diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3748eccbd3..b828a6800a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,12 +18,15 @@ on:
       - "apps/simplex-badge-service/**"
       - "apps/simplex-broadcast-bot/**"
       - "apps/simplex-directory-service/**"
+      - "apps/multiplatform/**"
+      - "apps/ios/**"
       - "tests/**"
       - "bots/src/**"
       - "simplex-chat.cabal"
       - "cabal.project"
       - "Dockerfile*"
       - "scripts/ci/**"
+      - "scripts/ci/ios-stub-libs.sh"
       - "scripts/desktop/**"
       - ".github/**"
 
@@ -90,7 +93,10 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       libs_tag: ${{ steps.libs.outputs.tag }}
-      core_changed: ${{ steps.core.outputs.core }}
+      core_changed: ${{ steps.changes.outputs.core }}
+      haskell: ${{ steps.changes.outputs.haskell }}
+      kotlin: ${{ steps.changes.outputs.kotlin }}
+      ios: ${{ steps.changes.outputs.ios }}
       addon_tag: ${{ steps.addon.outputs.tag }}
       addon_draft: ${{ steps.addon.outputs.draft }}
       libs_latest: ${{ steps.latest_libs.outputs.tag }}
@@ -105,14 +111,23 @@ jobs:
         with:
           fetch-depth: 2
 
-      - name: Check chat core change
-        id: core
-        if: github.event_name == 'pull_request'
+      - name: Check changes
+        id: changes
+        if: github.event_name == 'push' || github.event_name == 'pull_request'
+        shell: bash
         env:
           BASE: ${{ github.event.pull_request.base.sha }}
         run: |
-          git fetch -q --depth=1 origin "$BASE"
-          python3 scripts/ci/packages_release.py changes "$BASE" | grep '^core=' >> "$GITHUB_OUTPUT"
+          if [ "$GITHUB_EVENT_NAME" = pull_request ]; then
+            git fetch -q --depth=1 origin "$BASE"
+            python3 scripts/ci/packages_release.py changes "$BASE"
+          else
+            echo "haskell=true"
+            if [ "$GITHUB_REF_TYPE" = branch ]; then
+              echo "kotlin=true"
+              echo "ios=true"
+            fi
+          fi >> "$GITHUB_OUTPUT"
 
       - name: Build changelog
         id: build_changelog
@@ -226,7 +241,7 @@ jobs:
             os_underscore: 22_04
             arch: x86_64
             runner: "ubuntu-22.04"
-            should_run: true
+            should_run: ${{ needs.maybe-release.outputs.haskell == 'true' }}
             ghc: ${{ needs.variables.outputs.GHC_VER }}
             hash: 'sha256:5c8b2c0a6c745bc177669abfaa716b4bc57d58e2ea3882fb5da67f4d59e3dda5'
             libs: true
@@ -234,12 +249,13 @@ jobs:
             os_underscore: 24_04
             arch: x86_64
             runner: "ubuntu-24.04"
-            should_run: true
+            should_run: ${{ needs.maybe-release.outputs.haskell == 'true' }}
             ghc: ${{ needs.variables.outputs.GHC_VER }}
             hash: 'sha256:98ff7968124952e719a8a69bb3cccdd217f5fe758108ac4f21ad22e1df44d237'
+            kotlin: ${{ needs.maybe-release.outputs.kotlin == 'true' }}
     steps: &linux-steps
       - name: Checkout Code
-        if: matrix.should_run == true
+        if: matrix.should_run == true || matrix.kotlin == true
         uses: actions/checkout@v3
         with:
           submodules: recursive
@@ -258,16 +274,16 @@ jobs:
 
       # Otherwise we run out of disk space with Docker build
       - name: Free disk space
-        if: matrix.should_run == true
+        if: matrix.should_run == true || matrix.kotlin == true
         shell: bash
         run: ./scripts/ci/linux_util_free_space.sh
 
       - name: Set up Docker Buildx
-        if: matrix.should_run == true
+        if: matrix.should_run == true || matrix.kotlin == true
         uses: simplex-chat/docker-setup-buildx-action@v3
 
       - name: Log in to GitHub Container Registry
-        if: matrix.should_run == true && env.release != 'true'
+        if: (matrix.should_run == true || matrix.kotlin == true) && env.release != 'true'
         shell: bash
         env:
           GHCR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -275,11 +291,11 @@ jobs:
 
       - name: Compute image cache week
         id: week
-        if: matrix.should_run == true && env.release != 'true'
+        if: (matrix.should_run == true || matrix.kotlin == true) && env.release != 'true'
         run: echo "week=$(date -u +%G-W%V)" >> "$GITHUB_OUTPUT"
 
       - name: Build and cache Docker image
-        if: matrix.should_run == true
+        if: matrix.should_run == true || matrix.kotlin == true
         uses: simplex-chat/docker-build-push-action@v6
         with:
           context: .
@@ -300,7 +316,7 @@ jobs:
       # --cap-add SYS_ADMIN
       # --security-opt apparmor:unconfined
       - name: Start container
-        if: matrix.should_run == true
+        if: matrix.should_run == true || matrix.kotlin == true
         shell: bash
         run: |
           mkdir -p ~/.cabal
@@ -620,9 +636,23 @@ jobs:
             exit 1
           fi
 
+      # Compiling the desktop and Android targets of :common in parallel exceeds the 2 GB Kotlin daemon heap.
+      # cmakeBuildAndCopy links the JNI library against libsimplex, which this job does not build.
+      - name: Build and test Kotlin apps
+        if: ${{ !cancelled() && matrix.kotlin == true }}
+        timeout-minutes: 90
+        shell: docker exec -t builder sh -eu {0}
+        run: |
+          cd apps/multiplatform
+          ./gradlew --no-daemon --max-workers=1 \
+            :common:desktopTest \
+            :desktop:compileKotlinJvm -x :desktop:cmakeBuildAndCopy \
+            :android:compileGoogleDebugKotlin \
+            :android:testFossDebugUnitTest
+
       - name: Setup Node.js
         id: setup-node
-        if: ${{ !cancelled() && matrix.libs && (github.event_name == 'pull_request' || needs.maybe-release.outputs.addon_draft || needs.maybe-release.outputs.publish) }}
+        if: ${{ !cancelled() && matrix.should_run == true && matrix.libs && (github.event_name == 'pull_request' || needs.maybe-release.outputs.addon_draft || needs.maybe-release.outputs.publish) }}
         uses: actions/setup-node@v7
         with:
           node-version: 22
@@ -741,6 +771,7 @@ jobs:
             ghc: ${{ needs.variables.outputs.GHC_VER }}
             hash: 'sha256:6a62a4157b8775eaf4959cb629e757d32d39d1f4c8ac1b0ddc2510b555cf72f3'
             libs: true
+            kotlin: false
           - os: 24.04
             os_underscore: 24_04
             arch: aarch64
@@ -748,12 +779,13 @@ jobs:
             should_run: true
             ghc: ${{ needs.variables.outputs.GHC_VER }}
             hash: 'sha256:68434214381cb38287104e629fe8ee720167dd98cbb36ab1cbbab342515fa6ab'
+            kotlin: false
     steps: *linux-steps
 
   build-linux-ghc8:
     name: "ubuntu-${{ matrix.os }}-${{ matrix.arch }} (CLI,Desktop), GHC: ${{ matrix.ghc }}"
     needs: [maybe-release, variables]
-    if: ${{ !(github.ref == 'refs/heads/stable' || startsWith(github.ref, 'refs/tags/v')) }}
+    if: ${{ needs.maybe-release.outputs.haskell == 'true' && !(github.ref == 'refs/heads/stable' || startsWith(github.ref, 'refs/tags/v')) }}
     runs-on: ${{ matrix.runner }}
     permissions:
       contents: write
@@ -773,6 +805,7 @@ jobs:
             ghc: "8.10.7"
             hash: 'sha256:5c8b2c0a6c745bc177669abfaa716b4bc57d58e2ea3882fb5da67f4d59e3dda5'
             should_run: true
+            kotlin: false
     steps: *linux-steps
 
 # =================================
@@ -911,31 +944,36 @@ jobs:
             cli_asset_name: simplex-chat-macos-aarch64
             desktop_asset_name: simplex-desktop-macos-aarch64.dmg
             openssl_dir: "/opt/homebrew/opt"
+            should_run: ${{ needs.maybe-release.outputs.haskell == 'true' }}
+            ios: ${{ needs.maybe-release.outputs.ios == 'true' }}
           - os: macos-15-intel
             arch: x86_64
             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"
+            should_run: ${{ needs.maybe-release.outputs.haskell == 'true' }}
     steps:
       - name: Checkout Code
+        if: matrix.should_run == true || matrix.ios == true
         uses: actions/checkout@v3
         with:
           submodules: recursive
 
       - name: Point Command Line Tools SDK to Xcode SDK
+        if: matrix.should_run == true || matrix.ios == true
         shell: bash
         run: sudo ln -sfn "$(xcrun --sdk macosx --show-sdk-path)" /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
 
       - name: Compute toolchain cache key
         id: toolchain-key
-        if: env.release != 'true'
+        if: matrix.should_run == true && env.release != 'true'
         shell: bash
         run: echo "key=ghcup-${{ matrix.os }}-${{ matrix.arch }}-ghc${{ matrix.ghc }}-cabal3.10.2.0-$({ sw_vers -productVersion; clang --version; } | shasum -a 256 | cut -c1-16)" >> "$GITHUB_OUTPUT"
 
       - name: Restore toolchain from cache
         id: restore-toolchain
-        if: env.release != 'true'
+        if: matrix.should_run == true && env.release != 'true'
         uses: actions/cache/restore@v4
         with:
           path: |
@@ -945,11 +983,12 @@ jobs:
           key: ${{ steps.toolchain-key.outputs.key }}
 
       - name: Warn if toolchain not in cache
-        if: env.release != 'true' && steps.restore-toolchain.outputs.cache-hit != 'true'
+        if: matrix.should_run == true && env.release != 'true' && steps.restore-toolchain.outputs.cache-hit != 'true'
         run: echo "::warning title=Cache miss::${{ steps.toolchain-key.outputs.key }}"
 
       - name: Prepare build
         id: prepare
+        if: matrix.should_run == true
         uses: ./.github/actions/prepare-build
         with:
           java_ver: ${{ needs.variables.outputs.JAVA_VER }}
@@ -957,7 +996,7 @@ jobs:
           github_ref: ${{ github.ref }}
 
       - name: Save toolchain to cache
-        if: env.release != 'true' && steps.restore-toolchain.outputs.cache-hit != 'true'
+        if: matrix.should_run == true && env.release != 'true' && steps.restore-toolchain.outputs.cache-hit != 'true'
         uses: actions/cache/save@v4
         with:
           path: |
@@ -967,9 +1006,11 @@ jobs:
           key: ${{ steps.toolchain-key.outputs.key }}
 
       - name: Install OpenSSL
+        if: matrix.should_run == true
         run: brew install openssl@3.0
 
       - name: Prepare cabal.project.local
+        if: matrix.should_run == true
         shell: bash
         run: |
           echo "ignore-project: False"                                                    >> cabal.project.local
@@ -984,7 +1025,7 @@ jobs:
 
       - name: Compute cache key prefixes
         id: keys
-        if: env.release != 'true'
+        if: matrix.should_run == true && env.release != 'true'
         shell: bash
         run: |
           toolchain=$({ sw_vers -productVersion; clang --version; } | shasum -a 256 | cut -c1-16)
@@ -994,7 +1035,7 @@ jobs:
 
       - name: Restore dependencies from cache
         id: restore-deps
-        if: env.release != 'true'
+        if: matrix.should_run == true && env.release != 'true'
         uses: actions/cache/restore@v4
         with:
           path: ${{ steps.prepare.outputs.cabal-store }}
@@ -1004,12 +1045,12 @@ jobs:
             ${{ steps.keys.outputs.deps }}-
 
       - name: Warn if dependencies not in cache
-        if: env.release != 'true' && steps.restore-deps.outputs.cache-matched-key == ''
+        if: matrix.should_run == true && env.release != 'true' && steps.restore-deps.outputs.cache-matched-key == ''
         run: echo "::warning title=Cache miss::${{ steps.keys.outputs.deps }}-${{ env.branch }}"
 
       - name: Restore source repositories from cache
         id: restore-src
-        if: env.release != 'true'
+        if: matrix.should_run == true && env.release != 'true'
         uses: actions/cache/restore@v4
         with:
           path: dist-newstyle/src
@@ -1017,12 +1058,12 @@ jobs:
           restore-keys: src-${{ runner.os }}-
 
       - name: Warn if source repositories not in cache
-        if: env.release != 'true' && steps.restore-src.outputs.cache-matched-key == ''
+        if: matrix.should_run == true && env.release != 'true' && steps.restore-src.outputs.cache-matched-key == ''
         run: echo "::warning title=Cache miss::src-${{ runner.os }}"
 
       - name: Restore build directory from cache
         id: restore-build
-        if: env.release != 'true' && !needs.maybe-release.outputs.libs_tag
+        if: matrix.should_run == true && env.release != 'true' && !needs.maybe-release.outputs.libs_tag
         uses: actions/cache/restore@v4
         with:
           path: |
@@ -1034,11 +1075,12 @@ jobs:
             ${{ steps.keys.outputs.dist }}-${{ env.opt }}-
 
       - name: Warn if build directory not in cache
-        if: steps.restore-build.outcome == 'success' && steps.restore-build.outputs.cache-matched-key == ''
+        if: matrix.should_run == true && steps.restore-build.outcome == 'success' && steps.restore-build.outputs.cache-matched-key == ''
         run: echo "::warning title=Cache miss::${{ steps.keys.outputs.dist }}-${{ env.opt }}-${{ env.branch }}"
 
       - name: Build CLI
         id: mac_cli_build
+        if: matrix.should_run == true
         shell: bash
         run: |
           scripts/ci/prune-old-builds.sh dist-newstyle
@@ -1049,26 +1091,26 @@ jobs:
 
       - name: Compute dependency cache key
         id: hash-deps
-        if: env.release != 'true'
+        if: matrix.should_run == true && env.release != 'true'
         shell: bash
         run: echo "hash=$(ls '${{ steps.prepare.outputs.cabal-store }}'/ghc-*/ | shasum -a 256 | cut -c1-16)" >> "$GITHUB_OUTPUT"
 
       - name: Save dependencies to cache
-        if: env.release != 'true' && steps.restore-deps.outputs.cache-matched-key != format('{0}-{1}-{2}', steps.keys.outputs.deps, env.branch, steps.hash-deps.outputs.hash)
+        if: matrix.should_run == true && env.release != 'true' && steps.restore-deps.outputs.cache-matched-key != format('{0}-{1}-{2}', steps.keys.outputs.deps, env.branch, steps.hash-deps.outputs.hash)
         uses: actions/cache/save@v4
         with:
           path: ${{ steps.prepare.outputs.cabal-store }}
           key: ${{ steps.keys.outputs.deps }}-${{ env.branch }}-${{ steps.hash-deps.outputs.hash }}
 
       - name: Save source repositories to cache
-        if: env.release != 'true' && matrix.arch == 'x86_64' && steps.restore-src.outputs.cache-hit != 'true'
+        if: matrix.should_run == true && env.release != 'true' && matrix.arch == 'x86_64' && steps.restore-src.outputs.cache-hit != 'true'
         uses: actions/cache/save@v4
         with:
           path: dist-newstyle/src
           key: src-${{ runner.os }}-${{ hashFiles('cabal.project') }}
 
       - name: Save build directory to cache
-        if: env.release != 'true' && steps.restore-build.outputs.cache-hit != 'true'
+        if: matrix.should_run == true && env.release != 'true' && steps.restore-build.outputs.cache-hit != 'true'
         uses: actions/cache/save@v4
         with:
           path: |
@@ -1077,7 +1119,7 @@ jobs:
           key: ${{ steps.keys.outputs.dist }}-${{ env.opt }}-${{ env.branch }}-${{ github.sha }}
 
       - name: Upload CLI
-        if: startsWith(github.ref, 'refs/tags/v')
+        if: matrix.should_run == true && startsWith(github.ref, 'refs/tags/v')
         uses: ./.github/actions/prepare-release
         with:
           bin_path: ${{ steps.mac_cli_build.outputs.bin_path }}
@@ -1088,7 +1130,7 @@ jobs:
 
       - name: Build Desktop
         id: mac_desktop_build
-        if: startsWith(github.ref, 'refs/tags/v')
+        if: matrix.should_run == true && startsWith(github.ref, 'refs/tags/v')
         shell: bash
         env:
           APPLE_SIMPLEX_SIGNING_KEYCHAIN: ${{ secrets.APPLE_SIMPLEX_SIGNING_KEYCHAIN }}
@@ -1102,7 +1144,7 @@ jobs:
           echo "package_hash=$(echo SHA2-256\(${{ matrix.desktop_asset_name }}\)= $(openssl sha256 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
 
       - name: Upload Desktop
-        if: startsWith(github.ref, 'refs/tags/v')
+        if: matrix.should_run == true && startsWith(github.ref, 'refs/tags/v')
         uses: ./.github/actions/prepare-release
         with:
           bin_path: ${{ steps.mac_desktop_build.outputs.package_path }}
@@ -1112,7 +1154,7 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Mount RAM disk for tests
-        if: matrix.arch == 'aarch64'
+        if: matrix.should_run == true && matrix.arch == 'aarch64'
         shell: bash
         run: |
           disk=$(hdiutil attach -nomount ram://1048576 | tr -d '[:space:]')
@@ -1120,7 +1162,7 @@ jobs:
           ln -s /Volumes/tests tests/tmp
 
       - name: Run tests
-        if: matrix.arch == 'aarch64'
+        if: matrix.should_run == true && matrix.arch == 'aarch64'
         timeout-minutes: 120
         shell: bash
         run: |
@@ -1141,9 +1183,26 @@ jobs:
             exit 1
           fi
 
+      - name: Build iOS app
+        if: ${{ !cancelled() && matrix.ios == true }}
+        timeout-minutes: 60
+        shell: bash
+        run: |
+          scripts/ci/ios-stub-libs.sh
+          xcodebuild build -quiet \
+            -project apps/ios/SimpleX.xcodeproj \
+            -scheme "SimpleX (iOS)" \
+            -configuration Debug \
+            -destination "generic/platform=iOS Simulator" \
+            -onlyUsePackageVersionsFromResolvedFile \
+            -skipPackagePluginValidation \
+            -skipMacroValidation \
+            ARCHS=arm64 \
+            CODE_SIGNING_ALLOWED=NO
+
       - name: Build library
         id: mac_lib_build
-        if: ${{ !cancelled() && needs.maybe-release.outputs.libs_tag && steps.mac_cli_build.outcome == 'success' }}
+        if: ${{ !cancelled() && matrix.should_run == true && needs.maybe-release.outputs.libs_tag && steps.mac_cli_build.outcome == 'success' }}
         shell: bash
         env:
           APPLE_SIMPLEX_SIGNING_KEYCHAIN: ${{ secrets.APPLE_SIMPLEX_SIGNING_KEYCHAIN }}
@@ -1158,7 +1217,7 @@ jobs:
           (cd release-libs/$name && zip -r ../$name.zip libs)
 
       - name: Upload library
-        if: ${{ !cancelled() && steps.mac_lib_build.outcome == 'success' }}
+        if: ${{ !cancelled() && matrix.should_run == true && steps.mac_lib_build.outcome == 'success' }}
         shell: bash
         env:
           GH_TOKEN: ${{ secrets.NODEJS_REPO_TOKEN }}
@@ -1167,20 +1226,20 @@ jobs:
 
       - name: Setup Node.js
         id: setup-node
-        if: ${{ !cancelled() && (github.event_name == 'pull_request' || needs.maybe-release.outputs.addon_draft || needs.maybe-release.outputs.publish) }}
+        if: ${{ !cancelled() && matrix.should_run == true && (github.event_name == 'pull_request' || needs.maybe-release.outputs.addon_draft || needs.maybe-release.outputs.publish) }}
         uses: actions/setup-node@v7
         with:
           node-version: 22
 
       - name: Setup Python
         id: setup-python
-        if: ${{ !cancelled() && steps.setup-node.outcome == 'success' }}
+        if: ${{ !cancelled() && matrix.should_run == true && steps.setup-node.outcome == 'success' }}
         uses: actions/setup-python@v7
         with:
           python-version: "3.12"
 
       - name: Package tests (pull request)
-        if: ${{ !cancelled() && steps.setup-python.outcome == 'success' && github.event_name == 'pull_request' }}
+        if: ${{ !cancelled() && matrix.should_run == true && steps.setup-python.outcome == 'success' && github.event_name == 'pull_request' }}
         timeout-minutes: 30
         shell: bash
         run: |
@@ -1188,7 +1247,7 @@ jobs:
           scripts/ci/package-tests.sh test
 
       - name: Add-on
-        if: ${{ !cancelled() && steps.setup-python.outcome == 'success' && needs.maybe-release.outputs.addon_draft }}
+        if: ${{ !cancelled() && matrix.should_run == true && steps.setup-python.outcome == 'success' && needs.maybe-release.outputs.addon_draft }}
         timeout-minutes: 30
         shell: bash
         env:
@@ -1200,7 +1259,7 @@ jobs:
 
       - name: Package tests
         id: package-tests
-        if: ${{ !cancelled() && steps.setup-python.outcome == 'success' && needs.maybe-release.outputs.publish }}
+        if: ${{ !cancelled() && matrix.should_run == true && steps.setup-python.outcome == 'success' && needs.maybe-release.outputs.publish }}
         timeout-minutes: 30
         shell: bash
         run: |
@@ -1208,7 +1267,7 @@ jobs:
           echo "macos-${{ matrix.arch }}" > "$RUNNER_TEMP/package-tests"
 
       - name: Package tests result
-        if: ${{ !cancelled() && steps.package-tests.outcome == 'success' }}
+        if: ${{ !cancelled() && matrix.should_run == true && steps.package-tests.outcome == 'success' }}
         uses: actions/upload-artifact@v7
         with:
           name: package-tests-macos-${{ matrix.arch }}
@@ -1216,13 +1275,13 @@ jobs:
 
       - name: Remove -O2 build directory
         id: remove-o2
-        if: env.cache_o0 == 'true' && !cancelled() && steps.mac_cli_build.outcome == 'success'
+        if: matrix.should_run == true && env.cache_o0 == 'true' && !cancelled() && steps.mac_cli_build.outcome == 'success'
         shell: bash
         run: find dist-newstyle -mindepth 1 -maxdepth 1 ! -name src -exec rm -rf {} +
 
       - name: Restore -O0 build directory from cache
         id: restore-build-o0
-        if: ${{ !cancelled() && steps.remove-o2.outcome == 'success' }}
+        if: ${{ !cancelled() && matrix.should_run == true && steps.remove-o2.outcome == 'success' }}
         uses: actions/cache/restore@v4
         with:
           path: |
@@ -1235,14 +1294,14 @@ jobs:
 
       - name: Build at -O0 for pull request caches
         id: build-o0
-        if: ${{ !cancelled() && steps.remove-o2.outcome == 'success' }}
+        if: ${{ !cancelled() && matrix.should_run == true && steps.remove-o2.outcome == 'success' }}
         shell: bash
         run: |
           scripts/ci/prune-old-builds.sh dist-newstyle
           cabal build -j --enable-tests --ghc-options=-O0
 
       - name: Save -O0 build directory to cache
-        if: ${{ !cancelled() && steps.build-o0.outcome == 'success' && steps.restore-build-o0.outputs.cache-hit != 'true' }}
+        if: ${{ !cancelled() && matrix.should_run == true && steps.build-o0.outcome == 'success' && steps.restore-build-o0.outputs.cache-hit != 'true' }}
         uses: actions/cache/save@v4
         with:
           path: |
@@ -1257,6 +1316,7 @@ jobs:
   build-windows:
     name: "${{ matrix.os }} (CLI,Desktop), GHC: ${{ matrix.ghc }}"
     needs: [maybe-release, variables]
+    if: needs.maybe-release.outputs.haskell == 'true'
     runs-on: ${{ matrix.os }}
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}-windows-${{ matrix.os }}-${{ needs.maybe-release.outputs.libs_tag }}
diff --git a/Dockerfile.build b/Dockerfile.build
index 89f8c25101..f18f608612 100644
--- a/Dockerfile.build
+++ b/Dockerfile.build
@@ -5,11 +5,17 @@ FROM ubuntu:${TAG}@${HASH} AS build
 
 ### Build stage
 
+# Ubuntu archive state that all apt packages are installed from; bump it to pick up package updates
+ARG UBUNTU_SNAPSHOT=20261021T000000Z
 ARG GHC=9.6.3
 ARG CABAL=3.10.2.0
-ARG JAVA_VER=17.0.17.10.1
-ARG JAVA_HASH_AMD64=e3e11daa5c22a45153bbeff1a0c21bf08631791e4e8d8ed14deba31c7cf9af1a
-ARG JAVA_HASH_ARM64=2b460859b681757b33a7591b6238ecaf51569d05d2684984e5f0a89c6514acbc
+ARG GHCUP_VER=0.2.6.2
+ARG GHCUP_HASH_AMD64=9ed5da5449b48043a0d17e767c05d2ef585e25a639bb934329496c6d2fad9cf8
+ARG GHCUP_HASH_ARM64=65a5f05120288ee4f1a81d28825374b6af317456a351a586adfce90c6dc29e3b
+ARG GHCUP_METADATA=https://raw.githubusercontent.com/haskell/ghcup-metadata/ff5a77f2ee34afd9c49b970a45abfb7dac01cb8a/ghcup-0.1.0.yaml
+ARG JAVA_VER=17.0.21.0.10
+ARG JAVA_HASH_AMD64=8e7577ddeb5b17a13c73a6fe80b592f6e70299cd19f54d06976986b0bc7ada87
+ARG JAVA_HASH_ARM64=c400e8ae70ee9565c23667bc3b4dd0fe5f7c403629ebb2cf9648c1d756b6b926
 
 ENV TZ=Etc/UTC \
     DEBIAN_FRONTEND=noninteractive
@@ -18,8 +24,15 @@ ARG USER_UID=1000
 ARG USER_GID=1000
 ARG USER_NAME=builder
 
+# The base image has no CA certificates, so they are fetched without TLS peer verification;
+# apt still verifies every index against the GPG-signed InRelease files.
+RUN sed -i -E "s#http://(archive|security|ports)\.ubuntu\.com/ubuntu(-ports)?/?#https://snapshot.ubuntu.com/ubuntu/${UBUNTU_SNAPSHOT}/#" \
+        $(grep -rlsE 'http://(archive|security|ports)\.ubuntu\.com' /etc/apt/sources.list /etc/apt/sources.list.d) && \
+    apt-get -o Acquire::https::Verify-Peer=false update --error-on=any && \
+    apt-get -o Acquire::https::Verify-Peer=false install -y ca-certificates
+
 # Install curl, git and and simplex-chat dependencies
-RUN apt-get update && \
+RUN apt-get update --error-on=any && \
     apt-get install -y curl \
                        libpq-dev \
                        git \
@@ -58,7 +71,7 @@ RUN apt-get update && \
 # to fix this :(
 RUN export JAVA_FILENAME='java-corretto.deb' \
            JAVA_VER_MAJOR=$(printf "${JAVA_VER}" | awk -F. '{print $1}') \
-           JAVA_VER_DEB=$(printf "${JAVA_VER}" | sed 's/\.1$/-1/') && \
+           JAVA_VER_DEB="${JAVA_VER}-1" && \
     case "$(uname -m)" in \
         x86_64)  export JAVA_ARCH='amd64' JAVA_HASH="$JAVA_HASH_AMD64" ;; \
         aarch64) export JAVA_ARCH='arm64' JAVA_HASH="$JAVA_HASH_ARM64" ;; \
@@ -83,35 +96,38 @@ RUN mkdir /nix /out && chown ${USER_NAME}:${USER_NAME} /nix /out
 USER ${USER_NAME}
 WORKDIR /home/${USER_NAME}
 
-# 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
-
 # Setup basic env variables (required)
 ENV HOME="/home/${USER_NAME}" USER="${USER_NAME}"
 # Adjust PATH
 ENV PATH="$HOME/.cabal/bin:$HOME/.ghcup/bin:$PATH"
 
-# Set both as default
-RUN ghcup set ghc "${GHC}" && \
-    ghcup set cabal "${CABAL}"
+# Install ghcup, GHC and cabal
+RUN case "$(uname -m)" in \
+        x86_64)  export GHCUP_HASH="$GHCUP_HASH_AMD64" ;; \
+        aarch64) export GHCUP_HASH="$GHCUP_HASH_ARM64" ;; \
+        *) echo "unknown arch $(uname -m)" && exit 1 ;; \
+    esac && \
+    mkdir -p "$HOME/.ghcup/bin" && \
+    curl --proto '=https' --tlsv1.2 -sSf \
+         "https://downloads.haskell.org/~ghcup/${GHCUP_VER}/$(uname -m)-linux-ghcup-${GHCUP_VER}" \
+         -o "$HOME/.ghcup/bin/ghcup" && \
+    echo "${GHCUP_HASH}  $HOME/.ghcup/bin/ghcup" | sha256sum -c - && \
+    chmod +x "$HOME/.ghcup/bin/ghcup" && \
+    ghcup config set url-source "${GHCUP_METADATA}" && \
+    ghcup install ghc "${GHC}" --set && \
+    ghcup install cabal "${CABAL}" --set
 
 #=====================
 # Install Android SDK
 #=====================
 ARG SDK_VERSION=13114758
+ARG SDK_HASH=7ec965280a073311c339e571cd5de778b9975026cfcbe79f2b1cdcb1e15317ee
 
 ENV SDK_VERSION="$SDK_VERSION" \
     ANDROID_HOME="$HOME"
 
 RUN curl -L -o tools.zip "https://dl.google.com/android/repository/commandlinetools-linux-${SDK_VERSION}_latest.zip" && \
+    echo "${SDK_HASH}  tools.zip" | sha256sum -c - && \
     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"
@@ -128,7 +144,13 @@ ENV PATH="$PATH:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools"
 
 # Android reproducibility scripts
 RUN python3 -m venv "$HOME/.venv"
-RUN "$HOME/.venv/bin/pip" install apksigcopier repro-apk
+RUN printf '%s\n' \
+        'apksigcopier==1.1.1 --hash=sha256:0834bb7d6f3607bb0994cf8cd2e26b8f0c9d481e13b75872e0fa9cec052e519b' \
+        'repro-apk==0.3.0 --hash=sha256:09091a5e6d725d73ad418aa98ec72d0737452d3ce3803b56dd5c270b887fceb9' \
+        'click==8.5.0 --hash=sha256:255bc9599cf7748b4b1a446ccc735421bd08a2ae529a8b88597d3de5664ee360' \
+        > /tmp/requirements.txt && \
+    "$HOME/.venv/bin/pip" install --require-hashes --only-binary=:all: -r /tmp/requirements.txt && \
+    rm /tmp/requirements.txt
 
 ENV PATH="$HOME/.venv/bin:$PATH"
 
diff --git a/apps/ios/Shared/Model/AppAPITypes.swift b/apps/ios/Shared/Model/AppAPITypes.swift
index 30fa5c67b5..72cbd5d69b 100644
--- a/apps/ios/Shared/Model/AppAPITypes.swift
+++ b/apps/ios/Shared/Model/AppAPITypes.swift
@@ -1648,6 +1648,7 @@ struct AddressSettings: Codable, Hashable {
     var businessAddress: Bool
     var autoAccept: AutoAccept?
     var autoReply: MsgContent?
+    var chatLayout: ChatLayout?
 }
 
 struct AutoAccept: Codable, Hashable {
@@ -2326,6 +2327,7 @@ struct AppSettings: Codable, Equatable {
     var uiThemes: [ThemeOverrides]? = nil
     var oneHandUI: Bool? = nil
     var chatBottomBar: Bool? = nil
+    var uiChatLayout: ChatLayout? = nil
 
     func prepareForExport() -> AppSettings {
         var empty = AppSettings()
@@ -2362,6 +2364,7 @@ struct AppSettings: Codable, Equatable {
         if uiThemes != def.uiThemes { empty.uiThemes = uiThemes }
         if oneHandUI != def.oneHandUI { empty.oneHandUI = oneHandUI }
         if chatBottomBar != def.chatBottomBar { empty.chatBottomBar = chatBottomBar }
+        if uiChatLayout != def.uiChatLayout { empty.uiChatLayout = uiChatLayout }
         return empty
     }
 
@@ -2398,7 +2401,8 @@ struct AppSettings: Codable, Equatable {
             uiCurrentThemeIds: nil as [String: String]?,
             uiThemes: nil as [ThemeOverrides]?,
             oneHandUI: true,
-            chatBottomBar: true
+            chatBottomBar: true,
+            uiChatLayout: .classic
         )
     }
 }
diff --git a/apps/ios/Shared/Views/Call/WebRTCClient.swift b/apps/ios/Shared/Views/Call/WebRTCClient.swift
index 15d36f7931..f2fc9ffb8e 100644
--- a/apps/ios/Shared/Views/Call/WebRTCClient.swift
+++ b/apps/ios/Shared/Views/Call/WebRTCClient.swift
@@ -876,7 +876,7 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
 
         guard let connectionStateString = newState.toString() else { return }
         Task {
-            if activeCall?.wasConnected == true {
+            if activeCall?.wasConnected == true && ChatModel.shared.activeCall?.contact.callReconnectSupported == true {
                 switch newState {
                 case .disconnected, .failed:
                     if activeCall?.reconnection == nil {
diff --git a/apps/ios/Shared/Views/Chat/ChatInfoView.swift b/apps/ios/Shared/Views/Chat/ChatInfoView.swift
index 3d1e7ef477..7857646177 100644
--- a/apps/ios/Shared/Views/Chat/ChatInfoView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatInfoView.swift
@@ -1023,14 +1023,14 @@ struct ChatWallpaperEditorSheet: View {
                 let filePath = saveWallpaperFile(url: getWallpaperFilePath(imageFile))
                 if currentMode == DefaultThemeMode.light {
                     dark.wallpaper?.imageFile = filePath
-                    changedThemes = ThemeModeOverrides(light: changedThemes?.light, dark: dark)
+                    changedThemes?.dark = dark
                 } else {
                     light.wallpaper?.imageFile = filePath
-                    changedThemes = ThemeModeOverrides(light: light, dark: changedThemes?.dark)
+                    changedThemes?.light = light
                 }
             }
         } else {
-            changedThemes = nil
+            changedThemes = changedThemes?.layoutOnly()
         }
         wallpaperFiles.remove(changedThemes?.light?.wallpaper?.imageFile)
         wallpaperFiles.remove(changedThemes?.dark?.wallpaper?.imageFile)
diff --git a/apps/ios/Shared/Views/UserSettings/AppSettings.swift b/apps/ios/Shared/Views/UserSettings/AppSettings.swift
index 3554ce720f..849abb4d62 100644
--- a/apps/ios/Shared/Views/UserSettings/AppSettings.swift
+++ b/apps/ios/Shared/Views/UserSettings/AppSettings.swift
@@ -67,6 +67,7 @@ extension AppSettings {
         if let val = uiThemes { themeOverridesDefault.set(val.skipDuplicates()) }
         if let val = oneHandUI { groupDefaults.setValue(val, forKey: GROUP_DEFAULT_ONE_HAND_UI) }
         if let val = chatBottomBar { groupDefaults.setValue(val, forKey: GROUP_DEFAULT_CHAT_BOTTOM_BAR) }
+        if let val = uiChatLayout { chatLayoutDefault.set(val) }
     }
 
     public static var current: AppSettings {
@@ -104,6 +105,7 @@ extension AppSettings {
         c.uiThemes = themeOverridesDefault.get()
         c.oneHandUI = groupDefaults.bool(forKey: GROUP_DEFAULT_ONE_HAND_UI)
         c.chatBottomBar = groupDefaults.bool(forKey: GROUP_DEFAULT_CHAT_BOTTOM_BAR)
+        c.uiChatLayout = chatLayoutDefault.get()
         return c
     }
 }
diff --git a/apps/ios/Shared/Views/UserSettings/AppearanceSettings.swift b/apps/ios/Shared/Views/UserSettings/AppearanceSettings.swift
index 54a60eed19..d45ca12f75 100644
--- a/apps/ios/Shared/Views/UserSettings/AppearanceSettings.swift
+++ b/apps/ios/Shared/Views/UserSettings/AppearanceSettings.swift
@@ -775,14 +775,14 @@ struct UserWallpaperEditorSheet: View {
                 let filePath = saveWallpaperFile(url: getWallpaperFilePath(imageFile))
                 if currentMode == DefaultThemeMode.light {
                     dark.wallpaper?.imageFile = filePath
-                    changedThemes = ThemeModeOverrides(light: changedThemes?.light, dark: dark)
+                    changedThemes?.dark = dark
                 } else {
                     light.wallpaper?.imageFile = filePath
-                    changedThemes = ThemeModeOverrides(light: light, dark: changedThemes?.dark)
+                    changedThemes?.light = light
                 }
             }
         } else {
-            changedThemes = nil
+            changedThemes = changedThemes?.layoutOnly()
         }
         wallpaperFiles.remove(changedThemes?.light?.wallpaper?.imageFile)
         wallpaperFiles.remove(changedThemes?.dark?.wallpaper?.imageFile)
@@ -1135,7 +1135,7 @@ private func saveThemeToDatabase(_ themeUserDestination: (Int64, ThemeModeOverri
 private func removeUserThemeModeOverrides(_ themeUserDestination: Binding<(Int64, ThemeModeOverrides?)?>, _ perUserTheme: Binding<ThemeModeOverride>) {
     guard let dest = themeUserDestination.wrappedValue else { return }
     perUserTheme.wrappedValue = ThemeModeOverride(mode: CurrentColors.base.mode)
-    themeUserDestination.wrappedValue = (dest.0, nil)
+    themeUserDestination.wrappedValue = (dest.0, dest.1?.layoutOnly())
     var wallpaperFilesToDelete: [String] = []
     if let type = ChatModel.shared.currentUser?.uiThemes?.light?.type, case let WallpaperType.image(filename, _, _) = type {
         wallpaperFilesToDelete.append(filename)
diff --git a/apps/ios/Shared/Views/UserSettings/SettingsView.swift b/apps/ios/Shared/Views/UserSettings/SettingsView.swift
index f7042b0c39..493bf7914d 100644
--- a/apps/ios/Shared/Views/UserSettings/SettingsView.swift
+++ b/apps/ios/Shared/Views/UserSettings/SettingsView.swift
@@ -57,6 +57,7 @@ let DEFAULT_USER_INTERFACE_STYLE = "userInterfaceStyle" // deprecated, only used
 let DEFAULT_PROFILE_IMAGE_CORNER_RADIUS = "profileImageCornerRadius"
 let DEFAULT_CHAT_ITEM_ROUNDNESS = "chatItemRoundness"
 let DEFAULT_CHAT_ITEM_TAIL = "chatItemTail"
+let DEFAULT_CHAT_LAYOUT = "chatLayout"
 let DEFAULT_ONE_HAND_UI_CARD_SHOWN = "oneHandUICardShown"
 let DEFAULT_ADDRESS_CREATION_CARD_SHOWN = "addressCreationCardShown"
 let DEFAULT_SUPPORTER_BANNER_SHOWN = "supporterBannerShown"
@@ -123,6 +124,7 @@ let appDefaults: [String: Any] = [
     DEFAULT_PROFILE_IMAGE_CORNER_RADIUS: defaultProfileImageCorner,
     DEFAULT_CHAT_ITEM_ROUNDNESS: defaultChatItemRoundness,
     DEFAULT_CHAT_ITEM_TAIL: true,
+    DEFAULT_CHAT_LAYOUT: ChatLayout.classic.rawValue,
     DEFAULT_ONE_HAND_UI_CARD_SHOWN: false,
     DEFAULT_ADDRESS_CREATION_CARD_SHOWN: false,
     DEFAULT_SUPPORTER_BANNER_SHOWN: false,
@@ -214,6 +216,8 @@ let shouldDeleteDatabaseBackupsDefault = BoolDefault(defaults: UserDefaults.stan
 
 let connectViaLinkTabDefault = EnumDefault<ConnectViaLinkTab>(defaults: UserDefaults.standard, forKey: DEFAULT_CONNECT_VIA_LINK_TAB, withDefault: .scan)
 
+let chatLayoutDefault = EnumDefault<ChatLayout>(defaults: UserDefaults.standard, forKey: DEFAULT_CHAT_LAYOUT, withDefault: .classic)
+
 let privacySimplexLinkModeDefault = EnumDefault<SimpleXLinkMode>(defaults: UserDefaults.standard, forKey: DEFAULT_PRIVACY_SIMPLEX_LINK_MODE, withDefault: .description)
 
 let privacyLocalAuthModeDefault = EnumDefault<LAMode>(defaults: UserDefaults.standard, forKey: DEFAULT_LA_MODE, withDefault: .system)
diff --git a/apps/ios/Shared/Views/UserSettings/UserAddressView.swift b/apps/ios/Shared/Views/UserSettings/UserAddressView.swift
index 61c808dda1..f25733a002 100644
--- a/apps/ios/Shared/Views/UserSettings/UserAddressView.swift
+++ b/apps/ios/Shared/Views/UserSettings/UserAddressView.swift
@@ -582,6 +582,7 @@ struct AddressSettingsState: Equatable {
     var autoAccept = false
     var autoAcceptIncognito = false
     var autoReply = ""
+    var chatLayout: ChatLayout?
 
     init() {}
 
@@ -590,13 +591,15 @@ struct AddressSettingsState: Equatable {
         self.autoAccept = settings.autoAccept != nil
         self.autoAcceptIncognito = settings.autoAccept?.acceptIncognito == true
         self.autoReply = settings.autoReply?.text ?? ""
+        self.chatLayout = settings.chatLayout
     }
 
     var addressSettings: AddressSettings {
         AddressSettings(
             businessAddress: self.businessAddress,
             autoAccept: self.autoAccept ? AutoAccept(acceptIncognito: self.autoAcceptIncognito) : nil,
-            autoReply: self.autoReply.isEmpty ? nil : MsgContent.text(self.autoReply)
+            autoReply: self.autoReply.isEmpty ? nil : MsgContent.text(self.autoReply),
+            chatLayout: self.chatLayout
         )
     }
 }
diff --git a/apps/ios/SimpleXChat/ChatTypes.swift b/apps/ios/SimpleXChat/ChatTypes.swift
index 3977f562bd..86b678ea83 100644
--- a/apps/ios/SimpleXChat/ChatTypes.swift
+++ b/apps/ios/SimpleXChat/ChatTypes.swift
@@ -19,6 +19,8 @@ public let REPORTS_VERSION = 12
 // support group knocking (MsgScope)
 public let GROUP_KNOCKING_VERSION = 15
 
+public let CALL_RECONNECT_VERSION = 22
+
 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 {
@@ -259,6 +261,41 @@ extension ChatPeerType: Codable {
     }
 }
 
+public enum ChatLayout: Hashable {
+    case classic
+    case terminal
+    case unknown(String)
+}
+
+extension ChatLayout: RawRepresentable {
+    public init(rawValue: String) {
+        switch rawValue {
+        case "classic": self = .classic
+        case "terminal": self = .terminal
+        default: self = .unknown(rawValue)
+        }
+    }
+
+    public var rawValue: String {
+        switch self {
+        case .classic: "classic"
+        case .terminal: "terminal"
+        case let .unknown(s): s
+        }
+    }
+}
+
+extension ChatLayout: Codable {
+    public init(from decoder: Decoder) throws {
+        self.init(rawValue: try decoder.singleValueContainer().decode(String.self))
+    }
+
+    public func encode(to encoder: Encoder) throws {
+        var c = encoder.singleValueContainer()
+        try c.encode(rawValue)
+    }
+}
+
 public func peerTypeIcon(_ peerType: ChatPeerType?) -> Image {
     switch peerType {
     case .bot: Image(systemName: "cube.fill")
@@ -2578,6 +2615,7 @@ public struct Contact: Identifiable, Decodable, NamedChat, Hashable {
     public var sndReady: Bool { get { ready || activeConn?.connStatus == .sndReady } }
     public var active: Bool { get { contactStatus == .active } }
     public var nextSendGrpInv: Bool { get { contactGroupMemberId != nil && !contactGrpInvSent } }
+    public var callReconnectSupported: Bool { (activeConn?.peerChatVRange.maxVersion ?? 0) >= CALL_RECONNECT_VERSION }
     public var nextConnectPrepared: Bool { active && preparedContact != nil && (activeConn == nil || activeConn?.connStatus == .prepared) }
     public var profileChangeProhibited: Bool { activeConn != nil }
     public var nextAcceptContactRequest: Bool {
@@ -3142,6 +3180,7 @@ public struct GroupProfile: Codable, NamedChat, Hashable {
     public var publicGroup: PublicGroupProfile?
     public var groupPreferences: GroupPreferences?
     public var memberAdmission: GroupMemberAdmission?
+    public var chatLayout: ChatLayout?
     public var localAlias: String { "" }
 
     public var memberAdmission_: GroupMemberAdmission {
@@ -3189,6 +3228,7 @@ public struct ContactShortLinkData: Codable, Hashable {
     public var profile: Profile
     public var message: MsgContent?
     public var business: Bool
+    public var chatLayout: ChatLayout?
     // set by the core when building the connection plan: the link profile's badge, verified and crypto-free
     public var localBadge: LocalBadge?
 }
diff --git a/apps/ios/SimpleXChat/Theme/ThemeTypes.swift b/apps/ios/SimpleXChat/Theme/ThemeTypes.swift
index a4e8050c6e..f8e800f15e 100644
--- a/apps/ios/SimpleXChat/Theme/ThemeTypes.swift
+++ b/apps/ios/SimpleXChat/Theme/ThemeTypes.swift
@@ -570,15 +570,21 @@ extension [ThemeOverrides] {
 public struct ThemeModeOverrides: Codable, Hashable {
     public var light: ThemeModeOverride? = nil
     public var dark: ThemeModeOverride? = nil
+    public var chatLayout: ChatLayout? = nil
 
-    public init(light: ThemeModeOverride? = nil, dark: ThemeModeOverride? = nil) {
+    public init(light: ThemeModeOverride? = nil, dark: ThemeModeOverride? = nil, chatLayout: ChatLayout? = nil) {
         self.light = light
         self.dark = dark
+        self.chatLayout = chatLayout
     }
 
     public func preferredMode(_ darkTheme: Bool) -> ThemeModeOverride? {
         darkTheme ? dark : light
     }
+
+    public func layoutOnly() -> ThemeModeOverrides? {
+        chatLayout.map { ThemeModeOverrides(chatLayout: $0) }
+    }
 }
 
 // Spec: spec/services/theme.md#ThemeModeOverride
diff --git a/apps/ios/product/flows/calling.md b/apps/ios/product/flows/calling.md
index e656a2932a..5032a3a3ed 100644
--- a/apps/ios/product/flows/calling.md
+++ b/apps/ios/product/flows/calling.md
@@ -109,7 +109,7 @@ All signaling messages are exchanged via E2E encrypted SMP messages (no central
 2. The call shows "reconnecting…" and plays the connecting sound. Call duration continues, as this state is not reported to the core.
 3. The callee (the party that sent the initial offer) restarts ICE every 10 seconds, sending the new offer via `apiSendCallExtraInfo` with `rtcSession`; the caller answers the same way.
 4. When the connection is restored, the call returns to connected state.
-5. If the connection is not restored in 30 seconds, the call ends. Clients without ICE restart support ignore the restart offer, so the call ends in this case.
+5. If the connection is not restored in 30 seconds, the call ends. If the contact's chat version is below 22 (`CALL_RECONNECT_VERSION`), the call ends as soon as the connection is lost, without reconnection.
 
 ### 7. Audio Routing
 
diff --git a/apps/ios/spec/services/calls.md b/apps/ios/spec/services/calls.md
index b3fb83d151..08f256449b 100644
--- a/apps/ios/spec/services/calls.md
+++ b/apps/ios/spec/services/calls.md
@@ -184,7 +184,7 @@ All call signaling travels through the same encrypted SMP message channels used
 
 ### Reconnection
 
-When a connected call loses ICE connection (`.disconnected` or `.failed`), `WebRTCClient` reports `"reconnecting"` connection state instead of ending the call. `ActiveCallView` sets `.reconnecting` call state and plays the connecting sound; this state is not sent to the core via `apiCallStatus`, and `connectedAt` is kept. The party that sent the initial offer (callee) restarts ICE every 10 seconds: the restart offer and answer are sent via `apiSendCallExtraInfo` with `rtcSession` (`x.call.extra`). When ICE connects again, the call returns to `.connected`. If it does not reconnect in 30 seconds, `WebRTCClient` reports `"disconnected"` and ends the call.
+When a connected call loses ICE connection (`.disconnected` or `.failed`), `WebRTCClient` reports `"reconnecting"` connection state instead of ending the call. `ActiveCallView` sets `.reconnecting` call state and plays the connecting sound; this state is not sent to the core via `apiCallStatus`, and `connectedAt` is kept. The party that sent the initial offer (callee) restarts ICE every 10 seconds: the restart offer and answer are sent via `apiSendCallExtraInfo` with `rtcSession` (`x.call.extra`). When ICE connects again, the call returns to `.connected`. If it does not reconnect in 30 seconds, `WebRTCClient` reports `"disconnected"` and ends the call. Reconnection happens only when the contact's peer chat version is at least `CALL_RECONNECT_VERSION` (22); otherwise the call ends as soon as the connection is lost.
 
 ### API Commands
 
diff --git a/apps/ios/spec/services/theme.md b/apps/ios/spec/services/theme.md
index 321f3307f9..3b14e7175b 100644
--- a/apps/ios/spec/services/theme.md
+++ b/apps/ios/spec/services/theme.md
@@ -91,7 +91,7 @@ struct ActiveTheme: Equatable {
 1. Determine base theme from `currentThemeDefault`:
    - If `"system"`: use light or dark based on [`systemInDarkThemeCurrently`](../../Shared/Theme/Theme.swift#L95)
    - Dark mode maps to `systemDarkThemeDefault` (Dark, SimpleX, or Black)
-2. Get base color palette ([`LightColorPalette`](../../SimpleXChat/Theme/ThemeTypes.swift#L650), [`DarkColorPalette`](../../SimpleXChat/Theme/ThemeTypes.swift#L629), [`SimplexColorPalette`](../../SimpleXChat/Theme/ThemeTypes.swift#L671), [`BlackColorPalette`](../../SimpleXChat/Theme/ThemeTypes.swift#L692))
+2. Get base color palette ([`LightColorPalette`](../../SimpleXChat/Theme/ThemeTypes.swift#L656), [`DarkColorPalette`](../../SimpleXChat/Theme/ThemeTypes.swift#L635), [`SimplexColorPalette`](../../SimpleXChat/Theme/ThemeTypes.swift#L677), [`BlackColorPalette`](../../SimpleXChat/Theme/ThemeTypes.swift#L698))
 3. Look up app settings theme override (`themeOverridesDefault`)
 4. Look up per-user theme override (`User.uiThemes`)
 5. Look up per-chat theme override (from ChatInfo)
@@ -135,10 +135,10 @@ Each base theme defines two palette types:
 - [`AppColors`](../../SimpleXChat/Theme/ThemeTypes.swift#L90): App-specific colors (sentMessage, receivedMessage, title, primaryVariant2)
 
 Palette instances:
-- [`LightColorPalette`](../../SimpleXChat/Theme/ThemeTypes.swift#L650) / [`LightColorPaletteApp`](../../SimpleXChat/Theme/ThemeTypes.swift#L662)
-- [`DarkColorPalette`](../../SimpleXChat/Theme/ThemeTypes.swift#L629) / [`DarkColorPaletteApp`](../../SimpleXChat/Theme/ThemeTypes.swift#L641)
-- [`SimplexColorPalette`](../../SimpleXChat/Theme/ThemeTypes.swift#L671) / [`SimplexColorPaletteApp`](../../SimpleXChat/Theme/ThemeTypes.swift#L683)
-- [`BlackColorPalette`](../../SimpleXChat/Theme/ThemeTypes.swift#L692) / [`BlackColorPaletteApp`](../../SimpleXChat/Theme/ThemeTypes.swift#L704)
+- [`LightColorPalette`](../../SimpleXChat/Theme/ThemeTypes.swift#L656) / [`LightColorPaletteApp`](../../SimpleXChat/Theme/ThemeTypes.swift#L668)
+- [`DarkColorPalette`](../../SimpleXChat/Theme/ThemeTypes.swift#L635) / [`DarkColorPaletteApp`](../../SimpleXChat/Theme/ThemeTypes.swift#L647)
+- [`SimplexColorPalette`](../../SimpleXChat/Theme/ThemeTypes.swift#L677) / [`SimplexColorPaletteApp`](../../SimpleXChat/Theme/ThemeTypes.swift#L689)
+- [`BlackColorPalette`](../../SimpleXChat/Theme/ThemeTypes.swift#L698) / [`BlackColorPaletteApp`](../../SimpleXChat/Theme/ThemeTypes.swift#L710)
 
 ---
 
@@ -168,10 +168,13 @@ Stored on the `User` object (`User.uiThemes: ThemeModeOverrides?`), persisted in
 struct ThemeModeOverrides: Codable {
     var light: ThemeModeOverride?
     var dark: ThemeModeOverride?
+    var chatLayout: ChatLayout?
 }
 ```
 
-#### [`ThemeModeOverride`](../../SimpleXChat/Theme/ThemeTypes.swift#L585)
+`chatLayout` is set by the Android and desktop apps; iOS keeps it in theme writes: "Reset to app theme" and "Remove image" keep only the layout (`layoutOnly()`).
+
+#### [`ThemeModeOverride`](../../SimpleXChat/Theme/ThemeTypes.swift#L591)
 
 ```swift
 struct ThemeModeOverride: Codable {
@@ -374,7 +377,7 @@ Key functions in [`AppearanceSettings.swift`](../../Shared/Views/UserSettings/Ap
 | File | Path | Key Definitions |
 |------|------|-----------------|
 | Theme manager | [`Shared/Theme/ThemeManager.swift`](../../Shared/Theme/ThemeManager.swift) | `ThemeManager` (L15), `ActiveTheme` (L17) |
-| Theme types & colors | [`SimpleXChat/Theme/ThemeTypes.swift`](../../SimpleXChat/Theme/ThemeTypes.swift) | `DefaultTheme` (L13), `Colors` (L44), `AppColors` (L90), `AppWallpaper` (L142), `ThemeColors` (L230), `ThemeWallpaper` (L302), `ThemeOverrides` (L385), `ThemeModeOverrides` (L570), `ThemeModeOverride` (L585) |
+| Theme types & colors | [`SimpleXChat/Theme/ThemeTypes.swift`](../../SimpleXChat/Theme/ThemeTypes.swift) | `DefaultTheme` (L13), `Colors` (L44), `AppColors` (L90), `AppWallpaper` (L142), `ThemeColors` (L230), `ThemeWallpaper` (L302), `ThemeOverrides` (L385), `ThemeModeOverrides` (L570), `ThemeModeOverride` (L591) |
 | Wallpaper types | [`SimpleXChat/Theme/ChatWallpaperTypes.swift`](../../SimpleXChat/Theme/ChatWallpaperTypes.swift) | `PresetWallpaper` (L13), `WallpaperType` (L311) |
 | Color utilities | [`SimpleXChat/Theme/Color.swift`](../../SimpleXChat/Theme/Color.swift) | Hex color conversion |
 | App theme observable | [`Shared/Theme/Theme.swift`](../../Shared/Theme/Theme.swift) | `AppTheme` (L22), `CurrentColors` (L14), `systemInDarkThemeCurrently` (L95) |
diff --git a/apps/multiplatform/common/build.gradle.kts b/apps/multiplatform/common/build.gradle.kts
index e9503bc6ce..0ed62884ba 100644
--- a/apps/multiplatform/common/build.gradle.kts
+++ b/apps/multiplatform/common/build.gradle.kts
@@ -146,7 +146,11 @@ kotlin {
         implementation("com.squareup.okhttp3:okhttp:4.12.0")
       }
     }
-    val desktopTest by getting
+    val desktopTest by getting {
+      dependencies {
+        implementation(compose.desktop.currentOs)
+      }
+    }
   }
 }
 
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 e19961126d..e38f5f9ce0 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
@@ -414,6 +414,13 @@ object ChatModel {
     }
   }
 
+  suspend fun addSentChatItem(activeCtx: ChatsContext, rhId: Long?, cInfo: ChatInfo, cItem: ChatItem) {
+    activeCtx.addChatItem(rhId, cInfo, cItem)
+    if (activeCtx.secondaryContextFilter != null && cInfo.inMainChatList) {
+      chatsContext.addChatItem(rhId, cInfo, cItem)
+    }
+  }
+
   // Spec: spec/state.md#ChatsContext
   class ChatsContext(val secondaryContextFilter: SecondaryContextFilter?) {
     val chats = mutableStateOf(SnapshotStateList<Chat>())
@@ -584,9 +591,9 @@ object ChatModel {
       val i = getChatIndex(rhId, cInfo.id)
       val chat: Chat
       if (i >= 0) {
-        chat = chatsContext.chats[i]
+        chat = 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) {
+        if (cInfo.inMainChatList) {
           val newPreviewItem = when (cInfo) {
             is ChatInfo.Group -> {
               val currentPreviewItem = chat.chatItems.firstOrNull()
@@ -604,20 +611,20 @@ object ChatModel {
             else -> cItem
           }
           val wasUnread = chat.unreadTag
-          chatsContext.chats[i] = chat.copy(
+          chats[i] = chat.copy(
             chatItems = arrayListOf(newPreviewItem),
             chatStats =
-            if (cItem.meta.itemStatus is CIStatus.RcvNew) {
+            if (cItem.meta.itemStatus is CIStatus.RcvNew && secondaryContextFilter == null) {
               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)
+          updateChatTagReadInPrimaryContext(chats[i], wasUnread)
         }
         // pop chat
         if (appPlatform.isDesktop && cItem.chatDir.sent) {
-          reorderChat(chatsContext.chats[i], 0)
+          reorderChat(chats[i], 0)
         } else {
           popChatCollector.throttlePopChat(chat.remoteHostId, chat.id, currentPosition = i)
         }
@@ -1858,6 +1865,24 @@ sealed class ChatInfo: SomeChat, NamedChat {
     else -> emptyList()
   }
 
+  val chatLayout: ChatLayoutMode? get() = when (this) {
+    is Direct -> contact.chatLayout
+    is Group -> groupInfo.groupProfile.chatLayout
+    else -> null
+  }
+
+  val uiThemes: ThemeModeOverrides? get() = when (this) {
+    is Direct -> contact.uiThemes
+    is Group -> groupInfo.uiThemes
+    else -> null
+  }
+
+  fun defaultChatLayout(user: User?): ChatLayoutMode =
+    chatLayout.known ?: profileChatLayout(user)
+
+  fun activeChatLayout(user: User?): ChatLayoutMode =
+    uiThemes?.chatLayout.known ?: defaultChatLayout(user)
+
   val contactCard: Boolean
     get() = when (this) {
       is Direct -> contact.isContactCard
@@ -1872,6 +1897,9 @@ sealed class ChatInfo: SomeChat, NamedChat {
 
   val isChannel: Boolean
     get() = groupInfo_?.useRelays == true
+
+  val inMainChatList: Boolean
+    get() = groupChatScope() == null || groupInfo_?.membership?.memberPending == true
 }
 
 @Serializable
@@ -1898,6 +1926,7 @@ data class Contact(
   val chatItemTTL: Long?,
   override val chatDeleted: Boolean,
   val uiThemes: ThemeModeOverrides? = null,
+  val chatLayout: ChatLayoutMode? = null,
 ): SomeChat, NamedChat {
   override val chatType get() = ChatType.Direct
   override val id get() = "@$contactId"
@@ -1907,6 +1936,7 @@ data class Contact(
   val active get() = contactStatus == ContactStatus.Active
   override val nextConnect get() = sendMsgToConnect
   val nextSendGrpInv get() = contactGroupMemberId != null && !contactGrpInvSent
+  val callReconnectSupported get() = (activeConn?.peerChatVRange?.maxVersion ?: 0) >= CALL_RECONNECT_VERSION
   override val nextConnectPrepared get() = active && preparedContact != null && (activeConn == null || activeConn.connStatus == ConnStatus.Prepared)
   override val profileChangeProhibited get() = activeConn != null
   val nextAcceptContactRequest get() =
@@ -2191,6 +2221,39 @@ object ChatPeerTypeSerializer : KSerializer<ChatPeerType> {
   override fun serialize(encoder: Encoder, value: ChatPeerType) = encoder.encodeString(value.text)
 }
 
+@Serializable(with = ChatLayoutModeSerializer::class)
+sealed class ChatLayoutMode {
+  @Serializable @SerialName("classic") object Classic: ChatLayoutMode()
+  @Serializable @SerialName("terminal") object Terminal: ChatLayoutMode()
+  @Serializable @SerialName("unknown") data class Unknown(val type: String): ChatLayoutMode()
+
+  val text: String
+    get() = when (this) {
+      is Classic -> "classic"
+      is Terminal -> "terminal"
+      is Unknown -> type
+    }
+
+  companion object {
+    fun fromText(text: String): ChatLayoutMode = when (text) {
+      "classic" -> Classic
+      "terminal" -> Terminal
+      else -> Unknown(text)
+    }
+  }
+}
+
+object ChatLayoutModeSerializer : KSerializer<ChatLayoutMode> {
+  override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("ChatLayoutMode", PrimitiveKind.STRING)
+  override fun deserialize(decoder: Decoder): ChatLayoutMode = ChatLayoutMode.fromText(decoder.decodeString())
+  override fun serialize(encoder: Encoder, value: ChatLayoutMode) = encoder.encodeString(value.text)
+}
+
+private val ChatLayoutMode?.known: ChatLayoutMode? get() = if (this is ChatLayoutMode.Unknown) null else this
+
+fun profileChatLayout(user: User?): ChatLayoutMode =
+  user?.uiThemes?.chatLayout.known ?: ChatController.appPrefs.chatLayout.state.value.known ?: ChatLayoutMode.Classic
+
 fun peerTypeIcon(peerType: ChatPeerType?): ImageResource =
   when (peerType) {
     ChatPeerType.Bot -> MR.images.ic_cube
@@ -2759,7 +2822,8 @@ data class GroupProfile (
   val publicGroup: PublicGroupProfile? = null,
   override val localAlias: String = "",
   val groupPreferences: GroupPreferences? = null,
-  val memberAdmission: GroupMemberAdmission? = null
+  val memberAdmission: GroupMemberAdmission? = null,
+  val chatLayout: ChatLayoutMode? = null
 ): NamedChat {
   val isChannel: Boolean get() = publicGroup?.groupType == GroupType.Channel
 
@@ -2798,6 +2862,7 @@ data class ContactShortLinkData (
   val profile: Profile,
   val message: MsgContent?,
   val business: Boolean,
+  val chatLayout: ChatLayoutMode? = null,
   // set by the core when building the connection plan: the link profile's badge, verified and crypto-free
   val localBadge: LocalBadge? = null
 )
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 97a8a37990..bc4b521f9d 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
@@ -74,6 +74,8 @@ val CREATE_MEMBER_CONTACT_VERSION = 2
 // support group knocking (MsgScope)
 val GROUP_KNOCKING_VERSION = 15
 
+val CALL_RECONNECT_VERSION = 22
+
 enum class CallOnLockScreen {
   DISABLE,
   SHOW,
@@ -277,6 +279,10 @@ class AppPreferences {
 
   val oneHandUI = mkBoolPreference(SHARED_PREFS_ONE_HAND_UI, true)
   val chatBottomBar = mkBoolPreference(SHARED_PREFS_CHAT_BOTTOM_BAR, true)
+  val chatLayout = SharedPreference(
+    get = fun() = ChatLayoutMode.fromText(settings.getString(SHARED_PREFS_CHAT_LAYOUT, ChatLayoutMode.Classic.text)),
+    set = fun(value: ChatLayoutMode) = settings.putString(SHARED_PREFS_CHAT_LAYOUT, value.text)
+  )
 
   val hintPreferences: List<HintPref> = listOf(
     hintPref(laNoticeShown, false),
@@ -499,6 +505,7 @@ class AppPreferences {
     private const val SHARED_PREFS_CONFIRM_DB_UPGRADES = "ConfirmDBUpgrades"
     private const val SHARED_PREFS_ONE_HAND_UI = "OneHandUI"
     private const val SHARED_PREFS_CHAT_BOTTOM_BAR = "ChatBottomBar"
+    private const val SHARED_PREFS_CHAT_LAYOUT = "ChatLayout"
     private const val SHARED_PREFS_SELF_DESTRUCT = "LocalAuthenticationSelfDestruct"
     private const val SHARED_PREFS_SELF_DESTRUCT_DISPLAY_NAME = "LocalAuthenticationSelfDestructDisplayName"
     private const val SHARED_PREFS_PQ_EXPERIMENTAL_ENABLED = "PQExperimentalEnabled" // no longer used
@@ -3705,7 +3712,8 @@ object ChatController {
       media = r.callType.media,
       aesKey = r.sharedKey,
       iceServers = iceServers,
-      relay = useRelay
+      relay = useRelay,
+      canReconnect = r.contact.callReconnectSupported
     ))
   }
 
@@ -7820,7 +7828,8 @@ data class UserContactLinkRec(
 data class AddressSettings(
   val businessAddress: Boolean,
   val autoAccept: AutoAccept?,
-  val autoReply: MsgContent?
+  val autoReply: MsgContent?,
+  val chatLayout: ChatLayoutMode? = null
 )
 
 @Serializable
@@ -8776,7 +8785,8 @@ data class AppSettings(
   var uiCurrentThemeIds: Map<String, String>? = null,
   var uiThemes: List<ThemeOverrides>? = null,
   var oneHandUI: Boolean? = null,
-  var chatBottomBar: Boolean? = null
+  var chatBottomBar: Boolean? = null,
+  var uiChatLayout: ChatLayoutMode? = null
 ) {
   fun prepareForExport(): AppSettings {
     val empty = AppSettings()
@@ -8814,6 +8824,7 @@ data class AppSettings(
     if (uiThemes != def.uiThemes) { empty.uiThemes = uiThemes }
     if (oneHandUI != def.oneHandUI) { empty.oneHandUI = oneHandUI }
     if (chatBottomBar != def.chatBottomBar) { empty.chatBottomBar = chatBottomBar }
+    if (uiChatLayout != def.uiChatLayout) { empty.uiChatLayout = uiChatLayout }
     return empty
   }
 
@@ -8862,6 +8873,7 @@ data class AppSettings(
     uiThemes?.let { def.themeOverrides.set(it.skipDuplicates()) }
     oneHandUI?.let { def.oneHandUI.set(it) }
     chatBottomBar?.let { if (appPlatform.isAndroid) def.chatBottomBar.set(it) else def.chatBottomBar.set(true) }
+    uiChatLayout?.let { def.chatLayout.set(it) }
   }
 
   companion object {
@@ -8900,6 +8912,7 @@ data class AppSettings(
         uiThemes = null,
         oneHandUI = true,
         chatBottomBar = true,
+        uiChatLayout = ChatLayoutMode.Classic,
       )
 
     val current: AppSettings
@@ -8938,7 +8951,8 @@ data class AppSettings(
           uiCurrentThemeIds = def.currentThemeIds.get(),
           uiThemes = def.themeOverrides.get(),
           oneHandUI = def.oneHandUI.get(),
-          chatBottomBar = def.chatBottomBar.get()
+          chatBottomBar = def.chatBottomBar.get(),
+          uiChatLayout = def.chatLayout.get()
         )
     }
   }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt
index b6d6a4d771..aade56f305 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt
@@ -11,6 +11,7 @@ import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.*
 import chat.simplex.common.model.ChatController
 import chat.simplex.common.model.ChatController.appPrefs
+import chat.simplex.common.model.ChatLayoutMode
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.ThemeManager.colorFromReadableHex
 import chat.simplex.common.ui.theme.ThemeManager.toReadableHex
@@ -474,14 +475,20 @@ fun List<ThemeOverrides>.skipDuplicates(): List<ThemeOverrides> {
 @Serializable
 data class ThemeModeOverrides (
   val light: ThemeModeOverride? = null,
-  val dark: ThemeModeOverride? = null
+  val dark: ThemeModeOverride? = null,
+  val chatLayout: ChatLayoutMode? = null
 ) {
   fun preferredMode(darkTheme: Boolean): ThemeModeOverride? = when (darkTheme) {
     false -> light
     else -> dark
   }
+
+  fun layoutOnly(): ThemeModeOverrides? = chatLayout?.let { ThemeModeOverrides(chatLayout = it) }
 }
 
+fun ThemeModeOverrides?.withChatLayout(chatLayout: ChatLayoutMode?): ThemeModeOverrides? =
+  (this ?: ThemeModeOverrides()).copy(chatLayout = chatLayout).takeIf { it != ThemeModeOverrides() }
+
 // Spec: spec/services/theme.md#ThemeModeOverride
 @Serializable
 data class ThemeModeOverride (
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/call/CallManager.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/call/CallManager.kt
index 89865689c6..3265e1c8a3 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/call/CallManager.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/call/CallManager.kt
@@ -62,7 +62,8 @@ class CallManager(val chatModel: ChatModel) {
         media = invitation.callType.media,
         aesKey = invitation.sharedKey,
         iceServers = iceServers,
-        relay = useRelay
+        relay = useRelay,
+        canReconnect = invitation.contact.callReconnectSupported
       ))
       callInvitations.remove(invitation.contact.id)
       if (invitation.contact.id == activeCallInvitation.value?.contact?.id) {
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/call/WebRTC.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/call/WebRTC.kt
index 86e826e946..6be070631f 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/call/WebRTC.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/call/WebRTC.kt
@@ -90,8 +90,8 @@ enum class CallState {
 sealed class WCallCommand {
   @Serializable @SerialName("capabilities") data class Capabilities(val media: CallMediaType): WCallCommand()
   @Serializable @SerialName("permission") data class Permission(val title: String, val chrome: String, val safari: String): WCallCommand()
-  @Serializable @SerialName("start") data class Start(val media: CallMediaType, val aesKey: String? = null, val iceServers: List<RTCIceServer>? = null, val relay: Boolean? = null): WCallCommand()
-  @Serializable @SerialName("offer") data class Offer(val offer: String, val iceCandidates: String, val media: CallMediaType, val aesKey: String? = null, val iceServers: List<RTCIceServer>? = null, val relay: Boolean? = null): WCallCommand()
+  @Serializable @SerialName("start") data class Start(val media: CallMediaType, val aesKey: String? = null, val iceServers: List<RTCIceServer>? = null, val relay: Boolean? = null, val canReconnect: Boolean = false): WCallCommand()
+  @Serializable @SerialName("offer") data class Offer(val offer: String, val iceCandidates: String, val media: CallMediaType, val aesKey: String? = null, val iceServers: List<RTCIceServer>? = null, val relay: Boolean? = null, val canReconnect: Boolean = false): WCallCommand()
   @Serializable @SerialName("answer") data class Answer (val answer: String, val iceCandidates: String): WCallCommand()
   @Serializable @SerialName("ice") data class Ice(val iceCandidates: String, val session: String? = null): WCallCommand()
   @Serializable @SerialName("media") data class Media(val source: CallMediaSource, val enable: Boolean): WCallCommand()
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 82575984f6..16834a2ae9 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
@@ -40,6 +40,7 @@ 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.chat.item.LocalTerminalLayout
 import chat.simplex.common.views.chat.item.MarkdownText
 import chat.simplex.common.views.chatlist.updateChatSettings
 import chat.simplex.common.views.newchat.*
@@ -1296,13 +1297,40 @@ fun ModalData.ChatWallpaperEditorModal(chat: Chat) {
     globalThemeUsed.value = preferred == null
     preferred ?: ThemeManager.defaultActiveTheme(chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get())
   }
-  ChatWallpaperEditor(
-    initialTheme,
-    applyToMode = if (themes.light == themes.dark) null else initialTheme.mode,
-    globalThemeUsed = globalThemeUsed,
-    save = { applyToMode, newTheme ->
-      save(applyToMode, newTheme, chatModel.getChat(chat.id) ?: chat)
-    })
+  CompositionLocalProvider(LocalTerminalLayout provides (chat.chatInfo.activeChatLayout(chatModel.currentUser.value) == ChatLayoutMode.Terminal)) {
+    ChatWallpaperEditor(
+      initialTheme,
+      applyToMode = if (themes.light == themes.dark) null else initialTheme.mode,
+      globalThemeUsed = globalThemeUsed,
+      layoutSection = { ChatLayoutSection(chat.remoteHostId, chat.chatInfo) },
+      save = { applyToMode, newTheme ->
+        save(applyToMode, newTheme, chatModel.getChat(chat.id) ?: chat)
+      })
+  }
+}
+
+@Composable
+private fun ChatLayoutSection(rhId: Long?, chatInfo: ChatInfo) {
+  val defaultChatLayout = chatInfo.defaultChatLayout(chatModel.currentUser.value)
+  val otherLayout = otherChatLayout(defaultChatLayout)
+  val defaultSuffix = generalGetString(if (chatInfo.chatLayout == defaultChatLayout) MR.strings.chat_layout_chat_suffix else MR.strings.chat_layout_default_suffix)
+  val values = listOf(
+    null to "${chatLayoutName(defaultChatLayout)} $defaultSuffix",
+    otherLayout to chatLayoutName(otherLayout)
+  )
+  val userChatLayout = chatInfo.uiThemes?.chatLayout
+  val selection = remember(userChatLayout, otherLayout) { mutableStateOf(if (userChatLayout == otherLayout) otherLayout else null) }
+  SectionView {
+    ExposedDropDownSettingRow(
+      generalGetString(MR.strings.chat_layout),
+      values,
+      selection,
+      onSelected = { layout ->
+        selection.value = layout
+        withBGApi { setChatLayout(rhId, chatInfo, layout) }
+      }
+    )
+  }
 }
 
 suspend fun save(applyToMode: DefaultThemeMode?, newTheme: ThemeModeOverride?, chat: Chat) {
@@ -1335,7 +1363,7 @@ suspend fun save(applyToMode: DefaultThemeMode?, newTheme: ThemeModeOverride?, c
     }
     changedThemes
   } else {
-    null
+    changedThemes?.layoutOnly()
   }
   val wallpaperFilesToDelete = wallpaperFiles - changedThemes?.light?.wallpaper?.imageFile - changedThemes?.dark?.wallpaper?.imageFile
   wallpaperFilesToDelete.forEach(::removeWallpaperFile)
@@ -1351,6 +1379,19 @@ suspend fun save(applyToMode: DefaultThemeMode?, newTheme: ThemeModeOverride?, c
   }
 }
 
+private suspend fun setChatLayout(rhId: Long?, chatInfo: ChatInfo, layout: ChatLayoutMode?) {
+  val themes = chatInfo.uiThemes.withChatLayout(layout)
+  if (controller.apiSetChatUIThemes(rhId, chatInfo.id, themes)) {
+    withContext(Dispatchers.Main) {
+      if (chatInfo is ChatInfo.Direct) {
+        chatModel.chatsContext.updateChatInfo(rhId, chatInfo.copy(contact = chatInfo.contact.copy(uiThemes = themes)))
+      } else if (chatInfo is ChatInfo.Group) {
+        chatModel.chatsContext.updateChatInfo(rhId, chatInfo.copy(groupInfo = chatInfo.groupInfo.copy(uiThemes = themes)))
+      }
+    }
+  }
+}
+
 private fun setContactAlias(chat: Chat, localAlias: String, chatModel: ChatModel) = withBGApi {
   val chatRh = chat.remoteHostId
   chatModel.controller.apiSetContactAlias(chatRh, chat.chatInfo.apiId, localAlias)?.let {
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 f9d32892ee..cad263144f 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
@@ -111,12 +111,15 @@ data class MergedItems (
 
 sealed class MergedItem {
   abstract val startIndexInReversedItems: Int
+  abstract val revealed: Boolean
 
   // the item that is always single, cannot be grouped and always revealed
   data class Single(
     val item: ListItem,
     override val startIndexInReversedItems: Int,
-  ): MergedItem()
+  ): MergedItem() {
+    override val revealed: Boolean get() = true
+  }
 
   /** 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
@@ -125,7 +128,7 @@ sealed class MergedItem {
   @Stable
   data class Grouped (
     val items: ArrayList<ListItem>,
-    val revealed: Boolean,
+    override val revealed: Boolean,
     // 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 */
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 e9dbb3b157..9b872c59c4 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
@@ -5,6 +5,7 @@ import androidx.compose.animation.core.*
 import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.foundation.*
 import androidx.compose.foundation.gestures.*
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.*
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -264,9 +265,11 @@ fun ChatView(
       }
     }
     val clipboard = LocalClipboardManager.current
+    val terminal = chatInfo.activeChatLayout(user) == ChatLayoutMode.Terminal
     CompositionLocalProvider(
       LocalAppBarHandler provides rememberAppBarHandler(chatInfo.id, keyboardCoversBar = false),
       LocalSelectionManager provides selectionManager,
+      LocalTerminalLayout provides terminal,
     ) {
     when (chatInfo) {
       is ChatInfo.Direct, is ChatInfo.Group, is ChatInfo.Local -> {
@@ -723,35 +726,39 @@ fun ChatView(
                 ciInfo
               }
               groupMembersJob.cancel()
-              groupMembersJob = scope.launch(Dispatchers.Default) {
-                var initialCiInfo = loadChatItemInfo() ?: return@launch
+              groupMembersJob = scope.launch {
+                var initialCiInfo = withContext(Dispatchers.Default) { loadChatItemInfo() } ?: return@launch
                 if (!ModalManager.end.hasModalOpen(ModalViewId.SECONDARY_CHAT)) {
                   ModalManager.end.closeModals()
+                } else if (ModalManager.end.isTopModalOpen(ModalViewId.CHAT_ITEM_INFO)) {
+                  ModalManager.end.closeModal()
                 }
-                ModalManager.end.showModalCloseable(endButtons = {
+                ModalManager.end.showModalCloseable(id = ModalViewId.CHAT_ITEM_INFO, endButtons = {
                   ShareButton {
                     clipboard.shareText(itemInfoShareText(chatModel, initialCiInfo.first, initialCiInfo.second, chatModel.controller.appPrefs.developerTools.get()))
                   }
                 }) { close ->
-                  var ciInfo by remember(cItem.id) { mutableStateOf(initialCiInfo) }
-                  val (item, info) = ciInfo
-                  ChatItemInfoView(chatRh, item, info, devTools = chatModel.controller.appPrefs.developerTools.get(), chatInfo)
-                  LaunchedEffect(cItem.id) {
-                    withContext(Dispatchers.Default) {
-                      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
+                  key(this) {
+                    var ciInfo by remember(cItem.id) { mutableStateOf(initialCiInfo) }
+                    val (item, info) = ciInfo
+                    ChatItemInfoView(chatRh, item, info, devTools = chatModel.controller.appPrefs.developerTools.get(), chatInfo)
+                    LaunchedEffect(cItem.id) {
+                      withContext(Dispatchers.Default) {
+                        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
+                          }
                         }
                       }
                     }
-                  }
-                  KeyChangeEffect(chatModel.chatId.value) {
-                    close()
+                    KeyChangeEffect(chatModel.chatId.value) {
+                      close()
+                    }
                   }
                 }
               }
@@ -1000,7 +1007,7 @@ 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, drawWallpaper = chatsCtx.secondaryContextFilter == null)) {
+      Box(Modifier.fillMaxSize().chatViewBackgroundModifier(MaterialTheme.colors, MaterialTheme.wallpaper, LocalAppBarHandler.current?.backgroundGraphicsLayerSize, LocalAppBarHandler.current?.backgroundGraphicsLayer, drawWallpaper = chatsCtx.secondaryContextFilter == null, drawWallpaperImage = !LocalTerminalLayout.current)) {
         val remoteHostId = remember { remoteHostId }.value
         val chat = remember { chat }.value
         val chatInfo = chat?.chatInfo
@@ -1926,6 +1933,7 @@ fun BoxScope.ChatItemsList(
     cItem: ChatItem,
     itemSeparation: ItemSeparation,
     previousItemSeparationLargeGap: Boolean,
+    terminalGap: TextUnit,
     revealed: State<Boolean>,
     reveal: (Boolean) -> Unit
   ) {
@@ -1950,11 +1958,10 @@ fun BoxScope.ChatItemsList(
       }
 
       @Composable
-      fun ChatItemViewShortHand(cItem: ChatItem, itemSeparation: ItemSeparation, range: State<IntRange?>, fillMaxWidth: Boolean = true, swipeOffset: Float = 0f) {
+      fun ChatItemViewShortHand(cItem: ChatItem, itemSeparation: ItemSeparation, range: State<IntRange?>, fillMaxWidth: Boolean = true, swipeOffset: Float = 0f, highlighted: State<Boolean> = remember { derivedStateOf { highlightedItems.value.contains(cItem.id) } }, bubbleInteractionSource: MutableInteractionSource = remember { MutableInteractionSource() }) {
         tryOrShowError("${cItem.id}ChatItem", error = {
-          CIBrokenComposableView(if (cItem.chatDir.sent) Alignment.CenterEnd else Alignment.CenterStart)
+          CIBrokenComposableView(if (cItem.chatDir.sent && !LocalTerminalLayout.current) Alignment.CenterEnd else Alignment.CenterStart)
         }) {
-          val highlighted = remember { derivedStateOf { highlightedItems.value.contains(cItem.id) } }
           LaunchedEffect(Unit) {
             snapshotFlow { highlighted.value }
               .distinctUntilChanged()
@@ -1964,7 +1971,7 @@ fun BoxScope.ChatItemsList(
                 highlightedItems.value = setOf()
               }
           }
-          ChatItemView(chatsCtx, remoteHostId, chat, 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, swipeOffset = swipeOffset)
+          ChatItemView(chatsCtx, remoteHostId, chat, 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, swipeOffset = swipeOffset, bubbleInteractionSource = bubbleInteractionSource)
         }
       }
 
@@ -1990,18 +1997,19 @@ fun BoxScope.ChatItemsList(
           swipeDistance = with(LocalDensity.current) { 30.dp.toPx() },
         )
         val sent = cItem.chatDir.sent
+        val itemTopGap = if (previousItemSeparationLargeGap) 4.dp else 1.dp
 
         @Composable
-        fun ChatItemBox(modifier: Modifier = Modifier, content: @Composable () -> Unit = { }) {
+        fun ChatItemBox(modifier: Modifier = Modifier, top: Dp = itemTopGap, bottom: Dp? = null, content: @Composable () -> Unit = { }) {
           Box(
             modifier = modifier.padding(
               bottom = if (itemSeparation.largeGap) {
                 if (itemAtZeroIndexInWholeList) {
                   8.dp
                 } else {
-                  4.dp
+                  bottom ?: 4.dp
                 }
-              } else 1.dp, top = if (previousItemSeparationLargeGap) 4.dp else 1.dp
+              } else bottom ?: 1.dp, top = top
             ),
             contentAlignment = Alignment.CenterStart
           ) {
@@ -2021,9 +2029,33 @@ fun BoxScope.ChatItemsList(
         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 terminal = LocalTerminalLayout.current
+          val selectionOffset by animateDpAsState(if (selectionVisible && (!sent || terminal)) 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 (terminal) {
+            val rowInteractionSource = remember { TerminalRowInteractionSource() }
+            val highlighted = remember { derivedStateOf { highlightedItems.value.contains(cItem.id) } }
+            val rowColor = animateColorAsState(
+              when {
+                selectedChatItems.value?.contains(cItem.id) == true -> MaterialTheme.colors.primary.copy(alpha = 0.1f)
+                highlighted.value -> MaterialTheme.colors.primary.copy(alpha = 0.14f)
+                else -> Color.Transparent
+              }
+            )
+            ChatItemBox(Modifier.drawBehind { drawRect(rowColor.value) }.terminalRowIndication(rowInteractionSource), top = 0.dp, bottom = if (itemSeparation.date != null) TERMINAL_LEVEL_STEP.toDp() else 0.dp) {
+              AnimatedVisibility(selectionVisible, enter = fadeIn(), exit = fadeOut()) {
+                SelectedListItem(Modifier.padding(start = 8.dp), cItem.id, selectedChatItems)
+              }
+              TerminalChatItemRow(
+                if (showAvatar) chatItemSender(chatInfo, cItem, range, reversedChatItems, showMemberInfo, showChatInfo) else null,
+                terminalGutter(chatInfo),
+                terminalGap.toDp(),
+                Modifier.terminalStartOffset { selectionOffset }.then(if (selectionVisible) Modifier else swipeableModifier)
+              ) {
+                ChatItemViewShortHand(cItem, itemSeparation, range, swipeOffset = dismissState.offset.value, highlighted = highlighted, bubbleInteractionSource = rowInteractionSource)
+              }
+            }
+          } else if (chatInfo is ChatInfo.Group) {
             if (cItem.chatDir is CIDirection.GroupRcv) {
               if (showAvatar) {
                 Column(
@@ -2424,21 +2456,26 @@ fun BoxScope.ChatItemsList(
         } else {
           null
         }
-        val showAvatar = shouldShowAvatar(item, merged.oldest().nextItem)
+        val older = merged.oldest().nextItem
+        val showAvatar = if (LocalTerminalLayout.current) terminalItemShowsSender(item, older) else shouldShowAvatar(item, older)
+        val terminalGap = if (!LocalTerminalLayout.current) 0.sp else terminalRowGap(
+          item, older,
+          separated = terminalRowsSeparated(mergedItemsValue.items.getOrNull(index + 1)),
+          largeGap = older != null && getItemSeparationLargeGap(older, merged.oldest().item),
+          hasSenderRow = showAvatar
+        )
         val isRevealed = remember { derivedStateOf { revealedItems.value.contains(item.id) } }
-        val itemSeparation: ItemSeparation
+        val itemSeparation = rowItemSeparation(merged)
         val prevItemSeparationLargeGap: Boolean
         if (merged is MergedItem.Single || isRevealed.value) {
           val prev = listItem.prevItem
-          itemSeparation = getItemSeparation(item, prev)
           val nextForGap = if ((item.mergeCategory != null && item.mergeCategory == prev?.mergeCategory) || isLastItem) null else listItem.nextItem
           prevItemSeparationLargeGap = if (nextForGap == null) false else getItemSeparationLargeGap(nextForGap, item)
         } else {
-          itemSeparation = getItemSeparation(item, null)
           prevItemSeparationLargeGap = false
         }
         CompositionLocalProvider(LocalItemContext provides ItemContext(selectionIndex = index)) {
-          ChatViewListItem(index == 0, rememberUpdatedState(range), showAvatar, item, itemSeparation, prevItemSeparationLargeGap, isRevealed) {
+          ChatViewListItem(index == 0, rememberUpdatedState(range), showAvatar, item, itemSeparation, prevItemSeparationLargeGap, terminalGap, isRevealed) {
             if (merged is MergedItem.Grouped) merged.reveal(it, revealedItems)
           }
         }
@@ -3501,7 +3538,7 @@ private fun markUnreadChatAsRead(chatId: String) {
 }
 
 @Composable
-private fun memberNames(member: GroupMember, prevMember: GroupMember?, memCount: Int): String {
+fun memberNames(member: GroupMember, prevMember: GroupMember?, memCount: Int): String {
   val name = member.displayName
   val prevName = prevMember?.displayName
   return if (prevName != null) {
@@ -3520,9 +3557,10 @@ fun Modifier.chatViewBackgroundModifier(
   wallpaper: AppWallpaper,
   backgroundGraphicsLayerSize: MutableState<IntSize>?,
   backgroundGraphicsLayer: GraphicsLayer?,
-  drawWallpaper: Boolean
+  drawWallpaper: Boolean,
+  drawWallpaperImage: Boolean
 ): Modifier {
-  val wallpaperImage = wallpaper.type.image
+  val wallpaperImage = if (drawWallpaperImage) wallpaper.type.image else null
   val wallpaperType = wallpaper.type
   val backgroundColor = if (drawWallpaper) wallpaper.background ?: wallpaperType.defaultBackgroundColor(CurrentColors.value.base, colors.background) else colors.background
   val tintColor = wallpaper.tint ?: wallpaperType.defaultTintColor(CurrentColors.value.base)
@@ -3771,6 +3809,16 @@ private fun getItemSeparation(chatItem: ChatItem, prevItem: ChatItem?): ItemSepa
   )
 }
 
+private fun rowItemSeparation(row: MergedItem): ItemSeparation {
+  val newest = row.newest()
+  return getItemSeparation(newest.item, if (row.revealed) newest.prevItem else null)
+}
+
+fun terminalRowsSeparated(olderRow: MergedItem?): Boolean {
+  if (olderRow == null) return false
+  return olderRow.newest().item.content is CIContent.ChatBanner || rowItemSeparation(olderRow).date != null
+}
+
 private fun getItemSeparationLargeGap(chatItem: ChatItem, nextItem: ChatItem?): Boolean {
   if (nextItem == null) {
     return true
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 357a010d2c..736bb919e5 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
@@ -333,7 +333,7 @@ fun showLargeFileAlert(fileSize: Long, incognito: Boolean, senderProfile: LocalP
       text = text,
       confirmText = generalGetString(MR.strings.ok),
       dismissText = generalGetString(MR.strings.badges_support_simplex_title),
-      onDismiss = ::openBadgesView
+      onDismiss = { if (!appPlatform.isDesktop || !ModalManager.end.hasModalOpen(ModalViewId.BADGES)) openBadgesView() }
     )
   } else {
     AlertManager.shared.showAlertMsg(title, text)
@@ -599,7 +599,7 @@ fun ComposeView(
     if (!chatItems.isNullOrEmpty()) {
       chatItems.forEach { aChatItem ->
         withContext(Dispatchers.Main) {
-          chatsCtx.addChatItem(chat.remoteHostId, aChatItem.chatInfo, aChatItem.chatItem)
+          chatModel.addSentChatItem(chatsCtx, chat.remoteHostId, aChatItem.chatInfo, aChatItem.chatItem)
         }
       }
       return chatItems.first().chatItem
@@ -741,7 +741,7 @@ fun ComposeView(
 
       withContext(Dispatchers.Main) {
         chatItems?.forEach { chatItem ->
-          chatsCtx.addChatItem(rhId, chat.chatInfo, chatItem)
+          chatModel.addSentChatItem(chatsCtx, rhId, chat.chatInfo, chatItem)
         }
       }
 
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CICallItemView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CICallItemView.kt
index d3cc76fb7a..9eb00e6cad 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CICallItemView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CICallItemView.kt
@@ -25,30 +25,32 @@ fun CICallItemView(
   timedMessagesTTL: Int?
 ) {
   val sent = cItem.chatDir.sent
-  Column(
-    Modifier
-      .padding(horizontal = 4.dp)
-      .padding(bottom = 8.dp), horizontalAlignment = Alignment.CenterHorizontally) {
-    @Composable fun ConnectingCallIcon() = Icon(painterResource(MR.images.ic_settings_phone), stringResource(MR.strings.icon_descr_call_connecting), tint = SimplexGreen)
-    when (status) {
-      CICallStatus.Pending -> if (sent) {
-        Icon(painterResource(MR.images.ic_call), stringResource(MR.strings.icon_descr_call_pending_sent))
-      } else {
-        AcceptCallButton(cInfo, acceptCall)
+  ItemWithMeta(meta = { CIMetaView(cItem, timedMessagesTTL, showStatus = false, showEdited = false, showViaProxy = false, showTimestamp = showTimestamp) }) { inlineMeta ->
+    Column(
+      Modifier
+        .padding(horizontal = if (LocalTerminalLayout.current) CHAT_ITEM_TEXT_PADDING else 4.dp)
+        .padding(bottom = 8.dp), horizontalAlignment = Alignment.CenterHorizontally) {
+      @Composable fun ConnectingCallIcon() = Icon(painterResource(MR.images.ic_settings_phone), stringResource(MR.strings.icon_descr_call_connecting), tint = SimplexGreen)
+      when (status) {
+        CICallStatus.Pending -> if (sent) {
+          Icon(painterResource(MR.images.ic_call), stringResource(MR.strings.icon_descr_call_pending_sent))
+        } else {
+          AcceptCallButton(cInfo, acceptCall)
+        }
+        CICallStatus.Missed -> Icon(painterResource(MR.images.ic_call), stringResource(MR.strings.icon_descr_call_missed), tint = Color.Red)
+        CICallStatus.Rejected -> Icon(painterResource(MR.images.ic_call_end), stringResource(MR.strings.icon_descr_call_rejected), tint = Color.Red)
+        CICallStatus.Accepted -> ConnectingCallIcon()
+        CICallStatus.Negotiated -> ConnectingCallIcon()
+        CICallStatus.Progress -> Icon(painterResource(MR.images.ic_phone_in_talk_filled), stringResource(MR.strings.icon_descr_call_progress), tint = SimplexGreen)
+        CICallStatus.Ended -> Row {
+          Icon(painterResource(MR.images.ic_call_end), stringResource(MR.strings.icon_descr_call_ended), tint = MaterialTheme.colors.secondary, modifier = Modifier.padding(end = 4.dp))
+          Text(durationText(duration), color = MaterialTheme.colors.secondary)
+        }
+        CICallStatus.Error -> {}
       }
-      CICallStatus.Missed -> Icon(painterResource(MR.images.ic_call), stringResource(MR.strings.icon_descr_call_missed), tint = Color.Red)
-      CICallStatus.Rejected -> Icon(painterResource(MR.images.ic_call_end), stringResource(MR.strings.icon_descr_call_rejected), tint = Color.Red)
-      CICallStatus.Accepted -> ConnectingCallIcon()
-      CICallStatus.Negotiated -> ConnectingCallIcon()
-      CICallStatus.Progress -> Icon(painterResource(MR.images.ic_phone_in_talk_filled), stringResource(MR.strings.icon_descr_call_progress), tint = SimplexGreen)
-      CICallStatus.Ended -> Row {
-        Icon(painterResource(MR.images.ic_call_end), stringResource(MR.strings.icon_descr_call_ended), tint = MaterialTheme.colors.secondary, modifier = Modifier.padding(end = 4.dp))
-        Text(durationText(duration), color = MaterialTheme.colors.secondary)
-      }
-      CICallStatus.Error -> {}
-    }
 
-    CIMetaView(cItem, timedMessagesTTL, showStatus = false, showEdited = false, showViaProxy = false, showTimestamp = showTimestamp)
+      inlineMeta?.invoke()
+    }
   }
 }
 
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 c743d78d1c..1b5c6e3eaf 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
@@ -8,11 +8,13 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.unit.dp
 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.helpers.toDp
 
 @Composable
 fun CIChatFeatureView(
@@ -35,9 +37,11 @@ fun CIChatFeatureView(
       .onRightClick { showMenu.value = true }
   ) {
     if (!revealed.value && merged != null) {
+      val terminal = LocalTerminalLayout.current
       Row(
-        Modifier.padding(horizontal = 6.dp, vertical = 8.dp),
-        horizontalArrangement = Arrangement.spacedBy(4.dp)
+        Modifier.padding(chatEventPadding(vertical = 8.dp)).then(if (terminal) Modifier.height(chatEventTextStyle().lineHeight.toDp()) else Modifier),
+        horizontalArrangement = Arrangement.spacedBy(4.dp),
+        verticalAlignment = if (terminal) Alignment.CenterVertically else Alignment.Top
       ) {
         merged.forEach {
           FeatureIconView(it)
@@ -102,11 +106,11 @@ private fun featureInfo(ci: ChatItem, chatInfo: ChatInfo): FeatureInfo? =
 
 @Composable
 private fun FeatureIconView(f: FeatureInfo) {
-  val icon = @Composable { Icon(f.icon.icon, null, Modifier.size(20.dp), tint = f.color) }
+  val icon = @Composable { Icon(f.icon.icon, null, Modifier.inlineIcon().size(20.dp), tint = f.color) }
   if (f.param != null) {
     Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(4.dp)) {
       icon()
-      Text(chatEventText(f.param, ""), maxLines = 1)
+      Text(chatEventText(f.param, AnnotatedString("  ")), maxLines = 1, style = chatEventTextStyle())
     }
   } else {
     icon()
@@ -120,17 +124,20 @@ private fun FullFeatureView(
   iconColor: Color,
   icon: Painter? = null
 ) {
-  Row(
-    Modifier.padding(horizontal = 6.dp, vertical = 6.dp),
-    verticalAlignment = Alignment.CenterVertically,
-    horizontalArrangement = Arrangement.spacedBy(4.dp)
-  ) {
-    Icon(icon ?: feature.iconFilled(), feature.text, Modifier.size(20.dp), tint = iconColor)
-    Text(
-      chatEventText(chatItem),
-      Modifier,
-      // this is important. Otherwise, aligning will be bad because annotated string has a Span with size 12.sp
-      fontSize = 12.sp
-    )
+  ChatEventWithMeta(chatItem) { separator, ts ->
+    Row(
+      Modifier.padding(chatEventPadding()),
+      verticalAlignment = Alignment.CenterVertically,
+      horizontalArrangement = Arrangement.spacedBy(4.dp)
+    ) {
+      Icon(icon ?: feature.iconFilled(), feature.text, Modifier.inlineIcon().size(20.dp), tint = iconColor)
+      Text(
+        chatEventText(chatItem, ts = separator + ts),
+        Modifier,
+        // this is important. Otherwise, aligning will be bad because annotated string has a Span with size 12.sp
+        fontSize = 12.sp,
+        style = chatEventTextStyle()
+      )
+    }
   }
 }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIEventView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIEventView.kt
index 529a0e458b..afba9f87f8 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIEventView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIEventView.kt
@@ -1,18 +1,50 @@
 package chat.simplex.common.views.chat.item
 
 import androidx.compose.desktop.ui.tooling.preview.Preview
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.*
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import chat.simplex.common.model.ChatItem
 import chat.simplex.common.ui.theme.*
+import chat.simplex.common.views.helpers.toDp
 
 @Composable
 fun CIEventView(text: AnnotatedString) {
-  Text(text, Modifier.padding(horizontal = 6.dp, vertical = 6.dp), style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp), maxLines = 4)
+  Text(text, Modifier.padding(chatEventPadding()), style = chatEventTextStyle(MaterialTheme.typography.body1.copy(lineHeight = 22.sp)), maxLines = if (LocalTerminalLayout.current) Int.MAX_VALUE else 4)
+}
+
+@Composable
+fun chatEventTextStyle(base: TextStyle = LocalTextStyle.current): TextStyle =
+  if (LocalTerminalLayout.current) {
+    base.merge(terminalTextStyle(12.sp, MaterialTheme.colors.secondary))
+  } else {
+    base
+  }
+
+@Composable
+fun chatEventPadding(vertical: Dp = 6.dp): PaddingValues =
+  if (LocalTerminalLayout.current) PaddingValues(start = CHAT_ITEM_TEXT_PADDING, top = TERMINAL_EVENT_TOP_GAP.toDp(), end = CHAT_ITEM_TEXT_PADDING, bottom = TERMINAL_EVENT_BOTTOM_GAP.toDp())
+  else PaddingValues(horizontal = 6.dp, vertical = vertical)
+
+@Composable
+fun ChatEventWithMeta(ci: ChatItem, content: @Composable (separator: AnnotatedString, ts: AnnotatedString) -> Unit) {
+  ItemWithMeta(meta = { CIMetaView(ci, timedMessagesTTL = null, showStatus = false, showEdited = false, showViaProxy = false, showTimestamp = true) }, metaReserved = true) { inlineMeta ->
+    if (inlineMeta != null) {
+      content(AnnotatedString("  "), AnnotatedString(ci.timestampText))
+    } else {
+      val copy = terminalReserveSpaceForMeta(ci.meta, chatTTL = null, encrypted = null, signedFileVerified = null, secondaryColor = MaterialTheme.colors.secondary, showStatus = false, showEdited = false, showViaProxy = false, showTimestamp = true)
+      content(
+        buildAnnotatedString { withStyle(chatEventStyle) { withStyle(reserveTimestampStyle) { append("\u00A0\u00A0\u00A0") } } },
+        buildAnnotatedString { withStyle(reserveTimestampStyle) { append(copy) } }
+      )
+    }
+  }
 }
 @Preview/*(
   uiMode = Configuration.UI_MODE_NIGHT_YES,
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIFeaturePreferenceView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIFeaturePreferenceView.kt
index 27e605df4f..0ae7860314 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIFeaturePreferenceView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIFeaturePreferenceView.kt
@@ -21,33 +21,36 @@ fun CIFeaturePreferenceView(
   allowed: FeatureAllowed,
   acceptFeature: (Contact, ChatFeature, Int?) -> Unit
 ) {
-  Row(
-    Modifier.padding(horizontal = 6.dp, vertical = 6.dp),
-    verticalAlignment = Alignment.CenterVertically,
-    horizontalArrangement = Arrangement.spacedBy(4.dp)
-  ) {
-    Icon(feature.icon, feature.text, Modifier.size(18.dp), tint = MaterialTheme.colors.secondary)
-    if (contact != null && allowed != FeatureAllowed.NO && contact.allowsFeature(feature) && !contact.userAllowsFeature(feature)) {
-      val acceptStyle = SpanStyle(color = MaterialTheme.colors.primary, fontSize = 12.sp)
-      val setParam = feature == ChatFeature.TimedMessages && contact.mergedPreferences.timedMessages.userPreference.pref.ttl == null
-      val acceptTextId = if (setParam) MR.strings.accept_feature_set_1_day else MR.strings.accept_feature
-      val param = if (setParam) 86400 else null
-      val annotatedText = buildAnnotatedString {
-        withStyle(chatEventStyle) { append(chatItem.content.text + "  ") }
-        withAnnotation(tag = "Accept", annotation = "Accept") {
-          withStyle(acceptStyle) { append(generalGetString(acceptTextId) + "  ") }
+  ChatEventWithMeta(chatItem) { separator, ts ->
+    Row(
+      Modifier.padding(chatEventPadding()),
+      verticalAlignment = Alignment.CenterVertically,
+      horizontalArrangement = Arrangement.spacedBy(4.dp)
+    ) {
+      Icon(feature.icon, feature.text, Modifier.inlineIcon().size(18.dp), tint = MaterialTheme.colors.secondary)
+      if (contact != null && allowed != FeatureAllowed.NO && contact.allowsFeature(feature) && !contact.userAllowsFeature(feature)) {
+        val acceptStyle = SpanStyle(color = MaterialTheme.colors.primary, fontSize = 12.sp)
+        val setParam = feature == ChatFeature.TimedMessages && contact.mergedPreferences.timedMessages.userPreference.pref.ttl == null
+        val acceptTextId = if (setParam) MR.strings.accept_feature_set_1_day else MR.strings.accept_feature
+        val param = if (setParam) 86400 else null
+        val annotatedText = buildAnnotatedString {
+          withStyle(chatEventStyle) { append(chatItem.content.text + "  ") }
+          withAnnotation(tag = "Accept", annotation = "Accept") {
+            withStyle(acceptStyle) { append(generalGetString(acceptTextId)); append(separator) }
+          }
+          withStyle(chatEventStyle) { append(ts) }
         }
-        withStyle(chatEventStyle) { append(chatItem.timestampText) }
+        fun accept(offset: Int): Boolean = annotatedText.getStringAnnotations(tag = "Accept", start = offset, end = offset).isNotEmpty()
+        ClickableText(
+          annotatedText,
+          style = chatEventTextStyle(TextStyle.Default),
+          onClick = { if (accept(it)) { acceptFeature(contact, feature, param) } },
+          shouldConsumeEvent = ::accept
+        )
+      } else {
+        Text(AnnotatedString(chatItem.content.text) + separator + ts,
+          fontSize = 12.sp, fontWeight = FontWeight.Light, color = MaterialTheme.colors.secondary, style = chatEventTextStyle())
       }
-      fun accept(offset: Int): Boolean = annotatedText.getStringAnnotations(tag = "Accept", start = offset, end = offset).isNotEmpty()
-      ClickableText(
-        annotatedText,
-        onClick = { if (accept(it)) { acceptFeature(contact, feature, param) } },
-        shouldConsumeEvent = ::accept
-      )
-    } else {
-      Text(chatItem.content.text + "  " + chatItem.timestampText,
-        fontSize = 12.sp, fontWeight = FontWeight.Light, color = MaterialTheme.colors.secondary)
     }
   }
 }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIFileView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIFileView.kt
index 42cbff3a2f..f857d6a190 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIFileView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIFileView.kt
@@ -43,6 +43,7 @@ fun CIFileView(
   val saveFileLauncher = rememberSaveFileLauncher(ciFile = file)
   val sizeMultiplier = 1f
   val progressSizeMultiplier = if (smallView) 0.7f else 1f
+  val terminal = LocalTerminalLayout.current
   @Composable
   fun fileIcon(
     innerIcon: Painter? = null,
@@ -133,7 +134,7 @@ fun CIFileView(
   fun fileIndicator() {
     Box(
       Modifier
-        .padding(top = 2.sp.toDp())
+        .padding(top = if (terminal) 0.dp else 2.sp.toDp())
         .size(40.sp.toDp() * sizeMultiplier)
         .clip(RoundedCornerShape(4.sp.toDp() * sizeMultiplier)),
       contentAlignment = Alignment.Center
@@ -205,7 +206,13 @@ fun CIFileView(
         onClick = onClick,
         onLongClick = { showMenu.value = true }
       )
-      .padding(if (smallView) PaddingValues() else PaddingValues(top = 4.sp.toDp(), bottom = 6.sp.toDp(), start = 6.sp.toDp(), end = 12.sp.toDp())),
+      .padding(
+        when {
+          smallView -> PaddingValues()
+          terminal -> PaddingValues(top = TERMINAL_FILE_TOP_GAP.toDp(), start = 6.sp.toDp(), end = 12.sp.toDp())
+          else -> PaddingValues(top = 4.sp.toDp(), bottom = 6.sp.toDp(), start = 6.sp.toDp(), end = 12.sp.toDp())
+        }
+      ),
     verticalAlignment = Alignment.Bottom,
     horizontalArrangement = Arrangement.spacedBy(2.sp.toDp())
   ) {
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIGroupInvitationView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIGroupInvitationView.kt
index 14ecd723b9..38eaa6f170 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIGroupInvitationView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIGroupInvitationView.kt
@@ -85,71 +85,77 @@ fun CIGroupInvitationView(
 
   val sentColor = MaterialTheme.appColors.sentMessage
   val receivedColor = MaterialTheme.appColors.receivedMessage
-  Surface(
-    modifier = if (action && !inProgress.value) Modifier.clickable(onClick = {
-      inProgress.value = true
-      joinGroup(groupInvitation.groupId) { inProgress.value = false }
-    }) else Modifier,
-    shape = RoundedCornerShape(18.dp),
-    color = if (sent) sentColor else receivedColor,
-    contentColor = LocalContentColor.current
-  ) {
-    Box(
-      Modifier
-        .width(IntrinsicSize.Min)
-        .padding(start = 8.dp, end = 12.dp, top = 8.dp, bottom = 4.dp),
-      contentAlignment = Alignment.BottomEnd
+  ItemWithMeta(meta = { CIMetaView(ci, timedMessagesTTL, showStatus = false, showEdited = false, showViaProxy = false, showTimestamp = showTimestamp) }) { inlineMeta ->
+    Surface(
+      modifier = if (action && !inProgress.value) Modifier.clickable(onClick = {
+        inProgress.value = true
+        joinGroup(groupInvitation.groupId) { inProgress.value = false }
+      }) else Modifier,
+      shape = RoundedCornerShape(18.dp),
+      color = if (sent) sentColor else receivedColor,
+      contentColor = LocalContentColor.current
     ) {
       Box(
-        contentAlignment = Alignment.Center
+        Modifier
+          .width(IntrinsicSize.Min)
+          .padding(start = 8.dp, end = 12.dp, top = 8.dp, bottom = 4.dp),
+        contentAlignment = Alignment.BottomEnd
       ) {
-        Column(
-          Modifier
-            .defaultMinSize(minWidth = 220.dp)
-            .padding(bottom = 4.dp),
+        Box(
+          contentAlignment = Alignment.Center
         ) {
-          groupInfoView()
-          val secondaryColor = MaterialTheme.colors.secondary
-          Divider(Modifier.fillMaxWidth().padding(top = 8.dp))
-          Column(Modifier.padding(top = 8.dp, bottom = 4.dp, start = 4.dp), verticalArrangement = Arrangement.spacedBy(2.dp)) {
-            if (groupChat) {
-              Text(if (sent) String.format(stringResource(MR.strings.group_invitation_for_member_only), groupInvitation.localDisplayName) else stringResource(MR.strings.group_invitation_for_you_only), fontSize = 12.sp, color = secondaryColor)
-            }
-            if (action) {
-              Text(groupInvitationStr(), fontSize = 13.sp, lineHeight = 18.sp)
-              Text(
-                buildAnnotatedString {
-                  append(generalGetString(if (chatIncognito) MR.strings.group_invitation_tap_to_join_incognito else MR.strings.group_invitation_tap_to_join))
-                  withStyle(reserveTimestampStyle) { append(reserveSpaceForMeta(ci.meta, timedMessagesTTL, encrypted = null, showStatus = false, showEdited = false, secondaryColor = secondaryColor, showTimestamp = showTimestamp)) }
-                },
-                color = if (inProgress.value)
-                  MaterialTheme.colors.secondary
-                else
-                  if (chatIncognito) Indigo else MaterialTheme.colors.primary
-              )
-            } else {
-              Text(
-                buildAnnotatedString {
-                  append(groupInvitationStr())
-                  withStyle(reserveTimestampStyle) { append(reserveSpaceForMeta(ci.meta, timedMessagesTTL, encrypted = null, showStatus = false, showEdited = false, secondaryColor = secondaryColor, showTimestamp = showTimestamp)) }
-                },
-                fontSize = 13.sp,
-                lineHeight = 18.sp,
-              )
+          Column(
+            Modifier
+              .defaultMinSize(minWidth = 220.dp)
+              .padding(bottom = 4.dp),
+          ) {
+            groupInfoView()
+            val secondaryColor = MaterialTheme.colors.secondary
+            Divider(Modifier.fillMaxWidth().padding(top = 8.dp))
+            Column(Modifier.padding(top = 8.dp, bottom = 4.dp, start = 4.dp), verticalArrangement = Arrangement.spacedBy(2.dp)) {
+              if (groupChat) {
+                Text(if (sent) String.format(stringResource(MR.strings.group_invitation_for_member_only), groupInvitation.localDisplayName) else stringResource(MR.strings.group_invitation_for_you_only), fontSize = 12.sp, color = secondaryColor)
+              }
+              if (action) {
+                Text(groupInvitationStr(), fontSize = 13.sp, lineHeight = 18.sp)
+                Text(
+                  buildAnnotatedString {
+                    append(generalGetString(if (chatIncognito) MR.strings.group_invitation_tap_to_join_incognito else MR.strings.group_invitation_tap_to_join))
+                    if (inlineMeta != null) {
+                      withStyle(reserveTimestampStyle) { append(reserveSpaceForMeta(ci.meta, timedMessagesTTL, encrypted = null, showStatus = false, showEdited = false, secondaryColor = secondaryColor, showTimestamp = showTimestamp)) }
+                    }
+                  },
+                  color = if (inProgress.value)
+                    MaterialTheme.colors.secondary
+                  else
+                    if (chatIncognito) Indigo else MaterialTheme.colors.primary
+                )
+              } else {
+                Text(
+                  buildAnnotatedString {
+                    append(groupInvitationStr())
+                    if (inlineMeta != null) {
+                      withStyle(reserveTimestampStyle) { append(reserveSpaceForMeta(ci.meta, timedMessagesTTL, encrypted = null, showStatus = false, showEdited = false, secondaryColor = secondaryColor, showTimestamp = showTimestamp)) }
+                    }
+                  },
+                  fontSize = 13.sp,
+                  lineHeight = 18.sp,
+                )
+              }
             }
           }
+
+          if (progressByTimeout) {
+            CircularProgressIndicator(
+              Modifier.size(32.dp),
+              color = if (isInDarkTheme()) FileDark else FileLight,
+              strokeWidth = 3.dp
+            )
+          }
         }
 
-        if (progressByTimeout) {
-          CircularProgressIndicator(
-            Modifier.size(32.dp),
-            color = if (isInDarkTheme()) FileDark else FileLight,
-            strokeWidth = 3.dp
-          )
-        }
+        inlineMeta?.invoke()
       }
-
-      CIMetaView(ci, timedMessagesTTL, showStatus = false, showEdited = false, showViaProxy = false, showTimestamp = showTimestamp)
     }
   }
 }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIMemberCreatedContactView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIMemberCreatedContactView.kt
index bbd7788f29..3eba43c685 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIMemberCreatedContactView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIMemberCreatedContactView.kt
@@ -32,39 +32,42 @@ fun CIMemberCreatedContactView(
     }
   }
 
-  Row(
-    Modifier.padding(horizontal = 6.dp, vertical = 6.dp),
-    verticalAlignment = Alignment.CenterVertically,
-    horizontalArrangement = Arrangement.spacedBy(4.dp)
-  ) {
-    if (chatItem.chatDir is CIDirection.GroupRcv && chatItem.chatDir.groupMember.memberContactId != null) {
-      val openChatStyle = SpanStyle(color = MaterialTheme.colors.primary, fontSize = 12.sp)
-      val annotatedText = buildAnnotatedString {
-        append(eventText())
-        append("  ")
-        withAnnotation(tag = "Open", annotation = "Open") {
-          withStyle(openChatStyle) { append(generalGetString(MR.strings.rcv_group_event_open_chat) + "  ") }
-        }
-        withStyle(chatEventStyle) { append(chatItem.timestampText) }
-      }
-
-      fun open(offset: Int): Boolean = annotatedText.getStringAnnotations(tag = "Open", start = offset, end = offset).isNotEmpty()
-      ClickableText(
-        annotatedText,
-        onClick = {
-          if (open(it)) {
-            openDirectChat(chatItem.chatDir.groupMember.memberContactId)
+  ChatEventWithMeta(chatItem) { separator, ts ->
+    Row(
+      Modifier.padding(chatEventPadding()),
+      verticalAlignment = Alignment.CenterVertically,
+      horizontalArrangement = Arrangement.spacedBy(4.dp)
+    ) {
+      if (chatItem.chatDir is CIDirection.GroupRcv && chatItem.chatDir.groupMember.memberContactId != null) {
+        val openChatStyle = SpanStyle(color = MaterialTheme.colors.primary, fontSize = 12.sp)
+        val annotatedText = buildAnnotatedString {
+          append(eventText())
+          append("  ")
+          withAnnotation(tag = "Open", annotation = "Open") {
+            withStyle(openChatStyle) { append(generalGetString(MR.strings.rcv_group_event_open_chat)); append(separator) }
           }
-        },
-        shouldConsumeEvent = ::open
-      )
-    } else {
-      val annotatedText = buildAnnotatedString {
-        append(eventText())
-        append("  ")
-        withStyle(chatEventStyle) { append(chatItem.timestampText) }
+          withStyle(chatEventStyle) { append(ts) }
+        }
+
+        fun open(offset: Int): Boolean = annotatedText.getStringAnnotations(tag = "Open", start = offset, end = offset).isNotEmpty()
+        ClickableText(
+          annotatedText,
+          style = chatEventTextStyle(TextStyle.Default),
+          onClick = {
+            if (open(it)) {
+              openDirectChat(chatItem.chatDir.groupMember.memberContactId)
+            }
+          },
+          shouldConsumeEvent = ::open
+        )
+      } else {
+        val annotatedText = buildAnnotatedString {
+          append(eventText())
+          append(separator)
+          withStyle(chatEventStyle) { append(ts) }
+        }
+        Text(annotatedText, style = chatEventTextStyle())
       }
-      Text(annotatedText)
     }
   }
 }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIMetaView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIMetaView.kt
index e318f406de..ba22ae5966 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIMetaView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIMetaView.kt
@@ -8,8 +8,19 @@ 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.platform.LocalDensity
+import androidx.compose.ui.platform.LocalLayoutDirection
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.text.withStyle
 import androidx.compose.desktop.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.LayoutDirection
+import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
@@ -38,14 +49,17 @@ fun CIMetaView(
   showEdited: Boolean = true,
   showTimestamp: Boolean,
   showViaProxy: Boolean,
+  lineHeightColor: Color = metaColor,
 ) {
+  val timeStyle = LocalTextStyle.current.merge(terminalTextStyle(12.sp, lineHeightColor))
   Row(Modifier.padding(start = 3.dp), verticalAlignment = Alignment.CenterVertically) {
     if (chatItem.isDeletedContent) {
       Text(
         chatItem.timestampText,
         color = metaColor,
         fontSize = 12.sp,
-        modifier = Modifier.padding(start = 3.dp)
+        modifier = Modifier.padding(start = 3.dp),
+        style = timeStyle
       )
     } else {
       CIMetaText(
@@ -54,6 +68,7 @@ fun CIMetaView(
         encrypted = chatItem.encryptedFile,
         metaColor,
         paleMetaColor,
+        timeStyle,
         showStatus = showStatus,
         showEdited = showEdited,
         showViaProxy = showViaProxy,
@@ -72,6 +87,7 @@ private fun CIMetaText(
   encrypted: Boolean?,
   color: Color,
   paleColor: Color,
+  timeStyle: TextStyle,
   showStatus: Boolean = true,
   showEdited: Boolean = true,
   showTimestamp: Boolean,
@@ -87,7 +103,7 @@ private fun CIMetaText(
     StatusIconText(painterResource(MR.images.ic_timer), color)
     val ttl = meta.itemTimed?.ttl
     if (ttl != chatTTL) {
-      Text(shortTimeText(ttl), color = color, fontSize = 12.sp)
+      Text(shortTimeText(ttl), color = color, fontSize = 12.sp, style = timeStyle)
     }
   }
   if (showViaProxy && meta.sentViaProxy == true) {
@@ -99,7 +115,7 @@ private fun CIMetaText(
     val statusIcon = meta.statusIcon(MaterialTheme.colors.primary, color, paleColor)
     if (statusIcon != null) {
       val (icon, statusColor) = statusIcon
-      if (meta.itemStatus is CIStatus.SndSent || meta.itemStatus is CIStatus.SndRcvd) {
+      if (meta.tallStatusIcon) {
         Icon(painterResource(icon), null, Modifier.height(17.dp), tint = statusColor)
       } else {
         StatusIconText(painterResource(icon), statusColor)
@@ -122,11 +138,10 @@ private fun CIMetaText(
 
   if (showTimestamp) {
     Spacer(Modifier.width(4.dp))
-    Text(meta.timestampText, color = color, fontSize = 12.sp, maxLines = 1, overflow = TextOverflow.Ellipsis)
+    Text(meta.timestampText, color = color, fontSize = 12.sp, maxLines = 1, overflow = TextOverflow.Ellipsis, style = timeStyle)
   }
 }
 
-// the conditions in this function should match CIMetaText
 fun reserveSpaceForMeta(
   meta: CIMeta,
   chatTTL: Int?,
@@ -137,63 +152,126 @@ fun reserveSpaceForMeta(
   showViaProxy: Boolean = false,
   showTimestamp: Boolean,
   signedFileVerified: Boolean? = null
-): String {
+): String = buildString {
+  reserveSpaceForMeta(meta, chatTTL, encrypted, secondaryColor, showStatus, showEdited, showViaProxy, showTimestamp, signedFileVerified, tallIconSpace = "", spaces = { append(it) }, text = { append(it) })
+}
+
+// the conditions in this function should match CIMetaText
+private fun reserveSpaceForMeta(
+  meta: CIMeta,
+  chatTTL: Int?,
+  encrypted: Boolean?,
+  secondaryColor: Color,
+  showStatus: Boolean,
+  showEdited: Boolean,
+  showViaProxy: Boolean,
+  showTimestamp: Boolean,
+  signedFileVerified: Boolean?,
+  tallIconSpace: String,
+  spaces: (String) -> Unit,
+  text: (String) -> Unit
+) {
   val showSignature = appPreferences.privacyShowSignature.state.value
   val showEncryption = appPreferences.privacyShowEncryption.state.value
   val iconSpace = " \u00A0\u00A0\u00A0"
   val whiteSpace = "\u00A0"
-  var res = if (showTimestamp) "" else iconSpace
+  if (!showTimestamp) spaces(iconSpace)
   var space: String? = null
 
   fun appendSpace() {
-    if (space != null) {
-      res += space
-      space = null
-    }
+    space?.let(spaces)
+    space = null
   }
 
   if (showEdited && meta.itemEdited) {
-    res += iconSpace
+    spaces(iconSpace)
   }
   if (meta.itemTimed != null) {
-    res += iconSpace
+    spaces(iconSpace)
     val ttl = meta.itemTimed.ttl
     if (ttl != chatTTL) {
-      res += shortTimeText(ttl)
+      text(shortTimeText(ttl))
     }
     space = whiteSpace
   }
   if (showViaProxy && meta.sentViaProxy == true) {
     appendSpace()
-    res += iconSpace
+    spaces(iconSpace + tallIconSpace)
   }
   if (showStatus) {
     appendSpace()
     if (meta.statusIcon(secondaryColor) != null) {
-      res += iconSpace
+      spaces(if (meta.tallStatusIcon) iconSpace + tallIconSpace else iconSpace)
     } else if (!meta.disappearing) {
-      res += iconSpace
+      spaces(iconSpace)
     }
     space = whiteSpace
   }
 
   if (encrypted != null && showEncryption) {
     appendSpace()
-    res += iconSpace
+    spaces(iconSpace)
     space = whiteSpace
   }
   if ((showSignature && meta.msgVerified?.verified == true && signedFileVerified != false) || meta.msgVerified is MsgVerified.SigMissing) {
     appendSpace()
-    res += iconSpace
+    spaces(iconSpace)
     space = whiteSpace
   }
   if (showTimestamp) {
     appendSpace()
-    res += meta.timestampText
+    text(meta.timestampText)
   }
-  return res
 }
 
+@Composable
+fun terminalReserveSpaceForMeta(
+  meta: CIMeta,
+  chatTTL: Int?,
+  encrypted: Boolean?,
+  signedFileVerified: Boolean?,
+  secondaryColor: Color,
+  showStatus: Boolean = true,
+  showEdited: Boolean = true,
+  showViaProxy: Boolean,
+  showTimestamp: Boolean
+): AnnotatedString =
+  terminalReserveSpaceForMeta(
+    meta, chatTTL, encrypted, signedFileVerified, secondaryColor, showStatus, showEdited, showViaProxy, showTimestamp,
+    density = LocalDensity.current,
+    bodyFontSize = MaterialTheme.typography.body1.fontSize,
+    direction = LocalLayoutDirection.current
+  )
+
+fun terminalReserveSpaceForMeta(
+  meta: CIMeta,
+  chatTTL: Int?,
+  encrypted: Boolean?,
+  signedFileVerified: Boolean?,
+  secondaryColor: Color,
+  showStatus: Boolean,
+  showEdited: Boolean,
+  showViaProxy: Boolean,
+  showTimestamp: Boolean,
+  density: Density,
+  bodyFontSize: TextUnit,
+  direction: LayoutDirection
+): AnnotatedString {
+  val spaceStyle = SpanStyle(fontSize = with(density) { bodyFontSize.value.dp.toSp() }, fontWeight = FontWeight.Normal)
+  val textStyle = SpanStyle(fontSize = 12.sp, fontWeight = FontWeight.Normal)
+  return buildAnnotatedString {
+    append(if (direction == LayoutDirection.Ltr) "\u2060\u200E" else "\u2060\u200F")
+    reserveSpaceForMeta(
+      meta, chatTTL, encrypted, secondaryColor, showStatus, showEdited, showViaProxy, showTimestamp, signedFileVerified, tallIconSpace = "\u00A0",
+      spaces = { withStyle(spaceStyle) { append(it.replace(' ', '\u00A0')) } },
+      text = { withStyle(textStyle) { append(it.replace(' ', '\u00A0')) } }
+    )
+  }
+}
+
+private val CIMeta.tallStatusIcon: Boolean get() =
+  itemStatus is CIStatus.SndSent || itemStatus is CIStatus.SndRcvd
+
 @Composable
 private fun StatusIconText(icon: Painter, color: Color) {
   Icon(icon, null, Modifier.height(12.dp), tint = color)
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIRcvDecryptionError.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIRcvDecryptionError.kt
index 589b2a6fa6..42a8720018 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIRcvDecryptionError.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIRcvDecryptionError.kt
@@ -139,44 +139,48 @@ fun DecryptionErrorItemFixButton(
   syncSupported: Boolean
 ) {
   val receivedColor = MaterialTheme.appColors.receivedMessage
-  Surface(
-    Modifier.clickable(onClick = onClick),
-    shape = RoundedCornerShape(18.dp),
-    color = receivedColor,
-    contentColor = LocalContentColor.current
-  ) {
-    Box(
-      Modifier.padding(vertical = 6.dp, horizontal = 12.dp),
-      contentAlignment = Alignment.BottomEnd,
+  ItemWithMeta(meta = { CIMetaView(ci, timedMessagesTTL = null, showViaProxy = false, showTimestamp = true) }) { inlineMeta ->
+    Surface(
+      Modifier.clickable(onClick = onClick),
+      shape = RoundedCornerShape(18.dp),
+      color = receivedColor,
+      contentColor = LocalContentColor.current
     ) {
-      Column(
-        verticalArrangement = Arrangement.spacedBy(2.dp)
+      Box(
+        Modifier.padding(vertical = 6.dp, horizontal = 12.dp),
+        contentAlignment = Alignment.BottomEnd,
       ) {
-        Text(
-          buildAnnotatedString {
-            withStyle(SpanStyle(fontStyle = FontStyle.Italic, color = Color.Red)) { append(ci.content.text) }
-          },
-          style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp)
-        )
-        Row {
-          Icon(
-            painterResource(MR.images.ic_sync_problem),
-            stringResource(MR.strings.fix_connection),
-            tint = if (syncSupported) MaterialTheme.colors.primary else MaterialTheme.colors.secondary
-          )
-          Spacer(Modifier.padding(2.dp))
-          val secondaryColor = MaterialTheme.colors.secondary
+        Column(
+          verticalArrangement = Arrangement.spacedBy(2.dp)
+        ) {
           Text(
             buildAnnotatedString {
-              append(generalGetString(MR.strings.fix_connection))
-              withStyle(reserveTimestampStyle) { append(reserveSpaceForMeta(ci.meta, null, encrypted = null, secondaryColor = secondaryColor, showTimestamp = true)) }
-              withStyle(reserveTimestampStyle) { append("    ") } // for icon
+              withStyle(SpanStyle(fontStyle = FontStyle.Italic, color = Color.Red)) { append(ci.content.text) }
             },
-            color = if (syncSupported) MaterialTheme.colors.primary else MaterialTheme.colors.secondary
+            style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp)
           )
+          Row {
+            Icon(
+              painterResource(MR.images.ic_sync_problem),
+              stringResource(MR.strings.fix_connection),
+              tint = if (syncSupported) MaterialTheme.colors.primary else MaterialTheme.colors.secondary
+            )
+            Spacer(Modifier.padding(2.dp))
+            val secondaryColor = MaterialTheme.colors.secondary
+            Text(
+              buildAnnotatedString {
+                append(generalGetString(MR.strings.fix_connection))
+                if (inlineMeta != null) {
+                  withStyle(reserveTimestampStyle) { append(reserveSpaceForMeta(ci.meta, null, encrypted = null, secondaryColor = secondaryColor, showTimestamp = true)) }
+                  withStyle(reserveTimestampStyle) { append("    ") } // for icon
+                }
+              },
+              color = if (syncSupported) MaterialTheme.colors.primary else MaterialTheme.colors.secondary
+            )
+          }
         }
+        inlineMeta?.invoke()
       }
-      CIMetaView(ci, timedMessagesTTL = null, showViaProxy = false, showTimestamp = true)
     }
   }
 }
@@ -187,25 +191,29 @@ fun DecryptionErrorItem(
   onClick: () -> Unit
 ) {
   val receivedColor = MaterialTheme.appColors.receivedMessage
-  Surface(
-    Modifier.clickable(onClick = onClick),
-    shape = RoundedCornerShape(18.dp),
-    color = receivedColor,
-    contentColor = LocalContentColor.current
-  ) {
-    Box(
-      Modifier.padding(vertical = 6.dp, horizontal = 12.dp),
-      contentAlignment = Alignment.BottomEnd,
+  ItemWithMeta(meta = { CIMetaView(ci, timedMessagesTTL = null, showViaProxy = false, showTimestamp = true) }) { inlineMeta ->
+    Surface(
+      Modifier.clickable(onClick = onClick),
+      shape = RoundedCornerShape(18.dp),
+      color = receivedColor,
+      contentColor = LocalContentColor.current
     ) {
-      val secondaryColor = MaterialTheme.colors.secondary
-      Text(
-        buildAnnotatedString {
-          withStyle(SpanStyle(fontStyle = FontStyle.Italic, color = Color.Red)) { append(ci.content.text) }
-          withStyle(reserveTimestampStyle) { append(reserveSpaceForMeta(ci.meta, null, encrypted = null, secondaryColor = secondaryColor, showTimestamp = true)) }
-        },
-        style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp)
-      )
-      CIMetaView(ci, timedMessagesTTL = null, showViaProxy = false, showTimestamp = true)
+      Box(
+        Modifier.padding(vertical = 6.dp, horizontal = 12.dp),
+        contentAlignment = Alignment.BottomEnd,
+      ) {
+        val secondaryColor = MaterialTheme.colors.secondary
+        Text(
+          buildAnnotatedString {
+            withStyle(SpanStyle(fontStyle = FontStyle.Italic, color = Color.Red)) { append(ci.content.text) }
+            if (inlineMeta != null) {
+              withStyle(reserveTimestampStyle) { append(reserveSpaceForMeta(ci.meta, null, encrypted = null, secondaryColor = secondaryColor, showTimestamp = true)) }
+            }
+          },
+          style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp)
+        )
+        inlineMeta?.invoke()
+      }
     }
   }
 }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIVoiceView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIVoiceView.kt
index 5aeefd9668..aa49808fe8 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIVoiceView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIVoiceView.kt
@@ -44,10 +44,11 @@ fun CIVoiceView(
   receiveFile: (Long) -> Unit,
 ) {
   val sizeMultiplier = if (smallView) voiceMessageSizeBasedOnSquareSize(36f) / 56f else 1f
+  val classicWithText = hasText && !LocalTerminalLayout.current
   val padding = when {
     smallView -> PaddingValues()
-    hasText -> PaddingValues(top = 14.sp.toDp() * sizeMultiplier, bottom = 14.sp.toDp() * sizeMultiplier, start = 6.sp.toDp() * sizeMultiplier, end = 6.sp.toDp() * sizeMultiplier)
-    else -> PaddingValues(top = 4.sp.toDp() * sizeMultiplier, bottom = 6.sp.toDp() * sizeMultiplier, start = 0.dp, end = 0.dp)
+    classicWithText -> PaddingValues(top = 14.sp.toDp() * sizeMultiplier, bottom = 14.sp.toDp() * sizeMultiplier, start = 6.sp.toDp() * sizeMultiplier, end = 6.sp.toDp() * sizeMultiplier)
+    else -> PaddingValues(top = 4.sp.toDp() * sizeMultiplier, bottom = 6.sp.toDp() * sizeMultiplier, start = if (LocalTerminalLayout.current) CHAT_ITEM_TEXT_PADDING else 0.dp, end = 0.dp)
   }
   Row(
     Modifier.padding(padding),
@@ -87,7 +88,7 @@ fun CIVoiceView(
           durationText(time / 1000)
         }
       }
-      VoiceLayout(file, ci, text, audioPlaying, progress, duration, brokenAudio, sent, hasText, timedMessagesTTL, showViaProxy, showTimestamp, sizeMultiplier, play, pause, longClick, { chatModel.openWhenReceived(file, smallView); receiveFile(it) }) {
+      VoiceLayout(file, ci, text, audioPlaying, progress, duration, brokenAudio, sent, hasText, classicWithText, timedMessagesTTL, showViaProxy, showTimestamp, sizeMultiplier, play, pause, longClick, { chatModel.openWhenReceived(file, smallView); receiveFile(it) }) {
         AudioPlayer.seekTo(it, progress, fileSource.value?.filePath)
       }
       if (smallView) {
@@ -120,6 +121,7 @@ private fun VoiceLayout(
   brokenAudio: Boolean,
   sent: Boolean,
   hasText: Boolean,
+  classicWithText: Boolean,
   timedMessagesTTL: Int?,
   showViaProxy: Boolean,
   showTimestamp: Boolean,
@@ -182,7 +184,7 @@ private fun VoiceLayout(
         }
       }
     }
-    hasText -> {
+    classicWithText -> {
       val sentColor = MaterialTheme.appColors.sentMessage
       val receivedColor = MaterialTheme.appColors.receivedMessage
       Spacer(Modifier.width(6.sp.toDp() * sizeMultiplier))
@@ -192,7 +194,7 @@ private fun VoiceLayout(
         Slider(if (ci.chatDir.sent) sentColor else receivedColor)
       }
     }
-    sent -> {
+    sent && !LocalTerminalLayout.current -> {
       Column(horizontalAlignment = Alignment.End) {
         Row {
           Row(Modifier.weight(1f, false), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.End) {
@@ -208,19 +210,25 @@ private fun VoiceLayout(
       }
     }
     else -> {
-      Column(horizontalAlignment = Alignment.Start) {
-        Row {
-          VoiceMsgIndicator(file, audioPlaying.value, sent, hasText, progress, duration, brokenAudio, 1f, play, pause, longClick, receiveFile)
-          Row(Modifier.weight(1f, false), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Start) {
-            DurationText(text, PaddingValues(start = 12.sp.toDp() * sizeMultiplier))
-            Slider(MaterialTheme.colors.background, PaddingValues(start = DEFAULT_PADDING_HALF + 3.dp))
-            Spacer(Modifier.height(56.sp.toDp() * sizeMultiplier))
+      @Composable
+      fun VoiceRow(inlineMeta: (@Composable () -> Unit)?) {
+        Column(horizontalAlignment = Alignment.Start) {
+          Row {
+            VoiceMsgIndicator(file, audioPlaying.value, sent, false, progress, duration, brokenAudio, 1f, play, pause, longClick, receiveFile)
+            Row(Modifier.weight(1f, false), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Start) {
+              DurationText(text, PaddingValues(start = 12.sp.toDp() * sizeMultiplier))
+              Slider(MaterialTheme.colors.background, PaddingValues(start = DEFAULT_PADDING_HALF + 3.dp))
+              Spacer(Modifier.height(56.sp.toDp() * sizeMultiplier))
+            }
+          }
+          if (inlineMeta != null) {
+            Box(Modifier.padding(top = 6.sp.toDp() * sizeMultiplier)) {
+              inlineMeta()
+            }
           }
         }
-        Box(Modifier.padding(top = 6.sp.toDp() * sizeMultiplier)) {
-          CIMetaView(ci, timedMessagesTTL, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
-        }
       }
+      if (hasText) VoiceRow(null) else ItemWithMeta(meta = { CIMetaView(ci, timedMessagesTTL, showViaProxy = showViaProxy, showTimestamp = showTimestamp) }) { VoiceRow(it) }
     }
   }
 }
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 822aef9aa2..4305a35502 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
@@ -50,12 +50,12 @@ private val msgTailMaxHeightDp = msgTailWidthDp * 1.732f // 60deg
 
 val chatEventStyle = SpanStyle(fontSize = 12.sp, fontWeight = FontWeight.Light, color = CurrentColors.value.colors.secondary)
 
-fun chatEventText(ci: ChatItem, isChannel: Boolean = false): AnnotatedString =
-  chatEventText(ci.content.text(isChannel), ci.timestampText)
+fun chatEventText(ci: ChatItem, isChannel: Boolean = false, ts: AnnotatedString): AnnotatedString =
+  chatEventText(ci.content.text(isChannel), ts)
 
-fun chatEventText(eventText: String, ts: String): AnnotatedString =
+fun chatEventText(eventText: String, ts: AnnotatedString): AnnotatedString =
   buildAnnotatedString {
-    withStyle(chatEventStyle) { append("$eventText  $ts") }
+    withStyle(chatEventStyle) { append(eventText); append(ts) }
   }
 
 data class ChatItemReactionMenuItem (
@@ -64,6 +64,9 @@ data class ChatItemReactionMenuItem (
   val onClick: (() -> Unit)?
 )
 
+private val REACTION_SPACING = 5.dp
+private val REACTION_PADDING = 2.dp
+
 // Spec: spec/client/chat-view.md#ChatItemView
 @Composable
 fun ChatItemView(
@@ -113,11 +116,14 @@ fun ChatItemView(
   itemSeparation: ItemSeparation,
   preview: Boolean = false,
   swipeOffset: Float = 0f,
+  bubbleInteractionSource: MutableInteractionSource = remember { MutableInteractionSource() },
 ) {
   val cInfo = chat.chatInfo
   val uriHandler = LocalUriHandler.current
   val sent = cItem.chatDir.sent
-  val alignment = if (sent) Alignment.CenterEnd else Alignment.CenterStart
+  val terminal = LocalTerminalLayout.current
+  val alignEnd = sent && !terminal
+  val alignment = if (alignEnd) Alignment.CenterEnd else Alignment.CenterStart
   val showMenu = remember { mutableStateOf(false) }
   val fullDeleteAllowed = remember(cInfo) { cInfo.featureEnabled(ChatFeature.FullDelete) }
   val onLinkLongClick = { _: String -> showMenu.value = true }
@@ -139,7 +145,7 @@ fun ChatItemView(
 
     @Composable
     fun ChatItemReactions() {
-      Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.chatItemOffset(cItem, itemSeparation.largeGap, inverted = true, revealed = true)) {
+      Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.chatItemOffset(cItem, itemSeparation.largeGap, inverted = true, revealed = true).padding(start = if (terminal) CHAT_ITEM_TEXT_PADDING - REACTION_SPACING - REACTION_PADDING else 0.dp)) {
         cItem.reactions.forEach { r ->
           val showReactionMenu = remember { mutableStateOf(false) }
           val reactionMenuItems = remember { mutableStateOf(emptyList<ChatItemReactionMenuItem>()) }
@@ -153,7 +159,7 @@ fun ChatItemView(
             }
           }
 
-          var modifier = Modifier.padding(horizontal = 5.dp, vertical = 2.dp).clip(RoundedCornerShape(8.dp))
+          var modifier = Modifier.padding(horizontal = REACTION_SPACING, vertical = 2.dp).clip(RoundedCornerShape(8.dp))
           if (cInfo.featureEnabled(ChatFeature.Reactions)) {
             fun showReactionsMenu() {
               when (cInfo) {
@@ -206,7 +212,7 @@ fun ChatItemView(
               )
               .onRightClick { showReactionsMenu() }
           }
-          Row(modifier.padding(2.dp), verticalAlignment = Alignment.CenterVertically) {
+          Row(modifier.padding(REACTION_PADDING), verticalAlignment = Alignment.CenterVertically) {
             ReactionIcon(r.reaction.text, fontSize = 12.sp)
             DefaultDropdownMenu(showMenu = showReactionMenu) {
               reactionMenuItems.value.forEach { m ->
@@ -301,20 +307,20 @@ fun ChatItemView(
       }
     }
 
-    Column(horizontalAlignment = if (cItem.chatDir.sent) Alignment.End else Alignment.Start) {
+    Column(horizontalAlignment = if (alignEnd) Alignment.End else Alignment.Start) {
       val canReply = (cItem.content is CIContent.SndMsgContent || cItem.content is CIContent.RcvMsgContent) &&
           cInfo !is ChatInfo.Local && !cItem.isReport && !cItem.meta.isLive && cItem.meta.itemDeleted == null
       Box {
         Row(verticalAlignment = Alignment.CenterVertically) {
-          val bubbleInteractionSource = remember { MutableInteractionSource() }
         val bubbleHovered = bubbleInteractionSource.collectIsHoveredAsState()
-        if (cItem.chatDir.sent) {
+        val markedDeleted = cItem.meta.itemDeleted != null && (!revealed.value || cItem.isDeletedContent)
+        if (alignEnd) {
           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) {
+            if ((highlighted.value && !terminal) || hoveredItemId.value == cItem.id) {
               bubbleInteractionSource.emit(enterInteraction)
             } else {
               bubbleInteractionSource.emit(HoverInteraction.Exit(enterInteraction))
@@ -322,7 +328,7 @@ fun ChatItemView(
           }
           Column(
             Modifier
-              .clipChatItem(cItem, itemSeparation.largeGap, revealed.value)
+              .then(if (terminal) Modifier else Modifier.clipChatItem(cItem, itemSeparation.largeGap, revealed.value))
               .hoverable(bubbleInteractionSource)
               .combinedClickable(
                 onLongClick = { showMenu.value = true },
@@ -331,12 +337,12 @@ fun ChatItemView(
                     hoveredItemId.value = if (hoveredItemId.value == cItem.id) null else cItem.id
                   }
                   onClick()
-                }, interactionSource = bubbleInteractionSource, indication = LocalIndication.current)
+                }, interactionSource = bubbleInteractionSource, indication = if (terminal) null else LocalIndication.current)
               .onRightClick { showMenu.value = true },
           ) {
             @Composable
             fun framedItemView() {
-              FramedItemView(chatsCtx, chat, cItem, uriHandler, imageProvider, linkMode = linkMode, showViaProxy = showViaProxy, showMenu, showTimestamp = showTimestamp, tailVisible = itemSeparation.largeGap, receiveFile, onLinkLongClick, scrollToItem, scrollToItemId, scrollToQuotedItemFromItem)
+              FramedItemView(chatsCtx, chat, cItem, uriHandler, imageProvider, linkMode = linkMode, showViaProxy = showViaProxy, showMenu, showTimestamp = showTimestamp, tailVisible = itemSeparation.largeGap, receiveFile, onLinkLongClick, scrollToItem, scrollToItemId, scrollToQuotedItemFromItem, endButton = if (terminal && !searchIsNotBlank.value && cItem.meta.itemForwarded?.chatTypeApiIdMsgId != null) { { GoToItemButton(false, bubbleHovered) } } else null)
             }
 
             fun deleteMessageQuestionText(): String {
@@ -571,7 +577,7 @@ fun ChatItemView(
             @Composable
             fun ContentItem() {
               val mc = cItem.content.msgContent
-              if (cItem.quotedItem == null && cItem.meta.itemForwarded == null && cItem.meta.itemDeleted == null && !cItem.meta.isLive) {
+              if (!cItem.hasQuoteOrHeader) {
                 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()) {
@@ -622,24 +628,26 @@ fun ChatItemView(
               }
             }
 
-            fun eventItemViewText(reversedChatItems: List<ChatItem>): AnnotatedString {
+            fun eventItemViewText(reversedChatItems: List<ChatItem>, ts: AnnotatedString): AnnotatedString {
               val memberDisplayName = cItem.memberDisplayName
               val t = mergedGroupEventText(cItem, reversedChatItems)
               return if (!revealed.value && t != null) {
-                chatEventText(t, cItem.timestampText)
+                chatEventText(t, ts)
               } else if (memberDisplayName != null) {
                 buildAnnotatedString {
                   withStyle(chatEventStyle) { append(memberDisplayName) }
                   append(" ")
-                }.plus(chatEventText(cItem, cInfo.isChannel))
+                }.plus(chatEventText(cItem, cInfo.isChannel, ts))
               } else {
-                chatEventText(cItem, cInfo.isChannel)
+                chatEventText(cItem, cInfo.isChannel, ts)
               }
             }
 
             @Composable fun EventItemView() {
               val reversedChatItems = chatsCtx.chatItems.value.asReversed()
-              CIEventView(eventItemViewText(reversedChatItems))
+              ChatEventWithMeta(cItem) { separator, ts ->
+                CIEventView(eventItemViewText(reversedChatItems, separator + ts))
+              }
             }
 
             @Composable fun PendingReviewEventItemView() {
@@ -647,7 +655,8 @@ fun ChatItemView(
                 buildAnnotatedString {
                   withStyle(chatEventStyle.copy(fontWeight = FontWeight.Bold)) { append(cItem.content.text(cInfo.isChannel)) }
                 },
-                Modifier.padding(horizontal = 6.dp, vertical = 6.dp)
+                Modifier.padding(chatEventPadding()),
+                style = chatEventTextStyle()
               )
             }
 
@@ -677,7 +686,8 @@ fun ChatItemView(
                 buildAnnotatedString {
                   withStyle(chatEventStyle) { append(annotatedStringResource(sId)) }
                 },
-                Modifier.padding(horizontal = 6.dp, vertical = 6.dp)
+                Modifier.padding(chatEventPadding()),
+                style = chatEventTextStyle()
               )
             }
 
@@ -695,7 +705,7 @@ fun ChatItemView(
               e2eeInfoText(if (e2EEInfo.public == true) MR.strings.e2ee_info_no_e2ee else MR.strings.e2ee_info_no_pq)
             }
 
-            if (cItem.meta.itemDeleted != null && (!revealed.value || cItem.isDeletedContent)) {
+            if (markedDeleted) {
               MarkedDeletedItemView(chatsCtx, cItem, cInfo, cInfo.timedMessagesTTL, revealed, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
               MarkedDeletedItemDropdownMenu()
             } else {
@@ -803,7 +813,7 @@ fun ChatItemView(
             }
           }
         }
-        if (!cItem.chatDir.sent) {
+        if (!alignEnd && (!terminal || searchIsNotBlank.value || markedDeleted)) {
           GoToItemButton(false, bubbleHovered)
         }
         }
@@ -823,6 +833,9 @@ fun ChatItemView(
   }
 }
 
+val ChatItem.hasQuoteOrHeader: Boolean get() =
+  quotedItem != null || meta.itemForwarded != null || meta.itemDeleted != null || meta.isLive || isReport
+
 @Composable
 expect fun ReactionIcon(text: String, fontSize: TextUnit = TextUnit.Unspecified)
 
@@ -1203,10 +1216,12 @@ fun ItemAction(text: String, color: Color = Color.Unspecified, onClick: () -> Un
   }
 }
 
+@Composable
+fun chatItemTailEnabled(): Boolean = remember { appPreferences.chatItemTail.state }.value && !LocalTerminalLayout.current
+
 @Composable
 fun Modifier.chatItemOffset(cItem: ChatItem, tailVisible: Boolean, inverted: Boolean = false, revealed: Boolean): Modifier {
-  val chatItemTail = remember { appPreferences.chatItemTail.state }
-  val style = shapeStyle(cItem, chatItemTail.value, tailVisible, revealed)
+  val style = shapeStyle(cItem, chatItemTailEnabled(), tailVisible, revealed)
 
   val offset = if (style is ShapeStyle.Bubble) {
     if (style.tailVisible) {
@@ -1222,8 +1237,7 @@ fun Modifier.chatItemOffset(cItem: ChatItem, tailVisible: Boolean, inverted: Boo
 @Composable
 fun Modifier.clipChatItem(chatItem: ChatItem? = null, tailVisible: Boolean = false, revealed: Boolean = false): Modifier {
   val chatItemRoundness = remember { appPreferences.chatItemRoundness.state }
-  val chatItemTail = remember { appPreferences.chatItemTail.state }
-  val style = shapeStyle(chatItem, chatItemTail.value, tailVisible, revealed)
+  val style = shapeStyle(chatItem, chatItemTailEnabled(), tailVisible, revealed)
   val cornerRoundness = chatItemRoundness.value.coerceIn(0f, 1f)
 
   return when (style) {
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/DeletedItemView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/DeletedItemView.kt
index 17245c4e75..70bf88a51c 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/DeletedItemView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/DeletedItemView.kt
@@ -20,23 +20,25 @@ fun DeletedItemView(ci: ChatItem, timedMessagesTTL: Int?, showViaProxy: Boolean,
   val sent = ci.chatDir.sent
   val sentColor = MaterialTheme.appColors.sentMessage
   val receivedColor = MaterialTheme.appColors.receivedMessage
-  Surface(
-    shape = RoundedCornerShape(18.dp),
-    color = if (sent) sentColor else receivedColor,
-    contentColor = LocalContentColor.current
-  ) {
-    Row(
-      Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
-      verticalAlignment = Alignment.Bottom
+  ItemWithMeta(meta = { CIMetaView(ci, timedMessagesTTL, showViaProxy = showViaProxy, showTimestamp = showTimestamp) }) { inlineMeta ->
+    Surface(
+      shape = RoundedCornerShape(18.dp),
+      color = if (sent) sentColor else receivedColor,
+      contentColor = LocalContentColor.current
     ) {
-      Text(
-        buildAnnotatedString {
-          withStyle(SpanStyle(fontStyle = FontStyle.Italic, color = MaterialTheme.colors.secondary)) { append(ci.content.text) }
-        },
-        style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp),
-        modifier = Modifier.padding(end = 8.dp)
-      )
-      CIMetaView(ci, timedMessagesTTL, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
+      Row(
+        Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
+        verticalAlignment = Alignment.Bottom
+      ) {
+        Text(
+          buildAnnotatedString {
+            withStyle(SpanStyle(fontStyle = FontStyle.Italic, color = MaterialTheme.colors.secondary)) { append(ci.content.text) }
+          },
+          style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp),
+          modifier = Modifier.padding(end = if (inlineMeta != null) 8.dp else 0.dp)
+        )
+        inlineMeta?.invoke()
+      }
     }
   }
 }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/EmojiItemView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/EmojiItemView.kt
index 3bcd02411f..4b8633c4b3 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/EmojiItemView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/EmojiItemView.kt
@@ -15,6 +15,7 @@ import chat.simplex.common.model.ChatItem
 import chat.simplex.common.model.MREmojiChar
 import chat.simplex.common.ui.theme.EmojiFont
 import chat.simplex.common.views.chat.*
+import chat.simplex.common.views.helpers.toDp
 import java.sql.Timestamp
 
 val largeEmojiFont: TextStyle = TextStyle(fontSize = 48.sp, fontFamily = EmojiFont)
@@ -25,18 +26,20 @@ fun EmojiItemView(chatItem: ChatItem, timedMessagesTTL: Int?, showViaProxy: Bool
   val emojiText = chatItem.content.text.trim()
   val isSelected = setupEmojiSelection(LocalSelectionManager.current, LocalItemContext.current.selectionIndex, emojiText.length)
 
-  Column(
-    Modifier.padding(vertical = 8.dp, horizontal = 12.dp),
-    horizontalAlignment = Alignment.CenterHorizontally
-  ) {
-    if (isSelected) {
-      Box(Modifier.background(SelectionHighlightColor)) {
+  ItemWithMeta(meta = { CIMetaView(chatItem, timedMessagesTTL, showViaProxy = showViaProxy, showTimestamp = showTimestamp) }, metaReserved = true) { inlineMeta ->
+    Column(
+      if (LocalTerminalLayout.current) Modifier.padding(start = CHAT_ITEM_TEXT_PADDING, top = TERMINAL_EMOJI_TOP_GAP.toDp(), end = CHAT_ITEM_TEXT_PADDING, bottom = TERMINAL_EMOJI_BOTTOM_GAP.toDp()).messageLastLine() else Modifier.padding(vertical = 8.dp, horizontal = 12.dp),
+      horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+      if (isSelected) {
+        Box(Modifier.background(SelectionHighlightColor)) {
+          EmojiText(chatItem.content.text)
+        }
+      } else {
         EmojiText(chatItem.content.text)
       }
-    } else {
-      EmojiText(chatItem.content.text)
+      inlineMeta?.invoke()
     }
-    CIMetaView(chatItem, timedMessagesTTL, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
   }
 }
 
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 ca370c1b52..acae6c4c44 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
@@ -47,10 +47,17 @@ fun FramedItemView(
   scrollToItem: (Long) -> Unit = {},
   scrollToItemId: MutableState<Long?>,
   scrollToQuotedItemFromItem: (Long) -> Unit = {},
+  endButton: (@Composable () -> Unit)? = null,
 ) {
   val chatInfo = chat.chatInfo
   val sent = ci.chatDir.sent
   val chatTTL = chatInfo.timedMessagesTTL
+  val terminal = LocalTerminalLayout.current
+  val mediaModifier = if (terminal) Modifier.padding(start = CHAT_ITEM_TEXT_PADDING, top = TERMINAL_BLOCK_TOP_GAP.toDp()).clipChatItem(ci, revealed = true) else Modifier
+  val quoteColor = if (sent) MaterialTheme.appColors.sentQuote else MaterialTheme.appColors.receivedQuote
+  val cardModifier = mediaModifier.background(quoteColor)
+  val thumbnailClip = if (terminal) Modifier.clipChatItem(ci, revealed = true) else Modifier
+  val quoteBaseStyle = if (terminal) MaterialTheme.typography.body1 else TextStyle()
 
   fun membership(): GroupMember? {
     return if (chatInfo is ChatInfo.Group) chatInfo.groupInfo.membership else null
@@ -58,6 +65,7 @@ fun FramedItemView(
 
   @Composable
   fun ciQuotedMsgTextView(qi: CIQuote, lines: Int, showTimestamp: Boolean, stripLink: String? = null, prefix: AnnotatedString? = null) {
+    val color = if (terminal) MaterialTheme.colors.onSurface.copy(alpha = 0.7f) else MaterialTheme.colors.onSurface
     MarkdownText(
       qi.text,
       qi.formattedText,
@@ -65,7 +73,7 @@ fun FramedItemView(
       toggleSecrets = true,
       maxLines = lines,
       overflow = TextOverflow.Ellipsis,
-      style = TextStyle(fontSize = 15.sp, color = MaterialTheme.colors.onSurface),
+      style = quoteBaseStyle.copy(fontSize = 15.sp, color = color).merge(terminalTextStyle(15.sp, color)),
       linkMode = linkMode,
       uriHandler = if (appPlatform.isDesktop) uriHandler else null,
       showTimestamp = showTimestamp,
@@ -81,7 +89,7 @@ fun FramedItemView(
         // 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),
+        .then(if (terminal) Modifier.padding(end = 12.dp) else Modifier.padding(vertical = 6.dp, horizontal = 12.dp)),
       contentAlignment = Alignment.TopStart
     ) {
       val sender = qi.sender(membership())
@@ -91,7 +99,7 @@ fun FramedItemView(
         ) {
           Text(
             sender,
-            style = TextStyle(fontSize = 13.5.sp, color = if (qi.chatDir is CIDirection.GroupSnd) CurrentColors.value.colors.primary else CurrentColors.value.colors.secondary),
+            style = quoteBaseStyle.copy(fontSize = 13.5.sp, color = if (qi.chatDir is CIDirection.GroupSnd) CurrentColors.value.colors.primary else CurrentColors.value.colors.secondary).merge(terminalTextStyle(13.5.sp)),
             maxLines = 1
           )
           ciQuotedMsgTextView(qi, lines = 2, showTimestamp = showTimestamp, stripLink = stripLink, prefix = prefix)
@@ -111,7 +119,7 @@ fun FramedItemView(
           append(caption)
         }
       },
-      style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp),
+      style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp).merge(terminalTextStyle(fontSize, MaterialTheme.colors.secondary)),
       maxLines = 1,
       overflow = TextOverflow.Ellipsis
     )
@@ -119,13 +127,14 @@ fun FramedItemView(
 
   @Composable
   fun headerModifier(pad: Boolean, onClick: (() -> Unit)? = null): Modifier {
-    val sentColor = MaterialTheme.appColors.sentQuote
-    val receivedColor = MaterialTheme.appColors.receivedQuote
     return Modifier
-      .background(if (sent) sentColor else receivedColor)
+      .then(if (terminal) Modifier else Modifier.background(quoteColor))
       .fillMaxWidth()
       .then(if (onClick != null) Modifier.clickable(onClick = onClick) else Modifier)
-      .padding(start = 8.dp, top = 6.dp, end = 12.dp, bottom = if (pad || (ci.quotedItem == null && ci.meta.itemForwarded == null)) 6.dp else 0.dp)
+      .then(
+        if (terminal) Modifier.padding(start = CHAT_ITEM_TEXT_PADDING, top = TERMINAL_HEADER_TOP_GAP.toDp(), end = 12.dp, bottom = TERMINAL_HEADER_BOTTOM_GAP.toDp())
+        else Modifier.padding(start = 8.dp, top = 6.dp, end = 12.dp, bottom = if (pad || (ci.quotedItem == null && ci.meta.itemForwarded == null)) 6.dp else 0.dp)
+      )
   }
 
   @Composable
@@ -139,7 +148,7 @@ fun FramedItemView(
         Icon(
           icon,
           caption,
-          Modifier.size(18.dp),
+          Modifier.inlineIcon().size(18.dp),
           tint = iconColor ?: if (isInDarkTheme()) FileDark else FileLight
         )
       }
@@ -155,11 +164,9 @@ fun FramedItemView(
   @Composable
   fun ciQuoteView(qi: CIQuote) {
     val blurred = remember { mutableStateOf(appPreferences.privacyMediaBlurRadius.get() > 0) }
-    val sentColor = MaterialTheme.appColors.sentQuote
-    val receivedColor = MaterialTheme.appColors.receivedQuote
     Row(
       Modifier
-        .background(if (sent) sentColor else receivedColor)
+        .then(if (terminal) Modifier.padding(start = CHAT_ITEM_TEXT_PADDING, top = TERMINAL_BLOCK_TOP_GAP.toDp(), bottom = TERMINAL_BLOCK_BOTTOM_GAP.toDp()).quoteBar(MaterialTheme.colors.onSurface) else Modifier.background(quoteColor))
         .fillMaxWidth()
     ) {
       when (qi.content) {
@@ -172,7 +179,7 @@ fun FramedItemView(
             imageBitmap,
             contentDescription = stringResource(MR.strings.image_descr),
             contentScale = ContentScale.Crop,
-            modifier = Modifier.size(68.dp).clipToBounds().desktopModifyBlurredState(blurred, showMenu).privacyBlur(fullSize = false, imageBitmap, blurred, chatViewScrollState.collectAsState(), onLongClick = { showMenu.value = true })
+            modifier = Modifier.size(68.dp).then(thumbnailClip).clipToBounds().desktopModifyBlurredState(blurred, showMenu).privacyBlur(fullSize = false, imageBitmap, blurred, chatViewScrollState.collectAsState(), onLongClick = { showMenu.value = true })
           )
         }
         is MsgContent.MCVideo -> {
@@ -184,7 +191,7 @@ fun FramedItemView(
             imageBitmap,
             contentDescription = stringResource(MR.strings.video_descr),
             contentScale = ContentScale.Crop,
-            modifier = Modifier.size(68.dp).clipToBounds().desktopModifyBlurredState(blurred, showMenu).privacyBlur(fullSize = false, imageBitmap, blurred, chatViewScrollState.collectAsState(), onLongClick = { showMenu.value = true })
+            modifier = Modifier.size(68.dp).then(thumbnailClip).clipToBounds().desktopModifyBlurredState(blurred, showMenu).privacyBlur(fullSize = false, imageBitmap, blurred, chatViewScrollState.collectAsState(), onLongClick = { showMenu.value = true })
           )
         }
         is MsgContent.MCFile, is MsgContent.MCVoice -> {
@@ -195,7 +202,7 @@ fun FramedItemView(
             if (qi.content is MsgContent.MCFile) painterResource(MR.images.ic_draft_filled) else painterResource(MR.images.ic_mic_filled),
             if (qi.content is MsgContent.MCFile) stringResource(MR.strings.icon_descr_file) else stringResource(MR.strings.voice_message),
             Modifier
-              .padding(top = 6.dp, end = 4.dp)
+              .padding(top = if (terminal) 0.dp else 6.dp, end = 4.dp)
               .size(22.dp),
             tint = if (isInDarkTheme()) FileDark else FileLight
           )
@@ -210,7 +217,7 @@ fun FramedItemView(
           Icon(
             painterResource(qi.content.chatLink.smallIconRes),
             null,
-            Modifier.padding(top = 6.dp, end = 4.dp).size(22.dp),
+            Modifier.padding(top = if (terminal) 0.dp else 6.dp, end = 4.dp).size(22.dp),
             tint = if (isInDarkTheme()) FileDark else FileLight
           )
         }
@@ -223,220 +230,248 @@ fun FramedItemView(
   fun ciFileView(ci: ChatItem, text: String) {
     CIFileView(ci.file, ci.meta, chatTTL, showViaProxy, showTimestamp, showMenu, false, receiveFile)
     if (text != "" || ci.meta.isLive) {
-      CIMarkdownText(chatsCtx, ci, chat, chatTTL, linkMode = linkMode, uriHandler, showViaProxy = showViaProxy,  showTimestamp = showTimestamp)
+      CIMarkdownText(chatsCtx, ci, chat, chatTTL, linkMode = linkMode, uriHandler, showViaProxy = showViaProxy,  showTimestamp = showTimestamp, terminalTop = 0.dp)
     }
   }
 
-  val transparentBackground = (ci.content.msgContent is MsgContent.MCImage || ci.content.msgContent is MsgContent.MCVideo) &&
-      !ci.meta.isLive && ci.content.text.isEmpty() && ci.quotedItem == null && ci.meta.itemForwarded == null
+  val captionlessMedia = (ci.content.msgContent is MsgContent.MCImage || ci.content.msgContent is MsgContent.MCVideo) &&
+      !ci.meta.isLive && ci.content.text.isEmpty()
+  val transparentBackground = captionlessMedia && ci.quotedItem == null && ci.meta.itemForwarded == null
 
   val sentColor = MaterialTheme.appColors.sentMessage
   val receivedColor = MaterialTheme.appColors.receivedMessage
+  val (metaReserved, gapBelowBlock) = when (val mc = ci.content.msgContent) {
+    is MsgContent.MCVoice -> (mc.text != "") to false
+    is MsgContent.MCChat -> (mc.text != mc.chatLink.connLinkStr).let { it to !it }
+    else -> !captionlessMedia to captionlessMedia
+  }
   Box(Modifier
-    .clipChatItem(ci, tailVisible, revealed = true)
+    .then(
+      when {
+        !terminal -> Modifier.clipChatItem(ci, tailVisible, revealed = true)
+        gapBelowBlock -> Modifier.padding(bottom = TERMINAL_BLOCK_BOTTOM_GAP.toDp())
+        else -> Modifier
+      }
+    )
     .background(
       when {
-        transparentBackground -> Color.Transparent
+        transparentBackground || terminal -> Color.Transparent
         sent -> sentColor
         else -> receivedColor
       }
     )) {
     var metaColor = MaterialTheme.colors.secondary
-    Box(contentAlignment = Alignment.BottomEnd) {
-      val chatItemTail = remember { appPreferences.chatItemTail.state }
-      val style = shapeStyle(ci, chatItemTail.value, tailVisible, true)
-      val tailRendered = style is ShapeStyle.Bubble && style.tailVisible
-      Column(
-        Modifier
-          .width(IntrinsicSize.Max)
-          .padding(start = if (!sent && tailRendered) msgTailWidthDp else 0.dp, end = if (sent && tailRendered) msgTailWidthDp else 0.dp)
-      ) {
-        PriorityLayout(Modifier, CHAT_IMAGE_LAYOUT_ID) {
-          @Composable
-          fun Header() {
-            if (ci.isReport) {
-              if (ci.meta.itemDeleted == null) {
-                FramedItemHeader(
-                  stringResource(if (ci.chatDir.sent) MR.strings.report_item_visibility_submitter else MR.strings.report_item_visibility_moderators),
-                  true,
-                  painterResource(MR.images.ic_flag),
-                  iconColor = Color.Red
-                )
-              } else {
-                val text = if (ci.meta.itemDeleted is CIDeleted.Moderated && ci.meta.itemDeleted.byGroupMember.groupMemberId != (chatInfo as ChatInfo.Group?)?.groupInfo?.membership?.groupMemberId) {
-                  stringResource(MR.strings.report_item_archived_by).format(ci.meta.itemDeleted.byGroupMember.displayName)
+    ItemWithMeta(
+      meta = { CIMetaView(ci, chatTTL, metaColor, showViaProxy = showViaProxy, showTimestamp = showTimestamp) },
+      overlayMeta = if (captionlessMedia) { { CIMetaView(ci, chatTTL, Color.White, showViaProxy = showViaProxy, showTimestamp = showTimestamp, lineHeightColor = messageTextColor()) } } else null,
+      metaReserved = metaReserved,
+      endButton = endButton
+    ) { inlineMeta ->
+      Box(contentAlignment = Alignment.BottomEnd) {
+        val style = shapeStyle(ci, chatItemTailEnabled(), tailVisible, true)
+        val tailRendered = style is ShapeStyle.Bubble && style.tailVisible
+        Column(
+          Modifier
+            .width(IntrinsicSize.Max)
+            .padding(start = if (!sent && tailRendered) msgTailWidthDp else 0.dp, end = if (sent && tailRendered) msgTailWidthDp else 0.dp)
+        ) {
+          PriorityLayout(Modifier, CHAT_IMAGE_LAYOUT_ID, limitToPriorityWidth = !terminal || captionlessMedia) {
+            @Composable
+            fun Header() {
+              if (ci.isReport) {
+                if (ci.meta.itemDeleted == null) {
+                  FramedItemHeader(
+                    stringResource(if (ci.chatDir.sent) MR.strings.report_item_visibility_submitter else MR.strings.report_item_visibility_moderators),
+                    true,
+                    painterResource(MR.images.ic_flag),
+                    iconColor = Color.Red
+                  )
                 } else {
-                  stringResource(MR.strings.report_item_archived)
-                }
-                FramedItemHeader(text, true, painterResource(MR.images.ic_flag))
-              }
-            } else if (ci.meta.itemDeleted != null) {
-              when (ci.meta.itemDeleted) {
-                is CIDeleted.Moderated -> {
-                  FramedItemHeader(String.format(stringResource(MR.strings.moderated_item_description), ci.meta.itemDeleted.byGroupMember.chatViewName), true, painterResource(MR.images.ic_flag))
-                }
-                is CIDeleted.Blocked -> {
-                  FramedItemHeader(stringResource(MR.strings.blocked_item_description), true, painterResource(MR.images.ic_back_hand))
-                }
-                is CIDeleted.BlockedByAdmin -> {
-                  FramedItemHeader(stringResource(MR.strings.blocked_by_admin_item_description), true, painterResource(MR.images.ic_back_hand))
-                }
-                is CIDeleted.Deleted -> {
-                  FramedItemHeader(stringResource(MR.strings.marked_deleted_description), true, painterResource(MR.images.ic_delete))
-                }
-              }
-            } else if (ci.meta.isLive) {
-              FramedItemHeader(stringResource(MR.strings.live), false)
-            }
-          }
-          if (ci.quotedItem != null) {
-            Column(
-              Modifier
-                .combinedClickable(
-                  onLongClick = { showMenu.value = true },
-                  onClick = {
-                    if (ci.quotedItem.itemId != null) {
-                      if (ci.isReport && chatsCtx.secondaryContextFilter != null) {
-                        scrollToItemId.value = ci.quotedItem.itemId
-                      } else {
-                        scrollToItem(ci.quotedItem.itemId)
-                      }
-                    } else {
-                      scrollToQuotedItemFromItem(ci.id)
-                    }
+                  val text = if (ci.meta.itemDeleted is CIDeleted.Moderated && ci.meta.itemDeleted.byGroupMember.groupMemberId != (chatInfo as ChatInfo.Group?)?.groupInfo?.membership?.groupMemberId) {
+                    stringResource(MR.strings.report_item_archived_by).format(ci.meta.itemDeleted.byGroupMember.displayName)
+                  } else {
+                    stringResource(MR.strings.report_item_archived)
                   }
-                )
-                .onRightClick { showMenu.value = true }
-            ) {
-              Header()
-              ciQuoteView(ci.quotedItem)
-            }
-          } else {
-            Header()
-            val forwarded = ci.meta.itemForwarded
-            if (forwarded != null) {
-              val twoRowHeader = if (chatInfo.chatType == ChatType.Local) {
-                forwarded.chatTypeApiIdMsgId != null || forwarded.sourceGroupLink != null
-              } else {
-                when (forwarded) {
-                  is CIForwardedFrom.Group -> forwarded.groupType != null
-                  is CIForwardedFrom.GroupLink -> true
-                  else -> false
+                  FramedItemHeader(text, true, painterResource(MR.images.ic_flag))
                 }
-              }
-              if (twoRowHeader) {
-                val caption = stringResource(if (chatInfo.chatType == ChatType.Local) MR.strings.saved_from else MR.strings.forwarded_from)
-                Column(
-                  headerModifier(pad = true, onClick = {
-                    val target = forwarded.chatTypeApiIdMsgId
-                    val link = forwarded.sourceGroupLink
-                    if (target != null) {
-                      val (chatType, apiId, itemId) = target
-                      withBGApi { openChat(secondaryChatsCtx = null, chat.remoteHostId, chatType, apiId, itemId) }
-                    } else if (link != null) {
-                      withBGApi { planAndConnect(chat.remoteHostId, link, close = null) }
-                    }
-                  }),
-                  verticalArrangement = Arrangement.spacedBy(6.dp)
-                ) {
-                  HeaderRow(Modifier, caption, true, painterResource(MR.images.ic_forward), null)
-                  HeaderText(forwarded.chatName, italic = false, fontSize = 15.sp, modifier = Modifier.offset(y = (-2).dp))
+              } else if (ci.meta.itemDeleted != null) {
+                when (ci.meta.itemDeleted) {
+                  is CIDeleted.Moderated -> {
+                    FramedItemHeader(String.format(stringResource(MR.strings.moderated_item_description), ci.meta.itemDeleted.byGroupMember.chatViewName), true, painterResource(MR.images.ic_flag))
+                  }
+                  is CIDeleted.Blocked -> {
+                    FramedItemHeader(stringResource(MR.strings.blocked_item_description), true, painterResource(MR.images.ic_back_hand))
+                  }
+                  is CIDeleted.BlockedByAdmin -> {
+                    FramedItemHeader(stringResource(MR.strings.blocked_by_admin_item_description), true, painterResource(MR.images.ic_back_hand))
+                  }
+                  is CIDeleted.Deleted -> {
+                    FramedItemHeader(stringResource(MR.strings.marked_deleted_description), true, painterResource(MR.images.ic_delete))
+                  }
                 }
-              } else {
-                FramedItemHeader(forwarded.text(chatInfo.chatType), true, painterResource(MR.images.ic_forward), pad = true)
+              } else if (ci.meta.isLive) {
+                FramedItemHeader(stringResource(MR.strings.live), false)
               }
             }
-          }
-          if (ci.file == null && ci.formattedText == null && !ci.meta.isLive && isShortEmoji(ci.content.text)) {
-            Box(Modifier.padding(vertical = 6.dp, horizontal = 12.dp)) {
+            if (ci.quotedItem != null) {
               Column(
                 Modifier
-                  .padding(bottom = 2.dp)
-                  .fillMaxWidth(),
-                horizontalAlignment = Alignment.CenterHorizontally
-              ) {
-                EmojiText(ci.content.text)
-                Text(
-                  reserveSpaceForMeta(ci.meta, chatTTL, null, secondaryColor = MaterialTheme.colors.secondary, showViaProxy = showViaProxy, showTimestamp = showTimestamp),
-                  color = Color.Transparent,
-                  style = MaterialTheme.typography.body1
-                )
-              }
-            }
-          } else {
-            when (val mc = ci.content.msgContent) {
-              is MsgContent.MCImage -> {
-                CIImageView(image = mc.image, file = ci.file, imageProvider ?: return@PriorityLayout, showMenu, false, receiveFile)
-                if (mc.text == "" && !ci.meta.isLive) {
-                  metaColor = Color.White
-                } else {
-                  CIMarkdownText(chatsCtx, ci, chat, chatTTL, linkMode, uriHandler, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
-                }
-              }
-              is MsgContent.MCVideo -> {
-                CIVideoView(image = mc.image, mc.duration, file = ci.file, imageProvider ?: return@PriorityLayout, showMenu, smallView = false, receiveFile = receiveFile)
-                if (mc.text == "" && !ci.meta.isLive) {
-                  metaColor = Color.White
-                } else {
-                  CIMarkdownText(chatsCtx, ci, chat, 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(chatsCtx, ci, chat, chatTTL, linkMode, uriHandler, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
-                }
-              }
-              is MsgContent.MCFile -> ciFileView(ci, mc.text)
-              is MsgContent.MCUnknown ->
-                if (ci.file == null) {
-                  CIMarkdownText(chatsCtx, ci, chat, 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(chatsCtx, ci, chat, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
-                }
-              }
-              is MsgContent.MCChat -> {
-                val hasText = mc.text != mc.chatLink.connLinkStr
-                Box(
-                  Modifier.combinedClickable(
+                  .combinedClickable(
+                    onLongClick = { showMenu.value = true },
                     onClick = {
-                      withBGApi { planAndConnect(chat.remoteHostId, mc.chatLink.connLinkStr, linkOwnerSig = mc.ownerSig, close = null) }
-                    },
-                    onLongClick = { showMenu.value = true }
+                      if (ci.quotedItem.itemId != null) {
+                        if (ci.isReport && chatsCtx.secondaryContextFilter != null) {
+                          scrollToItemId.value = ci.quotedItem.itemId
+                        } else {
+                          scrollToItem(ci.quotedItem.itemId)
+                        }
+                      } else {
+                        scrollToQuotedItemFromItem(ci.id)
+                      }
+                    }
                   )
-                ) {
-                  CIChatLinkHeader(chatLink = mc.chatLink, ownerSig = mc.ownerSig, hasText = hasText)
-                }
-                if (hasText) {
-                  CIMarkdownText(chatsCtx, ci, chat, chatTTL, linkMode, uriHandler, showViaProxy = showViaProxy, showTimestamp = showTimestamp, stripLink = mc.chatLink.connLinkStr)
-                }
+                  .onRightClick { showMenu.value = true }
+              ) {
+                Header()
+                ciQuoteView(ci.quotedItem)
               }
-              is MsgContent.MCReport -> {
-                val prefix = buildAnnotatedString {
-                  withStyle(SpanStyle(color = Color.Red, fontStyle = FontStyle.Italic)) {
-                    append(itemPrefixText(ci))
+            } else {
+              Header()
+              val forwarded = ci.meta.itemForwarded
+              if (forwarded != null) {
+                val twoRowHeader = if (chatInfo.chatType == ChatType.Local) {
+                  forwarded.chatTypeApiIdMsgId != null || forwarded.sourceGroupLink != null
+                } else {
+                  when (forwarded) {
+                    is CIForwardedFrom.Group -> forwarded.groupType != null
+                    is CIForwardedFrom.GroupLink -> true
+                    else -> false
                   }
                 }
-                CIMarkdownText(chatsCtx, ci, chat, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy, showTimestamp = showTimestamp, prefix = prefix)
+                if (twoRowHeader) {
+                  val caption = stringResource(if (chatInfo.chatType == ChatType.Local) MR.strings.saved_from else MR.strings.forwarded_from)
+                  Column(
+                    headerModifier(pad = true, onClick = {
+                      val target = forwarded.chatTypeApiIdMsgId
+                      val link = forwarded.sourceGroupLink
+                      if (target != null) {
+                        val (chatType, apiId, itemId) = target
+                        withBGApi { openChat(secondaryChatsCtx = null, chat.remoteHostId, chatType, apiId, itemId) }
+                      } else if (link != null) {
+                        withBGApi { planAndConnect(chat.remoteHostId, link, close = null) }
+                      }
+                    }),
+                    verticalArrangement = Arrangement.spacedBy(6.dp)
+                  ) {
+                    HeaderRow(Modifier, caption, true, painterResource(MR.images.ic_forward), null)
+                    HeaderText(forwarded.chatName, italic = false, fontSize = 15.sp, modifier = Modifier.offset(y = (-2).dp))
+                  }
+                } else {
+                  FramedItemHeader(forwarded.text(chatInfo.chatType), true, painterResource(MR.images.ic_forward), pad = true)
+                }
+              }
+            }
+            if (ci.file == null && ci.formattedText == null && !ci.meta.isLive && isShortEmoji(ci.content.text)) {
+              Box(if (terminal) Modifier.padding(start = CHAT_ITEM_TEXT_PADDING, top = TERMINAL_EMOJI_TOP_GAP.toDp(), end = CHAT_ITEM_TEXT_PADDING, bottom = TERMINAL_EMOJI_BOTTOM_GAP.toDp()) else Modifier.padding(vertical = 6.dp, horizontal = 12.dp)) {
+                Column(
+                  if (terminal) Modifier.messageLastLine() else Modifier.padding(bottom = 2.dp).fillMaxWidth(),
+                  horizontalAlignment = Alignment.CenterHorizontally
+                ) {
+                  EmojiText(ci.content.text)
+                  if (!terminal) {
+                    Text(
+                      reserveSpaceForMeta(ci.meta, chatTTL, null, secondaryColor = MaterialTheme.colors.secondary, showViaProxy = showViaProxy, showTimestamp = showTimestamp),
+                      color = Color.Transparent,
+                      style = MaterialTheme.typography.body1
+                    )
+                  }
+                }
+              }
+            } else {
+              when (val mc = ci.content.msgContent) {
+                is MsgContent.MCImage -> {
+                  val provider = imageProvider ?: return@PriorityLayout
+                  Box(Modifier.layoutId(CHAT_IMAGE_LAYOUT_ID).then(mediaModifier)) {
+                    CIImageView(image = mc.image, file = ci.file, provider, showMenu, false, receiveFile)
+                  }
+                  if (mc.text == "" && !ci.meta.isLive) {
+                    if (!terminal) metaColor = Color.White
+                  } else {
+                    CIMarkdownText(chatsCtx, ci, chat, chatTTL, linkMode, uriHandler, showViaProxy = showViaProxy, showTimestamp = showTimestamp, terminalTop = TERMINAL_BLOCK_BOTTOM_GAP.toDp())
+                  }
+                }
+                is MsgContent.MCVideo -> {
+                  val provider = imageProvider ?: return@PriorityLayout
+                  Box(Modifier.layoutId(CHAT_IMAGE_LAYOUT_ID).then(mediaModifier)) {
+                    CIVideoView(image = mc.image, mc.duration, file = ci.file, provider, showMenu, smallView = false, receiveFile = receiveFile)
+                  }
+                  if (mc.text == "" && !ci.meta.isLive) {
+                    if (!terminal) metaColor = Color.White
+                  } else {
+                    CIMarkdownText(chatsCtx, ci, chat, chatTTL, linkMode, uriHandler, showViaProxy = showViaProxy, showTimestamp = showTimestamp, terminalTop = TERMINAL_BLOCK_BOTTOM_GAP.toDp())
+                  }
+                }
+                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(chatsCtx, ci, chat, chatTTL, linkMode, uriHandler, showViaProxy = showViaProxy, showTimestamp = showTimestamp, terminalTop = 0.dp)
+                  }
+                }
+                is MsgContent.MCFile -> ciFileView(ci, mc.text)
+                is MsgContent.MCUnknown ->
+                  if (ci.file == null) {
+                    CIMarkdownText(chatsCtx, ci, chat, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy, showTimestamp = showTimestamp, terminalTop = 0.dp)
+                  } else {
+                    ciFileView(ci, mc.text)
+                  }
+                is MsgContent.MCLink -> {
+                  Box(Modifier.layoutId(CHAT_IMAGE_LAYOUT_ID).then(if (terminal) cardModifier.padding(bottom = 8.dp) else Modifier)) {
+                    ChatItemLinkView(mc.preview, showMenu, onLongClick = { showMenu.value = true })
+                  }
+                  Box(if (terminal) Modifier else Modifier.widthIn(max = DEFAULT_MAX_IMAGE_WIDTH)) {
+                    CIMarkdownText(chatsCtx, ci, chat, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy, showTimestamp = showTimestamp, terminalTop = TERMINAL_BLOCK_BOTTOM_GAP.toDp())
+                  }
+                }
+                is MsgContent.MCChat -> {
+                  val hasText = mc.text != mc.chatLink.connLinkStr
+                  Box(
+                    Modifier.then(if (terminal) cardModifier.width(IntrinsicSize.Max) else Modifier).combinedClickable(
+                      onClick = {
+                        withBGApi { planAndConnect(chat.remoteHostId, mc.chatLink.connLinkStr, linkOwnerSig = mc.ownerSig, close = null) }
+                      },
+                      onLongClick = { showMenu.value = true }
+                    )
+                  ) {
+                    CIChatLinkHeader(chatLink = mc.chatLink, ownerSig = mc.ownerSig, hasText = hasText)
+                  }
+                  if (hasText) {
+                    CIMarkdownText(chatsCtx, ci, chat, chatTTL, linkMode, uriHandler, showViaProxy = showViaProxy, showTimestamp = showTimestamp, stripLink = mc.chatLink.connLinkStr, terminalTop = TERMINAL_BLOCK_BOTTOM_GAP.toDp())
+                  }
+                }
+                is MsgContent.MCReport -> {
+                  val prefix = buildAnnotatedString {
+                    withStyle(SpanStyle(color = Color.Red, fontStyle = FontStyle.Italic)) {
+                      append(itemPrefixText(ci))
+                    }
+                  }
+                  CIMarkdownText(chatsCtx, ci, chat, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy, showTimestamp = showTimestamp, prefix = prefix, terminalTop = 0.dp)
+                }
+                else -> CIMarkdownText(chatsCtx, ci, chat, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy, showTimestamp = showTimestamp, terminalTop = 0.dp)
               }
-              else -> CIMarkdownText(chatsCtx, ci, chat, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
             }
           }
         }
-      }
-      Box(
-        Modifier
-          .padding(
-            bottom = 6.dp,
-            end = 12.dp + if (tailRendered && sent) msgTailWidthDp else 0.dp,
-          )
-      ) {
-        CIMetaView(ci, chatTTL, metaColor, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
+        if (inlineMeta != null) {
+          Box(
+            Modifier
+              .padding(
+                bottom = 6.dp,
+                end = 12.dp + if (tailRendered && sent) msgTailWidthDp else 0.dp,
+              )
+          ) {
+            inlineMeta()
+          }
+        }
       }
     }
   }
@@ -454,18 +489,29 @@ fun CIMarkdownText(
   showViaProxy: Boolean,
   showTimestamp: Boolean,
   prefix: AnnotatedString? = null,
-  stripLink: String? = null
+  stripLink: String? = null,
+  terminalTop: Dp
 ) {
   val chatInfo = chat.chatInfo
   val text = if (ci.meta.isLive) ci.content.msgContent?.text ?: ci.text else ci.text
   val bases = remember(ci, linkMode) { itemDisplay(ci, linkMode)?.bases ?: listOf(0) }
   val selection = setupItemSelection(LocalSelectionManager.current, LocalItemContext.current.selectionIndex, ci.meta.isLive == true, bases)
+  val terminal = LocalTerminalLayout.current
 
-  Box(Modifier.padding(vertical = 7.dp, horizontal = 12.dp)) {
+  Box(
+    Modifier
+      .padding(
+        start = CHAT_ITEM_TEXT_PADDING,
+        top = if (terminal) terminalTop + terminalHeadingGap(ci).toDp() else CHAT_ITEM_TEXT_VERTICAL_PADDING,
+        end = CHAT_ITEM_TEXT_PADDING,
+        bottom = if (terminal) 0.dp else CHAT_ITEM_TEXT_VERTICAL_PADDING
+      )
+  ) {
     MarkdownText(
       text, if (text.isEmpty()) emptyList() else ci.formattedText, if (text.isEmpty()) null else ci.markdownBlocks, toggleSecrets = true,
       sendCommandMsg = if (chatInfo.useCommands && chat.chatInfo.sndReady) { { msg -> sendCommandMsg(chatsCtx, chat, msg) } } else null,
-      meta = ci.meta, chatTTL = chatTTL, linkMode = linkMode,
+      meta = ci.meta, chatTTL = chatTTL, encrypted = ci.encryptedFile, signedFileVerified = ci.file?.loaded, linkMode = linkMode,
+      style = MaterialTheme.typography.body1.copy(color = messageTextColor(), lineHeight = 22.sp).merge(terminalTextStyle(MaterialTheme.typography.body1.fontSize)),
       mentions = ci.mentions, userMemberId = when {
         chatInfo is ChatInfo.Group -> chatInfo.groupInfo.membership.memberId
         else -> null
@@ -494,7 +540,7 @@ fun sendCommandMsg(chatsCtx: ChatModel.ChatsContext, chat: Chat, msg: String) {
       if (!chatItems.isNullOrEmpty()) {
         chatItems.forEach { aChatItem ->
           withContext(Dispatchers.Main) {
-            chatsCtx.addChatItem(chat.remoteHostId, aChatItem.chatInfo, aChatItem.chatItem)
+            chatModel.addSentChatItem(chatsCtx, chat.remoteHostId, aChatItem.chatInfo, aChatItem.chatItem)
           }
         }
       }
@@ -509,6 +555,8 @@ const val CHAT_IMAGE_LAYOUT_ID = "chatImage"
 const val CHAT_BUBBLE_LAYOUT_ID = "chatBubble"
 const val CHAT_COMPOSE_LAYOUT_ID = "chatCompose"
 const val CONSOLE_COMPOSE_LAYOUT_ID = "consoleCompose"
+val CHAT_ITEM_TEXT_PADDING = 12.dp
+val CHAT_ITEM_TEXT_VERTICAL_PADDING = 7.dp
 
 /**
  * Compose shows "Can't represent a width of ... and height ... in Constraints" even when using built-in method for measuring max
@@ -524,6 +572,7 @@ private fun horizontalPaddingAroundCustomLayouts(density: Float): Int =
 fun PriorityLayout(
   modifier: Modifier = Modifier,
   priorityLayoutId: String,
+  limitToPriorityWidth: Boolean = true,
   content: @Composable () -> Unit
 ) {
   Layout(
@@ -540,9 +589,9 @@ fun PriorityLayout(
       if (it.layoutId == priorityLayoutId)
         imagePlaceable!!
       else
-        it.measure(constraints.copy(maxWidth = imagePlaceable?.width ?: constraints.maxWidth)) }
+        it.measure(constraints.copy(maxWidth = if (limitToPriorityWidth) imagePlaceable?.width ?: constraints.maxWidth else constraints.maxWidth)) }
     // Limit width for every other element to width of important element and height for a sum of all elements.
-    val width = imagePlaceable?.measuredWidth ?: placeables.maxOf { it.width }
+    val width = if (limitToPriorityWidth) imagePlaceable?.measuredWidth ?: placeables.maxOf { it.width } else placeables.maxOf { it.width }
     val height = placeables.sumOf { it.height }
     val adjustedConstraints = Constraints.fitPrioritizingHeight(constraints.minWidth, width, constraints.minHeight, height)
     layout(
@@ -551,7 +600,7 @@ fun PriorityLayout(
     ) {
       var y = 0
       placeables.forEach {
-        it.place(0, y)
+        if (limitToPriorityWidth) it.place(0, y) else it.placeRelative(0, y)
         y += it.measuredHeight
       }
     }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/IntegrityErrorItemView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/IntegrityErrorItemView.kt
index 9b378ea9ea..2869ce4168 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/IntegrityErrorItemView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/IntegrityErrorItemView.kt
@@ -52,24 +52,26 @@ fun IntegrityErrorItemView(msgError: MsgErrorType, ci: ChatItem, showTimestamp:
 @Composable
 fun CIMsgError(ci: ChatItem, showTimestamp: Boolean, timedMessagesTTL: Int?, onClick: () -> Unit) {
   val receivedColor = MaterialTheme.appColors.receivedMessage
-  Surface(
-    Modifier.clickable(onClick = onClick),
-    shape = RoundedCornerShape(18.dp),
-    color = receivedColor,
-    contentColor = LocalContentColor.current
-  ) {
-    Row(
-      Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
-      verticalAlignment = Alignment.Bottom
+  ItemWithMeta(meta = { CIMetaView(ci, timedMessagesTTL, showViaProxy = false, showTimestamp = showTimestamp) }) { inlineMeta ->
+    Surface(
+      Modifier.clickable(onClick = onClick),
+      shape = RoundedCornerShape(18.dp),
+      color = receivedColor,
+      contentColor = LocalContentColor.current
     ) {
-      Text(
-        buildAnnotatedString {
-          withStyle(SpanStyle(fontStyle = FontStyle.Italic, color = Color.Red)) { append(ci.content.text) }
-        },
-        style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp),
-        modifier = Modifier.padding(end = 8.dp)
-      )
-      CIMetaView(ci, timedMessagesTTL, showViaProxy = false, showTimestamp = showTimestamp)
+      Row(
+        Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
+        verticalAlignment = Alignment.Bottom
+      ) {
+        Text(
+          buildAnnotatedString {
+            withStyle(SpanStyle(fontStyle = FontStyle.Italic, color = Color.Red)) { append(ci.content.text) }
+          },
+          style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp),
+          modifier = Modifier.padding(end = if (inlineMeta != null) 8.dp else 0.dp)
+        )
+        inlineMeta?.invoke()
+      }
     }
   }
 }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/MarkdownBlocks.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/MarkdownBlocks.kt
index 75a778e567..637b53a23b 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/MarkdownBlocks.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/MarkdownBlocks.kt
@@ -21,13 +21,18 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.geometry.CornerRadius
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.graphics.takeOrElse
 import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.AlignmentLine
+import androidx.compose.ui.layout.FirstBaseline
+import androidx.compose.ui.layout.LastBaseline
 import androidx.compose.ui.layout.Layout
+import androidx.compose.ui.layout.layout
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.AnnotatedString
@@ -35,6 +40,9 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.Constraints
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.LayoutDirection
+import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.unit.takeOrElse
@@ -44,6 +52,8 @@ import chat.simplex.common.views.helpers.*
 import chat.simplex.res.*
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
+import kotlin.math.pow
+import kotlin.math.roundToInt
 
 @Composable
 fun MarkdownBlocks(
@@ -53,7 +63,8 @@ fun MarkdownBlocks(
   modifier: Modifier,
   cardColor: Color,
   blockText: @Composable (index: Int, range: SegmentRange, style: TextStyle, modifier: Modifier, softWrap: Boolean, last: Boolean) -> Unit,
-  metaLine: @Composable () -> Unit
+  metaLine: (@Composable () -> Unit)?,
+  ruleMinWidth: Dp
 ) {
   val roundness = remember { appPreferences.chatItemRoundness.state }.value.coerceIn(0f, 1f)
   val cardShape = RoundedCornerShape(12.dp * roundness)
@@ -61,6 +72,7 @@ fun MarkdownBlocks(
   val textColor = style.color.takeOrElse { MaterialTheme.colors.onSurface }
   val fontSize = style.fontSize.takeOrElse { 16.sp }
   val lineHeight = style.lineHeight.takeOrElse { 22.sp }
+  val terminal = LocalTerminalLayout.current
   val starts = remember(blocks) { blocks.runningFold(0) { n, b -> n + b.textRanges.size } }
   val lastIsText = when (blocks.lastOrNull()) {
     is MarkdownBlock.Paragraph, is MarkdownBlock.Heading, is MarkdownBlock.Quote, is MarkdownBlock.ItemList -> true
@@ -72,25 +84,31 @@ fun MarkdownBlocks(
   }
   Column(modifier) {
     blocks.forEachIndexed { k, block ->
-      if (k > 0 && paragraphBreak(formattedText, blocks[k - 1].end, block.start)) {
-        Spacer(Modifier.height(with(LocalDensity.current) { (lineHeight.toPx() / 2).toDp() }))
+      if (k > 0 && terminal && blocks[k - 1] is MarkdownBlock.Heading && block !is MarkdownBlock.Heading) {
+        Spacer(Modifier.height(TERMINAL_HEADING_BOTTOM_GAP.toDp()))
+      } else if (k > 0 && (paragraphBreak(formattedText, blocks[k - 1].end, block.start) || terminal && block is MarkdownBlock.Heading)) {
+        Spacer(Modifier.height(if (terminal) TERMINAL_LEVEL_STEP.toDp() else with(LocalDensity.current) { (lineHeight.toPx() / 2).toDp() }))
       }
       val start = starts[k]
+      val marksLastBlock = k == blocks.lastIndex && metaLine == null
+      val cardMargins = if (!terminal) Modifier else if (marksLastBlock) Modifier.padding(top = TERMINAL_BLOCK_TOP_GAP.toDp()).messageLastBlock() else Modifier.padding(top = TERMINAL_BLOCK_TOP_GAP.toDp(), bottom = TERMINAL_BLOCK_BOTTOM_GAP.toDp())
       when (block) {
         is MarkdownBlock.Paragraph -> BlockText(start, block.content, style)
         is MarkdownBlock.Heading -> {
-          val scale = when (block.level) {
+          val scale = if (terminal) TERMINAL_HEADING_RATIO.pow((3 - block.level).coerceAtLeast(0)) else when (block.level) {
             1 -> 1.5f
             2 -> 1.3f
             3 -> 1.15f
             else -> 1f
           }
-          BlockText(start, block.content, style.copy(fontSize = fontSize * scale, lineHeight = lineHeight * scale, fontWeight = FontWeight.Bold))
+          BlockText(
+            start, block.content, style.copy(fontSize = fontSize * scale, lineHeight = lineHeight * scale, fontWeight = FontWeight.Bold),
+            if (terminal) Modifier.headingBox(scale, fontSize) else Modifier
+          )
         }
-        is MarkdownBlock.Quote -> Row(Modifier.height(IntrinsicSize.Min)) {
-          Box(Modifier.width(4.dp).fillMaxHeight().clip(RoundedCornerShape(2.dp)).background(textColor.copy(alpha = if (MaterialTheme.colors.isLight) 0.16f else 0.22f)))
-          Spacer(Modifier.width(10.dp))
-          BlockText(start, block.content, style.copy(color = textColor.copy(alpha = 0.7f)))
+        is MarkdownBlock.Quote -> Box(Modifier.quoteBar(textColor)) {
+          val quoteColor = textColor.copy(alpha = 0.7f)
+          BlockText(start, block.content, style.copy(color = quoteColor).merge(terminalTextStyle(fontSize, quoteColor)))
         }
         is MarkdownBlock.ItemList -> listEntries(block.items, 0).forEachIndexed { j, (entry, level) ->
           Row(Modifier.padding(start = 20.dp * level)) {
@@ -99,13 +117,14 @@ fun MarkdownBlocks(
             BlockText(start + j, entry.content, style, Modifier.weight(1f, fill = false))
           }
         }
-        is MarkdownBlock.CodeBlock -> CodeBlockCard(cardShape, cardColor, roundness, codeText(formattedText, block.content)) { m ->
-          BlockText(start, block.content, style.copy(fontFamily = FontFamily.Monospace, fontSize = fontSize * 0.875f, lineHeight = lineHeight * 0.9f), m, softWrap = false)
+        is MarkdownBlock.CodeBlock -> CodeBlockCard(cardShape, cardColor, roundness, codeText(formattedText, block.content), cardMargins) { m ->
+          val codeFontSize = fontSize * 0.875f
+          BlockText(start, block.content, style.copy(fontFamily = FontFamily.Monospace, fontSize = codeFontSize, lineHeight = lineHeight * 0.9f).merge(terminalTextStyle(codeFontSize)), m, softWrap = false)
         }
         is MarkdownBlock.Table -> {
           val tableRows = listOf(block.header) + block.rows
           val rowStarts = tableRows.runningFold(start) { n, row -> n + row.size }
-          Box(Modifier.horizontalScroll(rememberScrollState())) {
+          Box(cardMargins.horizontalScroll(rememberScrollState())) {
             TableGrid(
               block.columns, tableRows.map { it.size }, cardColor, MaterialTheme.colors.secondary.copy(alpha = 0.1f), lineColor,
               Modifier.clip(cardShape).border(1.dp, lineColor, cardShape)
@@ -121,13 +140,38 @@ fun MarkdownBlocks(
             }
           }
         }
-        is MarkdownBlock.Rule -> Box(Modifier.padding(vertical = 6.dp).fillMaxWidth().height(1.dp).background(lineColor))
+        is MarkdownBlock.Rule -> Box((if (terminal) cardMargins.widthIn(min = ruleMinWidth) else Modifier.padding(vertical = 6.dp)).fillMaxWidth().height(1.dp).background(lineColor))
       }
     }
-    if (!lastIsText) metaLine()
+    if (!lastIsText) metaLine?.invoke()
   }
 }
 
+@Composable
+fun Modifier.quoteBar(textColor: Color): Modifier {
+  val color = textColor.copy(alpha = if (MaterialTheme.colors.isLight) 0.16f else 0.22f)
+  val barWidth = 4.dp
+  return drawBehind {
+    val width = barWidth.roundToPx().toFloat()
+    drawRoundRect(color, Offset(if (layoutDirection == LayoutDirection.Ltr) 0f else size.width - width, 0f), Size(width, size.height), CornerRadius(2.dp.toPx()))
+  }.padding(start = barWidth + 10.dp)
+}
+
+private fun Modifier.headingBox(scale: Float, bodyFontSize: TextUnit): Modifier =
+  layout { measurable, constraints ->
+    val placeable = measurable.measure(constraints)
+    val firstBaseline = placeable[FirstBaseline]
+    val lastBaseline = placeable[LastBaseline]
+    if (firstBaseline == AlignmentLine.Unspecified || lastBaseline == AlignmentLine.Unspecified) {
+      layout(placeable.width, placeable.height) { placeable.placeRelative(0, 0) }
+    } else {
+      val bodyRatio = bodyFontSize.toPx() / (bodyFontSize * scale).toPx()
+      val top = (firstBaseline * (1 - bodyRatio) - INTER_CAP_HEIGHT * ((bodyFontSize * scale).toPx() - bodyFontSize.toPx())).roundToInt()
+      val bottom = ((placeable.height - lastBaseline) * (1 - bodyRatio)).roundToInt()
+      layout(placeable.width, placeable.height - top - bottom) { placeable.placeRelative(0, -top) }
+    }
+  }
+
 private val MarkdownBlock.start: Int get() = when (this) {
   is MarkdownBlock.Rule -> mark.from
   else -> textRanges.firstOrNull()?.range?.from ?: 0
@@ -151,13 +195,13 @@ private fun codeText(fts: List<FormattedText>, r: SegmentRange): String =
   }
 
 @Composable
-private fun CodeBlockCard(shape: Shape, color: Color, roundness: Float, copyText: String, content: @Composable (Modifier) -> Unit) {
+private fun CodeBlockCard(shape: Shape, color: Color, roundness: Float, copyText: String, modifier: Modifier, content: @Composable (Modifier) -> Unit) {
   var tapped by remember { mutableStateOf(false) }
   val interactionSource = remember { MutableInteractionSource() }
   val hovered by interactionSource.collectIsHoveredAsState()
   val clipboard = LocalClipboardManager.current
   Box(
-    Modifier
+    modifier
       .fillMaxWidth()
       .clip(shape)
       .background(color)
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/MarkdownFileView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/MarkdownFileView.kt
index 189e69a925..15758a7296 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/MarkdownFileView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/MarkdownFileView.kt
@@ -96,11 +96,14 @@ fun showMarkdownFile(file: CIFile) {
       formatted,
       bidiControlChar.containsMatchIn(text)
     )
-    ModalManager.center.showModal(endButtons = {
-      if (formatted != null) MarkdownViewSwitch()
-      MarkdownFileSaveButton(file, bytes)
-    }) {
-      MarkdownFileView(file.fileName, document)
+    withContext(Dispatchers.Main) {
+      if (appPlatform.isDesktop && ModalManager.center.isTopModalOpen(ModalViewId.MARKDOWN_FILE)) ModalManager.center.closeModal()
+      ModalManager.center.showModal(id = ModalViewId.MARKDOWN_FILE, endButtons = {
+        if (formatted != null) MarkdownViewSwitch()
+        MarkdownFileSaveButton(file, bytes)
+      }) {
+        key(this) { MarkdownFileView(file.fileName, document) }
+      }
     }
   }
 }
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 c488b4172b..67ac3b293f 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
@@ -23,19 +23,21 @@ import kotlinx.datetime.Clock
 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(
-    shape = RoundedCornerShape(18.dp),
-    color = if (ci.chatDir.sent) sentColor else receivedColor,
-    contentColor = LocalContentColor.current
-  ) {
-    Row(
-      Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
-      verticalAlignment = Alignment.CenterVertically
+  ItemWithMeta(meta = { CIMetaView(ci, timedMessagesTTL, showViaProxy = showViaProxy, showTimestamp = showTimestamp) }) { inlineMeta ->
+    Surface(
+      shape = RoundedCornerShape(18.dp),
+      color = if (ci.chatDir.sent) sentColor else receivedColor,
+      contentColor = LocalContentColor.current
     ) {
-      Box(Modifier.weight(1f, false)) {
-        MergedMarkedDeletedText(chatsCtx, ci, chatInfo, revealed)
+      Row(
+        Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
+        verticalAlignment = Alignment.CenterVertically
+      ) {
+        Box(Modifier.weight(1f, false)) {
+          MergedMarkedDeletedText(chatsCtx, ci, chatInfo, revealed)
+        }
+        inlineMeta?.invoke()
       }
-      CIMetaView(ci, timedMessagesTTL, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
     }
   }
 }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TerminalItemView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TerminalItemView.kt
new file mode 100644
index 0000000000..3682c54d9d
--- /dev/null
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TerminalItemView.kt
@@ -0,0 +1,383 @@
+package chat.simplex.common.views.chat.item
+
+import androidx.compose.foundation.LocalIndication
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.hoverable
+import androidx.compose.foundation.indication
+import androidx.compose.foundation.interaction.Interaction
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.PressInteraction
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.ProvideTextStyle
+import androidx.compose.material.Text
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.compositeOver
+import androidx.compose.ui.graphics.luminance
+import androidx.compose.ui.input.pointer.PointerEventPass
+import androidx.compose.ui.input.pointer.changedToDownIgnoreConsumed
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.AlignmentLine
+import androidx.compose.ui.layout.FirstBaseline
+import androidx.compose.ui.layout.HorizontalAlignmentLine
+import androidx.compose.ui.layout.LastBaseline
+import androidx.compose.ui.layout.Layout
+import androidx.compose.ui.layout.Placeable
+import androidx.compose.ui.layout.VerticalAlignmentLine
+import androidx.compose.ui.layout.layout
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.LineHeightStyle
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.LayoutDirection
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.offset
+import androidx.compose.ui.unit.sp
+import chat.simplex.common.model.*
+import chat.simplex.common.platform.chatModel
+import chat.simplex.common.ui.theme.DEFAULT_PADDING_HALF
+import chat.simplex.common.views.chat.*
+import chat.simplex.common.views.helpers.*
+import chat.simplex.res.*
+import dev.icerock.moko.resources.compose.stringResource
+import kotlinx.coroutines.flow.Flow
+import kotlin.math.abs
+import kotlin.math.max
+import kotlin.math.min
+import kotlin.math.pow
+import kotlin.math.roundToInt
+
+val LocalTerminalLayout = staticCompositionLocalOf { false }
+
+val TERMINAL_BLOCK_TOP_GAP = 5.75.sp
+val TERMINAL_BLOCK_BOTTOM_GAP = 5.sp
+val TERMINAL_LEVEL_STEP = 4.75.sp
+val TERMINAL_HEADING_BOTTOM_GAP = TERMINAL_LEVEL_STEP / 2
+val TERMINAL_SENDER_TOP_GAP = 6.5.sp
+private val TERMINAL_SENDER_BOTTOM_GAP = 5.5.sp
+val TERMINAL_HEADER_TOP_GAP = 2.5.sp
+val TERMINAL_HEADER_BOTTOM_GAP = 1.5.sp
+val TERMINAL_EVENT_TOP_GAP = 8.25.sp
+val TERMINAL_EVENT_BOTTOM_GAP = 1.5.sp
+val TERMINAL_FILE_TOP_GAP = 2.sp
+val TERMINAL_EMOJI_TOP_GAP = 4.25.sp
+val TERMINAL_EMOJI_BOTTOM_GAP = 1.5.sp
+val TERMINAL_META_GAP = 6.sp
+const val TERMINAL_HEADING_RATIO = 1.3125f
+private const val TERMINAL_LINE_HEIGHT_RATIO = 22f / 16f
+private const val TERMINAL_LINE_HEIGHT_CONTRAST_SLOPE = 0.1515f
+const val INTER_CAP_HEIGHT = 2048f / 2816f
+private val TERMINAL_LINE_HEIGHT_STYLE = LineHeightStyle(LineHeightStyle.Alignment.Proportional, LineHeightStyle.Trim.None)
+
+@Composable
+fun terminalTextStyle(fontSize: TextUnit, color: Color = messageTextColor()): TextStyle =
+  if (LocalTerminalLayout.current) {
+    TextStyle(lineHeight = fontSize * (TERMINAL_LINE_HEIGHT_RATIO * contrastLineHeightFactor(color)), lineHeightStyle = TERMINAL_LINE_HEIGHT_STYLE)
+  } else {
+    TextStyle.Default
+  }
+
+@Composable
+private fun contrastLineHeightFactor(color: Color): Float {
+  val background = MaterialTheme.colors.background
+  val textContrast = lightnessContrast(messageTextColor(), background)
+  val weight = if (textContrast > 0f) (lightnessContrast(color, background) / textContrast).coerceIn(0f, 1f) else 1f
+  return 1 - TERMINAL_LINE_HEIGHT_CONTRAST_SLOPE * (1 - weight)
+}
+
+private fun lightnessContrast(color: Color, background: Color): Float =
+  abs(lightness(color.compositeOver(background)) - lightness(background))
+
+private fun lightness(color: Color): Float {
+  val y = color.luminance()
+  return if (y > 216f / 24389f) 116f * y.pow(1f / 3) - 16f else y * 24389f / 27f
+}
+
+fun terminalItemShowsSender(item: ChatItem, older: ChatItem?): Boolean =
+  item.content.hasTerminalSender && (older == null || !older.content.hasTerminalSender || !sameSender(item, older))
+
+private fun sameSender(item: ChatItem, older: ChatItem): Boolean {
+  val d = item.chatDir
+  val o = older.chatDir
+  return when {
+    item.channelIsSender || older.channelIsSender -> item.channelIsSender && older.channelIsSender
+    d is CIDirection.GroupRcv -> o is CIDirection.GroupRcv && o.groupMember.memberId == d.groupMember.memberId
+    else -> d::class == o::class
+  }
+}
+
+private val ChatItem.channelIsSender: Boolean get() =
+  chatDir is CIDirection.ChannelRcv || (chatDir is CIDirection.GroupSnd && meta.showGroupAsSender)
+
+fun terminalRowGap(item: ChatItem, older: ChatItem?, separated: Boolean, largeGap: Boolean, hasSenderRow: Boolean): TextUnit =
+  if (older != null && !separated && (largeGap || hasSenderRow || !item.content.hasTerminalSender || !older.content.hasTerminalSender || item.textAtItemTop && item.startsWithHeading)) TERMINAL_LEVEL_STEP else 0.sp
+
+fun terminalHeadingGap(item: ChatItem): TextUnit =
+  if (!item.textAtItemTop && item.startsWithHeading) TERMINAL_LEVEL_STEP else 0.sp
+
+private val ChatItem.textAtItemTop: Boolean get() =
+  (content.msgContent is MsgContent.MCText || content.msgContent is MsgContent.MCUnknown && file == null) && !hasQuoteOrHeader
+
+private val ChatItem.startsWithHeading: Boolean get() =
+  markdownBlocks?.firstOrNull() is MarkdownBlock.Heading
+
+private val CIContent.hasTerminalSender: Boolean get() = when (this) {
+  is CIContent.SndMsgContent,
+  is CIContent.SndDeleted,
+  is CIContent.SndCall,
+  is CIContent.SndGroupInvitation,
+  is CIContent.SndModerated -> true
+  else -> showMemberName
+}
+
+class TerminalRowInteractionSource : MutableInteractionSource {
+  private val source = MutableInteractionSource()
+  private var press: PressInteraction.Press? = null
+  var downPosition = Offset.Zero
+  override val interactions: Flow<Interaction> = source.interactions
+  override suspend fun emit(interaction: Interaction) = source.emit(rowInteraction(interaction))
+  override fun tryEmit(interaction: Interaction): Boolean = source.tryEmit(rowInteraction(interaction))
+
+  private fun rowInteraction(interaction: Interaction): Interaction = when (interaction) {
+    is PressInteraction.Press -> PressInteraction.Press(downPosition).also { press = it }
+    is PressInteraction.Release -> PressInteraction.Release(press ?: interaction.press)
+    is PressInteraction.Cancel -> PressInteraction.Cancel(press ?: interaction.press)
+    else -> interaction
+  }
+}
+
+@Composable
+fun Modifier.terminalRowIndication(interactionSource: TerminalRowInteractionSource): Modifier =
+  this
+    .pointerInput(interactionSource) {
+      awaitPointerEventScope {
+        while (true) {
+          awaitPointerEvent(PointerEventPass.Initial).changes.firstOrNull { it.changedToDownIgnoreConsumed() }?.let { interactionSource.downPosition = it.position }
+        }
+      }
+    }
+    .hoverable(interactionSource)
+    .indication(interactionSource, LocalIndication.current)
+
+fun Modifier.terminalStartOffset(offset: () -> Dp): Modifier =
+  layout { measurable, constraints ->
+    val start = offset().roundToPx()
+    val placeable = measurable.measure(constraints.offset(horizontal = -start))
+    layout(placeable.width + start, placeable.height) { placeable.placeRelative(start, 0) }
+  }
+
+private val LastLineLeft = VerticalAlignmentLine(::min)
+private val LastLineRight = VerticalAlignmentLine(::max)
+private val LastBlockBottom = HorizontalAlignmentLine(::max)
+
+fun Modifier.messageLastLine(): Modifier = lastLine { emptyMap() }
+
+fun Modifier.messageLastBlock(): Modifier = lastLine { mapOf(LastBlockBottom to it.height) }
+
+private fun Modifier.lastLine(extraAlignmentLines: (Placeable) -> Map<AlignmentLine, Int>): Modifier =
+  layout { measurable, constraints ->
+    val placeable = measurable.measure(constraints)
+    layout(placeable.width, placeable.height, mapOf(LastLineLeft to 0, LastLineRight to placeable.width) + extraAlignmentLines(placeable)) { placeable.placeRelative(0, 0) }
+  }
+
+@Composable
+fun Modifier.inlineIcon(): Modifier =
+  if (LocalTerminalLayout.current) {
+    layout { measurable, constraints ->
+      val placeable = measurable.measure(constraints)
+      layout(placeable.width, 0) { placeable.placeRelative(0, -placeable.height / 2) }
+    }
+  } else {
+    this
+  }
+
+@Composable
+fun ItemWithMeta(meta: @Composable () -> Unit, overlayMeta: (@Composable () -> Unit)? = null, metaReserved: Boolean = false, endButton: (@Composable () -> Unit)? = null, content: @Composable (inlineMeta: (@Composable () -> Unit)?) -> Unit) {
+  if (LocalTerminalLayout.current) {
+    TerminalMetaLayout(metaReserved, hasOverlay = overlayMeta != null) {
+      content(null)
+      listOfNotNull(meta, overlayMeta, endButton).forEach { m ->
+        Box(Modifier.padding(end = 12.dp)) {
+          m()
+        }
+      }
+    }
+  } else {
+    content(meta)
+  }
+}
+
+@Composable
+private fun TerminalMetaLayout(metaReserved: Boolean, hasOverlay: Boolean, contentWithMeta: @Composable () -> Unit) {
+  Layout(contentWithMeta) { measurables, constraints ->
+    val metaConstraints = constraints.copy(minWidth = 0, minHeight = 0)
+    val meta = measurables[1].measure(metaConstraints)
+    val overlay = if (hasOverlay) measurables[2].measure(metaConstraints) else null
+    val endButton = measurables.getOrNull(if (hasOverlay) 3 else 2)?.measure(metaConstraints)
+    val besideMeta = !metaReserved && overlay == null
+    val reservedWidth = max(if (besideMeta) meta.width else 0, endButton?.width ?: 0)
+    val contentMaxWidth = if (constraints.hasBoundedWidth) (constraints.maxWidth - reservedWidth).coerceAtLeast(0) else constraints.maxWidth
+    val content = measurables[0].measure(constraints.copy(minWidth = 0, maxWidth = contentMaxWidth))
+    val width = if (constraints.hasBoundedWidth) constraints.maxWidth else max(content.width + reservedWidth, meta.width)
+    val gap = TERMINAL_META_GAP.toPx().roundToInt()
+    val lineEnd = if (layoutDirection == LayoutDirection.Ltr) {
+      content[LastLineRight].takeIf { it != AlignmentLine.Unspecified }
+    } else {
+      content[LastLineLeft].takeIf { it != AlignmentLine.Unspecified }?.let { content.width - it }
+    }
+    val metaBelow = lineEnd != null && lineEnd + meta.width > width
+    val textBaseline = content[LastBaseline]
+    val metaBaseline = meta[FirstBaseline].takeIf { it != AlignmentLine.Unspecified } ?: ((meta.height + 12.sp.toPx() * INTER_CAP_HEIGHT) / 2).roundToInt()
+    val metaTop = when {
+      metaBelow -> content.height + gap
+      overlay == null && textBaseline != AlignmentLine.Unspecified -> textBaseline - metaBaseline
+      else -> content.height - gap - meta.height
+    }.coerceAtLeast(0)
+    val blockGap = if (content[LastBlockBottom] == content.height) TERMINAL_BLOCK_BOTTOM_GAP.toPx().roundToInt() else 0
+    val placedOverlay = overlay?.takeIf { content.width + meta.width > width }
+    val endButtonHeight = endButton?.height ?: 0
+    val endButtonTop = (((if (placedOverlay != null) content.height else metaTop) - endButtonHeight) / 2).coerceAtLeast(0)
+    layout(width, maxOf(content.height + blockGap, metaTop + meta.height, placedOverlay?.height ?: 0, endButtonTop + endButtonHeight)) {
+      content.placeRelative(0, 0)
+      if (placedOverlay != null) {
+        placedOverlay.placeRelative(content.width - placedOverlay.width, (content.height - gap - placedOverlay.height).coerceAtLeast(0))
+      } else {
+        meta.placeRelative(width - meta.width, metaTop)
+      }
+      endButton?.placeRelative(width - endButton.width, endButtonTop)
+    }
+  }
+}
+
+class ChatItemSender(val name: String, val badge: LocalBadge?, val role: String?, val own: Boolean, val image: (@Composable () -> Unit)?)
+
+@Composable
+fun chatItemSender(
+  chatInfo: ChatInfo,
+  cItem: ChatItem,
+  range: State<IntRange?>,
+  reversedChatItems: State<List<ChatItem>>,
+  showMemberInfo: (GroupInfo, GroupMember) -> Unit,
+  showChatInfo: () -> Unit
+): ChatItemSender {
+  val dir = cItem.chatDir
+  return when {
+    cItem.channelIsSender && chatInfo is ChatInfo.Group ->
+      ChatItemSender(chatInfo.chatViewName, null, stringResource(MR.strings.channel_role_label), dir.sent) {
+        Box(Modifier.clickable { showChatInfo() }) {
+          ProfileImage(MEMBER_IMAGE_SIZE * fontSizeSqrtMultiplier, chatInfo.groupInfo.image, chatInfo.groupInfo.chatIconName, backgroundColor = MaterialTheme.colors.background)
+        }
+      }
+    dir is CIDirection.DirectRcv ->
+      ChatItemSender(chatInfo.displayName, chatInfo.nameBadge, null, false, null)
+    dir is CIDirection.GroupRcv && chatInfo is ChatInfo.Group -> {
+      val member = dir.groupMember
+      val rangeValue = range.value
+      val (prevMember, memCount) = if (rangeValue != null) chatModel.getPrevHiddenMember(member, rangeValue, reversedChatItems.value) else null to 1
+      ChatItemSender(
+        memberNames(member, prevMember, memCount),
+        if (prevMember == null && memCount == 1) member.nameBadge else null,
+        if (memCount == 1) memberRole(member, chatInfo.isChannel) else null,
+        false
+      ) {
+        Box(Modifier.clickable { showMemberInfo(chatInfo.groupInfo, member) }) {
+          MemberImage(member)
+        }
+      }
+    }
+    dir is CIDirection.GroupSnd && chatInfo is ChatInfo.Group -> {
+      val membership = chatInfo.groupInfo.membership
+      ChatItemSender(membership.displayName, membership.nameBadge, memberRole(membership, chatInfo.isChannel), true) {
+        MemberImage(membership)
+      }
+    }
+    chatInfo.incognito ->
+      ChatItemSender(stringResource(MR.strings.incognito), null, null, true, null)
+    else -> {
+      val user = chatModel.currentUser.value
+      ChatItemSender(user?.displayName ?: "", user?.profile?.localBadge, null, true, null)
+    }
+  }
+}
+
+private fun memberRole(member: GroupMember, isChannel: Boolean): String? =
+  if (member.memberRole > GroupMemberRole.Member) member.memberRole.text(isChannel) else null
+
+@Composable
+private fun SenderNameAndRole(sender: ChatItemSender, modifier: Modifier) {
+  Row(modifier) {
+    NameWithBadge(
+      sender.name,
+      sender.badge,
+      Modifier.weight(1f, false),
+      fontSize = 13.5.sp,
+      color = if (sender.own) MaterialTheme.colors.primary else MaterialTheme.colors.secondary,
+      overflow = TextOverflow.Ellipsis,
+      maxLines = 1
+    )
+    if (sender.role != null) {
+      Text(
+        sender.role,
+        Modifier.padding(start = DEFAULT_PADDING_HALF * 1.5f),
+        fontSize = 13.5.sp,
+        fontWeight = FontWeight.Medium,
+        color = MaterialTheme.colors.secondary,
+        maxLines = 1
+      )
+    }
+  }
+}
+
+@Composable
+fun terminalGutter(chatInfo: ChatInfo): Dp =
+  if (chatInfo is ChatInfo.Group) MEMBER_IMAGE_SIZE * fontSizeSqrtMultiplier + 4.dp else 0.dp
+
+@Composable
+fun TerminalChatItemRow(
+  sender: ChatItemSender?,
+  gutter: Dp,
+  topGap: Dp,
+  modifier: Modifier = Modifier,
+  senderTopGap: Dp = TERMINAL_SENDER_TOP_GAP.toDp(),
+  content: @Composable () -> Unit
+) {
+  Layout(
+    content = {
+      Box {
+        sender?.image?.invoke()
+      }
+      Box {
+        if (sender != null) {
+          ProvideTextStyle(LocalTextStyle.current.merge(terminalTextStyle(13.5.sp))) {
+            SenderNameAndRole(sender, Modifier.padding(start = CHAT_ITEM_TEXT_PADDING, bottom = TERMINAL_SENDER_BOTTOM_GAP.toDp()))
+          }
+        }
+      }
+      Box {
+        content()
+      }
+    },
+    modifier
+      .padding(top = topGap + if (sender != null) senderTopGap else 0.dp, start = 8.dp, end = 12.dp)
+      .fillMaxWidth()
+  ) { measurables, constraints ->
+    val messageStart = gutter.roundToPx()
+    val looseConstraints = constraints.copy(minWidth = 0, minHeight = 0)
+    val messageConstraints = looseConstraints.copy(maxWidth = (constraints.maxWidth - messageStart).coerceAtLeast(0))
+    val avatar = measurables[0].measure(looseConstraints)
+    val name = measurables[1].measure(messageConstraints)
+    val message = measurables[2].measure(messageConstraints)
+    val messageTop = name.height
+    layout(constraints.maxWidth, max(messageTop + message.height, avatar.height)) {
+      avatar.placeRelative(0, 0)
+      name.placeRelative(messageStart, 0)
+      message.placeRelative(messageStart, messageTop)
+    }
+  }
+}
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 9b3162744d..ec79fd73c4 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
@@ -50,6 +50,9 @@ import kotlinx.coroutines.*
 val reserveTimestampStyle = SpanStyle(color = Color.Transparent)
 val boldFont = SpanStyle(fontWeight = FontWeight.Medium)
 
+@Composable
+fun messageTextColor(): Color = MaterialTheme.colors.onSurface.copy(alpha = if (MaterialTheme.colors.isLight) 1f else 0.87f)
+
 fun appendSender(b: AnnotatedString.Builder, sender: String?, senderBold: Boolean) {
   if (sender != null) {
     if (senderBold) b.withStyle(boldFont) { append(sender) }
@@ -65,21 +68,24 @@ private fun openMarkdownModal(modal: Format.Modal) {
 }
 
 private fun showFullProfileDescription(description: String) {
-  ModalManager.end.showModalCloseable { _ ->
-    ColumnWithScrollBar {
-      AppBarTitle(generalGetString(MR.strings.profile_description__field))
-      val parsed = parseToMarkdownText(description)
-      MarkdownText(
-        description,
-        parsed?.formattedText,
-        parsed?.markdownBlocks,
-        toggleSecrets = true,
-        style = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground, lineHeight = 22.sp),
-        uriHandler = LocalUriHandler.current,
-        linkMode = chatModel.simplexLinkMode.value,
-        modifier = Modifier.padding(horizontal = DEFAULT_PADDING).padding(bottom = DEFAULT_PADDING),
-        blockLayout = true,
-      )
+  if (ModalManager.end.isTopModalOpen(ModalViewId.PROFILE_DESCRIPTION)) ModalManager.end.closeModal()
+  ModalManager.end.showModalCloseable(id = ModalViewId.PROFILE_DESCRIPTION) { _ ->
+    key(this) {
+      ColumnWithScrollBar {
+        AppBarTitle(generalGetString(MR.strings.profile_description__field))
+        val parsed = parseToMarkdownText(description)
+        MarkdownText(
+          description,
+          parsed?.formattedText,
+          parsed?.markdownBlocks,
+          toggleSecrets = true,
+          style = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground, lineHeight = 22.sp),
+          uriHandler = LocalUriHandler.current,
+          linkMode = chatModel.simplexLinkMode.value,
+          modifier = Modifier.padding(horizontal = DEFAULT_PADDING).padding(bottom = DEFAULT_PADDING),
+          blockLayout = true,
+        )
+      }
     }
   }
 }
@@ -171,11 +177,13 @@ fun MarkdownText (
   sender: String? = null,
   meta: CIMeta? = null,
   chatTTL: Int? = null,
+  encrypted: Boolean? = null,
+  signedFileVerified: Boolean? = null,
   mentions: Map<String, CIMention>? = null,
   userMemberId: String? = null,
   toggleSecrets: Boolean,
   sendCommandMsg: ((String) -> Unit)? = null,
-  style: TextStyle = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onSurface, lineHeight = 22.sp),
+  style: TextStyle = MaterialTheme.typography.body1.copy(color = messageTextColor(), lineHeight = 22.sp),
   maxLines: Int = Int.MAX_VALUE,
   overflow: TextOverflow = TextOverflow.Clip,
   uriHandler: UriHandler? = null,
@@ -201,36 +209,49 @@ fun MarkdownText (
   val textLayoutDirection = remember (text) {
     if (isRtl(text.subSequence(0, kotlin.math.min(50, text.length)))) LayoutDirection.Rtl else LayoutDirection.Ltr
   }
+  val metaCopy = if (meta != null && LocalTerminalLayout.current) {
+    terminalReserveSpaceForMeta(meta, chatTTL, encrypted, signedFileVerified, MaterialTheme.colors.secondary, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
+  } else null
   if (blockLayout && formattedText != null && markdownBlocks != null && range == null) {
     val direction = LocalLayoutDirection.current
+    val terminal = LocalTerminalLayout.current
+    val ruleMinWidth = if (metaCopy != null && markdownBlocks.isNotEmpty() && markdownBlocks.all { it is MarkdownBlock.Rule }) {
+      with(LocalDensity.current) { rememberTextMeasurer().measure(metaCopy, style).size.width.toDp() }
+    } else 0.dp
     CompositionLocalProvider(LocalLayoutDirection provides textLayoutDirection) {
       MarkdownBlocks(
         formattedText, markdownBlocks, style, modifier, cardColor ?: MaterialTheme.appColors.receivedQuote,
         blockText = { index, r, blockStyle, blockModifier, blockSoftWrap, last ->
           MarkdownText(
             text, formattedText, markdownBlocks, sender = if (index == 0) sender else null, meta = if (last) meta else null, chatTTL = chatTTL,
+            encrypted = encrypted, signedFileVerified = signedFileVerified,
             mentions = mentions, userMemberId = userMemberId, toggleSecrets = toggleSecrets, sendCommandMsg = sendCommandMsg, style = blockStyle,
             uriHandler = uriHandler, senderBold = senderBold, modifier = blockModifier, linkMode = linkMode, onLinkLongClick = onLinkLongClick,
             showViaProxy = showViaProxy, showTimestamp = showTimestamp, prefix = if (index == 0) prefix else null,
             selection = selection, textIndex = index, range = r.from until r.to, softWrap = blockSoftWrap, parentDirection = direction
           )
         },
-        metaLine = {
-          MarkdownText(
-            text, formattedText, markdownBlocks, meta = meta, chatTTL = chatTTL, toggleSecrets = toggleSecrets, style = style,
-            linkMode = linkMode, showViaProxy = showViaProxy, showTimestamp = showTimestamp, range = IntRange.EMPTY
-          )
-        }
+        metaLine = if (terminal && meta?.isLive != true) null else {
+          {
+            MarkdownText(
+              text, formattedText, markdownBlocks, meta = meta, chatTTL = chatTTL, encrypted = encrypted, signedFileVerified = signedFileVerified, toggleSecrets = toggleSecrets, style = style,
+              linkMode = linkMode, showViaProxy = showViaProxy, showTimestamp = showTimestamp, range = IntRange.EMPTY, parentDirection = if (terminal) direction else null
+            )
+          }
+        },
+        ruleMinWidth = ruleMinWidth
       )
     }
     return
   }
-  val reserve = if (textLayoutDirection != (parentDirection ?: LocalLayoutDirection.current) && meta != null) {
-    "\n"
-  } else if (meta != null) {
-    reserveSpaceForMeta(meta, chatTTL, null, secondaryColor = MaterialTheme.colors.secondary, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
-  } else {
-    "    "
+  val reserve = meta?.let {
+    if (textLayoutDirection != (parentDirection ?: LocalLayoutDirection.current)) {
+      AnnotatedString("\n")
+    } else if (metaCopy != null) {
+      metaCopy
+    } else {
+      AnnotatedString(reserveSpaceForMeta(it, chatTTL, null, secondaryColor = MaterialTheme.colors.secondary, showViaProxy = showViaProxy, showTimestamp = showTimestamp))
+    }
   }
   val scope = rememberCoroutineScope()
   CompositionLocalProvider(
@@ -281,7 +302,7 @@ fun MarkdownText (
         if (meta?.isLive == true) {
           append(typingIndicator(meta.recent, typingIdx))
         }
-        if (meta != null) withStyle(reserveTimestampStyle) { append(reserve) }
+        if (reserve != null) withStyle(reserveTimestampStyle) { append(reserve) }
       }
       val clampedRange = textSelection?.highlightRange?.let { it.first .. minOf(it.last, selectableEnd - 1) }?.takeUnless { it.isEmpty() }
       if (textSelection != null) {
@@ -437,7 +458,7 @@ fun MarkdownText (
         // With RTL language set globally links looks bad sometimes, better to add a new line to bo sure everything looks good
         /*if (metaText != null && hasLinks && LocalLayoutDirection.current == LayoutDirection.Rtl)
           withStyle(reserveTimestampStyle) { append("\n" + metaText) }
-        else */if (meta != null) withStyle(reserveTimestampStyle) { append(reserve) }
+        else */if (reserve != null) withStyle(reserveTimestampStyle) { append(reserve) }
       }
       val clampedRange = textSelection?.highlightRange?.let { it.first .. minOf(it.last, selectableEnd - 1) }?.takeUnless { it.isEmpty() }
       val layoutResult = remember { mutableStateOf<TextLayoutResult?>(null) }
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 ea567d7da6..e3f6b92be8 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
@@ -274,8 +274,12 @@ fun UserPicker(
           painterResource(MR.images.ic_manage_accounts),
           generalGetString(MR.strings.create_chat_profile),
           {
+            if (ModalManager.center.isTopModalOpen(ModalViewId.CREATE_PROFILE)) {
+              userPickerState.value = AnimatedViewState.HIDING
+              return@UserPickerOptionRow
+            }
             doWithAuth(generalGetString(MR.strings.auth_open_chat_profiles), generalGetString(MR.strings.auth_log_in_using_credential)) {
-              ModalManager.center.showModalCloseable { close ->
+              ModalManager.center.showModalCloseable(id = ModalViewId.CREATE_PROFILE) { close ->
                 LaunchedEffect(Unit) {
                   userPickerState.value = AnimatedViewState.HIDING
                 }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ChatInfoImage.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ChatInfoImage.kt
index 036bcab68d..b09efe7d1d 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ChatInfoImage.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ChatInfoImage.kt
@@ -252,7 +252,7 @@ fun showBadgeInfoAlert(name: String, badge: LocalBadge, uriHandler: UriHandler)
           text = supports,
           confirmText = generalGetString(MR.strings.ok),
           dismissText = generalGetString(MR.strings.badges_support_simplex_title),
-          onDismiss = ::openBadgesView
+          onDismiss = { if (!appPlatform.isDesktop || !ModalManager.end.hasModalOpen(ModalViewId.BADGES)) openBadgesView() }
         )
       } else {
         AlertManager.shared.showAlertMsg(title = title, text = supports)
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 3655c4053d..7f6ee13d98 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
@@ -9,6 +9,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.input.pointer.pointerInput
 import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.platform.*
 import LocalCardScreen
@@ -93,7 +94,11 @@ enum class ModalViewId {
   CONTEXT_USER_PICKER_INCOGNITO,
   BADGE_LINK,
   BADGE_REDEEM_CODE,
-  BADGES
+  BADGES,
+  CREATE_PROFILE,
+  PROFILE_DESCRIPTION,
+  MARKDOWN_FILE,
+  CHAT_ITEM_INFO
 }
 
 class ModalManager(private val placement: ModalPlacement? = null) {
@@ -118,6 +123,8 @@ class ModalManager(private val placement: ModalPlacement? = null) {
 
   fun isLastModalOpen(id: ModalViewId): Boolean = modalViews.lastOrNull()?.id == id
 
+  fun isTopModalOpen(id: ModalViewId): Boolean = modalViews.getOrNull(modalViews.size - toRemove.size - 1)?.id == id
+
   fun isLastModal(data: ModalData): Boolean = modalViews.getOrNull(modalViews.size - toRemove.size - 1)?.data === data
 
   fun showModal(settings: Boolean = false, showClose: Boolean = true, id: ModalViewId? = null, forceAnimated: Boolean = false, cardScreen: Boolean = false, endButtons: @Composable RowScope.() -> Unit = {}, content: @Composable ModalData.() -> Unit) {
@@ -224,6 +231,10 @@ class ModalManager(private val placement: ModalPlacement? = null) {
       if (toRemove.isNotEmpty() && it == modalCount.value && transition.currentState == EnterExitState.Visible && !transition.isRunning) {
         runAtomically { toRemove.removeIf { elem -> modalViews.removeAt(elem); true } }
       }
+      // Until the opening modal covers the page that opened it, or the view under the first modal, a second click there would open it again
+      if (transition.targetState == EnterExitState.PostExit && it < modalCount.value) {
+        Box(Modifier.fillMaxSize().pointerInput(Unit) {})
+      }
     }
   }
 
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ThemeModeEditor.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ThemeModeEditor.kt
index 98ea245886..807d1b2f54 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ThemeModeEditor.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ThemeModeEditor.kt
@@ -13,9 +13,11 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import chat.simplex.common.model.ChatController.appPrefs
+import chat.simplex.common.model.ChatLayoutMode
 import chat.simplex.common.model.yaml
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
+import chat.simplex.common.views.chat.item.LocalTerminalLayout
 import chat.simplex.common.views.usersettings.*
 import chat.simplex.common.views.usersettings.AppearanceScope.WallpaperPresetSelector
 import chat.simplex.common.views.usersettings.AppearanceScope.editColor
@@ -95,11 +97,13 @@ fun ModalData.UserWallpaperEditor(
       }
     }
 
+    val terminal = LocalTerminalLayout.current
     val editColor = { name: ThemeColor ->
       editColor(
         name,
         wallpaperType,
         wallpaperImage,
+        terminal,
         onColorChange = { color ->
           preApplyGlobalIfNeeded(themeModeOverride.value.type)
           ThemeManager.applyThemeColor(name, color, themeModeOverride)
@@ -235,6 +239,7 @@ fun ModalData.ChatWallpaperEditor(
   theme: ThemeModeOverride,
   applyToMode: DefaultThemeMode?,
   globalThemeUsed: MutableState<Boolean>,
+  layoutSection: @Composable () -> Unit,
   save: suspend (applyToMode: DefaultThemeMode?, ThemeModeOverride?) -> Unit
 ) {
   ColumnWithScrollBar {
@@ -249,6 +254,10 @@ fun ModalData.ChatWallpaperEditor(
 
     AppBarTitle(stringResource(MR.strings.settings_section_title_chat_theme))
 
+    layoutSection()
+
+    SectionDividerSpaced()
+
     val onTypeCopyFromSameTheme: (WallpaperType?) -> Boolean = { type ->
       if (type is WallpaperType.Image && chatModel.remoteHostId() != null) {
         false
@@ -277,6 +286,7 @@ fun ModalData.ChatWallpaperEditor(
       withBGApi { save(applyToMode.value, themeModeOverride.value) }
     }
 
+    val terminal = LocalTerminalLayout.current
     val editColor: (ThemeColor) -> Unit = { name: ThemeColor ->
       ModalManager.end.showModal {
         val currentTheme by remember(themeModeOverride.value, CurrentColors.collectAsState().value) {
@@ -300,23 +310,25 @@ fun ModalData.ChatWallpaperEditor(
           ThemeColor.RECEIVED_MESSAGE -> currentTheme.appColors.receivedMessage
           ThemeColor.RECEIVED_QUOTE -> currentTheme.appColors.receivedQuote
         }
-        AppearanceScope.ColorEditor(
-          name,
-          initialColor,
-          CurrentColors.collectAsState().value.base,
-          themeModeOverride.value.type,
-          themeModeOverride.value.type?.image,
-          currentTheme.wallpaper.background,
-          currentTheme.wallpaper.tint,
-          currentColors = {
-            ThemeManager.currentColors(null, themeModeOverride.value, chatModel.currentUser.value?.uiThemes, appPreferences.themeOverrides.get())
-          },
-          onColorChange = { color ->
-            preApplyGlobalIfNeeded(themeModeOverride.value.type)
-            ThemeManager.applyThemeColor(name, color, themeModeOverride)
-            withBGApi { save(applyToMode.value, themeModeOverride.value) }
-          }
-        )
+        CompositionLocalProvider(LocalTerminalLayout provides terminal) {
+          AppearanceScope.ColorEditor(
+            name,
+            initialColor,
+            CurrentColors.collectAsState().value.base,
+            themeModeOverride.value.type,
+            themeModeOverride.value.type?.image,
+            currentTheme.wallpaper.background,
+            currentTheme.wallpaper.tint,
+            currentColors = {
+              ThemeManager.currentColors(null, themeModeOverride.value, chatModel.currentUser.value?.uiThemes, appPreferences.themeOverrides.get())
+            },
+            onColorChange = { color ->
+              preApplyGlobalIfNeeded(themeModeOverride.value.type)
+              ThemeManager.applyThemeColor(name, color, themeModeOverride)
+              withBGApi { save(applyToMode.value, themeModeOverride.value) }
+            }
+          )
+        }
       }
     }
 
@@ -524,6 +536,14 @@ private fun SetDefaultThemeButton(onClick: () -> Unit) {
   }
 }
 
+fun chatLayoutName(layout: ChatLayoutMode): String = when (layout) {
+  is ChatLayoutMode.Classic -> generalGetString(MR.strings.chat_layout_classic)
+  is ChatLayoutMode.Terminal -> generalGetString(MR.strings.chat_layout_terminal)
+  is ChatLayoutMode.Unknown -> layout.type
+}
+
+fun otherChatLayout(layout: ChatLayoutMode): ChatLayoutMode = if (layout == ChatLayoutMode.Terminal) ChatLayoutMode.Classic else ChatLayoutMode.Terminal
+
 @Composable
 private fun AdvancedSettingsButton(onClick: () -> Unit) {
   SettingsActionItem(
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 e2c89940ab..f3c43b8a5c 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
@@ -39,8 +39,11 @@ import java.net.URI
 fun AddGroupView(chatModel: ChatModel, rh: RemoteHostInfo?, close: () -> Unit, closeAll: () -> Unit) {
   val rhId = rh?.remoteHostId
   val view = LocalMultiplatformView()
+  val inProgress = remember { mutableStateOf(false) }
   AddGroupLayout(
     createGroup = { incognito, groupProfile ->
+      if (inProgress.value) return@AddGroupLayout
+      inProgress.value = true
       hideKeyboard(view)
       withBGApi {
         val groupInfo = chatModel.controller.apiNewGroup(rhId, incognito, groupProfile)
@@ -61,6 +64,8 @@ fun AddGroupView(chatModel: ChatModel, rh: RemoteHostInfo?, close: () -> Unit, c
               GroupLinkView(chatModel, rhId, groupInfo, groupLink = null, onGroupLinkUpdated = null, creatingGroup = true, close = close)
             }
           }
+        } else {
+          inProgress.value = false
         }
       }
     },
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 f6109778dc..82cffbb384 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
@@ -66,8 +66,9 @@ fun ContactConnectionInfoView(
     deleteConnection = { deleteContactConnectionAlert(rhId, contactConnection, chatModel, close) },
     onLocalAliasChanged = { setContactAlias(rhId, contactConnection, it, chatModel) },
     learnMore = {
+      if (appPlatform.isDesktop) ModalManager.end.closeModals()
       ModalManager.end.showModalCloseable { close ->
-        AddContactLearnMore(close)
+        key(this) { AddContactLearnMore(close) }
       }
     }
   )
@@ -90,7 +91,10 @@ private fun ContactConnectionInfoLayout(
       SettingsActionItemWithContent(
         icon = painterResource(MR.images.ic_theater_comedy_filled),
         text = null,
-        click = { ModalManager.end.showModal { IncognitoView() } },
+        click = {
+          if (appPlatform.isDesktop) ModalManager.end.closeModals()
+          ModalManager.end.showModal { key(this) { IncognitoView() } }
+        },
         iconColor = Indigo,
         extraPadding = false
       ) {
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 a661568a0d..179ec48175 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
@@ -23,6 +23,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.*
 import androidx.compose.ui.graphics.*
+import androidx.compose.ui.layout.Layout
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.input.TextFieldValue
@@ -38,7 +39,12 @@ import chat.simplex.common.model.ChatModel.controller
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.ThemeManager.colorFromReadableHex
 import chat.simplex.common.ui.theme.ThemeManager.toReadableHex
+import chat.simplex.common.views.chat.item.ChatItemSender
+import chat.simplex.common.views.chat.item.LocalTerminalLayout
 import chat.simplex.common.views.chat.item.PreviewChatItemView
+import chat.simplex.common.views.chat.item.TERMINAL_SENDER_TOP_GAP
+import chat.simplex.common.views.chat.item.TerminalChatItemRow
+import chat.simplex.common.views.chat.item.terminalRowGap
 import chat.simplex.common.views.chat.item.msgTailWidthDp
 import chat.simplex.res.*
 import com.godaddy.android.colorpicker.ClassicColorPicker
@@ -279,13 +285,14 @@ object AppearanceScope {
     val themeBackgroundColor = MaterialTheme.colors.background
     val backgroundColor =  backgroundColor ?: wallpaperType?.defaultBackgroundColor(theme, MaterialTheme.colors.background)
     val tintColor = tintColor ?: wallpaperType?.defaultTintColor(theme)
+    val terminal = LocalTerminalLayout.current
     Column(Modifier
       .drawWithCache {
-        if (wallpaperImage != null && wallpaperType != null && backgroundColor != null && tintColor != null) {
+        if (wallpaperImage != null && wallpaperType != null && backgroundColor != null && tintColor != null && !terminal) {
           chatViewBackground(wallpaperImage, wallpaperType, backgroundColor, tintColor, null, null)
         } else {
           onDrawBehind {
-            drawRect(themeBackgroundColor)
+            drawRect(backgroundColor ?: themeBackgroundColor)
           }
         }
       }
@@ -293,22 +300,54 @@ object AppearanceScope {
     ) {
       if (withMessages) {
         val chatItemTail = remember { appPreferences.chatItemTail.state }
+        val alice = remember { ChatItem.getSampleData(1, CIDirection.DirectRcv(), Clock.System.now(), generalGetString(MR.strings.wallpaper_preview_hello_bob)) }
+        val reply = ChatItem.getSampleData(2, CIDirection.DirectSnd(), Clock.System.now(), stringResource(MR.strings.wallpaper_preview_hello_alice),
+          quotedItem = CIQuote(alice.chatDir, alice.id, sentAt = alice.meta.itemTs, formattedText = alice.formattedText, content = MsgContent.MCText(alice.content.text))
+        )
 
-        Column(verticalArrangement = Arrangement.spacedBy(4.dp), modifier = if (chatItemTail.value) Modifier else Modifier.padding(horizontal = msgTailWidthDp)) {
-          val alice = remember { ChatItem.getSampleData(1, CIDirection.DirectRcv(), Clock.System.now(), generalGetString(MR.strings.wallpaper_preview_hello_bob)) }
-          PreviewChatItemView(alice)
-          PreviewChatItemView(
-            ChatItem.getSampleData(2, CIDirection.DirectSnd(), Clock.System.now(), stringResource(MR.strings.wallpaper_preview_hello_alice),
-              quotedItem = CIQuote(alice.chatDir, alice.id, sentAt = alice.meta.itemTs, formattedText = alice.formattedText, content = MsgContent.MCText(alice.content.text))
-            )
-          )
+        @Composable
+        fun TerminalPreviewRow(item: ChatItem, older: ChatItem?, sender: ChatItemSender) {
+          TerminalChatItemRow(sender, gutter = 0.dp, topGap = terminalRowGap(item, older, separated = false, largeGap = true, hasSenderRow = true).toDp(), senderTopGap = if (older == null) 0.dp else TERMINAL_SENDER_TOP_GAP.toDp()) {
+            PreviewChatItemView(item)
+          }
         }
+
+        PreviewInEitherLayout(
+          terminal,
+          classic = {
+            Column(verticalArrangement = Arrangement.spacedBy(4.dp), modifier = if (chatItemTail.value) Modifier else Modifier.padding(horizontal = msgTailWidthDp)) {
+              PreviewChatItemView(alice)
+              PreviewChatItemView(reply)
+            }
+          },
+          terminalRows = {
+            Column {
+              TerminalPreviewRow(alice, null, ChatItemSender("alice", null, null, own = false, image = null))
+              TerminalPreviewRow(reply, alice, ChatItemSender("bob", null, null, own = true, image = null))
+            }
+          }
+        )
       } else {
         Box(Modifier.fillMaxSize())
       }
     }
   }
 
+  @Composable
+  private fun PreviewInEitherLayout(terminal: Boolean, classic: @Composable () -> Unit, terminalRows: @Composable () -> Unit) {
+    Layout({
+      CompositionLocalProvider(LocalTerminalLayout provides false, content = classic)
+      CompositionLocalProvider(LocalTerminalLayout provides true, content = terminalRows)
+    }) { measurables, constraints ->
+      val placeables = measurables.map { it.measure(constraints) }
+      val shown = placeables[if (terminal) 1 else 0]
+      val height = placeables.maxOf { it.height }
+      layout(placeables.maxOf { it.width }, height) {
+        shown.placeRelative(0, (height - shown.height) / 2)
+      }
+    }
+  }
+
   @Composable
   fun WallpaperPresetSelector(
     selectedWallpaper: WallpaperType?,
@@ -326,6 +365,7 @@ object AppearanceScope {
     }
 
     val backgrounds = PresetWallpaper.entries.toList()
+    val terminal = LocalTerminalLayout.current
 
     fun LazyGridScope.gridContent(width: Dp, height: Dp) {
       @Composable
@@ -398,8 +438,10 @@ object AppearanceScope {
       items(items = backgrounds) { background ->
         BackgroundItem(background)
       }
-      item {
-        OwnBackgroundItem(selectedWallpaper)
+      if (!terminal) {
+        item {
+          OwnBackgroundItem(selectedWallpaper)
+        }
       }
     }
 
@@ -417,7 +459,7 @@ object AppearanceScope {
       val gridPadding = 12.dp
       val cardPadding = if (LocalCardScreen.current) CARD_PADDING * 2 else 0.dp
       val itemSize = (DEFAULT_START_MODAL_WIDTH * fontSizeSqrtMultiplier - cardPadding - gridPadding * 5) / 4
-      val rows = ceil((PresetWallpaper.entries.size + 2) / 4f).roundToInt()
+      val rows = ceil((PresetWallpaper.entries.size + if (terminal) 1 else 2) / 4f).roundToInt()
       LazyVerticalGrid(
         columns = GridCells.Fixed(4),
         Modifier.height(itemSize * rows + gridPadding * (rows + 1)),
@@ -530,19 +572,22 @@ object AppearanceScope {
 
     SectionView(stringResource(MR.strings.settings_section_title_themes)) {
       ThemeDestinationPicker(themeUserDestination)
+      ChatLayoutRow(themeUserDestination)
 
       val importWallpaperLauncher = rememberFileChooserLauncher(true) { to: URI? ->
         if (to != null) onImport(to)
       }
 
-      WallpaperPresetSelector(
-        selectedWallpaper = wallpaperType,
-        baseTheme = currentTheme.base,
-        currentColors = { type ->
-          currentColors(type)
-        },
-        onChooseType = { onChooseType(it, importWallpaperLauncher) },
-      )
+      CompositionLocalProvider(LocalTerminalLayout provides profileLayoutIsTerminal(if (themeUserDestination.value == null) null else chatModel.currentUser.value)) {
+        WallpaperPresetSelector(
+          selectedWallpaper = wallpaperType,
+          baseTheme = currentTheme.base,
+          currentColors = { type ->
+            currentColors(type)
+          },
+          onChooseType = { onChooseType(it, importWallpaperLauncher) },
+        )
+      }
       val type = MaterialTheme.wallpaper.type
       if (type is WallpaperType.Image && (themeUserDestination.value == null || perUserTheme.value.wallpaper?.imageFile != null)) {
         SectionItemView(disabled = chatModel.remoteHostId != null && themeUserDestination.value != null, click = {
@@ -596,7 +641,9 @@ object AppearanceScope {
             val importWallpaperLauncher = rememberFileChooserLauncher(true) { to: URI? ->
               if (to != null) onImport(to)
             }
-            CustomizeThemeView { onChooseType(it, importWallpaperLauncher) }
+            CompositionLocalProvider(LocalTerminalLayout provides profileLayoutIsTerminal(null)) {
+              CustomizeThemeView { onChooseType(it, importWallpaperLauncher) }
+            }
           }
         } else {
           ModalManager.start.showModalCloseable(cardScreen = true) { close ->
@@ -619,11 +666,13 @@ object AppearanceScope {
       val wallpaperType = MaterialTheme.wallpaper.type
       val baseTheme = CurrentColors.collectAsState().value.base
 
+      val terminal = LocalTerminalLayout.current
       val editColor = { name: ThemeColor ->
         editColor(
           name,
           wallpaperType,
           wallpaperImage,
+          terminal,
           onColorChange = { color ->
             ThemeManager.saveAndApplyThemeColor(baseTheme, name, color)
             saveThemeToDatabase(null)
@@ -787,7 +836,7 @@ object AppearanceScope {
     }
   }
 
-  fun editColor(name: ThemeColor, wallpaperType: WallpaperType, wallpaperImage: ImageBitmap?, onColorChange: (Color?) -> Unit) {
+  fun editColor(name: ThemeColor, wallpaperType: WallpaperType, wallpaperImage: ImageBitmap?, terminal: Boolean, onColorChange: (Color?) -> Unit) {
     ModalManager.start.showModal {
       val baseTheme = CurrentColors.collectAsState().value.base
       val wallpaperBackgroundColor = MaterialTheme.wallpaper.background ?: wallpaperType.defaultBackgroundColor(baseTheme, MaterialTheme.colors.background)
@@ -808,9 +857,11 @@ object AppearanceScope {
         ThemeColor.RECEIVED_MESSAGE -> MaterialTheme.appColors.receivedMessage
         ThemeColor.RECEIVED_QUOTE -> MaterialTheme.appColors.receivedQuote
       }
-      ColorEditor(name, initialColor, baseTheme, MaterialTheme.wallpaper.type, wallpaperImage, currentColors = { CurrentColors.value },
-        onColorChange = onColorChange
-      )
+      CompositionLocalProvider(LocalTerminalLayout provides terminal) {
+        ColorEditor(name, initialColor, baseTheme, MaterialTheme.wallpaper.type, wallpaperImage, currentColors = { CurrentColors.value },
+          onColorChange = onColorChange
+        )
+      }
     }
   }
 
@@ -823,13 +874,15 @@ object AppearanceScope {
       globalThemeUsed.value = preferred == null
       preferred ?: ThemeManager.defaultActiveTheme(chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get())
     }
-    UserWallpaperEditor(
-      initialTheme,
-      applyToMode = if (themes.value.light == themes.value.dark) null else initialTheme.mode,
-      globalThemeUsed = globalThemeUsed,
-      save = { applyToMode, newTheme ->
-        save(applyToMode, newTheme, themes.value, userId, remoteHostId)
-      })
+    CompositionLocalProvider(LocalTerminalLayout provides profileLayoutIsTerminal(chatModel.currentUser.value)) {
+      UserWallpaperEditor(
+        initialTheme,
+        applyToMode = if (themes.value.light == themes.value.dark) null else initialTheme.mode,
+        globalThemeUsed = globalThemeUsed,
+        save = { applyToMode, newTheme ->
+          save(applyToMode, newTheme, themes.value, userId, remoteHostId)
+        })
+    }
     KeyChangeEffect(chatModel.currentUser.value?.userId, chatModel.remoteHostId) {
       close()
     }
@@ -871,7 +924,7 @@ object AppearanceScope {
       }
       changedThemes
     } else {
-      null
+      changedThemes?.layoutOnly()
     }
 
     val wallpaperFilesToDelete = wallpaperFiles - changedThemes?.light?.wallpaper?.imageFile - changedThemes?.dark?.wallpaper?.imageFile
@@ -890,6 +943,40 @@ object AppearanceScope {
     }
   }
 
+  private fun profileLayoutIsTerminal(user: User?): Boolean =
+    profileChatLayout(user) == ChatLayoutMode.Terminal
+
+  @Composable
+  private fun ChatLayoutRow(themeUserDestination: MutableState<Pair<Long, ThemeModeOverrides?>?>) {
+    val globalLayout = remember { derivedStateOf { profileChatLayout(null) } }
+    val dest = themeUserDestination.value
+    if (dest == null) {
+      ExposedDropDownSettingRow(
+        generalGetString(MR.strings.chat_layout),
+        listOf(ChatLayoutMode.Classic, ChatLayoutMode.Terminal).map { it to chatLayoutName(it) },
+        globalLayout,
+        onSelected = { layout -> appPrefs.chatLayout.set(layout) }
+      )
+    } else {
+      val (userId, themes) = dest
+      val userLayout = themes?.chatLayout
+      val otherLayout = otherChatLayout(globalLayout.value)
+      val selection = remember(userLayout, otherLayout) { mutableStateOf(if (userLayout == otherLayout) otherLayout else null) }
+      ExposedDropDownSettingRow(
+        generalGetString(MR.strings.chat_layout),
+        listOf(
+          null to "${chatLayoutName(globalLayout.value)} ${generalGetString(MR.strings.chat_layout_default_suffix)}",
+          otherLayout to chatLayoutName(otherLayout)
+        ),
+        selection,
+        onSelected = { layout ->
+          themeUserDestination.value = userId to themes.withChatLayout(layout)
+          saveThemeToDatabase(themeUserDestination.value)
+        }
+      )
+    }
+  }
+
   @Composable
   fun ThemeDestinationPicker(themeUserDestination: MutableState<Pair<Long, ThemeModeOverrides?>?>) {
     val themeUserDest = remember(themeUserDestination.value?.first) { mutableStateOf(themeUserDestination.value?.first) }
@@ -897,7 +984,7 @@ object AppearanceScope {
       if (themeUserDestination.value == null) {
         // Easiest way to hide per-user customization.
         // Otherwise, it would be needed to make global variable and to use it everywhere for making a decision to include these overrides into active theme constructing or not
-        chatModel.currentUser.value = chatModel.currentUser.value?.copy(uiThemes = null)
+        chatModel.currentUser.value = chatModel.currentUser.value?.let { it.copy(uiThemes = it.uiThemes?.layoutOnly()) }
       } else {
         chatModel.updateCurrentUserUiThemes(chatModel.remoteHostId(), chatModel.users.firstOrNull { it.user.userId == chatModel.currentUser.value?.userId }?.user?.uiThemes)
       }
@@ -1198,10 +1285,11 @@ fun WallpaperSetupView(
   firstSectionTitle: String? = null,
 ) {
   val hasWallpaperSettings = wallpaperType is WallpaperType.Preset || wallpaperType is WallpaperType.Image
+  val terminal = LocalTerminalLayout.current
 
   if (hasWallpaperSettings) {
     SectionView(firstSectionTitle) {
-      if (wallpaperType is WallpaperType.Image) {
+      if (wallpaperType is WallpaperType.Image && !terminal) {
         val state = remember(wallpaperType.scaleType, initialWallpaper?.type) { mutableStateOf(wallpaperType.scaleType ?: (initialWallpaper?.type as? WallpaperType.Image)?.scaleType ?: WallpaperScaleType.FILL) }
         val values = remember {
           WallpaperScaleType.entries.map { it to generalGetString(it.text) }
@@ -1216,7 +1304,7 @@ fun WallpaperSetupView(
         )
       }
 
-      if (wallpaperType is WallpaperType.Preset || (wallpaperType is WallpaperType.Image && wallpaperType.scaleType == WallpaperScaleType.REPEAT)) {
+      if ((wallpaperType is WallpaperType.Preset || (wallpaperType is WallpaperType.Image && wallpaperType.scaleType == WallpaperScaleType.REPEAT)) && !terminal) {
         val state = remember(wallpaperType, initialWallpaper?.type?.scale) { mutableStateOf(wallpaperType.scale ?: initialWallpaper?.type?.scale ?: 1f) }
         Row(Modifier.padding(horizontal = DEFAULT_PADDING), verticalAlignment = Alignment.CenterVertically) {
           Text("${state.value}".substring(0, min("${state.value}".length, 4)), Modifier.width(50.dp))
@@ -1240,11 +1328,13 @@ fun WallpaperSetupView(
         Text(title)
         Icon(painterResource(MR.images.ic_circle_filled), title, tint = wallpaperBackgroundColor)
       }
-      val wallpaperTintColor = initialWallpaper?.tint ?: wallpaperType.defaultTintColor(theme)
-      SectionItemViewSpaceBetween({ editColor(ThemeColor.WALLPAPER_TINT) }) {
-        val title = generalGetString(MR.strings.color_wallpaper_tint)
-        Text(title)
-        Icon(painterResource(MR.images.ic_circle_filled), title, tint = wallpaperTintColor)
+      if (!terminal) {
+        val wallpaperTintColor = initialWallpaper?.tint ?: wallpaperType.defaultTintColor(theme)
+        SectionItemViewSpaceBetween({ editColor(ThemeColor.WALLPAPER_TINT) }) {
+          val title = generalGetString(MR.strings.color_wallpaper_tint)
+          Text(title)
+          Icon(painterResource(MR.images.ic_circle_filled), title, tint = wallpaperTintColor)
+        }
       }
     }
     SectionDividerSpaced()
@@ -1290,7 +1380,7 @@ private fun ColorPicker(initialColor: Color, showAlphaBar: Boolean, onColorChang
 private fun removeUserThemeModeOverrides(themeUserDestination: MutableState<Pair<Long, ThemeModeOverrides?>?>, perUserTheme: MutableState<ThemeModeOverride>) {
   val dest = themeUserDestination.value ?: return
   perUserTheme.value = ThemeModeOverride()
-  themeUserDestination.value = dest.first to null
+  themeUserDestination.value = dest.first to dest.second?.layoutOnly()
   val wallpaperFilesToDelete = listOf(
     (chatModel.currentUser.value?.uiThemes?.light?.type as? WallpaperType.Image)?.filename,
     (chatModel.currentUser.value?.uiThemes?.dark?.type as? WallpaperType.Image)?.filename
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 826648ddb8..674aa3831b 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
@@ -633,14 +633,16 @@ private fun BusinessAddressToggle(addressSettingsState: MutableState<AddressSett
         businessAddress = true,
         autoAccept = true,
         autoAcceptIncognito = false,
-        autoReply = addressSettingsState.value.autoReply
+        autoReply = addressSettingsState.value.autoReply,
+        chatLayout = addressSettingsState.value.chatLayout
       )
     else
       AddressSettingsState(
         businessAddress = false,
         autoAccept = addressSettingsState.value.autoAccept,
         autoAcceptIncognito = addressSettingsState.value.autoAcceptIncognito,
-        autoReply = addressSettingsState.value.autoReply
+        autoReply = addressSettingsState.value.autoReply,
+        chatLayout = addressSettingsState.value.chatLayout
       )
     saveAddressSettings(addressSettingsState.value)
   }
@@ -659,14 +661,16 @@ private fun AutoAcceptToggle(addressSettingsState: MutableState<AddressSettingsS
         businessAddress = addressSettingsState.value.businessAddress,
         autoAccept = true,
         autoAcceptIncognito = false,
-        autoReply = ""
+        autoReply = "",
+        chatLayout = addressSettingsState.value.chatLayout
       )
     else
       AddressSettingsState(
         businessAddress = false,
         autoAccept = false,
         autoAcceptIncognito = false,
-        autoReply = ""
+        autoReply = "",
+        chatLayout = addressSettingsState.value.chatLayout
       )
     saveAddressSettings(addressSettingsState.value)
   }
@@ -692,12 +696,15 @@ private class AddressSettingsState {
     private set
   var autoReply: String = ""
     private set
+  var chatLayout: ChatLayoutMode? = null
+    private set
 
-  constructor(businessAddress: Boolean = false, autoAccept: Boolean = false, autoAcceptIncognito: Boolean = false, autoReply: String = "") {
+  constructor(businessAddress: Boolean = false, autoAccept: Boolean = false, autoAcceptIncognito: Boolean = false, autoReply: String = "", chatLayout: ChatLayoutMode? = null) {
     this.businessAddress = businessAddress
     this.autoAccept = autoAccept
     this.autoAcceptIncognito = autoAcceptIncognito
     this.autoReply = autoReply
+    this.chatLayout = chatLayout
   }
 
   constructor(settings: AddressSettings) {
@@ -705,6 +712,7 @@ private class AddressSettingsState {
     this.autoAccept = settings.autoAccept != null
     this.autoAcceptIncognito = settings.autoAccept?.acceptIncognito == true
     this.autoReply = settings.autoReply?.text ?: ""
+    this.chatLayout = settings.chatLayout
   }
 
   val addressSettings: AddressSettings
@@ -712,7 +720,8 @@ private class AddressSettingsState {
       return AddressSettings(
         businessAddress = this.businessAddress,
         autoAccept = if (this.autoAccept) AutoAccept(acceptIncognito = this.autoAcceptIncognito) else null,
-        autoReply = if (this.autoReply.isEmpty()) null else MsgContent.MCText(this.autoReply)
+        autoReply = if (this.autoReply.isEmpty()) null else MsgContent.MCText(this.autoReply),
+        chatLayout = this.chatLayout
       )
     }
 
@@ -723,6 +732,7 @@ private class AddressSettingsState {
             && this.autoAccept == other.autoAccept
             && this.autoAcceptIncognito == other.autoAcceptIncognito
             && this.autoReply == other.autoReply
+            && this.chatLayout == other.chatLayout
     )
   }
 
@@ -731,6 +741,7 @@ private class AddressSettingsState {
     result = 31 * result + autoAccept.hashCode()
     result = 31 * result + autoAcceptIncognito.hashCode()
     result = 31 * result + autoReply.hashCode()
+    result = 31 * result + chatLayout.hashCode()
     return result
   }
 }
@@ -747,7 +758,8 @@ private fun AcceptIncognitoToggle(addressSettingsState: MutableState<AddressSett
       businessAddress = addressSettingsState.value.businessAddress,
       autoAccept = addressSettingsState.value.autoAccept,
       autoAcceptIncognito = incognitoToggle,
-      autoReply = addressSettingsState.value.autoReply
+      autoReply = addressSettingsState.value.autoReply,
+      chatLayout = addressSettingsState.value.chatLayout
     )
   }
 }
@@ -768,7 +780,8 @@ private fun AutoReplyEditor(addressSettingsState: MutableState<AddressSettingsSt
         businessAddress = addressSettingsState.value.businessAddress,
         autoAccept = addressSettingsState.value.autoAccept,
         autoAcceptIncognito = addressSettingsState.value.autoAcceptIncognito,
-        autoReply = autoReply.value
+        autoReply = autoReply.value,
+        chatLayout = addressSettingsState.value.chatLayout
       )
     }
   }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/UserProfilesView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/UserProfilesView.kt
index e91d6c2ce0..5d8ecec60b 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/UserProfilesView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/UserProfilesView.kt
@@ -47,8 +47,9 @@ fun UserProfilesView(m: ChatModel, search: MutableState<String>, profileHidden:
     showHiddenProfilesNotice = m.controller.appPrefs.showHiddenProfilesNotice,
     visibleUsersCount = visibleUsersCount(m),
     addUser = {
+      if (ModalManager.center.isTopModalOpen(ModalViewId.CREATE_PROFILE)) return@UserProfilesLayout
       withAuth {
-        ModalManager.center.showModalCloseable { close ->
+        ModalManager.center.showModalCloseable(id = ModalViewId.CREATE_PROFILE) { close ->
           CreateProfile(m, close)
         }
       }
diff --git a/apps/multiplatform/common/src/commonMain/moko-resources/base/strings.xml b/apps/multiplatform/common/src/commonMain/moko-resources/base/strings.xml
index c6d31955f9..565554f7e8 100644
--- a/apps/multiplatform/common/src/commonMain/moko-resources/base/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/moko-resources/base/strings.xml
@@ -2304,6 +2304,11 @@
   <string name="chat_theme_apply_to_all_modes">All color modes</string>
   <string name="chat_theme_apply_to_light_mode">Light mode</string>
   <string name="chat_theme_apply_to_dark_mode">Dark mode</string>
+  <string name="chat_layout">Chat layout</string>
+  <string name="chat_layout_classic">Classic</string>
+  <string name="chat_layout_terminal">Terminal</string>
+  <string name="chat_layout_chat_suffix">(chat)</string>
+  <string name="chat_layout_default_suffix">(default)</string>
 
 
   <!-- Preferences.kt -->
diff --git a/apps/multiplatform/common/src/commonMain/resources/assets/www/call.js b/apps/multiplatform/common/src/commonMain/resources/assets/www/call.js
index 6fb3677a2e..0e2c1f7b74 100644
--- a/apps/multiplatform/common/src/commonMain/resources/assets/www/call.js
+++ b/apps/multiplatform/common/src/commonMain/resources/assets/www/call.js
@@ -145,7 +145,7 @@ const processCommand = (function () {
             }
         });
     }
-    async function initializeCall(config, mediaType, aesKey) {
+    async function initializeCall(config, mediaType, aesKey, canReconnect) {
         var _a, _b, _c;
         let pc;
         try {
@@ -233,7 +233,7 @@ const processCommand = (function () {
                 : pc.iceConnectionState == "completed"
                     ? "connected"
                     : "connecting"); /* webView 69-70 doesn't have connectionState yet */
-            if (wasConnected) {
+            if (wasConnected && canReconnect) {
                 if (reconnectTimedOut) {
                     reconnectingTimeout = undefined;
                     if (activeCall !== call || state == "connected")
@@ -415,10 +415,10 @@ const processCommand = (function () {
                     inactiveCallMediaSources.camera = command.media == CallMediaType.Video;
                     inactiveCallMediaSourcesChanged(inactiveCallMediaSources);
                     setupLocalVideoRatio(getVideoElements().local);
-                    const { media, iceServers, relay } = command;
+                    const { media, iceServers, relay, canReconnect } = command;
                     const encryption = supportsInsertableStreams(useWorker);
                     const aesKey = encryption ? command.aesKey : undefined;
-                    activeCall = await initializeCall(getCallConfig(encryption && !!aesKey, iceServers, relay), media, aesKey);
+                    activeCall = await initializeCall(getCallConfig(encryption && !!aesKey, iceServers, relay), media, aesKey, canReconnect);
                     await setupLocalStream(true, activeCall);
                     setupCodecPreferences(activeCall);
                     const pc = activeCall.connection;
@@ -458,8 +458,8 @@ const processCommand = (function () {
                     else {
                         const offer = parse(command.offer);
                         const remoteIceCandidates = parse(command.iceCandidates);
-                        const { media, aesKey, iceServers, relay } = command;
-                        activeCall = await initializeCall(getCallConfig(!!aesKey, iceServers, relay), media, aesKey);
+                        const { media, aesKey, iceServers, relay, canReconnect } = command;
+                        activeCall = await initializeCall(getCallConfig(!!aesKey, iceServers, relay), media, aesKey, canReconnect);
                         const pc = activeCall.connection;
                         // console.log("offer remoteIceCandidates", JSON.stringify(remoteIceCandidates))
                         await pc.setRemoteDescription(new RTCSessionDescription(!webView69Or70() ? offer : adaptSdpToOldWebView(offer)));
diff --git a/apps/multiplatform/common/src/commonTest/kotlin/chat/simplex/app/TerminalItemViewTest.kt b/apps/multiplatform/common/src/commonTest/kotlin/chat/simplex/app/TerminalItemViewTest.kt
new file mode 100644
index 0000000000..91b7854dae
--- /dev/null
+++ b/apps/multiplatform/common/src/commonTest/kotlin/chat/simplex/app/TerminalItemViewTest.kt
@@ -0,0 +1,234 @@
+package chat.simplex.app
+
+import androidx.compose.ui.unit.sp
+import chat.simplex.common.model.*
+import chat.simplex.common.views.chat.ListItem
+import chat.simplex.common.views.chat.MergedItem
+import chat.simplex.common.views.chat.terminalRowsSeparated
+import chat.simplex.common.views.chat.item.TERMINAL_LEVEL_STEP
+import chat.simplex.common.views.chat.item.terminalHeadingGap
+import chat.simplex.common.views.chat.item.terminalItemShowsSender
+import chat.simplex.common.views.chat.item.terminalRowGap
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.datetime.Instant
+import kotlinx.datetime.LocalDate
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.atStartOfDayIn
+import kotlinx.serialization.json.JsonPrimitive
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+
+class TerminalItemViewTest {
+  private val noon = Instant.parse("2026-10-12T12:00:00Z")
+  private val alice = GroupMember.sampleData.copy(groupMemberId = 1, memberId = "alice")
+  private val bob = GroupMember.sampleData.copy(groupMemberId = 2, memberId = "bob")
+
+  private fun msgAt(id: Long, dir: CIDirection, ts: Instant) =
+    ChatItem.getSampleData(id, dir, ts).let {
+      if (dir.sent) it else it.copy(content = CIContent.RcvMsgContent(MsgContent.MCText("hello")))
+    }
+
+  private fun msg(id: Long, dir: CIDirection, secondsAfterNoon: Long) =
+    msgAt(id, dir, Instant.fromEpochSeconds(noon.epochSeconds + secondsAfterNoon))
+
+  private fun integrityError(id: Long, secondsAfterNoon: Long) =
+    msg(id, CIDirection.DirectRcv(), secondsAfterNoon).copy(content = CIContent.RcvIntegrityError(MsgErrorType.MsgSkipped(1, 2)))
+
+  private fun featureEvent(id: Long, secondsAfterNoon: Long) =
+    ChatItem(
+      CIDirection.DirectRcv(),
+      CIMeta.getSample(id, Instant.fromEpochSeconds(noon.epochSeconds + secondsAfterNoon), ""),
+      CIContent.RcvChatFeature(ChatFeature.Voice, FeatureEnabled(forUser = true, forContact = true)),
+      reactions = emptyList()
+    )
+
+  @Test
+  fun senderShownForOldestItem() {
+    assertTrue(terminalItemShowsSender(msg(1, CIDirection.DirectRcv(), 0), older = null))
+  }
+
+  @Test
+  fun senderHiddenForSameSender() {
+    assertFalse(terminalItemShowsSender(msg(2, CIDirection.DirectSnd(), 30), older = msg(1, CIDirection.DirectSnd(), 0)))
+    assertFalse(terminalItemShowsSender(msg(2, CIDirection.GroupRcv(alice), 59), older = msg(1, CIDirection.GroupRcv(alice), 0)))
+    assertFalse(terminalItemShowsSender(msg(2, CIDirection.DirectRcv(), 3600), older = msg(1, CIDirection.DirectRcv(), 0)))
+  }
+
+  @Test
+  fun senderShownForDifferentGroupMember() {
+    assertTrue(terminalItemShowsSender(msg(2, CIDirection.GroupRcv(bob), 10), older = msg(1, CIDirection.GroupRcv(alice), 0)))
+  }
+
+  @Test
+  fun senderShownWhenDirectionChanges() {
+    assertTrue(terminalItemShowsSender(msg(2, CIDirection.DirectSnd(), 10), older = msg(1, CIDirection.DirectRcv(), 0)))
+    assertTrue(terminalItemShowsSender(msg(2, CIDirection.GroupSnd(), 10), older = msg(1, CIDirection.GroupRcv(alice), 0)))
+  }
+
+  @Test
+  fun senderShownAfterEventItem() {
+    assertTrue(terminalItemShowsSender(msg(2, CIDirection.DirectRcv(), 10), older = featureEvent(1, 0)))
+  }
+
+  @Test
+  fun senderHiddenOnDateChange() {
+    val midnight = LocalDate(2026, 10, 13).atStartOfDayIn(TimeZone.currentSystemDefault())
+    val older = msgAt(1, CIDirection.DirectRcv(), Instant.fromEpochSeconds(midnight.epochSeconds - 10))
+    val item = msgAt(2, CIDirection.DirectRcv(), Instant.fromEpochSeconds(midnight.epochSeconds + 10))
+    assertFalse(terminalItemShowsSender(item, older))
+  }
+
+  @Test
+  fun senderShownWhenChannelPostFollowsMemberMessage() {
+    assertTrue(terminalItemShowsSender(msg(2, CIDirection.GroupRcv(alice), 10), older = msg(1, CIDirection.ChannelRcv(), 0)))
+    assertTrue(terminalItemShowsSender(msg(2, CIDirection.ChannelRcv(), 10), older = msg(1, CIDirection.GroupRcv(alice), 0)))
+    assertFalse(terminalItemShowsSender(msg(2, CIDirection.ChannelRcv(), 10), older = msg(1, CIDirection.ChannelRcv(), 0)))
+  }
+
+  @Test
+  fun senderShownWhenOwnerSwitchesBetweenChannelAndOwnName() {
+    val asChannel = msg(1, CIDirection.GroupSnd(), 0).let { it.copy(meta = it.meta.copy(showGroupAsSender = true)) }
+    assertTrue(terminalItemShowsSender(msg(2, CIDirection.GroupSnd(), 10), older = asChannel))
+    val asChannelToo = msg(2, CIDirection.GroupSnd(), 10).let { it.copy(meta = it.meta.copy(showGroupAsSender = true)) }
+    assertFalse(terminalItemShowsSender(asChannelToo, older = asChannel))
+    assertFalse(terminalItemShowsSender(msg(2, CIDirection.ChannelRcv(), 10), older = asChannel))
+  }
+
+  @Test
+  fun integrityErrorGroupedWithSender() {
+    assertFalse(terminalItemShowsSender(integrityError(2, 10), older = msg(1, CIDirection.DirectRcv(), 0)))
+    assertFalse(terminalItemShowsSender(msg(3, CIDirection.DirectRcv(), 20), older = integrityError(2, 10)))
+  }
+
+  @Test
+  fun senderHiddenAfterDeletedMessageFromSameSender() {
+    val deleted = msg(1, CIDirection.DirectRcv(), 0).let { it.copy(meta = it.meta.copy(itemDeleted = CIDeleted.Deleted(null))) }
+    val legacyDeleted = msg(1, CIDirection.DirectRcv(), 0).copy(content = CIContent.RcvDeleted(CIDeleteMode.cidmBroadcast))
+    assertFalse(terminalItemShowsSender(msg(2, CIDirection.DirectRcv(), 10), older = deleted))
+    assertFalse(terminalItemShowsSender(msg(2, CIDirection.DirectRcv(), 10), older = legacyDeleted))
+  }
+
+  @Test
+  fun senderGroupsLocalNotes() {
+    assertTrue(terminalItemShowsSender(msg(1, CIDirection.LocalSnd(), 0), older = null))
+    assertFalse(terminalItemShowsSender(msg(2, CIDirection.LocalSnd(), 10), older = msg(1, CIDirection.LocalSnd(), 0)))
+  }
+
+  @Test
+  fun noSenderForEventItem() {
+    assertFalse(terminalItemShowsSender(featureEvent(2, 10), older = msg(1, CIDirection.DirectRcv(), 0)))
+    assertFalse(terminalItemShowsSender(featureEvent(1, 0), older = null))
+  }
+
+  private fun withBlocks(item: ChatItem, vararg blocks: MarkdownBlock) = item.copy(markdownBlocks = blocks.toList())
+
+  private fun heading() = MarkdownBlock.Heading(1, SegmentRange(0, 1))
+
+  private fun quoted(item: ChatItem) = item.copy(quotedItem = CIQuote(CIDirection.DirectRcv(), 1, sentAt = noon, content = MsgContent.MCText("question")))
+
+  private fun forwarded(item: ChatItem) = item.copy(meta = item.meta.copy(itemForwarded = CIForwardedFrom.Unknown))
+
+  private fun gap(item: ChatItem, older: ChatItem?, separated: Boolean = false, largeGap: Boolean = false, hasSenderRow: Boolean = false) =
+    terminalRowGap(item, older, separated, largeGap, hasSenderRow)
+
+  private fun single(item: ChatItem, prev: ChatItem?) = MergedItem.Single(ListItem(item, prev, null, 0), 0)
+
+  private fun grouped(item: ChatItem, prev: ChatItem?, revealed: Boolean) =
+    MergedItem.Grouped(arrayListOf(ListItem(item, prev, null, 0)), revealed, mutableListOf(), MutableStateFlow(0..0), item.mergeCategory, mutableSetOf(), 0)
+
+  @Test
+  fun rowGapZeroForOldestItem() {
+    assertEquals(0.sp, gap(msg(1, CIDirection.DirectSnd(), 0), older = null, largeGap = true, hasSenderRow = true))
+  }
+
+  @Test
+  fun rowGapZeroBetweenCloseMessages() {
+    assertEquals(0.sp, gap(msg(2, CIDirection.DirectSnd(), 10), msg(1, CIDirection.DirectSnd(), 0)))
+  }
+
+  @Test
+  fun rowGapAfterLargeGapOrAboveSenderRow() {
+    val older = msg(1, CIDirection.DirectSnd(), 0)
+    assertEquals(TERMINAL_LEVEL_STEP, gap(msg(2, CIDirection.DirectSnd(), 70), older, largeGap = true))
+    assertEquals(TERMINAL_LEVEL_STEP, gap(msg(2, CIDirection.DirectSnd(), 10), older, hasSenderRow = true))
+  }
+
+  @Test
+  fun rowGapNextToEvent() {
+    assertEquals(TERMINAL_LEVEL_STEP, gap(featureEvent(2, 10), msg(1, CIDirection.DirectRcv(), 0)))
+    assertEquals(TERMINAL_LEVEL_STEP, gap(msg(2, CIDirection.DirectRcv(), 10), featureEvent(1, 0)))
+  }
+
+  @Test
+  fun rowGapZeroWhenRowsAreSeparated() {
+    assertEquals(0.sp, gap(featureEvent(2, 10), msg(1, CIDirection.DirectRcv(), 0), separated = true, largeGap = true, hasSenderRow = true))
+  }
+
+  @Test
+  fun rowsSeparatedByDateBannerOrRevealedRow() {
+    val midnight = LocalDate(2026, 10, 13).atStartOfDayIn(TimeZone.currentSystemDefault())
+    val older = msgAt(1, CIDirection.DirectRcv(), Instant.fromEpochSeconds(midnight.epochSeconds - 10))
+    val nextDay = msgAt(2, CIDirection.DirectRcv(), Instant.fromEpochSeconds(midnight.epochSeconds + 10))
+    assertFalse(terminalRowsSeparated(null))
+    assertTrue(terminalRowsSeparated(single(older, nextDay)))
+    assertFalse(terminalRowsSeparated(single(msg(1, CIDirection.DirectRcv(), 0), msg(2, CIDirection.DirectRcv(), 10))))
+    val banner = ChatItem(CIDirection.DirectRcv(), CIMeta.getSample(1, Instant.fromEpochSeconds(midnight.epochSeconds + 5), ""), CIContent.ChatBanner, reactions = emptyList())
+    assertTrue(terminalRowsSeparated(single(banner, nextDay)))
+    val event = featureEvent(1, 0).copy(meta = featureEvent(1, 0).meta.copy(itemTs = older.meta.itemTs))
+    assertFalse(terminalRowsSeparated(grouped(event, nextDay, revealed = false)))
+    assertTrue(terminalRowsSeparated(grouped(event, nextDay, revealed = true)))
+  }
+
+  @Test
+  fun headingAtItemTopTakesRowGap() {
+    val item = withBlocks(msg(2, CIDirection.DirectSnd(), 10), heading())
+    assertEquals(TERMINAL_LEVEL_STEP, gap(item, msg(1, CIDirection.DirectSnd(), 0)))
+    assertEquals(0.sp, terminalHeadingGap(item))
+  }
+
+  @Test
+  fun headingBelowQuoteOrHeaderTakesHeadingGap() {
+    val older = msg(1, CIDirection.DirectSnd(), 0)
+    listOf(quoted(msg(2, CIDirection.DirectSnd(), 10)), forwarded(msg(2, CIDirection.DirectSnd(), 10))).forEach {
+      val item = withBlocks(it, heading())
+      assertEquals(0.sp, gap(item, older))
+      assertEquals(TERMINAL_LEVEL_STEP, terminalHeadingGap(item))
+    }
+  }
+
+  @Test
+  fun headingBelowDeletionLiveFileOrMediaTakesHeadingGap() {
+    val older = msg(1, CIDirection.DirectSnd(), 0)
+    val base = msg(2, CIDirection.DirectSnd(), 10)
+    val file = CIFile(fileId = 1, fileName = "a.txt", fileSize = 1, fileStatus = CIFileStatus.SndComplete, fileProtocol = FileProtocol.XFTP)
+    listOf(
+      base.copy(meta = base.meta.copy(itemDeleted = CIDeleted.Deleted(null))),
+      base.copy(meta = base.meta.copy(itemLive = true)),
+      base.copy(content = CIContent.SndMsgContent(MsgContent.MCUnknown(text = "# Notes", json = JsonPrimitive("unknown"))), file = file),
+      base.copy(content = CIContent.SndMsgContent(MsgContent.MCImage("# Caption", "")))
+    ).forEach {
+      val item = withBlocks(it, heading())
+      assertEquals(0.sp, gap(item, older))
+      assertEquals(TERMINAL_LEVEL_STEP, terminalHeadingGap(item))
+    }
+  }
+
+  @Test
+  fun headingInUnknownContentWithoutFileTakesRowGap() {
+    val base = msg(2, CIDirection.DirectSnd(), 10)
+    val item = withBlocks(base.copy(content = CIContent.SndMsgContent(MsgContent.MCUnknown(text = "# Notes", json = JsonPrimitive("unknown")))), heading())
+    assertEquals(TERMINAL_LEVEL_STEP, gap(item, msg(1, CIDirection.DirectSnd(), 0)))
+    assertEquals(0.sp, terminalHeadingGap(item))
+  }
+
+  @Test
+  fun noHeadingGapsWithoutLeadingHeading() {
+    val older = msg(1, CIDirection.DirectSnd(), 0)
+    val headingSecond = withBlocks(msg(2, CIDirection.DirectSnd(), 10), MarkdownBlock.Paragraph(SegmentRange(0, 1)), heading())
+    assertEquals(0.sp, gap(headingSecond, older))
+    assertEquals(0.sp, terminalHeadingGap(headingSecond))
+    assertEquals(0.sp, terminalHeadingGap(quoted(msg(2, CIDirection.DirectSnd(), 10))))
+  }
+}
diff --git a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/ui/theme/Theme.desktop.kt b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/ui/theme/Theme.desktop.kt
index d7dc1ca859..8006b4febb 100644
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/ui/theme/Theme.desktop.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/ui/theme/Theme.desktop.kt
@@ -3,13 +3,20 @@ package chat.simplex.common.ui.theme
 import androidx.compose.runtime.Composable
 import chat.simplex.common.platform.Log
 import chat.simplex.common.platform.TAG
+import chat.simplex.common.platform.desktopPlatform
 import com.jthemedetecor.OsThemeDetector
 
 private val detector: OsThemeDetector = OsThemeDetector.getDetector()
   .apply {
     registerListener(::reactOnDarkThemeChanges)
+    if (desktopPlatform.isLinux()) Runtime.getRuntime().addShutdownHook(Thread(::stopGsettingsMonitor))
   }
 
+private fun stopGsettingsMonitor() =
+  ProcessHandle.current().children()
+    .filter { it.info().command().orElse("").contains("gsettings") }
+    .forEach { it.destroy() }
+
 // TODO: explore possibility to use
 //@Composable
 //actual fun isSystemInDarkTheme(): Boolean = androidx.compose.foundation.isSystemInDarkTheme()
diff --git a/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/ChatEventTextTest.kt b/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/ChatEventTextTest.kt
new file mode 100644
index 0000000000..0c515695b1
--- /dev/null
+++ b/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/ChatEventTextTest.kt
@@ -0,0 +1,53 @@
+package chat.simplex.app
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.size
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.withStyle
+import androidx.compose.ui.unit.dp
+import chat.simplex.common.model.*
+import chat.simplex.common.ui.theme.SimpleXTheme
+import chat.simplex.common.views.chat.item.*
+import kotlinx.datetime.Clock
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+class ChatEventTextTest {
+  private val event = ChatItem(CIDirection.DirectRcv(), CIMeta.getSample(1, Clock.System.now(), "", CIStatus.RcvRead()), CIContent.RcvDirectE2EEInfo(E2EEInfo(pqEnabled = false)), reactions = listOf())
+
+  private fun separatorAndTime(terminal: Boolean): Pair<AnnotatedString, AnnotatedString> {
+    var result: Pair<AnnotatedString, AnnotatedString>? = null
+    renderScene {
+      SimpleXTheme {
+        CompositionLocalProvider(LocalTerminalLayout provides terminal) {
+          ChatEventWithMeta(event) { separator, ts ->
+            result = separator to ts
+            Box(Modifier.size(1.dp))
+          }
+        }
+      }
+    }
+    return result!!
+  }
+
+  @Test
+  fun classicEventTextUnchanged() {
+    val (separator, ts) = separatorAndTime(terminal = false)
+    assertEquals(AnnotatedString("  "), separator)
+    assertEquals(AnnotatedString(event.timestampText), ts)
+    val base = buildAnnotatedString { withStyle(chatEventStyle) { append("alice joined the group  ${event.timestampText}") } }
+    assertEquals(base, chatEventText("alice joined the group", separator + ts))
+  }
+
+  @Test
+  fun terminalSeparatorJoinsCopyByNoBreakSpaces() {
+    val (separator, ts) = separatorAndTime(terminal = true)
+    assertEquals("\u00A0\u00A0\u00A0", separator.text)
+    assertEquals(listOf(chatEventStyle, reserveTimestampStyle), separator.spanStyles.map { it.item })
+    assertTrue(ts.text.startsWith("\u2060\u200E") && ts.text.endsWith(event.timestampText.replace(' ', '\u00A0')), ts.text)
+  }
+}
diff --git a/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/LayoutRecorder.kt b/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/LayoutRecorder.kt
new file mode 100644
index 0000000000..392edf225c
--- /dev/null
+++ b/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/LayoutRecorder.kt
@@ -0,0 +1,34 @@
+package chat.simplex.app
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.ImageComposeScene
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.FirstBaseline
+import androidx.compose.ui.layout.LastBaseline
+import androidx.compose.ui.layout.layout
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.layout.positionInRoot
+import androidx.compose.ui.unit.Constraints
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.LayoutDirection
+import kotlin.math.roundToInt
+
+data class Placed(val x: Int, val y: Int, val width: Int, val height: Int)
+
+fun Modifier.record(into: MutableMap<String, Placed>, name: String): Modifier = onGloballyPositioned {
+  val p = it.positionInRoot()
+  into[name] = Placed(p.x.roundToInt(), p.y.roundToInt(), it.size.width, it.size.height)
+}
+
+fun Modifier.fixed(width: Int, height: Int, baseline: Int?): Modifier = layout { measurable, _ ->
+  val placeable = measurable.measure(Constraints.fixed(width, height))
+  layout(width, height, if (baseline == null) emptyMap() else mapOf(FirstBaseline to baseline, LastBaseline to baseline)) { placeable.place(0, 0) }
+}
+
+fun renderScene(direction: LayoutDirection = LayoutDirection.Ltr, content: @Composable () -> Unit) {
+  val scene = ImageComposeScene(width = 400, height = 400, density = Density(1f), layoutDirection = direction, content = content)
+  scene.render()
+  scene.close()
+}
+
+fun Placed.relativeTo(origin: Placed) = Placed(x - origin.x, y - origin.y, width, height)
diff --git a/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/PriorityLayoutTest.kt b/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/PriorityLayoutTest.kt
new file mode 100644
index 0000000000..d0ce540765
--- /dev/null
+++ b/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/PriorityLayoutTest.kt
@@ -0,0 +1,66 @@
+package chat.simplex.app
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.layoutId
+import androidx.compose.ui.unit.LayoutDirection
+import androidx.compose.ui.unit.dp
+import chat.simplex.common.views.chat.item.CHAT_IMAGE_LAYOUT_ID
+import chat.simplex.common.views.chat.item.PriorityLayout
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class PriorityLayoutTest {
+  private val placed = mutableMapOf<String, Placed>()
+
+  private fun layOut(limitToPriorityWidth: Boolean, direction: LayoutDirection = LayoutDirection.Ltr): Map<String, Placed> {
+    renderScene(direction) {
+      Box(Modifier.width(300.dp)) {
+        PriorityLayout(Modifier.record(placed, "layout"), CHAT_IMAGE_LAYOUT_ID, limitToPriorityWidth) {
+          Box(Modifier.width(280.dp).height(30.dp).record(placed, "header"))
+          Box(Modifier.layoutId(CHAT_IMAGE_LAYOUT_ID).record(placed, "media").size(200.dp, 100.dp))
+          Box(Modifier.fillMaxWidth().height(40.dp).record(placed, "caption"))
+        }
+      }
+    }
+    val layout = placed.getValue("layout")
+    return listOf("layout", "header", "media", "caption").associateWith { placed.getValue(it).relativeTo(layout) }
+  }
+
+  @Test
+  fun terminalElementsAtTheirOwnWidth() {
+    val r = layOut(limitToPriorityWidth = false)
+    assertEquals(Placed(0, 0, 300, 170), r["layout"])
+    assertEquals(Placed(0, 0, 280, 30), r["header"])
+    assertEquals(Placed(0, 30, 200, 100), r["media"])
+    assertEquals(Placed(0, 130, 300, 40), r["caption"])
+  }
+
+  @Test
+  fun classicElementsAtMediaWidth() {
+    val r = layOut(limitToPriorityWidth = true)
+    assertEquals(Placed(0, 0, 200, 170), r["layout"])
+    assertEquals(Placed(0, 0, 200, 30), r["header"])
+    assertEquals(Placed(0, 30, 200, 100), r["media"])
+    assertEquals(Placed(0, 130, 200, 40), r["caption"])
+  }
+
+  @Test
+  fun terminalElementsAtStartEdgeRightToLeft() {
+    val r = layOut(limitToPriorityWidth = false, direction = LayoutDirection.Rtl)
+    assertEquals(Placed(20, 0, 280, 30), r["header"])
+    assertEquals(Placed(100, 30, 200, 100), r["media"])
+    assertEquals(Placed(0, 130, 300, 40), r["caption"])
+  }
+
+  @Test
+  fun classicPlacementUnmirroredRightToLeft() {
+    val r = layOut(limitToPriorityWidth = true, direction = LayoutDirection.Rtl)
+    assertEquals(Placed(0, 0, 200, 30), r["header"])
+    assertEquals(Placed(0, 30, 200, 100), r["media"])
+  }
+}
diff --git a/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/TerminalMetaCopyTest.kt b/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/TerminalMetaCopyTest.kt
new file mode 100644
index 0000000000..483ad6a9a3
--- /dev/null
+++ b/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/TerminalMetaCopyTest.kt
@@ -0,0 +1,158 @@
+package chat.simplex.app
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.width
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Rect
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.Paragraph
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.font.createFontFamilyResolver
+import androidx.compose.ui.text.style.TextDirection
+import androidx.compose.ui.unit.Constraints
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.LayoutDirection
+import androidx.compose.ui.unit.sp
+import chat.simplex.common.model.*
+import chat.simplex.common.ui.theme.Inter
+import chat.simplex.common.ui.theme.SimpleXTheme
+import chat.simplex.common.views.chat.item.LocalTerminalLayout
+import chat.simplex.common.views.chat.item.MarkdownText
+import chat.simplex.common.views.chat.item.reserveSpaceForMeta
+import chat.simplex.common.views.chat.item.terminalReserveSpaceForMeta
+import kotlinx.datetime.Clock
+import kotlin.math.abs
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+class TerminalMetaCopyTest {
+  private val resolver = createFontFamilyResolver()
+  private val iconSpace = " \u00A0\u00A0\u00A0"
+  private val sentEdited = CIMeta.getSample(1, Clock.System.now(), "", status = CIStatus.SndSent(SndCIStatusProgress.Complete), itemEdited = true)
+  private val receivedTimed = CIMeta.getSample(2, Clock.System.now(), "", status = CIStatus.RcvRead(), itemTimed = CITimed(30, null))
+  private val sentViaProxy = CIMeta.getSample(3, Clock.System.now(), "", status = CIStatus.SndSent(SndCIStatusProgress.Complete), sentViaProxy = true)
+
+  private fun copy(meta: CIMeta, density: Density, direction: LayoutDirection, showViaProxy: Boolean = false) =
+    terminalReserveSpaceForMeta(
+      meta, null, null, null, Color.Gray, showStatus = true, showEdited = true, showViaProxy = showViaProxy, showTimestamp = true,
+      density = density, bodyFontSize = 16.sp, direction = direction
+    )
+
+  private fun paragraph(text: AnnotatedString, density: Density, textDirection: TextDirection, width: Int) =
+    Paragraph(
+      text = text.text,
+      style = TextStyle(fontFamily = Inter, fontSize = 16.sp, textDirection = textDirection),
+      constraints = Constraints(maxWidth = width),
+      density = density,
+      fontFamilyResolver = resolver,
+      spanStyles = text.spanStyles
+    )
+
+  private fun Paragraph.bounds(range: IntRange): Rect =
+    range.map { getBoundingBox(it) }.reduce { a, b -> Rect(minOf(a.left, b.left), minOf(a.top, b.top), maxOf(a.right, b.right), maxOf(a.bottom, b.bottom)) }
+
+  @Test
+  fun classicReserveUnchanged() {
+    assertEquals(iconSpace + iconSpace + "\u00A0" + sentEdited.timestampText, reserveSpaceForMeta(sentEdited, null, null, Color.Gray, showTimestamp = true))
+    assertEquals(iconSpace + shortTimeText(30) + "\u00A0" + iconSpace + "\u00A0" + receivedTimed.timestampText, reserveSpaceForMeta(receivedTimed, null, null, Color.Gray, showTimestamp = true))
+    assertEquals(iconSpace + iconSpace + iconSpace, reserveSpaceForMeta(sentEdited, null, null, Color.Gray, showTimestamp = false))
+    assertEquals(iconSpace + iconSpace + "\u00A0" + sentViaProxy.timestampText, reserveSpaceForMeta(sentViaProxy, null, null, Color.Gray, showViaProxy = true, showTimestamp = true))
+  }
+
+  @Test
+  fun copyHasClassicSpacesAndDirectionMark() {
+    val ltr = copy(sentEdited, Density(1f), LayoutDirection.Ltr)
+    assertEquals("\u2060\u200E" + (iconSpace + iconSpace + "\u00A0" + "\u00A0" + sentEdited.timestampText).replace(' ', '\u00A0'), ltr.text)
+    val rtl = copy(receivedTimed, Density(1f), LayoutDirection.Rtl)
+    assertEquals("\u2060\u200F" + (iconSpace + shortTimeText(30) + "\u00A0" + iconSpace + "\u00A0" + receivedTimed.timestampText).replace(' ', '\u00A0'), rtl.text)
+    val proxy = copy(sentViaProxy, Density(1f), LayoutDirection.Ltr, showViaProxy = true)
+    assertEquals("\u2060\u200E" + (iconSpace + "\u00A0" + iconSpace + "\u00A0" + "\u00A0" + sentViaProxy.timestampText).replace(' ', '\u00A0'), proxy.text)
+  }
+
+  @Test
+  fun iconSpacesKeepWidthAcrossFontScales() {
+    val ts = sentEdited.timestampText
+    val widths = listOf(0.7f, 0.75f, 1f, 1.3f).associateWith { s ->
+      val density = Density(1f, s)
+      val text = copy(sentEdited, density, LayoutDirection.Ltr)
+      val p = paragraph(text, density, TextDirection.Ltr, 1000)
+      val timeStart = text.length - ts.length
+      assertTrue(p.getHorizontalPosition(2, true) < 0.5f, "marks at scale $s: ${p.getHorizontalPosition(2, true)} px")
+      val icons = p.getHorizontalPosition(timeStart, true) - p.getHorizontalPosition(2, true)
+      val time = p.getHorizontalPosition(text.length, true) - p.getHorizontalPosition(timeStart, true)
+      icons to time
+    }
+    val (icons1, time1) = widths.getValue(1f)
+    for ((s, w) in widths) {
+      assertTrue(abs(w.first - icons1) < 0.5f, "icon spaces at scale $s: ${w.first} px, at scale 1: $icons1 px")
+      assertTrue(abs(w.second / time1 - s) < 0.05f, "time at scale $s: ${w.second} px, at scale 1: $time1 px")
+    }
+  }
+
+  @Test
+  fun ruleOnlyMessageAsWideAsCopy() {
+    val placed = mutableMapOf<String, Placed>()
+    renderScene {
+      SimpleXTheme {
+        CompositionLocalProvider(LocalTerminalLayout provides true, LocalDensity provides Density(1f)) {
+          Box(Modifier.width(IntrinsicSize.Max)) {
+            MarkdownText(
+              "---", listOf(FormattedText("---")), listOf(MarkdownBlock.Rule(SegmentRange(0, 1))), meta = sentEdited,
+              toggleSecrets = false, linkMode = SimplexLinkMode.DESCRIPTION, blockLayout = true, modifier = Modifier.record(placed, "rule")
+            )
+          }
+        }
+      }
+    }
+    val copyWidth = paragraph(copy(sentEdited, Density(1f), LayoutDirection.Ltr), Density(1f), TextDirection.Ltr, 1000).maxIntrinsicWidth
+    assertTrue(abs(placed.getValue("rule").width - copyWidth) <= 1f, "rule ${placed.getValue("rule").width} px, copy $copyWidth px")
+  }
+
+  @Test
+  fun copyAfterSpacesStaysWithLastWord() {
+    val density = Density(1f)
+    val head = "The bot replied at once"
+    val text = buildAnnotatedString {
+      append("$head   ")
+      append(copy(sentEdited, density, LayoutDirection.Ltr))
+    }
+    val oneLine = paragraph(text, density, TextDirection.Ltr, 10000)
+    val width = (oneLine.getHorizontalPosition(head.length + 3, true) + oneLine.maxIntrinsicWidth) / 2
+    val p = paragraph(text, density, TextDirection.Ltr, width.toInt())
+    assertEquals(2, p.lineCount)
+    assertEquals(p.getLineForOffset(head.lastIndexOf(' ') + 1), p.getLineForOffset(text.length - 1))
+  }
+
+  @Test
+  fun copyStaysAtLineEndAfterWordInOtherDirection() {
+    val cases = listOf(
+      "שלום לכולם, זו הפסקה האחרונה של ההודעה" to LayoutDirection.Ltr,
+      "This is the last paragraph of the message" to LayoutDirection.Rtl,
+    )
+    for ((head, direction) in cases) {
+      val density = Density(1f)
+      val text = buildAnnotatedString {
+        append(head)
+        append(copy(sentEdited, density, direction))
+      }
+      val p = paragraph(text, density, if (direction == LayoutDirection.Ltr) TextDirection.Ltr else TextDirection.Rtl, 230)
+      val lastLine = p.lineCount - 1
+      val lineStart = p.getLineStart(lastLine)
+      assertTrue(lineStart in 1 until head.length, "$direction: last line start $lineStart")
+      assertEquals(lastLine, p.getLineForOffset(text.length - 1), "$direction: time line")
+      val words = p.bounds(lineStart until head.length)
+      val time = p.bounds(head.length + 2 until text.length)
+      if (direction == LayoutDirection.Ltr) {
+        assertTrue(time.left >= words.right - 0.5f, "$direction: copy ${time.left}..${time.right}, words ${words.left}..${words.right}")
+      } else {
+        assertTrue(time.right <= words.left + 0.5f, "$direction: copy ${time.left}..${time.right}, words ${words.left}..${words.right}")
+      }
+    }
+  }
+}
diff --git a/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/TerminalMetaLayoutTest.kt b/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/TerminalMetaLayoutTest.kt
new file mode 100644
index 0000000000..b76d5abe39
--- /dev/null
+++ b/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/TerminalMetaLayoutTest.kt
@@ -0,0 +1,160 @@
+package chat.simplex.app
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.layout.layoutId
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.LayoutDirection
+import androidx.compose.ui.unit.dp
+import chat.simplex.common.views.chat.item.*
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class TerminalMetaLayoutTest {
+  private val density = Density(1f)
+  private val rowWidth = 300
+  private val metaWidth = 60
+  private val metaHeight = 16
+  private val metaBaseline = 12
+  private val metaBoxWidth = metaWidth + 12
+  private val gap = with(density) { TERMINAL_META_GAP.roundToPx() }
+  private val blockGap = with(density) { TERMINAL_BLOCK_BOTTOM_GAP.roundToPx() }
+  private val placed = mutableMapOf<String, Placed>()
+
+  private class Result(val row: Placed, val content: Placed, val meta: Placed?, val overlay: Placed?, val endButton: Placed?, val drawn: Set<String>)
+
+  private fun layOut(
+    direction: LayoutDirection = LayoutDirection.Ltr,
+    metaReserved: Boolean = true,
+    overlay: Boolean = false,
+    endButton: Boolean = false,
+    content: @Composable (Modifier) -> Unit
+  ): Result {
+    val drawn = mutableSetOf<String>()
+    renderScene(direction) {
+      CompositionLocalProvider(LocalTerminalLayout provides true) {
+        Box(Modifier.width(rowWidth.dp).record(placed, "row")) {
+          ItemWithMeta(
+            meta = { Box(Modifier.record(placed, "meta").drawBehind { drawn += "meta" }.fixed(metaWidth, metaHeight, metaBaseline)) },
+            overlayMeta = if (overlay) { { Box(Modifier.record(placed, "overlay").drawBehind { drawn += "overlay" }.fixed(metaWidth, metaHeight, metaBaseline)) } } else null,
+            metaReserved = metaReserved,
+            endButton = if (endButton) { { Box(Modifier.record(placed, "endButton").fixed(22, 22, null)) } } else null
+          ) { content(Modifier.record(placed, "content")) }
+        }
+      }
+    }
+    val row = placed.getValue("row")
+    return Result(Placed(0, 0, row.width, row.height), placed.getValue("content").relativeTo(row), placed["meta"]?.relativeTo(row), placed["overlay"]?.relativeTo(row), placed["endButton"]?.relativeTo(row), drawn)
+  }
+
+  @Test
+  fun metaBaselineOnContentLastBaseline() {
+    val r = layOut(metaReserved = false) { Box(it.fixed(100, 40, 30)) }
+    assertEquals(Placed(0, 0, 100, 40), r.content)
+    assertEquals(Placed(rowWidth - metaBoxWidth, 30 - metaBaseline, metaWidth, metaHeight), r.meta)
+    assertEquals(40, r.row.height)
+  }
+
+  @Test
+  fun contentNarrowedByMetaWithoutReserve() {
+    val r = layOut(metaReserved = false) { Box(it.fillMaxWidth().height(40.dp)) }
+    assertEquals(Placed(0, 0, rowWidth - metaBoxWidth, 40), r.content)
+  }
+
+  @Test
+  fun metaBesideLastLineWithRoom() {
+    val r = layOut { Box(it.messageLastLine().fixed(100, 40, 30)) }
+    assertEquals(Placed(rowWidth - metaBoxWidth, 30 - metaBaseline, metaWidth, metaHeight), r.meta)
+    assertEquals(40, r.row.height)
+  }
+
+  @Test
+  fun metaUnderLastLineWithoutRoom() {
+    val r = layOut { Box(it.messageLastLine().fixed(260, 40, 30)) }
+    assertEquals(Placed(rowWidth - metaBoxWidth, 40 + gap, metaWidth, metaHeight), r.meta)
+    assertEquals(40 + gap + metaHeight, r.row.height)
+  }
+
+  @Test
+  fun blockGapBelowLastBlockWithMetaBeside() {
+    val r = layOut { Box(it.messageLastBlock().fixed(100, 40, 30)) }
+    assertEquals(Placed(rowWidth - metaBoxWidth, 30 - metaBaseline, metaWidth, metaHeight), r.meta)
+    assertEquals(40 + blockGap, r.row.height)
+  }
+
+  @Test
+  fun metaAboveBottomOfContentWithoutBaseline() {
+    val r = layOut(metaReserved = false) { Box(it.fixed(100, 50, null)) }
+    assertEquals(Placed(rowWidth - metaBoxWidth, 50 - gap - metaHeight, metaWidth, metaHeight), r.meta)
+    assertEquals(50, r.row.height)
+  }
+
+  @Test
+  fun rowAtLeastAsTallAsMeta() {
+    val r = layOut { Box(it.fixed(100, 10, 8)) }
+    assertEquals(Placed(rowWidth - metaBoxWidth, 0, metaWidth, metaHeight), r.meta)
+    assertEquals(metaHeight, r.row.height)
+  }
+
+  @Test
+  fun overlayMetaAtContentEndWhenRowIsFull() {
+    val r = layOut(metaReserved = false, overlay = true) { Box(it.fixed(260, 100, null)) }
+    assertEquals(Placed(260 - metaBoxWidth, 100 - gap - metaHeight, metaWidth, metaHeight), r.overlay)
+    assertEquals(setOf("overlay"), r.drawn)
+    assertEquals(100, r.row.height)
+  }
+
+  @Test
+  fun overlayMetaAtTopOfShortContent() {
+    val r = layOut(metaReserved = false, overlay = true) { Box(it.fixed(260, 10, null)) }
+    assertEquals(Placed(260 - metaBoxWidth, 0, metaWidth, metaHeight), r.overlay)
+    assertEquals(setOf("overlay"), r.drawn)
+    assertEquals(metaHeight, r.row.height)
+  }
+
+  @Test
+  fun overlayMetaOnMediaUnderWiderQuote() {
+    val r = layOut(metaReserved = false, overlay = true) {
+      Column(it.width(IntrinsicSize.Max)) {
+        PriorityLayout(Modifier, CHAT_IMAGE_LAYOUT_ID, limitToPriorityWidth = true) {
+          Box(Modifier.width(290.dp).height(30.dp))
+          Box(Modifier.layoutId(CHAT_IMAGE_LAYOUT_ID).record(placed, "media").size(260.dp, 100.dp))
+        }
+      }
+    }
+    val media = placed.getValue("media").relativeTo(placed.getValue("row"))
+    assertEquals(Placed(media.x + media.width - metaBoxWidth, media.y + media.height - gap - metaHeight, metaWidth, metaHeight), r.overlay)
+    assertEquals(setOf("overlay"), r.drawn)
+  }
+
+  @Test
+  fun endButtonCentredAboveTimeLine() {
+    val r = layOut(endButton = true) {
+      Column(it.fillMaxWidth()) {
+        Box(Modifier.fixed(80, 24, 18))
+        Box(Modifier.fixed(100, 40, 30))
+      }
+    }
+    assertEquals(Placed(0, 0, rowWidth - 12 - 22, 64), r.content)
+    assertEquals(Placed(rowWidth - metaBoxWidth, 54 - metaBaseline, metaWidth, metaHeight), r.meta)
+    assertEquals(Placed(rowWidth - 12 - 22, (54 - metaBaseline - 22) / 2, 22, 22), r.endButton)
+    assertEquals(64, r.row.height)
+  }
+
+  @Test
+  fun metaBesideLastLineRightToLeft() {
+    val r = layOut(direction = LayoutDirection.Rtl) { Box(it.messageLastLine().fixed(100, 40, 30)) }
+    assertEquals(Placed(rowWidth - 100, 0, 100, 40), r.content)
+    assertEquals(Placed(metaBoxWidth - metaWidth, 30 - metaBaseline, metaWidth, metaHeight), r.meta)
+    assertEquals(40, r.row.height)
+  }
+}
diff --git a/apps/multiplatform/gradle.properties b/apps/multiplatform/gradle.properties
index 484b8c7f94..8654bf1006 100644
--- a/apps/multiplatform/gradle.properties
+++ b/apps/multiplatform/gradle.properties
@@ -7,6 +7,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+kotlin.daemon.jvmargs=-Xmx4096m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
diff --git a/apps/multiplatform/product/concepts.md b/apps/multiplatform/product/concepts.md
index aa739ef636..dd208e89fa 100644
--- a/apps/multiplatform/product/concepts.md
+++ b/apps/multiplatform/product/concepts.md
@@ -50,6 +50,7 @@ This document provides a structured mapping between product-level concepts, thei
 | PC29 | User Address | [README.md](README.md) (Contacts, User Management) | [spec/api.md](../spec/api.md) | `common/.../views/usersettings/UserAddressView.kt`, `UserAddressLearnMore.kt` | `Controller.hs` (`APICreateMyAddress`) |
 | PC30 | Member Support Chat | [README.md](README.md) (Groups) | [spec/api.md](../spec/api.md) | `common/.../views/chat/group/MemberSupportView.kt`, `MemberSupportChatView.kt`, `MemberAdmission.kt` | `Messages.hs` (`GroupChatScope`), `Controller.hs` |
 | PC31 | Channels (Relays) | [views/group-info.md](views/group-info.md) | [spec/client/chat-view.md](../spec/client/chat-view.md), [spec/state.md](../spec/state.md) | `common/.../model/ChatModel.kt` (`RelayStatus` incl. `RsRejected`, `GroupRelay`, `GroupMemberRole.Relay`, `GroupMemberStatus.MemRejected`), `common/.../views/chat/group/ChannelRelaysView.kt`, `GroupMemberInfoView.kt` (rejected-status row), `common/.../views/newchat/AddChannelView.kt` (`RelayStatusIndicator` rejected branch), `common/.../views/chat/group/AddGroupRelayView.kt` | `Controller.hs` (`APIAddGroupRelays`, `APIAllowRelayGroup`, `XGrpRelayReject` CONF handler) |
+| PC32 | Terminal Chat Layout | [views/chat.md](views/chat.md) (Terminal Layout) | [spec/client/chat-view.md](../spec/client/chat-view.md#TerminalLayout), [spec/state.md](../spec/state.md), [spec/services/theme.md](../spec/services/theme.md#ThemeModeOverrides) | `common/.../views/chat/item/TerminalItemView.kt`, `common/.../views/chat/ChatView.kt` (`LocalTerminalLayout` provider, terminal row branch), `common/.../views/chat/item/ChatItemView.kt` (`alignEnd`, `chatItemTailEnabled`), `FramedItemView.kt` (text edge, meta), `CIEventView.kt` (`chatEventPadding`, `chatEventTextStyle`, `ChatEventWithMeta`), `CIMetaView.kt` (`terminalReserveSpaceForMeta`), `MarkdownBlocks.kt` (terminal block gaps, `headingBox`), `TextItemView.kt` (copy of the meta), `common/.../model/ChatModel.kt` (`ChatLayoutMode`, `activeChatLayout`), `common/.../ui/theme/Theme.kt` (`ThemeModeOverrides.chatLayout`), `common/.../views/usersettings/Appearance.kt` (`ChatLayoutRow`, theme previews), `common/.../views/chat/ChatInfoView.kt` (`ChatLayoutSection`); tests: `common/src/commonTest/kotlin/chat/simplex/app/TerminalItemViewTest.kt`, `common/src/desktopTest/kotlin/chat/simplex/app/TerminalMetaCopyTest.kt`, `common/src/desktopTest/kotlin/chat/simplex/app/TerminalMetaLayoutTest.kt`, `common/src/desktopTest/kotlin/chat/simplex/app/PriorityLayoutTest.kt`, `common/src/desktopTest/kotlin/chat/simplex/app/ChatEventTextTest.kt` | `Types/UITheme.hs` (`ChatLayout`, `UIThemeEntityOverrides`), `Types.hs` (`GroupProfile`), `Controller.hs` (`SetGroupChatLayout`, `SetAddressSettings`) |
 
 **Legend for abbreviated paths:**
 - `common/.../` expands to `common/src/commonMain/kotlin/chat/simplex/common/`
diff --git a/apps/multiplatform/product/flows/calling.md b/apps/multiplatform/product/flows/calling.md
index d29c1d4478..72b48d07c8 100644
--- a/apps/multiplatform/product/flows/calling.md
+++ b/apps/multiplatform/product/flows/calling.md
@@ -121,7 +121,7 @@ Reconnection: Connected -> Reconnecting -> Connected | Ended
 2. The WebRTC engine reports `"reconnecting"` connection state; the app shows "reconnecting…" and plays the connecting sound. This state is not reported to the core, and `connectedAt` is kept, so call duration continues.
 3. The callee's WebRTC engine (the party that sent the initial offer) restarts ICE every 10 seconds, sending the new offer in `WCallResponse.Ice` with `session` via `apiSendCallExtraInfo`. The caller answers the same way.
 4. When the connection is restored, the call returns to `Connected` and the sound stops.
-5. If the connection is not restored in 30 seconds, the call ends as disconnected. Clients without ICE restart support ignore the restart offer, so the call ends in this case.
+5. If the connection is not restored in 30 seconds, the call ends as disconnected. If the contact's chat version is below 22 (`CALL_RECONNECT_VERSION`), the call ends as soon as the connection is lost, without reconnection.
 
 ---
 
diff --git a/apps/multiplatform/product/views/chat.md b/apps/multiplatform/product/views/chat.md
index c920e40146..49ed6b8eff 100644
--- a/apps/multiplatform/product/views/chat.md
+++ b/apps/multiplatform/product/views/chat.md
@@ -45,7 +45,7 @@ Rendered by `LazyColumnWithScrollBar` with pagination:
 | Merged items | Adjacent messages grouped with `ItemSeparation` (timestamp, large gap, date separators) |
 | Floating buttons | Scroll-to-bottom button with unread count |
 | Date separators | Date headers between messages from different days |
-| Wallpaper | Per-chat themed background via `perChatTheme` from contact/group `uiThemes` |
+| Wallpaper | Per-chat themed background via `perChatTheme` from contact/group `uiThemes`; terminal layout: background colour without the image |
 | Content filter | Filter messages by type via `ContentFilter` (images, files, links, etc.) |
 
 ### Message Types
@@ -126,6 +126,12 @@ Shown when `selectedChatItems != null`:
 
 When `timedMessageAllowed` is true, compose bar includes a timer icon for setting message disappear time via `customDisappearingMessageTimePref`.
 
+### Terminal Layout
+
+On Android and desktop, a chat with the terminal layout shows messages as full-width rows without bubbles, starting at one edge for sent and received messages, with the sender's name above each group of messages and the time at the end of the last line. The wallpaper is drawn as its colour without the image.
+
+A chat uses the user's choice for that chat, otherwise the layout set by the group owner or by the address the contact came from, otherwise the user's choice for the profile and then the app setting, otherwise classic.
+
 ## Source Files
 
 | File | Path |
diff --git a/apps/multiplatform/spec/README.md b/apps/multiplatform/spec/README.md
index 59f3fbe78a..b29a44075e 100644
--- a/apps/multiplatform/spec/README.md
+++ b/apps/multiplatform/spec/README.md
@@ -88,7 +88,7 @@ Common Module (commonMain)
 | API | [spec/api.md](api.md) | ChatController command dispatch, ~150 API functions in 11 categories, CC/CR/API types |
 | Database | [spec/database.md](database.md) | SQLite database files, migrations, encryption, backup/restore |
 | Impact | [spec/impact.md](impact.md) | Source file → product concept mapping for change impact analysis |
-| Chat View | [spec/client/chat-view.md](client/chat-view.md) | ChatView, ChatItemView, message rendering, item interactions |
+| Chat View | [spec/client/chat-view.md](client/chat-view.md) | ChatView, ChatItemView, message rendering, item interactions, terminal layout (TerminalItemView) |
 | Chat List | [spec/client/chat-list.md](client/chat-list.md) | ChatListView, ChatPreviewView, filtering, search, tags |
 | Compose | [spec/client/compose.md](client/compose.md) | ComposeView, SendMsgView, ComposeState, attachments, mentions |
 | Navigation | [spec/client/navigation.md](client/navigation.md) | App screen routing, onboarding, settings, new chat flows |
@@ -104,7 +104,7 @@ Common Module (commonMain)
 | Category | Path | Topic |
 |---|---|---|
 | Overview | [product/README.md](../product/README.md) | Product overview, capability map, navigation map |
-| Concepts | [product/concepts.md](../product/concepts.md) | 30 product concepts (PC1-PC30) mapped to docs + source |
+| Concepts | [product/concepts.md](../product/concepts.md) | 32 product concepts (PC1-PC32) mapped to docs + source |
 | Glossary | [product/glossary.md](../product/glossary.md) | Domain term definitions (9 sections) |
 | Rules | [product/rules.md](../product/rules.md) | 18 business rules in 6 categories |
 | Gaps | [product/gaps.md](../product/gaps.md) | 8 known gaps with recommendations |
diff --git a/apps/multiplatform/spec/client/chat-view.md b/apps/multiplatform/spec/client/chat-view.md
index c7d6f0674f..a6e39c01b0 100644
--- a/apps/multiplatform/spec/client/chat-view.md
+++ b/apps/multiplatform/spec/client/chat-view.md
@@ -15,12 +15,13 @@ Source: `common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
 7. [ChatInfoView](#7-chatinfoview)
 8. [GroupChatInfoView](#8-groupchatinfoview)
 9. [Source Files](#9-source-files)
+10. [Terminal Layout](#10-terminal-layout)
 
 ---
 
 ## Executive Summary
 
-The Chat View is the primary message display and interaction surface in SimpleX Chat. It is built around the `ChatView` composable (line ~96 in `ChatView.kt`), which orchestrates a `ChatLayout` containing a reverse-scrolling `LazyColumn` of `ChatItemView` items and a `ComposeView` for message input. The view supports direct chats, group chats, local notes, and contact connections, with per-chat theming, search/filter, multi-select, and side-panel info modals. Message rendering is delegated to type-specific composables in the `views/chat/item/` package.
+The Chat View is the primary message display and interaction surface in SimpleX Chat. It is built around the [`ChatView`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt#L99) composable, which orchestrates a `ChatLayout` containing a reverse-scrolling `LazyColumn` of `ChatItemView` items and a `ComposeView` for message input. The view supports direct chats, group chats, local notes, and contact connections, with per-chat theming, search/filter, multi-select, and side-panel info modals. Message rendering is delegated to type-specific composables in the `views/chat/item/` package.
 
 ---
 
@@ -36,7 +37,10 @@ ChatView
 |   |   |   |-- DateSeparator
 |   |   |   |-- MemberNameAndRole  (group received messages)
 |   |   |   |-- MemberImage        (group received messages)
-|   |   |   +-- ChatItemView       (message type routing)
+|   |   |   |-- ChatItemView       (message type routing)
+|   |   |   +-- TerminalChatItemRow (terminal layout, replaces the three lines above)
+|   |   |       |-- sender row, avatar in groups
+|   |   |       +-- ChatItemView
 |   |   |-- ChatBannerView         (first item: chat profile banner)
 |   |   +-- FloatingButtons        (scroll-to-bottom, unread counter)
 |   |-- ComposeView               (message composition area)
@@ -56,7 +60,7 @@ ChatView
 
 ## 2. ChatView Composable
 
-**Location:** [`ChatView.kt#L97`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt#L97)
+**Location:** [`ChatView.kt#L98`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt#L98)
 
 ```kotlin
 fun ChatView(
@@ -84,7 +88,7 @@ fun ChatView(
 
 ### Chat Loading
 
-On chat ID change (via `snapshotFlow` on `chatModel.chatId.value`, line ~162):
+On chat ID change (via [`snapshotFlow` on `chatModel.chatId.value`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt#L180)):
 
 1. Marks unread chat as read (`markUnreadChatAsRead`)
 2. Clears group members state
@@ -95,7 +99,7 @@ On chat ID change (via `snapshotFlow` on `chatModel.chatId.value`, line ~162):
 
 ### Chat Type Routing
 
-The outer `when (chatInfo)` (line ~229) branches:
+The outer [`when (chatInfo)`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt#L274) branches:
 
 | ChatInfo Type | Behavior |
 |---|---|
@@ -107,13 +111,13 @@ The outer `when (chatInfo)` (line ~229) branches:
 
 ## 3. Message List
 
-**Location:** [`ChatView.kt#L1592`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt#L1592) (`ChatItemsList` composable)
+**Location:** [`ChatView.kt#L1757`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt#L1757) (`ChatItemsList` composable)
 
 The message list is a `LazyColumnWithScrollBar` with `reverseLayout = true`, meaning index 0 is the newest message at the bottom of the screen.
 
 ### Key Behaviors
 
-- **Merged Items:** Messages are grouped via `MergedItems.create()` (line ~1653), which collapses consecutive similar system events into expandable groups. Revealed state is tracked in `revealedItems`.
+- **Merged Items:** Messages are grouped via [`MergedItems.create()`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt#L1821), which collapses consecutive similar system events into expandable groups. Revealed state is tracked in `revealedItems`; `MergedItem.revealed` is true for a single item and for a revealed group row.
 - **Pagination:** `PreloadItems` triggers `loadMessages` with `ChatPagination.Before` (older) or `ChatPagination.Last` (newer) when the user scrolls near list boundaries.
 - **Scroll To Item:** `scrollToItem` lambda supports animated scrolling to a specific item ID, used by search result taps and quoted message navigation.
 - **Unread Marking:** `MarkItemsReadAfterDelay` composable marks newly visible received items as read after a brief delay.
@@ -127,6 +131,7 @@ The message list is a `LazyColumnWithScrollBar` with `reverseLayout = true`, mea
 - **Group received without avatar:** Indented to align with avatar-bearing messages.
 - **Sent messages (group or direct):** Right-aligned with larger start padding.
 - **Direct messages:** Symmetric padding (76dp opposite side).
+- **Terminal layout:** When `LocalTerminalLayout.current` is true, all chat types render through `TerminalChatItemRow`, which wraps `ChatItemView`, instead of the branches above (see section 10). The selection offset applies to sent items too.
 
 ---
 
@@ -134,7 +139,7 @@ The message list is a `LazyColumnWithScrollBar` with `reverseLayout = true`, mea
 
 ## 4. ChatItemView
 
-**Location:** [`item/ChatItemView.kt#L66`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt#L66)
+**Location:** [`item/ChatItemView.kt#L70`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt#L70)
 
 ```kotlin
 fun ChatItemView(
@@ -171,6 +176,37 @@ The composable routes based on `cItem.content` and `cItem.meta.itemDeleted`:
 
 Long-press or right-click opens a dropdown menu with context-sensitive actions (see section 6).
 
+### Terminal Layout Adjustments
+
+When `LocalTerminalLayout.current` is true, `ChatItemView` and the item views it calls keep their content and start at one text edge, `CHAT_ITEM_TEXT_PADDING` (12dp) inside the item; messages are drawn without the bubble fill and tail:
+
+- Items are start-aligned for both directions ([`alignEnd`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt#L125)). The item click has no indication; the row draws it (section 10). `GoToItemButton` is placed as described in section 10 ([L345](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt#L345), [L817](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt#L817)). Voice items use the arrangement of received items for both directions.
+- [`chatItemTailEnabled()`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt#L1220) returns false, so `shapeStyle` draws no tail.
+- `FramedItemView` has a transparent background. Headers (report, moderated, blocked, deleted, live, forwarded) and the quote have no background and start at the text edge. The quote has the bar of Markdown quotes ([`Modifier.quoteBar`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/MarkdownBlocks.kt#L151)), its text in `onSurface` at 70%, 15sp. The bar and the padding, `TERMINAL_BLOCK_TOP_GAP` (5.75sp) above and `TERMINAL_BLOCK_BOTTOM_GAP` (5sp) below, span the whole quote row, including an image or video thumbnail; the thumbnail has the message corner clip of media (`thumbnailClip`, `clipChatItem`, rounded by the `chatItemRoundness` preference, square at 0); the file, voice and chat link icons of the quote have no top padding. Headers: `TERMINAL_HEADER_TOP_GAP` (2.5sp) above, `TERMINAL_HEADER_BOTTOM_GAP` (1.5sp) below; the header text uses `terminalTextStyle` at its size in `secondary`, and the icon is centred on it and takes no height (`Modifier.inlineIcon()`).
+- Images, videos, link previews and chat link cards start at the text edge, `TERMINAL_BLOCK_TOP_GAP` below the part above them, and keep the message corner clip ([`mediaModifier`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/FramedItemView.kt#L56)). Link previews and chat links are cards in the quote colour ([`cardModifier`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/FramedItemView.kt#L58)). The item itself is not clipped (`clipChatItem` of `FramedItemView` and `ChatItemView` is skipped), so headings and emoji are drawn whole. An image or video without caption, or a chat link card without text (`gapBelowBlock`, computed with `metaReserved`, which is passed to `ItemWithMeta`), has `TERMINAL_BLOCK_BOTTOM_GAP` below it, outside `ItemWithMeta`. Captions are selected by the classic conditions.
+- Captions (user, D30): the text below an image, video, link preview, chat link card, voice message or file is laid out as the text of a close follow-up message, the time on it only. `PriorityLayout` measures it in the full width of the item (`limitToPriorityWidth = false`; classic: the width of the media) and places the elements at the start edge in both directions (`placeRelative`), the caption of a link preview has no width limit (classic: `DEFAULT_MAX_IMAGE_WIDTH`), and a chat link card keeps its own width (`width(IntrinsicSize.Max)`). Its gap below the media is the gap from the same media without text to a close follow-up message. An image or video without caption keeps the classic limit (`limitToPriorityWidth = true`): a quote or header above it takes the width of the media, so the white time over the media stays on its bottom end corner.
+- [`CIMarkdownText`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/FramedItemView.kt#L481): top padding `terminalTop` (required): 0 below the sender row, a header, the quote, a voice message or a file, `TERMINAL_BLOCK_BOTTOM_GAP` below an image, video, link preview or chat link card; plus [`terminalHeadingGap(item)`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TerminalItemView.kt#L121-L122), `TERMINAL_LEVEL_STEP` when the text starts with a heading and is not at the top of the item (below a quote, a header or a block); no bottom padding. Its text style: `body1` in `messageTextColor()`, merged with `terminalTextStyle` at the `body1` size. The default style of `MarkdownText` is classic and is used outside the rows (the compose context preview).
+- Code block cards, table cards and rules of `MarkdownBlocks`: `TERMINAL_BLOCK_TOP_GAP` above, `TERMINAL_BLOCK_BOTTOM_GAP` below, except the last block of a message without a meta line (`marksLastBlock`; a live message has the meta line with the typing indicator, so its last block keeps the gap). That block has no bottom margin and is marked with `messageLastBlock()`: `TERMINAL_BLOCK_BOTTOM_GAP` is added below it when the time stays beside it, and the time moved under it is `TERMINAL_META_GAP` below its edge (section 10). In a message of rules only, the rules are at least as wide as the copy of the time (`ruleMinWidth` of `MarkdownBlocks`, measured by `MarkdownText`; user, D31), as in classic, where the meta line sets the width; the time stays beside them unless a wider quote or header widens the item so that the rule leaves no room for the time.
+- Text blocks of [`MarkdownBlocks`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/MarkdownBlocks.kt#L59): a paragraph break, and a heading that does not start the text, add `TERMINAL_LEVEL_STEP` (4.75sp) (classic: half the line height, before a paragraph break only); above a heading that starts the text, the gap is added by `terminalRowGap` or `terminalHeadingGap`. A block after a heading, other than a heading, has `TERMINAL_HEADING_BOTTOM_GAP` (half of `TERMINAL_LEVEL_STEP`, 2.375sp) above it instead, so a heading is nearer to its own text than to the text above it.
+- Text styles: [`terminalTextStyle(fontSize, color)`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TerminalItemView.kt#L78-L84) sets the line height to font size × `TERMINAL_LINE_HEIGHT_RATIO` (22/16) × f(w) and `LineHeightStyle(Proportional, Trim.None)`. Every line takes the full line height, one-line texts included. The space added to a line is split in the ratio of the font's ascent to its descent. On desktop each run of a line is given its own line box; with this alignment, runs of different sizes (the 12sp time in the copy of the meta) are placed on one baseline in a line of the body line height. f(w) = 1 − `TERMINAL_LINE_HEIGHT_CONTRAST_SLOPE` (0.1515) × (1 − w); w: the L* contrast of the text colour against `MaterialTheme.colors.background`, divided by that of `messageTextColor()`, limited to 0…1, and 1 when the message text has no contrast. Used for message text and captions (the style of `CIMarkdownText`), Markdown quotes (text colour at 70%), code, headings (body line height × scale), quote text and the quote's sender (in `body1`, Inter, in terminal rows), the sender name and role, event texts ([`chatEventTextStyle(base)`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIEventView.kt#L22-L28): 12sp, `secondary`, merged into `base`, by default `LocalTextStyle.current`; classic: `base`; in both layouts the text direction is left unspecified, which Compose resolves to the layout direction, so that an event starting with a name in the opposite direction keeps the copy of the time at the end of the row), header texts and the time (classic: unchanged). For names and the white time over media (`lineHeightColor` of `CIMetaView`), f is computed with the message text colour. Line heights in the light and dark themes: message text 22sp, quote text 19.6sp and 20.1sp, event text and time 15.1sp and 15.5sp.
+- Headings: body size × `TERMINAL_HEADING_RATIO` (1.3125) to the power 2, 1, 0 for levels 1, 2, 3, 27.6, 21 and 16sp for 16sp text; levels 4–6 also at the body size; all bold (classic: 1.5, 1.3, 1.15); line heights scaled the same. `Modifier.headingBox` lays a heading out with the space of a body line above its capitals and below its last baseline (Inter cap height 2048/2816 em). It uses the px ratio of the body and heading font sizes: Android scales font sizes non-linearly from font scale 1.03 and, above 1.05, sets line heights in proportion to the font size in px, so the capitals are placed as body capitals at every font scale (within 1px at 1, 1.15 and 1.3).
+- Files: `TERMINAL_FILE_TOP_GAP` (2sp) above the file row, no padding below, no padding of its icon. Voice messages drawn by `FramedItemView` (with a caption, a quote or a header; `hasText = true`): the layout of a voice message drawn alone (4sp above, 6sp below, its indicator), without its own time; no padding below the item.
+- Emoji-only items, also under a quote or a header: `TERMINAL_EMOJI_TOP_GAP` (4.25sp) above, `TERMINAL_EMOJI_BOTTOM_GAP` (1.5sp) below (classic: 8dp; under a quote or header 6dp above, 8dp below). Under a quote or a header the emoji is not stretched to the item width, so its reported last line is the emoji itself; `PriorityLayout` places it at the start edge in both directions.
+- Item gaps: one gap above each row, [`terminalRowGap(item, older, separated, largeGap, hasSenderRow)`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TerminalItemView.kt#L118-L119), passed by `ChatItemsList` as `topGap` of the row. It is `TERMINAL_LEVEL_STEP` when an older item exists, the rows are not separated and one of these holds: the gap to the older item is large; the row shows a sender row; either item is an event (content without a terminal sender); the text of the item is at its top (text or unknown content without a file, without quote, header, deletion, live state or report) and its first block is a heading. Otherwise it is 0. `separated` (`terminalRowsSeparated`): a date separator is drawn between the two rows (the older row is revealed, a single item or a revealed group row, and its date differs from that of the oldest item of the row), or the older item is the chat banner. For a collapsed group, `older` is the item older than the group, and `largeGap` is computed against the oldest item of the group. The bottom of a row is `TERMINAL_LEVEL_STEP` when a date separator is drawn below it, 8dp for the newest row, as classic, otherwise 0 (`ChatItemBox(top, bottom)`; classic: 1dp or 4dp above, 1dp or 4dp below). Above a sender row, `TERMINAL_SENDER_TOP_GAP` (6.5sp) is added; below the name, `TERMINAL_SENDER_BOTTOM_GAP` (5.5sp). The gaps are constants in sp at the top of `TerminalItemView.kt`, converted to dp with the font scale. The bottom padding of call items (8dp), the paddings of voice messages drawn without `FramedItemView` (no caption, quote, header, deletion or live state; 4sp above, 6sp below) and the 6dp between the two rows of the forwarded-from header are classic.
+- Vertical gaps, measured from the baseline (or a block's bottom edge) to the top of the tallest letter, a heading's capitals, or a block's top edge:
+
+```
+level 1   lines of a quote
+level 2   lines of a message; messages of one sender within 60 seconds; a block against the text line or block next to it
+level 3   messages of one sender 60 seconds or more apart; sender name → message or header; paragraph break; above a heading, also at the start of a message
+level 4   last line of a message → next sender name; above and below an event
+```
+- Event, feature and member-created items use [`chatEventPadding(vertical)`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIEventView.kt#L30-L33): in terminal rows the text edge at the sides, `TERMINAL_EVENT_TOP_GAP` (8.25sp) above and `TERMINAL_EVENT_BOTTOM_GAP` (1.5sp) below, so that the capitals of the event text are where the capitals of a sender name would be and its last baseline is as far from the row end as that of a message line (classic: 6dp at the sides, `vertical` above and below, 6dp by default, 8dp for the merged feature icons). The icons of feature and preference items are centred on the text and take no height (`Modifier.inlineIcon()`); the row of merged feature icons is one event text line high. `CIEventView` has no line limit in terminal rows, so the copy of the time stays at the end of the text (user, D23; classic: 4 lines). Voice and call items and reactions start at the text edge.
+- Time and status: placed at the end of the row by [`ItemWithMeta`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TerminalItemView.kt#L200-L214), the baseline of the time on the last baseline of the content (section 10). Message text ends with [`terminalReserveSpaceForMeta`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIMetaView.kt#L227-L270): a transparent copy of the meta joined to the last word by no-break spaces, in `FontWeight.Normal`. The copy starts with a word joiner (U+2060), which forbids a line break before the copy, also after the three spaces of an idle live message (`noTyping`), so the time is not moved alone to the next line. The direction mark of its paragraph follows (U+200E left-to-right, U+200F right-to-left), so that the bidirectional algorithm places the copy at the end of the line, also after words in the other direction on a wrapped last line. Its spaces and texts are appended by [`reserveSpaceForMeta`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIMetaView.kt#L145-L225), which has the conditions of `CIMetaText`, except that the timer is reserved for every timed message, and returns the classic string unchanged, through span parameters: icon spaces and the spaces between them are no-break spaces at the `body1` size in dp (16dp converted to sp with the density, so that they keep their width at every font scale, as the icons do; also after a heading and in event text), 18dp for each icon, wider than a 12dp icon with its spacer (15dp or 16dp); after the 17dp icons one more space is added (22.5dp against 21dp): the sent and received status icons (`tallStatusIcon`, also used by `CIMetaText`) and the via-proxy icon; the time and the timer text of a disappearing message are at 12sp. The copy includes the file encryption and signature icons (`encrypted` and `signedFileVerified` of `MarkdownText`, passed by `CIMarkdownText` from the item). When the last word and the copy do not fit in the line, the last word moves to the next line with the time. Text whose paragraph direction (`textLayoutDirection`: right-to-left when the first 50 characters of the message text hold a right-to-left character; all blocks and lines of a message take it) differs from the outer direction (`parentDirection`, passed by the blocks and by the meta line of a live message; otherwise `LocalLayoutDirection`) ends with a line break instead of the copy, so the time is placed on an added empty line. Emoji, and the last code block, table or rule of a message, report their width (`Modifier.messageLastLine()`, `Modifier.messageLastBlock()`); the time moves under them when the row leaves no room for it beside them. The meta line with the time is drawn under such a block only for live messages, for the typing indicator. File text keeps the space reserved for the time at the end of its size line. Images and videos without a caption (`captionlessMedia`) keep the meta in `secondary` beside the media when it fits in the row, otherwise the meta is drawn over the bottom end of the media in white, as in the classic layout (`overlayMeta`). Event items are wrapped in [`ChatEventWithMeta`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIEventView.kt#L35-L48), which passes the separator and the end of the event text apart (`separator`, `ts`): in the classic layout two spaces and the time without a style, in the terminal layout three transparent no-break spaces in `chatEventStyle` and the transparent `terminalReserveSpaceForMeta` of the meta without status and edit icons, so the last word of the event text is moved to the next line with the time when they do not fit. Each view puts the separator where the classic layout has two spaces (user, D28): after the event text, or in the "Open" and "Accept" links, so the classic output is unchanged.
+- Group invitations, deleted items and error items (`IntegrityErrorItemView`, `CIRcvDecryptionError`) keep their rounded coloured card.
+
+Both layouts: `MarkdownText` draws message text in [`messageTextColor()`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TextItemView.kt#L54), `onSurface` at 87% in dark themes.
+
 ---
 
 ## 5. Message Types
@@ -316,6 +352,7 @@ Key sections: group profile, group link, member list with roles, group preferenc
 | `MarkdownFileView.kt` | Markdown file viewer, formatted or as text |
 | `IntegrityErrorItemView.kt` | Message integrity error |
 | `MarkedDeletedItemView.kt` | Marked-as-deleted / moderated message |
+| `TerminalItemView.kt` | Terminal layout: `LocalTerminalLayout`, sender row rule, `TerminalChatItemRow`, `ItemWithMeta` |
 | `TextItemView.kt` | Plain text message with markdown; blocks of `markdownBlocks` drawn as a column of views by `MarkdownBlocks` (`MarkdownBlocks.kt`) |
 
 ### `views/chat/group/`
@@ -343,3 +380,139 @@ Key sections: group profile, group link, member list with roles, group preferenc
 When a relay operator runs `/leave #channel`, the relay sends `x.grp.relay.reject` over the owner-relay direct contact channel. Owner-side handling: the corresponding `GroupRelay.relayStatus` transitions `RSInvited → RSRejected`; the relay's `GroupMember.memberStatus` is set to `MemLeft` so the owner UI renders the rejected relay identically to one that explicitly ran `/leave` (`MemRejected` is reserved for the knocking-admission flow). In `GroupMemberInfoView`, an additional "Status: rejected by relay operator" `InfoRow` appears when `groupRelay?.relayStatus == RelayStatus.RsRejected`. The status is final on the owner side — clearable only by the relay operator running `/group allow #<channel>`, which has no owner-facing event.
 
 The `RelayStatusIndicator` composable in `AddChannelView.kt` renders `RsRejected` with a red dot and "rejected" text, matching the `connFailed`/`removed` rendering.
+
+---
+
+<a id="TerminalLayout"></a>
+
+## 10. Terminal Layout
+
+**Location:** [`item/TerminalItemView.kt`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TerminalItemView.kt)
+
+Rendering of a chat whose [`ChatInfo.activeChatLayout`](../state.md) is `ChatLayoutMode.Terminal`: full-width start-aligned rows, the sender name once per group of messages, avatars in groups only, messages without bubbles (item-level changes: section 4). Android and desktop; iOS draws the classic layout.
+
+### Activation
+
+| Step | Location |
+|---|---|
+| `terminal = chatInfo.activeChatLayout(user) == ChatLayoutMode.Terminal` | [`ChatView`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt#L268) |
+| `LocalTerminalLayout provides terminal`, next to `LocalAppBarHandler` and `LocalSelectionManager` | [`ChatView`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt#L269-L273) |
+| `drawWallpaperImage = false` of `chatViewBackgroundModifier` | [`ChatLayout` composable](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt#L1010) |
+
+[`LocalTerminalLayout`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TerminalItemView.kt#L56) is `false` outside `ChatView` and the theme screens (below); chat item info keeps the classic look. The value applies to every `ChatView` of the chat: main view, member support chats and reports.
+
+Colours: the app, user and chat themes apply as in the classic layout. Wallpaper: `chatViewBackgroundModifier` fills the chat with the background colour of the wallpaper (preset or custom) and omits the image.
+
+### Functions
+
+| Function | Purpose |
+|---|---|
+| [`terminalTextStyle(fontSize, color)`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TerminalItemView.kt#L78-L84) | Terminal: line height and line height style of a text in the rows (section 4); classic: `TextStyle.Default`, so that merging it changes nothing |
+| [`terminalItemShowsSender(item, older)`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TerminalItemView.kt#L102-L103) | Whether a row shows the sender row (sender rule below). `older`: the next older item in the list |
+| [`sameSender(item, older)`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TerminalItemView.kt#L105-L113) | Private; same sender for grouping |
+| [`terminalRowGap(item, older, separated, largeGap, hasSenderRow)`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TerminalItemView.kt#L118-L119) | The gap above a row (section 4, item gaps): `TERMINAL_LEVEL_STEP` or 0. Used by `ChatItemsList` and the theme preview |
+| [`terminalHeadingGap(item)`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TerminalItemView.kt#L121-L122) | `TERMINAL_LEVEL_STEP` above a heading that starts the text of an item below a quote, a header or a block; added to the top padding of `CIMarkdownText` |
+| [`ChatItem.hasQuoteOrHeader`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt#L836-L837) | A quote, a forwarded header, a deletion, the live state or a report: the item is drawn by `FramedItemView` with a quote or header above its content. Used by `ChatItemView` to choose `EmojiItemView` or `CIVoiceView` and by the heading gaps |
+| [`CIContent.hasTerminalSender`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TerminalItemView.kt#L130-L137) | Private. True for sent messages, sent deleted and moderated items, sent calls and group invitations, and received content with `showMemberName` (messages, deleted, moderated and blocked items, calls, errors, group invitations, invalid JSON); false for events, feature and preference changes, E2EE info and the chat banner |
+| [`TerminalRowInteractionSource`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TerminalItemView.kt#L139-L153) | Interaction source of the row and its item: press interactions are emitted at the position where the pointer went down in the row, so the ripple starts there |
+| [`Modifier.terminalRowIndication(source)`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TerminalItemView.kt#L155-L166) | Records the pointer-down position; hover and press indication of the whole row |
+| [`Modifier.terminalStartOffset(offset)`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TerminalItemView.kt#L168-L173) | Shifts the row by the selection offset and narrows it by the same amount |
+| [`Modifier.messageLastLine()`, `Modifier.messageLastBlock()`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TerminalItemView.kt#L179-L187) | `messageLastLine()` sets the private alignment lines `LastLineLeft` and `LastLineRight` to the left and right edges of the element: emoji. `messageLastBlock()` also sets `LastBlockBottom` at the bottom edge of the element: the last code block, table or rule of a message without a meta line, which has no bottom margin |
+| [`Modifier.inlineIcon()`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TerminalItemView.kt#L189-L198) | Terminal: lays the element out with no height, centred on its position, so that a row with `Alignment.CenterVertically` takes the height of its text and centres the element on it: icons of feature and preference items and of message headers. Classic: the modifier unchanged |
+| [`ItemWithMeta(meta, overlayMeta, metaReserved, endButton, content)`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TerminalItemView.kt#L200-L214) | Classic: `content` with the meta passed as `inlineMeta`. Terminal: `content` without meta, and the meta in a box with 12dp end padding at the end of the available width, the message column of the row (private [`TerminalMetaLayout`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TerminalItemView.kt#L216-L256)). `endButton`, in a box with the same end padding, is placed at the end of the row, centred vertically between the content top and the top of the time box (the whole content when the time is over media); the content is measured in the width less the wider of this box and, without `metaReserved`, the time box. The meta is measured first. Without `metaReserved` and `overlayMeta`, the content is measured in the width less the width of the box, so that it does not reach under the time. `metaReserved` is true for content with its own reserve of the space or a reported last line: text with the transparent copy (`metaReserved` of `FramedItemView`), files, emoji and event items. The first baseline of the box (the baseline of the time; without a time, the baseline of a 12sp time centred in the box) is placed on the last baseline of the content. When the content reports its last line and the line and the box together are wider than the row, the box is placed `TERMINAL_META_GAP` (6sp) under the content and the bottom of the row moves down by that gap and the height of the box. When the box stays beside a last block reported with `LastBlockBottom` at the content bottom (a table, or a code card or rule, which span the width of the item), `TERMINAL_BLOCK_BOTTOM_GAP` is added below the content. Content without a baseline (a message of a rule only, a failed call), and captionless media with `overlayMeta`: the box ends `TERMINAL_META_GAP` above the content bottom; when the content and the box together are wider than the row, the `overlayMeta` box is placed at the bottom end of the content instead, `TERMINAL_META_GAP` above its bottom. Either box is placed at the top of the content at most, and the row is at least as tall as the box. When the rule leaves room for the time beside it, the time stays on the baseline of the last text line above it (D24); otherwise it is placed under the rule. |
+| [`ChatItemSender`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TerminalItemView.kt#L258) | Name, badge, role label, `own`, avatar |
+| [`chatItemSender(chatInfo, cItem, range, reversedChatItems, showMemberInfo, showChatInfo)`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TerminalItemView.kt#L260-L307) | Sender of a row (table below) |
+| [`SenderNameAndRole(sender, modifier)`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TerminalItemView.kt#L312-L335) | Private; name and badge (13.5sp; primary for own items, secondary otherwise) and role label |
+| [`terminalGutter(chatInfo)`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TerminalItemView.kt#L337-L339) | Gutter width: the member image size (scaled by `fontSizeSqrtMultiplier`) plus 4dp in groups, 0 in other chats |
+| [`TerminalChatItemRow(sender, gutter, topGap, modifier, senderTopGap, content)`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TerminalItemView.kt#L341-L383) | Row layout below |
+
+In `ChatView.kt`, shared with the classic date separator:
+
+| Function | Purpose |
+|---|---|
+| [`terminalRowsSeparated(olderRow)`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt#L3817-L3820) | A date separator or the chat banner between a row and the older row: the newest item of the older row is the banner, or [`rowItemSeparation(row)`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt#L3812-L3815) of the older row has a date. False without an older row |
+| `rowItemSeparation(row)` | Private; the separation of a row, also used by `ChatItemsList` for the date separator it draws: `getItemSeparation` of the newest item of the row and the next newer item (the oldest item of the newer row) when the row is revealed (`MergedItem.revealed`: a single item or a revealed group row), without the newer item otherwise (user, D32) |
+
+### Row Layout
+
+```
+row padding        top: topGap (terminalRowGap), plus senderTopGap (TERMINAL_SENDER_TOP_GAP, 6.5sp) with a sender row; start 8dp; end 12dp
+gutter             terminalGutter(chatInfo)
+  avatar           top of the gutter, sender rows of groups only
+message column     starts at the gutter
+  sender row       name and badge (13.5sp; primary for own messages, secondary otherwise), role label; start padding CHAT_ITEM_TEXT_PADDING; text style terminalTextStyle(13.5sp)
+  item             ChatItemView; TERMINAL_SENDER_BOTTOM_GAP (5.5sp) below the sender row
+```
+
+`ChatItemsList` passes [`showAvatar`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt#L2460) = `terminalItemShowsSender(item, merged.oldest().nextItem)`, and the row gets `chatItemSender(...)` when it is true, `null` otherwise; the [gap above the row](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt#L2461-L2466), with `terminalRowsSeparated` of the older row (the next merged item of the reversed list), is passed to `ChatViewListItem` as `terminalGap`.
+
+### Sender Rule
+
+`terminalItemShowsSender`: a row shows the sender row when the item has a sender (`hasTerminalSender`) and one of these holds:
+
+- it is the oldest loaded item;
+- the older item has no sender (an event);
+- `sameSender` is false.
+
+The time between the items and a date change do not repeat the sender row.
+
+`sameSender`: when either item is posted as the channel (`ChannelRcv`, or `GroupSnd` with `meta.showGroupAsSender`), both must be; two `GroupRcv` items need the same `memberId`; other items need the same direction class.
+
+### Sender Resolution
+
+| Direction | Name and badge | Role label | Avatar | Avatar click | Own colour |
+|---|---|---|---|---|---|
+| `ChannelRcv`, `GroupSnd` with `showGroupAsSender` | Channel name | "channel" (`channel_role_label`) | `ProfileImage` of the group, as in the classic layout | `showChatInfo` | For `GroupSnd` |
+| `DirectRcv` | Contact display name and badge | None | None | None | No |
+| `GroupRcv` | `memberNames` of the merged members; badge for one member | Member role when above `Member`, for one member | `MemberImage` | `showMemberInfo` | No |
+| `GroupSnd` | `groupInfo.membership` display name and badge | Membership role when above `Member` | `MemberImage(membership)` | None | Yes |
+| Other, incognito chat | "Incognito" | None | None | None | Yes |
+| Other (`DirectSnd`, `LocalSnd`, `LocalRcv`) | Current user display name and badge | None | None | None | Yes |
+
+The sender row has no time; the time of every item is placed by `ItemWithMeta`.
+
+### Row Background
+
+| State | Background |
+|---|---|
+| Selected (selection mode) | `primary` at 10% |
+| Highlighted (`highlightedItems` contains the item, e.g. after jumping to a quoted message) | `primary` at 14% |
+| Otherwise | Transparent |
+
+Hover and press are drawn by `terminalRowIndication` over the whole row.
+
+### Go-to Button
+
+[`GoToItemButton`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt#L290) is activated by the row hover (`parentActivated`; the row interaction source is passed as `bubbleInteractionSource`).
+
+- Search results: the search icon is drawn by `ChatItemView` after the item, as for classic received items: at the end of the row, centred on the item; every row of the results is narrowed by the button and its 13dp start padding, so their times stay aligned.
+- Forwarded items drawn by `FramedItemView`: the arrow is passed as `endButton` and placed by `ItemWithMeta` at the end of the row, centred on the item above the line with the time (the forwarded header line for a one-line message); the text is narrowed by the arrow, and the time keeps its place.
+- Forwarded items shown as marked deleted (`markedDeleted`, no header line): the arrow after the item, as in search results.
+
+### Selection and Swipe
+
+The selection checkbox (8dp start padding) and the full-row selection click overlay are shared with the classic layout. The row is moved by `Modifier.terminalStartOffset` for sent and received items alike. Swipe to reply uses the `swipeableModifier` of the classic layout on the whole row (Android; off in selection mode).
+
+### Theme Screens
+
+`LocalTerminalLayout` is provided to the theme screens of a terminal chat or profile:
+
+| Screen | Value |
+|---|---|
+| Chat theme ([`ChatWallpaperEditorModal`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatInfoView.kt#L1300)) | `activeChatLayout` of the chat |
+| Appearance › Themes, preset selector ([`ThemesSection`](../../common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/Appearance.kt#L581)) | `profileChatLayout` of the current user, or of none for the app theme destination |
+| Customize theme, profile theme, colour editors | the same, through `profileLayoutIsTerminal` and the `terminal` parameter of `editColor` |
+
+With the value true:
+
+- the preview draws two terminal rows ("alice", then "bob" in the own colour) without gutter, the gap between them by `terminalRowGap` and `TERMINAL_SENDER_TOP_GAP`, as in the chat; [`PreviewInEitherLayout`](../../common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/Appearance.kt#L337) measures both layouts and shows the active one centred in the larger height, so a layout switch keeps the preview height;
+- the preview and the preset tiles show the wallpaper colour without the image;
+- the custom image tile, the image scale, the scale slider and the wallpaper accent row are hidden.
+
+Layout controls:
+
+| Control | Values | Stored in |
+|---|---|---|
+| Chat theme screen, first section ([`ChatLayoutSection`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatInfoView.kt#L1313)) | the chat default, "(chat)" when the chat layout is the default, otherwise "(default)"; the other layout | chat theme record, by [`setChatLayout`](../../common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatInfoView.kt#L1382) and `apiSetChatUIThemes` |
+| Appearance › Themes, app theme destination ([`ChatLayoutRow`](../../common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/Appearance.kt#L950)) | Classic, Terminal; the selection is `profileChatLayout(null)` | `appPrefs.chatLayout` |
+| Appearance › Themes, profile destination | `profileChatLayout(null)` "(default)"; the other layout | profile theme record, by `saveThemeToDatabase` and `apiSetUserUIThemes` |
diff --git a/apps/multiplatform/spec/impact.md b/apps/multiplatform/spec/impact.md
index 6ae1e8d9f6..8c5b474dfd 100644
--- a/apps/multiplatform/spec/impact.md
+++ b/apps/multiplatform/spec/impact.md
@@ -41,6 +41,7 @@
 | PC29 | User Address |
 | PC30 | Member Support Chat |
 | PC31 | Channels (Relays) |
+| PC32 | Terminal Chat Layout |
 
 ---
 
@@ -52,13 +53,13 @@ Path prefix: `common/src/commonMain/kotlin/chat/simplex/common/`
 
 | Source File | Product Concepts Affected | Risk Level | Notes |
 |-------------|--------------------------|------------|-------|
-| `App.kt` | PC1 through PC31 | High | Root composable — navigation scaffold for all features |
+| `App.kt` | PC1 through PC32 | High | Root composable — navigation scaffold for all features |
 | `AppLock.kt` | PC22 | Medium | App lock state and authorization lifecycle |
-| `model/ChatModel.kt` | PC1 through PC31 | High | Central state object — every feature reads or writes here |
-| `model/SimpleXAPI.kt` | PC1 through PC31 | High | FFI bridge to Haskell core — all commands and responses |
+| `model/ChatModel.kt` | PC1 through PC32 | High | Central state object — every feature reads or writes here |
+| `model/SimpleXAPI.kt` | PC1 through PC32 | High | FFI bridge to Haskell core — all commands and responses |
 | `model/CryptoFile.kt` | PC10, PC23 | Medium | Encrypted file read/write helpers |
-| `platform/Core.kt` | PC1 through PC31 | High | Native FFI declarations (`chatMigrateInit`, `chatSendCmd`, etc.) — all API traffic |
-| `platform/AppCommon.kt` | PC1 through PC31 | Medium | Shared app initialization logic |
+| `platform/Core.kt` | PC1 through PC32 | High | Native FFI declarations (`chatMigrateInit`, `chatSendCmd`, etc.) — all API traffic |
+| `platform/AppCommon.kt` | PC1 through PC32 | Medium | Shared app initialization logic |
 | `platform/Files.kt` | PC10, PC23, PC26 | Medium | File path resolution, temp dirs, encryption utilities |
 | `platform/NtfManager.kt` | PC18 | High | Notification manager expect declarations |
 | `platform/Notifications.kt` | PC18 | Medium | Notification channel and permission abstractions |
@@ -68,7 +69,7 @@ Path prefix: `common/src/commonMain/kotlin/chat/simplex/common/`
 | `platform/Cryptor.kt` | PC23 | Medium | Keystore encryption expect declarations |
 | `platform/Share.kt` | PC10, PC12 | Low | Share sheet abstractions |
 | `platform/Images.kt` | PC10, PC19 | Low | Image processing utilities |
-| `platform/Platform.kt` | PC1 through PC31 | Low | Platform detection and capability flags |
+| `platform/Platform.kt` | PC1 through PC32 | Low | Platform detection and capability flags |
 | `platform/PlatformTextField.kt` | PC4 | Low | Native text input expect declarations |
 | `platform/Back.kt` | PC1 | Low | Back navigation handling |
 | `platform/UI.kt` | PC24 | Low | UI density and locale helpers |
@@ -82,7 +83,7 @@ Path prefix: `common/src/commonMain/kotlin/chat/simplex/common/`
 | Source File | Product Concepts Affected | Risk Level | Notes |
 |-------------|--------------------------|------------|-------|
 | `ui/theme/ThemeManager.kt` | PC24 | Medium | Theme resolution engine — all color and wallpaper logic |
-| `ui/theme/Theme.kt` | PC24 | Medium | Theme composables and `SimpleXTheme` |
+| `ui/theme/Theme.kt` | PC24, PC32 | Medium | Theme composables and `SimpleXTheme` |
 | `ui/theme/Color.kt` | PC24 | Low | Color palette definitions |
 | `ui/theme/Shape.kt` | PC24 | Low | Shape token definitions |
 | `ui/theme/Type.kt` | PC24 | Low | Typography definitions |
@@ -108,7 +109,7 @@ Path prefix: `common/src/commonMain/kotlin/chat/simplex/common/`
 
 | Source File | Product Concepts Affected | Risk Level | Notes |
 |-------------|--------------------------|------------|-------|
-| `views/chat/ChatView.kt` | PC2, PC3, PC4, PC5, PC6, PC7, PC8, PC9, PC11 | High | Core conversation UI — most messaging features |
+| `views/chat/ChatView.kt` | PC2, PC3, PC4, PC5, PC6, PC7, PC8, PC9, PC11, PC32 | High | Core conversation UI — most messaging features |
 | `views/chat/ComposeView.kt` | PC4, PC6, PC9, PC10, PC11 | High | Message composition — send path for all messages |
 | `views/chat/SendMsgView.kt` | PC4, PC9 | Medium | Send button and voice record toggle |
 | `views/chat/ComposeEmojiPicker.kt` | PC4 | Low | Emoji button expect declaration, emoji insertion |
@@ -117,11 +118,11 @@ Path prefix: `common/src/commonMain/kotlin/chat/simplex/common/`
 | `views/chat/ComposeImageView.kt` | PC10 | Low | Image attachment preview in compose area |
 | `views/chat/ContextItemView.kt` | PC6 | Low | Reply/edit quote preview |
 | `views/chat/SelectableChatItemToolbars.kt` | PC7, PC10 | Medium | Multi-select toolbar (delete, forward) |
-| `views/chat/ChatInfoView.kt` | PC2, PC13, PC20 | Medium | Contact details and verification |
+| `views/chat/ChatInfoView.kt` | PC2, PC13, PC20, PC32 | Medium | Contact details and verification |
 | `views/chat/ContactPreferences.kt` | PC2, PC8 | Medium | Per-contact feature preferences |
 | `views/chat/ChatItemInfoView.kt` | PC2, PC3 | Low | Message delivery detail |
 | `views/chat/ChatItemsLoader.kt` | PC2, PC3 | Medium | Pagination and message loading logic |
-| `views/chat/ChatItemsMerger.kt` | PC2, PC3 | Medium | Merges incremental message updates |
+| `views/chat/ChatItemsMerger.kt` | PC2, PC3, PC32 | Medium | Merges incremental message updates |
 | `views/chat/VerifyCodeView.kt` | PC13 | Medium | Contact security code verification |
 | `views/chat/ScanCodeView.kt` | PC13 | Low | QR code scanning for verification |
 | `views/chat/CommandsMenuView.kt` | PC4 | Low | Slash-command menu |
@@ -134,28 +135,30 @@ Path prefix: `common/src/commonMain/kotlin/chat/simplex/common/`
 
 | Source File | Product Concepts Affected | Risk Level | Notes |
 |-------------|--------------------------|------------|-------|
-| `views/chat/item/ChatItemView.kt` | PC2, PC3, PC5, PC6, PC7, PC8 | High | Root chat item renderer with context menus |
-| `views/chat/item/TextItemView.kt` | PC2, PC3, PC4 | Medium | Text message bubble rendering |
-| `views/chat/item/FramedItemView.kt` | PC4, PC6, PC10, PC11 | Medium | Framed (quoted/forwarded) message container |
+| `views/chat/item/ChatItemView.kt` | PC2, PC3, PC5, PC6, PC7, PC8, PC32 | High | Root chat item renderer with context menus |
+| `views/chat/item/TextItemView.kt` | PC2, PC3, PC4, PC32 | Medium | Text message bubble rendering |
+| `views/chat/item/MarkdownBlocks.kt` | PC4, PC32 | Medium | Block Markdown rendering; terminal block gaps and headings |
+| `views/chat/item/FramedItemView.kt` | PC4, PC6, PC10, PC11, PC32 | Medium | Framed (quoted/forwarded) message container |
+| `views/chat/item/TerminalItemView.kt` | PC2, PC3, PC32 | Medium | Terminal layout rows, sender rows, time placement |
 | `views/chat/item/CIImageView.kt` | PC10 | Medium | Image message rendering |
 | `views/chat/item/CIVideoView.kt` | PC10 | Medium | Video message rendering |
-| `views/chat/item/CIFileView.kt` | PC10 | Medium | File message rendering |
-| `views/chat/item/CIVoiceView.kt` | PC9 | Medium | Voice message rendering and playback |
-| `views/chat/item/EmojiItemView.kt` | PC5 | Low | Emoji reaction display |
-| `views/chat/item/CIMetaView.kt` | PC2, PC3, PC8 | Low | Timestamp, delivery status, timed message indicator |
-| `views/chat/item/CICallItemView.kt` | PC17 | Low | Call event item rendering |
-| `views/chat/item/CIEventView.kt` | PC3, PC14, PC16 | Low | Group event item rendering |
-| `views/chat/item/CIGroupInvitationView.kt` | PC3, PC14 | Low | Group invitation item rendering |
-| `views/chat/item/CIMemberCreatedContactView.kt` | PC3, PC12 | Low | Member-created contact event |
-| `views/chat/item/CIChatFeatureView.kt` | PC8 | Low | Feature change event rendering |
-| `views/chat/item/CIFeaturePreferenceView.kt` | PC8 | Low | Feature preference change rendering |
-| `views/chat/item/CIRcvDecryptionError.kt` | PC2, PC3 | Low | Decryption error display |
-| `views/chat/item/DeletedItemView.kt` | PC7 | Low | Deleted message placeholder |
-| `views/chat/item/MarkedDeletedItemView.kt` | PC7 | Low | Moderated/marked-deleted placeholder |
+| `views/chat/item/CIFileView.kt` | PC10, PC32 | Medium | File message rendering |
+| `views/chat/item/CIVoiceView.kt` | PC9, PC32 | Medium | Voice message rendering and playback |
+| `views/chat/item/EmojiItemView.kt` | PC5, PC32 | Low | Emoji reaction display |
+| `views/chat/item/CIMetaView.kt` | PC2, PC3, PC8, PC32 | Low | Timestamp, delivery status, timed message indicator |
+| `views/chat/item/CICallItemView.kt` | PC17, PC32 | Low | Call event item rendering |
+| `views/chat/item/CIEventView.kt` | PC3, PC14, PC16, PC32 | Low | Group event item rendering |
+| `views/chat/item/CIGroupInvitationView.kt` | PC3, PC14, PC32 | Low | Group invitation item rendering |
+| `views/chat/item/CIMemberCreatedContactView.kt` | PC3, PC12, PC32 | Low | Member-created contact event |
+| `views/chat/item/CIChatFeatureView.kt` | PC8, PC32 | Low | Feature change event rendering |
+| `views/chat/item/CIFeaturePreferenceView.kt` | PC8, PC32 | Low | Feature preference change rendering |
+| `views/chat/item/CIRcvDecryptionError.kt` | PC2, PC3, PC32 | Low | Decryption error display |
+| `views/chat/item/DeletedItemView.kt` | PC7, PC32 | Low | Deleted message placeholder |
+| `views/chat/item/MarkedDeletedItemView.kt` | PC7, PC32 | Low | Moderated/marked-deleted placeholder |
 | `views/chat/item/ImageFullScreenView.kt` | PC10 | Low | Full-screen image viewer |
 | `views/chat/item/CIBrokenComposableView.kt` | — | Low | Fallback for render failures |
 | `views/chat/item/CIInvalidJSONView.kt` | — | Low | Fallback for malformed items |
-| `views/chat/item/IntegrityErrorItemView.kt` | PC2, PC3 | Low | Message integrity error display |
+| `views/chat/item/IntegrityErrorItemView.kt` | PC2, PC3, PC32 | Low | Message integrity error display |
 
 ### 1.6 Views — Groups
 
@@ -207,13 +210,13 @@ Path prefix: `common/src/commonMain/kotlin/chat/simplex/common/`
 | Source File | Product Concepts Affected | Risk Level | Notes |
 |-------------|--------------------------|------------|-------|
 | `views/usersettings/SettingsView.kt` | PC18, PC22, PC23, PC24, PC25, PC29 | Medium | Settings navigation hub |
-| `views/usersettings/Appearance.kt` | PC24 | Low | Theme and appearance customization |
+| `views/usersettings/Appearance.kt` | PC24, PC32 | Low | Theme and appearance customization |
 | `views/usersettings/PrivacySettings.kt` | PC20, PC22 | Medium | Privacy and lock settings |
 | `views/usersettings/UserProfileView.kt` | PC19 | Medium | Profile display name and image editing |
 | `views/usersettings/UserProfilesView.kt` | PC19, PC21 | Medium | Multi-profile management |
 | `views/usersettings/HiddenProfileView.kt` | PC21 | Medium | Hidden profile access |
 | `views/usersettings/IncognitoView.kt` | PC20 | Low | Incognito mode explanation |
-| `views/usersettings/UserAddressView.kt` | PC29 | Medium | User SimpleX address management |
+| `views/usersettings/UserAddressView.kt` | PC29, PC32 | Medium | User SimpleX address management |
 | `views/usersettings/UserAddressLearnMore.kt` | PC29 | Low | Address educational content |
 | `views/usersettings/NotificationsSettingsView.kt` | PC18 | Medium | Notification mode configuration |
 | `views/usersettings/CallSettings.kt` | PC17 | Low | Call-related settings |
@@ -271,15 +274,15 @@ Path prefix: `common/src/commonMain/kotlin/chat/simplex/common/`
 
 | Source File | Product Concepts Affected | Risk Level | Notes |
 |-------------|--------------------------|------------|-------|
-| `views/helpers/AlertManager.kt` | PC1 through PC31 | Medium | Modal alert system used across all features |
-| `views/helpers/ModalView.kt` | PC1 through PC31 | Medium | Modal navigation stack |
-| `views/helpers/Utils.kt` | PC1 through PC31 | Low | Shared formatting, clipboard, and utility functions |
+| `views/helpers/AlertManager.kt` | PC1 through PC32 | Medium | Modal alert system used across all features |
+| `views/helpers/ModalView.kt` | PC1 through PC32 | Medium | Modal navigation stack |
+| `views/helpers/Utils.kt` | PC1 through PC32 | Low | Shared formatting, clipboard, and utility functions |
 | `views/helpers/DatabaseUtils.kt` | PC23 | Medium | Keystore passphrase and database helpers |
 | `views/helpers/LinkPreviews.kt` | PC11 | Medium | Link preview fetching and rendering |
 | `views/helpers/LocalAuthentication.kt` | PC22 | Medium | Biometric/passcode authentication expect |
 | `views/helpers/ChatWallpaper.kt` | PC24 | Low | Chat wallpaper rendering |
 | `views/helpers/ChatInfoImage.kt` | PC19 | Low | Profile image composable |
-| `views/helpers/ThemeModeEditor.kt` | PC24 | Low | Theme mode toggle |
+| `views/helpers/ThemeModeEditor.kt` | PC24, PC32 | Low | Theme mode toggle |
 | `views/helpers/ChooseAttachmentView.kt` | PC10 | Low | Attachment picker |
 | `views/helpers/GetImageView.kt` | PC10, PC19 | Low | Image capture and crop |
 | `views/helpers/TextEditor.kt` | PC4 | Low | Rich text editor helpers |
@@ -326,8 +329,8 @@ Path prefix: `android/src/main/java/chat/simplex/app/`
 
 | Source File | Product Concepts Affected | Risk Level | Notes |
 |-------------|--------------------------|------------|-------|
-| `SimplexApp.kt` | PC1 through PC31 | High | Application class — initializes core, preferences, and notification channels |
-| `MainActivity.kt` | PC1 through PC31 | High | Single-activity host — intent handling, lifecycle, deep links |
+| `SimplexApp.kt` | PC1 through PC32 | High | Application class — initializes core, preferences, and notification channels |
+| `MainActivity.kt` | PC1 through PC32 | High | Single-activity host — intent handling, lifecycle, deep links |
 | `SimplexService.kt` | PC18 | High | Foreground service — keeps message receiver alive |
 | `CallService.kt` | PC17 | Medium | Foreground service for active calls |
 | `MessagesFetcherWorker.kt` | PC18 | Medium | WorkManager periodic message fetch |
@@ -341,7 +344,7 @@ Path prefix: `common/src/androidMain/kotlin/chat/simplex/common/`
 
 | Source File | Product Concepts Affected | Risk Level | Notes |
 |-------------|--------------------------|------------|-------|
-| `platform/AppCommon.android.kt` | PC1 through PC31 | Medium | Android app initialization actual declarations |
+| `platform/AppCommon.android.kt` | PC1 through PC32 | Medium | Android app initialization actual declarations |
 | `platform/SimplexService.android.kt` | PC18 | Medium | Android foreground service actual implementation |
 | `platform/Files.android.kt` | PC10, PC23, PC26 | Medium | Android file paths and content-URI resolution |
 | `platform/Cryptor.android.kt` | PC23 | Medium | Android Keystore encryption actual implementation |
@@ -408,7 +411,7 @@ Path prefix: `desktop/src/jvmMain/kotlin/chat/simplex/desktop/`
 
 | Source File | Product Concepts Affected | Risk Level | Notes |
 |-------------|--------------------------|------------|-------|
-| `Main.kt` | PC1 through PC31 | High | JVM entry point — Haskell init, migrations, app launch |
+| `Main.kt` | PC1 through PC32 | High | JVM entry point — Haskell init, migrations, app launch |
 
 ### 3.2 Desktop Platform Implementations (desktopMain)
 
@@ -423,7 +426,7 @@ Path prefix: `common/src/desktopMain/kotlin/chat/simplex/common/`
 | `WindowActivation.kt` | — | Low | `_NET_ACTIVE_WINDOW` request that raises the window on X11 and XWayland |
 | `platform/AppLinkScheme.desktop.kt` | — | Medium | Runtime `simplexchat:` and `simplex:` scheme registration (Windows HKCU, AppImage desktop entry) |
 | `model/NtfManager.desktop.kt` | PC18 | Medium | Desktop system tray notification display |
-| `platform/AppCommon.desktop.kt` | PC1 through PC31 | Medium | Desktop app initialization actual declarations |
+| `platform/AppCommon.desktop.kt` | PC1 through PC32 | Medium | Desktop app initialization actual declarations |
 | `platform/SimplexService.desktop.kt` | PC18 | Low | Desktop background receiver (no foreground service) |
 | `platform/Files.desktop.kt` | PC10, PC23, PC26 | Medium | Desktop file path resolution |
 | `platform/Cryptor.desktop.kt` | PC23 | Medium | Desktop keystore encryption actual implementation |
@@ -487,14 +490,14 @@ The Haskell core is compiled as a shared native library (`libsimplex.so` / `libs
 
 | Source File | Product Concepts Affected | Risk Level | Notes |
 |-------------|--------------------------|------------|-------|
-| `src/Simplex/Chat.hs` | PC1 through PC31 | High | Main chat module — top-level orchestration |
-| `src/Simplex/Chat/Controller.hs` | PC1 through PC31 | High | Command processor — all API commands dispatched here |
-| `src/Simplex/Chat/Types.hs` | PC1 through PC31 | High | Core data types shared across all features |
-| `src/Simplex/Chat/Core.hs` | PC1 through PC31 | High | Chat engine lifecycle (start, stop, subscribe) |
-| `src/Simplex/Chat/Library/Commands.hs` | PC1 through PC31 | High | API command handler implementations |
-| `src/Simplex/Chat/Library/Internal.hs` | PC1 through PC31 | High | Internal helpers for command processing |
-| `src/Simplex/Chat/Library/Subscriber.hs` | PC1 through PC31 | High | Event subscriber — incoming message routing |
-| `src/Simplex/Chat/Protocol.hs` | PC2, PC3, PC4, PC5, PC6, PC7 | High | Chat-level message protocol (x-events) |
+| `src/Simplex/Chat.hs` | PC1 through PC32 | High | Main chat module — top-level orchestration |
+| `src/Simplex/Chat/Controller.hs` | PC1 through PC32 | High | Command processor — all API commands dispatched here |
+| `src/Simplex/Chat/Types.hs` | PC1 through PC32 | High | Core data types shared across all features |
+| `src/Simplex/Chat/Core.hs` | PC1 through PC32 | High | Chat engine lifecycle (start, stop, subscribe) |
+| `src/Simplex/Chat/Library/Commands.hs` | PC1 through PC32 | High | API command handler implementations |
+| `src/Simplex/Chat/Library/Internal.hs` | PC1 through PC32 | High | Internal helpers for command processing |
+| `src/Simplex/Chat/Library/Subscriber.hs` | PC1 through PC32 | High | Event subscriber — incoming message routing |
+| `src/Simplex/Chat/Protocol.hs` | PC2, PC3, PC4, PC5, PC6, PC7, PC32 | High | Chat-level message protocol (x-events) |
 | `src/Simplex/Chat/Messages.hs` | PC2, PC3, PC4, PC5, PC6, PC7, PC8, PC9 | High | Message types and content |
 | `src/Simplex/Chat/Messages/CIContent.hs` | PC4, PC5, PC6, PC7, PC8, PC9, PC11 | Medium | Chat item content variants |
 | `src/Simplex/Chat/Messages/CIContent/Events.hs` | PC3, PC14, PC16 | Medium | Group event content types |
@@ -503,15 +506,15 @@ The Haskell core is compiled as a shared native library (`libsimplex.so` / `libs
 | `src/Simplex/Chat/Files.hs` | PC10 | Medium | File transfer orchestration |
 | `src/Simplex/Chat/Delivery.hs` | PC2, PC3 | Medium | Message delivery engine |
 | `src/Simplex/Chat/Markdown.hs` | PC4 | Low | Markdown parsing for message formatting |
-| `src/Simplex/Chat/Store.hs` | PC1 through PC31 | High | Database store interface |
-| `src/Simplex/Chat/Store/Shared.hs` | PC1 through PC31 | Medium | Shared store utilities |
+| `src/Simplex/Chat/Store.hs` | PC1 through PC32 | High | Database store interface |
+| `src/Simplex/Chat/Store/Shared.hs` | PC1 through PC32 | Medium | Shared store utilities |
 | `src/Simplex/Chat/Store/Messages.hs` | PC4, PC5, PC6, PC7, PC8 | High | Message persistence |
-| `src/Simplex/Chat/Store/Groups.hs` | PC3, PC14, PC15, PC16, PC30 | High | Group persistence |
-| `src/Simplex/Chat/Store/Direct.hs` | PC2, PC12, PC13 | High | Contact persistence |
+| `src/Simplex/Chat/Store/Groups.hs` | PC3, PC14, PC15, PC16, PC30, PC32 | High | Group persistence |
+| `src/Simplex/Chat/Store/Direct.hs` | PC2, PC12, PC13, PC32 | High | Contact persistence |
 | `src/Simplex/Chat/Store/Files.hs` | PC10 | Medium | File transfer persistence |
-| `src/Simplex/Chat/Store/Profiles.hs` | PC19, PC21 | Medium | User profile persistence |
-| `src/Simplex/Chat/Store/Connections.hs` | PC2, PC12 | High | Connection persistence and entity resolution |
-| `src/Simplex/Chat/Store/ContactRequest.hs` | PC12 | Medium | Contact request persistence |
+| `src/Simplex/Chat/Store/Profiles.hs` | PC19, PC21, PC32 | Medium | User profile persistence |
+| `src/Simplex/Chat/Store/Connections.hs` | PC2, PC12, PC32 | High | Connection persistence and entity resolution |
+| `src/Simplex/Chat/Store/ContactRequest.hs` | PC12, PC32 | Medium | Contact request persistence |
 | `src/Simplex/Chat/Store/NoteFolders.hs` | PC1 | Low | Note folder (self-chat) persistence |
 | `src/Simplex/Chat/Store/Delivery.hs` | PC2, PC3 | Medium | Delivery task persistence |
 | `src/Simplex/Chat/Store/AppSettings.hs` | PC25 | Low | App settings persistence |
@@ -525,19 +528,19 @@ The Haskell core is compiled as a shared native library (`libsimplex.so` / `libs
 | `src/Simplex/Chat/Remote/RevHTTP.hs` | PC27 | Low | Reverse HTTP for remote desktop |
 | `src/Simplex/Chat/Remote/AppVersion.hs` | PC27 | Low | Remote version negotiation |
 | `src/Simplex/Chat/ProfileGenerator.hs` | PC20 | Low | Random profile generation for incognito |
-| `src/Simplex/Chat/Types/UITheme.hs` | PC24 | Low | Theme data types for UI customization |
+| `src/Simplex/Chat/Types/UITheme.hs` | PC24, PC32 | Low | Theme data types for UI customization |
 | `src/Simplex/Chat/Types/Preferences.hs` | PC2, PC3, PC8 | Medium | Chat feature preferences (timed messages, etc.) |
 | `src/Simplex/Chat/Types/Shared.hs` | PC3, PC16 | Medium | Shared types including GroupMemberRole |
 | `src/Simplex/Chat/Types/MemberRelations.hs` | PC3, PC16, PC30 | Medium | Member relationship state machine |
 | `src/Simplex/Chat/Operators.hs` | PC25 | Medium | Server operator management |
 | `src/Simplex/Chat/Operators/Presets.hs` | PC25 | Low | Preset server operators |
 | `src/Simplex/Chat/Operators/Conditions.hs` | PC25 | Low | Operator usage conditions |
-| `src/Simplex/Chat/AppSettings.hs` | PC25 | Low | App settings sync types |
-| `src/Simplex/Chat/Mobile.hs` | PC1 through PC31 | High | C FFI exports — JNI bridge target |
+| `src/Simplex/Chat/AppSettings.hs` | PC25, PC32 | Low | App settings sync types |
+| `src/Simplex/Chat/Mobile.hs` | PC1 through PC32 | High | C FFI exports — JNI bridge target |
 | `src/Simplex/Chat/Mobile/File.hs` | PC10 | Medium | Mobile file read/write FFI |
-| `src/Simplex/Chat/Mobile/Shared.hs` | PC1 through PC31 | Medium | Shared FFI helpers |
+| `src/Simplex/Chat/Mobile/Shared.hs` | PC1 through PC32 | Medium | Shared FFI helpers |
 | `src/Simplex/Chat/Mobile/WebRTC.hs` | PC17 | Low | WebRTC FFI helpers |
-| `src/Simplex/Chat/View.hs` | PC1 through PC31 | Low | Terminal view rendering (not used by mobile/desktop UI) |
+| `src/Simplex/Chat/View.hs` | PC1 through PC32 | Low | Terminal view rendering (not used by mobile/desktop UI) |
 | `src/Simplex/Chat/Stats.hs` | PC25 | Low | Server statistics tracking |
 | `src/Simplex/Chat/Util.hs` | — | Low | General Haskell utilities |
 | `src/Simplex/Chat/Styled.hs` | — | Low | Terminal styled text (not used by mobile/desktop UI) |
diff --git a/apps/multiplatform/spec/services/calls.md b/apps/multiplatform/spec/services/calls.md
index a46de4f45c..1bbcb81cad 100644
--- a/apps/multiplatform/spec/services/calls.md
+++ b/apps/multiplatform/spec/services/calls.md
@@ -54,7 +54,7 @@ enum class CallState {
 
 State transitions are driven by `WCallResponse` messages from the WebRTC layer. Each transition typically triggers a corresponding API command (e.g., `apiSendCallInvitation`, `apiSendCallOffer`).
 
-**Reconnection**: `Connected` -> `Reconnecting` -> `Connected` or `Ended`. When a connected call loses its WebRTC connection, `call.js` reports `"reconnecting"` connection state instead of ending the call. The app sets `CallState.Reconnecting` and plays the connecting sound; this state is not sent to the core with `apiCallStatus`, so the call item duration is not affected, and `connectedAt` is kept. The party that sent the initial offer (callee) restarts ICE every 10 seconds until reconnected: the restart offer and the answer are sent as `WCallResponse.Ice` / `WCallCommand.Ice` with `session`, via `apiSendCallExtraInfo` (`x.call.extra` with `rtcSession`). If the connection is not restored in 30 seconds, `call.js` reports `"disconnected"` and ends the call.
+**Reconnection**: `Connected` -> `Reconnecting` -> `Connected` or `Ended`. When a connected call loses its WebRTC connection, `call.js` reports `"reconnecting"` connection state instead of ending the call. The app sets `CallState.Reconnecting` and plays the connecting sound; this state is not sent to the core with `apiCallStatus`, so the call item duration is not affected, and `connectedAt` is kept. The party that sent the initial offer (callee) restarts ICE every 10 seconds until reconnected: the restart offer and the answer are sent as `WCallResponse.Ice` / `WCallCommand.Ice` with `session`, via `apiSendCallExtraInfo` (`x.call.extra` with `rtcSession`). If the connection is not restored in 30 seconds, `call.js` reports `"disconnected"` and ends the call. Reconnection is enabled by `canReconnect` in `WCallCommand.Start` / `WCallCommand.Offer`, set when the contact's peer chat version is at least `CALL_RECONNECT_VERSION` (22); otherwise the call ends as soon as the connection is lost.
 
 ---
 
diff --git a/apps/multiplatform/spec/services/theme.md b/apps/multiplatform/spec/services/theme.md
index e5839fc193..e278dbe2a9 100644
--- a/apps/multiplatform/spec/services/theme.md
+++ b/apps/multiplatform/spec/services/theme.md
@@ -139,7 +139,7 @@ Converts `Color` to `#AARRGGBB` hex string with intelligent alpha handling.
 
 ## 3. Default Themes
 
-[`Theme.kt`](../../common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt#L26):
+[`Theme.kt`](../../common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt#L27):
 
 ```kotlin
 enum class DefaultTheme {
@@ -160,7 +160,7 @@ enum class DefaultTheme {
 
 `SYSTEM` is a virtual theme name that resolves to LIGHT or the configured dark variant at runtime.
 
-`DefaultThemeMode` ([line 46](../../common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt#L46)): `LIGHT` or `DARK`, serialized as `"light"` / `"dark"`.
+`DefaultThemeMode` ([line 47](../../common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt#L47)): `LIGHT` or `DARK`, serialized as `"light"` / `"dark"`.
 
 ---
 
@@ -168,9 +168,9 @@ enum class DefaultTheme {
 
 <a id="AppColors"></a>
 
-### AppColors (line 53)
+### AppColors (line 54)
 
-[`Theme.kt` L53](../../common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt#L53):
+[`Theme.kt` L54](../../common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt#L54):
 
 ```kotlin
 @Stable
@@ -188,9 +188,9 @@ Mutable state properties (for efficient recomposition) representing chat-specifi
 
 <a id="AppWallpaper"></a>
 
-### AppWallpaper (line 106)
+### AppWallpaper (line 107)
 
-[`Theme.kt` L106](../../common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt#L106):
+[`Theme.kt` L107](../../common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt#L107):
 
 ```kotlin
 @Stable
@@ -205,7 +205,7 @@ Represents the active wallpaper state with optional background color, tint overl
 
 <a id="ThemeColor"></a>
 
-### ThemeColor (line 140)
+### ThemeColor (line 141)
 
 Enum of all customizable color slots:
 
@@ -215,17 +215,17 @@ Each has a `fromColors()` method to extract the current value and a `text` prope
 
 <a id="ThemeColors"></a>
 
-### ThemeColors (line 183)
+### ThemeColors (line 184)
 
-[`Theme.kt` L183](../../common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt#L183):
+[`Theme.kt` L184](../../common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt#L184):
 
 Serializable data class with optional hex color strings for each slot. Uses `@SerialName` annotations for YAML compatibility (`accent` for `primary`, `accentVariant` for `primaryVariant`, `menus` for `surface`, etc.).
 
 <a id="ThemeWallpaper"></a>
 
-### ThemeWallpaper (line 224)
+### ThemeWallpaper (line 225)
 
-[`Theme.kt` L224](../../common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt#L224):
+[`Theme.kt` L225](../../common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt#L225):
 
 ```kotlin
 @Serializable
@@ -248,9 +248,9 @@ Key methods:
 
 <a id="ThemeOverrides"></a>
 
-### ThemeOverrides (line 304)
+### ThemeOverrides (line 305)
 
-[`Theme.kt` L304](../../common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt#L304):
+[`Theme.kt` L305](../../common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt#L305):
 
 ```kotlin
 @Serializable
@@ -269,25 +269,29 @@ A complete theme override entry. Multiple can coexist (one per wallpaper type pe
 
 <a id="ThemeModeOverrides"></a>
 
-### ThemeModeOverrides (line 475)
+### ThemeModeOverrides (line 476)
 
-[`Theme.kt` L475](../../common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt#L475):
+[`Theme.kt` L476](../../common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt#L476):
 
 ```kotlin
 @Serializable
 data class ThemeModeOverrides(
   val light: ThemeModeOverride? = null,
   val dark: ThemeModeOverride? = null,
+  val chatLayout: ChatLayoutMode? = null
 )
 ```
 
-Container for per-user or per-chat overrides, with separate light and dark mode variants. Stored on the `User` model as `uiThemes`.
+Container for per-user or per-chat overrides, with separate light and dark mode variants, and the chat layout chosen for the profile or the chat (both colour modes). Stored on the `User` model as `uiThemes`.
+
+- `layoutOnly()`: the overrides with the colours and wallpapers removed, `null` without a layout. Used by "Reset to app theme", "Remove image" and the app theme destination of Appearance, so the layout is kept.
+- `ThemeModeOverrides?.withChatLayout(chatLayout)`: the overrides with the layout set, `null` when empty.
 
 <a id="ThemeModeOverride"></a>
 
-### ThemeModeOverride (line 487)
+### ThemeModeOverride (line 494)
 
-[`Theme.kt` L487](../../common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt#L487):
+[`Theme.kt` L494](../../common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt#L494):
 
 ```kotlin
 @Serializable
diff --git a/apps/multiplatform/spec/state.md b/apps/multiplatform/spec/state.md
index 5003bb60e5..87acb64072 100644
--- a/apps/multiplatform/spec/state.md
+++ b/apps/multiplatform/spec/state.md
@@ -300,6 +300,18 @@ data class ChatStats(
 | `ChatInfo.ContactConnection` | `"contactConnection"` | `contactConnection: PendingContactConnection` |
 | `ChatInfo.InvalidJSON` | `"invalidJSON"` | `json: String` |
 
+[`ChatInfo.activeChatLayout(user)`](../common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt#L1876) is computed in the app, skipping `ChatLayoutMode.Unknown` values:
+
+```
+chat choice        ChatInfo.uiThemes.chatLayout (contact or group theme record)
+chat layout        ChatInfo.chatLayout: groupProfile.chatLayout of a group; Contact.chatLayout (address link data, stored when the contact is prepared)
+profile choice     User.uiThemes.chatLayout (profileChatLayout)
+app choice         appPrefs.chatLayout
+otherwise          ChatLayoutMode.Classic
+```
+
+[`defaultChatLayout(user)`](../common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt#L1873) is the same without the chat choice. Note folders have no chat values, so the profile and app choices apply. `ChatView` reads `chatModel.currentUser`, and `profileChatLayout` reads `appPrefs.chatLayout.state`, so a change of either recomposes the open chat; the chat list is not reloaded. The chat choice is written with `apiSetChatUIThemes` (`setChatLayout`, `ChatInfoView.kt`), the profile choice with `apiSetUserUIThemes` (`ChatLayoutRow`, `Appearance.kt`), together with the colours of the same record.
+
 ### RelayStatus (Channels)
 
 `RelayStatus` is an `enum class` at [`ChatModel.kt line 2288`](../common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt#L2288) modelling a relay's lifecycle for a channel on the owner's side. Serialized as a lowercase string via `@SerialName`.
@@ -450,6 +462,7 @@ val appPrefs: AppPreferences by lazy { AppPreferences() }
 |---|---|---|---|
 | `oneHandUI` | `Boolean` | `true` | One-hand mode |
 | `chatBottomBar` | `Boolean` | `true` | Bottom bar in chat |
+| `chatLayout` | `ChatLayoutMode` | `Classic` | App chat layout (`activeChatLayout`) |
 
 #### Remote Access (lines 238-243)
 
diff --git a/apps/simplex-badge-service/src/BadgeService/Group.hs b/apps/simplex-badge-service/src/BadgeService/Group.hs
index 28117655ef..b072277a76 100644
--- a/apps/simplex-badge-service/src/BadgeService/Group.hs
+++ b/apps/simplex-badge-service/src/BadgeService/Group.hs
@@ -76,7 +76,8 @@ buildGroupProfile GroupConfig {gDisplayName, gDescription} =
       image = Nothing,
       publicGroup = Nothing,
       groupPreferences = Just (emptyGroupPrefs {commands = Just groupCommands} :: GroupPreferences),
-      memberAdmission = Nothing
+      memberAdmission = Nothing,
+      chatLayout = Nothing
     }
 
 ensureManagedGroup :: ChatController -> GroupConfig -> IO (Maybe GroupId)
diff --git a/apps/simplex-badge-service/src/BadgeService/Log.hs b/apps/simplex-badge-service/src/BadgeService/Log.hs
index a2f54f4420..6ac7cd48a2 100644
--- a/apps/simplex-badge-service/src/BadgeService/Log.hs
+++ b/apps/simplex-badge-service/src/BadgeService/Log.hs
@@ -9,9 +9,10 @@ module BadgeService.Log
 where
 
 import Control.Monad.IO.Class (MonadIO, liftIO)
+import qualified Data.ByteString as B
 import Data.Text (Text)
 import qualified Data.Text as T
-import qualified Data.Text.IO as T
+import Data.Text.Encoding (encodeUtf8)
 import Data.Time.Format (defaultTimeLocale, formatTime)
 import Data.Time.LocalTime (getZonedTime)
 import GHC.Stack (CallStack, HasCallStack, callStack, getCallStack, srcLocFile, srcLocStartLine)
@@ -29,7 +30,8 @@ logError = logAt "ERROR" callStack
 logAt :: MonadIO m => Text -> CallStack -> Text -> m ()
 logAt tag cs msg = liftIO $ do
   ts <- formatTime defaultTimeLocale "%Y-%m-%d %H:%M:%S %z" <$> getZonedTime
-  T.hPutStrLn stderr $ "[" <> tag <> " " <> T.pack ts <> " " <> loc <> "] " <> msg
+  -- one write per line, putStrLn family is not atomic
+  B.hPut stderr $ encodeUtf8 $ "[" <> tag <> " " <> T.pack ts <> " " <> loc <> "] " <> msg <> "\n"
   where
     loc = case getCallStack cs of
       ((_, l) : _) -> T.pack (srcLocFile l) <> ":" <> T.pack (show (srcLocStartLine l))
diff --git a/bots/api/TYPES.md b/bots/api/TYPES.md
index 14ec531e13..897c540678 100644
--- a/bots/api/TYPES.md
+++ b/bots/api/TYPES.md
@@ -50,6 +50,7 @@ This file is generated automatically.
 - [ChatInfo](#chatinfo)
 - [ChatItem](#chatitem)
 - [ChatItemDeletion](#chatitemdeletion)
+- [ChatLayout](#chatlayout)
 - [ChatListQuery](#chatlistquery)
 - [ChatPeerType](#chatpeertype)
 - [ChatRef](#chatref)
@@ -273,6 +274,7 @@ This file is generated automatically.
 **Record type**:
 - businessAddress: bool
 - autoAccept: [AutoAccept](#autoaccept)?
+- chatLayout: [ChatLayout](#chatlayout)?
 - autoReply: [MsgContent](#msgcontent)?
 
 
@@ -1590,6 +1592,15 @@ Message deletion result.
 - toChatItem: [AChatItem](#achatitem)?
 
 
+---
+
+## ChatLayout
+
+**Enum type**:
+- "classic"
+- "terminal"
+
+
 ---
 
 ## ChatListQuery
@@ -1981,6 +1992,7 @@ Error:
 - chatTags: [int64]
 - chatItemTTL: int64?
 - uiThemes: [UIThemeEntityOverrides](#uithemeentityoverrides)?
+- chatLayout: [ChatLayout](#chatlayout)?
 - chatDeleted: bool
 - customData: JSONObject?
 
@@ -2023,6 +2035,7 @@ ContactViaAddress:
 - profile: [Profile](#profile)
 - message: [MsgContent](#msgcontent)?
 - business: bool
+- chatLayout: [ChatLayout](#chatlayout)?
 - localBadge: [LocalBadge](#localbadge)?
 
 
@@ -2788,6 +2801,7 @@ UpdateRequired:
 - publicGroup: [PublicGroupProfile](#publicgroupprofile)?
 - groupPreferences: [GroupPreferences](#grouppreferences)?
 - memberAdmission: [GroupMemberAdmission](#groupmemberadmission)?
+- chatLayout: [ChatLayout](#chatlayout)?
 
 
 ---
@@ -4645,6 +4659,7 @@ Handshake:
 **Record type**:
 - light: [UIThemeEntityOverride](#uithemeentityoverride)?
 - dark: [UIThemeEntityOverride](#uithemeentityoverride)?
+- chatLayout: [ChatLayout](#chatlayout)?
 
 
 ---
diff --git a/bots/src/API/Docs/Commands.hs b/bots/src/API/Docs/Commands.hs
index 21cffa6412..fe81b430b4 100644
--- a/bots/src/API/Docs/Commands.hs
+++ b/bots/src/API/Docs/Commands.hs
@@ -299,6 +299,7 @@ cliCommands =
     "SetClientService",
     "SetContactFeature",
     "SetContactTimedMessages",
+    "SetGroupChatLayout",
     "SetGroupFeature",
     "SetGroupFeatureRole",
     "SetGroupMemberAdmissionReview",
diff --git a/bots/src/API/Docs/Types.hs b/bots/src/API/Docs/Types.hs
index ab76cc6581..26553b58cb 100644
--- a/bots/src/API/Docs/Types.hs
+++ b/bots/src/API/Docs/Types.hs
@@ -236,6 +236,7 @@ chatTypesDocsData =
     (sti @BadgeType, STEnum, "BT", ["BTUnknown"], "", ""),
     (sti @ChatFeature, STEnum, "CF", [], "", ""),
     (sti @ChatItemDeletion, STRecord, "", [], "", "Message deletion result."),
+    (sti @ChatLayout, STEnum, "CL", ["CLUnknown"], "", ""),
     (sti @ChatPeerType, STEnum, "CPT", ["CPTUnknown"], "", ""),
     (sti @ChatRef, STRecord, "", [], Param "chatType" <> Param "chatId" <> Optional "" (Param "$0") "chatScope", "Used in API commands. Chat scope can only be passed with groups."),
     (sti @ChatSettings, STRecord, "", [], "", ""),
@@ -474,6 +475,7 @@ deriving instance Generic ChatError
 deriving instance Generic ChatErrorType
 deriving instance Generic ChatFeature
 deriving instance Generic ChatItemDeletion
+deriving instance Generic ChatLayout
 deriving instance Generic ChatPeerType
 deriving instance Generic ChatRef
 deriving instance Generic ChatSettings
diff --git a/cabal.project b/cabal.project
index 746a09c590..e2e0c01f3f 100644
--- a/cabal.project
+++ b/cabal.project
@@ -21,7 +21,7 @@ constraints: zip +disable-bzip2 +disable-zstd
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/simplexmq.git
-    tag: 8bc4d3601250d9f79dc7e80ead319ec2b6d4a95a
+    tag: 381828400710344bc1c6ce94e7cdf6e0ca043ee9
 
 source-repository-package
     type: git
@@ -70,5 +70,5 @@ source-repository-package
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/wai.git
-    tag: 2f6e5aa5f05ba9140ac99e195ee647b4f7d926b0
+    tag: 63667cb577d09c967ddcd945e42c324872dfeb7d
     subdir: warp
diff --git a/docs/protocol/agent-protocols.md b/docs/protocol/agent-protocols.md
index d4e828d677..b6048c3896 100644
--- a/docs/protocol/agent-protocols.md
+++ b/docs/protocol/agent-protocols.md
@@ -1,4 +1,4 @@
-Revision 1, 2026-10-19, draft for comments
+Revision 2, 2026-10-21, draft for comments
 
 Evgeny Poberezkin
 
@@ -28,6 +28,16 @@ Evgeny Poberezkin
   - [Messages](#messages)
   - [Versions and capabilities](#versions-and-capabilities)
   - [Examples](#examples)
+- [A2A binding](#a2a-binding)
+  - [Identification](#identification)
+  - [A2A messages](#a2a-messages)
+  - [Service parameters](#service-parameters)
+  - [Streaming](#streaming)
+  - [Push notifications](#push-notifications)
+  - [Callers and authorization](#callers-and-authorization)
+  - [Service RPC](#service-rpc)
+  - [Agent Card](#agent-card)
+  - [A2A examples](#a2a-examples)
 - [Security considerations](#security-considerations)
 - [Privacy considerations](#privacy-considerations)
 - [Implementations](#implementations)
@@ -41,7 +51,7 @@ This document defines how software agents find SimpleX addresses and call the to
 - declarations: the protocols a profile serves and their transports, the peer types a channel or a contact address is made for, and the update frequency of a channel;
 - the chat transport: the command `/_call` in a conversation;
 - the Service RPC transport: one request and one response, without a conversation, in a generic envelope;
-- the binding of the Model Context Protocol (MCP) [MCP] to both transports.
+- the bindings of the Model Context Protocol (MCP) [MCP] and of the Agent2Agent protocol (A2A) [A2A] to both transports.
 
 ## Conventions
 
@@ -113,7 +123,7 @@ For SimpleX entries, the type `updates` requires a channel link, the type `group
 
 - [Acme news](https://smp12.simplex.im/c#…): SimpleX updates for people and agents, weekly. Product news and offers.
 - [Acme customers](https://smp12.simplex.im/g#…): SimpleX group for people. Questions and tips from customers.
-- [Ask Acme](https://smp12.simplex.im/a#…): SimpleX business contact for agents, MCP. Orders and availability.
+- [Ask Acme](https://smp12.simplex.im/a#…): SimpleX business contact for agents, MCP, A2A. Orders and availability.
 - [Acme support](mailto:support@acme.example): Email contact for people.
 ```
 
@@ -165,6 +175,10 @@ Example, the `preferences` of a contact profile:
     "mcp": {
       "versions": ["2026-07-28"],
       "transports": {"chat": true, "rpc": true}
+    },
+    "a2a": {
+      "versions": ["1.0"],
+      "transports": {"chat": true, "rpc": true}
     }
   }
 }
@@ -211,6 +225,7 @@ A binding defines the protocol's request and response messages, including how, a
 | Name | Binding |
 |---|---|
 | `mcp` | [MCP binding](#mcp-binding) |
+| `a2a` | [A2A binding](#a2a-binding) |
 
 ## Chat transport
 
@@ -230,10 +245,12 @@ A binding defines the protocol's request and response messages, including how, a
 
 ### Replies
 
-- A bot sends one reply to each command it answers. The reply quotes the command, with a truncated quote. Its text is the protocol's response message, a JSON object.
+- A bot answers a command with one or more replies. Each reply quotes the command, with a truncated quote. Its text is a message of the protocol, a JSON object.
+- The binding defines the messages a bot sends before its last reply, and the message that ends its answer.
 - A caller matches each reply to its command by the quoted message. Replies can arrive in any order.
-- In a group, a broadcast can receive several replies, one from each member that serves the protocol. A caller collects them all, each with its sender.
-- In a direct chat, a caller accepts replies only from the recipient. In a group, a caller of a command with a mention accepts only the mentioned member's reply.
+- A caller collects every reply until its wait ends, each with its sender, in arrival order. In a group, a broadcast receives the answers of every member that serves the protocol.
+- A reply whose text is not a message of the protocol is collected as text, with its sender.
+- In a direct chat, a caller accepts replies only from the recipient. In a group, a caller of a command with a mention accepts only the mentioned member's replies.
 - Commands and replies are ordinary messages: people see them in the conversation.
 
 ### Message size
@@ -316,7 +333,7 @@ JSON Type Definition schema [RFC8927] of the response:
 ```
 
 - A response has exactly one of `response` and `error`.
-- `response`: the protocol's response message, the same as the reply in a conversation.
+- `response`: the protocol's response message, the same as the last reply of the answer in a conversation.
 - `error`: the request was not passed to the protocol.
 - `message`: a description for the requester's logs.
 - `retryAfter`: the number of seconds after which a repeated request can succeed.
@@ -347,9 +364,10 @@ Protocol name: `mcp`.
 ### Messages
 
 - The request is one JSON-RPC request of MCP revision 2026-07-28 or later, with its `_meta` envelope [MCP]. In a conversation, it follows `/_call mcp`. Over Service RPC, it is the envelope's `request`.
-- The response is the JSON-RPC response to the request: a result or a JSON-RPC error. In a conversation, it is the text of the reply. Over Service RPC, it is the envelope's `response`.
+- The bot's answer ends with the JSON-RPC response to the request: a result or a JSON-RPC error. In a conversation, it is the text of the last reply. Over Service RPC, it is the envelope's `response`.
+- In a conversation, the bot MAY send notifications for the request before the response, each as a reply: for example `notifications/progress` when the request has a progress token [MCP].
 - In a conversation, a caller matches a reply to its request by the quoted message. The response has the request's `id`, as JSON-RPC requires.
-- A bot serves the methods answered with one response, for example `server/discover`, `tools/list` and `tools/call`.
+- A bot serves the request-response methods, for example `server/discover`, `tools/list` and `tools/call`.
 - A multi-round-trip result (`resultType: "input_required"`) is answered with a new request, as MCP defines.
 - A response above the size limit is replaced with a JSON-RPC error with code -32603 in a conversation, and with the envelope error `too_large` over Service RPC.
 - Over Service RPC, a call of a tool that needs a conversation is answered with the envelope error `conversation_required`.
@@ -431,19 +449,142 @@ The response:
 }
 ```
 
+## A2A binding
+
+Protocol name: `a2a`. This binding is a custom protocol binding of A2A 1.0 [A2A, sections 5.8 and 12]: it carries the messages of the A2A JSON-RPC binding [A2A, section 9] over both SimpleX transports.
+
+### Identification
+
+- Binding URI: `https://simplex.chat/protocol/a2a/v1`. A revision of this binding that breaks compatibility uses a new URI.
+- An A2A Agent Card lists a SimpleX interface in `supportedInterfaces`, with `url` the bot's contact address link, `protocolBinding` the binding URI, and `protocolVersion` the A2A version.
+- `versions` in the `protocols` declaration: A2A versions in the `Major.Minor` form, for example `1.0`.
+
+### A2A messages
+
+- The request is one JSON-RPC request of the A2A JSON-RPC binding, with its method name and parameters unchanged: `SendMessage`, `SendStreamingMessage`, `GetTask`, `ListTasks`, `CancelTask`, `SubscribeToTask`, the push notification methods and `GetExtendedAgentCard` [A2A, section 9.4]. In a conversation, it follows `/_call a2a`. Over Service RPC, it is the envelope's `request`.
+- Responses and errors are those of the A2A JSON-RPC binding, with the JSON forms of its data types: timestamps, bytes in base64 and enumerations [A2A, section 12.2].
+- For every method other than the two streaming methods, the bot's answer is one JSON-RPC response. In a conversation, it is one reply. Over Service RPC, it is the envelope's `response`.
+- A response above the size limit is replaced with a JSON-RPC error with code -32603 in a conversation, and with the envelope error `too_large` over Service RPC. The bytes of `raw` parts count towards the limit.
+
+### Service parameters
+
+A2A sends service parameters, such as `A2A-Version` and `A2A-Extensions`, as HTTP headers [A2A, section 9.2]. SimpleX messages have no headers, so this binding uses the field that A2A names for protocols without headers [A2A, section 12.3]:
+
+- `a2a-service-parameters`: a member of the JSON-RPC request object, beside `jsonrpc`, `method`, `params` and `id`. Its value is an object of service parameter names and string values.
+- Names are case-insensitive. Several values of one parameter are joined by commas in one string, as in an HTTP header.
+- Every request MUST carry `A2A-Version`. A bot answers a request of a version it does not serve with A2A's `VersionNotSupportedError`.
+- A proxy to an HTTP interface sends each service parameter as an HTTP header and removes the member from the request.
+- The envelope's `version` is omitted.
+
+### Streaming
+
+`SendStreamingMessage` and `SubscribeToTask` are served in a conversation [A2A, section 12.5]:
+
+- Each `StreamResponse` is one reply that quotes the command. Its text is a JSON-RPC response with the request's `id`, whose `result` is the `StreamResponse`, as in the events of the A2A JSON-RPC binding.
+- Replies are sent in the order of the stream.
+- The stream ends with the reply whose task or status update is in a terminal state (completed, failed, canceled, rejected) or an interrupted state (input required, auth required).
+- A caller that missed replies resumes the stream with `SubscribeToTask`.
+- Over Service RPC, both methods are answered with the envelope error `conversation_required`.
+
+### Push notifications
+
+A conversation delivers every update of a task to the caller, so push notification configurations are not used. A bot answers the push notification methods with A2A's `PushNotificationNotSupportedError`.
+
+### Callers and authorization
+
+- In a conversation, the caller is the contact or the group member that sent the command [A2A, section 12.6].
+- A context and its tasks are available only to their caller: in the conversation where they were created, and in a group to the member who created them. A request that names the context or the task of another caller is answered as a request for an unknown task.
+- An agent whose Agent Card declares security schemes receives the credential as the service parameter of the scheme, for example `Authorization` for an HTTP scheme. A challenge is answered with the task state `auth required`.
+- A request with a credential MUST NOT be sent in a group.
+
+### Service RPC
+
+Service RPC serves one-shot tasks: a request and its answer, without a conversation.
+
+- A bot answers `SendMessage` whose message has neither `contextId` nor `taskId`, and whose `configuration.returnImmediately` is absent or false.
+- The response is the task in its state at the end of the work, or a message.
+- A bot that cannot finish the task within 180 seconds answers with the envelope error `conversation_required`.
+- Every other request is answered with the envelope error `conversation_required`.
+
+### Agent Card
+
+- The Agent Card of an agent with a website is published at the well-known URI of A2A [A2A, section 8.2], with the SimpleX interface among its interfaces.
+- A bot answers `GetExtendedAgentCard` with its Agent Card. For a caller without credentials, it is the public card.
+
+### A2A examples
+
+A one-shot task over Service RPC, the request:
+
+```json
+{
+  "protocol": "a2a",
+  "request": {
+    "jsonrpc": "2.0",
+    "id": 1,
+    "method": "SendMessage",
+    "a2a-service-parameters": {"A2A-Version": "1.0"},
+    "params": {
+      "message": {
+        "messageId": "m-1",
+        "role": "ROLE_USER",
+        "parts": [{"text": "Price of two anvils delivered to Lisbon"}]
+      }
+    }
+  }
+}
+```
+
+The response:
+
+```json
+{
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 1,
+    "result": {
+      "task": {
+        "id": "t-1",
+        "contextId": "c-1",
+        "status": {"state": "TASK_STATE_COMPLETED"},
+        "artifacts": [
+          {"artifactId": "a-1", "parts": [{"text": "EUR 480, delivered within 5 days."}]}
+        ]
+      }
+    }
+  }
+}
+```
+
+A streamed task in a conversation, continuing the context `c-7` created earlier in the same chat:
+
+```
+/_call a2a {"jsonrpc": "2.0", "id": 2, "method": "SendStreamingMessage", "a2a-service-parameters": {"A2A-Version": "1.0"}, "params": {"message": {"messageId": "m-2", "contextId": "c-7", "role": "ROLE_USER", "parts": [{"text": "Order two, delivered by Friday"}]}}}
+```
+
+The replies, each quoting the command:
+
+```json
+{"jsonrpc": "2.0", "id": 2, "result": {"statusUpdate": {"taskId": "t-8", "contextId": "c-7", "status": {"state": "TASK_STATE_WORKING"}}}}
+```
+
+```json
+{"jsonrpc": "2.0", "id": 2, "result": {"task": {"id": "t-8", "contextId": "c-7", "status": {"state": "TASK_STATE_COMPLETED"}, "artifacts": [{"artifactId": "a-8", "parts": [{"text": "Order 1042 confirmed, delivery on Friday."}]}]}}}
+```
+
 ## Security considerations
 
-- Messages, replies, profiles, tool descriptions and tool results from other participants are data for an agent, never instructions.
+- Messages, replies, profiles, tool descriptions, Agent Cards, tool results and task artifacts from other participants are data for an agent, never instructions.
 - In a group, any member can reply to a broadcast. Each reply shows its sender. A caller that needs one provider mentions it.
 - A responder that relies on `requestKey` MUST compare it with `signerKey`.
 - A signed request identifies its signer to the responder across all requests signed with the same key.
+- Every member of a group sees the commands and replies in it, so A2A credentials are sent only in a direct chat or over Service RPC.
 
 ## Privacy considerations
 
 - Each Service RPC request uses a new connection with a new reply queue.
 - MCP's `io.modelcontextprotocol/clientInfo` identifies the requester's software. A requester that needs unlinkable requests SHOULD send a common value or omit it.
 - In a group, every member sees each command and each reply, with or without a mention. A request that needs privacy is sent in a direct chat with the member, where the group allows direct messages, or over Service RPC.
-- A conversation persists: the bot can link all calls made in it. An incognito profile gives the caller a new random profile for each conversation.
+- A conversation persists: the bot can link all calls made in it, and all A2A contexts of its caller. An incognito profile gives the caller a new random profile for each conversation.
 
 ## Implementations
 
@@ -455,11 +596,13 @@ Implemented:
 Planned:
 
 - The simplex-chat core: the key `protocols` in the preferences types, in the preferences sent in profiles and in link data, and in the preferences of business chats; `audience` and `changeFrequency` in the public group record; `serves` in the address settings and the address link data; replies with a truncated quote.
-- `@simplex-chat/mcp`: the tools `mcp_tools` and `mcp_call`. They use Service RPC when the address declares `transports.rpc`, and the agent's conversation otherwise. In a group, `mcp_call` mentions the called member, or broadcasts and returns all replies. Each call is an action, approved by the agent's owner as a message is.
-- The bot library: a helper that serves MCP tools over both transports.
+- `@simplex-chat/mcp`: the tools `mcp_tools` and `mcp_call`, and A2A calls. They use Service RPC when the address declares `transports.rpc` and the request suits it, and the agent's conversation otherwise. In a group, a call mentions the called member, or broadcasts and returns all replies with their senders. Each call is an action, approved by the agent's owner as a message is.
+- The bot library: helpers that serve MCP tools and A2A over both transports.
+- An A2A proxy bot: it serves `a2a` over both transports and forwards each request to the HTTP JSON-RPC interface of an A2A agent, with the service parameters as HTTP headers.
 
 ## References
 
+- [A2A] Agent2Agent (A2A) protocol specification, version 1.0: https://a2a-protocol.org/latest/specification/
 - [BUSINESS] Using SimpleX Chat in business: [BUSINESS.md](../BUSINESS.md)
 - [CHAT] SimpleX Chat protocol: [simplex-chat.md](./simplex-chat.md)
 - [LLMSTXT] The /llms.txt file: https://llmstxt.org
diff --git a/docs/protocol/simplex-chat.md b/docs/protocol/simplex-chat.md
index a95e7ee75f..9400d15b68 100644
--- a/docs/protocol/simplex-chat.md
+++ b/docs/protocol/simplex-chat.md
@@ -264,6 +264,8 @@ Currently members can have one of four roles - `owner`, `admin`, `member` and `o
 
 `x.grp.info` message is sent to all members by the member who updated group profile. Only group owners can update group profiles. Clients MAY implement some conflict resolution strategy - it is currently not implemented by SimpleX Chat client. This message MUST only be sent by members with `owner` role. Receiving clients MUST ignore this message if it is received from member other than with `owner` role.
 
+Group profile can include optional `chatLayout` property (`classic` or `terminal`) set by a group owner. Clients use it as the layout of the group chat, also after it is changed by `x.grp.info`, unless the user chose another layout for this chat. Clients MUST treat unknown values as absent.
+
 `x.grp.direct.inv` message is sent to a group member to propose establishing a direct connection between members, thus creating a contact with another member.
 
 `x.grp.msg.forward` message is sent by inviting member to forward messages between introduced members, while they are connecting. This message MUST NOT contain another `x.grp.msg.forward` message.
@@ -286,7 +288,7 @@ These message are used for WebRTC calls:
 
 3. `x.call.answer`: to continue with call connection the initiating clients must reply with `x.call.answer` message. This message contains WebRTC answer and collected ICE candidates. Additional ICE candidates can be sent in `x.call.extra` message.
 
-4. `x.call.extra` with `rtcSession` property: when an established connection is lost, the client that sent `x.call.offer` restarts ICE and sends the new offer in `rtcSession` of `x.call.extra`. The other client replies with the answer in `rtcSession` of `x.call.extra`. Clients that do not support it ignore this property, and the call ends when reconnection times out.
+4. `x.call.extra` with `rtcSession` property: when an established connection is lost, the client that sent `x.call.offer` restarts ICE and sends the new offer in `rtcSession` of `x.call.extra`. The other client replies with the answer in `rtcSession` of `x.call.extra`. Clients restart ICE only when the peer supports chat protocol version 22 or later, otherwise the call ends when the connection is lost.
 
 5. `x.call.end` message is sent to notify the other party that the call is terminated.
 
diff --git a/docs/protocol/simplex-chat.schema.json b/docs/protocol/simplex-chat.schema.json
index a9bb2d8735..095e7207be 100644
--- a/docs/protocol/simplex-chat.schema.json
+++ b/docs/protocol/simplex-chat.schema.json
@@ -61,6 +61,7 @@
           "type": "string",
           "metadata": {"comment": "group purpose / short description (160 characters)"}
         },
+        "chatLayout": {"enum": ["classic", "terminal"]},
         "groupPreferences": {
           "optionalProperties": {
             "commands": {
diff --git a/packages/simplex-chat-client/types/typescript/src/types.ts b/packages/simplex-chat-client/types/typescript/src/types.ts
index 873679ad50..8514cbd43c 100644
--- a/packages/simplex-chat-client/types/typescript/src/types.ts
+++ b/packages/simplex-chat-client/types/typescript/src/types.ts
@@ -25,6 +25,7 @@ export interface AddRelayResult {
 export interface AddressSettings {
   businessAddress: boolean
   autoAccept?: AutoAccept
+  chatLayout?: ChatLayout
   autoReply?: MsgContent
 }
 
@@ -1886,6 +1887,11 @@ export interface ChatItemDeletion {
   toChatItem?: AChatItem
 }
 
+export enum ChatLayout {
+  Classic = "classic",
+  Terminal = "terminal",
+}
+
 export type ChatListQuery = ChatListQuery.Filters | ChatListQuery.Search
 
 export namespace ChatListQuery {
@@ -2296,6 +2302,7 @@ export interface Contact {
   chatTags: number[] // int64
   chatItemTTL?: number // int64
   uiThemes?: UIThemeEntityOverrides
+  chatLayout?: ChatLayout
   chatDeleted: boolean
   customData?: object
 }
@@ -2355,6 +2362,7 @@ export interface ContactShortLinkData {
   profile: Profile
   message?: MsgContent
   business: boolean
+  chatLayout?: ChatLayout
   localBadge?: LocalBadge
 }
 
@@ -3120,6 +3128,7 @@ export interface GroupProfile {
   publicGroup?: PublicGroupProfile
   groupPreferences?: GroupPreferences
   memberAdmission?: GroupMemberAdmission
+  chatLayout?: ChatLayout
 }
 
 export interface GroupRelay {
@@ -5415,6 +5424,7 @@ export interface UIThemeEntityOverride {
 export interface UIThemeEntityOverrides {
   light?: UIThemeEntityOverride
   dark?: UIThemeEntityOverride
+  chatLayout?: ChatLayout
 }
 
 export interface UpdatedMessage {
diff --git a/packages/simplex-chat-client/typescript/src/client.ts b/packages/simplex-chat-client/typescript/src/client.ts
index 67e470e52d..403ad60b46 100644
--- a/packages/simplex-chat-client/typescript/src/client.ts
+++ b/packages/simplex-chat-client/typescript/src/client.ts
@@ -104,18 +104,32 @@ export class ChatClient {
   }
 
   async enableAddressAutoAccept(userId: number, autoReply?: T.MsgContent, businessAddress = false): Promise<void> {
-    const r = await this.sendChatCmd(
-      CC.APISetAddressSettings.cmdString({userId, settings: {businessAddress, autoAccept: {acceptIncognito: false}, autoReply}})
-    )
-    if (r.type !== "userContactLinkUpdated") {
-      throw new ChatCommandError("error changing user contact address mode", r)
-    }
+    const settings = await this.apiGetAddressSettings(userId)
+    await this.apiSetAddressSettings(userId, {...settings, businessAddress, autoAccept: {acceptIncognito: false}, autoReply})
   }
 
   async disableAddressAutoAccept(userId: number, businessAddress = false): Promise<void> {
-    const r = await this.sendChatCmd(CC.APISetAddressSettings.cmdString({userId, settings: {businessAddress}}))
+    const settings = await this.apiGetAddressSettings(userId)
+    await this.apiSetAddressSettings(userId, {...settings, businessAddress, autoAccept: undefined, autoReply: undefined})
+  }
+
+  async apiGetAddressSettings(userId: number): Promise<T.AddressSettings | undefined> {
+    const r = await this.sendChatCmd(CC.APIShowMyAddress.cmdString({userId}))
+    switch (r.type) {
+      case "userContactLink":
+        return r.contactLink.addressSettings
+      default:
+        if (r.type === "chatCmdError" && r.chatError.type === "errorStore" && r.chatError.storeError.type === "userContactLinkNotFound") {
+          return undefined
+        }
+        throw new ChatCommandError("error loading user address", r)
+    }
+  }
+
+  async apiSetAddressSettings(userId: number, settings: T.AddressSettings): Promise<void> {
+    const r = await this.sendChatCmd(CC.APISetAddressSettings.cmdString({userId, settings}))
     if (r.type !== "userContactLinkUpdated") {
-      throw new ChatCommandError("error changing user contact address mode", r)
+      throw new ChatCommandError("error changing user contact address settings", r)
     }
   }
 
diff --git a/packages/simplex-chat-mcp/PLAN.md b/packages/simplex-chat-mcp/PLAN.md
index 841b76f2b3..22bcf02ddd 100644
--- a/packages/simplex-chat-mcp/PLAN.md
+++ b/packages/simplex-chat-mcp/PLAN.md
@@ -104,6 +104,7 @@ layer                         who                                      what
 listener                      http.ts                                  127.0.0.1:PORT; Node limits lifted for hours-long calls: requestTimeout 0, timeout 0, headersTimeout 60 s, keepAliveTimeout 5 s
 bearer token                  http.ts, before the SDK                  Authorization: Bearer <DIR/token>, compared in constant time; otherwise 401
 path                          http.ts                                  /mcp only; otherwise 404, a request target that is not a URL included
+start                         http.ts                                  until the owner setup at start ends: 503 with Retry-After: 1
 Origin, Host                  SDK middleware                           localhostOriginValidation (no Origin, or a localhost origin on any port), localhostHostValidation; otherwise 403
 protocol                      SDK                                      both eras, header and version errors, 405, body limit, cache hints (ttlMs, cacheScope), JSON or SSE per call, SSE keep-alive
 cancellation                  SDK                                      the client closing the response stream aborts ctx.mcpReq.signal (toNodeHandler ties the Request signal to res "close")
@@ -214,7 +215,7 @@ NAME not ^[a-z0-9](-?[a-z0-9])*-?$,   NAME: 1 to 32 lowercase letters, digits an
 $ npx -y @simplex-chat/mcp serve my-agent --display-name "My Agent"
 Downloading libsimplex from https://github.com/simplex-chat/simplex-chat-libs/releases/download/core-7.1.0.12/simplex-chat-libs-linux-x86_64.zip ...
 Downloading the Node.js add-on from https://github.com/simplex-chat/simplex-chat-libs/releases/download/... ...
-SimpleX MCP server 0.1.0, agent "my-agent"
+SimpleX MCP server 0.1.1, agent "my-agent"
 Data folder: /home/alice/.simplex-mcp/my-agent
 Approval mode: requests
 Agent control chat "My Agent" created.
@@ -231,7 +232,7 @@ Listening on http://127.0.0.1:5226/mcp
   - large: two spaces with the module's background per module, one line per module: 74 columns × 37 lines.
 - The download lines are written to stderr by the `simplex-chat` package on first use (`libs.ts`, `installLibs`, `installAddon`).
 - `npx -y` answers npm's install prompt only; the server asks no questions.
-- A second `serve` on the same data folder exits with code 1: `Another server uses /home/alice/.simplex-mcp/my-agent (PID 1234).` A port in use: exit code 1, `Port 5226 is in use. Start with --port N.`
+- A second `serve` on the same data folder exits with code 1: `Another server uses /home/alice/.simplex-mcp/my-agent (PID 1234). If no server runs, remove /home/alice/.simplex-mcp/my-agent/lock.` A port in use: exit code 1, `Port 5226 is in use. Start with --port N.`
 
 ### Owner joins (no --owners)
 
@@ -285,12 +286,13 @@ action created                  Action 1: connect to bot SimpleX Directory, as i
 action decided                  Action 2 approved by Alice: sent. | Action 1 approved by Alice: connected. | Action 5 approved by Alice: connection requested. | Action 2 approved by Alice: failed: <error>.
 action decided                  Action 2 rejected by Alice. | Action 2 expired.
 mode host                       Action 2: performed without approval (mode host). | ...; failed: <error>.
+counter or card not written     Action 2: failed: <error>.
 owner added, --owners LIST      Bob (member 7) is now an owner and can't approve actions yet. Restart the server with --owners 3:Alice,7:Bob
 owner gone, --owners LIST       Alice (member 3) is no longer an owner. Restart the server with --owners 7:Bob   (the human owners remaining)
 no human owner remains          Alice (member 3) is no longer an owner. No owners remain: restart the server with --reset-owners --owners
 no approver, no --owners        No owners in the agent control chat. (followed by a new link)
 control chat lost               The agent lost its control chat. Restart the server with --reset-owners.
-shutdown                        Cancelled 2 actions. Stopped.   (the count only when actions were pending or performing)
+shutdown                        Cancelled 2 actions. Stopped.   (the count only when actions were pending or performing; a perform interrupted by the stop logs no line)
 ```
 
 ## What the owner sees: the agent control chat
@@ -319,7 +321,7 @@ contact | bot | agent | business | group | channel   plan type; channel when gro
 SimpleX Directory                                the contact's or group's display name from the link
 (@directory.simplex)                             the target, when it is a SimpleX name
 as myself | incognito                            input.incognito
-quoted lines                                     short description and welcome message from the link
+quoted lines                                     short description and welcome message from the link, cut to fit the card (section Card size)
 "With the message:" and the message lines        with message; after the quoted lines
 ```
 
@@ -417,6 +419,7 @@ N unknown, decided or from an earlier run   Action 9 is not pending.
 CHAT not the action's chat                  Action 10 is not for #3.
 /approve CHAT all                           Approved for business Ridgeline (#9) by Alice. /'revoke #9'
 /approve CHAT all, CHAT not the agent's     No chat #13. /list shows the agent's chats.
+/approve CHAT all, mode host                Approvals apply in mode requests; this server runs in mode host.
 /revoke CHAT                                Messages to business Ridgeline (#9) need approval again.
 /revoke CHAT, no standing approval          Messages to #9 have no standing approval.
 /list, no chats                             No chats.
@@ -424,7 +427,7 @@ other one-line text starting with "/"       Commands: /approve, /reject, /revoke
 ```
 
 - CHAT is optional in `/approve N` and `/reject N` as typed; the cards include it for sends and leaves.
-- A standing approval covers sends only. It ends at `/revoke`, when the chat is deleted, or when member `approvedById` is no longer an approver. It applies in mode `requests` only: in mode `host`, `list` and `/list` show no approvals.
+- A standing approval covers sends only. It ends at `/revoke`, when the chat is deleted, or when member `approvedById` is no longer an approver. It applies in mode `requests` only: in mode `host`, `list` and `/list` show no approvals, and `/approve CHAT all` stores none.
 
 ### Membership messages
 
@@ -608,7 +611,9 @@ no approver, no --owners           The agent has no owner. The person who runs i
 no approver, --owners              The agent has no approving owner. The person who runs it has to restart it with the --owners options it printed.
 control chat lost                  The agent lost its control chat. The person who runs it has to restart it with --reset-owners.
 20 actions pending                 20 actions are pending; wait for the owner's decisions.
+20 actions performing              20 actions are being performed; wait for their results.
 card over 15000 bytes (send)       text: too long for its approval card; shorten it.
+card over 15000 bytes (connect)    message: too long for its approval card; shorten it.
 unknown chat                       No chat #13. list shows the agent's chats.
 not a link or name                 Not a SimpleX link or name: <target>
 link not joinable                  <target> can't be joined now: <plan type>.
@@ -616,7 +621,9 @@ message not for an address         message: <target> is not a contact or busines
 chat not connected (send)          The agent is not connected to @2 and can't post; list shows connected: false.
 role below author                  The agent has role observer in #12 and can't post.
 reply_to not in chat               reply_to: #15 has no item 999.
+reply_to not a message             reply_to: item 31 in #15 is not a message.
 mention not a member               mention: #15 has no member 45. (in a contact chat: mention: @4 is a contact chat; mentions apply to groups and channels.)
+mention of equal names             mention: members 44 and 45 have the same name.
 SimpleX error worded by the apps   the apps' text (table below), for example: Name not found: This SimpleX name is not registered. Please check the name.
 other SimpleX error                SimpleX error: <the chain of error types>: <the scalar fields of the chain as JSON, at most 500 characters>
                                      for example: SimpleX error: error: groupUserRole: {"requiredRole":"author"}
@@ -691,7 +698,6 @@ serve(NAME, options):
   create DIR, mode 0700 (set again when DIR exists, except on Windows); DIR/lock created exclusively, or exit 1 when its PID runs; token = DIR/token, created when missing or with --new-token; DIR/headers.json written with the token
   chat = ChatApi.init({type: "sqlite", filePrefix: DIR/simplex})
   profile = the user, or created: /_create user {profile: {displayName: <--display-name or NAME>, fullName: "", peerType: agent}, pastTimestamp: false}
-  write DIR/server.json {name: NAME, port, expireHours}
   /network socks=off smp-proxy=always smp-proxy-fallback=protected           # the apps' defaults, SimpleXAPI.kt:5427-5447
   buffer events; chat.startChat()
   --display-name differs from profile.displayName, or peerType is not agent: /_profile <user> {the profile with displayName and peerType agent}       # APIUpdateProfile, parser Commands.hs:6399; before startChat the core returns chatNotStarted
@@ -703,6 +709,8 @@ serve(NAME, options):
   lost unset, group.groupProfile.displayName differs from the profile's, or its commands from the menu of createControlChat: /_group_profile #group {the group profile with that displayName and menu}   # APIUpdateGroupProfile, parser Commands.hs:6534
   members = /_members #group, so approvers are known before the first call
   HTTP listen 127.0.0.1:PORT; port in use: chat.close(); remove DIR/lock; exit 1 "Port PORT is in use. Start with --port N."   # before any link or QR code is printed
+    requests to /mcp with the token get 503 with Retry-After: 1 until ownerStart ends
+  write DIR/server.json {name: NAME, port, expireHours}
   lost unset: ownerStart(group)
   log "Listening on http://127.0.0.1:PORT/mcp"
   every 60 s, and at each owner command: expire the pending actions whose expires has passed (wall clock, so a sleep of the computer delays no expiry);
@@ -714,12 +722,14 @@ SIGINT, SIGTERM (process.on; the second signal joins the stop in progress):
   close HTTP (open calls end); stop handling events, so no /approve starts a perform
   wait for the cards being posted
   each pending action: edit its card to the cancelled form
-  each performing action: mark it interrupted, so its perform's end edits no card; card set: edit it to the interrupted form; card unset (mode host): post the "host, interrupted" card
+  each performing action: mark it interrupted, so its perform's end edits no card and logs no line; card set: edit it to the interrupted form; card unset (mode host): post the "host, interrupted" card
+  abort the stop signal of the performs: a connect's wait for the connection ends
   wait for the outcome edits of performs that ended before the stop
   K = pending and performing actions; log "Cancelled K actions." ("1 action." for one) when K > 0
   wait until the control chat's pending deliveries are 0, polled every 100 ms, at most 10 s:   # an edit of a received card emits no status event (Subscriber.hs:4139-4146, 9711dcfc9)
     /sql chat SELECT hex(agent_conn_id) FROM connections WHERE group_member_id IN (SELECT group_member_id FROM group_members WHERE group_id = <control group>)
     /sql agent SELECT count(*) FROM snd_message_deliveries WHERE failed = 0 AND hex(conn_id) IN (<those IDs>)
+    an error of either query: log "delivery wait: <error>" to stderr; the wait ends
   chat.close(); remove DIR/lock; log "Stopped."; exit 0
 ```
 
@@ -755,7 +765,7 @@ ownerStart(group):
     no humans: openLink(observer); print the observer line
     else: log and post "<member name> joined (member <groupMemberId>). Restart the server with --owners <ID:name of each human>"
   --owners LIST:
-    each entry: a human with groupMemberId ID and displayName NAME; missing: exit 2 "--owners: member ID:NAME is not in the agent control chat. Start with --reset-owners --owners, or use the IDs of current members."
+    each entry: a human with groupMemberId ID and displayName NAME, folded to one line as the restart line prints it; missing: exit 2 "--owners: member ID:NAME is not in the agent control chat. Start with --reset-owners --owners, or use the IDs of current members."
     each entry without role owner: apiSetMembersRole(group, [ID], owner)     # one member per call: Commands.hs:2990-2991 (9711dcfc9)
     each human not in LIST: apiRemoveMembers(group, [ID])                    # one member per call: Commands.hs:3130 (9711dcfc9)
     deleteLink(); log "Owners: LIST."; print the register hint
@@ -795,7 +805,7 @@ approve [CHAT] N | reject [CHAT] N, action N not pending in memory, or its card
 approve CHAT N | reject CHAT N, action N a connect or for another chat: reply "Action N is not for CHAT."
 approve [CHAT] N: decidedBy = sender; state performing; start perform(N) without awaiting it in the event handler; its end edits the card
 reject [CHAT] N:  decidedBy = sender; state rejected; edit the card
-approve CHAT all: CHAT not a chat of the agent: reply "No chat CHAT. ..."; otherwise set the chat's custom data simplexMcp = {approvedBy: sender name, approvedById: sender groupMemberId, approvedAt}, keeping its other keys
+approve CHAT all: mode host: reply "Approvals apply in mode requests; this server runs in mode host."; CHAT not a chat of the agent: reply "No chat CHAT. ..."; otherwise set the chat's custom data simplexMcp = {approvedBy: sender name, approvedById: sender groupMemberId, approvedAt}, keeping its other keys
                   (/_set custom @C or #G); each pending send of CHAT: approve as above; reply "Approved for ... /'revoke CHAT'"
 revoke CHAT:      no approval in the chat's custom data: reply "Messages to CHAT have no standing approval."; otherwise remove simplexMcp from it; reply "Messages to ... need approval again."
 pending:          reply with the pending actions
@@ -867,7 +877,9 @@ action(tool, input, ctx):
     stopping: tool error "The server is stopping."
     lost: tool error "control chat lost"
     20 actions pending: tool error "20 actions pending"
-    a send whose largest card exceeds 15000 bytes (section Card size): tool error "card over 15000 bytes"
+    20 actions performing: tool error "20 actions performing"
+    a connect: the link texts on its card cut to fit 15000 bytes (section Card size)
+    a send or connect whose largest card exceeds 15000 bytes (section Card size): tool error "card over 15000 bytes"
     no approvers: tool error, the no-approver message
     N = nextAction; nextAction = N + 1; create action N; log "Action N: ..."
     /_set custom #group {simplexMcp: {control: true, nextAction}}, queued after earlier writes, awaited
@@ -950,9 +962,9 @@ send(input, ctx):
   r = /_get chat <chat> count=0; a store error: tool error "unknown chat"
   r.chat.chatInfo not connected (as connected in list()): tool error "chat not connected"
   group or channel, r.chat.chatInfo.groupInfo.membership role below author: tool error "role below author"
-  reply_to i: /_get chat <chat> around=<i> count=0 fails or has no item i: tool error "reply_to not in chat"
+  reply_to i: /_get chat <chat> around=<i> count=0 fails or has no item i: tool error "reply_to not in chat"; item i not a message: tool error "reply_to not a message"
   mention, chat a contact chat: tool error "mention not a member"
-  mention m: /_members <chat> has no member m: tool error "mention not a member"
+  mention m: /_members <chat> has no member m: tool error "mention not a member"; two members with the same display name: tool error "mention of equal names"
   action(send, input, ctx)
   return responses(action, wait, idle, limit, ctx) with {action, status: "done"}
 
@@ -966,7 +978,7 @@ perform send:
 `responses(action, wait, idle, limit, ctx)`:
 
 ```
-collected: action.responses, in arrival order: at most 100 items kept, later ones counted as overflow; an item updated by chatItemUpdated (a live message) is replaced, and idle does not end the wait while a collected item is live
+collected: action.responses, in arrival order: at most 100 items kept, the IDs of later ones kept as overflow until they are deleted; an item updated by chatItemUpdated (a live message) is replaced, and idle does not end the wait while a collected item is live
 until: wait seconds | idle seconds after the last collected item | the call's signal; re-evaluated at each newChatItems of chat
   signal: return
 progress at once and every 60 s: "<k> responses in <chat>; waiting until <time>."
@@ -993,7 +1005,8 @@ card text, JSON-escaped      15000   the server's limit: 420 below the strictest
 - Group member connections are created with PQ off (`Store/Groups.hs:1837`, `:2201`, `:2726`), so `deliverMessagesB` compresses to the same 15602 bytes (`Internal.hs:2578`).
 - The library posts a card with `/_send #G json ...` without `sign=on`, and edits it with `/_update item #G <item> json ...` (`api.js`, `apiSendMessages`, `apiUpdateChatItem`): the body has no signature prefix.
 - History sends the edited card to a later owner as `x.msg.new` in a forward element, within 15763 bytes (`maxForwardBatchLength`, `batchElements`, `Internal.hs:1425`).
-- At `send`, before the action is created, the server builds the card forms of the action, with its text, reply and mentions: pending, done (the standing form under a standing approval) and failed. The approver is the action's own (a standing send) or the longest name of the current approvers, the error 600 three-byte characters (`chatErrorText` keeps 500 characters of details). Each form is measured as aeson encodes it: `"`, `\`, `\n`, `\r` and `\t` 2 bytes, other characters below U+0020 6 bytes, the rest their UTF-8 length.
+- At `send` and `connect`, before the action is created, the server builds the card forms of the action, with its text, reply and mentions, or with its message: pending, done (the standing form under a standing approval) and failed. The approver is the action's own (a standing send) or the longest name of the current approvers, the error 600 three-byte characters (`chatErrorText` keeps 500 characters of details). Each form is measured as aeson encodes it: `"`, `\`, `\n`, `\r` and `\t` 2 bytes, other characters below U+0020 6 bytes, the rest their UTF-8 length.
+- A connect card quotes the link's description and welcome in the bytes that its largest form leaves without them: lines are kept while they fit, the next one is cut to the bytes left and ends in "…", and the later ones are left out. The tool result keeps both texts whole. A connect whose largest form exceeds 15000 bytes without them is refused with the `message` error.
 
 ### leave
 
@@ -1027,7 +1040,7 @@ receive(input, ctx):
   result {chat, messages, more}
 
 list():
-  /_get chats <user> pcc=off count=100, earlier pages with before=<chatTs of the last chat> count=100 while a page holds 100   # parser Commands.hs:6342
+  /_get chats <user> pcc=off count=1000000   # parser Commands.hs:6342; count= is ORDER BY chat_ts DESC LIMIT without a time boundary, Store/Messages.hs:884, :995
   chats: contact and group chats except the agent control chat (the notes folder is left out, Store/Messages.hs:751)
   connected: contacts: contact.activeConn.connStatus ready (Contact.ready, ChatTypes.swift:2504); groups: membership.memberStatus connected or complete (set at the host's CON, Subscriber.hs:894-899)
   unread: chatStats.unreadCount (types.d.ts:1175)
@@ -1224,14 +1237,14 @@ Unit:
 
 ```
 test        covers
-options     defaults, ranges, NAME, --display-name at the first and a later start, --owners with and without a list, rejected arguments, --help text
-commands    /approve [CHAT] N, /reject [CHAT] N, another chat, /approve CHAT all, /revoke, /pending, /list, unknown, multi-line, non-command text, a number from an earlier run; /list of 100 chats with cut lines and the older count; chat references over 15 digits; names with line breaks and escape sequences; the restart command as code; card size at 15000 bytes, with the current approvers' longest name; mode host without approvals
-actions     every transition; attach rule; open counts; counter written before the card; stop edits pending and performing cards; standing approval: performed at once, outcome card posted; 20 pending; decided actions deleted after expires
-cards       every card form and outcome; quoting; names and errors on one line; "as myself" and "incognito"; "where I am incognito"; leave forms; standing form
-messages    message fields; responses with idle and wait; receive with new messages under a concurrent call, stopping at limit + 1; leave of @N and #N, pending membership included; approved in list; an approval whose approver is no longer one; a group-role failure; a send to an unconnected contact or group refused; the connect wait cap
-http        401 without token; 403 with another Origin; 404 for other paths and for a request target that is not a URL, the server serving on; SDK validation errors
-register    entry JSON with headersHelper and no token; timeout from server.json; remove before add; errors
-files       lock: exclusive create, a running PID, a stale PID; folder mode at every start; headers.json
+options     defaults, ranges, NAME, --display-name at the first and a later start, --owners with and without a list, names with commas, rejected arguments, --help text
+commands    /approve [CHAT] N, /reject [CHAT] N, another chat, /approve CHAT all, /revoke, /pending, /list, unknown, multi-line, non-command text, a number from an earlier run; /list of 100 chats with cut lines and the older count; chat references over 15 digits; names with line breaks and escape sequences; a listed owner by the name on one line; the restart command as code; card size at 15000 bytes, with the current approvers' longest name; a connect refused for its message, its link texts cut to fit; mode host without approvals, /approve CHAT all refused; an SQL error of the delivery wait logged
+actions     every transition; attach rule; open counts; counter written before the card; a failed counter write or card post logged; stop edits pending and performing cards, aborts the performs' signal, and an interrupted perform logs no line; standing approval: performed at once, outcome card posted; 20 pending; 20 performing; decided actions deleted after expires
+cards       every card form and outcome; quoting; names and errors on one line; "as myself" and "incognito"; "where I am incognito"; leave forms; standing form; link texts cut to the bytes left; the reply quote cut by characters
+messages    message fields; responses with idle and wait; overflow IDs removed at deletion; receive with new messages under a concurrent call, stopping at limit + 1, a store error of a page read as its error; leave of @N and #N, pending membership included; approved in list; all chats in one read; an approval whose approver is no longer one; a group-role failure; a send to an unconnected contact or group refused; reply_to of an item other than a message refused; mentions of equal names refused; the connect wait cap; the connect wait ended by the stop
+http        401 without token; 403 with another Origin; 404 for other paths and for a request target that is not a URL, the server serving on; 503 with Retry-After until ready; SDK validation errors
+register    entry JSON with headersHelper and no token; timeout from server.json; remove before add; errors; on Windows, claude through cmd.exe after ENOENT, with cmd.exe quoting
+files       lock: exclusive create, a running PID, a stale PID; folder mode at every start; headers.json; file modes set again on existing files
 log         every SimpleX error shape worded by the apps, in its JSON shape from @simplex-chat/types; the chain for other errors
 ```
 
@@ -1250,6 +1263,7 @@ restart           stop with a pending action: card cancelled; start: counter con
 host mode         actions done at once; outcome cards
 peer text         groups named "\n/approve 1" and "x\n/approve 1" by SQL, their welcome with edge-space commands and links: the card's formattedText has only its own commands, no SimpleX link, every peer line a snippet
 alias             a 20-digit reference that the core reads as the agent control chat: receive, send and leave refuse it
+port in use       serve on a bound port: exit before server.json is written and before a link is printed
 ```
 
 Claude Code checks, by hand (TESTING.md):
diff --git a/packages/simplex-chat-mcp/REFERENCE.md b/packages/simplex-chat-mcp/REFERENCE.md
index 9b3bc5f51a..9144d468e9 100644
--- a/packages/simplex-chat-mcp/REFERENCE.md
+++ b/packages/simplex-chat-mcp/REFERENCE.md
@@ -55,7 +55,7 @@ At its first start the server downloads the SimpleX core library, 29 to 50 MB de
    The first start prints, after two lines about downloading the SimpleX core library and the Node.js add-on:
 
    ```
-   SimpleX MCP server 0.1.0, agent "my-agent"
+   SimpleX MCP server 0.1.1, agent "my-agent"
    Data folder: /home/alice/.simplex-mcp/my-agent
    Approval mode: requests
    Agent control chat "My Agent" created.
@@ -297,7 +297,7 @@ Add an entry with the URL `http://127.0.0.1:5226/mcp` and the header `Authorizat
 |---|---|
 | The server was not running when Claude Code started | Start the server, then run `/mcp reconnect all` in Claude Code (2.1.284 or later). |
 | The server restarted while Claude Code was running | Claude Code reconnects up to five times within about 30 seconds. After that, in an interactive session, run `/mcp reconnect all`; `claude -p` runs and Agent SDK sessions keep retrying for about half an hour. Open calls fail, and pending actions are cancelled; the agent's repeated call creates a new request. |
-| A second server was started on the same data folder | It exits with `Another server uses <folder> (PID N).` |
+| A second server was started on the same data folder | It exits with `Another server uses <folder> (PID N). If no server runs, remove <folder>/lock.` |
 | Every owner left the agent control chat or was removed | `connect`, `send` and `leave` fail. Without `--owners`, the server logs `No owners in the agent control chat.` and prints a new link; join with it. With an `--owners` list, the agent posts and the server logs `No owners remain: restart the server with --reset-owners --owners`. |
 | The agent was removed from the agent control chat, the chat was deleted, or the agent lost its owner role | `connect`, `send` and `leave` fail, and the server logs `The agent lost its control chat. Restart the server with --reset-owners.` |
 | The QR code does not scan | Start with `--qr-code large`, or paste the link into the app. |
diff --git a/packages/simplex-chat-mcp/TESTING.md b/packages/simplex-chat-mcp/TESTING.md
index 4098364c50..d7a4647d63 100644
--- a/packages/simplex-chat-mcp/TESTING.md
+++ b/packages/simplex-chat-mcp/TESTING.md
@@ -75,7 +75,7 @@ Incognito, as a second agent, because the first one already knows the directory:
 Stop and restart:
 
 - Stop the server while a card waits: the card ends with `Cancelled: the server stopped.` After a restart, `/approve` of that number replies `Action N is not pending.`, and the next card has the next number.
-- A second `serve my-agent` on the same data folder exits with `Another server uses ... (PID N).` A port in use exits with `Port 5226 is in use. Start with --port N.`, before any link is printed.
+- A second `serve my-agent` on the same data folder exits with `Another server uses ... (PID N). If no server runs, remove .../lock.` A port in use exits with `Port 5226 is in use. Start with --port N.`, before any link is printed.
 - Restart with `--new-token`, without `register`: after the reconnection, `list` returns the chats. Checked with `claude -p` and an `--mcp-config` entry with `headersHelper`, Claude Code 2.1.302, 2026-10-18.
 
 ## Claude Code checks
diff --git a/packages/simplex-chat-mcp/package-lock.json b/packages/simplex-chat-mcp/package-lock.json
index 4c37f08001..3156241491 100644
--- a/packages/simplex-chat-mcp/package-lock.json
+++ b/packages/simplex-chat-mcp/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@simplex-chat/mcp",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@simplex-chat/mcp",
-      "version": "0.1.0",
+      "version": "0.1.1",
       "license": "AGPL-3.0",
       "dependencies": {
         "@modelcontextprotocol/node": "^2.1.1",
diff --git a/packages/simplex-chat-mcp/package.json b/packages/simplex-chat-mcp/package.json
index 28418ca596..9e1b0cb87a 100644
--- a/packages/simplex-chat-mcp/package.json
+++ b/packages/simplex-chat-mcp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@simplex-chat/mcp",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "MCP server that gives an AI agent its own SimpleX profile",
   "bin": {
     "simplex-mcp": "dist/cli.js"
diff --git a/packages/simplex-chat-mcp/spec/api.md b/packages/simplex-chat-mcp/spec/api.md
index 1dde8ebf86..97f80d92ee 100644
--- a/packages/simplex-chat-mcp/spec/api.md
+++ b/packages/simplex-chat-mcp/spec/api.md
@@ -156,8 +156,10 @@ Tool errors:
 | `No chat CHAT. list shows the agent's chats.` | invalid reference, the control chat, or a store error when the chat is read | [tools.ts:714-721](../src/tools.ts#L714-L721) |
 | `The agent has role ROLE in CHAT and can't post.` | membership role `observer` or `relay` | [tools.ts:576-579](../src/tools.ts#L576-L579) |
 | `reply_to: CHAT has no item N.` | the read of `around=N` fails, or the item is absent from it | [tools.ts:723-728](../src/tools.ts#L723-L728) |
+| `reply_to: item N in CHAT is not a message.` | the item's content is not `rcvMsgContent` or `sndMsgContent` | [tools.ts:722](../src/tools.ts#L722) |
 | `mention: CHAT is a contact chat; mentions apply to groups and channels.` | `mention` with `@N` | [tools.ts:731](../src/tools.ts#L731) |
 | `mention: CHAT has no member N.` | ID absent from `/_members` | [tools.ts:735](../src/tools.ts#L735) |
+| `mention: members N and M have the same name.` | two mentioned members with the same display name | [tools.ts:735](../src/tools.ts#L735) |
 | refusals | see [1.8](#18-action-refusals) | |
 
 ### 1.4 `receive`
@@ -180,7 +182,7 @@ Output (all fields always present):
 | `messages` | unread received messages in chat order, then received messages that arrived during the call; live items left out; at most `limit` |
 | `more` | new messages not returned, overflow, and unread items left unread by the page reads |
 
-Tool errors: `No chat CHAT. list shows the agent's chats.` for an invalid reference, the control chat, or a store error while the unread items are read ([tools.ts:655](../src/tools.ts#L655), [:659-661](../src/tools.ts#L659-L661)); other chat errors as their error text ([log.ts:39-47](../src/log.ts#L39-L47)).
+Tool errors: `No chat CHAT. list shows the agent's chats.` for an invalid reference, the control chat, or a store error of the first read, `initial=1` ([tools.ts:655](../src/tools.ts#L655), [:659-661](../src/tools.ts#L659-L661)); other chat errors, a store error of a later page read included, as their error text ([log.ts:39-47](../src/log.ts#L39-L47)).
 
 Messages are read by `receive` without an action or an approval.
 
@@ -197,7 +199,7 @@ Output:
 | `chats` | `chat`<br>`type`<br>`name`<br>`simplex_name`, when verified<br>`peer_type`, when present<br>`incognito`<br>`known_as`, when incognito<br>`connected`<br>`unread`: `chatStats.unreadCount`<br>`approved: true`, only under a standing approval in mode `requests` |
 | `actions` | `action`<br>`tool`<br>`input`: the input of the creating call<br>`state`<br>`open`: `true` while a call waits on it |
 
-`chats`: the contacts and groups from `/_get chats USER pcc=off`, paged by 100 with `before=CHAT_TS`, except the control chat ([tools.ts:698-712](../src/tools.ts#L698-L712)). `actions`: every action in memory ([tools.ts:694](../src/tools.ts#L694)).
+`chats`: the contacts and groups from one read, `/_get chats USER pcc=off count=1000000`, except the control chat ([tools.ts:698-712](../src/tools.ts#L698-L712)). `actions`: every action in memory ([tools.ts:694](../src/tools.ts#L694)).
 
 ### 1.6 `leave`
 
@@ -258,12 +260,16 @@ Refusals of a new `connect`, `send` or `leave` action, first match ([actions.ts:
 | `The server is stopping.` | `Actions.stop` has started |
 | `The agent lost its control chat. The person who runs it has to restart it with --reset-owners.` | control chat lost |
 | `20 actions are pending; wait for the owner's decisions.` | 20 actions in state `pending` |
+| `20 actions are being performed; wait for their results.` | 20 actions in state `performing` |
 | `text: too long for its approval card; shorten it.` | `send` whose largest card form exceeds 15000 bytes |
+| `message: too long for its approval card; shorten it.` | `connect` whose largest card form exceeds 15000 bytes without the link texts |
 | `The agent has no owner. The person who runs it has to join its control chat with the link the server printed.` | no approver, `--owners` absent |
 | `The agent has no approving owner. The person who runs it has to restart it with the --owners options it printed.` | no approver, `--owners` given |
 
 Largest card form ([control.ts:476-484](../src/control.ts#L476-L484)): the maximum of the creation form, the `done` form and a `failed` form with an error of 600 × `€`, with the action's own decider or the longest current approver name; each form is measured as JSON-escaped UTF-8: `"`, `\`, `\n`, `\r`, `\t` 2 bytes, other characters below U+0020 6 bytes.
 
+Link texts of a `connect` card ([control.ts:111](../src/control.ts#L111), [:508-522](../src/control.ts#L508-L522)): the description and welcome lines take the bytes that the largest form leaves without them. Lines are kept while they fit; the next line is cut to the bytes left and ends in `…`; later lines are left out. The tool result keeps both texts whole.
+
 ---
 
 ## 2. Agent control chat
@@ -299,6 +305,7 @@ The server ignores other text. It answers a command with a reply that quotes it
 | `approve`, `reject` | action N absent, not `pending`, or without a card | `Action N is not pending.` | [control.ts:182](../src/control.ts#L182) |
 | `approve CHAT N`, `reject CHAT N` | action N is a `connect`, or for another chat | `Action N is not for CHAT.` | [control.ts:183](../src/control.ts#L183) |
 | `approve`, `reject` | accepted | none; the card is edited at the outcome | [control.ts:184-187](../src/control.ts#L184-L187) |
+| `approve CHAT all` | mode `host`; nothing is stored | `Approvals apply in mode requests; this server runs in mode host.` | [control.ts:182](../src/control.ts#L182) |
 | `approve CHAT all` | CHAT unknown or the control chat | `No chat CHAT. /list shows the agent's chats.` | [control.ts:194](../src/control.ts#L194) |
 | `approve CHAT all` | accepted | `Approved for KIND NAME (CHAT) by APPROVER. /'revoke CHAT'` | [control.ts:202](../src/control.ts#L202) |
 | `revoke CHAT` | CHAT unknown, or without a standing approval | `Messages to CHAT have no standing approval.` | [control.ts:207](../src/control.ts#L207) |
@@ -318,7 +325,7 @@ Request lines:
 
 | Tool | First line | Further lines |
 |---|---|---|
-| `connect` | `I want to connect to SUBJECT, as myself.` or `, incognito.`<br>done and connected: `I connected to ...`<br>done and not connected: `I asked to connect to ...` | link description, one code span per line<br>welcome, one code span per line<br>with `message`: `With the message:` and its lines |
+| `connect` | `I want to connect to SUBJECT, as myself.` or `, incognito.`<br>done and connected: `I connected to ...`<br>done and not connected: `I asked to connect to ...` | link description, one code span per line<br>welcome, one code span per line<br>both cut to fit the card ([1.8](#18-action-refusals))<br>with `message`: `With the message:` and its lines |
 | `send` | `I want to send a message to SUBJECT:`, with `, where I am incognito` before the colon in incognito chats<br>done: `I sent a message to ...` | text, one code span per line<br>`replying to NAME: QUOTE` with `reply_to`<br>`mentioning @A, @'B C'` with `mention` |
 | `leave` | `I want to delete KIND NAME (@N).` or `I want to leave KIND NAME (#N).`<br>done: `I deleted ...` or `I left ...` | |
 
@@ -394,7 +401,7 @@ NAME: 1 to 32 characters of `[a-z0-9]` and single hyphens, starting with a lette
 | `--data` | folder | `~/.simplex-mcp/NAME` | resolved to an absolute path; `dataGiven` is set | [cli.ts:65-68](../src/cli.ts#L65-L68) |
 | `--display-name` | text | NAME when the user is created | must equal `validName(text)` | [cli.ts:69-71](../src/cli.ts#L69-L71), [:146-150](../src/cli.ts#L146-L150) |
 | `--approve` | `requests` or `host` | `requests` | | [cli.ts:72-74](../src/cli.ts#L72-L74) |
-| `--owners` | absent value, or `ID:NAME,...` | absent | the value is absent when the next argument is missing or starts with `--`; entries match `^([1-9]\d*):(.+)$` | [cli.ts:75-77](../src/cli.ts#L75-L77), [:167-171](../src/cli.ts#L167-L171) |
+| `--owners` | absent value, or `ID:NAME,...` | absent | the value is absent when the next argument is missing or starts with `--`; it is split at each comma followed by `ID:`, so a name may hold commas; entries match `^([1-9]\d*):(.+)$` | [cli.ts:75-77](../src/cli.ts#L75-L77), [:167-171](../src/cli.ts#L167-L171) |
 | `--expire` | hours | 23 | integer 1 to 23 | [cli.ts:78-80](../src/cli.ts#L78-L80) |
 | `--reset-owners` | flag | off | refused with an `--owners` list | [cli.ts:81-83](../src/cli.ts#L81-L83), [:97-99](../src/cli.ts#L97-L99) |
 | `--new-token` | flag | off | | [cli.ts:84-86](../src/cli.ts#L84-L86) |
@@ -437,7 +444,7 @@ Server name: `simplex-NAME` ([register.ts:33](../src/register.ts#L33)).
 | 2 | `--port: a port from 1 to 65535 expected, got VALUE` | [cli.ts:88](../src/cli.ts#L88), [:175](../src/cli.ts#L175) |
 | 2 | `--reset-owners takes --owners without a list: member IDs change in a new agent control chat.` | [cli.ts:98](../src/cli.ts#L98) |
 | 2 | `--owners: member ENTRY is not in the agent control chat. Start with --reset-owners --owners, or use the IDs of current members.` | [control.ts:251](../src/control.ts#L251) |
-| 1 | `Another server uses DATA (PID N).` | [files.ts:21](../src/files.ts#L21), [:23](../src/files.ts#L23) |
+| 1 | `Another server uses DATA (PID N). If no server runs, remove DATA/lock.` | [files.ts:21](../src/files.ts#L21), [:23](../src/files.ts#L23) |
 | 1 | `Port PORT is in use. Start with --port N.` | [serve.ts:205](../src/serve.ts#L205) |
 | 1 | `Agent "NAME" was never started. Start it with: npx -y @simplex-chat/mcp serve NAME` | [register.ts:32](../src/register.ts#L32) |
 | 1 | `Add this entry under LOCATION in ~/.claude.json: {"simplex-NAME": ENTRY}` | [register.ts:52-55](../src/register.ts#L52-L55) |
@@ -462,11 +469,12 @@ stdout ([log.ts:31-33](../src/log.ts#L31-L33)):
 | approvers gone, `--owners` absent | `No owners in the agent control chat.` | [control.ts:20](../src/control.ts#L20), [:157](../src/control.ts#L157), [:238](../src/control.ts#L238) |
 | control chat lost | `The agent lost its control chat. Restart the server with --reset-owners.` | [control.ts:298](../src/control.ts#L298) |
 | action created | `Action N: WHAT` with `, as itself` or `, incognito` for `connect` and ` (CHAT)` for `send` and `leave` | [actions.ts:140-141](../src/actions.ts#L140-L141), [:268-278](../src/actions.ts#L268-L278) |
-| perform ended, mode `requests` | `Action N approved by NAME: RESULT.` with RESULT `sent`, `deleted`, `left`, `connected`, `connection requested` or `failed: ERROR` | [actions.ts:238](../src/actions.ts#L238), [:284-291](../src/actions.ts#L284-L291) |
-| perform ended, mode `host` | `Action N: performed without approval (mode host).`, or `...; failed: ERROR.` | [actions.ts:286](../src/actions.ts#L286) |
+| counter write or card post failed | `Action N: failed: ERROR.` | [actions.ts:232](../src/actions.ts#L232) |
+| perform ended, not interrupted by the stop, mode `requests` | `Action N approved by NAME: RESULT.` with RESULT `sent`, `deleted`, `left`, `connected`, `connection requested` or `failed: ERROR` | [actions.ts:238](../src/actions.ts#L238), [:284-291](../src/actions.ts#L284-L291) |
+| perform ended, not interrupted by the stop, mode `host` | `Action N: performed without approval (mode host).`, or `...; failed: ERROR.` | [actions.ts:286](../src/actions.ts#L286) |
 | rejected | `Action N rejected by NAME.` | [actions.ts:188](../src/actions.ts#L188) |
 | expired | `Action N expired.` | [actions.ts:158](../src/actions.ts#L158) |
 | stop | `Cancelled K action.` or `Cancelled K actions.` when K > 0<br>`Stopped.` | [serve.ts:155](../src/serve.ts#L155), [:159](../src/serve.ts#L159) |
 | membership messages | see [2.3](#23-membership-messages) | |
 
-stderr: `CONTEXT: ERROR` from `logError` ([log.ts:35-37](../src/log.ts#L35-L37)), with CONTEXT one of `action N`, `action N card`, `control chat command`, `EVENT in the agent control chat`, `EVENT event`, `MCP`, `HTTP request`, `stop`, `simplex-mcp`. The library's download lines are written to stderr, and its event processing errors to stdout ([libs.ts:114](../../simplex-chat-nodejs/src/libs.ts#L114), [api.ts:187](../../simplex-chat-nodejs/src/api.ts#L187)).
+stderr: `CONTEXT: ERROR` from `logError` ([log.ts:35-37](../src/log.ts#L35-L37)), with CONTEXT one of `action N`, `action N card`, `control chat command`, `EVENT in the agent control chat`, `EVENT event`, `MCP`, `HTTP request`, `delivery wait`, `stop`, `simplex-mcp`. The library's download lines are written to stderr, and its event processing errors to stdout ([libs.ts:114](../../simplex-chat-nodejs/src/libs.ts#L114), [api.ts:187](../../simplex-chat-nodejs/src/api.ts#L187)).
diff --git a/packages/simplex-chat-mcp/spec/architecture.md b/packages/simplex-chat-mcp/spec/architecture.md
index bb7c7dc70c..b3de74046f 100644
--- a/packages/simplex-chat-mcp/spec/architecture.md
+++ b/packages/simplex-chat-mcp/spec/architecture.md
@@ -176,7 +176,7 @@ Hooks are bound in [`serve.ts:97-103`](../src/serve.ts#L97-L103): `refusal`, `sa
 | `OwnerRequest` | [54](../src/control.ts#L54) | parsed owner command |
 | `Control.load` | [88](../src/control.ts#L88) | lost check, group profile and menu, member list |
 | `Control.start` | [97](../src/control.ts#L97) | owner setup per `--owners` |
-| `Control.refusal` | [105](../src/control.ts#L105) | card size of a send, approver presence |
+| `Control.refusal` | [105](../src/control.ts#L105) | bytes left for the link texts of a connect card, card size of a send or connect, approver presence |
 | `Control.standingApprover` | [113](../src/control.ts#L113) | approver name of a chat's standing approval |
 | `Control.saveCounter` | [118](../src/control.ts#L118) | queued counter writes |
 | `Control.postCard`, `Control.outcome` | [124-132](../src/control.ts#L124-L132) | card post and card edit |
@@ -200,13 +200,13 @@ Hooks are bound in [`serve.ts:97-103`](../src/serve.ts#L97-L103): `refusal`, `sa
 |---|---|---|
 | `Message` | [11](../src/messages.ts#L11) | message item of tool results |
 | `ToolCall` | [29](../src/messages.ts#L29) | abort signal and progress callback of one call |
-| `Collected` | [34](../src/messages.ts#L34) | collected items, change signal, overflow count, time of the last change |
+| `Collected` | [34](../src/messages.ts#L34) | collected items, change signal, IDs of the items over the first 100, time of the last change |
 | `Changes` | [41](../src/messages.ts#L41) | set of wake callbacks |
 | `ChatItemsWatch` | [58](../src/messages.ts#L58) | listeners per chat reference; received message items gathered by `collect` |
 | `chatRef`, `isChatRef` | [104-117](../src/messages.ts#L104-L117) | `@N` and `#N` references |
 | `toMessage` | [135](../src/messages.ts#L135) | chat item to `Message` |
 | `chatCommand`, `getChat`, `markRead` | [169-181](../src/messages.ts#L169-L181) | raw chat commands with response type checks |
-| `unreadItems` | [183](../src/messages.ts#L183) | unread items of a chat, paged |
+| `unreadItems` | [183](../src/messages.ts#L183) | unread items of a chat after its `initial=1` read, paged |
 | `reportProgress`, `nextChange`, `awaitResponses` | [200-230](../src/messages.ts#L200-L230) | waits |
 | `validName`, `viewName` | [236-262](../src/messages.ts#L236-L262) | display name rules and `@name` form |
 | `fullDomainName` | [264-267](../src/messages.ts#L264-L267) | `SimplexDomain` to `name.simplex` or `name.testing` |
@@ -229,7 +229,7 @@ Hooks are bound in [`serve.ts:97-103`](../src/serve.ts#L97-L103): `refusal`, `sa
 | `registryEntry` | [43](../src/register.ts#L43) | `{type, url, headersHelper, timeout}` |
 | `manualEntryText` | [52](../src/register.ts#L52) | entry text when `claude` is missing |
 | `projectRoot` | [57](../src/register.ts#L57) | project key of `--scope local` |
-| `runCommand` | [83](../src/register.ts#L83) | `spawnSync` with ENOENT detection |
+| `runCommand` | [83](../src/register.ts#L83) | `spawnSync` with ENOENT detection; on Windows after ENOENT, once more through `cmd.exe` with `cmdArgument` quoting, and exit status 9009 as missing |
 
 ### [2.10 `log.ts`](../src/log.ts)
 
@@ -272,9 +272,9 @@ The profile, chats, items and members are stored by the core in `DATA/simplex_ch
 | Path | Contents | Mode | Written | Read |
 |---|---|---|---|---|
 | `DATA/` | data folder | 0700, set at every start except on Windows | [files.ts:12](../src/files.ts#L12) | |
-| `DATA/token` | base64url of 32 random bytes | 0600 at creation | first start, `--new-token` ([:30](../src/files.ts#L30)) | every start |
-| `DATA/headers.json` | `{"Authorization":"Bearer <token>"}` | 0600 at creation | every start ([:42](../src/files.ts#L42)) | Claude Code `headersHelper` |
-| `DATA/server.json` | `{name, port, expireHours}` | 0600 at creation | every start, after the user exists ([serve.ts:90](../src/serve.ts#L90)) | `register` |
+| `DATA/token` | base64url of 32 random bytes | 0600, set again at every write except on Windows | first start, `--new-token` ([:30](../src/files.ts#L30)) | every start |
+| `DATA/headers.json` | `{"Authorization":"Bearer <token>"}` | 0600, set again at every write except on Windows | every start ([:42](../src/files.ts#L42)) | Claude Code `headersHelper` |
+| `DATA/server.json` | `{name, port, expireHours}` | 0600, set again at every write except on Windows | every start, after the HTTP listener is bound ([serve.ts:114](../src/serve.ts#L114)) | `register` |
 | `DATA/lock` | PID and a newline | 0600 | start ([files.ts:57](../src/files.ts#L57)) | next start |
 
 The core library is downloaded once into `CACHE/core-7.1.0.12/sqlite`, and the Node.js add-on into `CACHE/<add-on release>/`, each with a `Downloading ...` line on stderr. CACHE is `$XDG_CACHE_HOME/simplex-chat` or `~/.cache/simplex-chat`; on macOS `~/Library/Caches/simplex-chat`; on Windows `%LOCALAPPDATA%\simplex-chat` ([libs.ts:39-46](../../simplex-chat-nodejs/src/libs.ts#L39-L46), [:87](../../simplex-chat-nodejs/src/libs.ts#L87), [:107](../../simplex-chat-nodejs/src/libs.ts#L107), [:114](../../simplex-chat-nodejs/src/libs.ts#L114), [:127](../../simplex-chat-nodejs/src/libs.ts#L127)).
@@ -289,14 +289,14 @@ The core library is downloaded once into `CACHE/core-7.1.0.12/sqlite`, and the N
 2. libsimplex for SQLite is loaded by `ChatApi.init`, and the databases are migrated with confirmation `yesUp` ([serve.ts:71](../src/serve.ts#L71), [api.ts:114-123](../../simplex-chat-nodejs/src/api.ts#L114-L123)).
 3. Three log lines: version and NAME, data folder, mode ([serve.ts:72-74](../src/serve.ts#L72-L74)).
 4. The active user is read, or created with display name `--display-name` or NAME, empty full name and peer type `agent` ([serve.ts:89](../src/serve.ts#L89)).
-5. `server.json` is written ([:90](../src/serve.ts#L90)).
-6. The network config is set: `/network socks=off smp-proxy=always smp-proxy-fallback=protected` ([:91](../src/serve.ts#L91)).
-7. Events are buffered, and the chat is started ([:92-93](../src/serve.ts#L92-L93)).
-8. A `--display-name` different from the profile, or a peer type other than `agent`, is applied with one `apiUpdateProfile` ([:94](../src/serve.ts#L94), [:187-192](../src/serve.ts#L187-L192)).
-9. The agent control chat is found by its marker, created with counter 1, or reset with `--reset-owners` ([:96](../src/serve.ts#L96), [:194-199](../src/serve.ts#L194-L199)).
-10. `Actions`, `ChatItemsWatch`, `AgentTools` and `Control` are created; the counter is taken from the marker ([:97-106](../src/serve.ts#L97-L106)).
-11. `Control.load`: for a lost control chat, `Actions.lost` is set; otherwise the group name and command menu are updated when they differ, and members are read ([control.ts:88-95](../src/control.ts#L88-L95)).
-12. The HTTP server listens; with the port in use, the process exits with code 1 ([serve.ts:113](../src/serve.ts#L113), [:201-208](../src/serve.ts#L201-L208)).
+5. The network config is set: `/network socks=off smp-proxy=always smp-proxy-fallback=protected` ([:91](../src/serve.ts#L91)).
+6. Events are buffered, and the chat is started ([:92-93](../src/serve.ts#L92-L93)).
+7. A `--display-name` different from the profile, or a peer type other than `agent`, is applied with one `apiUpdateProfile` ([:94](../src/serve.ts#L94), [:187-192](../src/serve.ts#L187-L192)).
+8. The agent control chat is found by its marker, created with counter 1, or reset with `--reset-owners` ([:96](../src/serve.ts#L96), [:194-199](../src/serve.ts#L194-L199)).
+9. `Actions`, `ChatItemsWatch`, `AgentTools` and `Control` are created; the counter is taken from the marker ([:97-106](../src/serve.ts#L97-L106)).
+10. `Control.load`: for a lost control chat, `Actions.lost` is set; otherwise the group name and command menu are updated when they differ, and members are read ([control.ts:88-95](../src/control.ts#L88-L95)).
+11. The HTTP server listens; with the port in use, the process exits with code 1 ([serve.ts:113](../src/serve.ts#L113), [:201-208](../src/serve.ts#L201-L208)). Until step 13 ends, requests to `/mcp` that pass the token check get 503 with `Retry-After: 1` ([http.ts:23](../src/http.ts#L23), [serve.ts:112](../src/serve.ts#L112), [:121](../src/serve.ts#L121)).
+12. `server.json` is written ([serve.ts:114](../src/serve.ts#L114)).
 13. The server runs the owner setup, `Control.start`; after an error, HTTP is closed and the error is rethrown ([serve.ts:114-119](../src/serve.ts#L114-L119)).
 14. `Listening on http://127.0.0.1:PORT/mcp` ([:120](../src/serve.ts#L120)).
 15. Buffered events are replayed, then live events are dispatched ([:123](../src/serve.ts#L123), [:210-224](../src/serve.ts#L210-L224)).
@@ -325,14 +325,14 @@ Owner commands are queued in a second chain, independent of the membership chain
 On `SIGINT` or `SIGTERM` the server runs one stop, shared by all later signals ([serve.ts:50-61](../src/serve.ts#L50-L61)). `RunningServer.stop` ([serve.ts:150-160](../src/serve.ts#L150-L160)):
 
 1. Events are ignored from now on.
-2. `Actions.stop` starts: new actions are refused with `The server is stopping.`; the expiry timer is cleared; cards being posted are awaited; pending and performing actions are marked interrupted, and their cards are edited, or posted when they have no card; outcome edits already in progress are awaited ([actions.ts:200-209](../src/actions.ts#L200-L209)).
+2. `Actions.stop` starts: new actions are refused with `The server is stopping.`; the expiry timer is cleared; cards being posted are awaited; pending and performing actions are marked interrupted; the stop signal of the performs is aborted, which ends the wait of a `connect` for its connection; their cards are edited, or posted when they have no card; outcome edits already in progress are awaited ([actions.ts:200-209](../src/actions.ts#L200-L209)).
 3. In parallel with step 2, the HTTP server is closed with all connections, and open calls are aborted ([http.ts:46-50](../src/http.ts#L46-L50)).
 4. `Cancelled K action(s).` when K > 0 ([serve.ts:155](../src/serve.ts#L155)).
-5. Pending deliveries of the control chat's member connections are polled with `/sql chat` and `/sql agent` every 100 ms, for at most 10 s ([serve.ts:168-176](../src/serve.ts#L168-L176)).
+5. Pending deliveries of the control chat's member connections are polled with `/sql chat` and `/sql agent` every 100 ms, for at most 10 s; an error of either query is logged as `delivery wait: ERROR` and ends the wait ([serve.ts:168-176](../src/serve.ts#L168-L176)).
 6. `chat.close()`: `/_stop`, then the store is closed ([api.ts:162-167](../../simplex-chat-nodejs/src/api.ts#L162-L167)).
 7. The lock is removed, `Stopped.` is logged, and the process exits with code 0, or 1 after an error ([serve.ts:158-159](../src/serve.ts#L158-L159), [:52-58](../src/serve.ts#L52-L58)).
 
-Performs in progress are not awaited; when one ends, its card stays as edited at the stop, because the action is interrupted ([actions.ts:239](../src/actions.ts#L239)).
+Performs in progress are not awaited; when one ends, its card stays as edited at the stop and no line is logged, because the action is interrupted ([actions.ts:252](../src/actions.ts#L252)).
 
 ### 4.4 The lock
 
@@ -342,7 +342,7 @@ acquireLock(DATA):                                   files.ts:17
   exists:
     PID = number in the file
     PID valid, other than ours, running:            :21, :70-77
-      exit 1 "Another server uses DATA (PID N)."
+      exit 1 "Another server uses DATA (PID N). If no server runs, remove DATA/lock."
     remove the file; create it exclusively again    :22-23
       exists again: exit 1 with the same message
 releaseLock(DATA): remove DATA/lock                  :26
@@ -373,7 +373,7 @@ Sources: [actions.ts:130](../src/actions.ts#L130), [tools.ts:361](../src/tools.t
 | human owner | human with role `owner` | [control.ts:340-342](../src/control.ts#L340-L342) |
 | approver, `--owners` absent | member with role `owner` | [control.ts:357-361](../src/control.ts#L357-L361) |
 | approver, `--owners` without a list | none | [control.ts:360](../src/control.ts#L360) |
-| approver, `--owners ID:NAME,...` | member with role `owner` whose `groupMemberId` and `displayName` match an entry | [control.ts:360](../src/control.ts#L360), [:565-567](../src/control.ts#L565-L567) |
+| approver, `--owners ID:NAME,...` | member with role `owner` whose `groupMemberId` and `displayName`, folded to one line by `oneLine`, match an entry | [control.ts:360](../src/control.ts#L360), [:565-567](../src/control.ts#L565-L567) |
 
 The command sender's member record from the chat item is checked ([control.ts:139](../src/control.ts#L139), [:167](../src/control.ts#L167)). The approver count for refusals and standing approvals is taken from `Control.members`, refreshed at load and at each membership event ([control.ts:344-346](../src/control.ts#L344-L346)).
 
@@ -423,13 +423,16 @@ create(key, fields, standingApprover?):
     stopping                      "The server is stopping."
     control chat lost             lostMessage
     20 actions pending            pendingMessage
-    send card over 15000 bytes    cardTooLong
+    20 actions performing         performingMessage
+    connect: link texts cut to the bytes its largest card leaves
+    send or connect card over 15000 bytes    cardTooLong
     no approver                   no-owner message
   refusal: throw ToolError        counter unchanged
   N = next; next += 1; store; log "Action N: ..."
   post:
     saveCounter(next)
     state pending: card = postCard()
+    either fails: state failed; log "Action N: failed: ERROR."
   after post:
     posted and performing:
       stopping: state = pending
@@ -448,7 +451,7 @@ Outcomes are posted after `done` and `failed` ([actions.ts:239](../src/actions.t
 
 | Aspect | Rule | Code |
 |---|---|---|
-| grant | `/approve CHAT all` from an approver: custom data of CHAT gets `simplexMcp: {approvedBy, approvedById, approvedAt}`, other keys kept; pending sends of CHAT with a card are approved | [control.ts:192-203](../src/control.ts#L192-L203) |
+| grant | `/approve CHAT all` from an approver in mode `requests` (mode `host` stores nothing and replies `Approvals apply in mode requests; this server runs in mode host.`): custom data of CHAT gets `simplexMcp: {approvedBy, approvedById, approvedAt}`, other keys kept; pending sends of CHAT with a card are approved | [control.ts:192-203](../src/control.ts#L192-L203) |
 | removal | `/revoke CHAT`: the `simplexMcp` key is removed, other keys kept | [control.ts:205-211](../src/control.ts#L205-L211) |
 | use | mode `requests`, and `approvedById` equal to the `groupMemberId` of a current approver | [control.ts:113-116](../src/control.ts#L113-L116) |
 | scope | `send` only | [tools.ts:586](../src/tools.ts#L586) |
@@ -493,6 +496,7 @@ Checks in order of the request listener ([http.ts:18-26](../src/http.ts#L18-L26)
 | Origin | absent or empty passes; otherwise the same hostnames, any port | 403, JSON-RPC error | [node index.cjs:74-96](../node_modules/@modelcontextprotocol/node/dist/index.cjs#L74-L96), [server index.cjs:1599-1644](../node_modules/@modelcontextprotocol/server/dist/index.cjs#L1599-L1644) |
 | token | `Authorization` equal to `Bearer <token>`, same length, `timingSafeEqual` | 401, empty body | [http.ts:32-35](../src/http.ts#L32-L35) |
 | path | pathname `/mcp` | 404, empty body | [http.ts:21](../src/http.ts#L21) |
+| start | the owner setup at start has ended | 503, `Retry-After: 1`, empty body | [http.ts:23](../src/http.ts#L23) |
 | body size | 4 MiB | 413 | [node index.cjs:395-401](../node_modules/@modelcontextprotocol/node/dist/index.cjs#L395-L401) |
 | content type of POST | `application/json` | 415 | [server index.cjs:1464-1467](../node_modules/@modelcontextprotocol/server/dist/index.cjs#L1464-L1467) |
 | tool arguments | input schema, Ajv | `isError: true` result | [mcp-BumlNux0.cjs:1812-1817](../node_modules/@modelcontextprotocol/server/dist/mcp-BumlNux0.cjs#L1812-L1817) |
@@ -505,7 +509,7 @@ Node limits: `requestTimeout` 0, `timeout` 0, `headersTimeout` 60 s, `keepAliveT
 - The token is created once and kept in `DATA/token`; `--new-token` replaces it ([files.ts:30-36](../src/files.ts#L30-L36)).
 - `DATA/headers.json` is rewritten at every start ([files.ts:42-44](../src/files.ts#L42-L44)).
 - The Claude Code entry gets the command `cat <DATA>/headers.json`, or `type "<DATA>\headers.json"` on Windows, with the path quoted for the shell ([register.ts:47](../src/register.ts#L47), [log.ts:18-25](../src/log.ts#L18-L25)). Only this command is written to the entry and to the `claude mcp add-json` arguments ([register.test.ts:56](../test/unit/register.test.ts#L56)).
-- File modes 0600 apply when a file is created; the data folder is set to 0700 at every start, except on Windows ([files.ts:12-15](../src/files.ts#L12-L15)).
+- `token`, `headers.json` and `server.json` are set to mode 0600 at every write, and the data folder to 0700 at every start, except on Windows ([files.ts:12-15](../src/files.ts#L12-L15), [:55-58](../src/files.ts#L55-L58)).
 
 ### 6.3 Peer-written text
 
@@ -513,7 +517,8 @@ Node limits: `requestTimeout` 0, `timeout` 0, `headersTimeout` 60 s, `keepAliveT
 |---|---|---|
 | card and reply names | folded to one line; a valid display name is plain, others a code span | [`safeName`](../src/control.ts#L498-L501) |
 | card text lines | one code span per line; backticks become `'`; a leading or trailing space becomes U+00A0; blank lines empty | [`codeLines`, `codeSpan`](../src/control.ts#L490-L496) |
-| reply quote on a send card | whitespace runs to one space, first 100 UTF-16 units, one code span | [control.ts:450](../src/control.ts#L450) |
+| reply quote on a send card | whitespace runs to one space, first 100 characters (code points), one code span | [control.ts:450](../src/control.ts#L450) |
+| link texts on a connect card | code span lines in the bytes that the largest card form leaves; the line that does not fit is cut and ends in `…` inside its code span; later lines left out | [control.ts:508-522](../src/control.ts#L508-L522) |
 | mention names | valid name: `@name` or `@'name'`; others a code span | [`mentionText`](../src/control.ts#L503-L506) |
 | errors on cards | folded to one line, one code span | [control.ts:430](../src/control.ts#L430) |
 | `--owners` part of restart lines in the chat | one code span | [control.ts:65](../src/control.ts#L65), [:589-591](../src/control.ts#L589-L591) |
@@ -554,9 +559,10 @@ The server writes the tappable form `/'...'` only in the card's command line, `/
 | Limit | Value | Code |
 |---|---|---|
 | pending actions | 20 | [actions.ts:10](../src/actions.ts#L10) |
+| actions being performed | 20 | [actions.ts:11](../src/actions.ts#L11) |
 | expiry | 1 to 23 h, default 23 | [cli.ts:79](../src/cli.ts#L79) |
 | connect wait for the other side | `created + 23 h 50 min` | [tools.ts:112](../src/tools.ts#L112) |
-| send card | 15000 bytes JSON-escaped, in its largest form | [control.ts:17](../src/control.ts#L17), [:476-484](../src/control.ts#L476-L484) |
+| send and connect card | 15000 bytes JSON-escaped, in its largest form | [control.ts:17](../src/control.ts#L17), [:476-484](../src/control.ts#L476-L484) |
 | error assumed in the largest card | 600 × `€` | [control.ts:18](../src/control.ts#L18) |
 | `send.text` | 1 to 12000 characters | [tools.ts:184](../src/tools.ts#L184) |
 | `connect.message` | 1 to 2000 characters | [tools.ts:172](../src/tools.ts#L172) |
@@ -565,9 +571,9 @@ The server writes the tappable form `/'...'` only in the card's command line, `/
 | `idle` | 1 to 300 s, default 30 | [tools.ts:174](../src/tools.ts#L174), [:188](../src/tools.ts#L188), [:115](../src/tools.ts#L115) |
 | `limit` | 1 to 100, default 50 | [tools.ts:189](../src/tools.ts#L189), [:200](../src/tools.ts#L200), [:116](../src/tools.ts#L116) |
 | `connect` snapshot | last 50 items | [tools.ts:117](../src/tools.ts#L117) |
-| collected items per action or call | 100, then counted as overflow | [messages.ts:7](../src/messages.ts#L7), [:78-79](../src/messages.ts#L78-L79) |
+| collected items per action or call | 100, then their IDs kept as overflow until deleted | [messages.ts:7](../src/messages.ts#L7), [:78-79](../src/messages.ts#L78-L79) |
 | unread page | 100 items | [messages.ts:6](../src/messages.ts#L6) |
-| chat list page | 100 chats | [tools.ts:111](../src/tools.ts#L111) |
+| chat list read | one command, `count=1000000` | [tools.ts:111](../src/tools.ts#L111) |
 | error details | 500 characters | [log.ts:5](../src/log.ts#L5) |
 | progress interval | 60 s | [messages.ts:4](../src/messages.ts#L4) |
 | expiry tick | 60 s | [actions.ts:9](../src/actions.ts#L9) |
diff --git a/packages/simplex-chat-mcp/spec/flows.md b/packages/simplex-chat-mcp/spec/flows.md
index 6b39a8b6df..945964fc2c 100644
--- a/packages/simplex-chat-mcp/spec/flows.md
+++ b/packages/simplex-chat-mcp/spec/flows.md
@@ -54,7 +54,6 @@ sequenceDiagram
   S->>P: version line, data folder, approval mode
   S->>C: /user (no active user)
   S->>C: /_create user {"profile":{"displayName":"My Agent","fullName":"","peerType":"bot"},...}
-  S->>S: server.json
   S->>C: /network socks=off smp-proxy=always smp-proxy-fallback=protected
   S->>C: startChat, events buffered
   S->>C: /_groups USER (no control marker)
@@ -63,7 +62,8 @@ sequenceDiagram
   S->>P: Agent control chat "My Agent" created.
   S->>K: load
   K->>C: /_members #G
-  S->>S: HTTP listens on 127.0.0.1:5226
+  S->>S: HTTP listens on 127.0.0.1:5226, /mcp answers 503 until the owner setup ends
+  S->>S: server.json
   K->>C: /_delete link #G (groupLinkNotFound ignored)
   K->>C: /_create link #G member
   K->>P: join line, QR code, link, QR hint, owner line
@@ -497,6 +497,8 @@ Notes:
 - The interrupted card line is `DECIDER; interrupted: the server stopped.` ([control.ts:426](../src/control.ts#L426)).
 - A host-mode action whose counter is being written at the stop is set to `pending` and cancelled without a perform ([actions.ts:226](../src/actions.ts#L226), [actions.test.ts:380-391](../test/unit/actions.test.ts#L380-L391)).
 - After a crash, the cards of that run are left with their commands; `/approve` of their numbers gets the reply `Action N is not pending.` ([control.ts:182](../src/control.ts#L182)).
+- The stop signal of the performs is aborted after the actions are marked interrupted: a `connect` waiting for its connection ends, and an interrupted perform logs no line ([actions.ts:218](../src/actions.ts#L218), [:252](../src/actions.ts#L252), [tools.ts:507-509](../src/tools.ts#L507-L509)).
+- An error of a `/sql` query of the delivery wait is logged as `delivery wait: ERROR` on stderr and ends the wait ([serve.ts:185](../src/serve.ts#L185)).
 
 Source: [serve.ts:48-62](../src/serve.ts#L48-L62), [:150-176](../src/serve.ts#L150-L176), [actions.ts:200-209](../src/actions.ts#L200-L209), [http.ts:46-50](../src/http.ts#L46-L50), [control.ts:421-426](../src/control.ts#L421-L426).
 
@@ -536,7 +538,7 @@ sequenceDiagram
 Notes:
 
 - Until the restart with a list, new actions are refused: `The agent has no approving owner. ...` ([control.ts:108-110](../src/control.ts#L108-L110)).
-- An entry must match a human by member ID and display name, or the server exits with code 2 ([control.ts:249-253](../src/control.ts#L249-L253)).
+- An entry must match a human by member ID and display name, folded to one line as the restart line prints it, or the server exits with code 2 ([control.ts:249-253](../src/control.ts#L249-L253)).
 - With `--reset-owners`, the server deletes the control chat for all members and creates a new one with the same counter; the CLI refuses the option with an `--owners` list ([control.ts:387-392](../src/control.ts#L387-L392), [cli.ts:97-99](../src/cli.ts#L97-L99)).
 - When a listed owner leaves and none remains: `... is no longer an owner. No owners remain: restart the server with --reset-owners --owners` ([control.ts:288-293](../src/control.ts#L288-L293)).
 
diff --git a/packages/simplex-chat-mcp/src/actions.ts b/packages/simplex-chat-mcp/src/actions.ts
index 33c627b73f..8cba24146f 100644
--- a/packages/simplex-chat-mcp/src/actions.ts
+++ b/packages/simplex-chat-mcp/src/actions.ts
@@ -8,10 +8,12 @@ export type State = "pending" | "performing" | "done" | "failed" | "rejected" |
 const progressTick = 60_000
 const expiryTick = 60_000
 const maxPending = 20
+const maxPerforming = 20
 
 export const lostMessage = "The agent lost its control chat. The person who runs it has to restart it with --reset-owners."
 export const stoppingMessage = "The server is stopping."
 const pendingMessage = `${maxPending} actions are pending; wait for the owner's decisions.`
+const performingMessage = `${maxPerforming} actions are being performed; wait for their results.`
 
 export class ToolError extends Error {}
 
@@ -57,6 +59,7 @@ export interface ConnectAction extends ActionRecord {
   connectedAt?: number
   startedAt?: number
   connectUntil?: number
+  linkTextBytes?: number
 }
 
 export interface SendAction extends ActionRecord {
@@ -86,13 +89,14 @@ export interface ActionHooks {
   refusal(action: Action): string | undefined
   saveCounter(next: number): Promise<void>
   postCard(action: Action): Promise<number>
-  perform(action: Action): Promise<void>
+  perform(action: Action, signal: AbortSignal): Promise<void>
   outcome(action: Action): Promise<void>
 }
 
 export class Actions {
   lost = false
   private stopping = false
+  private readonly abortPerforms = new AbortController()
   private readonly actions = new Map<number, Action>()
   private readonly expiry = setInterval(() => this.expireDue(), expiryTick).unref()
   private readonly posting = new Map<number, Promise<boolean>>()
@@ -112,6 +116,10 @@ export class Actions {
     return this.all().filter(({state}) => state === "pending")
   }
 
+  private performing(): Action[] {
+    return this.all().filter(({state}) => state === "performing")
+  }
+
   find(key: string): Action | undefined {
     return this.all().find(action => action.key === key)
   }
@@ -133,7 +141,11 @@ export class Actions {
       interrupted: false,
     }
     const action = {...fields, ...record} as Action
-    const refusal = this.stopping ? stoppingMessage : this.lost ? lostMessage : this.pending().length >= maxPending ? pendingMessage : this.hooks.refusal(action)
+    const refusal = this.stopping ? stoppingMessage
+      : this.lost ? lostMessage
+      : this.pending().length >= maxPending ? pendingMessage
+      : this.performing().length >= maxPerforming ? performingMessage
+      : this.hooks.refusal(action)
     if (refusal !== undefined) throw new ToolError(refusal)
     this.next++
     this.actions.set(n, action)
@@ -203,6 +215,7 @@ export class Actions {
     await Promise.all(this.posting.values())
     const stopped = this.all().filter(({state}) => state === "pending" || state === "performing")
     for (const action of stopped) action.interrupted = true
+    this.abortPerforms.abort()
     if (!this.lost) await Promise.all(stopped.map(action => this.hooks.outcome(action).catch(error => logError(`action ${action.n} card`, error))))
     await Promise.allSettled(this.outcomes)
     return stopped.length
@@ -216,6 +229,7 @@ export class Actions {
     } catch (error) {
       action.error = errorText(error)
       this.decide(action, "failed")
+      log(`Action ${action.n}: failed: ${oneLine(action.error)}.`)
       return false
     }
   }
@@ -229,14 +243,15 @@ export class Actions {
 
   private async runPerform(action: Action): Promise<void> {
     try {
-      await this.hooks.perform(action)
+      await this.hooks.perform(action, this.abortPerforms.signal)
       this.decide(action, "done")
     } catch (error) {
       action.error = errorText(error)
       this.decide(action, "failed")
     }
+    if (action.interrupted) return
     log(`Action ${action.n}${this.mode === "host" ? ":" : ` approved by ${action.decidedBy}:`} ${performedText(action, this.mode)}`)
-    if (!action.interrupted && !this.lost) await this.postOutcome(action)
+    if (!this.lost) await this.postOutcome(action)
   }
 
   private decide(action: Action, state: State): void {
diff --git a/packages/simplex-chat-mcp/src/cli.ts b/packages/simplex-chat-mcp/src/cli.ts
index c03411e8d6..b03846c998 100644
--- a/packages/simplex-chat-mcp/src/cli.ts
+++ b/packages/simplex-chat-mcp/src/cli.ts
@@ -73,7 +73,7 @@ function serveOptions(name: string, options: OptionReader, home: string): ServeO
         serve.approve = approveMode(options.value(option))
         break
       case "--owners":
-        serve.owners = options.optionalValue() === undefined ? [] : options.value(option).split(",").map(ownerEntry)
+        serve.owners = options.optionalValue() === undefined ? [] : options.value(option).split(/,(?=[1-9]\d*:)/).map(ownerEntry)
         break
       case "--expire":
         serve.expireHours = integer(option, options.value(option), 1, 23, "hours from 1 to 23")
diff --git a/packages/simplex-chat-mcp/src/control.ts b/packages/simplex-chat-mcp/src/control.ts
index 5c38a4e1f4..b39bd86e78 100644
--- a/packages/simplex-chat-mcp/src/control.ts
+++ b/packages/simplex-chat-mcp/src/control.ts
@@ -1,7 +1,7 @@
 import {ChatEvent, T} from "@simplex-chat/types"
 import * as qrcode from "qrcode"
 import {api} from "simplex-chat"
-import {Action, ActionHooks, Actions, Subject, ToolError, leaveVerbs, subjectText, summary} from "./actions"
+import {Action, ActionHooks, Actions, ConnectAction, Subject, ToolError, leaveVerbs, subjectText, summary} from "./actions"
 import {ExitError, chatErrorOf, log, logError, oneLine, shellWord} from "./log"
 import {chatNumber, chatRef, isChatRef, utcMinutes, validName, viewName} from "./messages"
 import type {OwnerEntry, QrCodeSize} from "./serve"
@@ -13,7 +13,7 @@ const controlCommands: T.ChatBotCommand[] = [
 ]
 
 const commandsReply = "Commands: /approve, /reject, /revoke, /pending, /list. Each card shows its commands."
-const cardTooLong = "text: too long for its approval card; shorten it."
+const cardTooLong = {send: "text: too long for its approval card; shorten it.", connect: "message: too long for its approval card; shorten it."}
 const maxCardLength = 15_000
 const listedChats = 100
 const maxLineLength = 100
@@ -106,7 +106,10 @@ export class Control implements Pick<ActionHooks, "refusal" | "saveCounter" | "p
   }
 
   refusal(action: Action): string | undefined {
-    if (action.tool === "send" && largestCard(action, this.actions.mode, this.longestApproverName()) > maxCardLength) return cardTooLong
+    const {mode} = this.actions
+    const approver = this.longestApproverName()
+    if (action.tool === "connect") action.linkTextBytes = maxCardLength - largestCard({...action, linkTextBytes: 0}, mode, approver)
+    if (action.tool !== "leave" && largestCard(action, mode, approver) > maxCardLength) return cardTooLong[action.tool]
     if (this.approvers().length > 0) return undefined
     return this.options.owners === undefined
       ? "The agent has no owner. The person who runs it has to join its control chat with the link the server printed."
@@ -176,6 +179,7 @@ export class Control implements Pick<ActionHooks, "refusal" | "saveCounter" | "p
       case "list":
         return this.chatsText()
       case "approveChat":
+        if (this.actions.mode === "host") return "Approvals apply in mode requests; this server runs in mode host."
         return this.approveChat(sender, request.chat)
       case "revoke":
         return this.revoke(request.chat)
@@ -219,7 +223,7 @@ export class Control implements Pick<ActionHooks, "refusal" | "saveCounter" | "p
       const approvedBy = this.standingApprover(chatInfo)
       const approval = approvedBy === undefined ? "" : `, approved for this chat by ${approvedBy}`
       const connection = isConnected(chatInfo) ? "" : ", not connected"
-      return truncatedLine(`${chatRef(chatInfo)}  ${chatName(chatSubject(chatInfo))}${approval}${connection}`)
+      return truncatedLine(`${chatRef(chatInfo)}  ${chatName(chatSubject(chatInfo))}${approval}${connection}`, maxLineLength)
     })
     const rest = chats.length - lines.length
     if (rest > 0) lines.push(`${rest} older chat${rest === 1 ? " is" : "s are"} not shown.`)
@@ -253,7 +257,7 @@ export class Control implements Pick<ActionHooks, "refusal" | "saveCounter" | "p
   private async startListed(owners: OwnerEntry[]): Promise<void> {
     const humans = this.humans()
     const listed = owners.map(owner => {
-      const member = humans.find(({groupMemberId, memberProfile}) => groupMemberId === owner.memberId && memberProfile.displayName === owner.name)
+      const member = humans.find(human => listsMember(owner, human))
       if (!member) throw new ExitError(`--owners: member ${entryText(owner)} is not in the agent control chat. Start with --reset-owners --owners, or use the IDs of current members.`, 2)
       return member
     })
@@ -446,14 +450,14 @@ function requestLines(action: Action): string[] {
   const subject = subjectText(action.subject, safeName)
   switch (action.tool) {
     case "connect": {
-      const {plan, input} = action
+      const {input} = action
       const verb = !done ? "I want to connect" : action.connected ? "I connected" : "I asked to connect"
       const message = input.message === undefined ? [] : ["With the message:", ...codeLines(input.message)]
-      return [`${verb} to ${subject}, ${action.subject.incognito ? "incognito" : "as myself"}.`, ...codeLines(plan.description), ...codeLines(plan.welcome), ...message]
+      return [`${verb} to ${subject}, ${action.subject.incognito ? "incognito" : "as myself"}.`, ...linkLines(action), ...message]
     }
     case "send": {
       const {replyTo, mentions} = action
-      const reply = replyTo === undefined ? [] : [`replying to ${safeName(replyTo.from)}: ${codeSpan(replyTo.text.replace(/\s+/g, " ").slice(0, 100))}`]
+      const reply = replyTo === undefined ? [] : [`replying to ${safeName(replyTo.from)}: ${codeSpan([...replyTo.text.replace(/\s+/g, " ")].slice(0, 100).join(""))}`]
       const mentioning = mentions.length === 0 ? [] : [`mentioning ${mentions.map(({name}) => mentionText(name)).join(", ")}`]
       return [`${done ? "I sent" : "I want to send"} a message to ${subject}${action.subject.incognito ? ", where I am incognito" : ""}:`, ...codeLines(action.input.text), ...reply, ...mentioning]
     }
@@ -489,18 +493,34 @@ function encodedLength(text: string): number {
   return [...text].reduce((length, c) => length + (/["\\\n\r\t]/.test(c) ? 2 : c < " " ? 6 : Buffer.byteLength(c)), 0)
 }
 
-function truncatedLine(line: string): string {
-  if (encodedLength(line) <= maxLineLength) return line
+function truncatedLine(line: string, maxLength: number): string {
+  if (encodedLength(line) <= maxLength) return line
   let length = encodedLength(truncationMark)
   let kept = ""
   for (const c of line) {
     length += encodedLength(c)
-    if (length > maxLineLength) break
+    if (length > maxLength) break
     kept += c
   }
   return `${kept}${truncationMark}`
 }
 
+function linkLines({plan, linkTextBytes = Infinity}: ConnectAction): string[] {
+  const lines: string[] = []
+  let left = linkTextBytes
+  for (const line of [...codeLines(plan.description), ...codeLines(plan.welcome)]) {
+    const length = encodedLength(`\n${line}`)
+    if (length > left) {
+      const room = left - encodedLength("\n``")
+      if (room >= encodedLength(truncationMark)) lines.push(`\`${truncatedLine(line.slice(1, -1), room)}\``)
+      break
+    }
+    lines.push(line)
+    left -= length
+  }
+  return lines
+}
+
 function chatName(subject: Subject): string {
   return subjectText({...subject, simplexName: undefined}, safeName)
 }
@@ -581,7 +601,7 @@ function isLost({membership}: T.GroupInfo): boolean {
 }
 
 function listsMember({memberId, name}: OwnerEntry, member: T.GroupMember): boolean {
-  return member.groupMemberId === memberId && member.memberProfile.displayName === name
+  return member.groupMemberId === memberId && oneLine(member.memberProfile.displayName) === name
 }
 
 function sameMember(member: T.GroupMember): (other: T.GroupMember) => boolean {
diff --git a/packages/simplex-chat-mcp/src/files.ts b/packages/simplex-chat-mcp/src/files.ts
index d5c6307e1d..063dccaf51 100644
--- a/packages/simplex-chat-mcp/src/files.ts
+++ b/packages/simplex-chat-mcp/src/files.ts
@@ -18,9 +18,9 @@ export function acquireLock(dir: string): void {
   const file = join(dir, "lock")
   if (createLock(file)) return
   const pid = lockPid(file)
-  if (pid !== undefined && pid !== process.pid && isRunning(pid)) throw new ExitError(`Another server uses ${dir} (PID ${pid}).`, 1)
+  if (pid !== undefined && pid !== process.pid && isRunning(pid)) throw lockedError(dir, file, pid)
   unlinkSync(file)
-  if (!createLock(file)) throw new ExitError(`Another server uses ${dir} (PID ${lockPid(file)}).`, 1)
+  if (!createLock(file)) throw lockedError(dir, file, lockPid(file))
 }
 
 export function releaseLock(dir: string): void {
@@ -31,7 +31,7 @@ export function serverToken(dir: string, renew: boolean): string {
   const file = join(dir, "token")
   if (!renew && existsSync(file)) return readFileSync(file, "utf8").trim()
   const token = randomBytes(32).toString("base64url")
-  writeFileSync(file, `${token}\n`, {mode: 0o600})
+  writePrivateFile(file, `${token}\n`)
   return token
 }
 
@@ -40,11 +40,11 @@ export function headersFile(dir: string): string {
 }
 
 export function writeHeadersFile(dir: string, token: string): void {
-  writeFileSync(headersFile(dir), `${JSON.stringify({Authorization: `Bearer ${token}`})}\n`, {mode: 0o600})
+  writePrivateFile(headersFile(dir), `${JSON.stringify({Authorization: `Bearer ${token}`})}\n`)
 }
 
 export function writeServerFile(dir: string, server: ServerFile): void {
-  writeFileSync(join(dir, "server.json"), `${JSON.stringify(server)}\n`, {mode: 0o600})
+  writePrivateFile(join(dir, "server.json"), `${JSON.stringify(server)}\n`)
 }
 
 export function readServerFile(dir: string): ServerFile | undefined {
@@ -52,6 +52,15 @@ export function readServerFile(dir: string): ServerFile | undefined {
   return existsSync(file) ? JSON.parse(readFileSync(file, "utf8")) : undefined
 }
 
+function writePrivateFile(file: string, text: string): void {
+  writeFileSync(file, text, {mode: 0o600})
+  if (process.platform !== "win32") chmodSync(file, 0o600)
+}
+
+function lockedError(dir: string, file: string, pid: number | undefined): ExitError {
+  return new ExitError(`Another server uses ${dir} (PID ${pid}). If no server runs, remove ${file}.`, 1)
+}
+
 function createLock(file: string): boolean {
   try {
     writeFileSync(file, `${process.pid}\n`, {flag: "wx", mode: 0o600})
diff --git a/packages/simplex-chat-mcp/src/http.ts b/packages/simplex-chat-mcp/src/http.ts
index 2952ba77bb..df6209c562 100644
--- a/packages/simplex-chat-mcp/src/http.ts
+++ b/packages/simplex-chat-mcp/src/http.ts
@@ -8,9 +8,10 @@ export interface HttpOptions {
   port: number
   token: string
   factory: McpServerFactory
+  ready: () => boolean
 }
 
-export function startHttp({port, token, factory}: HttpOptions): Promise<Server> {
+export function startHttp({port, token, factory, ready}: HttpOptions): Promise<Server> {
   const expectedAuthorization = Buffer.from(`Bearer ${token}`)
   const validHost = localhostHostValidation()
   const validOrigin = localhostOriginValidation()
@@ -19,6 +20,7 @@ export function startHttp({port, token, factory}: HttpOptions): Promise<Server>
     if (!validHost(req, res) || !validOrigin(req, res)) return
     if (!authorized(req.headers.authorization)) return plain(res, 401)
     if (requestPath(req.url) !== "/mcp") return plain(res, 404)
+    if (!ready()) return plain(res, 503, {"Retry-After": "1"})
     mcp(req, res).catch(error => {
       logError("HTTP request", error)
       res.destroy()
@@ -57,7 +59,7 @@ function requestPath(target: string | undefined): string | undefined {
   }
 }
 
-function plain(res: ServerResponse, status: number): void {
-  res.writeHead(status)
+function plain(res: ServerResponse, status: number, headers: {[name: string]: string} = {}): void {
+  res.writeHead(status, headers)
   res.end()
 }
diff --git a/packages/simplex-chat-mcp/src/messages.ts b/packages/simplex-chat-mcp/src/messages.ts
index f04ce3a167..b5745ecb36 100644
--- a/packages/simplex-chat-mcp/src/messages.ts
+++ b/packages/simplex-chat-mcp/src/messages.ts
@@ -34,7 +34,7 @@ export interface ToolCall {
 export class Collected {
   readonly items: T.AChatItem[] = []
   readonly changes = new Changes()
-  overflow = 0
+  readonly overflow = new Set<number>()
   lastAt?: number
 }
 
@@ -71,12 +71,15 @@ export class ChatItemsWatch {
   collect(chat: string, collected: Collected, accepts: (item: T.ChatItem) => boolean = () => true): () => void {
     return this.listen(chat, (item, change) => {
       if (item.chatItem.content.type !== "rcvMsgContent" || !accepts(item.chatItem)) return
-      const i = collected.items.findIndex(({chatItem}) => chatItem.meta.itemId === item.chatItem.meta.itemId)
-      if (change !== "new" && i < 0) return
-      if (change === "deleted") collected.items.splice(i, 1)
+      const {itemId} = item.chatItem.meta
+      const i = collected.items.findIndex(({chatItem}) => chatItem.meta.itemId === itemId)
+      const overflowDeleted = change === "deleted" && collected.overflow.has(itemId)
+      if (change !== "new" && i < 0 && !overflowDeleted) return
+      if (overflowDeleted) collected.overflow.delete(itemId)
+      else if (change === "deleted") collected.items.splice(i, 1)
       else if (i >= 0) collected.items[i] = item
       else if (collected.items.length < maxCollected) collected.items.push(item)
-      else collected.overflow++
+      else collected.overflow.add(itemId)
       collected.lastAt = Date.now()
       collected.changes.notify()
     })
@@ -180,8 +183,7 @@ export async function markRead(chat: api.ChatApi, ref: string, itemIds: number[]
   if (itemIds.length > 0) await chatCommand(chat, `/_read chat items ${ref} ${itemIds.join(",")}`, "itemsReadForChat")
 }
 
-export async function unreadItems(chat: api.ChatApi, ref: string, messages: number): Promise<{chatInfo: T.ChatInfo; items: T.ChatItem[]; unreadRest: number}> {
-  const {chatInfo, chatStats} = await getChat(chat, ref, "initial=1")
+export async function unreadItems(chat: api.ChatApi, ref: string, {chatInfo, chatStats}: T.AChat, messages: number): Promise<{chatInfo: T.ChatInfo; items: T.ChatItem[]; unreadRest: number}> {
   if (chatStats.unreadCount === 0) return {chatInfo, items: [], unreadRest: 0}
   const items = (await getChat(chat, ref, `around=${chatStats.minUnreadItemId} count=0`)).chatItems
   for (let last = items.at(-1); last !== undefined && items.filter(isNewMessage).length < messages;) {
diff --git a/packages/simplex-chat-mcp/src/register.ts b/packages/simplex-chat-mcp/src/register.ts
index 809af50dc7..b03b2fa581 100644
--- a/packages/simplex-chat-mcp/src/register.ts
+++ b/packages/simplex-chat-mcp/src/register.ts
@@ -4,6 +4,9 @@ import {basename, dirname, join, resolve} from "path"
 import {headersFile, readServerFile} from "./files"
 import {ExitError, shellPath} from "./log"
 
+const cmdNotFound = 9009
+const cmdMetaChars = /([()\][%!^"`<>&|;, *?])/g
+
 export type Scope = "user" | "local"
 
 export interface RegisterOptions {
@@ -83,5 +86,16 @@ function repositoryRoot(root: string): string {
 function runCommand(command: string, args: string[]): RunResult {
   const result = spawnSync(command, args, {encoding: "utf8"})
   const missing = (result.error as NodeJS.ErrnoException | undefined)?.code === "ENOENT"
+  if (missing && process.platform === "win32") return runInCmd(command, args)
   return {missing, status: result.status, stderr: result.stderr ?? ""}
 }
+
+function runInCmd(command: string, args: string[]): RunResult {
+  const result = spawnSync([command, ...args.map(cmdArgument)].join(" "), {encoding: "utf8", shell: true})
+  return {missing: result.status === cmdNotFound, status: result.status, stderr: result.stderr ?? ""}
+}
+
+export function cmdArgument(arg: string): string {
+  const quoted = `"${arg.replace(/(\\*)"/g, '$1$1\\"').replace(/(\\*)$/, "$1$1")}"`
+  return quoted.replace(cmdMetaChars, "^$1").replace(cmdMetaChars, "^$1")
+}
diff --git a/packages/simplex-chat-mcp/src/serve.ts b/packages/simplex-chat-mcp/src/serve.ts
index 3805181e15..216085dbdc 100644
--- a/packages/simplex-chat-mcp/src/serve.ts
+++ b/packages/simplex-chat-mcp/src/serve.ts
@@ -87,7 +87,6 @@ export async function startServer(options: ServeOptions): Promise<RunningServer>
 async function startAgent(chat: api.ChatApi, options: ServeOptions, token: string): Promise<RunningServer> {
   const {name, data, port, approve, expireHours} = options
   const created = (await chat.apiGetActiveUser()) ?? (await chat.apiCreateActiveUser({displayName: options.displayName ?? name, fullName: "", peerType: T.ChatPeerType.Agent}))
-  writeServerFile(data, {name, port, expireHours})
   await chatCommand(chat, "/network socks=off smp-proxy=always smp-proxy-fallback=protected", "networkConfig")
   const events = bufferEvents(chat)
   await chat.startChat()
@@ -99,7 +98,7 @@ async function startAgent(chat: api.ChatApi, options: ServeOptions, token: strin
     saveCounter: next => control.saveCounter(next),
     postCard: action => control.postCard(action),
     outcome: action => control.outcome(action),
-    perform: action => tools.perform(action),
+    perform: (action, signal) => tools.perform(action, signal),
   })
   const watch = new ChatItemsWatch()
   const tools = new AgentTools({chat, user, actions, watch, controlChat: () => control.chatRef, standingApprover: chatInfo => control.standingApprover(chatInfo)}, approve)
@@ -110,13 +109,16 @@ async function startAgent(chat: api.ChatApi, options: ServeOptions, token: strin
     tools.register(mcp)
     return mcp
   }
-  const server = await listen(port, token, factory)
+  let started = false
+  const server = await listen(port, token, factory, () => started)
+  writeServerFile(data, {name, port, expireHours})
   try {
     await control.start()
   } catch (error) {
     await stopHttp(server)
     throw error
   }
+  started = true
   log(`Listening on http://127.0.0.1:${port}/mcp`)
   let controlEvents = Promise.resolve()
   let stopped = false
@@ -165,7 +167,7 @@ export function registerHint({name, data, dataGiven}: ServeOptions): string {
   return `Add the agent to Claude Code:\n  npx -y @simplex-chat/mcp register ${name}${dataGiven ? ` --data ${shellPath(data)}` : ""}`
 }
 
-async function deliveries(chat: api.ChatApi, groupId: number): Promise<void> {
+export async function deliveries(chat: api.ChatApi, groupId: number): Promise<void> {
   const connIds = (await sqlRows(chat, `/sql chat SELECT hex(agent_conn_id) FROM connections WHERE group_member_id IN (SELECT group_member_id FROM group_members WHERE group_id = ${groupId})`)).slice(1)
   if (connIds.length === 0) return
   const pending = `/sql agent SELECT count(*) FROM snd_message_deliveries WHERE failed = 0 AND hex(conn_id) IN (${connIds.map(id => `'${id}'`).join(",")})`
@@ -179,7 +181,8 @@ async function sqlRows(chat: api.ChatApi, query: string): Promise<string[]> {
   try {
     const {rows} = (await chat.sendChatCmd(query)) as unknown as {rows?: string[]}
     return rows ?? []
-  } catch {
+  } catch (error) {
+    logError("delivery wait", error)
     return []
   }
 }
@@ -198,9 +201,9 @@ async function controlGroup(chat: api.ChatApi, userId: number, displayName: stri
   return resetOwners ? resetControlChat(chat, userId, group, displayName, nextAction) : group
 }
 
-async function listen(port: number, token: string, factory: McpServerFactory): Promise<Server> {
+async function listen(port: number, token: string, factory: McpServerFactory, ready: () => boolean): Promise<Server> {
   try {
-    return await startHttp({port, token, factory})
+    return await startHttp({port, token, factory, ready})
   } catch (error) {
     if ((error as NodeJS.ErrnoException).code === "EADDRINUSE") throw new ExitError(`Port ${port} is in use. Start with --port N.`, 1)
     throw error
diff --git a/packages/simplex-chat-mcp/src/tools.ts b/packages/simplex-chat-mcp/src/tools.ts
index fad2a8fc9c..a568e11008 100644
--- a/packages/simplex-chat-mcp/src/tools.ts
+++ b/packages/simplex-chat-mcp/src/tools.ts
@@ -108,7 +108,7 @@ type Schema = {[key: string]: unknown}
 
 type ToolName = "connect" | "send" | "receive" | "list" | "leave"
 
-const chatsPage = 100
+const maxChats = 1_000_000
 const editWindow = 24 * 3_600_000 - 10 * 60_000
 const connectWait = 60
 const sendWait = 60
@@ -373,10 +373,10 @@ export class AgentTools {
     }
   }
 
-  async perform(action: Action): Promise<void> {
+  async perform(action: Action, signal: AbortSignal): Promise<void> {
     switch (action.tool) {
       case "connect":
-        return this.performConnect(action)
+        return this.performConnect(action, signal)
       case "send":
         return this.performSend(action)
       case "leave":
@@ -449,7 +449,7 @@ export class AgentTools {
     if (action.connected && startedAt !== undefined) {
       const {wait = connectWait, idle = defaultIdle} = input
       const deadline = startedAt + wait * 1000
-      const stopProgress = reportProgress(call, () => `${action.messages.items.length + action.messages.overflow} messages in ${chat}; waiting until ${utcMinutes(deadline)}.`)
+      const stopProgress = reportProgress(call, () => `${action.messages.items.length + action.messages.overflow.size} messages in ${chat}; waiting until ${utcMinutes(deadline)}.`)
       const finished = await awaitResponses(action.messages, deadline, idle, call).finally(stopProgress)
       if (!finished) return undefined
     }
@@ -477,7 +477,7 @@ export class AgentTools {
     return classifyPlan(r, input)
   }
 
-  private async performConnect(action: ConnectAction): Promise<void> {
+  private async performConnect(action: ConnectAction, signal: AbortSignal): Promise<void> {
     const {input} = action
     action.startedAt = Date.now()
     action.connectUntil = Math.min(action.startedAt + (input.wait ?? connectWait) * 1000, action.created + editWindow)
@@ -504,9 +504,8 @@ export class AgentTools {
       this.markConnected(action, action.chat)
       return
     }
-    const never = new AbortController().signal
     for (let remaining = action.connectUntil - Date.now(); !action.connected && remaining > 0; remaining = action.connectUntil - Date.now()) {
-      await nextChange(action.changes, never, remaining)
+      if (!(await nextChange(action.changes, signal, remaining))) break
     }
     action.connected ??= false
   }
@@ -594,7 +593,7 @@ export class AgentTools {
       const {wait = sendWait, idle = defaultIdle, limit = defaultLimit} = input
       const start = doneAtCall ? Date.now() : action.sentAt!
       const deadline = start + wait * 1000
-      const stopProgress = reportProgress(call, () => `${action.responses.items.length + action.responses.overflow} responses in ${action.chat}; waiting until ${utcMinutes(deadline)}.`)
+      const stopProgress = reportProgress(call, () => `${action.responses.items.length + action.responses.overflow.size} responses in ${action.chat}; waiting until ${utcMinutes(deadline)}.`)
       const finished = await awaitResponses(action.responses, deadline, idle, call).finally(stopProgress)
       if (!finished || call.signal.aborted) return undefined
       const returned = action.responses.items.filter(({chatItem}) => !isLive(chatItem)).slice(0, limit)
@@ -603,7 +602,7 @@ export class AgentTools {
         chat: action.chat,
         item: action.item,
         responses: returned.map(({chatInfo, chatItem}) => toMessage(chatInfo, chatItem, {name: ""})),
-        more: action.responses.items.length - returned.length + action.responses.overflow,
+        more: action.responses.items.length - returned.length + action.responses.overflow.size,
       }
     })
   }
@@ -657,9 +656,10 @@ export class AgentTools {
     const arrived = new Collected()
     const stop = this.agent.watch.collect(chat, arrived)
     try {
-      const {chatInfo, items, unreadRest} = await unreadItems(this.agent.chat, chat, limit + 1).catch(error => {
+      const initial = await getChat(this.agent.chat, chat, "initial=1").catch(error => {
         throw chatErrorOf(error)?.type === "errorStore" ? unknownChat(chat) : error
       })
+      const {chatInfo, items, unreadRest} = await unreadItems(this.agent.chat, chat, initial, limit + 1)
       const unread = items.filter(({content}) => content.type === "rcvMsgContent").map(chatItem => arrived.items.find(copy => copy.chatItem.meta.itemId === chatItem.meta.itemId) ?? {chatInfo, chatItem})
       const skipped = items.filter(({content}) => content.type !== "rcvMsgContent").map(({meta}) => meta.itemId)
       const later = arrived.items.filter(a => !unread.some(u => u.chatItem.meta.itemId === a.chatItem.meta.itemId))
@@ -680,7 +680,7 @@ export class AgentTools {
       if (call.signal.aborted) return undefined
       await markRead(this.agent.chat, chat, [...returned.map(({chatItem}) => chatItem.meta.itemId), ...skipped])
       if (call.signal.aborted) return undefined
-      return {chat, messages: returned.map(({chatInfo, chatItem}): Message => toMessage(chatInfo, chatItem, {name: ""})), more: arrived.items.length - returned.length + arrived.overflow + unreadRest}
+      return {chat, messages: returned.map(({chatInfo, chatItem}): Message => toMessage(chatInfo, chatItem, {name: ""})), more: arrived.items.length - returned.length + arrived.overflow.size + unreadRest}
     } finally {
       stop()
     }
@@ -699,13 +699,7 @@ export class AgentTools {
   async agentChats(): Promise<T.AChat[]> {
     const {userId} = this.agent.user
     const control = this.agent.controlChat()
-    const chats: T.AChat[] = []
-    for (let page = "count=" + chatsPage; page !== "";) {
-      const {chats: previews} = await chatCommand<{chats: T.AChat[]}>(this.agent.chat, `/_get chats ${userId} pcc=off ${page}`, "apiChats")
-      chats.push(...previews)
-      const last = previews.at(-1)
-      page = previews.length === chatsPage && last !== undefined ? `before=${chatTs(last.chatInfo)} count=${chatsPage}` : ""
-    }
+    const {chats} = await chatCommand<{chats: T.AChat[]}>(this.agent.chat, `/_get chats ${userId} pcc=off count=${maxChats}`, "apiChats")
     return chats.filter(({chatInfo}) => {
       const ref = chatRef(chatInfo)
       return ref !== undefined && ref !== control
@@ -725,16 +719,22 @@ export class AgentTools {
     const quoted = await getChat(this.agent.chat, chat, `around=${item} count=0`).catch(() => undefined)
     const chatItem = quoted?.chatItems.find(({meta}) => meta.itemId === item)
     if (quoted === undefined || chatItem === undefined) throw new ToolError(`reply_to: ${chat} has no item ${item}.`)
+    if (!isMessageItem(chatItem)) throw new ToolError(`reply_to: item ${item} in ${chat} is not a message.`)
     return {from: toMessage(quoted.chatInfo, chatItem, {name: this.selfName(quoted.chatInfo)}).from, text: chatItem.meta.itemText}
   }
 
   private async mentionedMembers(chatInfo: T.ChatInfo, chat: string, ids: number[]): Promise<{name: string; member: number}[]> {
     if (chatInfo.type !== "group") throw new ToolError(`mention: ${chat} is a contact chat; mentions apply to groups and channels.`)
     const members = await this.agent.chat.apiListMembers(chatInfo.groupInfo.groupId)
+    const named = new Map<string, number>()
     return ids.map(id => {
       const member = members.find(({groupMemberId}) => groupMemberId === id)
       if (member === undefined) throw new ToolError(`mention: ${chat} has no member ${id}.`)
-      return {name: member.memberProfile.displayName, member: id}
+      const name = member.memberProfile.displayName
+      const same = named.get(name)
+      if (same !== undefined) throw new ToolError(`mention: members ${same} and ${id} have the same name.`)
+      named.set(name, id)
+      return {name, member: id}
     })
   }
 
@@ -968,21 +968,6 @@ function memberCurrentOrPending(member: T.GroupMember): boolean {
   return memberCurrent(member) || member.memberStatus === T.GroupMemberStatus.Pending_approval || member.memberStatus === T.GroupMemberStatus.Pending_review
 }
 
-function chatTs(chatInfo: T.ChatInfo): string {
-  switch (chatInfo.type) {
-    case "direct":
-      return chatInfo.contact.chatTs ?? chatInfo.contact.updatedAt
-    case "group":
-      return chatInfo.groupInfo.chatTs ?? chatInfo.groupInfo.updatedAt
-    case "local":
-      return chatInfo.noteFolder.chatTs
-    case "contactRequest":
-      return chatInfo.contactRequest.updatedAt
-    case "contactConnection":
-      return chatInfo.contactConnection.updatedAt
-  }
-}
-
 function commandsOf(commands: T.ChatBotCommand[] | undefined): Command[] | undefined {
   if (commands === undefined || commands.length === 0) return undefined
   return commands.map(command =>
diff --git a/packages/simplex-chat-mcp/test/e2e/scenarios.test.ts b/packages/simplex-chat-mcp/test/e2e/scenarios.test.ts
index 20eb0a744e..36666a1f27 100644
--- a/packages/simplex-chat-mcp/test/e2e/scenarios.test.ts
+++ b/packages/simplex-chat-mcp/test/e2e/scenarios.test.ts
@@ -1,8 +1,10 @@
 import {mkdirSync, mkdtempSync, rmSync} from "fs"
+import {createServer} from "net"
 import {tmpdir} from "os"
 import {join} from "path"
 import {T} from "@simplex-chat/types"
 import {api} from "simplex-chat"
+import {readServerFile} from "../../src/files"
 import {RunningServer, ServeOptions, startServer} from "../../src/serve"
 import {McpClient} from "./client"
 import {
@@ -331,6 +333,19 @@ test("a chat reference over 15 digits, which the core reads as the agent control
   expect(await agent.client.tool("leave", {chat: alias})).toMatchObject(refusal)
 }, 600_000)
 
+test("a port in use stops the start before server.json is written and before any link is printed", async () => {
+  const data = await agentData("port")
+  const agent = new Agent(data, await freePort())
+  closing.push(() => agent.stop())
+  const busy = createServer()
+  await new Promise<void>(resolve => busy.listen(agent.port, "127.0.0.1", resolve))
+  closing.push(() => new Promise<void>(resolve => busy.close(() => resolve())))
+  const before = logLines.length
+  await expect(agent.start()).rejects.toThrow(`Port ${agent.port} is in use. Start with --port N.`)
+  expect(readServerFile(data)).toBeUndefined()
+  expect(logLines.slice(before).filter(line => line.startsWith("Join the agent control chat") || /^(https:\/\/|simplex:)/.test(line))).toEqual([])
+}, 600_000)
+
 test("--display-name names the profile and the agent control chat", async () => {
   const alice = await personIn("names", "Alice")
   const agent = await agentIn("names")
diff --git a/packages/simplex-chat-mcp/test/unit/actions.test.ts b/packages/simplex-chat-mcp/test/unit/actions.test.ts
index ab21a28cea..728ddf8b1d 100644
--- a/packages/simplex-chat-mcp/test/unit/actions.test.ts
+++ b/packages/simplex-chat-mcp/test/unit/actions.test.ts
@@ -148,6 +148,20 @@ describe("actions in mode requests", () => {
     await settled()
     expect(action).toMatchObject({state: "failed", error: "not a member"})
     expect(action.card).toBeUndefined()
+    expect(logLines.at(-1)).toBe("Action 1: failed: not a member.")
+  })
+
+  it("fails without a card or a perform when the counter can't be written, and logs it on one line", async () => {
+    const fake = fakeHooks()
+    fake.hooks.saveCounter = async () => {
+      throw new Error("disk\nfull")
+    }
+    const actions = actionsWith("host", fake)
+    const action = actions.create("k", sendFields())
+    await settled()
+    expect(action).toMatchObject({state: "failed", error: "disk\nfull"})
+    expect(fake.calls).toEqual([])
+    expect(logLines).toEqual(["Action 1: send to bot SimpleX Directory (@4)", "Action 1: failed: disk full."])
   })
 
   it("refuses new actions without approvers or control chat", () => {
@@ -221,6 +235,25 @@ describe("actions in mode requests", () => {
     expect(fake.calls.filter(call => call.startsWith("outcome"))).toHaveLength(3)
   })
 
+  it("aborts the signal of the performs at the stop, and logs no line when an interrupted perform ends", async () => {
+    const fake = fakeHooks()
+    const signals: AbortSignal[] = []
+    const perform = fake.hooks.perform
+    fake.hooks.perform = (action, signal) => (signals.push(signal), perform(action, signal))
+    const actions = actionsWith("requests", fake)
+    const action = await pendingAction(actions)
+    actions.approve(action, "Alice")
+    expect(signals.map(({aborted}) => aborted)).toEqual([false])
+    await actions.stop()
+    expect(signals.map(({aborted}) => aborted)).toEqual([true])
+    const lines = [...logLines]
+    fake.performs[0].resolve()
+    await settled()
+    expect(action.state).toBe("done")
+    expect(logLines).toEqual(lines)
+    expect(fake.calls.filter(call => call.startsWith("outcome"))).toEqual(["outcome 1 performing interrupted"])
+  })
+
   it("stops after the outcome edit of a perform that ended before the stop", async () => {
     const fake = fakeHooks()
     let edited: () => void = () => undefined
@@ -390,6 +423,18 @@ describe("actions in mode host", () => {
     expect(fake.calls).toEqual(["outcome 1 pending interrupted"])
   })
 
+  it("refuses a new action while 20 are being performed", async () => {
+    const fake = fakeHooks()
+    const actions = actionsWith("host", fake)
+    for (let i = 0; i < 20; i++) actions.create(`k${i}`, sendFields(`text ${i}`))
+    await settled()
+    expect(() => actions.create("k20", sendFields("one more"))).toThrow(new ToolError("20 actions are being performed; wait for their results."))
+    expect(actions.next).toBe(21)
+    fake.performs[0].resolve()
+    await settled()
+    expect(actions.create("k20", sendFields("one more")).n).toBe(21)
+  })
+
   it("logs a failure", async () => {
     const fake = fakeHooks()
     const actions = actionsWith("host", fake)
diff --git a/packages/simplex-chat-mcp/test/unit/cards.test.ts b/packages/simplex-chat-mcp/test/unit/cards.test.ts
index f32d099c76..3d2ccb8575 100644
--- a/packages/simplex-chat-mcp/test/unit/cards.test.ts
+++ b/packages/simplex-chat-mcp/test/unit/cards.test.ts
@@ -80,6 +80,19 @@ describe("connect cards", () => {
     if (fields.tool === "connect") Object.assign(fields, {subject: {kind: "contact", incognito: false}})
     expect(cardText(action(fields, "pending"), mode).split("\n")[0]).toBe("I want to connect to an unnamed contact, as myself.")
   })
+
+  it("cuts the link texts to the bytes left for them, ending the last line kept with …", () => {
+    const linkLines = (fields: NewAction, linkTextBytes: number, state: State = "pending"): string[] =>
+      cardText(action(fields, state, {linkTextBytes, decidedBy: "Alice"} as Partial<Action>), mode).split("\n").slice(1, -1)
+    const fields = connect({description: "one\n\ntwo", welcome: "Welcome!"})
+    expect(linkLines(fields, 28)).toEqual(["`one`", "", "`two`", "`Welcome!`"])
+    expect(linkLines(fields, 27)).toEqual(["`one`", "", "`two`", "`Welc…`"])
+    expect(linkLines(fields, 27, "done")).toEqual(["`one`", "", "`two`", "`Welc…`"])
+    expect(linkLines(fields, 19)).toEqual(["`one`", "", "`two`"])
+    expect(linkLines(fields, 0)).toEqual([])
+    expect(linkLines(connect({description: "abcdefgh", welcome: "Welcome!"}), 10)).toEqual(["`abc…`"])
+    expect(linkLines(connect({description: " abcdefgh"}), 10)).toEqual(["` a…`"])
+  })
 })
 
 describe("send cards", () => {
@@ -107,6 +120,11 @@ describe("send cards", () => {
     ])
   })
 
+  it("cuts the reply quote at 100 characters, not inside a character", () => {
+    const fields = send({replyTo: {from: "Switchback", text: `${"a".repeat(99)}😀b`}})
+    expect(cardText(action(fields, "pending"), mode).split("\n")[2]).toBe(`replying to Switchback: \`${"a".repeat(99)}😀\``)
+  })
+
   it("quotes names that are not valid display names", () => {
     const fields = send()
     Object.assign(fields, {subject: {kind: "bot", name: "/approve 9", incognito: false}})
diff --git a/packages/simplex-chat-mcp/test/unit/commands.test.ts b/packages/simplex-chat-mcp/test/unit/commands.test.ts
index a265ce72ff..686fa8ba08 100644
--- a/packages/simplex-chat-mcp/test/unit/commands.test.ts
+++ b/packages/simplex-chat-mcp/test/unit/commands.test.ts
@@ -1,9 +1,10 @@
 import {CallToolResult} from "@modelcontextprotocol/server"
 import {ChatEvent, T} from "@simplex-chat/types"
-import {Actions, Mode, NewAction} from "../../src/actions"
+import {core} from "simplex-chat"
+import {Actions, Mode, NewAction, ToolError} from "../../src/actions"
 import {Control, cardText, parseCommand} from "../../src/control"
 import {ChatItemsWatch, Collected, utcMinutes} from "../../src/messages"
-import {OwnerEntry} from "../../src/serve"
+import {OwnerEntry, deliveries} from "../../src/serve"
 import {AgentTools} from "../../src/tools"
 import {FakeChat, actionsWith, contact, direct, event, fakeHooks, group, groupChat, item, member, settled, signal, user} from "./fixtures"
 
@@ -189,6 +190,15 @@ describe("owner commands", () => {
     expect(await none.control.ownerCommand(alice, {keyword: "approve", params: "5"})).toBe("Only the owners listed in --owners approve actions.")
   })
 
+  it("accepts a listed owner by the name on one line, as the restart line prints it", async () => {
+    const chat = agentChats()
+    const ana = member(3, "Ana\nLu, Jr", T.GroupMemberRole.Owner)
+    chat.members.set(10, [self, ana])
+    const {control} = await controlWith(chat, actionsWith("requests", fakeHooks()), [{memberId: 3, name: "Ana Lu, Jr"}])
+    await control.start()
+    expect(await control.ownerCommand(ana, {keyword: "pending", params: ""})).toBe("No pending actions.")
+  })
+
   it("replies in the agent control chat to commands only", async () => {
     const {control, chat} = await setup()
     const chatInfo = groupChat(group(10, "agent"))
@@ -341,7 +351,7 @@ describe("sends to a chat approved for all messages", () => {
       saveCounter: async () => undefined,
       postCard: action => control.postCard(action),
       outcome: action => control.outcome(action),
-      perform: action => tools.perform(action),
+      perform: (action, signal) => tools.perform(action, signal),
     })
     const {control, tools} = await controlWith(chat, actions, undefined, mode)
     return {chat, actions, control, tools}
@@ -387,6 +397,8 @@ describe("sends to a chat approved for all messages", () => {
     const {chats} = (await tools.call("list", {}, signal().call))!.structuredContent as {chats: {chat: string}[]}
     expect(chats.find(({chat: ref}) => ref === "@4")).not.toHaveProperty("approved")
     expect((await control.ownerCommand(alice, {keyword: "list", params: ""}))!.split("\n")[0]).toBe("@4  bot SimpleX Directory")
+    expect(await control.ownerCommand(alice, {keyword: "approve", params: "#2 all"})).toBe("Approvals apply in mode requests; this server runs in mode host.")
+    expect(chat.customData).toEqual([])
     expect((await tools.call("send", {chat: "@4", text: "trail shoes", wait: 0}, signal().call))!.structuredContent).toMatchObject({action: 1, status: "done"})
     await settled()
     expect(cards(chat)).toEqual(["I sent a message to bot SimpleX Directory:\n`trail shoes`\nPerformed without approval (mode host)."])
@@ -406,13 +418,25 @@ describe("approval card size", () => {
       saveCounter: async () => undefined,
       postCard: action => control.postCard(action),
       outcome: action => control.outcome(action),
-      perform: action => tools.perform(action),
+      perform: (action, signal) => tools.perform(action, signal),
     })
     const {control, tools} = await controlWith(chat, actions)
     const textOf = (result: CallToolResult | undefined): string => (result!.content[0] as {text: string}).text
     return {chat, actions, tools, textOf}
   }
 
+  function connectFields(name: string, extra: {message?: string; description?: string; welcome?: string}): NewAction {
+    return {
+      tool: "connect",
+      input: {target: "https://simplex.chat/a#ridgeline", ...(extra.message === undefined ? {} : {message: extra.message})},
+      subject: {kind: "contact", name, incognito: false},
+      plan: {cardKind: "contact", type: "contact", takesMessage: true, description: extra.description, welcome: extra.welcome},
+      messages: new Collected(),
+    }
+  }
+
+  const encodedLength = (text: string): number => Buffer.byteLength(JSON.stringify(text)) - 2
+
   const flushed = (): Promise<void> => new Promise(resolve => setImmediate(resolve))
 
   it("accepts a text whose largest card has 15000 bytes and refuses one byte more, counting multi-byte characters", async () => {
@@ -460,4 +484,41 @@ describe("approval card size", () => {
     controller.abort()
     expect(await sending).toBeUndefined()
   })
+
+  it("refuses a connect whose message makes its largest card longer than 15000 bytes", async () => {
+    const {chat, actions} = await sendTools()
+    const name = "😀".repeat(1000)
+    expect(() => actions.create("c", connectFields(name, {message: "\b".repeat(2000), welcome: "Welcome!"}))).toThrow(new ToolError("message: too long for its approval card; shorten it."))
+    expect(actions.next).toBe(1)
+    actions.create("c", connectFields(name, {message: "\b".repeat(1400), welcome: "Welcome!"}))
+    await flushed()
+    expect(chat.sent.map(({chat: [, id]}) => id)).toEqual([10])
+  })
+
+  it("cuts the link texts on a connect card to fit 15000 bytes in its largest form, and keeps them whole in the action", async () => {
+    const {chat, actions} = await sendTools()
+    const description = "Trail shoes. ".repeat(1500)
+    const action = actions.create("c", connectFields("Ridgeline", {description, welcome: "Welcome!"}))
+    await flushed()
+    const [card] = chat.sent.filter(({chat: [, id]}) => id === 10).map(({messages: [{msgContent}]}) => msgContent.text.split("\n"))
+    expect(card).toHaveLength(3)
+    expect(card[1]).toMatch(/^`Trail shoes\. .*…`$/)
+    const failed = encodedLength(cardText({...action, state: "failed", decidedBy: "Alice", error: "€".repeat(600)}, "requests"))
+    expect(failed).toBeLessThanOrEqual(15000)
+    expect(failed).toBeGreaterThan(15000 - 8)
+    expect(action.tool === "connect" && action.plan.description).toBe(description)
+  })
+})
+
+describe("delivery wait at the stop", () => {
+  it("logs an error of the SQL query and ends", async () => {
+    const errors: string[] = []
+    jest.spyOn(process.stderr, "write").mockImplementation(text => (errors.push(String(text).trimEnd()), true))
+    const chat = new FakeChat()
+    chat.sendChatCmd = async () => {
+      throw new core.ChatAPIError("Chat command error", {type: "errorStore", storeError: {type: "dBException", message: "no such table: connections"}} as unknown as T.ChatError)
+    }
+    await deliveries(chat.api(), 10)
+    expect(errors).toEqual(['delivery wait: SimpleX error: errorStore: dBException: {"message":"no such table: connections"}'])
+  })
 })
diff --git a/packages/simplex-chat-mcp/test/unit/files.test.ts b/packages/simplex-chat-mcp/test/unit/files.test.ts
index b84c4000e2..52a230a84e 100644
--- a/packages/simplex-chat-mcp/test/unit/files.test.ts
+++ b/packages/simplex-chat-mcp/test/unit/files.test.ts
@@ -26,7 +26,7 @@ describe("lock", () => {
   it("refuses a lock of a running process", () => {
     const runningPid = process.ppid
     writeFileSync(join(dir, "lock"), `${runningPid}\n`)
-    expect(() => acquireLock(dir)).toThrow(new ExitError(`Another server uses ${dir} (PID ${runningPid}).`, 1))
+    expect(() => acquireLock(dir)).toThrow(new ExitError(`Another server uses ${dir} (PID ${runningPid}). If no server runs, remove ${join(dir, "lock")}.`, 1))
   })
 
   it("replaces a lock of a stopped process or of this process", () => {
@@ -66,6 +66,18 @@ describe("data folder", () => {
     expect(serverToken(dir, true)).not.toBe(token)
   })
 
+  it("makes the token, the headers and the server record private again when they exist", () => {
+    const files = ["token", "headers.json", "server.json"].map(name => join(dir, name))
+    for (const file of files) {
+      writeFileSync(file, "{}\n")
+      chmodSync(file, 0o644)
+    }
+    serverToken(dir, true)
+    writeHeadersFile(dir, "token")
+    writeServerFile(dir, {name: "agent", port: 5226, expireHours: 23})
+    expect(files.map(file => statSync(file).mode & 0o777)).toEqual([0o600, 0o600, 0o600])
+  })
+
   it("records the server", () => {
     expect(readServerFile(dir)).toBeUndefined()
     writeServerFile(dir, {name: "agent", port: 5226, expireHours: 23})
diff --git a/packages/simplex-chat-mcp/test/unit/fixtures.ts b/packages/simplex-chat-mcp/test/unit/fixtures.ts
index 02a3b7ccfa..9f02d178f3 100644
--- a/packages/simplex-chat-mcp/test/unit/fixtures.ts
+++ b/packages/simplex-chat-mcp/test/unit/fixtures.ts
@@ -129,7 +129,11 @@ export class FakeChat {
     const getChat = /^\/_get chat ([@#]\d+) (.+)$/.exec(cmd)
     if (getChat) return this.getChat(getChat[1], getChat[2])
     if (cmd.startsWith("/_get chats ")) {
-      const chats = [...this.chats.values()].map(({chatInfo, items}) => ({chatInfo, chatItems: [], chatStats: chatStats(items)}))
+      const [, before, count] = /(?: before=(\S+))? count=(\d+)$/.exec(cmd)!
+      const chats = [...this.chats.values()]
+        .filter(({chatInfo}) => before === undefined || chatTs(chatInfo) < before)
+        .slice(0, Number(count))
+        .map(({chatInfo, items}) => ({chatInfo, chatItems: [], chatStats: chatStats(items)}))
       return structuredClone({type: "apiChats", user, chats}) as unknown as ChatResponse
     }
     if (cmd.startsWith("/_read chat items ")) {
@@ -185,6 +189,8 @@ export class FakeChat {
     this.setCustomData(`#${groupId}`, customData)
   }
 
+  async apiDeleteGroupLink(): Promise<void> {}
+
   async apiUpdateGroupProfile(groupId: number, groupProfile: T.GroupProfile): Promise<T.GroupInfo> {
     this.profiles.push({groupId, groupProfile})
     return {...group(groupId, groupProfile.displayName), groupProfile}
@@ -225,6 +231,10 @@ export class FakeChat {
   }
 }
 
+function chatTs(chatInfo: T.ChatInfo): string {
+  return chatInfo.type === "direct" ? chatInfo.contact.updatedAt : (chatInfo as T.ChatInfo.Group).groupInfo.updatedAt
+}
+
 function chatStats(items: T.ChatItem[]): T.ChatStats {
   const unread = items.filter(({meta}) => meta.itemStatus.type === "rcvNew")
   return {unreadCount: unread.length, minUnreadItemId: unread[0]?.meta.itemId ?? 0, unreadMentions: 0, reportsCount: 0, unreadChat: false}
diff --git a/packages/simplex-chat-mcp/test/unit/http.test.ts b/packages/simplex-chat-mcp/test/unit/http.test.ts
index 4127d374cd..73ec8a640c 100644
--- a/packages/simplex-chat-mcp/test/unit/http.test.ts
+++ b/packages/simplex-chat-mcp/test/unit/http.test.ts
@@ -12,8 +12,10 @@ const token = "secret-token"
 let server: Server
 let url: string
 let actions: Actions
+let ready: boolean
 
 async function start(mode: Mode = "requests"): Promise<void> {
+  ready = true
   const chat = new FakeChat()
   chat.chats.set("@4", {chatInfo: direct(contact(4, "SimpleX Directory")), items: []})
   actions = actionsWith(mode, fakeHooks())
@@ -23,7 +25,7 @@ async function start(mode: Mode = "requests"): Promise<void> {
     tools.register(mcp)
     return mcp
   }
-  server = await startHttp({port: 0, token, factory})
+  server = await startHttp({port: 0, token, factory, ready: () => ready})
   url = `http://127.0.0.1:${(server.address() as AddressInfo).port}`
 }
 
@@ -106,6 +108,17 @@ describe("HTTP", () => {
     expect(await rawStatusLine("http://[")).toBe("HTTP/1.1 404 Not Found")
     expect((await post(modern("tools/list"), modernHeaders("tools/list"))).status).toBe(200)
   })
+
+  it("answers /mcp with 503 and Retry-After until the server is ready, after the token check", async () => {
+    await start()
+    ready = false
+    const starting = await post(modern("tools/list"), modernHeaders("tools/list"))
+    expect(starting.status).toBe(503)
+    expect(starting.headers.get("retry-after")).toBe("1")
+    expect((await post(modern("tools/list"), {...modernHeaders("tools/list"), authorization: ""})).status).toBe(401)
+    ready = true
+    expect((await post(modern("tools/list"), modernHeaders("tools/list"))).status).toBe(200)
+  })
 })
 
 describe("MCP", () => {
diff --git a/packages/simplex-chat-mcp/test/unit/messages.test.ts b/packages/simplex-chat-mcp/test/unit/messages.test.ts
index be2b8f9ef5..fb09f0b075 100644
--- a/packages/simplex-chat-mcp/test/unit/messages.test.ts
+++ b/packages/simplex-chat-mcp/test/unit/messages.test.ts
@@ -116,19 +116,26 @@ describe("responses", () => {
     stop()
   })
 
-  it("keeps 100 messages and counts the later ones as overflow", () => {
+  it("keeps 100 messages and the IDs of the later ones as overflow, until they are deleted", () => {
     const watch = new ChatItemsWatch()
     const chatInfo = direct(contact(4, "Switchback"))
     const collected = new Collected()
     const stop = watch.collect("@4", collected)
     watch.deliver(Array.from({length: 102}, (_, i) => event(chatInfo, item(100 + i, `post ${i}`))))
     expect(collected.items.map(({chatItem}) => chatItem.meta.itemId)).toEqual(Array.from({length: 100}, (_, i) => 100 + i))
-    expect(collected.overflow).toBe(2)
+    expect([...collected.overflow]).toEqual([200, 201])
     watch.update(event(chatInfo, item(101, "edited")))
     watch.update(event(chatInfo, item(201, "edited")))
     expect(collected.items[1].chatItem.meta.itemText).toBe("edited")
     expect(collected.items).toHaveLength(100)
-    expect(collected.overflow).toBe(2)
+    expect([...collected.overflow]).toEqual([200, 201])
+    watch.remove([event(chatInfo, item(201, "edited")), event(chatInfo, item(999, "other"))])
+    expect(collected.items).toHaveLength(100)
+    expect([...collected.overflow]).toEqual([200])
+    watch.remove([event(chatInfo, item(100, "post 0"))])
+    watch.update(event(chatInfo, item(200, "edited")))
+    expect(collected.items).toHaveLength(99)
+    expect([...collected.overflow]).toEqual([200])
     stop()
   })
 })
@@ -186,9 +193,23 @@ describe("receive", () => {
     await settled()
     expect(progress[0]).toMatch(/^No new messages in @4; waiting until /)
     watch.deliver(Array.from({length: 102}, (_, i) => chat.addItem("@4", item(30 + i, `post ${i}`))))
+    watch.remove([event(chat.chats.get("@4")!.chatInfo, item(131, "post 101"))])
     const result = (await receiving)!.structuredContent as {messages: {item: number}[]; more: number}
     expect(result.messages).toHaveLength(50)
-    expect(result.more).toBe(52)
+    expect(result.more).toBe(51)
+  })
+
+  it("reports a store error of a later read as that error, and an unknown chat only for the first read", async () => {
+    const chat = new FakeChat()
+    chat.chats.set("@4", {chatInfo: direct(contact(4, "SimpleX Directory")), items: [item(21, "first", {type: "directRcv"})]})
+    const sendChatCmd = chat.sendChatCmd.bind(chat)
+    chat.sendChatCmd = async cmd => {
+      if (cmd.includes(" around=")) throw new core.ChatAPIError("Chat command error", {type: "errorStore", storeError: {type: "chatItemNotFound", itemId: 21}} as unknown as T.ChatError)
+      return sendChatCmd(cmd)
+    }
+    const {tools} = agentTools(chat)
+    expect(textOf(await tools.call("receive", {chat: "@4"}, signal().call))).toBe('SimpleX error: errorStore: chatItemNotFound: {"itemId":21}')
+    expect(textOf(await tools.call("receive", {chat: "@5"}, signal().call))).toBe("No chat @5. list shows the agent's chats.")
   })
 
   it("returns a live unread message after its final update", async () => {
@@ -276,7 +297,7 @@ describe("send", () => {
     const fake = fakeHooks()
     const actions = actionsWith("requests", fake)
     const {tools, watch} = agentTools(chat, actions)
-    fake.hooks.perform = action => tools.perform(action)
+    fake.hooks.perform = (action, signal) => tools.perform(action, signal)
     const {call} = signal()
     const sending = tools.call("send", {chat: "@4", text: "trail running shoes", wait: 60, idle: 5, limit: 2}, call)
     await jest.advanceTimersByTimeAsync(0)
@@ -307,7 +328,7 @@ describe("send", () => {
     const fake = fakeHooks()
     const actions = actionsWith("requests", fake)
     const {tools, watch} = agentTools(chat, actions)
-    fake.hooks.perform = action => tools.perform(action)
+    fake.hooks.perform = (action, signal) => tools.perform(action, signal)
     const first = signal()
     const creating = tools.call("send", {chat: "@4", text: "trail running shoes", wait: 600}, first.call)
     await jest.advanceTimersByTimeAsync(0)
@@ -340,7 +361,7 @@ describe("send", () => {
     const fake = fakeHooks()
     const actions = actionsWith("requests", fake)
     const {tools, watch} = agentTools(chat, actions)
-    fake.hooks.perform = action => tools.perform(action)
+    fake.hooks.perform = (action, signal) => tools.perform(action, signal)
     const send = async (text: string, final: boolean): Promise<{sentItem: number; result: object}> => {
       const sending = tools.call("send", {chat: "@4", text, wait: 10, idle: 2}, signal().call)
       await jest.advanceTimersByTimeAsync(0)
@@ -367,7 +388,7 @@ describe("send", () => {
     const fake = fakeHooks()
     const actions = actionsWith("requests", fake)
     const {tools, watch} = agentTools(chat, actions)
-    fake.hooks.perform = action => tools.perform(action)
+    fake.hooks.perform = (action, signal) => tools.perform(action, signal)
     const sending = tools.call("send", {chat: "@4", text: "price?", wait: 60, idle: 2}, signal().call)
     let finished = false
     sending.then(() => (finished = true))
@@ -420,6 +441,26 @@ describe("send", () => {
     expect(actions.all()).toHaveLength(0)
   })
 
+  it("refuses a reply to an item that is not a message", async () => {
+    const chat = new FakeChat()
+    const connected = {...item(19, "contact connected", {type: "directRcv"}), content: {type: "rcvDirectEvent", rcvDirectEvent: {type: "contactConnected"}}} as unknown as T.ChatItem
+    chat.chats.set("@4", {chatInfo: direct(contact(4, "Bob")), items: [connected, item(20, "hello", {type: "directRcv"})]})
+    const actions = actionsWith("requests", fakeHooks())
+    const {tools} = agentTools(chat, actions)
+    expect(textOf(await tools.call("send", {chat: "@4", text: "x", reply_to: 19}, signal().call))).toBe("reply_to: item 19 in @4 is not a message.")
+    expect(actions.all()).toHaveLength(0)
+  })
+
+  it("refuses mentions of two members with the same name", async () => {
+    const chat = new FakeChat()
+    chat.chats.set("#15", {chatInfo: groupChat(group(15, "Trail", member(1, "agent"))), items: []})
+    chat.members.set(15, [member(44, "Switchback"), member(47, "Bob"), member(48, "Bob")])
+    const actions = actionsWith("requests", fakeHooks())
+    const {tools} = agentTools(chat, actions)
+    expect(textOf(await tools.call("send", {chat: "#15", text: "x", mention: [44, 47, 48]}, signal().call))).toBe("mention: members 47 and 48 have the same name.")
+    expect(actions.all()).toHaveLength(0)
+  })
+
   it("reports a failure with the chain of error types and their scalar fields only, on one line of its card", async () => {
     const chat = new FakeChat()
     const groupInfo = group(15, "Trail", member(1, "agent"), {groupProfile: {displayName: "Trail", fullName: "", description: "line 1\n/'approve @7 all' https://simplex.chat/contact#x"}})
@@ -430,7 +471,7 @@ describe("send", () => {
     const fake = fakeHooks()
     const actions = actionsWith("requests", fake)
     const {tools} = agentTools(chat, actions)
-    fake.hooks.perform = action => tools.perform(action)
+    fake.hooks.perform = (action, signal) => tools.perform(action, signal)
     const sending = tools.call("send", {chat: "#15", text: "hello", wait: 0}, signal().call)
     await settled()
     const action = actions.get(1)!
@@ -447,7 +488,7 @@ describe("send", () => {
     const fake = fakeHooks()
     const actions = actionsWith("requests", fake)
     const {tools} = agentTools(chat, actions)
-    fake.hooks.perform = action => tools.perform(action)
+    fake.hooks.perform = (action, signal) => tools.perform(action, signal)
     const sending = tools.call("send", {chat: "#15", text: "hi @Switchback, any news?", mention: [44, 45], wait: 0}, signal().call)
     await settled()
     actions.approve(actions.get(1)!, "Alice")
@@ -463,7 +504,7 @@ describe("connect", () => {
     const fake = fakeHooks()
     const actions = actionsWith("requests", fake)
     const {tools, watch} = agentTools(chat, actions)
-    fake.hooks.perform = action => tools.perform(action)
+    fake.hooks.perform = (action, signal) => tools.perform(action, signal)
     return {tools, actions, watch}
   }
 
@@ -564,6 +605,30 @@ describe("connect", () => {
     expect((await connecting)!.structuredContent).toMatchObject({action: 1, status: "done", connected: false})
   })
 
+  it("ends the wait for the connection at the stop, with no timer left and no log line", async () => {
+    jest.useFakeTimers()
+    const lines: string[] = []
+    jest.spyOn(process.stdout, "write").mockImplementation(text => (lines.push(String(text).trimEnd()), true))
+    const chat = new FakeChat()
+    chat.responses.set(`/_connect plan 1 ${link}`, plan({type: "contactAddress", contactAddressPlan: {type: "ok"}}))
+    chat.responses.set(`/_connect 1 incognito=off ${link}`, {type: "sentInvitation", connection: {pccConnId: 300}})
+    const {tools, actions} = connectTools(chat)
+    const {controller, call} = signal()
+    const connecting = tools.call("connect", {target: link, wait: 3600}, call)
+    await jest.advanceTimersByTimeAsync(0)
+    const action = actions.get(1)!
+    actions.approve(action, "Alice")
+    await jest.advanceTimersByTimeAsync(0)
+    expect(action.state).toBe("performing")
+    controller.abort()
+    expect(await connecting).toBeUndefined()
+    await actions.stop()
+    await jest.advanceTimersByTimeAsync(0)
+    expect(action).toMatchObject({state: "done", connected: false, interrupted: true})
+    expect(jest.getTimerCount()).toBe(0)
+    expect(lines).toEqual(["Action 1: connect to an unnamed contact, as itself"])
+  })
+
   it("keeps the chat of a connect that completed when a later event names its connection", async () => {
     jest.useFakeTimers()
     const chat = new FakeChat()
@@ -696,7 +761,7 @@ describe("leave", () => {
     const fake = fakeHooks()
     const actions = actionsWith("requests", fake)
     const {tools} = agentTools(chat, actions)
-    fake.hooks.perform = action => tools.perform(action)
+    fake.hooks.perform = (action, signal) => tools.perform(action, signal)
     return {tools, actions}
   }
 
@@ -791,4 +856,13 @@ describe("list", () => {
     ])
     expect(chats[1]).not.toHaveProperty("approved")
   })
+
+  it("reads all chats with one command, so chats with the same time are all listed", async () => {
+    const chat = new FakeChat()
+    for (let i = 100; i < 250; i++) chat.chats.set(`@${i}`, {chatInfo: direct(contact(i, `contact ${i}`)), items: []})
+    const {tools} = agentTools(chat)
+    const {chats} = (await tools.call("list", {}, signal().call))!.structuredContent as {chats: {chat: string}[]}
+    expect(chats.map(({chat: ref}) => ref)).toEqual(Array.from({length: 150}, (_, i) => `@${100 + i}`))
+    expect(chat.commands.filter(cmd => cmd.startsWith("/_get chats "))).toEqual(["/_get chats 1 pcc=off count=1000000"])
+  })
 })
diff --git a/packages/simplex-chat-mcp/test/unit/options.test.ts b/packages/simplex-chat-mcp/test/unit/options.test.ts
index 30df28dbed..720ea6d2df 100644
--- a/packages/simplex-chat-mcp/test/unit/options.test.ts
+++ b/packages/simplex-chat-mcp/test/unit/options.test.ts
@@ -69,6 +69,12 @@ describe("serve options", () => {
     })
   })
 
+  it("splits --owners only at commas before an entry ID, so a name may have commas", () => {
+    expect(parseCommand(["serve", "agent", "--owners", "3:Smith, Alice,7:Bob,,Jr,12:Lu,8"], home)).toMatchObject({
+      options: {owners: [{memberId: 3, name: "Smith, Alice"}, {memberId: 7, name: "Bob,,Jr"}, {memberId: 12, name: "Lu,8"}]},
+    })
+  })
+
   it("checks ranges", () => {
     expect(usage(["serve", "agent", "--expire", "24"])).toBe("--expire: hours from 1 to 23 expected, got 24")
     expect(usage(["serve", "agent", "--expire", "0"])).toBe("--expire: hours from 1 to 23 expected, got 0")
diff --git a/packages/simplex-chat-mcp/test/unit/register.test.ts b/packages/simplex-chat-mcp/test/unit/register.test.ts
index 3a18e246fc..4253f39b21 100644
--- a/packages/simplex-chat-mcp/test/unit/register.test.ts
+++ b/packages/simplex-chat-mcp/test/unit/register.test.ts
@@ -1,9 +1,10 @@
+import * as childProcess from "child_process"
 import {mkdirSync, mkdtempSync, rmSync, writeFileSync} from "fs"
 import {tmpdir} from "os"
 import {join} from "path"
 import {createDataFolder, serverToken, writeServerFile} from "../../src/files"
 import {ExitError} from "../../src/log"
-import {RunResult, projectRoot, register, registryEntry} from "../../src/register"
+import {RunResult, cmdArgument, projectRoot, register, registryEntry} from "../../src/register"
 
 let dir: string
 
@@ -12,7 +13,10 @@ beforeEach(() => {
   createDataFolder(dir)
 })
 
-afterEach(() => rmSync(join(dir, ".."), {recursive: true, force: true}))
+afterEach(() => {
+  jest.restoreAllMocks()
+  rmSync(join(dir, ".."), {recursive: true, force: true})
+})
 
 const ok: RunResult = {missing: false, status: 0, stderr: ""}
 
@@ -81,6 +85,50 @@ describe("register", () => {
       new ExitError("claude mcp add-json failed: bad scope", 1),
     )
   })
+
+  describe("when claude can't be spawned", () => {
+    const spawnClaude = (shellStatus: number): jest.SpyInstance =>
+      jest.spyOn(childProcess, "spawnSync").mockImplementation(((_command: string, args: unknown) =>
+        Array.isArray(args) ? {error: Object.assign(new Error("spawnSync claude ENOENT"), {code: "ENOENT"}), status: null, stderr: ""} : {status: shellStatus, stderr: ""}) as never)
+    const manualEntry = (): ExitError => new ExitError(`Add this entry under "mcpServers" in ~/.claude.json: {"simplex-agent": ${JSON.stringify(registryEntry(5226, dir, 23))}}`, 1)
+
+    beforeEach(() => writeServerFile(dir, {name: "agent", port: 5226, expireHours: 23}))
+
+    it("runs it through cmd.exe on Windows, with the arguments quoted for cmd.exe", () => {
+      onPlatform("win32")
+      const spawn = spawnClaude(0)
+      expect(register({name: "agent", data: dir, scope: "user"})).toBe("Added to Claude Code: scope user, server simplex-agent.")
+      const words = (args: string[]): string => ["claude", ...args.map(cmdArgument)].join(" ")
+      expect(spawn.mock.calls).toEqual([
+        ["claude", ["mcp", "remove", "--scope", "user", "simplex-agent"], {encoding: "utf8"}],
+        [words(["mcp", "remove", "--scope", "user", "simplex-agent"]), {encoding: "utf8", shell: true}],
+        ["claude", ["mcp", "add-json", "--scope", "user", "simplex-agent", JSON.stringify(registryEntry(5226, dir, 23))], {encoding: "utf8"}],
+        [words(["mcp", "add-json", "--scope", "user", "simplex-agent", JSON.stringify(registryEntry(5226, dir, 23))]), {encoding: "utf8", shell: true}],
+      ])
+    })
+
+    it("prints the entry on Windows when cmd.exe does not find it either", () => {
+      onPlatform("win32")
+      const spawn = spawnClaude(9009)
+      expect(() => register({name: "agent", data: dir, scope: "user"})).toThrow(manualEntry())
+      expect(spawn).toHaveBeenCalledTimes(2)
+    })
+
+    it("prints the entry on other platforms without a shell", () => {
+      onPlatform("linux")
+      const spawn = spawnClaude(0)
+      expect(() => register({name: "agent", data: dir, scope: "user"})).toThrow(manualEntry())
+      expect(spawn).toHaveBeenCalledTimes(1)
+    })
+  })
+
+  it("quotes an argument for cmd.exe and for the npm command shim it runs", () => {
+    expect(cmdArgument("mcp")).toBe('^^^"mcp^^^"')
+    expect(cmdArgument('{"a":"b c"}')).toBe('^^^"{\\^^^"a\\^^^":\\^^^"b^^^ c\\^^^"}^^^"')
+    expect(cmdArgument('a\\"b')).toBe('^^^"a\\\\\\^^^"b^^^"')
+    expect(cmdArgument("C:\\dir\\")).toBe('^^^"C:\\dir\\\\^^^"')
+    expect(cmdArgument("100% & more")).toBe('^^^"100^^^%^^^ ^^^&^^^ more^^^"')
+  })
 })
 
 describe("project root", () => {
diff --git a/packages/simplex-chat-nodejs/src/api.ts b/packages/simplex-chat-nodejs/src/api.ts
index fc090d037c..f01219ef9b 100644
--- a/packages/simplex-chat-nodejs/src/api.ts
+++ b/packages/simplex-chat-nodejs/src/api.ts
@@ -39,12 +39,15 @@ export interface BotAddressSettings {
    * @default false
    */
   businessAddress?: boolean
+
+  chatLayout?: T.ChatLayout
 }
 
 export const defaultBotAddressSettings: BotAddressSettings = {
   autoAccept: true,
   welcomeMessage: undefined,
-  businessAddress: false
+  businessAddress: false,
+  chatLayout: undefined
 }
 
 export type EventSubscriberFunc<K extends CEvt.Tag> = (event: ChatEvent & {type: K}, chat: ChatApi) => void | Promise<void>
@@ -413,12 +416,13 @@ export class ChatApi {
    * Set bot address settings.
    * Network usage: interactive.
    */
-  async apiSetAddressSettings(userId: number, {autoAccept, welcomeMessage, businessAddress}: BotAddressSettings): Promise<void> {
+  async apiSetAddressSettings(userId: number, {autoAccept, welcomeMessage, businessAddress, chatLayout}: BotAddressSettings): Promise<void> {
     const autoReply = welcomeMessage || defaultBotAddressSettings.welcomeMessage
     const settings: T.AddressSettings = {
       autoAccept: (autoAccept === undefined ? defaultBotAddressSettings.autoAccept : autoAccept) ? {acceptIncognito: false} : undefined,
       autoReply: typeof autoReply === "string" ? {type: "text", text: autoReply} : autoReply,
-      businessAddress: businessAddress || defaultBotAddressSettings.businessAddress || false
+      businessAddress: businessAddress || defaultBotAddressSettings.businessAddress || false,
+      chatLayout
     }
     const r = await this.sendChatCmd(CC.APISetAddressSettings.cmdString({userId, settings}))
     if (r.type !== "userContactLinkUpdated") {
diff --git a/packages/simplex-chat-nodejs/src/bot.ts b/packages/simplex-chat-nodejs/src/bot.ts
index 83037e310e..1501262680 100644
--- a/packages/simplex-chat-nodejs/src/bot.ts
+++ b/packages/simplex-chat-nodejs/src/bot.ts
@@ -82,7 +82,8 @@ function fullOptions(options: BotOptions): Required<BotOptions> {
   opts.addressSettings = {
     autoAccept: opts.addressSettings.autoAccept ?? defaultOpts.addressSettings.autoAccept,
     welcomeMessage: typeof welcomeMessage === "string" ? {type: "text", text: welcomeMessage} : welcomeMessage,
-    businessAddress: opts.addressSettings.businessAddress ?? defaultOpts.addressSettings.businessAddress
+    businessAddress: opts.addressSettings.businessAddress ?? defaultOpts.addressSettings.businessAddress,
+    chatLayout: opts.addressSettings.chatLayout
   }
   return opts
 }
diff --git a/packages/simplex-chat-nodejs/src/util.ts b/packages/simplex-chat-nodejs/src/util.ts
index 6b8915e93a..f7fd83e304 100644
--- a/packages/simplex-chat-nodejs/src/util.ts
+++ b/packages/simplex-chat-nodejs/src/util.ts
@@ -49,7 +49,8 @@ export function botAddressSettings({addressSettings}: T.UserContactLink): BotAdd
   return {
     autoAccept: addressSettings.autoAccept ? true : false,
     welcomeMessage: addressSettings.autoReply,
-    businessAddress: addressSettings.businessAddress
+    businessAddress: addressSettings.businessAddress,
+    chatLayout: addressSettings.chatLayout
   }
 }
 
diff --git a/packages/simplex-chat-nodejs/tests/bot.unit.test.ts b/packages/simplex-chat-nodejs/tests/bot.unit.test.ts
index 62ff10aab4..9b55cf4b37 100644
--- a/packages/simplex-chat-nodejs/tests/bot.unit.test.ts
+++ b/packages/simplex-chat-nodejs/tests/bot.unit.test.ts
@@ -127,4 +127,32 @@ describe("run", () => {
     await runBot("calc.simplex", {updateAddress: false})
     expect(chat.apiSetUserDomain).not.toHaveBeenCalled()
   })
+
+  it("updates the address settings when they changed", async () => {
+    const chat = fakeChat()
+    await runBot(undefined, {addressSettings: {welcomeMessage: "hello"}})
+    expect(chat.apiSetAddressSettings).toHaveBeenCalledWith(1, {autoAccept: true, welcomeMessage: {type: "text", text: "hello"}, businessAddress: false})
+  })
+
+  it("updates the address settings when the chat layout changed", async () => {
+    const chat = fakeChat()
+    await runBot(undefined, {addressSettings: {chatLayout: T.ChatLayout.Terminal}})
+    expect(chat.apiSetAddressSettings).toHaveBeenCalledWith(1, {autoAccept: true, businessAddress: false, chatLayout: T.ChatLayout.Terminal})
+  })
+
+  it("does not update the address settings when they are the same", async () => {
+    const chat = fakeChat()
+    chat.apiGetUserAddress.mockResolvedValue({...address, addressSettings: {...address.addressSettings, chatLayout: T.ChatLayout.Terminal}})
+    await runBot(undefined, {addressSettings: {chatLayout: T.ChatLayout.Terminal}})
+    expect(chat.apiSetAddressSettings).not.toHaveBeenCalled()
+  })
+})
+
+describe("apiSetAddressSettings", () => {
+  it("writes the chat layout of the bot address settings", async () => {
+    const sendChatCmd = jest.fn().mockResolvedValue({type: "userContactLinkUpdated"})
+    await api.ChatApi.prototype.apiSetAddressSettings.call({sendChatCmd} as unknown as api.ChatApi, 1, {autoAccept: true, chatLayout: T.ChatLayout.Terminal})
+    const cmd: string = sendChatCmd.mock.calls[0][0]
+    expect(JSON.parse(cmd.slice(cmd.indexOf("{")))).toEqual({businessAddress: false, autoAccept: {acceptIncognito: false}, chatLayout: "terminal"})
+  })
 })
diff --git a/packages/simplex-chat-python/src/simplex_chat/bot.py b/packages/simplex-chat-python/src/simplex_chat/bot.py
index 2fa0ed39b4..2bc17f7f5d 100644
--- a/packages/simplex-chat-python/src/simplex_chat/bot.py
+++ b/packages/simplex-chat-python/src/simplex_chat/bot.py
@@ -96,6 +96,7 @@ class Bot(Client):
         update_profile: bool = True,
         auto_accept: bool = True,
         business_address: bool = False,
+        chat_layout: T.ChatLayout | None = None,
         allow_files: bool = False,
         log_contacts: bool = True,
         log_network: bool = False,
@@ -115,6 +116,7 @@ class Bot(Client):
         self._update_address = update_address
         self._auto_accept = auto_accept
         self._business_address = business_address
+        self._chat_layout = chat_layout
         self._allow_files = allow_files
 
     # ------------------------------------------------------------------ #
@@ -153,6 +155,8 @@ class Bot(Client):
             desired: T.AddressSettings = {"businessAddress": self._business_address}
             if self._auto_accept:
                 desired["autoAccept"] = {"acceptIncognito": False}
+            if self._chat_layout is not None:
+                desired["chatLayout"] = self._chat_layout
             if self._welcome is not None:
                 desired["autoReply"] = (
                     {"type": "text", "text": self._welcome}
diff --git a/packages/simplex-chat-python/src/simplex_chat/types/_types.py b/packages/simplex-chat-python/src/simplex_chat/types/_types.py
index 2535d3b2a3..af9a501d81 100644
--- a/packages/simplex-chat-python/src/simplex_chat/types/_types.py
+++ b/packages/simplex-chat-python/src/simplex_chat/types/_types.py
@@ -23,6 +23,7 @@ class AddRelayResult(TypedDict):
 class AddressSettings(TypedDict):
     businessAddress: bool
     autoAccept: NotRequired["AutoAccept"]
+    chatLayout: NotRequired["ChatLayout"]
     autoReply: NotRequired["MsgContent"]
 
 class AgentCryptoError_DECRYPT_AES(TypedDict):
@@ -1311,6 +1312,8 @@ class ChatItemDeletion(TypedDict):
     deletedChatItem: "AChatItem"
     toChatItem: NotRequired["AChatItem"]
 
+ChatLayout = Literal["classic", "terminal"]
+
 class ChatListQuery_filters(TypedDict):
     type: Literal["filters"]
     favorite: bool
@@ -1602,6 +1605,7 @@ class Contact(TypedDict):
     chatTags: list[int]  # int64
     chatItemTTL: NotRequired[int]  # int64
     uiThemes: NotRequired["UIThemeEntityOverrides"]
+    chatLayout: NotRequired["ChatLayout"]
     chatDeleted: bool
     customData: NotRequired[dict[str, object]]
 
@@ -1643,6 +1647,7 @@ class ContactShortLinkData(TypedDict):
     profile: "Profile"
     message: NotRequired["MsgContent"]
     business: bool
+    chatLayout: NotRequired["ChatLayout"]
     localBadge: NotRequired["LocalBadge"]
 
 ContactStatus = Literal["active", "deleted", "deletedByUser", "rejected"]
@@ -2175,6 +2180,7 @@ class GroupProfile(TypedDict):
     publicGroup: NotRequired["PublicGroupProfile"]
     groupPreferences: NotRequired["GroupPreferences"]
     memberAdmission: NotRequired["GroupMemberAdmission"]
+    chatLayout: NotRequired["ChatLayout"]
 
 class GroupRelay(TypedDict):
     groupRelayId: int  # int64
@@ -3780,6 +3786,7 @@ class UIThemeEntityOverride(TypedDict):
 class UIThemeEntityOverrides(TypedDict):
     light: NotRequired["UIThemeEntityOverride"]
     dark: NotRequired["UIThemeEntityOverride"]
+    chatLayout: NotRequired["ChatLayout"]
 
 class UpdatedMessage(TypedDict):
     msgContent: "MsgContent"
diff --git a/packages/simplex-chat-python/tests/test_client_and_waiters.py b/packages/simplex-chat-python/tests/test_client_and_waiters.py
index 1ecf146ec3..c4500439a5 100644
--- a/packages/simplex-chat-python/tests/test_client_and_waiters.py
+++ b/packages/simplex-chat-python/tests/test_client_and_waiters.py
@@ -729,6 +729,7 @@ class _StubApi:
 
     def __init__(self) -> None:
         self.profiles: list[dict] = []
+        self.address_settings: list[dict] = []
         self.user: dict = {"userId": 1, "profile": {"displayName": "x", "fullName": ""}}
         self.address: dict | None = None
 
@@ -758,8 +759,8 @@ class _StubApi:
     async def api_get_user_address(self, _user_id):
         return self.address
 
-    async def api_set_address_settings(self, _user_id, _settings):
-        pass
+    async def api_set_address_settings(self, _user_id, settings):
+        self.address_settings.append(settings)
 
     async def send_chat_cmd(self, _cmd):
         return {"type": "cmdOk"}
@@ -942,6 +943,55 @@ def test_sync_profile_keeps_the_bot_address_in_the_profile(monkeypatch):
     assert api.profiles[0]["contactLink"] == "https://l"
 
 
+def test_bot_address_settings_include_the_chat_layout(monkeypatch):
+    import simplex_chat.client as client_mod
+
+    api = _StubApi()
+    api.address = {
+        "connLinkContact": {"connFullLink": "https://l"},
+        "addressSettings": {"businessAddress": False, "autoAccept": {"acceptIncognito": False}},
+    }
+    monkeypatch.setattr(client_mod, "ChatApi", _init_returning(api))
+    bot = Bot(
+        profile=BotProfile(display_name="x"),
+        db=SqliteDb(file_prefix="/tmp/test"),
+        update_profile=False,
+        chat_layout="terminal",
+    )
+
+    async def go():
+        async with bot:
+            pass
+
+    asyncio.run(go())
+    assert api.address_settings == [
+        {"businessAddress": False, "autoAccept": {"acceptIncognito": False}, "chatLayout": "terminal"}
+    ]
+
+
+def test_bot_address_settings_remove_the_chat_layout_not_in_bot_settings(monkeypatch):
+    import simplex_chat.client as client_mod
+
+    api = _StubApi()
+    api.address = {
+        "connLinkContact": {"connFullLink": "https://l"},
+        "addressSettings": {"businessAddress": False, "chatLayout": "terminal"},
+    }
+    monkeypatch.setattr(client_mod, "ChatApi", _init_returning(api))
+    bot = Bot(
+        profile=BotProfile(display_name="x"),
+        db=SqliteDb(file_prefix="/tmp/test"),
+        update_profile=False,
+    )
+
+    async def go():
+        async with bot:
+            pass
+
+    asyncio.run(go())
+    assert api.address_settings == [{"businessAddress": False, "autoAccept": {"acceptIncognito": False}}]
+
+
 def test_profile_can_be_replaced(monkeypatch):
     c, _ = _client_with_stub_api(monkeypatch)
     c.profile = Profile(display_name="other", full_name="Other")
diff --git a/packages/simplex-chat-webrtc/src/call.ts b/packages/simplex-chat-webrtc/src/call.ts
index aa207939e8..aaa2acf7e8 100644
--- a/packages/simplex-chat-webrtc/src/call.ts
+++ b/packages/simplex-chat-webrtc/src/call.ts
@@ -110,6 +110,7 @@ interface WCStartCall extends IWCallCommand {
   aesKey?: string
   iceServers?: RTCIceServer[]
   relay?: boolean
+  canReconnect?: boolean
 }
 
 interface WCEndCall extends IWCallCommand {
@@ -124,6 +125,7 @@ interface WCAcceptOffer extends IWCallCommand {
   aesKey?: string
   iceServers?: RTCIceServer[]
   relay?: boolean
+  canReconnect?: boolean
 }
 
 interface WCallOffer extends IWCallResponse {
@@ -429,7 +431,7 @@ const processCommand = (function () {
     })
   }
 
-  async function initializeCall(config: CallConfig, mediaType: CallMediaType, aesKey?: string): Promise<Call> {
+  async function initializeCall(config: CallConfig, mediaType: CallMediaType, aesKey?: string, canReconnect?: boolean): Promise<Call> {
     let pc: RTCPeerConnection
     try {
       pc = new RTCPeerConnection(config.peerConnectionConfig)
@@ -520,7 +522,7 @@ const processCommand = (function () {
           : pc.iceConnectionState == "completed"
           ? "connected"
           : "connecting") /* webView 69-70 doesn't have connectionState yet */
-      if (wasConnected) {
+      if (wasConnected && canReconnect) {
         if (reconnectTimedOut) {
           reconnectingTimeout = undefined
           if (activeCall !== call || state == "connected") return
@@ -700,10 +702,10 @@ const processCommand = (function () {
           inactiveCallMediaSourcesChanged(inactiveCallMediaSources)
           setupLocalVideoRatio(getVideoElements()!.local)
 
-          const {media, iceServers, relay} = command
+          const {media, iceServers, relay, canReconnect} = command
           const encryption = supportsInsertableStreams(useWorker)
           const aesKey = encryption ? command.aesKey : undefined
-          activeCall = await initializeCall(getCallConfig(encryption && !!aesKey, iceServers, relay), media, aesKey)
+          activeCall = await initializeCall(getCallConfig(encryption && !!aesKey, iceServers, relay), media, aesKey, canReconnect)
           await setupLocalStream(true, activeCall)
           setupCodecPreferences(activeCall)
 
@@ -742,8 +744,8 @@ const processCommand = (function () {
           } else {
             const offer: RTCSessionDescriptionInit = parse(command.offer)
             const remoteIceCandidates: RTCIceCandidateInit[] = parse(command.iceCandidates)
-            const {media, aesKey, iceServers, relay} = command
-            activeCall = await initializeCall(getCallConfig(!!aesKey, iceServers, relay), media, aesKey)
+            const {media, aesKey, iceServers, relay, canReconnect} = command
+            activeCall = await initializeCall(getCallConfig(!!aesKey, iceServers, relay), media, aesKey, canReconnect)
             const pc = activeCall.connection
             // console.log("offer remoteIceCandidates", JSON.stringify(remoteIceCandidates))
             await pc.setRemoteDescription(new RTCSessionDescription(!webView69Or70() ? offer : adaptSdpToOldWebView(offer)))
diff --git a/packages/simplex-chat-webrtc/test/fullstack.test.js b/packages/simplex-chat-webrtc/test/fullstack.test.js
index 06711845a3..e67aa92dec 100644
--- a/packages/simplex-chat-webrtc/test/fullstack.test.js
+++ b/packages/simplex-chat-webrtc/test/fullstack.test.js
@@ -14,6 +14,7 @@ const DISCONNECT_DETECTION = 10000
 const RECONNECT = 20000
 const SIGNALING = 15000
 const CORE_CALL_STATUSES = ["connecting", "connected", "disconnected", "failed"]
+const CALL_RECONNECT_VERSION = 22
 
 async function withChatCall({useWorker = false}, run) {
   const dir = fs.mkdtempSync(path.join(os.tmpdir(), "simplex-call-test-"))
@@ -78,7 +79,13 @@ async function startCall({a, b, network, alice, bob, aliceContact, bobContact})
   await alice.cmd(`/_call invite @${aliceContact} ${JSON.stringify(callType)}`)
 
   const {callInvitation} = await bob.waitEvent((e) => e.type === "callInvitation", SIGNALING, "callInvitation")
-  const offer = await b.command({type: "start", media: MEDIA, aesKey: callInvitation.sharedKey, iceServers: []})
+  const offer = await b.command({
+    type: "start",
+    media: MEDIA,
+    aesKey: callInvitation.sharedKey,
+    iceServers: [],
+    canReconnect: canReconnect(callInvitation.contact),
+  })
   assert.equal(offer.resp.type, "offer", JSON.stringify(offer.resp))
   const offerSignal = await network.routeSignal("B", offer.resp.offer, offer.resp.iceCandidates)
   const callOffer = {
@@ -95,6 +102,7 @@ async function startCall({a, b, network, alice, bob, aliceContact, bobContact})
     media: MEDIA,
     aesKey: offered.sharedKey,
     iceServers: [],
+    canReconnect: canReconnect(offered.contact),
   })
   assert.equal(answer.resp.type, "answer", JSON.stringify(answer.resp))
   const answerSignal = await network.routeSignal("A", answer.resp.answer, answer.resp.iceCandidates)
@@ -107,6 +115,10 @@ async function startCall({a, b, network, alice, bob, aliceContact, bobContact})
   await Promise.all([a.waitForState("connected", RECONNECT), b.waitForState("connected", RECONNECT)])
 }
 
+function canReconnect(contact) {
+  return contact.activeConn.peerChatVRange.maxVersion >= CALL_RECONNECT_VERSION
+}
+
 async function assertAudioDecoded(a, b) {
   const before = [await a.receivedAudioEnergy(), await b.receivedAudioEnergy()]
   await sleep(2000)
diff --git a/packages/simplex-chat-webrtc/test/harness.js b/packages/simplex-chat-webrtc/test/harness.js
index d8e1668ce1..02969687ae 100644
--- a/packages/simplex-chat-webrtc/test/harness.js
+++ b/packages/simplex-chat-webrtc/test/harness.js
@@ -129,10 +129,9 @@ class Network {
 }
 
 class Peer {
-  constructor(name, page, {ignoresIceRestart = false} = {}) {
+  constructor(name, page) {
     this.name = name
     this.page = page
-    this.ignoresIceRestart = ignoresIceRestart
     this.messages = []
     this.waiters = []
     this.onResponse = async () => {}
@@ -245,7 +244,7 @@ class Signaling {
 }
 
 // useWorker encrypts media in a worker with RTCRtpScriptTransform, as the desktop app does
-async function openPeers({answerer = {}, useWorker = false} = {}) {
+async function openPeers({useWorker = false} = {}) {
   const server = await servePage()
   const url = `http://localhost:${server.address().port}/android/call.html`
   const browser = await chromium.launch({
@@ -257,15 +256,15 @@ async function openPeers({answerer = {}, useWorker = false} = {}) {
       "--autoplay-policy=no-user-gesture-required",
     ],
   })
-  const newPeer = async (name, opts) => {
+  const newPeer = async (name) => {
     const context = await browser.newContext({permissions: ["camera", "microphone"]})
-    const peer = new Peer(name, await context.newPage(), opts)
+    const peer = new Peer(name, await context.newPage())
     await peer.open(url)
     if (useWorker) await peer.page.evaluate(() => (useWorker = true))
     return peer
   }
   // A sends the call invitation and B accepts it, so B sends the WebRTC offer, as "start" command in the apps
-  const a = await newPeer("A", answerer)
+  const a = await newPeer("A")
   const b = await newPeer("B")
   const network = new Network()
   const signaling = new Signaling(network)
@@ -279,20 +278,20 @@ async function openPeers({answerer = {}, useWorker = false} = {}) {
 }
 
 // The test relays signaling between the peers directly, as the apps and the chat core would do.
-async function startCall({media = "audio", answerer = {}} = {}) {
-  const peers = await openPeers({answerer})
+async function startCall({media = "audio", canReconnect = true} = {}) {
+  const peers = await openPeers()
   const {a, b, network, signaling, close} = peers
   const relayIce = (from, to) => async (resp) => {
     if (resp.type !== "ice") return
     const {session, iceCandidates} = await network.routeSignal(from.name, resp.session, resp.iceCandidates)
-    signaling.send(() => to.command({type: "ice", iceCandidates, session: to.ignoresIceRestart ? undefined : session}))
+    signaling.send(() => to.command({type: "ice", iceCandidates, session}))
   }
   a.onResponse = relayIce(a, b)
   b.onResponse = relayIce(b, a)
 
   try {
     await a.command({type: "capabilities", media})
-    const offer = await b.command({type: "start", media, iceServers: []})
+    const offer = await b.command({type: "start", media, iceServers: [], canReconnect})
     if (offer.resp.type !== "offer") throw new Error(`B start: ${JSON.stringify(offer.resp)}`)
     const offerSignal = await network.routeSignal("B", offer.resp.offer, offer.resp.iceCandidates)
     const answer = await a.command({
@@ -301,6 +300,7 @@ async function startCall({media = "audio", answerer = {}} = {}) {
       iceCandidates: offerSignal.iceCandidates,
       media,
       iceServers: [],
+      canReconnect,
     })
     if (answer.resp.type !== "answer") throw new Error(`A offer: ${JSON.stringify(answer.resp)}`)
     const answerSignal = await network.routeSignal("A", answer.resp.answer, answer.resp.iceCandidates)
diff --git a/packages/simplex-chat-webrtc/test/reconnect.test.js b/packages/simplex-chat-webrtc/test/reconnect.test.js
index d7eb9f861e..74667df7c6 100644
--- a/packages/simplex-chat-webrtc/test/reconnect.test.js
+++ b/packages/simplex-chat-webrtc/test/reconnect.test.js
@@ -83,13 +83,15 @@ test("call reconnection", {concurrency: true}, async (t) => {
     })
   )
 
-  await t.test("ends the call when the peer does not support ICE restart", () =>
-    withCall({answerer: {ignoresIceRestart: true}}, async ({a, b, network}) => {
-      await Promise.all([a.setTimeouts({reconnectTimeout: 10000}), b.setTimeouts({reconnectTimeout: 10000})])
-      network.changePath()
-      await Promise.all([a.waitForEnded(DISCONNECT_DETECTION + 15000), b.waitForEnded(DISCONNECT_DETECTION + 15000)])
-      assert.ok(b.sessionsSent() > 0, "offerer did not restart ICE")
-      assert.equal(a.sessionsSent(), 0)
+  await t.test("ends the call without reconnecting when the peer does not support ICE restart", () =>
+    withCall({canReconnect: false}, async ({a, b, network}) => {
+      network.down = true
+      await Promise.all([a.waitForEnded(DISCONNECT_DETECTION), b.waitForEnded(DISCONNECT_DETECTION)])
+      assert.ok(!a.connectionStates().includes("reconnecting"), `A states: ${a.connectionStates()}`)
+      assert.ok(!b.connectionStates().includes("reconnecting"), `B states: ${b.connectionStates()}`)
+      assert.equal(a.connectionStates().at(-1), "disconnected")
+      assert.equal(b.connectionStates().at(-1), "disconnected")
+      assert.equal(a.sessionsSent() + b.sessionsSent(), 0, "ICE was restarted")
     })
   )
 })
diff --git a/plans/2026-06-13-chat-list-wrong-chat-preview-fix.md b/plans/2026-06-13-chat-list-wrong-chat-preview-fix.md
new file mode 100644
index 0000000000..171612edc2
--- /dev/null
+++ b/plans/2026-06-13-chat-list-wrong-chat-preview-fix.md
@@ -0,0 +1,157 @@
+# Chat list: message preview and unread counter applied to the wrong chat
+
+**PR:** #7072 · **Files:** `ChatModel.kt` (`ChatsContext.addChatItem`, `ChatModel.addSentChatItem`, `ChatInfo.inMainChatList`), `ComposeView.kt`, `FramedItemView.kt`
+
+## Symptom
+
+While a secondary chat view is open — "Chat with admins", "chat with member", or a
+group's reports view — an incoming message could land on an unrelated chat in the
+main list: that chat took the message as its last-message preview and its unread
+badge incremented. The wrong preview stays until that chat's next message or until the chat list is reloaded; the wrong
+unread count until the chat is opened (opening reloads its stats).
+
+## Root cause
+
+`ChatsContext` is a nested class with two live instances: the primary chat list
+(`ChatModel.chatsContext`, shown in the main list) and a secondary context created
+per reports / member-support view (set up in `ChatListNavLinkView.kt`, `MemberSupportChatView.kt`,
+`GroupReportsView.kt`). `SimpleXAPI` dispatches every incoming item to **both**.
+
+Inside `addChatItem`:
+
+```kotlin
+val i = getChatIndex(rhId, cInfo.id)   // searches THIS context's own list
+...
+chat = chatsContext.chats[i]           // but reads the PRIMARY singleton's list
+chatsContext.chats[i] = chat.copy(...) // ...and writes it
+```
+
+`getChatIndex` is a member of `ChatsContext`, so `chats` resolves to the receiver
+context. `chatsContext` (unqualified) is a member of the enclosing `object ChatModel`
+and always resolves to the **primary** instance. On the secondary context the two
+lists hold different chats in a different order, so `i` — a secondary-list index —
+points at an unrelated chat in the primary list, which then gets clobbered.
+
+### Why the indices diverge
+
+The secondary context's chat list starts empty (only the primary is seeded on load) and
+grows by `addChat` at index 0 as chats receive messages. The two lists fall out of step
+when a change reaches only one of them, for example:
+- a message sent in "Chat with admins" creates the group's entry only in the secondary
+  list;
+- a chat added to or removed from the primary list only (a group invitation, a contact
+  request);
+- a burst of messages within 2 s: the primary list's pop is throttled, while the
+  secondary `addChat` inserts at index 0 at once.
+
+Until #7404 is merged, the secondary pop collector rebuilds the secondary list from the primary
+one, which re-aligns them now and then, so the bug is intermittent.
+
+### How it was introduced
+
+Commit `b97e1e0f1` (#5909, "show new messages from support scope in main chat preview
+when invitee is pending") changed `chats[i]` → `chatsContext.chats[i]` at four sites
+while broadening the preview guard with `|| memberPending`. The guard change was the
+feature for received items; the `chatsContext.` qualifier also made the invitee's sent
+support messages reach the main list, but at an index from the secondary list, which
+on the secondary context updates the wrong chat.
+
+## The fix
+
+Use the receiver context's own list at all four sites, keeping the broadened guard:
+
+```diff
+- chat = chatsContext.chats[i]
++ chat = chats[i]
+- chatsContext.chats[i] = chat.copy(
++ chats[i] = chat.copy(
+- updateChatTagReadInPrimaryContext(chatsContext.chats[i], wasUnread)
++ updateChatTagReadInPrimaryContext(chats[i], wasUnread)
+- reorderChat(chatsContext.chats[i], 0)
++ reorderChat(chats[i], 0)
+```
+
+This is a byte-for-byte revert of the qualifier from `b97e1e0f1`, with the feature's
+guard preserved. `chats[i]` get/set is the idiom used elsewhere in the class.
+
+## The revert alone would break #5909
+
+A pending invitee's own **sent** support message reaches only the **active** context —
+`ComposeView` send/forward and `FramedItemView` command-send all call
+`chatsCtx.addChatItem`, and in a member-support chat `chatsCtx` is the *secondary*
+context. Before this change that call wrote `chatsContext.chats[i]`, i.e. the primary
+list, so the group's main-list preview did update — but only as a side effect of the
+bug, at whatever index happened to line up.
+
+Reverting the four sites therefore removes it: the secondary updates its own list and
+the primary is never touched, so the invitee's sent support messages stop appearing as
+the group's preview. Confirmed by testing during review.
+
+So the revert is paired with an explicit dispatch, which does the same thing on purpose
+and at the right index:
+
+```kotlin
+suspend fun addSentChatItem(activeCtx: ChatsContext, rhId: Long?, cInfo: ChatInfo, cItem: ChatItem) {
+  activeCtx.addChatItem(rhId, cInfo, cItem)
+  if (activeCtx.secondaryContextFilter != null && cInfo.inMainChatList) {
+    chatsContext.addChatItem(rhId, cInfo, cItem)
+  }
+}
+```
+
+`ChatInfo.inMainChatList` (`groupChatScope() == null || membership.memberPending`) is
+the rule `addChatItem` applies to decide whether an item updates the preview of a chat
+already in the list; both places use the property.
+
+Cross-context dispatch stays with the **caller**, matching how `processReceivedMsg`
+hands received items to both contexts and how `ChatView` handles deletes. No
+`ChatsContext` method writes the other context — the invariant this fix restores
+(the pop collector still reads the primary list until #7404).
+
+Passing the scoped `cInfo` to the primary is safe: when the group is in the main list
+`updateChatInfo` strips the scope before storing it (when it isn't, `addChat` stores it
+as received items already do), and `chatItemBelongsToScope` returns false in the primary context
+for a scoped `cInfo`, so the item never enters the primary item list.
+
+## Why it is safe
+
+- The four-site revert changes nothing for the **primary** context:
+  `chats === chatsContext.chats` there, so both forms resolve to the same list. The
+  secondary context stops touching the wrong one. The primary context additionally
+  receives items sent from a secondary view that belong in the main list (the pending
+  invitee's support messages; also a bot command tapped in the reports view, which the
+  main chat now shows).
+- `updateChatTagReadInPrimaryContext` and `increaseUnreadCounter` (through
+  `changeUnreadCounterInPrimaryContext`) already return early in a secondary context,
+  so they stay primary-only either way.
+- `popChatCollector` is per-context (`PopChatCollector(this)`), so the pop/reorder
+  calls write the context they run in (until #7404 the collector reads the primary
+  list; see "A related defect" below).
+- The unread stats increment is limited to the primary context
+  (`secondaryContextFilter == null`). The secondary context's own entry for the open
+  group is what `ChatView` reads for the unread button inside the open view; without
+  the limit it would count main-scope group messages that the view doesn't show. The
+  limit keeps increments out of that entry, as #7559 does for chats added to the list.
+- iOS is unaffected — `ItemsModel` holds only chat items and the chat list is a single
+  `chats` array on `ChatModel`, so the mis-indexing cannot occur there.
+
+## Alternatives considered
+
+- **Guard the whole block to `secondaryContextFilter == null`.** Looked smaller, but
+  the secondary list would then stop getting the preview and order updates that
+  received items give it, and the block would branch on the context type.
+- **Compute `i` against the primary list and keep the primary writes.** Would make the
+  secondary call double-update the primary preview and unread, and never update the
+  secondary list at all.
+
+## A related defect, fixed separately
+
+`PopChatCollector` is nested but not `inner`, so the unqualified `getChat` / `chats`
+inside `popCollectedChats()` also resolve to `ChatModel` — the primary list — while
+the result is written to `chatsCtx.chats`. Same class of defect, different symptom
+(it corrupts the secondary context's own list, not the main one). Fixed in #7404.
+
+## Verification
+
+Desktop, master vs this PR, with "Chat with admins" open in a group the user does not
+own: see the PR description for the reproduction and the before/after screenshots.
diff --git a/plans/2026-10-13-agent-profile-chat-layout.md b/plans/2026-10-13-agent-profile-chat-layout.md
new file mode 100644
index 0000000000..b2169ae22b
--- /dev/null
+++ b/plans/2026-10-13-agent-profile-chat-layout.md
@@ -0,0 +1,337 @@
+# Chat layout and agent peer type
+
+Date: 2026-10-13. Revised: 2026-10-21.
+
+The layout of a chat (`classic` or `terminal`) is computed by the apps from the user's choice for the chat, the layout of the chat, the user's choice for the profile and the app setting. LLM agents are identified by the peer type `agent` (section 11, implemented in master).
+
+## 1. Types
+
+```
+Types/UITheme.hs
+  ChatLayout (:47)
+    CLClassic                                "classic"
+    CLTerminal                               "terminal"
+    CLUnknown Text                           any other text, stored and sent as received
+  UIThemeEntityOverrides (:33)
+    chatLayout :: Maybe ChatLayout           user's choice for the chat or the profile, both colour modes
+Types.hs
+  Contact (:223)
+    chatLayout :: Maybe ChatLayout           layout of the address the contact was prepared from
+  GroupProfile (:924)
+    chatLayout :: Maybe ChatLayout           set by a group owner
+AppSettings.hs
+  AppSettings (:62)
+    uiChatLayout :: Maybe ChatLayout         app setting; default Just CLClassic
+Store/Profiles.hs
+  AddressSettings (:515)
+    chatLayout :: Maybe ChatLayout           set by the address owner
+Protocol.hs
+  ContactShortLinkData (:1616)
+    chatLayout :: Maybe ChatLayout           address link data, next to business
+```
+
+- Chat protocol version: unchanged.
+- JSON: a string; the key is omitted for `Nothing` (`defaultJSON`).
+- `ChatLayout` is defined in `Types/UITheme.hs`, imported by `Types.hs`.
+- `GroupProfile.chatLayout` is sent in every JSON encoding of the group profile:
+  - `x.grp.info`
+  - `x.grp.inv`
+  - `x.grp.link.inv`
+  - `x.grp.link.reject`
+  - group link data (`GroupShortLinkData`)
+  - chat link card `MCLGroup`
+
+## 2. Layout of the chat
+
+Group: `groupProfile.chatLayout`, stored in `group_profiles.chat_layout` and updated with the profile, for every member.
+
+```
+writer                                                  function
+group created by the user                               createNewGroup (Store/Groups.hs:383)
+group of a received invitation                          createGroupInvitation_ (:481); repeated invitation: updateGroupProfile
+group prepared from link data                           createPreparedGroup, createGroup_ (:928)
+group joined via a link without prepare                 createGroupViaLink', createGroup_
+x.grp.info, group link data                             updateGroupProfile (:2729)
+x.grp.link.inv of a prepared group                      updatePreparedUserAndHostMembers' (:821), updateGroupProfile
+business member profile update                          updateGroupProfileFromMember (:2823): chat_layout of the stored profile kept
+```
+
+Contact: `contacts.chat_layout`, written once.
+
+```
+record                                          chat_layout
+contact prepared from an address                ContactShortLinkData.chatLayout: APIPrepareContact (Library/Commands.hs:2222), createPreparedContact (Store/Direct.hs:407), createContact_ (Store/Shared.hs:419)
+contact of an invitation link                   NULL
+contact of an address, joined without prepare   NULL
+contact of the address owner                    NULL
+member contact                                  NULL
+```
+
+Business chat:
+
+```
+customer, prepared from a business address      businessGroupProfile profile groupPreferences chatLayout (Library/Internal.hs:1218), chatLayout of the link data
+customer, joined without prepare                x.grp.link.inv of acceptBusinessJoinRequestAsync (Internal.hs:1129), AddressSettings.chatLayout (Library/Subscriber.hs:1500)
+business                                        group profile of the customer (createBusinessRequestGroup, Store/Groups.hs:2205): NULL
+```
+
+- A later change of the address layout applies to new business chats only.
+
+## 3. Sources
+
+### 3.1. Group profile
+
+```
+owner sets            /_group, /_public group: profile JSON with chatLayout
+                      /_group_profile #<groupId> <json>
+                      /set layout #<group> classic|terminal|default    SetGroupChatLayout (Library/Commands.hs:3670): updateGroupProfileByName gName $ \p -> p {chatLayout}
+member receives       x.grp.info, group link data, x.grp.link.inv of a prepared group
+```
+
+- A layout-only change of a group profile: the item "group profile updated" is created; `CRGroupUpdated` and `CEvtGroupUpdated` are sent.
+- Business chat: the profile change is stored by the business. Current-version members receive `x.grp.prefs`, older members receive `x.grp.info` (`runUpdateGroupProfile`, `Library/Commands.hs:4202-4215`). Business chat members apply only the preferences of `x.grp.info` (`xGrpInfo`, `Library/Subscriber.hs:3862`), so the layout of their chats is unchanged.
+
+### 3.2. Address
+
+```
+APISetAddressSettings (Library/Commands.hs:2532)    setAddressSettings user pqRatchet_ (const settings): the whole object replaces the stored settings
+SetAddressSettings (:2534), /auto_accept            setAddressSettings user pqRatchet_ (\stored -> settings {chatLayout = fromMaybe stored layout change})
+setAddressSettings (:4160)                          stored settings read once; compared with the new settings; link data written when shortLinkDataSet;
+                                                    updateUserAddressSettings (Store/Profiles.hs:640)
+contactShortLinkData (:4843)                        ContactShortLinkData p msg business layout Nothing
+```
+
+- Invitation links: `chatLayout` of the link data is `Nothing`.
+
+### 3.3. User choices
+
+```
+chat       uiThemes.chatLayout of the contact or group    /_set theme @<contactId>|#<groupId> <json>    APISetChatUIThemes (Library/Commands.hs:1657)
+profile    uiThemes.chatLayout of the user                /_set theme user <userId> <json>               APISetUserUIThemes (:1650)
+app        Kotlin appPrefs.chatLayout, iOS chatLayoutDefault, AppSettings.uiChatLayout
+```
+
+- Each theme command writes the whole record; the apps keep `chatLayout` in every theme write (section 6).
+
+## 4. Precedence
+
+Computed by the apps; `CLUnknown` counts as absent.
+
+```
+activeChatLayout     chat choice, else defaultChatLayout
+defaultChatLayout    layout of the chat, else profile choice, else app setting, else classic
+```
+
+- Note folders have no chat values: the profile choice and the app setting apply.
+
+## 5. Storage
+
+Migration `M20261019_chat_layout`, SQLite and Postgres:
+
+```
+contacts.chat_layout TEXT
+group_profiles.chat_layout TEXT
+user_contact_links.chat_layout TEXT
+```
+
+- The three columns are dropped by the down migration.
+- User choices are stored in `ui_themes` of `users`, `contacts` and `groups`.
+
+```
+column                          read                                                                      written
+contacts.chat_layout            ContactRow', after chat_item_ttl (Store/Shared.hs)                       createContact_ (Store/Shared.hs:419)
+group_profiles.chat_layout      after member_admission: groupInfoQueryFields, getConnectionEntityKeys,    createNewGroup, createGroupInvitation_, createGroup_, updateGroupProfile
+                                getGroupProfileById (Store/Groups.hs:2831)
+user_contact_links.chat_layout  toUserContactLink (Store/Profiles.hs:531)                                 updateUserAddressSettings (:640)
+```
+
+Files regenerated by the test suite:
+
+- `src/Simplex/Chat/Store/SQLite/Migrations/chat_schema.sql`: `tests/SchemaDump.hs`
+- `src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt`: `tests/SchemaDump.hs`
+- `src/Simplex/Chat/Store/Postgres/Migrations/chat_schema.sql`: `tests/PostgresSchemaDump.hs`
+
+## 6. Apps
+
+```
+                          Kotlin                                                   iOS
+ChatLayout                ChatLayoutMode (ChatModel.kt:2214), serializer          ChatTypes.swift:262, RawRepresentable, Codable
+Contact.chatLayout        ChatModel.kt:1919                                         not decoded
+GroupProfile.chatLayout   ChatModel.kt:2741                                         ChatTypes.swift:3107
+ContactShortLinkData      ChatModel.kt:2780                                         ChatTypes.swift:3155
+ThemeModeOverrides        chatLayout, layoutOnly(), withChatLayout (Theme.kt:476)   chatLayout, layoutOnly() (ThemeTypes.swift:570)
+AddressSettings           SimpleXAPI.kt:7785; AddressSettingsState                  AppAPITypes.swift:1625; AddressSettingsState
+                          (UserAddressView.kt:699)                                  (UserAddressView.swift:585)
+AppSettings.uiChatLayout  SimpleXAPI.kt:8742                                        AppAPITypes.swift:2304, AppSettings.swift
+app setting               appPrefs.chatLayout (SimpleXAPI.kt:280)                   chatLayoutDefault (SettingsView.swift:219)
+```
+
+Kotlin computation, `model/ChatModel.kt`:
+
+```
+ChatInfo.chatLayout (:1861)      contact.chatLayout; groupInfo.groupProfile.chatLayout
+ChatInfo.uiThemes (:1867)        uiThemes of the contact or group
+defaultChatLayout (:1873)        chatLayout, else profileChatLayout
+activeChatLayout (:1876)         uiThemes.chatLayout, else defaultChatLayout
+profileChatLayout (:2243)        user.uiThemes.chatLayout, else the app setting, else Classic
+```
+
+Controls, Kotlin. iOS has none until it draws terminal rows.
+
+```
+chat theme screen, first section    ChatLayoutSection (views/chat/ChatInfoView.kt:1313)
+  values                            "<default> (chat)" when the chat layout is the default, else "<default> (default)"; the other layout
+  write                             setChatLayout (:1382): uiThemes.withChatLayout(layout), apiSetChatUIThemes, chat info updated in the model
+Settings › Appearance › Themes      ChatLayoutRow (views/usersettings/Appearance.kt:948), after the destination picker
+  app theme destination             Classic, Terminal: appPrefs.chatLayout, sent with the app settings
+  profile destination               "<app setting> (default)"; the other layout: themeUserDestination updated, saveThemeToDatabase (:818)
+strings                             chat_layout, chat_layout_classic, chat_layout_terminal, chat_layout_chat_suffix, chat_layout_default_suffix
+```
+
+Theme writes that keep the layout:
+
+```
+"Reset to app theme", chat           save (ChatInfoView.kt): layoutOnly() when both modes are removed; iOS ChatWallpaperEditorSheet.save
+"Reset to app theme", profile        save (Appearance.kt); iOS UserWallpaperEditorSheet.save
+"Remove image", profile destination  removeUserThemeModeOverrides: layoutOnly(); iOS the same
+app theme destination of Appearance  Kotlin: currentUser.uiThemes = uiThemes.layoutOnly(); the open chat keeps the profile layout
+image copied for both modes          iOS: the changed mode is set on the record
+```
+
+- A change of any choice recomposes the open chat; the chat list is not reloaded.
+- `GroupProfile`, `ContactShortLinkData`, `AddressSettings` and the theme records are sent back to the core whole by the apps; with the new fields the layout is kept.
+
+## 7. API and CLI
+
+```
+/_set theme user <userId> <json>              APISetUserUIThemes, existing; chatLayout in the JSON
+/_set theme <chatRef> <json>                  APISetChatUIThemes, existing; chatLayout in the JSON
+/set layout #<group> classic|terminal|default SetGroupChatLayout GroupName (Maybe ChatLayout); CRGroupUpdated
+/_group_profile #<groupId> <json>             APIUpdateGroupProfile, existing
+/_group <userId> <json>                       APINewGroup, existing
+/_show_address <userId>                       APIShowMyAddress, existing
+/_address_settings <userId> <json>            APISetAddressSettings, existing; the whole settings object
+/auto_accept on [business|incognito=on|off] [layout=classic|terminal|default] [text <auto reply>]    deprecated; SetAddressSettings
+/auto_accept off [layout=classic|terminal|default]
+/_prepare contact <userId> <links> <json>     APIPrepareContact, existing; chatLayout in the link data JSON
+```
+
+- Constructors: `Controller.hs:596`, `:682`. Parsers: `chatCommandP` (`Library/Commands.hs:6629`, `:6665`), `chatLayoutP`, `chatLayoutP_` (`:6815-6816`), `autoAcceptP` (`:6937`).
+- `SetAddressSettings {pqRatchet, settings, chatLayout :: Maybe (Maybe ChatLayout)}`: `Nothing` keeps the stored layout (`/auto_accept` without `layout=`), `Just Nothing` removes it (`layout=default`).
+
+## 8. Terminal (`View.hs`)
+
+```
+viewChatLayout (:1936)          "chat layout: <layout>", when set
+viewContactInfo (:1896)         chatLayout of the contact
+viewAddressSettings (:1192)     after the auto_accept line
+viewGroupUpdated (:2117)        "chat layout changed to: <layout>" or "chat layout removed"
+viewGroupProfile (:2163)        after the welcome message lines
+/u, /i                          the user and chat choices: "UI themes" JSON line
+```
+
+## 9. Libraries and docs
+
+Clients read the address settings with `/_show_address` and write back the whole object with `/_address_settings`:
+
+```
+src/Simplex/Chat/Bot.hs                                 initializeBotAddress': SetAddressSettings Nothing settings Nothing; the stored layout is kept
+packages/simplex-chat-nodejs/src/api.ts                 BotAddressSettings.chatLayout (:43), default undefined; apiSetAddressSettings (:419) writes it
+packages/simplex-chat-nodejs/src/util.ts                botAddressSettings (:48): chatLayout of the address, compared by createOrUpdateAddress
+packages/simplex-chat-client/typescript/src/client.ts   apiGetAddressSettings (:116), apiSetAddressSettings (:129)
+                                                        enableAddressAutoAccept (:106), disableAddressAutoAccept (:111): the stored settings, then their parameters
+packages/simplex-chat-python/src/simplex_chat/bot.py    Bot(chat_layout: T.ChatLayout | None = None): None removes the stored layout
+bots/src/API/Docs/Commands.hs                           cliCommands: "SetGroupChatLayout"
+docs/protocol/simplex-chat.schema.json                  groupProfile.optionalProperties: chatLayout {"enum": ["classic", "terminal"]}
+docs/protocol/simplex-chat.md                           x.grp.info: chatLayout of the group profile
+apps/multiplatform/spec                                 state.md (precedence), services/theme.md (ThemeModeOverrides), client/chat-view.md (section 10)
+apps/ios/spec/services/theme.md                         ThemeModeOverrides.chatLayout
+regenerated by tests/APIDocs.hs                         bots/api/TYPES.md
+                                                        packages/simplex-chat-client/types/typescript/src/types.ts
+                                                        packages/simplex-chat-python/src/simplex_chat/types/_types.py
+```
+
+## 10. Compatibility and tests
+
+```
+group profile with chatLayout, older core           the key is ignored
+x.grp.info or link data of an older owner           group_profiles.chat_layout is replaced with NULL; the chat follows
+unsigned x.grp.info forwarded by an older relay     encoded again: chatLayout is removed from the forwarded profile
+signed x.grp.info                                   forwarded as received bytes
+address link data with chatLayout, older client     the key is ignored; chat_layout of the contact is NULL, also after the upgrade
+theme record with chatLayout, older app             the key is ignored; a theme written by the older app has no chatLayout
+unknown layout value                                stored and sent as received (CLUnknown); skipped by the precedence
+directory service                                   layout-only change of a listed group: sameProfile (Directory/Service.hs:533) is true; the listing is unchanged
+remote desktop                                      chat and profile choices: theme records of the host; app setting: of the desktop
+databases that ran the earlier migration            keep groups.chat_layout, groups.user_chat_layout, contacts.user_chat_layout, users.chat_layout, unused
+```
+
+```
+tests/ChatTests/Profiles.hs
+  testSetUITheme (:3810)                   theme with chatLayout terminal written and read for the user, a contact and a group
+  testGroupChatLayout (:3860)              group created with terminal; member by invitation: terminal
+                                           /set layout #team classic: owner and member classic; /group_profile line
+                                           member prepared from the link: classic; /set layout #team default: owner and member NULL; the prepared member joins: NULL
+  testGroupLinkChatLayout (:3918)          member joined by /c <full link> without prepare: terminal
+  testUnknownChatLayout (:3935)            group created with "wide": CLUnknown "wide" stored and read
+  testAddressChatLayout (:3941)            /_address_settings with chatLayout; prepared contact: terminal, also after the connection; contact of the address owner: NULL
+                                           /auto_accept without layout= keeps the stored layout; layout=default removes it; /_address_settings writes the whole object
+  testBusinessAddressChatLayout (:3985)    prepared business chat: terminal; chat of the business: NULL; customer joined by the full link: terminal
+tests/ChatTests/Groups.hs
+  testChannelChatLayout (:10555)           /set layout #team terminal by the channel owner: owner, relay and subscriber joined via the short link: terminal
+tests/ProtocolTests.hs (:357, :360)        x.grp.info with "terminal"; "wide" decoded as CLUnknown "wide"
+tests/ChatTests/Utils.hs (:734, :741)      contactChatLayout: Contact.chatLayout; groupChatLayout: groupProfile.chatLayout
+nodejs tests/bot.unit.test.ts              apiSetAddressSettings writes chatLayout; runBot updates the address when chatLayout differs, and not when the settings are the same
+python tests/test_client_and_waiters.py    Bot(chat_layout="terminal") sets the layout (:946); Bot() removes the stored layout (:972)
+```
+
+Untested:
+
+- contact created without prepare
+- prepared contact of an invitation link: NULL
+- member contact: NULL
+- business chat: later change of the address layout
+- business chat: `x.info` profile update (`updateGroupProfileFromMember`)
+- `x.grp.info` of an older owner
+- address layout in link data after a user profile update (`updateProfile_`)
+- Kotlin controls and theme writes: checked on desktop on 2026-10-21; no automated tests
+- iOS theme writes: not compiled here
+- Postgres down migration
+
+## 11. Peer type `agent`
+
+Implemented in master: #7738 (type and icons), #7751 (incognito profiles keep the peer type), #7752 (the MCP server sets it). Peer type and layout are independent: the layout of a chat with an agent follows section 4; `chatLayout` of the agent's address is the layout of the chat.
+
+```
+Types.hs (:753, :772, :778)                 ChatPeerType: CPTAgent, text "agent"
+Kotlin ChatModel.kt (:2183-2211)            ChatPeerType.Agent, "agent", in text and serializer
+Kotlin ChatModel.kt (:2246)                 peerTypeIcon: Bot ic_cube, Agent ic_agent, otherwise ic_account_circle_filled
+iOS ChatTypes.swift (:227, :297)            ChatPeerType.agent, "agent"; peerTypeIcon: bot cube.fill, agent Image("agent") of SharedAssets.xcassets, otherwise person.crop.circle.fill
+contact icon                                Contact.chatIconName (ChatModel.kt:1975), Contact.chatIcon (ChatTypes.swift:2581): peerTypeIcon
+link alert icon                             ConnectPlan.kt:720, NewChatView.swift:1134: peerTypeIcon, business icon for business addresses
+isBot                                       peerType bot only (ChatModel.kt:1970, ChatTypes.swift:2573): an agent contact has no commands menu and commands are not sent on tap (useCommands, menuCommands)
+incognito                                   generateIncognitoProfile (Library/Internal.hs:1341): the incognito profile keeps the peer type of the user
+set by                                      APICreateActiveUser and APIUpdateProfile with peerType "agent": packages/simplex-chat-mcp/src/serve.ts:89, :189-190
+generated                                   bots/api/TYPES.md, types.ts, _types.py; docs/protocol/simplex-chat.schema.json peerType enum
+tests                                       tests/ProtocolTests.hs: x.info with agent peer type
+```
+
+## Interfaces
+
+```
+ChatLayout                            Kotlin ChatLayoutMode: Classic, Terminal, Unknown(type); iOS: classic, terminal, unknown
+GroupProfile.chatLayout               layout of the group, for every member
+Contact.chatLayout                    layout of the address, stored when the contact is prepared
+UIThemeEntityOverrides.chatLayout     user's choice for the chat or the profile
+ChatInfo.activeChatLayout             Kotlin: section 4
+core                                  /set layout #<group> classic|terminal|default
+                                      /_set theme user <userId> <json>
+                                      /_set theme <chatRef> <json>
+Kotlin                                fun ThemeModeOverrides.layoutOnly(): ThemeModeOverrides?
+                                      fun ThemeModeOverrides?.withChatLayout(chatLayout: ChatLayoutMode?): ThemeModeOverrides?
+iOS                                   func ThemeModeOverrides.layoutOnly() -> ThemeModeOverrides?
+```
+
+## Depends on
+
+- `2026-10-13-flat-chat-layout-ui.md`: reader of `ChatInfo.activeChatLayout`; owner of drawing and of the theme screens of terminal chats.
diff --git a/plans/2026-10-13-flat-chat-layout-ui.md b/plans/2026-10-13-flat-chat-layout-ui.md
new file mode 100644
index 0000000000..6cd111acb9
--- /dev/null
+++ b/plans/2026-10-13-flat-chat-layout-ui.md
@@ -0,0 +1,263 @@
+# Terminal chat layout: UI
+
+Date: 2026-10-13. Revised: 2026-10-14, 2026-10-19, 2026-10-21, 2026-10-24.
+
+Chats with the layout `terminal` are drawn by the Android and desktop apps as full-width start-aligned rows without bubbles. iOS draws the classic layout; its layout pickers were removed until it draws terminal rows.
+
+D1–D33: the numbered decisions of the layout review of 2026-10-23 and 2026-10-24.
+
+```
+specification    apps/multiplatform/spec/client/chat-view.md, sections 4 and 10
+product          apps/multiplatform/product/views/chat.md, "Terminal Layout"
+layout value     ChatInfo.activeChatLayout (agent profile plan, section 4)
+```
+
+## 1. Scope
+
+```
+terminal     main chat view of a direct chat, group, business chat or channel
+             member support chat view and reports view of a terminal group
+             note folder, when the profile choice or the app setting is terminal
+             theme screens of a terminal chat or profile: preview and wallpaper presets
+classic      chat item info
+unchanged    chat list preview
+             notification text
+             compose view
+             date separators
+             context menu
+             multi-select
+```
+
+## 2. Decisions
+
+```
+row               the classic item without bubble fill and tail; start-aligned for both directions
+text edge         CHAT_ITEM_TEXT_PADDING (12dp) inside the item: text, quotes, headers, media, cards, events, voice, calls, reactions
+sender row        classic group geometry and style: name 13.5sp, role label; own name in the primary colour
+avatars           groups and channels only; gutter: member image width and 4dp
+gutter            other chats: none (user, 2026-10-25)
+sender groups     new sender row after an event or a sender change, as classic: time gaps and date changes do not repeat it
+time, status      at the end of the row, for every item with a time; baseline of the time on the last baseline of the content (D3)
+                  message text ends with a transparent copy of the time, joined to the last word by no-break spaces
+                  last line without room: the last word moves to the next line with the time
+                  code block, table, rule or emoji without room: the time under them
+                  images and videos without caption: over the media in white, as classic, when the row has no space beside them
+quote             Markdown quote design: bar, text at 70%, 15sp; 5.75sp above, 5sp below, over the whole quote row
+headers           all item headers without background; 2.5sp above, 1.5sp below; name → header level 3, header → text level 2 (D8)
+                  icon 18dp, as classic, centred on the header text without height
+media             message corner clip, start at the text edge, 5.75sp above; quote thumbnails: message corner clip; roundness preference (D22)
+captions          laid out as the text of a close follow-up message: full row width, the same gap below the media, the time on the caption only (D30)
+                  media, chat link cards and voice at their own width and layout, as without text
+rule-only message rules as wide as the copy of the time; the time beside them unless a wider quote or header widens the rule (D31)
+item clip         none, so headings and emoji are drawn whole
+cards             link preview and chat link in the quote colour, message corner radius
+message text      onSurface at 87% in dark themes, both layouts
+line height       font size × 22/16 × f(w): message text, captions, quotes, code, headings, sender row, headers, event text, time (D1)
+                  cards, files, voice and calls: classic until their redesign
+                  f(w) = 1 − 0.1515 × (1 − w); w: L* contrast of the text colour divided by that of the message text, 0…1; names and the white time: f = 1
+                  full line height for every line, one-line texts included (D7); extra space split by ascent and descent (Proportional, Trim.None)
+                  slope of f(w) set by the quote (D2); light theme: message 22sp, quote 19.6sp, event text and time 15.1sp; dark theme: quote 20.1sp
+spacing level 1   lines of a quote
+spacing level 2   lines of a message; messages of one sender within 60 s; blocks of a message against the text next to them
+spacing level 3   messages of one sender 60 s or more apart; sender name → message or header; paragraph break; above a heading, also at the start of a message (D9b)
+spacing level 4   last line of a message → next sender name; above and below an event, whatever the time between them (D9a)
+level targets     measured from a baseline or a block edge to the top of the tallest letter or a block edge
+                  level 2: the line gap; level 3: 15.1sp; level 4: 20.8sp (D5)
+                  levels and heading sizes built by multiplying base values upward
+                  accepted: desktop message → event 19px (D9c)
+                  all gaps: sp constants at the top of TerminalItemView.kt (D10)
+                  one gap above a row, terminalRowGap: 4.75sp after a large gap, above a sender row, next to an event, above text at the item top starting with a heading; otherwise 0
+                  0 below a date separator and the chat banner; 4.75sp above a date separator
+                  sender row 6.5sp above, 5.5sp below; events 8.25sp above, 1.5sp below
+                  text top padding: 0 below the sender row, a header, the quote, voice or a file, 5sp below media and cards; bottom 0
+                  text starting with a heading below a quote, header or block: 4.75sp more above, terminalHeadingGap
+                  item ending with a block (image or video without caption, chat link without text): 5sp below
+                  code cards, table cards and rules: 5.75sp above, 5sp below all but the last block of a message without a meta line
+                  that last block with the time beside it: 5sp below, by messageLastBlock() and TerminalMetaLayout; the time under it: 6sp below its edge
+                  paragraph break and a heading inside a message: 4.75sp
+                  below a heading: 2.375sp (half of 4.75sp), so a heading is nearer to its own text (D21)
+                  headings: body × 1.72, 1.3125, 1 for levels 1, 2, 3 (D15, revised 2026-10-25); capitals placed as body capitals
+                  files: 2sp above; voice drawn by FramedItemView (caption, quote or header): as voice alone, 4sp above, 6sp below
+                  emoji-only items, also under a quote or header: 4.25sp above, 1.5sp below; not stretched to the item width
+                  feature and preference icons: centred on the event text, no height; merged feature icons: one event line high, centred
+                  classic: call item bottom, voice drawn without FramedItemView, the two rows of the forwarded-from header
+meta width        content measured without the meta width, except text with the transparent copy, files, emoji, events and captionless media with overlayMeta
+meta placement    never above the content; the row at least as tall as the time
+                  after a rule with room beside it: the time on the baseline of the last text line above it (D24); otherwise under the rule
+meta copy         FontWeight.Normal; icon spaces at the body1 size in dp; time and timer text at 12sp
+                  conditions of CIMetaText, except that the timer is reserved for every timed message; file encryption and signature included; tall status icon condition shared with CIMetaView
+                  one more space after the 17dp icons: sent and received status, via proxy (D29)
+event text        layout direction in both layouts (unspecified text direction); separator and copy passed apart by ChatEventWithMeta, each view puts the separator where classic has two spaces (D28); no line limit (D23)
+meta copy mark    U+200E (left-to-right layout) or U+200F (right-to-left) before the copy, so the copy stays at the line end after text in the other direction
+                  U+2060 (word joiner) before the mark, so the copy stays with the last word after the spaces of an idle live message
+event time        joined to the last word by no-break spaces
+go-to button      search results: after the item at the row end, centred on it, as classic received items; all times of the results move left together
+                  forwarded items: at the row end, centred on the item above the time line (one-line message: the forwarded line);
+                  text narrowed by the arrow, the time keeps its place (user, 2026-10-25)
+row tint          hover and press: indication over the whole row; selected: primary 10%; highlighted: primary 14%
+colours           app, user and chat themes, as classic
+wallpaper         background colour of the wallpaper, preset or custom; image omitted
+theme screens     preview as terminal rows ("alice", then "bob" in the own colour), one height for both layouts
+                  wallpaper presets as colours
+                  custom image tile, image scale, scale slider and wallpaper accent hidden
+theme export      colours and wallpaper; the layout is not exported
+classic           unchanged apart from the message text colour: no copy of the time in bubbles (decided 2026-10-23), no spacing or line-height changes
+build             kotlin.daemon.jvmargs=-Xmx4096m in apps/multiplatform/gradle.properties (D33)
+rejected          hover action bar
+                  reaction pills
+                  reply line
+                  date pill
+                  compose field shape
+                  hidden or moved timestamps
+                  gutter time
+                  colour-mode palette
+```
+
+## 3. Kotlin
+
+Paths are relative to `apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/`.
+
+```
+views/chat/ChatView.kt
+  ChatView (:268-:273)                   terminal = activeChatLayout == Terminal; LocalTerminalLayout provided
+  ChatLayout composable (:1010)          chatViewBackgroundModifier(drawWallpaperImage = !LocalTerminalLayout.current)
+  ChatItemsList (:2460-:2466)            showAvatar = terminalItemShowsSender(item, older) when terminal
+                                         terminalGap = terminalRowGap(item, older, separated, largeGap, showAvatar)
+                                         separated = terminalRowsSeparated(older row) (:3817): the banner, or rowItemSeparation of the older row with a date
+                                         rowItemSeparation(row) (:3812): one rule for the date separator, drawn and in the gap (D32)
+  local ChatItemView (:2035)             terminal branch:
+                                           ChatItemBox(top, bottom) with the row tint and terminalRowIndication; top 0
+                                           bottom TERMINAL_LEVEL_STEP above a date separator; 8dp below the newest row; otherwise 0
+                                           SelectedListItem when selecting
+                                           TerminalChatItemRow(chatItemSender or null, terminalGutter, terminalGap, terminalStartOffset and swipeableModifier)
+                                           ChatItemViewShortHand with the row interaction source
+  memberNames                            public, used by chatItemSender
+  classic                                sender rows and shouldShowAvatar as on master
+views/chat/ChatItemsMerger.kt            MergedItem.revealed: true for Single, the flag of Grouped
+views/chat/item/TerminalItemView.kt      LocalTerminalLayout, gap constants, terminalTextStyle, terminalItemShowsSender, sameSender, terminalRowGap, terminalHeadingGap
+                                         row interaction, messageLastLine, messageLastBlock, inlineIcon, ItemWithMeta (endButton centred above the time line)
+                                         ChatItemSender, chatItemSender, SenderNameAndRole, TerminalChatItemRow
+views/chat/item/ChatItemView.kt          alignEnd = sent && !terminal; item click without indication; reactions at the text edge
+                                         GoToItemButton on the side given by alignEnd; terminal: after the item in search results
+                                         and for marked deleted items, otherwise endButton of FramedItemView
+                                         chatItemTailEnabled false; clipChatItem skipped
+                                         hasQuoteOrHeader: the choice of EmojiItemView or CIVoiceView, and the heading gaps
+views/chat/item/FramedItemView.kt        transparent background; headers and quote without background; quoteBar; mediaModifier; cardModifier; thumbnailClip; endButton to ItemWithMeta
+                                         CIMarkdownText: parameter terminalTop plus terminalHeadingGap, no bottom padding, terminal text style, file encryption and signature for the copy
+                                         metaReserved: passed to ItemWithMeta, bottom gap without text; captions by the classic conditions; clipChatItem skipped
+                                         emoji: TERMINAL_EMOJI_* paddings, not stretched; quote row: TERMINAL_BLOCK_* paddings, icons without top padding
+                                         CHAT_ITEM_TEXT_PADDING (text edge); classic vertical text padding named CHAT_ITEM_TEXT_VERTICAL_PADDING
+                                         PriorityLayout(limitToPriorityWidth = !terminal || captionlessMedia), placeRelative when not limited; link preview caption without width limit; chat link card at its own width
+views/chat/item/MarkdownBlocks.kt        Modifier.quoteBar, shared with Markdown quotes; Markdown quote text with terminalTextStyle and the colour rule
+                                         heading scale TERMINAL_HEADING_RATIO, Modifier.headingBox with the px ratio of the font sizes
+                                         spacers: TERMINAL_HEADING_BOTTOM_GAP after a heading, TERMINAL_LEVEL_STEP at a paragraph break or above a heading
+                                         card margins of code, tables and rules; messageLastBlock() on the last block without a meta line (marksLastBlock)
+                                         ruleMinWidth: rules of a rule-only message as wide as the copy of the time (D31)
+                                         code: terminalTextStyle at the code size (classic: line height × 0.9); metaLine null in terminal rows unless live
+views/chat/item/CIFileView.kt            row padding TERMINAL_FILE_TOP_GAP, icon without top padding; the reserve in the size line kept
+views/chat/item/CIVoiceView.kt           voice drawn by FramedItemView: the layout of voice alone without its time; otherwise classic, start at the text edge
+views/chat/item/EmojiItemView.kt         TERMINAL_EMOJI_* paddings at the text edge, messageLastLine()
+views/chat/item/TextItemView.kt          messageTextColor(); terminalReserveSpaceForMeta at the end of message text
+                                         meta line of a live message: encryption, signature and the outer direction, as the blocks
+                                         ruleMinWidth measured from the copy of a rule-only message
+views/chat/item/CIMetaView.kt            reserveSpaceForMeta with span parameters: the classic string and terminalReserveSpaceForMeta
+                                         terminalReserveSpaceForMeta: word joiner and direction mark, icon spaces in dp; tallStatusIcon shared with CIMetaText
+                                         time style with lineHeightColor
+views/chat/item/CIChatFeatureView.kt     merged feature icons: one event line high, centred in terminal rows
+views/chat/item/CIEventView.kt           chatEventPadding(), chatEventTextStyle(), ChatEventWithMeta (separator, and time or copy, apart; classic as before, D28)
+                                         CIEventView without a line limit in terminal rows (D23)
+item views with ItemWithMeta             FramedItemView, EmojiItemView, CIVoiceView, CICallItemView, DeletedItemView, MarkedDeletedItemView
+                                         IntegrityErrorItemView, CIRcvDecryptionError, CIGroupInvitationView
+item views with ChatEventWithMeta        CIChatFeatureView, CIFeaturePreferenceView, CIMemberCreatedContactView, event items of ChatItemView
+views/chat/ChatInfoView.kt               ChatLayoutSection, setChatLayout; LocalTerminalLayout of the chat theme screen
+views/helpers/ThemeModeEditor.kt         layoutSection slot of ChatWallpaperEditor; terminal passed to editColor
+views/usersettings/Appearance.kt         ChatLayoutRow; PreviewInEitherLayout; terminal preview rows with terminalRowGap
+                                         presets as colours; custom image tile, image scale, scale slider and accent hidden
+                                         LocalTerminalLayout by profileLayoutIsTerminal
+```
+
+## 4. iOS
+
+```
+drawing         classic
+controls        none; the pickers return with terminal rows
+theme writes    chatLayout kept (agent profile plan, section 6)
+terminal rows   in this pull request, after the Kotlin part is approved and reviewed (D11)
+```
+
+## 5. Tests
+
+`apps/multiplatform/common/src/commonTest/kotlin/chat/simplex/app/TerminalItemViewTest.kt`, `terminalItemShowsSender`:
+
+- oldest item: shown
+- same sender: hidden, also an hour later
+- another group member; a direction change: shown
+- after an event item: shown
+- date change: hidden
+- channel post after a member message: shown
+- owner switching between posting as the channel and under the own name: shown
+- integrity error: grouped with its sender
+- after a deleted message of the same sender: hidden
+- note folder items: grouped
+- event item: no sender row
+
+`terminalRowGap` and `terminalHeadingGap`:
+
+- oldest item; close messages: 0
+- large gap; sender row; next to an event: `TERMINAL_LEVEL_STEP`
+- heading at the item top: row gap, no heading gap
+- heading below a quote or a forwarded header: heading gap, no row gap
+- heading not first; text without heading: neither
+- separated rows: 0
+- heading below a deletion, the live state, a file or media: heading gap; in unknown content without a file: row gap
+
+`terminalRowsSeparated`: a date change of a single or revealed row, the chat banner: separated; a collapsed group, the same date, no older row: not separated
+
+`apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/TerminalMetaCopyTest.kt`:
+
+- classic reserve strings: unchanged, via proxy included
+- copy text: word joiner and direction mark, the classic spaces, one more space after the tall status and via-proxy icons
+- icon spaces: one width at font scales 0.7, 0.75, 1 and 1.3; the time scaled with the font; the marks without width
+- copy after spaces, as in an idle live message: on the line of the last word
+- copy after words in the other direction on a wrapped last line: at the line end, in both directions
+- a message of a rule only: the rule as wide as the copy (D31)
+
+`apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/TerminalMetaLayoutTest.kt`, `ItemWithMeta` in terminal rows:
+
+- time baseline on the last baseline of the content
+- content narrowed by the time box without `metaReserved`
+- last line with room: time beside it; without room: `TERMINAL_META_GAP` under the content, the row taller
+- last block at the bottom with the time beside it: `TERMINAL_BLOCK_BOTTOM_GAP` added
+- content without a baseline: time `TERMINAL_META_GAP` above the content bottom
+- content shorter than the time: time at the top, the row as tall as the time
+- overlay meta when content and time exceed the row: at the bottom end of the content; under a wider quote, on the media corner
+- overlay meta on content shorter than the time: at the top of the content, the row as tall as the time
+- end button: at the row end, centred above the time box; content narrowed by it; the time at the row end
+- last line with room, right-to-left
+
+`apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/PriorityLayoutTest.kt`: terminal elements at their own width, classic elements at the media width; terminal placement at the start edge right-to-left, classic unmirrored.
+
+`apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/ChatEventTextTest.kt`: classic separator and event text as before (D28); terminal separator of transparent no-break spaces before the copy.
+
+Checked on desktop on 2026-10-21:
+
+1. Direct chat, group and channel: rows, sender rows, avatars in groups, time at the row end for every item kind.
+2. Spacing: close messages at the line pitch (22px).
+3. Search and forwarded items: go-to button in the gutter.
+4. Theme screens of a terminal chat and profile: preview, presets, hidden controls.
+5. Layout choices: chat, profile and app; the open chat is redrawn at once; "Reset to app theme" keeps the chat layout; the choices are kept after a restart.
+
+## Later
+
+```
+line heights    app-wide, in the redesign (D6)
+items           link preview, chat link, files, voice and calls on the levels and line heights, in the redesign (D8)
+style guide     one document for both apps with platform differences, after merge (D13)
+```
+
+## Depends on
+
+```
+agent profile plan             ChatLayout; ChatInfo.activeChatLayout; storage of the choices
+block Markdown rendering       MarkdownBlocks; Modifier.quoteBar shared with Markdown quotes
+```
diff --git a/plans/2026-10-13-message-parts.md b/plans/2026-10-13-message-parts.md
new file mode 100644
index 0000000000..ac6befddc3
--- /dev/null
+++ b/plans/2026-10-13-message-parts.md
@@ -0,0 +1,400 @@
+# Message parts
+
+A text longer than one chat message is sent as several parts and shown as one chat item; for an update of the text only the changed parts are sent.
+
+References are to `/code/simplex-chat-4`, master. Paths without a directory are in `src/Simplex/Chat/`.
+
+## 1. Limit of one message
+
+15602 bytes is the limit of every encoded chat message in every chat, and of the head and of every part of a split text. With PQ a body over 13380 bytes is delivered compressed.
+```
+creation    encodeChatMessage maxEncodedMsgLength (Library/Internal.hs:2353); over 15602: SELargeMsg (Store/Messages.hs:242)
+batching    batchMessages maxEncodedMsgLength (Library/Internal.hs:2493)
+delivery    connection without PQ: a body of up to 15602, as encoded (Library/Internal.hs:2578)
+            connection with PQ: a body over 13380 is compressed; still over 13380: CEException "large compressed body" (:2495-2501)
+            a contact connection has PQ after the first received message (:1842-1845)
+relay       forwarded batch of up to 15763 (Library/Subscriber.hs:4234, Messages/Batch.hs:90)
+receiver    up to 65536 bytes after decompression (Protocol.hs:944, 1028)
+```
+
+## 2. Protocol and types
+
+`Protocol.hs`:
+```
+msgPartsVersion              next free chat version (23); currentChatVersion (:96) is raised
+maxMsgParts = 8
+maxQuotedTextLength = 2000   -- escaped bytes (3.1)
+```
+
+The head is the `x.msg.new` or `x.msg.update` message of an item. Part 1 is its `content.text`. The text of an item with parts is the field `text` of its `MsgContent`: the received parts, concatenated in order.
+
+New field `parts :: Maybe Int`, the number of parts; absent = 1:
+```
+MsgContainer (:691, mcSimple :718)                with silent :: Maybe Bool of 2026-10-13-silent-messages.md
+                                                  and new partsId :: Maybe SharedMsgId: random ID of the parts of a new item
+XMsgUpdate (:463, parser :1421, encoder :1514)    last field; positional uses:
+                                                  Library/Commands.hs:811, 845, 1474
+                                                  Library/Subscriber.hs:589, 769, 1088, 1339, 4048
+```
+
+New event `x.msg.part`, tag `XMsgPart_`:
+```
+XMsgPart
+  msgId :: SharedMsgId      -- part of a new item: partsId of its head; part of an update, live part: ID of the item
+  partNo :: Int             -- 2 .. maxMsgParts
+  text :: Text
+  live :: Maybe Bool        -- applied on receipt to a live item
+  scope :: Maybe MsgScope
+  asGroup :: Maybe Bool
+
+sites         ChatMsgEvent :460
+              CMEventTag :1077
+              StrEncoding (CMEventTag e) :1139
+              StrEncoding ACMEventTag :1200
+              toCMEventTag :1263
+              appJsonToCM :1407
+              chatToAppMessage :1500
+properties    hasNotification XMsgPart_ = False (:1338)
+              hasDeliveryReceipt XMsgPart_ = False (:1349)
+              isForwardedGroupMsg XMsgPart {} = True (:528)
+              signableContent XMsgPart_ = False (:1374)
+              assertDirectAllowed: XMsgPart_ -> False (Library/Commands.hs:5826)
+```
+
+Messages of a change, in order:
+```
+new item              parts 2..n; x.msg.new
+edit                  changed parts; x.msg.update
+live update, head     changed parts; x.msg.update with live = true
+live update, other    changed parts with live = true
+end of live item      changed parts; x.msg.update
+```
+
+The head of a live update is sent in each of these cases:
+- the content with part 1 as its text differs from that of the item
+- the mentions differ
+- the number of parts is lower
+- all parts are unchanged
+
+`Messages.hs`, `CIMeta` (`:509`) and `mkCIMeta` (`:535`): new `partsMissing :: BoolDef`, set when a part of 2..n is not received; next to `silent` of the silent messages plan.
+
+## 3. Sender
+
+### 3.1. Split and update
+
+New function `splitMsgParts` in `Library/Internal.hs`:
+```
+input         chat version range; head event with the whole text; parts of the item, for an update
+output        head event with part 1 and parts; texts of parts 2..n; numbers of the changed parts
+encoded       encodeChatMessage (Protocol.hs:986) with an item ID of the generated length
+escaped t     length of t as a JSON string of aeson, without the quotes
+headBudget    maxEncodedMsgLength − length of the encoded head with text "", parts = maxMsgParts and, in x.msg.new, partsId
+partBudget    maxEncodedMsgLength − length of the encoded x.msg.part with text "" and partNo = maxMsgParts
+cut b t       longest prefix of t with escaped ≤ b, in one pass over the characters
+part 1        cut headBudget text
+part k ≥ 2    cut partBudget (rest of the text)
+
+update item newText:
+  old = text of the item cut by item_parts              -- one part for NULL
+  k = largest i < length old such that old[1..i] is a prefix of newText and, for i ≥ 1, the new head with old[1] fits
+  new = old[1..k] ++ parts from k + 1 of (newText without old[1..k])
+  changed = [i | i <- [2 .. length new], i > length old || new[i] /= old[i]]
+```
+- The text is the field `text` of `MsgContent`. `MCUnknown` is sent as one message.
+- A text is split when the head with the whole text is over the limit.
+
+Errors:
+```
+SELargeMsg                                    headBudget is negative
+                                              the text has more than maxMsgParts parts
+                                              MCUnknown over the limit
+                                              direct chat: the peer version is below msgPartsVersion
+CECommandError "long text: signed message"    the message is signed (signMsgs, Library/Commands.hs:4937; reuseSign, :846)
+CECommandError "long text: relay <name>"      channel: relay <name> of the recipients is below msgPartsVersion
+```
+
+### 3.2. Sending
+
+Text is split in the three places of this section. Every other sender of content sends one message, as now.
+
+New item, `sendContactContentMessages` (`Library/Commands.hs:4877-4878`) and `sendGroupContentMessages_` (`:4961-4962`); the items of a command are sent in order:
+1. Containers are built as now (`prepareMsgs` `:4898`, `prepareGroupMsg` `Library/Internal.hs:212`) and passed to `splitMsgParts`. `partsId` of an item with parts is generated by `getSharedMsgId` (`Library/Commands.hs:5159`).
+2. Consecutive items without parts are sent by one call, as now.
+3. Item with parts: its parts are sent by one call of `sendDirectContactMessages` (`Library/Internal.hs:2244`) or `sendGroupMessages` (`:2699`), then its head by the existing call, before the messages of the next item.
+4. The results of the calls are joined in item order; in a group the `GroupSndResult` values are merged.
+5. An error of a part is the error of its item (`prepareSndItemsData`, `Library/Commands.hs:5061`): its head is skipped, and the part messages created for it are deleted (new `deleteSndMessages`).
+
+Update, `APIUpdateChatItem` (`Library/Commands.hs:811-818`, `:845-854`): changed parts are sent by `sendDirectContactMessages` or `sendGroupMessages`; the head, when sent, by the existing calls (`:812`, `:847`).
+
+All three places:
+- Recipients of parts are the recipients of the head.
+- SMP flag of a call (`Library/Internal.hs:2248`, `:2748`), with `eventHasNotification` of the silent messages plan:
+```
+parts only           False
+head x.msg.new       True; False with silent
+head x.msg.update    False
+```
+- `item_parts` and the links of the part messages are written by `setChatItemParts` in the transaction of the item:
+```
+NewSndChatItemData (Library/Internal.hs:2983)        new fields itemParts, partMsgIds; silent of the silent messages plan
+saveSndChatItems.createItem (:3011)                  setChatItemParts
+APIUpdateChatItem (Library/Commands.hs:813, :848)    setChatItemParts
+```
+- A version is recorded when a head is sent (`addInitialAndNewCIVersions`, `Library/Commands.hs:816, 851`).
+- Item status is set from the delivery events of head messages: part messages are excluded in `getChatItemIdsByAgentMsgId` (`Store/Messages.hs:2522`), the query of every status update.
+- Quote: the quoted text is cut to `maxQuotedTextLength` with `cut`, after `updatedMentionNames` (`Library/Internal.hs:225`, `Library/Commands.hs:4911`). `CIQuote.formattedText` is parsed from the cut text. The quote of a report is cut in the same way.
+
+## 4. Receiver
+
+`Library/Subscriber.hs`. Dispatch of `x.msg.part`; when a condition is false, the part is dropped with `messageError`:
+```
+direct processEvent (:586)     handler
+group processEvent (:1080)     inside checkSendAsGroup and memberCanSend with p.scope, as XMsgUpdate (:1088-1091)
+processForwardedMsg (:4041)    inside memberCanSend, as XMsgUpdate (:4048-4049)
+```
+
+### 4.1. Pseudocode
+
+Key of a pending part: chat (connection of the contact, or group), author (member of the message; none for a forwarded channel message), p.msgId, partNo. Key of a head, `key h`: `partsId` for `x.msg.new`, the item ID for `x.msg.update`.
+```
+on x.msg.part p:
+  drop unless 2 ≤ p.partNo ≤ maxMsgParts and byte length of p.text ≤ maxEncodedMsgLength
+  if p.live == Just True:
+    item_ <- find item (chat, author, p.msgId, p.asGroup)          -- as x.msg.update, :2091, :2342-2347
+    case item_ of
+      Just item | item.live && allowed item p -> setPart item p
+      _ -> drop
+  else:
+    save pending p                 -- the pending part with the same key is deleted
+    pending parts of the chat and author over 4 × maxMsgParts: the oldest are deleted
+
+on head h with parts = n > 1:      -- x.msg.new, x.msg.update
+  drop unless n ≤ maxMsgParts, h is unsigned, byte length of h.text ≤ maxEncodedMsgLength
+  ps = pending parts (chat, author, key h) with partNo ≤ n
+  parts = [ps[k] <|> part k of the item | k <- [2..n]]            -- Nothing: not received
+  text = h.text ++ concat (catMaybes parts)
+  msgParts = (lengths of Just h.text : parts, messages of ps)
+  existing handler of h, with text as the content text and msgParts in RcvMessage
+  delete pending parts (chat, author, key h) that are left
+
+on head h without parts:
+  existing handler of h; item_parts of an updated item is set to NULL
+
+setPart item p:
+  item_parts is extended to p.partNo with parts that are not received
+  part p.partNo = p.text
+  content text = received parts concatenated
+  emit chatItemUpdated
+
+allowed item p:
+  the item content is CIRcvMsgContent
+  msgVerified of the item is other than MVSigned
+  group: p is sent by the author of the item; channel item: by an owner (as :2350-2356)
+  group: prohibitedSimplexLinks is False for the resulting text (as :2299)
+```
+
+### 4.2. Functions and transactions
+
+`RcvMessage` (`Messages.hs:1179`): new field `msgParts`; `Nothing` in `createNewRcvMessage` (`Store/Messages.hs:344`); set at dispatch of a head with parts.
+```
+save pending          saveRcvMsgPart, one transaction: replaced part message deleted; row inserted; limit applied
+setPart               one transaction: content, text, item_parts (getChatItemParts, setChatItemParts), link of the part message
+head, pending parts   getRcvMsgParts, before the handler
+head, item created    saveRcvChatItem' (Library/Internal.hs:3034): setChatItemParts with msg.msgParts
+head, item updated    transactions at :2082, :2098, :2328, :2373: setChatItemParts with msg.msgParts
+```
+- `setChatItemParts` is called when the stored content is the message content. In that transaction `item_parts` is written, the merged part messages are inserted in `chat_item_messages`, and their pending rows are deleted.
+- A pending part is deleted by deletion of its message; the row is deleted by cascade.
+- The existing handlers of the head events are called with the whole text. Content checks, mentions, moderation and blocking are applied to it, as now.
+- A version is recorded when a head is applied (`:2100`, `:2375`), as now. Only the content text and `item_parts` are changed by `setPart`.
+- `partsMissing` of an item: `item_parts` has a part that is not received.
+- Messages of one chat are processed one at a time, under the lock of the send commands (`:146`; `Library/Commands.hs:752, 758, 799, 824`).
+- `cleanupManager` (`Library/Commands.hs:5909`), new step: pending parts older than one day are deleted (`deleteOldRcvMsgParts`).
+
+`Markdown.hs`, `hasObfuscatedSimplexLink` (`:195`): applied to windows of `2 × maxEncodedMsgLength` characters with a step of `maxEncodedMsgLength`.
+
+## 5. Storage
+
+Migration `M20261013_message_parts` (working name), SQLite and Postgres, registered in both `Migrations.hs` and `simplex-chat.cabal`. The migration is named with the date of its merge, and its name is ordered after every released migration name, the migration of the silent messages plan included (`Store/SQLite/Migrations.hs:363`, `Store/Postgres/Migrations.hs:117`; simplexmq `Agent/Store/Migrations.hs:32-34`). Down migration: the column, the index and the table are dropped.
+```
+chat_items
+  item_parts TEXT                    -- JSON list of part lengths in characters; null: not received; NULL: one part
+
+rcv_msg_parts                        -- pending parts
+  message_id                         -- PRIMARY KEY; FK messages ON DELETE CASCADE
+  shared_msg_id                      -- ID of the item
+  part_no
+
+idx_rcv_msg_parts_shared_msg_id
+  shared_msg_id
+```
+- Chat, author and time of a pending part: `connection_id`, `group_id`, `author_group_member_id`, `created_at` of its message (`Store/Messages.hs:336-342`).
+- `item_parts` is read with the item, next to `item_silent` of the silent messages plan; the combined change of `getGroupChatItem` is listed in "Depends on" of the agent profile plan:
+```
+ChatItemModeRow          Store/Messages.hs:2283
+item queries             :2711, :3105, :3218
+item row conversions     :1096, :2308, :2369
+```
+- `item_parts` and `item_live` are set to NULL in the UPDATE of `updateGroupChatItemModerated` (`:2859`) and of `updateGroupCIBlockedByAdmin` (`:2931`).
+- `chat_schema.sql` and `chat_query_plans.txt` are regenerated by the schema and query plan tests.
+
+## 6. Groups, channels, relays
+
+Delivery tasks of a forwarding member (relay, host), `Library/Subscriber.hs`; the result of `processEvent` (`:1069`) is a list of tasks (`:1058`, `:1133-1144`):
+```
+live part applied       one task with the context of the item (infoToDeliveryContext, as :2384)
+pending part            none
+head accepted           tasks of the merged part messages in part order, then the task of the head, with the context of the head
+part or head dropped    none
+```
+- `channelContentChanged` is signalled for an applied live part (`Library/Subscriber.hs:1136`).
+- Channel: a text is split when every relay of the recipients (`getGroupRecipients`, `Library/Internal.hs:1939`) supports `msgPartsVersion`.
+- `batchDeliveryTasks1` (`Messages/Batch.hs:84`): the batch is closed at the first task that does not fit it (`:95`); task order is kept. A task over the batch limit is reported as large (`:90`), as now.
+
+History, `sendHistory` (`Library/Internal.hs:1414`):
+```
+getGroupHistoryItems (Store/Messages.hs:3737)
+  result      item_parts of each item
+  omitted     items with a part that is not received
+  limit       the newest items with at most 100 parts in total; an item without parts counts as one
+
+processContentItem (Library/Internal.hs:1528; item_parts is passed by itemForwardMsgs, :1450), item with parts
+  text        the stored text; updatedMentionNames (:1536) is skipped
+  head        prepareGroupMsg (:1551) with part 1 as the content text, live of the item
+              and silent of the item (silent messages plan); parts = n and a new partsId are set in the returned container
+  head size   over the limit: encoded without the quote; still over: the item is omitted
+  parts       XMsgPart 2..n with that partsId, cut by item_parts; VMUnsigned, envelope msgId = Nothing, as the XMsgFileDescr events (:1559)
+  order       parts, head, file descriptions
+```
+
+## 7. API and CLI
+
+- Text of up to `maxMsgParts` parts is accepted by every command that sends or updates content through the places of 3.2.
+- `CIMeta.partsMissing` is added to every chat item. Commands, the other types and events are unchanged. An item has the whole text in every response and event.
+- Receiver events: `newChatItems` once for a new item; `chatItemUpdated` for each applied head and each applied live part.
+- An item with `partsMissing` is skipped in forwarding, as a deleted item (`forwardMsgContent`, `Library/Commands.hs:5104`). It is quoted as any item.
+
+## 8. Kotlin, iOS, terminal
+
+Kotlin paths are in `apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/`, iOS paths in `apps/ios/`.
+```
+Kotlin      model/ChatModel.kt:3871 CIMeta: val partsMissing: Boolean = false
+            views/chat/item/CIMetaView.kt:83 (meta text), :155 (reserved space): for partsMissing, StatusIconText(ic_warning, Color.Red) after the edited mark
+iOS         SimpleXChat/ChatTypes.swift:4229 CIMeta: partsMissing: Bool, false when absent
+            Shared/Views/Chat/ChatItem/CIMetaView.swift:127: for partsMissing, statusIconText("exclamationmark.triangle", red) after the edited mark
+            NSE: unchanged; parts and the head are counted in the 4 messages of a push (SimpleX NSE/NotificationService.swift:256, 545-549)
+terminal    View.hs:2362 viewReceivedMessage_, suffixes in appendLast, in this order: msgVerifiedStr;
+            " (silent)" of the silent messages plan; " (incomplete)" for an item with partsMissing
+```
+
+## 9. Libraries and docs
+
+- `CIMeta.partsMissing`: the output of the docs generator is regenerated (`bots/api/TYPES.md` and the TypeScript and Python type files of `packages/`).
+- `packages/simplex-chat-nodejs`: the whole text is passed to the core by `apiSendMessages` and `apiUpdateChatItem` (`src/api.ts:443, 482`). Added to `tests/api.test.ts`: one item for a text of several parts.
+- `docs/protocol/simplex-chat.md`: `parts` and `partsId` in `x.msg.new` (`:168`); `parts` in `x.msg.update` (`:185`); new section `x.msg.part`.
+- `docs/protocol/simplex-chat.schema.json`: `parts` and `partsId` in `msgContainer` (`:113`); `parts` in `x.msg.update` (`:470`); new `x.msg.part`.
+
+## 10. Compatibility
+
+```
+contact below msgPartsVersion          sender: SELargeMsg, as now; the version of an upgraded contact is recorded from its next message (Library/Internal.hs:1832-1840)
+group member or subscriber below       receives the parts and the head; part 1 is shown; one error event per part (Library/Subscriber.hs:1132, 4064)
+member reached through a host below    the head is encoded again without parts (Protocol.hs:1591); part 1 is shown; parts are dropped by the host
+relay below                            sender: CECommandError with the relay name; its version is recorded from each of its messages to the owner (Library/Internal.hs:1326, 2932)
+recipient queue                        item of n parts: n of its 128 messages (simplexmq Server/Env/STM.hs:273); a full queue is handled as now (Library/Subscriber.hs:1755-1762, 4407)
+remote desktop                         partsMissing = false from an older mobile; bodies up to 64 MB and 512 MB (Remote/Protocol.hs:277-281)
+bots                                   one newChatItems event with the whole text; CIMeta.partsMissing is added
+iOS push                               new item of more than 4 parts: the default notification text; the item is created when the app receives the head
+```
+
+## 11. Tests
+
+Unit tests:
+- `tests/ProtocolTests.hs`: `x.msg.part`, and `parts` in `x.msg.new` and `x.msg.update`, are encoded and decoded
+- `tests/MessageBatching.hs`: `batchDeliveryTasks1` with a task over the remaining space of the batch; task order is kept
+- `tests/MarkdownTests.hs`: `hasObfuscatedSimplexLink` with repeated `simplex:/contact#/?` of `maxMsgParts × maxEncodedMsgLength` characters
+
+`tests/ChatTests/Direct.hs`:
+- a 40 KB text: one item in one `newChatItems` event; the rows of `messages` are deleted with the item
+- a silent item of 3 parts: `eventHasNotification` is False for every message; the item of the recipient is silent; `item_silent` is unchanged by a later live part
+- uniformly random printable ASCII of 40 KB with PQ on is delivered; on failure the limit of a part on a PQ connection is `maxEncodedMsgLengthPQ`
+- 4-byte characters and control characters at each part boundary
+- a live text extended over two part boundaries; an update of one part is one message
+- a live update with a changed part 1: one `chatItemUpdated` with the new text
+- reply to a 40 KB item: the quote is 2000 escaped bytes
+- a peer at the previous version: `SELargeMsg`
+- a text of more than `maxMsgParts` parts: `SELargeMsg`
+- a head or a part above the byte limit from a modified sender is dropped
+- 6 items of 8 parts forwarded by one command are received complete
+
+`tests/ChatTests/Groups.hs`:
+- a long text forwarded by the host to a member without a connection to the sender
+- a member whose recorded version is below the real one receives the whole text
+- a live item of several parts
+- group with the `signMessages` preference: `CECommandError`; a part for a verified item is dropped
+- a part from an observer and a part from a member other than the author are dropped
+- reply to a long item whose mentioned member was renamed
+- a head received with one of its parts lost: `partsMissing`; the item is skipped by forwarding and history
+- a message of another member with the `partsId` of pending parts as its envelope `msgId`: the item is created with all parts
+
+`tests/ChatTests/ChatRelays.hs`:
+- two relays: a long post is received in full; a new subscriber receives it in history
+- a live post of several parts
+- a part with `asGroup` from a subscriber is dropped by the relay
+- 6 posts of 8 parts forwarded by one command are received complete
+- a relay at the previous version: `CECommandError` with its name
+
+Manual, on Android, desktop and iOS: an `agent` contact with `chatLayout: flat` sends silent messages with `live`, then a completion message of several parts with a heading, a list, a code block and a table. Expected: one notification with the completion text; the row is a teaser; the blocks are shown by the viewer.
+
+Released before this plan:
+- the linear parser of the block-markdown plan (section "Limits and cost")
+- the read-more plan, 2.7 of the flat layout plan and part 2 of the rendering plan
+
+Measured before release, on a mid-range phone: the time of one part applied to an item of `maxMsgParts` parts is under 50 ms in the core and under 100 ms of app redraw; above it `maxMsgParts` is lowered.
+
+## Interfaces
+
+```
+protocol    msgPartsVersion
+            x.msg.part, XMsgPart
+            MsgContainer.parts
+            MsgContainer.partsId
+            XMsgUpdate.parts
+            maxMsgParts
+            maxQuotedTextLength
+core        splitMsgParts
+API, apps   CIMeta.partsMissing
+            text of a sent or received item: at most maxMsgParts × maxEncodedMsgLength = 124,816 bytes
+            note folder items are created without a length check (Library/Commands.hs:5109-5122)
+storage     chat_items.item_parts
+            rcv_msg_parts
+            migration M20261013_message_parts (working name)
+```
+
+## Depends on
+
+`2026-10-13-silent-messages.md`, combined result:
+```
+MsgContainer          silent, parts, partsId; Nothing in mcSimple
+CIMeta, mkCIMeta      silent, partsMissing
+ChatItemModeRow       item_silent, item_parts
+NewSndChatItemData    silent, itemParts, partMsgIds
+prepareGroupMsg       one new parameter, silent (silent messages plan); part 1 and parts are set after it by splitMsgParts
+sendHistory           prepareGroupMsg (Library/Internal.hs:1551) with silent and live of the item and part 1 as the text
+SMP flag              any eventHasNotification of the events of a call; the table of 3.2
+receiver              item_silent is set from the head; unchanged by parts
+```
+- `2026-10-13-block-markdown.md`: the bound of the parsed text is its linear parser and `maxSegments`. The window change of `hasObfuscatedSimplexLink` (4.2) is named in its "Interfaces".
+- `2026-10-13-message-read-more.md`: rows are bounded by the teaser; the chat list preview, the compose context item and the notification text by `msgPrefix`.
+- `2026-10-13-flat-chat-layout-ui.md`: flat rows are bounded by its section 2.7; the `partsMissing` mark is part of `CIMetaView` in both layouts.
+- `2026-10-13-block-markdown-rendering.md`: rows are bounded by `MSG_MAX_BLOCKS` block views (rendering plan, 2.2); the `partsMissing` mark is drawn in the added meta line.
+
+## Open questions
+
+1. "Read more" in the flat layout: a flat row above 500 lines (16,000 characters on a phone) is a teaser, against "CLI layout does not need read more". Recommended: accept; smaller texts are drawn in full.
+2. Maximum text of one item: 8 parts (124,816 bytes, 16 items per recipient queue) or 32 parts (499,264 bytes, 4 items). Recommended: 8.
+3. iOS push: 4 messages are received per push; with 4 or more silent messages, live updates or parts queued before the completion message its notification text is "message received". Recommended: accept in this release.
+4. Long text is refused for a contact below `msgPartsVersion`, for signed messages (groups with the `signMessages` preference, signed channel posts) and for a channel with a relay below the version. Recommended: accept; parts of signed messages in a later chat version.
+5. An item with a part that is not received is shown with the received text and a red warning icon in the meta; it is skipped by forwarding and history. Recommended: yes.
+6. Name of the second layout. Recommended: `flat`.
+7. Release grouping: three releases, message parts last. Recommended: yes.
diff --git a/plans/2026-10-13-message-priority.md b/plans/2026-10-13-message-priority.md
new file mode 100644
index 0000000000..c5ea825854
--- /dev/null
+++ b/plans/2026-10-13-message-priority.md
@@ -0,0 +1,399 @@
+# Message priority
+
+Date: 2026-10-13. Replaces `2026-10-13-silent-messages.md`.
+
+A group member marks a message with a priority, when it is sent or by an update; a high priority message is an attention item of the chat, as a mention or a reply, and is shown with a bell.
+
+References are to `/code/simplex-chat-4`, commit `be2e1c1cc`. Haskell paths without a directory are in `src/Simplex/Chat/`. Layout names are those of the code: `classic` and `terminal` (`flat` in `2026-10-13-flat-chat-layout-ui.md`).
+
+## 1. Rules
+```
+priority          integer of a message: -1 low, 0 normal, 1 high; absent: 0
+                  a received value of 0 or below is normal, of 1 or above is high
+scope             groups, business chats and channels
+senders           the API, the CLI and the libraries; the apps send normal priority
+item priority     set from x.msg.new when the item is created, limited to -1 .. 1
+                  raised to 1 by an x.msg.update of the sender of the item; unchanged by every other update
+normal priority   a priority message of a sender who is not allowed (section 3), and a priority message to a contact,
+                  are sent and received with normal priority, without an error
+read item         an item already read when its priority is raised stays read; a notification is shown
+attention item    received item with userMention: mention or reply (as now), or high priority (new)
+```
+- Notifications are created for every message, as now. Notification text and sound are unchanged. The SMP notification flag is set as now for new messages, and also for an update that raises the priority.
+- Mode `MFMentions`: the apps notify for attention items, as now; a high priority item is one of them. A raise is notified once, for an unread and for a read item.
+- An item that is a mention and high priority is shown as high priority.
+
+Counters of a chat (`ChatStats`):
+```
+unreadCount           unread items                  unchanged
+unreadMentions        unread attention items        high priority included; groups only, as now
+unreadHighPriority    unread high priority items    new; 0 in direct chats and note folders
+```
+Chat list badge of a group:
+```
+sign          bell when unreadHighPriority > 0; otherwise "@" when unreadMentions > 0
+sign colour   primary for MFAll and MFMentions; secondary for MFNone
+number        unreadCount; secondary for MFMentions and MFNone, as now
+one unread    an attention item: the sign alone in a circle, as "@" now
+```
+
+| Unread items | MFAll | MFMentions | MFNone (muted) |
+|---|---|---|---|
+| 2 normal, 1 high | primary bell, primary "3" | primary bell, secondary "3" | secondary bell, secondary "3" |
+| 1 high | primary bell | primary bell | secondary bell |
+
+Other places:
+```
+list label (user tag)    bell in place of "●" when a chat of the list has unreadHighPriority > 0 and MFAll or MFMentions
+muted chat (MFNone)      notifications, list labels, the "unread" filter and profile totals: as now for a mention
+chat view                bell in the meta of the item, sent and received, in both layouts; its unread counters are unchanged
+item info                row "High priority"
+member support chats     a high priority item is counted in support_chat_items_mentions and shown with "@"; a raise by an update is ignored there
+preference               set and shown by the CLI; excluded from feature items and from the preference screens of the apps
+```
+
+## 2. Protocol and types
+```
+Protocol.hs
+  MsgContainer (:691)          priority :: Maybe Int      -- new, after live; JSON "priority": 1; omitted for Nothing
+  mcSimple (:718)              priority = Nothing
+  XMsgUpdate (:463)            priority :: Maybe Int      -- new last field; parsed by opt "priority" (:1421-1429); encoded by .=? (:1514)
+                               positional uses: Library/Commands.hs:811, 845, 1474; Library/Subscriber.hs:589, 769, 1088, 1339, 4048
+  limitPriority                new: Int -> Int; the value limited to -1 .. 1
+  cmPriority                   new, next to cmToQuotedMsg (:635): AChatMsgEvent -> Int
+                                 XMsgNew: limitPriority of the field; XMsgUpdate: 1 when the field is 1 or above; otherwise 0
+  eventHasNotification         new, next to hasNotification (:1338): ChatMsgEvent e -> Bool
+                                 True for XMsgUpdate with priority of 1 or above; otherwise hasNotification of the event tag
+Types.hs
+  IntDef                       new newtype of Int, next to BoolDef (:2337); FromJSON omittedField = Just (IntDef 0)
+Messages.hs
+  CIMeta (:509)                priority :: Maybe Int      -- new, after userMention; Nothing for 0
+  mkCIMeta (:535)              new parameter priority :: Int, after userMention
+  dummyMeta (:551)             priority = Nothing
+  ChatStats (:458)             unreadHighPriority :: IntDef    -- new, after unreadMentions
+  emptyChatStats (:467)        unreadHighPriority = IntDef 0
+Controller.hs
+  ComposedMessage (:1335)      priority :: Maybe Int      -- new; FromJSON (:1934): v .:? "priority"
+  UpdatedMessage (:1343)       priority :: Maybe Int      -- new last field; JSON derived (:1947)
+                               positional uses: Library/Commands.hs:798, 2697, 2701, 6562; apps/simplex-badge-service/src/BadgeService/Group.hs:344
+  PriorityRaised               new record
+                                 newAttention :: Bool     -- userMention of the item was False before the update
+  CEvtChatItemUpdated (:980)   priorityRaised :: Maybe PriorityRaised    -- new last field; Just for the update that raised the priority
+                               Nothing at: Library/Internal.hs:709, 855, 888; Library/Commands.hs:4847;
+                                 Library/Subscriber.hs:420, 439, 726, 1227, 1572, 1601, 2027, 2077, 2085, 2104, 2334
+                               positional patterns: View.hs:455; Terminal/Output.hs:150, 188
+```
+- In a signed message `priority` is covered by the signature. The chat protocol version is unchanged.
+
+## 3. Preference
+Who sends messages with a priority other than 0 in a group is set by a group preference. Direct chats are outside this preference: priority is ignored there (sections 4, 5).
+```
+feature     GFMsgPriority, SGFMsgPriority
+JSON name   msgPriority
+name text   "Message priority"
+type        MsgPriorityGroupPreference
+              enable :: GroupFeatureEnabled
+              role :: Maybe GroupMemberRole
+            as VoiceGroupPreference (Types/Preferences.hs:735): HasField "enable" (:800) and "role" (:927), GroupFeatureI (:851), GroupFeatureRoleI (:943)
+            FromJSON omittedField = on for admin, as SignMessagesGroupPreference (:1275)
+default     enable = on, role = admin: admins and owners, in groups, channels and business chats
+            business chat: the business is the owner (Store/Groups.hs:2245), the customer a member (:2262)
+```
+- A member may send when `enable = on` and the member role is at or above `role` (`groupFeatureMemberAllowed'`, `Types/Preferences.hs:273`). A channel post is checked with the owner role.
+- `Types/Preferences.hs`, a case or a field next to that of voice at `:205 :221 :250 :300 :321 :337 :353 :378 :396 :451 :498 :569 :588 :608 :1099 :1121`; True at `:300` and `:321`; `Nothing` in `emptyGroupPrefs` (`:588`) and `defaultBusinessGroupPrefs` (`:608`).
+- The feature is excluded from `allGroupFeatures` (`:280`), as `SGFSessions`: the feature items of a chat and the items for preference changes are unchanged.
+- CLI, parser next to that of voice (`Library/Commands.hs:6453`); the command is accepted from owners (`runUpdateGroupProfile`, `:4166`):
+```
+/set priority #<group> on|off [<role>]    SetGroupFeatureRole (AGFR SGFMsgPriority)
+/set priority #team on member             members and above; without a role: every member
+```
+- CLI views, `AGF SGFMsgPriority` appended to the feature list of `viewGroupUpdated` (`View.hs:2121`) and `viewGroupProfile` (`:2149`): `Message priority: on for admins`.
+
+## 4. Core: sending
+New message:
+```
+contact    priority of a composed message is ignored: the message is sent without the field; the item has priority 0
+group      sent value = limitPriority of the value, when it differs from 0 and groupFeatureUserAllowed SGFMsgPriority gInfo (Types.hs:689); every scope
+           otherwise the message is sent with normal priority, without an error, as ttl without the timed messages feature (sndCITimed_, Library/Internal.hs:185)
+```
+- `Library/Commands.hs:4861` `sendContactContentMessages`: `priority` of each composed message is replaced with Nothing.
+- `Library/Commands.hs:4931` `sendGroupContentMessages_`: `priority` of each composed message is replaced with the sent value.
+- `Library/Internal.hs:212` `prepareGroupMsg`: new parameter `priority :: Maybe Int`, set in the container (`:229`); passed at:
+  - `Library/Commands.hs:4994`: `priority` of the composed message
+  - `Library/Internal.hs:1551` (`sendHistory`): the priority of the stored item
+- `Library/Internal.hs:2983` `NewSndChatItemData`: `priority :: Int`:
+  - `prepareSndItemsData` (`Library/Commands.hs:5061`): `priority` of the composed message, 0 for Nothing
+  - the other 4 constructions (`Library/Internal.hs:2979`, `Library/Commands.hs:3069, 3121, 3220`): 0
+- `Library/Internal.hs:3010` `saveSndChatItems.createItem`: `priority` is passed to `createNewSndChatItem` and `mkChatItem_`.
+- `Library/Internal.hs:3081` `mkChatItem_`: new parameter `priority`; 0 at `:3079` (`mkChatItem`) and `:3414` (`createLocalChatItems`).
+- The other values of `ComposedMessage` are built with `priority = Nothing`: `Library/Commands.hs:792, 1140, 2611, 2639, 2684, 3485, 5247`; `Bot.hs:90, 97`; `apps/simplex-badge-service/src/BadgeService/Group.hs:286`. A forwarded item and a report have normal priority.
+
+Update, `APIUpdateChatItem` (`Library/Commands.hs:798`):
+```
+contact (:799), note folder    priority of the updated message is ignored
+group (:824)
+  raise        limitPriority of the value is 1, the item priority is below 1, scope is Nothing, groupFeatureUserAllowed SGFMsgPriority gInfo
+  condition    :840: changed || the item is live || raise
+  event        :845: priority = Just 1 when raise; otherwise Nothing
+  SMP flag     sendGroupSignedMessages_ (Library/Internal.hs:2748): any eventHasNotification of the events
+               unchanged: Library/Internal.hs:2248 (direct), :2552 (deliverMessage)
+               messages forwarded by relays and hosts: "Depends on"
+  item         :852: edited = changed && itemLive /= Just True     -- the present value in the present cases
+               :853: when raise, CIMeta.priority = Just 1 before updateGroupChatItem
+```
+
+## 5. Core: receiving
+New item, `Library/Internal.hs:3030` `saveRcvChatItem'`, with unchanged callers:
+```
+priority = if content is CIRcvMsgContent && rcvPriorityAllowed cd then cmPriority chatMsgEvent else 0
+userMention = (mention or reply, :3062, as now) || priority > 0
+priority is passed to createNewRcvChatItem and mkChatItem_
+
+rcvPriorityAllowed cd =          -- new, Library/Internal.hs
+  CDGroupRcv g _ m   -> groupFeatureMemberAllowed SGFMsgPriority m g && not (memberBlocked m)
+  CDChannelRcv g _   -> groupFeatureMemberAllowed' SGFMsgPriority GROwner (fullGroupPreferences g)
+  CDDirectRcv, CDLocalRcv -> False
+```
+- A message of a sender who is not allowed, and every direct message, is received as a normal message.
+- Items of group and forwarded messages (`Library/Subscriber.hs:2209, 4008`), of history, and the item created by `x.msg.update` for a missing item (`:2327`) are created by this function: that item has the priority of the update.
+- Support chat counters (`memberChatStats`, `Library/Internal.hs:3064`; `Store/Messages.hs:2195-2212`) are computed from `userMention`, unchanged.
+
+Update, `Library/Subscriber.hs:2297` `groupMessageUpdate`: new parameter, `priority` of `XMsgUpdate` (`:1088`, `:4048`). The field is ignored in the direct handler (`:589`).
+```
+updateCI (:2368), new parameters: priority of the update; cd of the item (the values at :2351, :2354)
+  requested    priority >= 1
+  raise        requested && the item priority is below 1 && scopeInfo is Nothing && rcvPriorityAllowed cd
+  condition    :2371: changed || the item is live || requested
+  edited       :2377: changed && itemLive /= Just True
+  item         when raise: CIMeta.priority = Just 1 and userMention = True, before updateGroupChatItem (:2379)
+  event        :2382: priorityRaised = Just PriorityRaised {newAttention = userMention of the item was False}, when raise
+  delivery     as now (:2384)
+```
+- The status of a raised item is unchanged: an unread item is counted by the stats queries; a read item stays read. The item priority is unchanged by an update without `priority` or with a value of 0 or below.
+
+Groups, channels, relays:
+```
+forwarding    the received event is forwarded: signed as its bytes; unsigned encoded again with priority (Protocol.hs:1591)
+              an update with requested priority is forwarded by the condition above, whatever the result of the raise for the forwarding member
+              each receiver applies rcvPriorityAllowed with the role of the author
+history       unsigned item: encoded with the priority of the stored item
+              signed item: its stored bytes, the last signed message of the item (updateChatItemSignedMsg, Store/Messages.hs:2780)
+abuse         every member with MFAll or MFMentions is notified by one message of an allowed member
+limits        the role of the preference; a message of a blocked member is received with normal priority; MFNone
+```
+
+## 6. Storage
+Migration `M20261013_msg_priority`, SQLite and Postgres, registered in `Store/SQLite/Migrations.hs`, `Store/Postgres/Migrations.hs` and `simplex-chat.cabal`. Its name is ordered after `20261019_chat_layout` of the chat layout patch (`migrations = sortOn name`, `Store/SQLite/Migrations.hs:363`). It is one `ADD COLUMN`; indexes are unchanged.
+```
+chat_items
+  item_priority INTEGER NOT NULL DEFAULT 0    -- SMALLINT in Postgres
+```
+- Down migration: the column is dropped. The schema dumps and `chat_query_plans.txt` need regeneration by the schema and query plan tests; they are never edited by hand.
+
+`Store/Messages.hs`:
+```
+createNewChatItem_ :591          new parameter priority, written to item_priority; 0 at Library/Internal.hs:3412
+createNewSndChatItem :549        new parameter priority; 0 in SendMessageBroadcast (Library/Commands.hs:2679)
+createNewRcvChatItem :565        new parameter priority
+createNewChatItemNoMsg :584      0
+updateGroupChatItem_ :2794       the UPDATE (:2803) also writes item_priority and user_mention from CIMeta
+ChatItemModeRow :2283            item_priority added
+item queries :2711 :3105 :3218   i.item_priority selected
+item rows :1096 :2308 :2369      priority passed to mkCIMeta
+toChatStats :787                 unreadHighPriority = IntDef 0, for direct chats and note folders
+GroupStatsRow :791               unreadHighPriority added after unreadMentions
+findGroupChatPreviews_ :899      :925: SUM(CASE WHEN user_mention = 1 AND item_priority > 0 THEN 1 ELSE 0 END) AS UnreadHighPriority
+getGroupUnreadCount_ :1739       :1743: the same sum in COALESCE; returns count, mentions, high priority; used at :1703, :1708, :1718
+```
+- `user_mention = 1` is tested first in both sums: the table row is read for attention items only, with `idx_chat_items_group_scope_stats_all` as it is. These two sums are the only aggregates of `item_priority`. A received high priority item always has `user_mention = 1`: both columns are written together at creation and at a raise.
+
+## 7. API and CLI
+`/_send` (`Library/Commands.hs:6174`) and `/_update item` (`:6183`) syntax is unchanged. `priority` is a property of each composed message and of the updated message:
+```
+/_send #1 json [{"msgContent": {"type": "text", "text": "done"}, "priority": 1}]
+/_update item #1 5 json {"msgContent": {"type": "text", "text": "done"}, "mentions": {}, "priority": 1}
+```
+- Streamed message: sent with `live=on`, updated with `live=on`, completed by `/_update item` without `live` and with `"priority": 1`. A message that is not live is raised by the same command, with or without a change of the text.
+- For a contact and a note folder `priority` is ignored by both commands. Responses and events: `CIMeta.priority` in chat items; `ChatStats.unreadHighPriority` where the other counters are returned; `priorityRaised` in the event `chatItemUpdated`.
+
+## 8. Apps: model
+`K`: `apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/`. `I`: `apps/ios/`.
+```
+CIMeta                 priority: Int? = null; highPriority: priority >= 1
+                       K model/ChatModel.kt:3907; I SimpleXChat/ChatTypes.swift:4272
+ChatStats              unreadHighPriority: Int = 0
+                       K model/ChatModel.kt:1502; I SimpleXChat/ChatTypes.swift:2423, also a parameter of init
+group preference       msgPriority: RoleGroupPreference in FullGroupPreferences; optional in GroupPreferences; copied by toGroupPreferences
+                       K model/SimpleXAPI.kt:6369, :6418, :6383; I SimpleXChat/ChatTypes.swift:1658, :1716, :1773
+                       returned unchanged when the other preferences are saved (K views/chat/group/GroupPreferences.kt:48; I Shared/Views/Chat/Group/GroupChatInfoView.swift:1142)
+                         by the unchanged preference screens; GroupFeature is unchanged
+new unread item        event newChatItems: unreadHighPriority + 1 for a high priority item
+                       K addChatItem, model/ChatModel.kt:612; I addChatItem, Shared/Model/ChatModel.swift:733
+items read             /_read chat items: unreadHighPriority reduced by the count of read high priority items; /_read chat: 0
+                       K markChatItemsRead :884, markItemsReadInCurrentChat :904 (third result)
+                       I markChatItemsRead ChatModel.swift:1041, apiMarkChatItemsRead SimpleXAPI.swift:1925 (new parameter highPriorityRead)
+                         unreadItemIds ChatView.swift:1838 (third result), calls :1812, :1817
+item read or removed   events chatItemsStatusesUpdated, chatItemUpdated, chatItemsDeleted, and removal of the items of a member
+                       K decreaseCounterInPrimaryContext :940: new parameter item; unreadMentions and unreadHighPriority
+                         are reduced by the flags of the item; calls :675 (pItem), :725 (cItem), :777 (item)
+                       I removeChatItem ChatModel.swift:850, removeMemberItems :885: third delta
+                         UnreadCollector :1062, changeUnreadCounter(_:by:unreadMentions:) :1162: third delta
+priority raised        event chatItemUpdated with priorityRaised: K CR.ChatItemUpdated (model/SimpleXAPI.kt:6805); I ChatEvent (Shared/Model/AppAPITypes.swift:1188)
+                       active profile, unread item: unreadHighPriority + 1; unreadMentions + 1 when newAttention; list labels by the rule below
+                       other profile, unread item, MFMentions, newAttention: profile total + 1 (as K :3026, I :2636 for a new item)
+                       notification: notifyMessageReceived, for an unread and for a read item
+                       K chatItemUpdateNotify (model/SimpleXAPI.kt:3762): new parameter priorityRaised; notify() also when it is present (:3775)
+                       I case .chatItemUpdated (Shared/Model/SimpleXAPI.swift:2670), after chatItemSimpleUpdate (:3128); showNotification as at :2645
+                       NSE: new case chatItemUpdated in NSEChatEvent (SimpleX NSE/NSEAPITypes.swift:87)
+                         receivedMsgNtf (SimpleX NSE/NotificationService.swift:1003): with priorityRaised as .newChatItems (:1024-1030); otherwise nil
+```
+`ntfsEnabled` (K `model/ChatModel.kt:1809`; I `ChatTypes.swift:2290`) is computed from `userMention`, unchanged. Unchanged notification paths of new items:
+```
+K    platform/NtfManager.kt:39; model/SimpleXAPI.kt:3026, 3041, 3072, in the one receiver loop (startReceiver, :784)
+I    Shared/Model/NtfManager.swift:253; Shared/Model/SimpleXAPI.swift:2636, 2646, 2682, 3135
+     SimpleX NSE/NotificationService.swift:1024
+```
+List labels:
+```
+UnreadTag = None | Unread | HighPriority    -- type of Chat.unreadTag; K model/ChatModel.kt:1475, I ChatModel.swift:1444
+unreadTag(chat):
+  MFAll         HighPriority if unreadHighPriority > 0; Unread if unreadChat || unreadCount > 0
+  MFMentions    HighPriority if unreadHighPriority > 0; Unread if unreadChat || unreadMentions > 0
+  MFNone, nil   Unread if unreadChat
+  otherwise     None
+unreadTags[tag]      chats of the tag with unreadTag /= None           -- as now
+priorityTags[tag]    chats of the tag with unreadTag == HighPriority   -- new map, next to unreadTags
+update(chat, was):                                                     -- was: unreadTag before the change
+  now = chat.unreadTag
+  for tag in tags of the chat:
+    unreadTags[tag]   += (now /= None) - (was /= None)
+    priorityTags[tag] += (now == HighPriority) - (was == HighPriority)
+functions with this rule     K model/ChatModel.kt: updateChatTags :319, moveChatTagUnread :380, updateChatTagReadInPrimaryContext :1052,
+                               markChatTagRead :1068, markChatTagReadInPrimaryContext_ :1076
+                             I ChatModel.swift: updateChatTags :197, markChatTagRead :251, updateChatTagRead :257, decTagsReadCount :269
+Boolean uses of unreadTag    compared with None: K views/chatlist/ChatListView.kt:1575, ChatListNavLinkView.kt:984
+                             I Shared/Views/ChatList/ChatListView.swift:676, TagListView.swift:201, :211
+other call sites             unchanged: the value before the change is passed as now
+```
+
+## 9. Apps: views
+```
+chat list badge    K views/chatlist/ChatPreviewView.kt:465-493: ic_notifications in place of ic_alternate_email when unreadHighPriority > 0
+                   I Shared/Views/ChatList/ChatPreviewView.swift:233, 241: Text(Image(systemName: "bell.fill")) in place of MENTION_START
+list label         K views/chatlist/ChatListView.kt:1348: inline icon ic_notifications, primary, when priorityTags[tag] > 0; " ●" otherwise
+                   I Shared/Views/ChatList/ChatListView.swift:1060: Text(Image(systemName: "bell.fill")) in the same place
+item meta          K views/chat/item/CIMetaView.kt: CIMetaText (:83), first element StatusIconText(ic_notifications, primary) when highPriority
+                     reserveSpaceForMeta (:155): iconSpace for it
+                   I Shared/Views/Chat/ChatItem/CIMetaView.swift: ciMetaText (:127), first element statusIconText("bell.fill", colorMode.resolve(primaryColor)),
+                     as the "xmark.seal" icon (:167)
+item info          K views/chat/ChatItemInfoView.kt: Details (:254), InfoRow with ic_notifications after "Disappears at"; itemInfoShareText (:568)
+                   I Shared/Views/Chat/ChatItemInfoView.swift: details (:135), itemInfoShareText (:520)
+string             info_row_high_priority: "High priority" (K moko-resources/base/strings.xml; I the same text)
+```
+
+## 10. Terminal
+`View.hs:709` `viewChatItem`, mark `!!` for a high priority item of a group; `!` for a mention or a reply, as now:
+```
+received    #team alice!!> done      ttyFromGroupAttention (:3100), fromGroupAttention_ (:3113): the mark in place of the Bool
+sent        #team !! done            ttyTo "!! " after ttyToGroup (:739)
+updated     the same marks in viewItemUpdate (:864), at :892 and :901, also with "[edited]"
+```
+- `Terminal/Output.hs:188`: `sendNtf` for an event with `priorityRaised`, as for a new item (`:181-185`). `markRead` (`:161`) and `setActiveChat` depend on `isUserMention`, unchanged.
+
+## 11. Libraries and docs
+- `bots/src/API/TypeInfo.hs`: `"IntDef" -> ST TInt []` (`:174`); `MsgPriorityGroupPreference` in `roleGroupPrefTypes` (`:248`). `bots/src/API/Docs/Types.hs`: `PriorityRaised` registered as `UpdatedMessage` (`:402`, `:641`).
+- Generated files are written by `tests/APIDocs.hs` (`testGenerate`, `:153`): `bots/api/TYPES.md`, `bots/api/EVENTS.md`, and the types and events files of `packages/simplex-chat-client/types/typescript/src` and `packages/simplex-chat-python/src/simplex_chat/types`.
+- New optional parameter `priority`, set in the composed or the updated message; `apiSendMessages` (`api.ts:443`) and `api_send_messages` (`api.py:196`) are unchanged:
+  - `packages/simplex-chat-nodejs/src/api.ts`: `apiSendTextMessage` (`:466`), `apiSendTextReply` (`:474`), `apiUpdateChatItem` (`:482`)
+  - `packages/simplex-chat-python/src/simplex_chat/api.py`: `api_send_text_message` (`:225`), `api_send_text_reply` (`:236`), `api_update_chat_item` (`:241`)
+  - `packages/simplex-chat-python/src/simplex_chat/client.py`: `Message.reply` (`:74`)
+- `bots/README.md`, new section "Message priority" before "How to create a bot" (`:87`): the field of a new message, the raise by an update, the group preference and its role, direct chats.
+- `docs/protocol/simplex-chat.md`: `priority` in `x.msg.new` (`:168`) and `x.msg.update` (`:185`), the receiver rules, the preference. `docs/protocol/simplex-chat.schema.json`: optional `priority` of type `integer`, as `ttl`, in `msgContainer` (`:117`) and `x.msg.update` (`:478`).
+- `apps/ios/spec` and `apps/multiplatform/spec`: the descriptions of the changed functions.
+
+## 12. Compatibility
+```
+receiver, sender before this release    "priority" is ignored by the parsers of x.msg.new and x.msg.update; a sender sends normal priority
+forwarding host or relay before         signed message: forwarded as received bytes, "priority" kept
+                                        unsigned message: encoded again from the parsed message (Protocol.hs:1591), "priority" dropped
+owner before this release               the preference is absent: the default; the received preference JSON is kept (prefsToRow, Types/Preferences.hs:181) and parsed after an upgrade
+                                        preferences saved by an app before this release are sent without msgPriority: the default applies again
+remote desktop                          host JSON is decoded by the controller core (Remote/Protocol.hs:71, :185)
+                                        newer desktop, older mobile: priority absent, unreadHighPriority 0, msgPriority by omittedField, priorityRaised absent
+                                        older desktop, newer mobile: a high priority item is shown as a mention; a raise is shown as an update, without a notification
+bots                                    priority of ComposedMessage and UpdatedMessage is optional and ignored by a core before this release (Controller.hs:1934, :1947); the response fields of section 7 are added
+downgrade                               item_priority is dropped; user_mention = 1 is kept: the items are shown as mentions
+```
+
+## 13. Tests
+`tests/ProtocolTests.hs`:
+- `x.msg.new` with `"priority":1` and with `"priority":-1`, and `x.msg.update` with `"priority":1`, are encoded and decoded
+- the fixture `testGroupPreferences` gets `msgPriority = Nothing`; group preferences without `msgPriority` are decoded to the default
+
+`tests/ChatTests/Groups.hs`, `tests/ChatTests/ChatRelays.hs`, `tests/ChatTests/Profiles.hs`; `ChatStats` is read with `getChatPreviews` through `withCCTransaction` (`tests/ChatTests/Utils.hs:671`):
+- `/_send #1 json` with `"priority": 1` by the owner: sender `#team !! done`, members `#team alice!!> done`; `unreadMentions = 1`, `unreadHighPriority = 1`; by a member: sent and received as normal
+- `/set priority #team on member`, `/set priority #team off`: `Message priority: on for members` and `Message priority: off` in the CLI views of the owner and of members; feature items unchanged; the rule applied by senders and receivers
+- `/unmute mentions #team`: a normal message is printed with `<muted>`, a high priority message without it; with a mention of the user: `!!`, counters 1 and 1
+- after `/_read chat items` for the high priority item: `unreadHighPriority = 0`; `"priority": -1`: a normal item with `priority = -1`; member blocked by the recipient: normal priority
+- message forwarded by the host to a member without a direct connection, and history (unsigned and signed item): high priority
+- channel through a relay: an owner post with priority is high priority for a subscriber; business chat: high priority for a message of the business, normal for a message of the customer
+- raise: normal message, then `/_update item` with `"priority": 1` and the same text: sender `#team !! done`, members `#team alice!!> done`; one `chatItemUpdated` with `priorityRaised`; `newAttention` false for an item that mentions the user; raise of a read item: the item stays read, `unreadHighPriority = 0`, the item has priority 1
+- streamed message: `live=on`, live updates, completion with `"priority": 1`: high priority; a later edit without `priority`: priority kept
+- raise by a member below the role: the update is sent without the field; raise in a member support chat: ignored; update with `"priority": 1` for an item deleted by the recipient: the created item is high priority
+- message to a contact with `"priority": 1`, and its update with `"priority": 1`: sent without the field; the items have priority 0
+
+Manual checks, Android, desktop, iOS:
+1. Badge table of section 1 in a group; list label; the bell is removed when the item is read or deleted; muted chat.
+2. Group set to "Mute" (`MFMentions`): notification, in-app banner and sound for a high priority message and for a raise only; app open, in background and closed; iOS push for a raise sent by the author to a member with a connection, and for a forwarded raise with the patch of `2026-10-13-forwarded-notification-flag.md`. Raise of a streamed message: one notification with the final text; the bell appears on the item, the badge and the list label.
+3. Item meta in the classic and terminal layouts, sent and received, image without text; item info. Group preferences saved from an app after `/set priority`: the value is kept. Desktop linked to a mobile of the previous release, and the reverse: chats and items are shown.
+
+## Interfaces
+```
+wire              "priority" in x.msg.new
+                  "priority" in x.msg.update
+core types        MsgContainer.priority
+                  XMsgUpdate.priority
+                  ComposedMessage.priority
+                  UpdatedMessage.priority
+                  CIMeta.priority
+                  NewSndChatItemData.priority
+                  ChatStats.unreadHighPriority
+                  PriorityRaised
+                  CEvtChatItemUpdated.priorityRaised
+                  IntDef
+core functions    limitPriority
+                  cmPriority
+                  eventHasNotification
+                  rcvPriorityAllowed
+                  prepareGroupMsg, new parameter priority
+feature           GFMsgPriority with MsgPriorityGroupPreference
+                  JSON name msgPriority
+CLI               /set priority #<group>
+terminal          mark "!!"
+storage           chat_items.item_priority
+                  migration M20261013_msg_priority
+apps              CIMeta.highPriority
+                  UnreadTag
+                  priorityTags
+```
+
+## Depends on
+`2026-10-13-forwarded-notification-flag.md`, a separate patch: the notification flag of messages forwarded by relays and hosts (delivery jobs, `Library/Subscriber.hs:4416, 4483`) is set by that patch; `eventHasNotification` is the function used by it for an update that raises the priority. The author's own send (section 4) is part of this plan.
+
+This plan is implemented independently of the other plans. Their references to `silent` of the rejected plan are replaced:
+```
+2026-10-13-message-parts.md        MsgContainer: priority, parts, partsId; priority is a field of the head only
+                                   XMsgUpdate: priority, then parts, as new last fields; the positional uses are the same sites
+                                   item_priority is set or raised by the head; unchanged by x.msg.part
+                                   CIMeta, mkCIMeta: priority, partsMissing; ChatItemModeRow: item_priority, item_parts; NewSndChatItemData: priority, itemParts, partMsgIds
+                                   prepareGroupMsg: one new parameter, priority; in sendHistory with the priority and live of the item
+                                   SMP flag of a call: any eventHasNotification of its events; a call of parts only: False
+                                   its migration is named with a later date than M20261013_msg_priority
+2026-10-13-block-markdown.md       terminal suffixes: msgVerifiedStr, then " (incomplete)"
+2026-10-13-message-read-more.md    release grouping: this plan in place of silent messages
+layout and rendering plans         the bell is part of CIMetaView in both layouts and in the added meta line
+```
+
+## Open questions
+1. Postgres: the plan of the two stats sums with the `user_mention = 1` guard is unmeasured. Recommended: measure with the data set used for SQLite before release; an index only if the rows of normal items are read.
+2. Later: a compose control for high priority in the apps; a raise by an update in a member support chat; the bell on the unread counters of the chat view, on preset filters (contacts, groups, businesses) and in member support chat lists. Recommended: later.
diff --git a/plans/2026-10-13-message-read-more.md b/plans/2026-10-13-message-read-more.md
new file mode 100644
index 0000000000..0f247898b6
--- /dev/null
+++ b/plans/2026-10-13-message-read-more.md
@@ -0,0 +1,400 @@
+# Read more for long messages
+
+Date: 2026-10-13. Revised: 2026-10-14.
+
+The app shows a long message as a teaser followed by a "Read more" link; after a tap on the link the app shows the whole message in a viewer.
+
+## Scope
+
+Only the Kotlin and iOS apps are changed. References are to branch `ep/llm-ux`, commit `31a8c86fb`.
+
+- Input: `ChatItem.formattedText`, the list of blocks of the core parser (`MarkdownList = [MarkdownBlock]`, block Markdown plan, release 2). Release 1: the segment list of the item is taken as one paragraph.
+- "Read more" is the app-only format `Format.Modal`: Kotlin `ChatModel.kt:5220`, iOS `ChatTypes.swift:5707`. Its other use, the description link (`ChatInfoView.kt:812`, `MsgContentView.swift:382`), is unchanged.
+- Desktop linked to a mobile: the teaser is computed by the desktop app from the items of the mobile core.
+
+```
+agent profile plan    2026-10-13-agent-profile-chat-layout.md, patch 01 rework
+layout plan           2026-10-13-flat-chat-layout-ui.md, layouts classic and terminal
+block Markdown plan   2026-10-13-block-markdown.md
+rendering plan        2026-10-13-block-markdown-rendering.md
+message parts plan    2026-10-13-message-parts.md
+```
+
+## Items
+
+```
+text path                Kotlin CIMarkdownText (FramedItemView.kt:445)
+                         iOS FramedItemView.ciMsgContentView (FramedItemView.swift:359)
+layout of a chat view    ChatInfo.activeChatLayout, provided by the layout plan: Kotlin LocalChatLayout, iOS EnvironmentValues.chatLayout
+texts                    every text drawn by the text path
+chat link item           the link is removed first (rendering plan)
+report                   the reason prefix (itemPrefixText) is outside the count
+live item                truncated above the teaser cost while it is updated
+```
+
+Limits:
+
+```
+limit         classic            terminal layout, or search text not blank
+maxLines      MSG_MAX_LINES      MSG_TERMINAL_MAX_LINES (layout plan)
+teaserLines   MSG_TEASER_LINES   MSG_TERMINAL_TEASER_LINES (layout plan)
+maxUnits      without limit      MSG_TERMINAL_MAX_LINES × MSG_LINE_CHARS
+teaserUnits   without limit      MSG_TERMINAL_TEASER_LINES × MSG_LINE_CHARS
+maxBlocks     MSG_MAX_BLOCKS     MSG_MAX_BLOCKS (rendering plan)
+```
+
+## Teaser rule
+
+Input: the blocks of the item. A text with `formattedText == null` is taken as one paragraph with one segment without format. Line breaks in content are text of segments without format (block Markdown plan, "Rendering contract").
+
+```
+MSG_LINE_CHARS        32 on Android and iOS
+                      80 on desktop
+MSG_MAX_LINES         24
+MSG_TEASER_LINES      16
+MSG_CODE_LINE_CHARS   240, the units drawn in CODE_MAX_WIDTH (rendering plan)
+MSG_CELL_CHARS        30, the units drawn in a table column of 240
+MSG_PREVIEW_UNITS     1000
+unit                  UTF-16 code unit
+display text          of an inline segment: the displayText argument
+                      Kotlin: itemSegmentDisplayText(ft, ci, linkMode) (TextItemView.kt:88), passed by itemTeaser
+                      iOS: segmentDisplayText (new), the text drawn by messageText (MsgContentView.swift:446-570)
+line break            Kotlin: a match of the regular expression \R; Swift: a Character with isNewline
+width                 1 per unit
+                      2 per unit in U+2E80-U+A4CF
+                      2 per unit in U+AC00-U+D7A3
+                      2 per unit in U+F900-U+FAFF
+                      2 per unit in U+FF00-U+FF60
+line cost             max(1, ceil(width of the line / chars)); chars: MSG_LINE_CHARS unless stated
+```
+
+Cost and units of a block:
+
+```
+block           cost                                                  units
+paragraph       line costs of the display text of its content         display text
+heading         as paragraph                                          display text
+quote           as paragraph                                          display text
+list item       as paragraph                                          display text
+code block      1 for the header                                      code text
+                line costs of the code lines, chars MSG_CODE_LINE_CHARS
+table           per row: the largest line cost of its cells,          cell texts
+                chars MSG_CELL_CHARS
+rule            1                                                     0
+unknown block   0                                                     0
+gap             1 before a block
+                0 before the first drawn block and before an unknown block
+                0 before a list item after a list item
+```
+
+```
+msgTeaser(blocks, live, maxLines, teaserLines, maxUnits, teaserUnits, maxBlocks):
+  limits: maxLines and maxUnits; for a live item: teaserLines and teaserUnits
+  cost, units and count of blocks within the limits and maxBlocks: null; the item is drawn in full
+  teaser: the blocks in order while cost <= teaserLines, units <= teaserUnits and count <= maxBlocks
+          the next block: cut by "Cut inside a block" to the remaining cost and units; left out when the cut is empty
+  return the teaser; it can be empty
+
+msgPrefix(segments, maxUnits):
+  segments: one text; release 2: markdownSegments(blocks) (block Markdown plan, "Rendering contract")
+  units <= maxUnits: the segments
+  otherwise: inline cut at p = maxUnits
+```
+
+### Cut inside a block
+
+p: the position of the remaining cost and units in the text of the block.
+
+```
+paragraph       inline cut at p
+heading         inline cut at p
+quote           inline cut at p
+list item       inline cut at p
+code block      the lines before the first line that does not fit
+                that line, cut at the grapheme cluster boundary at or before p, when it is the first line
+table           the header row (first row) and the rows before the first row that does not fit
+                a table with the header row only is left out
+rule            left out
+unknown block   kept
+
+inline cut
+  p at a line break   line breaks and empty lines before p are dropped
+  p inside a line     moved back to the last white space within the last MSG_LINE_CHARS units before p
+                      without such white space: to the grapheme cluster boundary at or before p
+  segment at p        none: cut
+                      bold: cut; the format is kept
+                      italic: as bold
+                      strikeThrough: as bold
+                      snippet: as bold
+                      small: as bold
+                      colored: as bold
+                      secret: as bold
+                      strong: as bold
+                      other: replaced by a segment without format that has the cut display text
+```
+
+- The cut inline content is a prefix of the segment list with the last segment cut.
+- The display text of a mention is built from the names of `ci.mentions`; of a SimpleX link, from the SimpleX link mode.
+- Command: the drawn text is "/" and `commandStr` (`TextItemView.kt:270-279`), the display text is `ft.text` (`:106`).
+
+## Truncated item
+
+```
+blocks         teaser
+               paragraph of one segment: "Read more", Format.Modal with modal name "message" and text ""
+drawn by       a list of paragraphs only: one text, the segments of markdownSegments, by MarkdownText and messageText
+               any other list: MsgBlocksView of the rendering plan
+end of text    typing indicator of a live item and meta reserve: at the end of the last paragraph (rendering plan)
+selection      the paragraph of the link is outside the desktop selection
+link           drawn and handled by the Format.Modal code of the description link (TextItemView.kt:334-340, 392-411; MsgContentView.swift:234-235, 560-565)
+```
+
+## Viewer
+
+Kotlin `showFullMessage` (`TextItemView.kt`), iOS `FullMessageView` (`FullMessageView.swift`):
+
+```
+content        the blocks of the item, drawn with the geometry and colours of the classic layout
+chatLayout     the layout of the chat view of the tap: Kotlin LocalChatLayout.current, iOS @Environment(\.chatLayout)
+items          msgLines: one MsgLine (block index, range in the display text of the block) per lazy item
+               one per line of a paragraph, heading, quote, list item and code block
+               a line above 15,000 units: items of 15,000 units by the inline cut, as MarkdownFileView.kt:57, :95
+               one per table, rule and unknown block, with the range null
+               drawn by MsgBlockView(block, range, first, last) of the rendering plan
+item           looked up by ID at each draw: Kotlin chatsCtx.chatItems, snapshot state (ChatModel.kt:424)
+               iOS im.reversedChatItems, published with a 0.2 s throttle (ChatModel.swift:78-106)
+closed         the item is removed from the chat items: deleted, or unloaded by pagination
+               meta.itemDeleted of the item differs from its value at opening
+               the open chat is changed: Kotlin KeyChangeEffect on chatModel.chatId, as ChatView.kt:753-755; iOS onChange of ChatModel.chatId
+live item      the items are built from the looked-up item at each update; the texts are drawn without meta; the list state is kept
+links          actions of the item text (TextItemView.kt:371-382, MsgContentView.swift:197-222)
+secrets        shown per lazy item; reset with the item key
+commands       sendCommandMsg (FramedItemView.kt:479, CommandsMenuView.swift:164), enabled as in the item text (FramedItemView.kt:465, MsgContentView.swift:108)
+               then close (Kotlin), dismiss (iOS)
+copy button    whole text, ci.content.text
+```
+
+## Kotlin
+
+Paths are relative to `apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/`.
+
+```
+model/ChatModel.kt, Format.Modal companion (:5221-5223)
+  const val Message = "message"
+views/chat/item/TextItemView.kt, new
+  constants of "Teaser rule"
+  msgTeaser(blocks, live, maxLines, teaserLines, maxUnits, teaserUnits, maxBlocks, lineChars, displayText): List<MarkdownBlock>?
+                                    pure function; null: drawn in full
+  msgPrefix(segments, maxUnits, displayText): List<FormattedText>
+  itemTeaser(ci, linkMode, maxLines, teaserLines, maxUnits, teaserUnits): List<MarkdownBlock>?
+                                    blocks drawn by CIMarkdownText: live text (FramedItemView.kt:459), chat link removed; maxBlocks = MSG_MAX_BLOCKS
+  MsgLine(block: Int, range: IntRange?); msgLines(blocks, displayText): List<MsgLine>, items of "Viewer"
+  showFullMessage(chatsCtx, chat, ci, chatLayout)
+views/chat/item/TextItemView.kt, MarkdownText (:125)
+  openModal: ((Format.Modal) -> Unit)? = null    new parameter
+  MODAL tap (:392-396)                           openModal; null: openMarkdownModal
+  long press (:357-366)                          condition hasLinks || hasModals; MODAL annotation: onLinkLongClick("")
+views/chat/TextSelection.kt, ItemContext (:48-50)
+  new fields                        the four line and unit limits of "Limits", Int = Int.MAX_VALUE
+views/chat/ChatView.kt, ChatItemsList (:1750)
+  terminal limits                   LocalChatLayout.current == ChatLayout.Terminal || searchValue.value.isNotBlank()
+  :2440                             ItemContext(selectionIndex = index, and the limits)
+  :2383                             SelectionHandler(manager, listState, mergedItems, revealedItems, linkMode, and the limits)
+views/chat/item/FramedItemView.kt
+  CIMarkdownText (:445)             teaser = itemTeaser(ci, linkMode, the limits of LocalItemContext.current)
+  with a teaser                     blocks of "Truncated item"; link text MR.strings.whats_new_read_more
+                                    openModal = showFullMessage(chatsCtx, chat, ci, LocalChatLayout.current)
+  without a teaser                  drawn as by the rendering plan
+  :225, :372, :380, :386, :415      onLinkLongClick is passed to CIMarkdownText
+views/chat/item/TextItemView.kt, showFullMessage
+  presentation                      main chat view (chatsCtx.secondaryContextFilter == null): ModalManager.center.showModalCloseable, as showMarkdownFile (MarkdownFileView.kt:99)
+                                    Android: full screen (ModalView.kt:249-253); desktop: over the conversation (App.kt:419-420), closed when another chat is opened (App.kt:392-400)
+                                    member support chat and reports view: ModalManager.end.showModalCloseable, stacked over that view, as item info (ChatView.kt:728-731)
+                                    after back that view is composed again (ModalView.kt:194-223)
+  title                             saved_message_title, sent_message or received_message, as ChatItemInfoView.kt:255
+  toolbar                           copy_verb, with the toast `copied`
+  body                              SelectionContainer { MarkdownFileColumn(title, false) { the items of "Viewer" } } (MarkdownFileView.kt:158, :227)
+                                    MarkdownFileColumn is made internal; item key: index and text of the line
+  text                              the parameters of CIMarkdownText (FramedItemView.kt:463-475), without meta and selection; style as TextItemView.kt:60
+                                    first line: the report reason prefix
+  selection                         SelectionContainer over the composed items; the copied text is the display text
+views/chat/TextSelection.kt, desktop selection
+  SelectionManager.itemBlocks       (ChatItem) -> List<MarkdownBlock>?, set in SelectionHandler with listState (:339-341)
+                                    itemTeaser(ci, linkMode, and the limits) ?: ci.formattedText
+  snapSelection (:121-137)          itemBlocks(ci)
+  getSelectedCopiedText (:214-227)  item with the range 0 until Int.MAX_VALUE (:256): the item prefix and ci.text (rendering plan, section 5)
+                                    anchor and focus items: itemBlocks(ci), the selected teaser text
+  offsets                           in the display text of markdownSegments, by the rendering plan (selectedItemCopiedText :264, snapOffset :295)
+```
+
+## iOS
+
+Paths are relative to `apps/ios/`. `FullMessageView.swift` is a new file, added to the SimpleX target in `project.pbxproj`.
+
+```
+SimpleXChat/ChatTypes.swift
+  Format, after :5713              static let modalMessage = "message"
+  after FormattedText (:5665)      public msgPrefix(_ segments, maxUnits:, displayText:) -> [FormattedText]
+                                   public functions of "Cut inside a block", used by msgPrefix and msgTeaser
+                                   units by String.utf16 indices with a limit; cuts at Character boundaries
+                                   MSG_LINE_CHARS
+                                   MSG_PREVIEW_UNITS
+Shared/Views/Chat/ChatItem/MsgContentView.swift
+  the other constants of "Teaser rule"
+  msgTeaser(_ blocks, live:, maxLines:, teaserLines:, maxUnits:, teaserUnits:, maxBlocks:, mentions:) -> [MarkdownBlock]?
+  segmentDisplayText(_ ft, mentions:) -> String        display text of a segment, as drawn by messageText (:446-570)
+  MsgLine; msgLines(_ blocks, mentions:) -> [MsgLine]  items of the viewer, as in Kotlin
+  MsgContentView.openModal: ((Format) -> Void)? = nil  passed to msgTextResultView (:123)
+Shared/Views/Chat/ChatItem/FramedItemView.swift, ciMsgContentView (:359)
+  terminal limits                  @Environment(\.chatLayout) is .terminal or @Environment(\.textSearch) is true
+  teaser                           msgTeaser(ft ?? [paragraph of FormattedText.plain(text)], live: ci.meta.isLive, the limits, maxBlocks: MSG_MAX_BLOCKS, mentions: ci.mentions)
+                                   ft: the blocks with the chat link removed (rendering plan)
+  with a teaser                    blocks of "Truncated item"; link text: the key "Read more" of MsgContentView.swift:379
+                                   openModal = showFullMessage(chat, im, ci, chatLayout); chatLayout: @Environment(\.chatLayout)
+Shared/Views/Chat/ChatItemView.swift, EnvironmentValues (:12-39)
+  textSearch: Bool                 default false
+Shared/Views/Chat/ChatView.swift
+  chatItemWithMenu (:2145-2146)    .environment(\.textSearch, searchText is not blank)
+  chatItemsList (:996)             on a change of the blank state of searchText: scrollView.updateItems(mergedItems.boxedValue.items, true)
+Shared/Views/Chat/ChatItem/FullMessageView.swift
+  showFullMessage(_ chat, _ im, _ ci, _ chatLayout)
+                                   showAppSheet (AppSheet.swift:34), as showMarkdownFile (MarkdownFileView.swift:31)
+                                   screen protection by its redaction (AppSheet.swift:22-30)
+  FullMessageView                  NavigationView with an inline title, as MarkdownFileView.swift:170-213
+                                   title: the key "Saved message", "Sent message" or "Received message" of ChatItemInfoView.swift:61-67
+                                   toolbar: "Copy"
+                                   ScrollView with LazyVStack of the items of "Viewer"; id: index and text of the line
+                                   @ObservedObject im; dismissed by the rules of "Viewer"
+  MessageLineView                  one item of "Viewer": MsgBlockView of the rendering plan with the chatLayout of "Viewer"
+                                   showSecrets state and msgTextResultView with sendCommand, as TextBubble (ChatItemInfoView.swift:308-322)
+```
+
+## Shared code
+
+```
+function                                         this plan            layout plan       rendering plan
+MarkdownText (TextItemView.kt:125)               openModal            chatLayout        Strong; text of one block
+CIMarkdownText (FramedItemView.kt:445)           teaser; openModal    paddings          MsgBlocksView
+messageText, MsgContentView                      openModal            chatLayout        strong; text of one block
+ciMsgContentView (FramedItemView.swift:359)      teaser; openModal    paddings; frame   MsgBlocksView
+selectedItemCopiedText (TextSelection.kt:264)    blocks of the item                     offsets in markdownSegments
+snapOffset (TextSelection.kt:295)                blocks of the item                     offsets in markdownSegments
+chatItemWithMenu (ChatView.swift:2121)           textSearch           alignment         coordinate space
+```
+
+Order of the edits: rendering plan part 1, layout plan, this plan, rendering plan part 2. Release 1: the segment list of the item as one paragraph; release 2: the blocks of the core.
+
+## Other views
+
+```
+chat list preview       msgPrefix(markdownSegments(blocks), MSG_PREVIEW_UNITS) before the renderer: ChatPreviewView.kt:277, ChatPreviewView.swift:302
+compose context item    the same: ContextItemView.kt:59, ContextItemView.swift:74
+quote in an item        the same: FramedItemView.kt:61, FramedItemView.swift:337; 2 or 3 lines, as now (FramedItemView.kt:96-99, FramedItemView.swift:324-327)
+notification text       the same before hideSecrets, with displayText ft.text: NtfManager.kt:134, Notifications.swift:200
+hidden deleted item     unchanged: header (ChatItemView.kt:698-700, ChatItemView.swift:75-76)
+emoji only item         unchanged (isShortEmoji)
+scroll to item          unchanged (ChatView.kt:3139, ChatView.swift:812)
+item info               unchanged: versions in full (ChatItemInfoView.kt:55-73, ChatItemInfoView.swift:298-322)
+copy, share, edit       unchanged: whole ci.content.text (ChatItemView.kt:426-448, 464-468; ChatView.swift:2479-2506, 2546-2557)
+```
+
+## Docs
+
+- `apps/multiplatform/spec/client/chat-view.md:319`: `TextItemView.kt` row: teaser, viewer.
+- `apps/multiplatform/spec/client/navigation.md:266-267`: message viewer in the rows of `ModalManager.center` and `ModalManager.end`.
+- `apps/ios/spec/client/chat-view.md:188-192`: `MsgContentView`: teaser; new `FullMessageView` entry.
+- Text row, teaser and "Read more": `apps/multiplatform/product/views/chat.md:57`, `apps/ios/product/views/chat.md:52`.
+
+## Tests
+
+`apps/multiplatform/common/src/commonTest/kotlin/chat/simplex/app/MsgTeaserTest.kt`, `msgTeaser` with `lineChars` 32, limits 24 and 16:
+
+```
+24 lines "a" in one paragraph                              null
+25 lines "a" in one paragraph                              lines 1 to 16
+"word " 600 times                                          102 words, 509 units
+live: "a" 288 times, LF, "b" 225 times                     line 1, LF, "b" 224 times
+one-line command: "/" and 2999 units                       one segment without format, 512 units
+secret of 3000 units                                       one secret segment, 512 units
+1500 surrogate pairs                                       256 pairs
+U+4E00 400 times                                           256 units
+24 lines "a" separated by CRLF; 25 by U+2028               null; lines 1 to 16
+25 mentions of 41 units without white space, spaced        12 mentions
+13 paragraphs of one line                                  8 paragraphs
+30 list items of one line                                  16 list items
+heading, then a paragraph of 30 lines                      heading; paragraph of 14 lines
+code block of 30 lines                                     header and 15 lines
+terminal limits, one code line of 124,816 units            code block of one line of 12,800 units
+table: header row and 30 rows of short cells               header row and 15 rows
+table: header row, one row with a cell of 3000 units       empty teaser
+paragraph of 15 lines, rule, paragraph of 15 lines         paragraph of 15 lines
+quote of 30 lines                                          quote of 16 lines
+maxBlocks 3, 4 list items of one line                      3 list items
+msgPrefix: "word " 600 times, 1000 units                   200 words, 999 units
+```
+
+`TextSelectionTest.kt`, `getSelectedCopiedText`: three items with the middle one truncated give the whole text of the middle item; a partly selected truncated item gives the selected teaser text. iOS: the vectors of `msgTeaser` and `msgPrefix`, checked as messages in a chat.
+
+Checks, Android, desktop and iOS:
+
+1. Classic layout: a message above the limit is drawn as the teaser with "Read more"; a message at the limit is drawn in full; the teaser has about 16 lines on a phone and in a desktop window.
+2. Tap on "Read more" in the main chat view: the viewer with the whole message; each tap action of the item text; after a command tap the viewer is closed; after back the chat is at the same scroll position.
+3. Viewer opened from a chat with the terminal layout: `*x*` is drawn by the rule of the layout plan.
+4. Live item above the teaser cost: the item height is constant while the item is updated; the updates are shown in the open viewer. The viewer is closed when its item is deleted, marked deleted or removed by a timer.
+5. Search with a match after the teaser: the match is drawn; after the search is closed the item is a teaser; iOS cell heights are correct in both states.
+6. Desktop: with a drag selection over a truncated item the highlight ends at the teaser end; Ctrl+C over three items gives the whole text of the middle item. Kotlin: after a long press on "Read more" the item menu is shown.
+7. Item of 124,816 bytes: chat list preview, compose context item, quote and notification show its first 1000 units.
+8. Teaser with each block type last: code, table, list item, quote; the link paragraph and the meta after it.
+
+## Interfaces
+
+```
+both      constants of "Teaser rule"
+          msgTeaser
+          msgPrefix
+          showFullMessage
+Kotlin    itemTeaser
+          MarkdownText(openModal)
+          Format.Modal.Message
+          ItemContext: the line and unit limits of "Limits"
+          SelectionManager.itemBlocks
+iOS       MsgContentView.openModal
+          Format.modalMessage
+          EnvironmentValues.textSearch
+```
+
+## Depends on
+
+```
+agent profile plan    ChatLayout: Classic, Terminal, Unknown(type)
+                      ChatInfo.activeChatLayout, computed by the core (patch 01 rework; ChatInfo.chatLayout on ep/llm-ux)
+layout plan           LocalChatLayout, default ChatLayout.Classic
+                      EnvironmentValues.chatLayout, default .classic
+                      MSG_TERMINAL_MAX_LINES = 500
+                      MSG_TERMINAL_TEASER_LINES = 400
+                      the chatLayout parameter of the texts
+                      the forced cell reload on iOS
+block Markdown plan   MarkdownBlock of "Types", release 2: blocks without nesting; rows[0] of a table is the header row
+                      formattedText == null for a plain text
+                      markdownSegments: the one-text form
+rendering plan        app types of MarkdownBlock, in release 1 without JSON use
+                      markdownSegments in the apps from release 1; iOS: in SimpleXChat, used by the NSE
+                      MsgBlocksView: a teaser list with another block kind and the link paragraph; gaps between blocks (2.2)
+                      meta and typing indicator at the end of the last paragraph (2.4); openModal passed to every text (3)
+                      MsgBlockView(block, range, first, last): range in the display text of the block, null for the whole block
+                      MSG_MAX_BLOCKS
+                      CODE_MAX_WIDTH
+                      horizontal scroll of code and tables; with wrapped code lines: chars MSG_LINE_CHARS for code
+                      removal of the chat link from the blocks
+                      desktop selection over markdownSegments, the link paragraph excluded (5)
+                      a list of paragraphs only: one text, markdownSegments, by MarkdownText and messageText (1)
+message parts plan    item text of at most maxMsgParts × maxEncodedMsgLength = 124,816 bytes
+```
+
+## Open questions
+
+1. "Read more" in the terminal layout: the product owner said that the terminal layout does not need read more. A terminal row above 500 lines (16,000 characters on a phone, 40,000 on desktop) or above `MSG_MAX_BLOCKS` blocks is a teaser; smaller texts are drawn in full. Recommended: keep these limits: one row of 124,816 bytes is one lazy item, laid out as a whole.
+2. Maximum text of one item: 8 parts (124,816 bytes, 16 items per recipient queue) or 32 parts (499,264 bytes, 4 items). Recommended: 8.
+3. `*x*` is kept as `Bold` (bold in the classic layout, italic in the terminal layout) and `**x**` is `Strong` (bold in both). Surfaces of a terminal chat with italic `*x*`: rows only, or rows and the viewer. Recommended: rows and the viewer; bold in previews, compose context and item info.
+4. Read more in the classic layout: truncated above 24 lines, teaser of 16 lines (line: 32 units on phones, 80 on desktop); a viewer screen in place of expansion in the item; live items truncated while updated; search results with the terminal limits. Recommended: accept; thresholds adjusted after a trial.
+5. Release grouping: three releases: (1) message priority, chat layout, terminal layout, read more, `Strong` with rendering part 1; (2) blocks of the core with rendering part 2; (3) message parts. Recommended: yes.
diff --git a/plans/2026-10-15-modal-opens-again-on-repeat-click.md b/plans/2026-10-15-modal-opens-again-on-repeat-click.md
new file mode 100644
index 0000000000..4360d4c288
--- /dev/null
+++ b/plans/2026-10-15-modal-opens-again-on-repeat-click.md
@@ -0,0 +1,80 @@
+# A page opens again on every click of the button that opened it
+
+Fixes #6270.
+
+## Problem
+
+Issue #6270 reports one case: on desktop (Linux), clicking "Learn more" repeatedly in a pending connection opens the page again on every click. Each copy then needs its own Back. The same bug has two causes, and both occur across the app:
+
+1. **The button stays clickable in another pane.** On desktop the window has a left pane (chat list, `ModalManager.start`), a center pane (chat or `ModalManager.center`) and a right pane (`ModalManager.end`). Each pane draws only the top modal of its own stack. When a button in one pane opens a page in another, the button stays visible and clickable, and every click pushes another copy.
+2. **A fast double click during the slide-in.** A modal slides in over 250 ms. Until it covers the button that opened it, the button still takes clicks, so a double click opens two copies. Pages slide in on Android and in the desktop left pane; in the desktop center and right panes the first page never slides, the third and later do, and the second does only after an earlier page there has slid out.
+
+Reproduced on the master prebuild (a932c82), R8 on the stable prebuild (master has the same code):
+
+| # | Steps | Clicks | Backs needed |
+|---|---|---|---|
+| R1 | Pending connection: "Learn more" or "Incognito" | 3 | 3 |
+| R2 | Your chat profiles: "+ Add profile" (form opens in the center) | 3 | 3 |
+| R3 | "Chat with admins" open on the right (a reports chat opens the same way; not tried); in the group chat, message menu → "Info" | 3 | 3 |
+| R4 | Direct chat banner: profile bio "Read more" | 3 | 3 |
+| R5 | Attach a file over 1 GB; "Large file" alert → "Support SimpleX" | 3 | 3 |
+| R6 | `.md` file clicked in a support chat on the right (viewer opens in the center) | 3 | 3 |
+| R7 | What's New opened in the center after an update → "Create your address" → "Address settings" | 3 | 3 |
+| R8 | No profile and no linked mobile: picker → "Create chat profile" | 3 | 3 |
+| D1 | Settings: double-click "Appearance" (80 ms, 150 ms) | 2 | 2 |
+| D2 | Settings: double-click "Network & servers" (80 ms) | 2 | 2 |
+| D3 | User menu: double-click "Your chat profiles" (80 ms) | 2 | 2 |
+
+Controls that don't stack on master: message "Info" with nothing open on the right, a double click on "Group preferences" when group info is the only page on the right, a double click on the new-chat pencil.
+
+## Audit
+
+Every `ModalManager.{start,center,end,fullscreen}.show*` call on master (about 170) was classified by where its button is drawn on desktop and whether that button stays clickable after the page opens. Wrapper functions and every caller of each view were followed. The cases above are all those found. All other call sites are covered by the page they open, guarded already, or open a fullscreen modal, which covers every pane.
+
+Existing guards: close the target pane first (`ChatListNavLinkView` "Set contact name", the pending-connection branch of `ChatView`), skip if a page with that id is open (`BadgesSupportSimplexView`, `BADGE_REDEEM_CODE`), toggles (the chat info button, the profile picker's incognito info), and the desktop overlay in `DesktopScreen` that closes left-pane pages on a click in the center (it guards the onboarding cards there).
+
+## Fix
+
+### Double click: block clicks on the page being covered (`ModalManager.showInView`)
+
+`AnimatedContent` draws each page in a child with its own enter or exit transition. When a modal opens, the child sliding out (`targetState == PostExit`, below the new count) also draws an empty `pointerInput` box over itself. That child is the page being covered, which is the page that opened the new one when the button is in the same pane, or, for the first modal of a pane, the empty child, whose box covers the chat list or chat under the pane. The rest of the pane is under the page sliding in, whose `Surface` already takes clicks. Nothing is blocked when a page closes, as on master.
+
+This fixes the double click for every animated modal on both platforms, with no change at the call sites.
+
+### Buttons in another pane
+
+Each site uses an existing guard, or "replace" (an on-top check followed by a close and a show), chosen by where its button can be and what the page shows:
+
+| Site | Guard | Why this one |
+|---|---|---|
+| `ContactConnectionInfoView` "Learn more", "Incognito" (R1) | desktop: close the right pane first | The button is never in the right pane on desktop. On Android the view can itself be the open modal ("Set contact name"), so the call is desktop only. |
+| The large-file and badge alerts' "Support SimpleX" (R5), which call `openBadgesView` | desktop: skip if `BADGES` is open | Badges can also be open under other right-pane pages, so the right pane can't be closed. `BADGES` is already set on this modal. Badges sub-pages stack above it, so the check is "open", not "on top": while an open Badges page is covered by another page, these two buttons do nothing. The check is at the two alerts, not in `openBadgesView`, so the "Larger files, longer" row in message Info, which its Badges page covers, is unchanged. On Android the page covers its button. |
+| `UserProfilesView` "+ Add profile" (R2), `UserPicker` "Create chat profile" (R8) | skip if `CREATE_PROFILE` is on top | Closing the center would also close What's New when it is open there, and clear `chatModel.secondaryChatsContext` while a support chat is open on the right (`closeModals()` always clears it). Both clicks open the same empty form, so the open form, with anything already typed, is kept. Both check before asking for authentication, and the picker row also hides the picker, as the form does when it opens. "On top" rather than "open": with no chat selected the center stops drawing its page stack once its last page has closed, so a closed page can stay in its list. |
+| `showFullProfileDescription` "Read more" (R4) | replace if `PROFILE_DESCRIPTION` is on top | Also opened from info pages in the right pane. The text depends on which link was clicked. |
+| `showMarkdownFile` (R6) | desktop: replace if `MARKDOWN_FILE` is on top, on the main thread | The opener can be a support chat in the right pane, which must stay. Another file must show its own text. The file is read on a background thread, so the close and show run on the main thread, where the pane reads its stack. On Android the viewer covers its file once it has loaded; taps during the load are the async case under Not fixed. |
+| `showItemDetails` message "Info" (R3) | when a secondary chat is open, replace if `CHAT_ITEM_INFO` is on top | Info already closes the right pane first unless a secondary chat is open there. In that case it was pushed over the support or reports chat on every click. The first Info over the support chat still opens over it, and Back still returns to it. The job now runs on the chat's UI scope with only the load on a background thread, so the close and show run on the main thread, as `showReports` does. |
+
+"Replace" closes and shows in one main-thread event, so the new page is drawn in the same place as the old one, from a lambda of the same call site, and Compose would keep the old page's state. That includes `AppBarTitle`'s `LaunchedEffect(title)`, so when the title is unchanged it would not reach the new page's app bar. Each replaced page, and each #6270 row, wraps its content in `key(this)`, the `ModalData` of that show, so it starts fresh.
+
+The "on top" checks use a new `isTopModalOpen`, which looks at the visible top modal (the same index as `isLastModal`). A modal closed with animation stays in `modalViews` until its slide-out ends, and `isLastModalOpen` still counts it: "replace" during those 250 ms would then call `closeModal()` on a page already closing, and `closeModal()` would close the page under it. `isLastModalOpen` and its callers are unchanged.
+
+### Not fixed
+
+- **R7, What's New "Create your address".** The address page opened from What's New in the center pushes its own pages (Address settings, SimpleX name, 1-time link, Learn more) to the left pane, beside it. Opening it in the left pane instead, where they would cover it, makes it disposed while covered: on Back it is composed again, its `autoCreateAddress` effect runs again (re-creating an address the user just deleted) and its "share with contacts" state resets. The Settings → What's New path and Android already have that flaw. Fixing it needs `UserAddressView` to keep that state across disposal, which a follow-up PR (#7756) does.
+- Async openers that load data before showing a page, e.g. the reports and support bars, the add-members, channel-members and relays rows in group info, and on Android a `.md` file tapped twice while it loads. Two clicks within the load time can still push two pages. This is a different mechanism from the slide-in. It reproduces on master (reports bar, "Invite", "Invite members", "Member reports", "Chats with members" rows) and is fixed in a follow-up PR (#7757).
+- On desktop, two different `.md` files clicked before either has loaded: the one that finishes loading last is shown, as on master; Back now returns to the chat instead of the other file.
+- `OpenWhenReceivedEffect`: a file opened when its download finishes is not a repeated click. An image opens a second fullscreen viewer over an open one, as before. On desktop a `.md` file opened this way now replaces an open `.md` viewer, so Back returns to the chat instead of the other file.
+- Keyboard and accessibility activation are not pointer input and are not blocked during a slide.
+- The `BADGES` check (`hasModalOpen`) also counts a page that is sliding out, so on desktop a click within 250 ms of closing that page, if it slid out, does nothing; a click after the slide-out works.
+- A different page opened from the same view stacks over the first one, for example bio "Read more" over contact info, and Back returns to the first page. That is normal navigation. Of the buttons this change touches, only #6270's two rows, "Incognito" and "Learn more", replace each other.
+
+## Effect
+
+- Desktop: each fixed button opens its page once. A repeated click keeps the open page or replaces it with what was clicked. The on-top check doesn't depend on which button opened the page, so a bio, `.md` viewer or Info opened from one place is also replaced by one opened from another (for example a member's bio by a business chat banner's "Read more"), and Back then returns to the page under it. Message Info that replaces Info with nothing else on the right also starts fresh now: master kept the previous page's selected tab and, when both messages had the same title, its app bar showed none.
+- Both platforms: while a modal slides open, the page it covers in its pane, or the view under a pane's first modal, takes no new pointer input (clicks, drags, wheel scroll, hover) for 250 ms. On desktop the first page of the center and right panes appears without a slide, so it has no such window.
+- Both platforms: a keyed page (bio, `.md` viewer, Info, #6270's pages) opened again while the previous one is still sliding out after Back now starts fresh; master reused the closing page's remembered state (for example Info's selected tab), and its app bar showed no title when the title was unchanged.
+- Android: the slide window also covers modals the app opens itself (What's New at start), and a double-tapped toggle (chat info, the profile picker's incognito info, and the reports and support-chats bars when the second tap comes after their page is pushed) now stays open; a second tap during the reports or support-chat load still opens a second page (see Not fixed). Apart from these and the fresh state above, the per-site checks act only on desktop, where the button stays visible.
+
+## Verification
+
+Desktop: the same steps on the master prebuild and this branch, before and after, plus the areas the change touches (info and support chats in the right pane, profiles, badges, markdown viewer, Settings navigation and Back). Android (Waydroid): double tap on list rows, Back during a transition, and the touched flows.
diff --git a/plans/2026-10-17-gsettings-monitor-left-running.md b/plans/2026-10-17-gsettings-monitor-left-running.md
new file mode 100644
index 0000000000..25a2836c10
--- /dev/null
+++ b/plans/2026-10-17-gsettings-monitor-left-running.md
@@ -0,0 +1,46 @@
+# Desktop leaves `gsettings monitor` running after it exits (Linux)
+
+## Problem
+
+Every run of the desktop app on Linux left a `gsettings monitor org.gnome.desktop.interface gtk-theme` process running after the app exited, reparented to PID 1. Each one holds two D-Bus connections, one to the session bus and one to the system bus. On a test machine 228 of them accumulated and exhausted the system bus's per-user connection limit (256), after which other programs failed to connect to D-Bus ("No buffer space available").
+
+Reproduced with the master AppImage: each launch and clean quit added one such process.
+
+## Cause
+
+`Theme.desktop.kt` registers a listener on jSystemThemeDetector 3.8's `OsThemeDetector`. On Linux the library always uses `GnomeThemeDetector`, whose `registerListener` starts a daemon thread that runs `Runtime.exec("gsettings monitor org.gnome.desktop.interface gtk-theme")` and reads its output with a blocking `readLine()`. The library destroys the process only when the thread is interrupted and then reads another line; nothing does that on JVM exit. `gsettings` never notices that its parent is gone: GLib ignores SIGPIPE and `g_print` ignores write errors, so it keeps running through theme changes with nobody reading its output, and it does not read stdin. It exits only when signalled or when the session bus closes, at logout. A leftover with its output closed survived three theme changes and exited when its session bus was stopped.
+
+## Fix
+
+A JVM shutdown hook, registered where the listener is registered, sends SIGTERM to the app's direct child processes whose executable path contains `gsettings`.
+
+- It is installed once, when the detector is created, i.e. only when the monitor can exist.
+- The filter is needed: other children must survive the exit (on Linux the app also starts `notify-send`, `xdg-mime`, and `xdg-open` for the downloaded `.deb` update). `contains` rather than `endsWith("/gsettings")`: after a glib upgrade the running binary's path is `/usr/bin/gsettings (deleted)`; NixOS wrappers are named `.gsettings-wrapped`.
+- A `gsettings get` from the detector's `isDark()` that happens to run at that moment is stopped too; harmless at exit.
+- It is installed on Linux only; on macOS and Windows the library starts no child process.
+
+Alternatives considered:
+- `detector.removeListener` on exit: only interrupts the thread, which is blocked in `readLine()`; the process is not destroyed.
+- Destroying all children: kills the `.deb` installer opened by the updater and other handlers.
+- Stopping it at `exitProcess(0)` in `DesktopApp.kt`: misses SIGTERM/SIGHUP (session logout).
+- Upgrading the library: no release or its master stops the monitor on exit (upstream issue #42; the fix proposed there, PR #43, is the same shutdown hook, unmerged). 3.9.x also loops at full CPU once the monitor has exited (#52).
+- Covering SIGKILL and crashes too needs the app to start the monitor itself: a `sh` wrapper that kills it when the app's pipe closes (tested), `setpriv --pdeathsig` (fires when the spawning thread exits, so it needs a dedicated thread), or polling `gsettings get` instead of a monitor. Each replaces part of the library for exits where a leftover lasts only until logout.
+
+Not covered (no in-process code runs): SIGKILL, JVM crashes, native `exit()`. Ctrl-C in a terminal does not need it: the monitor is in the terminal's foreground process group, gets the SIGINT itself and exits; the app does not quit on the first Ctrl-C (the Haskell runtime takes it) and exits natively on a second one.
+
+Side effect: when the monitor is stopped, the library's thread reads end-of-file and throws a `NullPointerException` (`readLine()` returned null); on some exits the JVM prints its stack trace to stderr before the process ends.
+
+## Verification
+
+Desktop Linux AppImage, the same base without (before) and with (after) the change, fresh profile:
+
+| # | Check | before | after |
+|---|---|---|---|
+| G1 | Window closed (`xd quit`): the app's `gsettings monitor` child | still running, ppid 1 | gone |
+| G2 | App sent SIGTERM: its child | still running, ppid 1 | gone |
+| G3 | While the app runs: one `gsettings monitor` child, alive after ~20 s of use | yes | yes |
+| G3 | Settings → Appearance, color mode System: the app follows the system (light) | yes | yes |
+| G3 | Profile opens normally after G1/G2 | yes | yes |
+| G4 | `App crashed` / `E:` / `Exception` log lines | none | none |
+
+Android is not affected: the change is in `desktopMain`, which the APK does not contain.
diff --git a/plans/2026-10-18-create-group-twice.md b/plans/2026-10-18-create-group-twice.md
new file mode 100644
index 0000000000..ed237f564a
--- /dev/null
+++ b/plans/2026-10-18-create-group-twice.md
@@ -0,0 +1,20 @@
+# A double click on "Create group" creates two groups
+
+Follow-up to #7725.
+
+## Problem
+
+"Create group" creates the group (`apiNewGroup`), opens it, loads its members and only then closes its page and opens Invite members (or the group link when incognito). The button stays enabled meanwhile and the core does not deduplicate, so a double click created two groups (the second named with a suffix, for example "G2_1"). Reproduced on the master prebuild at 40, 80 and 150 ms.
+
+## Fix
+
+The page remembers whether its create is in progress, as `CIGroupInvitationView` does for joining: the create handler checks and sets it at the start, so a second click on that page while it is set is ignored. It is cleared only when the create fails. A successful create closes the page, but the page leaves the screen only after its job has ended (in testing the job ended about 0.7 s after the click and the page was gone 0.8 to 1.1 s after it), so clearing it at the end of the job let a second click in that gap create a second group.
+
+## Not fixed
+
+- The channel's "Continue" (desktop `onLinkReady`) was checked and not affected: a double click opened one link page in testing.
+- A create that never returns, or that throws instead of returning an error, keeps that page's "Create group" inert; a page opened again creates as on master.
+
+## Effect
+
+Desktop and Android: one group per double click. After a failed create the button works again. Single clicks are unchanged.
diff --git a/scripts/ci/ios-stub-libs.sh b/scripts/ci/ios-stub-libs.sh
new file mode 100755
index 0000000000..ca0e3c9225
--- /dev/null
+++ b/scripts/ci/ios-stub-libs.sh
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+# Creates stub static libraries in apps/ios/Libraries/sim so that the iOS app
+# links for the simulator without the Haskell core.
+# Run from repo root on macOS.
+
+set -eu
+
+IOS_DIR=apps/ios
+PBXPROJ=$IOS_DIR/SimpleX.xcodeproj/project.pbxproj
+OUT_DIR=$IOS_DIR/Libraries/sim
+ARCH=arm64
+MIN_IOS=15.0
+
+tmp=$(mktemp -d)
+trap 'rm -rf "$tmp"' EXIT
+
+# The linker resolves symbols by name only, so the stub signatures are not checked.
+sed -n 's/^extern [^(]*[ *]\([a-z_]*\)(.*/\1/p' "$IOS_DIR/SimpleXChat/SimpleX.h" "$IOS_DIR/SimpleXChat/hs_init.c" \
+    | sort -u | sed 's/.*/void &(void) {}/' > "$tmp/stubs.c"
+
+if [ ! -s "$tmp/stubs.c" ]; then
+    echo "Error: no extern functions found in SimpleX.h and hs_init.c" >&2
+    exit 1
+fi
+
+xcrun --sdk iphonesimulator clang -arch "$ARCH" -mios-simulator-version-min="$MIN_IOS" -c "$tmp/stubs.c" -o "$tmp/stubs.o"
+xcrun ar rcs "$tmp/libstubs.a" "$tmp/stubs.o"
+
+libs=$(sed -n 's/.*isa = PBXFileReference; lastKnownFileType = archive\.ar; path = "\{0,1\}\(lib[^";]*\.a\)"\{0,1\};.*/\1/p' "$PBXPROJ")
+if [ -z "$libs" ]; then
+    echo "Error: no static library references found in $PBXPROJ" >&2
+    exit 1
+fi
+
+mkdir -p "$OUT_DIR"
+echo "$libs" | while IFS= read -r lib; do
+    cp "$tmp/libstubs.a" "$OUT_DIR/$lib"
+    echo "$OUT_DIR/$lib"
+done
diff --git a/scripts/ci/packages_release.py b/scripts/ci/packages_release.py
index 7f7556e900..534ab6241f 100644
--- a/scripts/ci/packages_release.py
+++ b/scripts/ci/packages_release.py
@@ -10,8 +10,8 @@ publish-release   publish a draft release that has every asset
 check-pins        check the pins of the packages against the published releases
 download          download a release asset and check its digest
 download-pinned   download a pinned asset and check its pin
-changes           print whether the changes since a commit touch the chat core and the add-on
-build-plan        print the platforms to test the packages on, none when build.yml runs for the pull request
+changes           print whether the changes since a commit touch the chat core, the add-on and each build of build.yml
+build-plan        print the platforms to test the packages on, none when build.yml builds the core for the pull request
 prepare           update pins and versions of the packages
 publish-plan      print the package versions that are not published yet
 record            record releases and published versions in releases.toml of simplex-chat-libs
@@ -47,7 +47,29 @@ RELEASE_FILE = f"{NODEJS_DIR}/src/release.ts"
 PYTHON_VERSION_FILE = f"{PYTHON_DIR}/src/simplex_chat/_version.py"
 ADDON_SOURCES = [f"{NODEJS_DIR}/binding.gyp", f"{NODEJS_DIR}/cpp"]
 CORE_SOURCES = ["src", "simplex-chat.cabal", "cabal.project"]
-BUILD_WORKFLOW = ".github/workflows/build.yml"
+# The pull_request paths of build.yml are the union of these globs; ":!" excludes a path from its build.
+BUILD_CHANGES = {
+    "haskell": [
+        "src/**",
+        "apps/simplex-chat/**",
+        "apps/simplex-bot/**",
+        "apps/simplex-bot-advanced/**",
+        "apps/simplex-badge-service/**",
+        "apps/simplex-broadcast-bot/**",
+        "apps/simplex-directory-service/**",
+        "tests/**",
+        "bots/src/**",
+        "simplex-chat.cabal",
+        "cabal.project",
+        "Dockerfile*",
+        "scripts/ci/**",
+        ":!scripts/ci/ios-stub-libs.sh",
+        "scripts/desktop/**",
+        ".github/**",
+    ],
+    "kotlin": ["apps/multiplatform/**", "Dockerfile*", ".github/**"],
+    "ios": ["apps/ios/**", "scripts/ci/ios-stub-libs.sh", ".github/**"],
+}
 CABAL_FILE = "simplex-chat.cabal"
 CABAL_VERSION = re.compile(r"^(version:\s*)(\S+)", re.M)
 TYPES_SOURCES = [f"{TYPES_DIR}/src"]
@@ -358,13 +380,6 @@ def plan(state: State) -> Plan:
     )
 
 
-def pull_request_paths(workflow: str) -> list[str]:
-    found = re.search(r'^  pull_request:\n    paths:\n((?:      - ".*"\n)+)', workflow, re.M)
-    if not found:
-        raise ValueError(f"no pull_request paths in {BUILD_WORKFLOW}")
-    return re.findall(r'^      - "(.*)"$', found[1], re.M)
-
-
 def build_matrix(platforms: list[str]) -> str:
     return json.dumps([{"platform": platform, "os": ADDON_RUNNERS[platform]} for platform in platforms])
 
@@ -480,14 +495,19 @@ def changed_since(base: str, sources: list[str]) -> bool:
     return diff.returncode != 0
 
 
+def build_pathspecs(build: str) -> list[str]:
+    return [path if path.startswith(":") else f":(glob){path}" for path in BUILD_CHANGES[build]]
+
+
 def changes(base: str) -> None:
     print(f"core={'true' if changed_since(base, CORE_SOURCES) else ''}")
     print(f"addon={'true' if changed_since(base, ADDON_SOURCES) else ''}")
+    for build in BUILD_CHANGES:
+        print(f"{build}={'true' if changed_since(base, build_pathspecs(build)) else ''}")
 
 
 def print_build_plan(args: argparse.Namespace) -> None:
-    build_paths = [f":(glob){path}" for path in pull_request_paths(read_text(BUILD_WORKFLOW))]
-    platforms = [] if changed_since(args.base, build_paths) else ADDON_PLATFORMS
+    platforms = [] if changed_since(args.base, build_pathspecs("haskell")) else ADDON_PLATFORMS
     print(f"platforms={build_matrix(platforms)}")
 
 
diff --git a/scripts/ci/test_packages_release.py b/scripts/ci/test_packages_release.py
index 3cbd42689a..dfc92d20e5 100644
--- a/scripts/ci/test_packages_release.py
+++ b/scripts/ci/test_packages_release.py
@@ -5,6 +5,7 @@ import email.message
 import hashlib
 import io
 import json
+import re
 import subprocess
 import tomllib
 import urllib.error
@@ -25,7 +26,7 @@ from packages_release import (
     TYPES_DIR,
     TYPES_README,
     ADDON_PLATFORMS,
-    BUILD_WORKFLOW,
+    BUILD_CHANGES,
     LIBS_ASSETS,
     Package,
     Pins,
@@ -37,6 +38,7 @@ from packages_release import (
     bump_npm_version,
     bump_python_version,
     changed_since,
+    changes,
     add_releases,
     claim_core,
     core_release,
@@ -49,7 +51,6 @@ from packages_release import (
     prepare,
     print_build_plan,
     publish_plan,
-    pull_request_paths,
     record_releases,
     recorded_commit,
     release_status,
@@ -239,11 +240,14 @@ class PlanTest(unittest.TestCase):
 
 
 class BuildPlanTest(unittest.TestCase):
-    def test_reads_the_pull_request_paths_of_build_yml(self):
-        paths = pull_request_paths((packages_release.ROOT / BUILD_WORKFLOW).read_text())
-        self.assertIn("src/**", paths)
-        self.assertIn(".github/**", paths)
-        self.assertFalse([path for path in paths if path.startswith("packages/")])
+    def test_build_yml_runs_for_the_paths_of_its_builds(self):
+        workflow = (packages_release.ROOT / ".github/workflows/build.yml").read_text()
+        found = re.search(r'^  pull_request:\n    paths:\n((?:      - ".*"\n)+)', workflow, re.M)
+        self.assertIsNotNone(found, "no pull_request paths in build.yml")
+        paths = re.findall(r'^      - "(.*)"$', found[1], re.M)
+        globs = {path for build in BUILD_CHANGES.values() for path in build if not path.startswith(":")}
+        self.assertEqual(sorted(paths), sorted(globs))
+        self.assertEqual(len(paths), len(set(paths)), "duplicate pull_request paths in build.yml")
 
     def test_matrix_names_the_runner_of_each_platform(self):
         self.assertEqual(
@@ -408,7 +412,6 @@ class GitRepoTest(unittest.TestCase):
 class PrintBuildPlanTest(GitRepoTest):
     def setUp(self):
         super().setUp()
-        self.write(BUILD_WORKFLOW, 'on:\n  pull_request:\n    paths:\n      - "src/**"\n      - "Dockerfile*"\n\nenv:\n')
         self.write("packages/pkg/src.txt", "a")
         self.commit("base")
         self.base = self.head()
@@ -438,6 +441,58 @@ class PrintBuildPlanTest(GitRepoTest):
         self.commit("top-level Dockerfile")
         self.assertEqual(self.platforms(), [])
 
+    def test_app_change_leaves_the_add_on_to_this_workflow(self):
+        self.write("packages/pkg/src.txt", "b")
+        self.write("apps/ios/Shared/View.swift", "v")
+        self.write("apps/multiplatform/common/Model.kt", "k")
+        self.commit("package and app change")
+        self.assertEqual(self.platforms(), ADDON_PLATFORMS)
+
+
+class ChangesTest(GitRepoTest):
+    def setUp(self):
+        super().setUp()
+        self.write("README.md", "r")
+        self.commit("base")
+        self.base = self.head()
+
+    def builds(self, *files):
+        for file in files:
+            self.write(file, "changed")
+        self.commit("change")
+        output = io.StringIO()
+        with mock.patch.object(packages_release, "ROOT", self.repo), contextlib.redirect_stdout(output):
+            changes(self.base)
+        values = dict(line.split("=", 1) for line in output.getvalue().splitlines())
+        return {build for build in BUILD_CHANGES if values[build] == "true"}
+
+    def test_ios_change_builds_only_ios(self):
+        self.assertEqual(self.builds("apps/ios/Shared/View.swift"), {"ios"})
+
+    def test_kotlin_change_builds_only_kotlin(self):
+        self.assertEqual(self.builds("apps/multiplatform/common/Model.kt"), {"kotlin"})
+
+    def test_app_changes_build_both_apps_without_the_core(self):
+        self.assertEqual(self.builds("apps/ios/Shared/View.swift", "apps/multiplatform/common/Model.kt"), {"ios", "kotlin"})
+
+    def test_core_change_builds_only_the_core(self):
+        self.assertEqual(self.builds("src/Simplex/Chat.hs"), {"haskell"})
+
+    def test_ios_stub_script_builds_only_ios(self):
+        self.assertEqual(self.builds("scripts/ci/ios-stub-libs.sh"), {"ios"})
+
+    def test_other_ci_script_builds_the_core(self):
+        self.assertEqual(self.builds("scripts/ci/prune-old-builds.sh"), {"haskell"})
+
+    def test_build_image_change_builds_the_core_and_kotlin(self):
+        self.assertEqual(self.builds("Dockerfile.build"), {"haskell", "kotlin"})
+
+    def test_workflow_change_builds_everything(self):
+        self.assertEqual(self.builds(".github/workflows/build.yml"), {"haskell", "kotlin", "ios"})
+
+    def test_unrelated_change_builds_nothing(self):
+        self.assertEqual(self.builds("docs/guide.md", "packages/pkg/src.txt"), set())
+
 
 class PackageStateTest(GitRepoTest):
     def setUp(self):
diff --git a/scripts/nix/sha256map.nix b/scripts/nix/sha256map.nix
index d819d55b3b..e8d29583f6 100644
--- a/scripts/nix/sha256map.nix
+++ b/scripts/nix/sha256map.nix
@@ -1,5 +1,5 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."8bc4d3601250d9f79dc7e80ead319ec2b6d4a95a" = "1zzrbqqbaw6sa3midyv9qgnypsjp17h5yhgi7bffldcncyl4w1ni";
+  "https://github.com/simplex-chat/simplexmq.git"."381828400710344bc1c6ce94e7cdf6e0ca043ee9" = "0cayvxjcyhlp2ckw57c8ny72va7mcc6vifd896kmxi6l8s7pppkj";
   "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38";
   "https://github.com/simplex-chat/direct-sqlcipher.git"."2330df3dc8c4b660674d3c02d76bb86f66c2abee" = "11pfj1vqsjdl26nplkr2l6z1xj7cn153qijj5gknmlzq3krn7x1i";
   "https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl";
@@ -8,5 +8,5 @@
   "https://github.com/simplex-chat/android-support.git"."9aa09f148089d6752ce563b14c2df1895718d806" = "0pbf2pf13v2kjzi397nr13f1h3jv0imvsq8rpiyy2qyx5vd50pqn";
   "https://github.com/simplex-chat/zip.git"."2eff156c3aac389e35d38bf10a52733d7061640a" = "052vahd5d4lxnazjrb6l60i261aycn2js7jhzafyb72n15ns4r6p";
   "https://github.com/yesodweb/wai.git"."ec5e017d896a78e787a5acea62b37a4e677dec2e" = "1ckcpmpjfy9jiqrb52q20lj7ln4hmq9v2jk6kpkf3m68c1m9c2bx";
-  "https://github.com/simplex-chat/wai.git"."2f6e5aa5f05ba9140ac99e195ee647b4f7d926b0" = "199g4rjdf1zp1fcw8nqdsyr1h36hmg424qqx03071jk7j00z7ay4";
+  "https://github.com/simplex-chat/wai.git"."63667cb577d09c967ddcd945e42c324872dfeb7d" = "1nh4j3fnxbpkdhz1sfgpfhb7j0371apbmx1kv7aqa2zrdxc8gmzb";
 }
diff --git a/scripts/prices/.gitignore b/scripts/prices/.gitignore
new file mode 100644
index 0000000000..c4457ced31
--- /dev/null
+++ b/scripts/prices/.gitignore
@@ -0,0 +1,8 @@
+node_modules/
+*.p8
+*.json
+!package.json
+!package-lock.json
+*.csv*
+*.xlsx*
+INFO.md
diff --git a/scripts/prices/apple-prices.js b/scripts/prices/apple-prices.js
new file mode 100644
index 0000000000..e9ebc620c3
--- /dev/null
+++ b/scripts/prices/apple-prices.js
@@ -0,0 +1,430 @@
+#!/usr/bin/env node
+const fs = require('fs');
+const path = require('path');
+const jwt = require('jsonwebtoken');
+const fetch = require('node-fetch');
+const { parse } = require('csv-parse/sync');
+const { stringify } = require('csv-stringify/sync');
+
+// ============ HARDCODE THIS ============
+const APP_ID = '1605771084'; // your numeric app ID
+// =======================================
+const CSV_FILE = 'apple-prices.csv';
+const POINTS_FILE = 'apple-price-points.csv';
+
+function usage() {
+  console.log(`Usage:
+  node apple-prices.js export <issuer_id> <path/to/AuthKey_XXXX.p8> [-o <file>]
+  node apple-prices.js points <issuer_id> <path/to/AuthKey_XXXX.p8> [-o <file>]
+  node apple-prices.js import <issuer_id> <path/to/AuthKey_XXXX.p8> [--start-date YYYY-MM-DD] [--preserve true|false] [--dry-run]
+
+export writes ${CSV_FILE} and points writes ${POINTS_FILE} unless -o is given; neither overwrites an existing file.
+import reads ${CSV_FILE} and changes the prices that differ from the current App Store prices.
+`);
+  process.exit(1);
+}
+
+function parseArgs() {
+  const args = process.argv.slice(2);
+  const cmd = args[0];
+  if (!cmd || !['export', 'points', 'import'].includes(cmd)) usage();
+
+  const issuerId = args[1];
+  const p8Path = args[2];
+  if (!issuerId || !p8Path) {
+    console.error('Missing issuer_id or key file');
+    process.exit(1);
+  }
+
+  const basename = path.basename(p8Path, '.p8');
+  const keyId = basename.replace(/^AuthKey_/, '');
+  if (!keyId || keyId === basename) {
+    console.error('Key file must be named AuthKey_XXXXXXXX.p8');
+    process.exit(1);
+  }
+
+  let output = { export: CSV_FILE, points: POINTS_FILE }[cmd];
+  let startDate = null;
+  let preserveCurrent = true;
+  let dryRun = false;
+
+  for (let i = 3; i < args.length; i++) {
+    if (args[i] === '-o' && cmd !== 'import' && args[i + 1]) output = args[++i];
+    else if (args[i] === '--start-date' && /^\d{4}-\d{2}-\d{2}$/.test(args[i + 1])) startDate = args[++i];
+    else if (args[i] === '--preserve' && ['true', 'false'].includes(args[i + 1])) preserveCurrent = args[++i] === 'true';
+    else if (args[i] === '--dry-run') dryRun = true;
+    else usage();
+  }
+
+  return { cmd, issuerId, keyId, p8Path, output, startDate, preserveCurrent, dryRun };
+}
+
+const { cmd, issuerId, keyId, p8Path, output, startDate, preserveCurrent, dryRun } = parseArgs();
+const privateKey = fs.readFileSync(p8Path, 'utf8');
+const today = new Date().toISOString().slice(0, 10);
+const RATE_LIMIT_RETRIES = 6;
+
+function getToken() {
+  return jwt.sign(
+    { iss: issuerId, aud: 'appstoreconnect-v1' },
+    privateKey,
+    { algorithm: 'ES256', expiresIn: '5m', header: { kid: keyId, typ: 'JWT' } }
+  );
+}
+
+async function api(endpoint, options = {}, retry = 0) {
+  const url = new URL(endpoint, 'https://api.appstoreconnect.apple.com').href;
+  const res = await fetch(url, {
+    ...options,
+    headers: {
+      Authorization: `Bearer ${getToken()}`,
+      Accept: 'application/json',
+      'Content-Type': 'application/json',
+      ...options.headers,
+    },
+  });
+  const text = await res.text();
+  if (res.status === 429 && retry < RATE_LIMIT_RETRIES) {
+    const minutes = 2 ** retry;
+    console.warn(`Rate limit exceeded, retrying in ${minutes} min: ${url}`);
+    await sleep(minutes * 60 * 1000);
+    return api(endpoint, options, retry + 1);
+  }
+  if (!res.ok) {
+    throw new Error(`${res.status} ${url}: ${text}`);
+  }
+  return text ? JSON.parse(text) : {};
+}
+
+async function apiList(endpoint) {
+  const data = [];
+  const included = [];
+  let next = endpoint;
+  while (next) {
+    const res = await api(next);
+    data.push(...res.data);
+    included.push(...(res.included ?? []));
+    next = res.links?.next;
+  }
+  return { data, included };
+}
+
+async function sleep(ms) {
+  return new Promise(r => setTimeout(r, ms));
+}
+
+// ====================== EXPORT ======================
+async function readProducts() {
+  const products = [];
+
+  const groups = await apiList(`/v1/apps/${APP_ID}/subscriptionGroups?limit=200`);
+  for (const group of groups.data) {
+    const subs = await apiList(`/v1/subscriptionGroups/${group.id}/subscriptions?limit=200`);
+    for (const sub of subs.data) {
+      console.log(`Reading subscription ${sub.attributes.productId}`);
+      products.push({
+        type: 'subscription',
+        id: sub.id,
+        productId: sub.attributes.productId,
+        pricePointsPath: `/v1/subscriptions/${sub.id}/pricePoints`,
+        prices: await readSubscriptionPrices(sub),
+      });
+    }
+  }
+
+  const iaps = await apiList(`/v1/apps/${APP_ID}/inAppPurchasesV2?limit=200`);
+  for (const iap of iaps.data) {
+    console.log(`Reading IAP ${iap.attributes.productId}`);
+    products.push({
+      type: 'iap',
+      id: iap.id,
+      productId: iap.attributes.productId,
+      pricePointsPath: `/v2/inAppPurchases/${iap.id}/pricePoints`,
+      prices: await readIapPrices(iap),
+    });
+  }
+
+  return products;
+}
+
+async function readSubscriptionPrices(sub) {
+  const res = await apiList(`/v1/subscriptions/${sub.id}/prices?include=subscriptionPricePoint,territory&limit=200`);
+  const records = priceRecords(res, 'subscriptionPricePoint');
+  const monthly = records
+    .filter(r => r.planType === 'MONTHLY')
+    .map(r => `  ${r.territory} ${r.startDate ?? '-'} ${r.point.customerPrice} ${r.currency}`);
+  if (monthly.length > 0) {
+    throw new Error(`${sub.attributes.productId} has MONTHLY plan prices:\n${monthly.join('\n')}`);
+  }
+  return territoryPrices(sub.attributes.productId, records);
+}
+
+async function readIapPrices(iap) {
+  const records = [];
+  for (const kind of ['manualPrices', 'automaticPrices']) {
+    const res = await apiList(`/v1/inAppPurchasePriceSchedules/${iap.id}/${kind}?include=inAppPurchasePricePoint,territory&limit=200`);
+    records.push(...priceRecords(res, 'inAppPurchasePricePoint'));
+  }
+  return territoryPrices(iap.attributes.productId, records);
+}
+
+function priceRecords({ data, included }, pricePointRelationship) {
+  const find = ({ type, id }) => included.find(i => i.type === type && i.id === id);
+  return data.map(({ attributes, relationships }) => {
+    const territory = find(relationships.territory.data);
+    const point = find(relationships[pricePointRelationship].data);
+    return {
+      territory: territory.id,
+      currency: territory.attributes.currency,
+      startDate: attributes.startDate,
+      endDate: attributes.endDate,
+      planType: attributes.planType,
+      point: { id: point.id, customerPrice: point.attributes.customerPrice },
+    };
+  });
+}
+
+function territoryPrices(productId, records) {
+  const territories = [...new Set(records.map(r => r.territory))];
+  return territories.map(territory => {
+    const history = records
+      .filter(r => r.territory === territory)
+      .sort((a, b) => (a.startDate ?? '').localeCompare(b.startDate ?? ''));
+    const current = history.findLast(r => (r.startDate ?? '') <= today && (!r.endDate || r.endDate > today));
+    if (!current) {
+      throw new Error(`${productId} ${territory}: no current price`);
+    }
+    return {
+      territory,
+      current,
+      scheduled: history.find(r => (r.startDate ?? '') > today),
+    };
+  });
+}
+
+async function readPricePoints(product, territory) {
+  const { data } = await apiList(`${product.pricePointsPath}?filter[territory]=${territory}&limit=8000`);
+  return data
+    .map(p => ({ id: p.id, customerPrice: p.attributes.customerPrice }))
+    .sort((a, b) => Number(a.customerPrice) - Number(b.customerPrice));
+}
+
+async function exportPrices() {
+  if (fs.existsSync(output)) throw new Error(`${output} already exists`);
+  const products = await readProducts();
+  const rows = products.flatMap(product => product.prices.map(({ territory, current, scheduled }) => ({
+    type: product.type,
+    product_id: product.productId,
+    territory,
+    currency: current.currency,
+    current_price: current.point.customerPrice,
+    scheduled_price: scheduled?.point.customerPrice ?? '',
+    scheduled_date: scheduled?.startDate ?? '',
+    price: current.point.customerPrice,
+  })));
+
+  fs.writeFileSync(output, stringify(rows, { header: true }), { flag: 'wx' });
+  console.log(`\nExported ${rows.length} rows → ${output}`);
+}
+
+async function exportPricePoints() {
+  if (fs.existsSync(output)) throw new Error(`${output} already exists`);
+  const products = await readProducts();
+  const rows = [];
+  for (const type of ['subscription', 'iap']) {
+    const product = products.find(p => p.type === type);
+    console.log(`Reading price points of ${type} ${product.productId}`);
+    for (const { territory, current } of product.prices) {
+      for (const point of await readPricePoints(product, territory)) {
+        rows.push({ type, territory, currency: current.currency, customer_price: point.customerPrice });
+      }
+    }
+  }
+
+  fs.writeFileSync(output, stringify(rows, { header: true }), { flag: 'wx' });
+  console.log(`\nExported ${rows.length} price points → ${output}`);
+}
+
+// ====================== IMPORT ======================
+async function findPricePoint(product, territory, value) {
+  if (Number.isNaN(value)) return {};
+  const points = await readPricePoints(product, territory);
+  return {
+    point: points.find(p => Number(p.customerPrice) === value),
+    lower: points.findLast(p => Number(p.customerPrice) < value),
+    higher: points.find(p => Number(p.customerPrice) > value),
+  };
+}
+
+async function matchRows(products, rows) {
+  const problems = [];
+  const rowsByKey = new Map();
+  for (const row of rows) {
+    const key = `${row.product_id} ${row.territory}`;
+    if (rowsByKey.has(key)) problems.push(`${key}: duplicate row`);
+    rowsByKey.set(key, row);
+  }
+
+  const lines = [];
+  for (const product of products) {
+    console.log(`Checking prices of ${product.type} ${product.productId}`);
+    for (const price of product.prices) {
+      const key = `${product.productId} ${price.territory}`;
+      const row = rowsByKey.get(key);
+      rowsByKey.delete(key);
+      if (!row) {
+        problems.push(`${key}: missing row`);
+        continue;
+      }
+      const value = Number(row.price);
+      const changed = value !== Number(price.current.point.customerPrice);
+      const { point, lower, higher } = changed
+        ? await findPricePoint(product, price.territory, value)
+        : { point: price.current.point };
+      if (!point) {
+        problems.push(`${key}: "${row.price}" ${price.current.currency} is not a price point, nearest are ${lower?.customerPrice ?? 'none'} and ${higher?.customerPrice ?? 'none'}`);
+        continue;
+      }
+      lines.push({
+        product,
+        territory: price.territory,
+        currency: price.current.currency,
+        current: price.current.point,
+        point,
+        changed,
+      });
+    }
+  }
+  for (const key of rowsByKey.keys()) problems.push(`${key}: not an App Store product territory`);
+
+  if (problems.length > 0) {
+    throw new Error(`${problems.length} invalid rows, nothing was changed:\n${problems.join('\n')}`);
+  }
+  return lines;
+}
+
+function describeLine({ territory, currency, current, point, changed }) {
+  return changed
+    ? `${territory} ${current.customerPrice} -> ${point.customerPrice} ${currency}`
+    : `${territory} ${point.customerPrice} ${currency}`;
+}
+
+function subscriptionChanges(lines) {
+  return lines
+    .filter(line => line.product.type === 'subscription' && line.changed)
+    .map(line => {
+      const increase = Number(line.point.customerPrice) > Number(line.current.customerPrice);
+      return {
+        label: `subscription ${line.product.productId} ${describeLine(line)}${increase ? ', increase' : ''}`,
+        details: [],
+        path: '/v1/subscriptionPrices',
+        body: {
+          data: {
+            type: 'subscriptionPrices',
+            attributes: increase ? { startDate, preserveCurrentPrice: preserveCurrent } : { startDate },
+            relationships: {
+              subscription: { data: { type: 'subscriptions', id: line.product.id } },
+              subscriptionPricePoint: { data: { type: 'subscriptionPricePoints', id: line.point.id } },
+            },
+          },
+        },
+      };
+    });
+}
+
+function manualPrice(product, point, from, until) {
+  return {
+    type: 'inAppPurchasePrices',
+    attributes: { startDate: from, endDate: until },
+    relationships: {
+      inAppPurchaseV2: { data: { type: 'inAppPurchases', id: product.id } },
+      inAppPurchasePricePoint: { data: { type: 'inAppPurchasePricePoints', id: point.id } },
+    },
+  };
+}
+
+async function iapScheduleChanges(products, lines) {
+  const changes = [];
+  for (const product of products.filter(p => p.type === 'iap')) {
+    const productLines = lines.filter(line => line.product === product);
+    if (!productLines.some(line => line.changed)) continue;
+
+    const baseTerritory = (await api(`/v1/inAppPurchasePriceSchedules/${product.id}/baseTerritory`)).data.id;
+    const manualPrices = productLines
+      .flatMap(line => startDate && line.changed
+        ? [manualPrice(product, line.current, null, startDate), manualPrice(product, line.point, startDate, null)]
+        : [manualPrice(product, line.point, null, null)])
+      .map((price, i) => ({ ...price, id: `\${price-${i}}` }));
+
+    changes.push({
+      label: `iap ${product.productId} price schedule, base territory ${baseTerritory}, ${productLines.length} territories`,
+      details: productLines.map(describeLine),
+      path: '/v1/inAppPurchasePriceSchedules',
+      body: {
+        data: {
+          type: 'inAppPurchasePriceSchedules',
+          relationships: {
+            inAppPurchase: { data: { type: 'inAppPurchases', id: product.id } },
+            baseTerritory: { data: { type: 'territories', id: baseTerritory } },
+            manualPrices: { data: manualPrices.map(({ type, id }) => ({ type, id })) },
+          },
+        },
+        included: manualPrices,
+      },
+    });
+  }
+  return changes;
+}
+
+function printChange({ label, details }) {
+  console.log(label);
+  for (const detail of details) console.log(`  ${detail}`);
+}
+
+async function applyChanges(changes) {
+  for (const [i, change] of changes.entries()) {
+    try {
+      await api(change.path, { method: 'POST', body: JSON.stringify(change.body) });
+    } catch (e) {
+      throw new Error([
+        `Failed: ${change.label}`,
+        e.message,
+        `Applied ${i} changes:`,
+        ...changes.slice(0, i).map(c => `  ${c.label}`),
+        `Not applied ${changes.length - i} changes:`,
+        ...changes.slice(i).map(c => `  ${c.label}`),
+      ].join('\n'));
+    }
+    printChange(change);
+    await sleep(300);
+  }
+}
+
+async function importPrices() {
+  const rows = parse(fs.readFileSync(CSV_FILE, 'utf8'), {
+    columns: true,
+    skip_empty_lines: true,
+    bom: true,
+  });
+  const products = await readProducts();
+  const lines = await matchRows(products, rows);
+  const changes = [
+    ...await iapScheduleChanges(products, lines),
+    ...subscriptionChanges(lines),
+  ];
+
+  console.log(`\n${changes.length} changes, start date ${startDate ?? 'immediate'}, preserve current price on increases ${preserveCurrent} (dry-run=${dryRun})`);
+  if (dryRun) {
+    changes.forEach(printChange);
+    return;
+  }
+  await applyChanges(changes);
+  console.log('Import finished');
+}
+
+// ====================== RUN ======================
+const commands = { export: exportPrices, points: exportPricePoints, import: importPrices };
+commands[cmd]().catch(e => {
+  console.error(e);
+  process.exitCode = 1;
+});
diff --git a/scripts/prices/package-lock.json b/scripts/prices/package-lock.json
new file mode 100644
index 0000000000..ccd9270cd2
--- /dev/null
+++ b/scripts/prices/package-lock.json
@@ -0,0 +1,211 @@
+{
+  "name": "prices",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "prices",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "csv-parse": "^7.0.3",
+        "csv-stringify": "^6.9.0",
+        "jsonwebtoken": "^9.0.3",
+        "node-fetch": "^2.7.0"
+      }
+    },
+    "node_modules/buffer-equal-constant-time": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+      "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/csv-parse": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-7.0.3.tgz",
+      "integrity": "sha512-YFd3QM/yo17vH91L1IOZuvl09zM0zEEtdfTcOCKWcMdM++MNaQSyp09slXyFCLaPXvHstQFx/xC8myiFHSMUvw==",
+      "license": "MIT"
+    },
+    "node_modules/csv-stringify": {
+      "version": "6.9.0",
+      "resolved": "https://registry.npmjs.org/csv-stringify/-/csv-stringify-6.9.0.tgz",
+      "integrity": "sha512-6b3e29CILFfSQ2nDRuZMRROzQOpPuJ+s8zPB5H7eK5ncXBbFOyVuRLU5Sx/zAUmVri3Ly49GyC8NEme4SVSAbA==",
+      "license": "MIT"
+    },
+    "node_modules/ecdsa-sig-formatter": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/jsonwebtoken": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.3.tgz",
+      "integrity": "sha512-MT/xP0CrubFRNLNKvxJ2BYfy53Zkm++5bX9dtuPbqAeQpTVe0MQTFhao8+Cp//EmJp244xt6Drw/GVEGCUj40g==",
+      "license": "MIT",
+      "dependencies": {
+        "jws": "^4.0.1",
+        "lodash.includes": "^4.3.0",
+        "lodash.isboolean": "^3.0.3",
+        "lodash.isinteger": "^4.0.4",
+        "lodash.isnumber": "^3.0.3",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.isstring": "^4.0.1",
+        "lodash.once": "^4.0.0",
+        "ms": "^2.1.1",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": ">=12",
+        "npm": ">=6"
+      }
+    },
+    "node_modules/jwa": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.1.tgz",
+      "integrity": "sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==",
+      "license": "MIT",
+      "dependencies": {
+        "buffer-equal-constant-time": "^1.0.1",
+        "ecdsa-sig-formatter": "1.0.11",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/jws": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.1.tgz",
+      "integrity": "sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==",
+      "license": "MIT",
+      "dependencies": {
+        "jwa": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/lodash.includes": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
+      "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isboolean": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
+      "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isinteger": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
+      "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isnumber": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
+      "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isstring": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
+      "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.once": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==",
+      "license": "MIT"
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
+    },
+    "node_modules/node-fetch": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+      "license": "MIT",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/semver": {
+      "version": "7.8.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz",
+      "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+      "license": "MIT"
+    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "license": "MIT",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    }
+  }
+}
diff --git a/scripts/prices/package.json b/scripts/prices/package.json
new file mode 100644
index 0000000000..f7d0a3f4c2
--- /dev/null
+++ b/scripts/prices/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "prices",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "type": "commonjs",
+  "dependencies": {
+    "csv-parse": "^7.0.3",
+    "csv-stringify": "^6.9.0",
+    "jsonwebtoken": "^9.0.3",
+    "node-fetch": "^2.7.0"
+  }
+}
diff --git a/scripts/prices/play-prices.js b/scripts/prices/play-prices.js
new file mode 100644
index 0000000000..f9335a2010
--- /dev/null
+++ b/scripts/prices/play-prices.js
@@ -0,0 +1,288 @@
+#!/usr/bin/env node
+const fs = require('fs');
+const crypto = require('crypto');
+const { setTimeout: sleep } = require('timers/promises');
+
+const PACKAGE_NAME = 'chat.simplex.app';
+const API = `https://androidpublisher.googleapis.com/androidpublisher/v3/applications/${PACKAGE_NAME}`;
+const TOKEN_URL = 'https://oauth2.googleapis.com/token';
+const CSV_FILE = 'play-prices.csv';
+const COLUMNS = ['type', 'product_id', 'base_plan_id', 'region', 'currency', 'current_price', 'price'];
+const NANOS = 1_000_000_000n;
+const MAX_ATTEMPTS = 5;
+
+function parseArgs() {
+  const [cmd, keyFile, ...flags] = process.argv.slice(2);
+  if (cmd === 'export' && keyFile && (flags.length === 0 || (flags.length === 2 && flags[0] === '-o'))) {
+    return { cmd, keyFile, outFile: flags[1] ?? CSV_FILE };
+  }
+  if (cmd === 'import' && keyFile && flags.every(flag => ['--dry-run', '--migrate-decreases'].includes(flag))) {
+    return { cmd, keyFile, dryRun: flags.includes('--dry-run'), migrateDecreases: flags.includes('--migrate-decreases') };
+  }
+  console.log(`Usage:
+  node play-prices.js export <service-account.json> [-o <file>]
+  node play-prices.js import <service-account.json> [--dry-run] [--migrate-decreases]
+export writes ${CSV_FILE} or <file> and refuses to overwrite an existing file; import reads ${CSV_FILE}.
+`);
+  process.exit(1);
+}
+
+async function getAccessToken(keyFile) {
+  const key = JSON.parse(fs.readFileSync(keyFile, 'utf8'));
+  const now = Math.floor(Date.now() / 1000);
+  const header = { alg: 'RS256', typ: 'JWT', kid: key.private_key_id };
+  const claims = {
+    iss: key.client_email,
+    scope: 'https://www.googleapis.com/auth/androidpublisher',
+    aud: TOKEN_URL,
+    iat: now,
+    exp: now + 3600,
+  };
+  const unsigned = [header, claims].map(part => Buffer.from(JSON.stringify(part)).toString('base64url')).join('.');
+  const signature = crypto.sign('sha256', Buffer.from(unsigned), key.private_key).toString('base64url');
+  const res = await fetch(TOKEN_URL, {
+    method: 'POST',
+    body: new URLSearchParams({
+      grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
+      assertion: `${unsigned}.${signature}`,
+    }),
+  });
+  const text = await res.text();
+  if (!res.ok) throw new Error(`${res.status} ${TOKEN_URL}: ${text}`);
+  return JSON.parse(text).access_token;
+}
+
+async function api(token, method, path, body) {
+  for (let attempt = 1; ; attempt++) {
+    const res = await fetch(`${API}${path}`, {
+      method,
+      headers: { Authorization: `Bearer ${token}`, 'Content-Type': 'application/json' },
+      body: body && JSON.stringify(body),
+    });
+    const text = await res.text();
+    if (res.ok) return text ? JSON.parse(text) : {};
+    const retryable = res.status === 429 || res.status >= 500;
+    if (!retryable || attempt === MAX_ATTEMPTS) throw new Error(`${res.status} ${method} ${path}: ${text}`);
+    const delay = 2 ** attempt * 1000;
+    console.warn(`  ${res.status} ${method} ${path}, retrying in ${delay / 1000}s`);
+    await sleep(delay);
+  }
+}
+
+async function listAll(token, collection) {
+  const items = [];
+  let query = '';
+  do {
+    const page = await api(token, 'GET', `/${collection}${query}`);
+    items.push(...(page[collection] || []));
+    query = page.nextPageToken ? `?pageToken=${encodeURIComponent(page.nextPageToken)}` : '';
+  } while (query);
+  return items;
+}
+
+async function fetchRegionPrices(token) {
+  const subscriptions = await listAll(token, 'subscriptions');
+  const oneTimeProducts = await listAll(token, 'oneTimeProducts');
+  return [
+    ...subscriptions.flatMap(subscription => {
+      const product = {
+        type: 'subscription',
+        resource: subscription,
+        updatePath: `/subscriptions/${subscription.productId}`,
+        updateMask: 'basePlans',
+      };
+      return (subscription.basePlans || []).flatMap(plan => regionPricesOf(product, plan.basePlanId, plan.regionalConfigs));
+    }),
+    ...oneTimeProducts.flatMap(oneTimeProduct => {
+      const product = {
+        type: 'onetime',
+        resource: oneTimeProduct,
+        updatePath: `/onetimeproducts/${oneTimeProduct.productId}`,
+        updateMask: 'purchaseOptions',
+      };
+      return regionPricesOf(product, '', purchaseOption(oneTimeProduct).regionalPricingAndAvailabilityConfigs);
+    }),
+  ];
+}
+
+function purchaseOption(oneTimeProduct) {
+  const options = oneTimeProduct.purchaseOptions;
+  if (options.length !== 1) {
+    throw new Error(`one-time product ${oneTimeProduct.productId} has ${options.length} purchase options, the CSV supports one`);
+  }
+  return options[0];
+}
+
+function regionPricesOf(product, basePlanId, configs = []) {
+  return configs
+    .filter(config => config.price)
+    .map(config => ({
+      key: [product.type, product.resource.productId, basePlanId, config.regionCode].join(','),
+      product,
+      basePlanId,
+      config,
+    }));
+}
+
+function nanosOf(money) {
+  return BigInt(money.units ?? 0) * NANOS + BigInt(money.nanos ?? 0);
+}
+
+function toMoney(currencyCode, nanos) {
+  return { currencyCode, units: String(nanos / NANOS), nanos: Number(nanos % NANOS) };
+}
+
+function formatPrice(nanos) {
+  const fraction = String(nanos % NANOS).padStart(9, '0').replace(/0+$/, '');
+  return fraction ? `${nanos / NANOS}.${fraction}` : `${nanos / NANOS}`;
+}
+
+function parsePrice(text, currency) {
+  const match = /^(\d+)(?:\.(\d{1,9}))?$/.exec(text);
+  if (!match) throw new Error(`price "${text}" is not a decimal number`);
+  const nanos = BigInt(match[1]) * NANOS + BigInt((match[2] ?? '').padEnd(9, '0'));
+  if (nanos === 0n) throw new Error('price must be positive');
+  const digits = new Intl.NumberFormat('en', { style: 'currency', currency }).resolvedOptions().maximumFractionDigits;
+  if (nanos % 10n ** BigInt(9 - digits) !== 0n) throw new Error(`price ${text}: ${currency} allows ${digits} fractional digits`);
+  return nanos;
+}
+
+async function exportPrices(keyFile, outFile) {
+  if (fs.existsSync(outFile)) throw new Error(`${outFile} already exists, nothing was written`);
+  const token = await getAccessToken(keyFile);
+  const rows = (await fetchRegionPrices(token)).map(({ key, config }) => {
+    const price = formatPrice(nanosOf(config.price));
+    return [key, config.price.currencyCode, price, price].join(',');
+  });
+  fs.writeFileSync(outFile, [COLUMNS.join(','), ...rows, ''].join('\n'), { flag: 'wx' });
+  console.log(`Exported ${rows.length} rows → ${outFile}`);
+}
+
+function readCsv() {
+  const [header, ...lines] = fs.readFileSync(CSV_FILE, 'utf8').replace(/^\u{FEFF}/u, '').split(/\r?\n/);
+  if (header !== COLUMNS.join(',')) throw new Error(`${CSV_FILE}: the header must be ${COLUMNS.join(',')}`);
+  return lines.flatMap((text, i) => (text ? [{ line: i + 2, fields: text.split(',') }] : []));
+}
+
+function matchRows(regionPrices, rows) {
+  const regionPricesByKey = new Map(regionPrices.map(regionPrice => [regionPrice.key, regionPrice]));
+  const rowKeys = new Set();
+  const changes = [];
+  const errors = [];
+  for (const { line, fields } of rows) {
+    const key = fields.slice(0, 4).join(',');
+    try {
+      if (rowKeys.has(key)) throw new Error(`duplicate row for ${key}`);
+      rowKeys.add(key);
+      changes.push(rowChange(key, regionPricesByKey.get(key), fields));
+    } catch (e) {
+      errors.push(`line ${line}: ${e.message}`);
+    }
+  }
+  for (const key of regionPricesByKey.keys()) {
+    if (!rowKeys.has(key)) errors.push(`missing row for ${key}`);
+  }
+  if (errors.length) throw new Error(`${CSV_FILE} is invalid, nothing was sent:\n  ${errors.join('\n  ')}`);
+  return changes;
+}
+
+function rowChange(key, regionPrice, fields) {
+  if (!regionPrice) throw new Error(`${key} has no price in Google Play`);
+  if (fields.length !== COLUMNS.length) throw new Error(`expected ${COLUMNS.length} columns, found ${fields.length}`);
+  const currency = fields[4];
+  const { currencyCode } = regionPrice.config.price;
+  if (currency !== currencyCode) throw new Error(`currency ${currency}, Google Play uses ${currencyCode}`);
+  return { ...regionPrice, current: nanosOf(regionPrice.config.price), price: parsePrice(fields[6], currencyCode) };
+}
+
+async function fetchRegionsVersion(token) {
+  const converted = await api(token, 'POST', '/pricing:convertRegionPrices', { price: { currencyCode: 'USD', units: '1' } });
+  return converted.regionVersion.version;
+}
+
+function planRequests(changes, regionsVersion, migrateDecreases) {
+  return [...Map.groupBy(changes, change => change.product)].flatMap(([product, productChanges]) => {
+    const query = new URLSearchParams({ updateMask: product.updateMask, 'regionsVersion.version': regionsVersion });
+    const update = {
+      label: `update ${product.type} ${product.resource.productId}`,
+      changes: productChanges,
+      method: 'PATCH',
+      path: `${product.updatePath}?${query}`,
+      body: product.resource,
+    };
+    const decreases = productChanges.filter(change => change.price < change.current);
+    return migrateDecreases && product.type === 'subscription' && decreases.length
+      ? [update, migrationRequest(product.resource.productId, decreases, regionsVersion)]
+      : [update];
+  });
+}
+
+function migrationRequest(productId, decreases, regionsVersion) {
+  const oldestAllowedPriceVersionTime = new Date().toISOString();
+  return {
+    label: `migrate subscription ${productId} subscribers to lower prices`,
+    changes: decreases,
+    method: 'POST',
+    path: `/subscriptions/${productId}/basePlans:batchMigratePrices`,
+    body: {
+      requests: [...Map.groupBy(decreases, change => change.basePlanId)].map(([basePlanId, planDecreases]) => ({
+        packageName: PACKAGE_NAME,
+        productId,
+        basePlanId,
+        regionalPriceMigrations: planDecreases.map(change => ({
+          regionCode: change.config.regionCode,
+          oldestAllowedPriceVersionTime,
+        })),
+        regionsVersion: { version: regionsVersion },
+      })),
+    },
+  };
+}
+
+function printPlan(requests) {
+  for (const { label, changes } of requests) {
+    console.log(label);
+    for (const change of changes) {
+      const currency = change.config.price.currencyCode;
+      console.log(`  ${change.key} ${currency} ${formatPrice(change.current)} → ${formatPrice(change.price)}`);
+    }
+  }
+}
+
+async function sendRequests(token, requests) {
+  for (const [i, request] of requests.entries()) {
+    try {
+      await api(token, request.method, request.path, request.body);
+    } catch (e) {
+      const applied = requests.slice(0, i).map(r => r.label).join('\n  ') || 'none';
+      const remaining = requests.slice(i).map(r => r.label).join('\n  ');
+      throw new Error(`${request.label} failed: ${e.message}\nApplied:\n  ${applied}\nNot applied:\n  ${remaining}`);
+    }
+    console.log(`Done: ${request.label}`);
+  }
+}
+
+async function importPrices(keyFile, dryRun, migrateDecreases) {
+  const token = await getAccessToken(keyFile);
+  const rows = readCsv();
+  const changes = matchRows(await fetchRegionPrices(token), rows).filter(change => change.price !== change.current);
+  for (const change of changes) change.config.price = toMoney(change.config.price.currencyCode, change.price);
+  const regionsVersion = await fetchRegionsVersion(token);
+  const requests = planRequests(changes, regionsVersion, migrateDecreases);
+  console.log(`Regions version ${regionsVersion}, ${requests.length} requests${dryRun ? ' (dry run, no updates are sent)' : ''}`);
+  printPlan(requests);
+  if (dryRun) return;
+  await sendRequests(token, requests);
+  console.log('Import finished');
+}
+
+async function main() {
+  const { cmd, keyFile, outFile, dryRun, migrateDecreases } = parseArgs();
+  if (cmd === 'export') await exportPrices(keyFile, outFile);
+  else await importPrices(keyFile, dryRun, migrateDecreases);
+}
+
+main().catch(e => {
+  console.error(e.message);
+  process.exit(1);
+});
diff --git a/scripts/prices/price-levels.js b/scripts/prices/price-levels.js
new file mode 100644
index 0000000000..783ba50701
--- /dev/null
+++ b/scripts/prices/price-levels.js
@@ -0,0 +1,111 @@
+#!/usr/bin/env node
+const fs = require('fs');
+
+const BIG_MAC_URL = 'https://raw.githubusercontent.com/TheEconomist/big-mac-data/master/output-data/big-mac-raw-index.csv';
+const EURO_AREA = ['AUT', 'BEL', 'BGR', 'CYP', 'DEU', 'ESP', 'EST', 'FIN', 'FRA', 'GRC', 'HRV', 'IRL', 'ITA', 'LTU', 'LUX', 'LVA', 'MLT', 'NLD', 'PRT', 'SVK', 'SVN'];
+const APPLE_TERRITORIES = { XKX: 'XKS' };
+const ISO2 = { TWN: 'TW' };
+const COLUMNS = ['name', 'iso2', 'iso3', 'apple_territory', 'google_region', 'price_level', 'price_level_year', 'ppp_lcu_per_usd', 'atls_lcu_per_usd', 'big_mac_ratio', 'big_mac_date', 'big_mac_source'];
+
+async function download(url) {
+  const res = await fetch(url);
+  if (!res.ok) throw new Error(`${res.status} ${url}`);
+  return res;
+}
+
+async function worldBank(path, page = 1) {
+  const res = await download(`https://api.worldbank.org/v2/${path}?format=json&per_page=20000&page=${page}`);
+  const [header, records] = await res.json();
+  if (!records) throw new Error(`World Bank ${path}: ${JSON.stringify(header)}`);
+  return page < header.pages ? records.concat(await worldBank(path, page + 1)) : records;
+}
+
+async function economies() {
+  const countries = await worldBank('country');
+  return countries
+    .filter(country => country.region.id !== 'NA')
+    .map(country => ({ name: country.name, iso2: country.iso2Code, iso3: country.id }));
+}
+
+async function indicator(id) {
+  const records = await worldBank(`country/all/indicator/${id}`);
+  return records.filter(record => record.value !== null);
+}
+
+async function priceLevels() {
+  const ppp = await indicator('PA.NUS.PPP');
+  const rates = await indicator('PA.NUS.ATLS');
+  const rateOf = new Map(rates.map(rate => [`${rate.countryiso3code} ${rate.date}`, rate.value]));
+  const levels = new Map();
+  for (const { countryiso3code, date, value } of ppp.sort((a, b) => a.date.localeCompare(b.date))) {
+    const rate = rateOf.get(`${countryiso3code} ${date}`);
+    if (rate) levels.set(countryiso3code, { value: value / rate, year: date, ppp: value, atls: rate });
+  }
+  return levels;
+}
+
+async function bigMacRatios() {
+  const res = await download(BIG_MAC_URL);
+  const [header, ...lines] = (await res.text()).trim().split('\n');
+  const columns = header.split(',');
+  const entries = lines.map(line => Object.fromEntries(line.split(',').map((field, i) => [columns[i], field])));
+  const date = entries.map(entry => entry.date).sort().at(-1);
+  const latest = entries.filter(entry => entry.date === date);
+  const usaPrice = latest.find(entry => entry.iso_a3 === 'USA').dollar_price;
+  return new Map(latest.map(entry => [entry.iso_a3, { name: entry.name, ratio: entry.dollar_price / usaPrice, date }]));
+}
+
+function bigMacOf(iso3, bigMacs) {
+  if (bigMacs.has(iso3)) return { ...bigMacs.get(iso3), source: 'own' };
+  if (EURO_AREA.includes(iso3)) return { ...bigMacs.get('EUZ'), source: 'EUZ' };
+  return {};
+}
+
+function priceLevelRow({ name, iso2, iso3 }, levels, bigMacs) {
+  const level = levels.get(iso3) ?? {};
+  const bigMac = bigMacOf(iso3, bigMacs);
+  return {
+    name,
+    iso2,
+    iso3,
+    apple_territory: APPLE_TERRITORIES[iso3] ?? iso3,
+    google_region: iso2,
+    price_level: level.value,
+    price_level_year: level.year,
+    ppp_lcu_per_usd: level.ppp,
+    atls_lcu_per_usd: level.atls,
+    big_mac_ratio: bigMac.ratio,
+    big_mac_date: bigMac.date,
+    big_mac_source: bigMac.source,
+  };
+}
+
+function csvField(value) {
+  const text = String(value ?? '');
+  return /[",\n]/.test(text) ? `"${text.replaceAll('"', '""')}"` : text;
+}
+
+function csv(rows) {
+  return [COLUMNS, ...rows.map(row => COLUMNS.map(column => row[column]))]
+    .map(fields => fields.map(csvField).join(','))
+    .join('\n') + '\n';
+}
+
+async function main() {
+  const output = process.argv[2] ?? 'price-levels.csv';
+  const [worldBankEconomies, levels, bigMacs] = await Promise.all([economies(), priceLevels(), bigMacRatios()]);
+  const worldBankIso3 = new Set(worldBankEconomies.map(economy => economy.iso3));
+  const bigMacOnly = [...bigMacs]
+    .filter(([iso3]) => iso3 !== 'EUZ' && !worldBankIso3.has(iso3))
+    .map(([iso3, { name }]) => ({ name, iso2: ISO2[iso3], iso3 }));
+  const rows = [...worldBankEconomies, ...bigMacOnly]
+    .sort((a, b) => a.iso3.localeCompare(b.iso3))
+    .map(economy => priceLevelRow(economy, levels, bigMacs));
+  fs.writeFileSync(output, csv(rows));
+  console.log(`Wrote ${rows.length} rows to ${output}`);
+}
+
+main().catch(e => {
+  console.error(e);
+  process.exitCode = 1;
+});
diff --git a/scripts/prices/prices-workbook.py b/scripts/prices/prices-workbook.py
new file mode 100644
index 0000000000..bdc33d83a1
--- /dev/null
+++ b/scripts/prices/prices-workbook.py
@@ -0,0 +1,670 @@
+#!/usr/bin/env python3
+import csv
+import sys
+from collections import defaultdict
+from pathlib import Path
+
+from openpyxl import Workbook
+from openpyxl.formatting.rule import FormulaRule
+from openpyxl.styles import Font, PatternFill
+from openpyxl.utils import get_column_letter
+from openpyxl.workbook.properties import CalcProperties
+from openpyxl.worksheet.datavalidation import DataValidation
+
+WORKBOOK_FILE = "prices.xlsx"
+USAGE = f"""Usage:
+  python3 prices-workbook.py [-o <file>]
+Reads apple-prices.csv, play-prices.csv, apple-price-points.csv, rates.csv and price-levels.csv from the current directory.
+Writes {WORKBOOK_FILE} or <file> and refuses to overwrite an existing file. Requires openpyxl (pip install openpyxl)."""
+
+FONT_NAME = "Arial"
+INPUT_COLOR = "0000FF"
+NOTE_COLOR = "595959"
+UNUSED_COLOR = "A6A6A6"
+HEADER_FILL = PatternFill("solid", fgColor="E7E6E6")
+HIGHLIGHT_FILL = PatternFill("solid", fgColor="FCE4D6")
+
+TIERS = [
+    (1, 0.55, 7),
+    (2, 0.40, 5),
+    (3, 0, 3),
+]
+TOLERANCE = 0.035
+STEPS = [
+    (0, 1, 0.5, 0.5),
+    (10, 1, 1, 1),
+    *(
+        row
+        for unit in (1, 10, 100, 1000, 10000, 100000)
+        for row in ((35 * unit, 5 * unit, 5 * unit, 5 * unit), (75 * unit, 10 * unit, 10 * unit, 10 * unit))
+    ),
+]
+FAMILIES = [
+    ("Supporter", 1, "yes"),
+    ("Legend", 10, "no"),
+]
+ANNUAL_MONTHS = 6
+TIER_OVERRIDES = {
+    **dict.fromkeys(
+        [
+            "ALB", "AND", "AUT", "BEL", "BGR", "BIH", "CHE", "CYP", "CZE", "DEU", "DNK", "ESP", "EST", "FIN",
+            "FRA", "FRO", "GBR", "GIB", "GRC", "HRV", "HUN", "IMN", "IRL", "ISL", "ITA", "LIE", "LTU", "LUX",
+            "LVA", "MCO", "MKD", "MLT", "MNE", "NLD", "NOR", "POL", "PRT", "ROU", "SMR", "SRB", "SVK", "SVN",
+            "SWE", "XKX",
+        ],
+        1,
+    ),
+    "RUS": 2,
+    "CHN": 1,
+}
+AVOIDED_NUMBERS = [13, 66, 666]
+AVOIDED_DIGITS = [
+    ("CNY", 4, None),
+    ("HKD", 4, None),
+    ("MOP", 4, None),
+    ("TWD", 4, None),
+    ("JPY", 4, 9),
+    ("KRW", 4, None),
+    ("SGD", 4, None),
+    ("VND", 4, None),
+    ("MYR", 4, None),
+]
+MANUAL_PRICES = {
+    ("ARS", 1): 10000,
+    ("ETB", 1): 1150,
+    ("HUF", 1): 2350,
+    ("IDR", 1): 125000,
+    ("IQD", 1): 10500,
+    ("JPY", 1): 1050,
+    ("KRW", 1): 10000,
+    ("KZT", 3): 1350,
+    ("MNT", 3): 10500,
+    ("MXN", 1): 125,
+    ("MYR", 3): 12.5,
+    ("SGD", 1): 10,
+    ("THB", 1): 235,
+    ("TWD", 1): 215,
+    ("VND", 3): 85000,
+}
+PRODUCTS = [
+    ("apple", "SUBSCR_BADGE_SUPPORTER_MONTH_01", "", "Supporter monthly"),
+    ("apple", "SUBSCR_BADGE_SUPPORTER_YEAR_01", "", "Supporter annual"),
+    ("apple", "SUBSCR_BADGE_LEGEND_MONTH_01", "", "Legend monthly"),
+    ("apple", "SUBSCR_BADGE_LEGEND_YEAR_01", "", "Legend annual"),
+    ("apple", "BADGE_SUPPORTER_01", "", "Supporter monthly"),
+    ("apple", "BADGE_LEGEND_01", "", "Legend monthly"),
+    ("play", "subscr_badge_supporter_01", "subscr-badge-supporter-month-01", "Supporter monthly"),
+    ("play", "subscr_badge_supporter_01", "subscr-badge-supporter-month-02", "Supporter monthly"),
+    ("play", "subscr_badge_supporter_01", "subscr-badge-supporter-year-01", "Supporter annual"),
+    ("play", "subscr_badge_legend_01", "subscr-badge-legend-month-01", "Legend monthly"),
+    ("play", "subscr_badge_legend_01", "subscr-badge-legend-year-01", "Legend annual"),
+    ("play", "badge_supporter_01", "", "Supporter monthly"),
+    ("play", "badge_legend_01", "", "Legend monthly"),
+]
+APPLE_DOWN_LIMIT = 0.02
+POINT_KEY_SCALE = 10**10
+APPLE_MANUAL_PRICES = {
+    ("RON", 1, "Supporter annual"): 200,
+    ("TRY", 2, "Supporter annual"): 1500,
+}
+PLAY_MANUAL_PRICES = {
+    ("SA", "subscr-badge-legend-year-01"): 1599,
+}
+APPLE_COLUMNS = ["type", "product_id", "territory", "currency", "current_price", "scheduled_price", "scheduled_date", "price"]
+PLAY_COLUMNS = ["type", "product_id", "base_plan_id", "region", "currency", "current_price", "price"]
+CHECK_COLUMNS = ["Country", "Tier", "Priced as", "Current, USD", "New, USD", "Change"]
+COUNTRY_COLUMNS = [
+    "Name",
+    "ISO3",
+    "ISO2",
+    "Apple territory",
+    "Play region",
+    "Apple currency",
+    "Play currency",
+    "Price level",
+    "Year",
+    "Tier override",
+    "Tier",
+    "PPP, LCU per USD",
+    "Atlas rate, LCU per USD",
+    "Big Mac ratio",
+    "Big Mac date",
+    "Big Mac source",
+]
+
+
+def read_csv(path):
+    with open(path, newline="", encoding="utf-8") as file:
+        return list(csv.DictReader(file))
+
+
+def number(text):
+    return float(text) if text else None
+
+
+def currency_by_code(rows, code_column):
+    currencies = {}
+    for row in rows:
+        code, currency = row[code_column], row["currency"]
+        if currencies.setdefault(code, currency) != currency:
+            raise ValueError(f"{code} is priced in {currencies[code]} and {currency}")
+    return currencies
+
+
+def put(ws, row, column, value, number_format=None, color=None, bold=False, italic=False):
+    cell = ws.cell(row, column, value)
+    cell.font = Font(name=FONT_NAME, size=10, color=color, bold=bold, italic=italic)
+    if number_format:
+        cell.number_format = number_format
+    return cell
+
+
+def put_header(ws, row, headers, first_column=1):
+    for column, header in enumerate(headers, start=first_column):
+        put(ws, row, column, header, bold=True).fill = HEADER_FILL
+
+
+def put_note(ws, row, text):
+    put(ws, row, 1, text, color=NOTE_COLOR, italic=True)
+
+
+def set_widths(ws, widths):
+    for index, width in enumerate(widths, start=1):
+        ws.column_dimensions[get_column_letter(index)].width = width
+
+
+def finish_table(ws, columns, last_row):
+    ws.freeze_panes = "A2"
+    ws.auto_filter.ref = f"A1:{get_column_letter(columns)}{last_row}"
+
+
+def avoided_formula(settings, price, currency):
+    numbers = settings["avoided_numbers"]
+    digits = [f'IFERROR(INDEX({column},MATCH({currency},{settings["avoided_currencies"]},0))&"","")' for column in (settings["avoided_first"], settings["avoided_second"])]
+    contains_digit = ",".join(f'AND({digit}<>"",ISNUMBER(SEARCH({digit},{price}&"")))' for digit in digits)
+    return (
+        f"OR({contains_digit},"
+        f"COUNTIF({numbers},{price}/10^(INT(LOG10({price}))-1))+COUNTIF({numbers},{price}/10^(INT(LOG10({price}))-2))"
+        f"+COUNTIF({numbers},MOD(INT({price}/1000),1000))+COUNTIF({numbers},MOD(INT({price}/10^6),1000))>0)"
+    )
+
+
+def add_validation(ws, cells, error, **rule):
+    validation = DataValidation(showErrorMessage=True, errorStyle="stop", error=error, **rule)
+    validation.add(cells)
+    ws.add_data_validation(validation)
+
+
+def build_settings(ws, rate_date):
+    put(ws, 1, 1, "SimpleX badge prices", bold=True)
+    put_note(ws, 2, "Blue cells are inputs. Every price is computed from them.")
+
+    put(ws, 4, 1, "Tiers", bold=True)
+    put_header(ws, 5, ["Tier", "Price level from", "Supporter monthly, USD"])
+    tier_row = 6
+    for offset, (tier, level, usd) in enumerate(TIERS):
+        row = tier_row + offset
+        put(ws, row, 1, tier)
+        put(ws, row, 2, level, "0.00", color=INPUT_COLOR if tier < len(TIERS) else None)
+        put(ws, row, 3, usd, color=INPUT_COLOR)
+    put_note(ws, tier_row + len(TIERS), "Price level: World Bank PPP factor ÷ Atlas rate, US = 1. Countries without a price level are in tier 1. A tier entered in Countries column J replaces the computed tier: 1 for European countries outside the former USSR, the Baltic states and China, 2 for Russia.")
+
+    put(ws, 11, 1, "Rounding", bold=True)
+    tolerance_row = 12
+    put(ws, tolerance_row, 1, "Tolerance")
+    put(ws, tolerance_row, 2, TOLERANCE, "0.0%", color=INPUT_COLOR)
+    put_note(ws, 13, "The exact amount is rounded down to the step when the result is within the tolerance, otherwise up.")
+    put_header(ws, 14, ["Amount from", "Step, tier 1", "Step, tier 2", "Step, tier 3"])
+    step_row = 15
+    for offset, values in enumerate(STEPS):
+        for column, value in enumerate(values, start=1):
+            put(ws, step_row + offset, column, value, color=INPUT_COLOR)
+    step_last = step_row + len(STEPS) - 1
+    put_note(ws, step_last + 1, "Each step is used from its amount up to the next row's amount.")
+
+    family_title = step_last + 3
+    put(ws, family_title, 1, "Families", bold=True)
+    put_header(ws, family_title + 1, ["Family", "× supporter monthly", "Discounted"])
+    family_row = family_title + 2
+    for offset, (name, multiple, discounted) in enumerate(FAMILIES):
+        row = family_row + offset
+        put(ws, row, 1, name)
+        put(ws, row, 2, multiple, color=INPUT_COLOR)
+        put(ws, row, 3, discounted, color=INPUT_COLOR)
+    family_last = family_row + len(FAMILIES) - 1
+    put_note(ws, family_last + 1, "Monthly price = multiple × the final supporter monthly price of the country's tier when discounted, of tier 1 otherwise.")
+    add_validation(ws, f"C{family_row}:C{family_last}", "Enter yes or no.", type="list", formula1='"yes,no"', allow_blank=False)
+    annual_row = family_last + 2
+    put(ws, annual_row, 1, "Annual months")
+    put(ws, annual_row, 2, ANNUAL_MONTHS, color=INPUT_COLOR)
+    put_note(ws, annual_row + 1, "Annual price = annual months × monthly price.")
+    add_validation(ws, f"B{annual_row}", "Enter a whole number of months.", type="whole", operator="between", formula1="1", formula2="12", allow_blank=False)
+
+    avoided_title = annual_row + 3
+    put(ws, avoided_title, 1, "Avoided numbers", bold=True)
+    numbers_row = avoided_title + 1
+    put(ws, numbers_row, 1, "Everywhere")
+    for column, avoided in enumerate(AVOIDED_NUMBERS, start=2):
+        put(ws, numbers_row, column, avoided, color=INPUT_COLOR)
+    put_note(ws, numbers_row + 1, "A price is flagged in the Warning columns of the Apple and Play tabs, and shaded orange on the Prices tab in Excel, when its significant digits, or its thousands or millions, equal one of these numbers.")
+    put_header(ws, numbers_row + 2, ["Currency", "Digit", "Second digit"])
+    digit_row = numbers_row + 3
+    for offset, (currency, digit, second_digit) in enumerate(AVOIDED_DIGITS):
+        put(ws, digit_row + offset, 1, currency, color=INPUT_COLOR)
+        put(ws, digit_row + offset, 2, digit, color=INPUT_COLOR)
+        put(ws, digit_row + offset, 3, second_digit, color=INPUT_COLOR)
+    digit_last = digit_row + len(AVOIDED_DIGITS) - 1
+    put_note(ws, digit_last + 1, "A price in the currency is flagged when it contains either digit. A flagged price is replaced by a value in the Manual column of the Prices tab.")
+
+    product_title = digit_last + 3
+    put(ws, product_title, 1, "Store products", bold=True)
+    put_header(ws, product_title + 1, ["Store", "Product ID", "Base plan ID", "Priced as", "Key"])
+    product_row = product_title + 2
+    for offset, (store, product_id, base_plan_id, priced_as) in enumerate(PRODUCTS):
+        row = product_row + offset
+        put(ws, row, 1, store)
+        put(ws, row, 2, product_id)
+        put(ws, row, 3, base_plan_id or None)
+        put(ws, row, 4, priced_as, color=INPUT_COLOR)
+        put(ws, row, 5, f'=A{row}&"|"&B{row}&"|"&C{row}')
+    product_last = product_row + len(PRODUCTS) - 1
+
+    points_title = product_last + 2
+    put(ws, points_title, 1, "Apple price points", bold=True)
+    apple_limit_row = points_title + 1
+    put(ws, apple_limit_row, 1, "Round-down limit")
+    put(ws, apple_limit_row, 2, APPLE_DOWN_LIMIT, "0.0%", color=INPUT_COLOR)
+    put_note(ws, apple_limit_row + 1, "Apple prices are calculated on the Apple prices tab, one row per currency and tier. A price is the target when Apple offers it; otherwise the highest round price point at or below the target when that is within the limit, else the lowest round price point above it.")
+    put_note(ws, apple_limit_row + 2, "Round: a whole number, or a multiple of 0.5 below 10; the Apple points tab lists the round points and the others. Target: the workbook price; for annual prices, annual months × the Apple monthly price of the same row.")
+    put_note(ws, apple_limit_row + 3, "A value in the Manual columns of the Apple prices tab replaces the Apple price, and one in the Play manual column of the Play tab replaces the Play price. Points: apple-price-points.csv.")
+
+    export_title = apple_limit_row + 5
+    put(ws, export_title, 1, "Import", bold=True)
+    put_note(ws, export_title + 1, "Save sheet apple-prices.csv as CSV UTF-8 to scripts/prices/apple-prices.csv, then run: node apple-prices.js import <issuer_id> <path/to/AuthKey_XXXX.p8> --dry-run")
+    put_note(ws, export_title + 2, "Save sheet play-prices.csv as CSV UTF-8 to scripts/prices/play-prices.csv, then run: node play-prices.js import <service-account.json> --dry-run")
+    put_note(ws, export_title + 3, "Both import scripts read a decimal point (3.5), so save from a region that writes 3.5, not 3,5.")
+    put_note(ws, export_title + 4, f"Rates: rates.csv, Frankfurter, {rate_date}. Price levels: price-levels.csv.")
+
+    set_widths(ws, [22, 38, 34, 20, 44])
+    return {
+        "tier1_level": f"Settings!$B${tier_row}",
+        "tier2_level": f"Settings!$B${tier_row + 1}",
+        "tier_usd": f"Settings!$C${tier_row}:$C${tier_row + len(TIERS) - 1}",
+        "tolerance": f"Settings!$B${tolerance_row}",
+        "step_from": f"Settings!$A${step_row}:$A${step_last}",
+        "steps": f"Settings!$B${step_row}:$D${step_last}",
+        "family_rows": [family_row + offset for offset in range(len(FAMILIES))],
+        "annual_months": f"Settings!$B${annual_row}",
+        "avoided_numbers": f"Settings!$B${numbers_row}:${get_column_letter(1 + len(AVOIDED_NUMBERS))}${numbers_row}",
+        "avoided_currencies": f"Settings!$A${digit_row}:$A${digit_last}",
+        "avoided_first": f"Settings!$B${digit_row}:$B${digit_last}",
+        "avoided_second": f"Settings!$C${digit_row}:$C${digit_last}",
+        "product_cells": f"D{product_row}:D{product_last}",
+        "product_priced_as": f"Settings!$D${product_row}:$D${product_last}",
+        "product_key": f"Settings!$E${product_row}:$E${product_last}",
+        "apple_down_limit": f"Settings!$B${apple_limit_row}",
+    }
+
+
+def country_rows(levels, apple_currency, play_currency):
+    known_apple = {row["apple_territory"] for row in levels}
+    known_play = {row["google_region"] for row in levels}
+    added = [
+        *({"name": code, "apple_territory": code} for code in sorted(apple_currency.keys() - known_apple)),
+        *({"name": code, "google_region": code} for code in sorted(play_currency.keys() - known_play)),
+    ]
+    return sorted([*levels, *added], key=lambda row: row["name"])
+
+
+def build_countries(ws, countries, apple_currency, play_currency, settings):
+    put_header(ws, 1, COUNTRY_COLUMNS)
+    last_row = len(countries) + 1
+    for row, country in enumerate(countries, start=2):
+        apple = country.get("apple_territory", "")
+        play = country.get("google_region", "")
+        year = country.get("price_level_year", "")
+        put(ws, row, 1, country["name"])
+        put(ws, row, 2, country.get("iso3") or None)
+        put(ws, row, 3, country.get("iso2") or None)
+        put(ws, row, 4, apple or None)
+        put(ws, row, 5, play or None)
+        put(ws, row, 6, apple_currency.get(apple))
+        put(ws, row, 7, play_currency.get(play))
+        put(ws, row, 8, number(country.get("price_level", "")), "0.0000")
+        put(ws, row, 9, int(year) if year else None)
+        put(ws, row, 10, TIER_OVERRIDES.get(country.get("iso3")), color=INPUT_COLOR)
+        put(ws, row, 11, f'=IF(J{row}<>"",J{row},IF(H{row}="",1,IF(H{row}>={settings["tier1_level"]},1,IF(H{row}>={settings["tier2_level"]},2,3))))')
+        put(ws, row, 12, number(country.get("ppp_lcu_per_usd", "")))
+        put(ws, row, 13, number(country.get("atls_lcu_per_usd", "")))
+        put(ws, row, 14, number(country.get("big_mac_ratio", "")), "0.000")
+        put(ws, row, 15, country.get("big_mac_date") or None)
+        put(ws, row, 16, country.get("big_mac_source") or None)
+    add_validation(ws, f"J2:J{last_row}", "Enter tier 1, 2 or 3, or leave empty.", type="whole", operator="between", formula1="1", formula2=str(len(TIERS)), allow_blank=True)
+    finish_table(ws, len(COUNTRY_COLUMNS), last_row)
+    set_widths(ws, [30, 7, 7, 10, 9, 10, 9, 11, 7, 10, 6, 14, 14, 11, 12, 11])
+    return {
+        "name": f"Countries!$A$2:$A${last_row}",
+        "apple_code": f"Countries!$D$2:$D${last_row}",
+        "play_code": f"Countries!$E$2:$E${last_row}",
+        "apple_currency": f"Countries!$F$2:$F${last_row}",
+        "play_currency": f"Countries!$G$2:$G${last_row}",
+        "tier": f"Countries!$K$2:$K${last_row}",
+    }
+
+
+def build_rates(ws, rates):
+    put_header(ws, 1, ["Currency", "Units per USD", "Date", "Source"])
+    last_row = len(rates) + 1
+    for row, rate in enumerate(rates, start=2):
+        put(ws, row, 1, rate["currency"])
+        put(ws, row, 2, float(rate["units_per_usd"]))
+        put(ws, row, 3, rate["rate_date"])
+        put(ws, row, 4, rate["source"])
+    finish_table(ws, 4, last_row)
+    set_widths(ws, [10, 14, 12, 40])
+    return {
+        "currency": f"Rates!$A$2:$A${last_row}",
+        "units": f"Rates!$B$2:$B${last_row}",
+    }
+
+
+def build_prices(ws, currencies, settings, countries, rates):
+    headers = ["Key", "Currency", "Tier", "Apple territories", "Play regions", "Units per USD", "Exact", "Step", "Down", "Down vs exact", "Rounded", "Manual", "Final", "Final vs exact"]
+    first_price_column = len(headers) + 1
+    last_price_column = len(headers) + 2 * len(FAMILIES)
+    put_header(ws, 1, headers)
+    for offset, family_row in enumerate(settings["family_rows"]):
+        monthly_column = first_price_column + 2 * offset
+        put(ws, 1, monthly_column, f'=Settings!$A${family_row}&" monthly"', bold=True).fill = HEADER_FILL
+        put(ws, 1, monthly_column + 1, f'=Settings!$A${family_row}&" annual"', bold=True).fill = HEADER_FILL
+    pairs = [(currency, tier) for currency in currencies for tier, _, _ in TIERS]
+    last_row = len(pairs) + 1
+    keys = f"$A$2:$A${last_row}"
+    final = f"$M$2:$M${last_row}"
+    for row, (currency, tier) in enumerate(pairs, start=2):
+        tier1_final = f'INDEX({final},MATCH($B{row}&"|1",{keys},0))'
+        put(ws, row, 1, f'=B{row}&"|"&C{row}', color=NOTE_COLOR)
+        put(ws, row, 2, currency)
+        put(ws, row, 3, tier)
+        put(ws, row, 4, f"=COUNTIFS({countries['apple_currency']},$B{row},{countries['tier']},$C{row})")
+        put(ws, row, 5, f"=COUNTIFS({countries['play_currency']},$B{row},{countries['tier']},$C{row})")
+        put(ws, row, 6, f"=INDEX({rates['units']},MATCH($B{row},{rates['currency']},0))")
+        put(ws, row, 7, f"=INDEX({settings['tier_usd']},$C{row})*F{row}", "#,##0.00")
+        put(ws, row, 8, f"=INDEX({settings['steps']},MATCH(G{row},{settings['step_from']},1),$C{row})")
+        put(ws, row, 9, f"=FLOOR(G{row},H{row})")
+        put(ws, row, 10, f"=I{row}/G{row}-1", "0.0%")
+        put(ws, row, 11, f"=IF(I{row}>=G{row}*(1-{settings['tolerance']}),I{row},CEILING(G{row},H{row}))")
+        put(ws, row, 12, MANUAL_PRICES.get((currency, tier)), color=INPUT_COLOR)
+        put(ws, row, 13, f'=IF(L{row}="",K{row},L{row})')
+        put(ws, row, 14, f"=M{row}/G{row}-1", "0.0%")
+        for offset, family_row in enumerate(settings["family_rows"]):
+            monthly_column = first_price_column + 2 * offset
+            monthly = f"{get_column_letter(monthly_column)}{row}"
+            put(ws, row, monthly_column, f'=Settings!$B${family_row}*IF(Settings!$C${family_row}="yes",$M{row},{tier1_final})')
+            put(ws, row, monthly_column + 1, f"={settings['annual_months']}*{monthly}")
+    first_price, last_price = get_column_letter(first_price_column), get_column_letter(last_price_column)
+    add_validation(ws, f"L2:L{last_row}", "Enter a positive price or leave empty.", type="decimal", operator="greaterThan", formula1="0", allow_blank=True)
+    ws.conditional_formatting.add(f"A2:{last_price}{last_row}", FormulaRule(formula=["AND($C2<>1,$D2+$E2=0)"], font=Font(color=UNUSED_COLOR)))
+    ws.conditional_formatting.add(f"M2:M{last_row} {first_price}2:{last_price}{last_row}", FormulaRule(formula=[avoided_formula(settings, "M2", "$B2")], fill=HIGHLIGHT_FILL))
+    finish_table(ws, last_price_column, last_row)
+    set_widths(ws, [9, 9, 5, 10, 8, 12, 12, 8, 10, 10, 10, 10, 10, 10, 18, 18, 18, 18])
+    put_note(ws, last_row + 2, "Exact: the tier's supporter monthly USD price at the rate. Down: the exact amount rounded down to the step. Rounded: Down when it is within the tolerance, otherwise rounded up.")
+    put_note(ws, last_row + 3, "Final: Manual when entered, otherwise Rounded. In Excel, orange cells contain an avoided number from Settings; Numbers shows these only in the Warning columns of the Apple and Play tabs.")
+    put_note(ws, last_row + 4, "Grey rows: tiers 2 and 3 without territories. Tier-1 rows also set the legend prices of every tier.")
+    return {
+        "key": f"Prices!{keys}",
+        "names": f"Prices!${first_price}$1:${last_price}$1",
+        "prices": f"Prices!${first_price}$2:${last_price}${last_row}",
+    }
+
+
+def build_store(ws, columns, rows, code_column, country_codes, product_key, settings, countries, rates, price, extra):
+    headers = [*columns, *CHECK_COLUMNS, *(header for header, _, _, _ in extra)]
+    put_header(ws, 1, headers)
+    letter = {name: get_column_letter(index) for index, name in enumerate(headers, start=1)}
+    code, currency, current, price_column = (letter[name] for name in (code_column, "currency", "current_price", "price"))
+    last_row = len(rows) + 1
+    for row, data in enumerate(rows, start=2):
+        for index, name in enumerate(columns, start=1):
+            put(ws, row, index, price(row, letter) if name == "price" else data[name] or None)
+        rate = f"INDEX({rates['units']},MATCH(${currency}{row},{rates['currency']},0))"
+        put(ws, row, len(columns) + 1, f"=INDEX({countries['name']},MATCH(${code}{row},{country_codes},0))")
+        put(ws, row, len(columns) + 2, f"=INDEX({countries['tier']},MATCH(${code}{row},{country_codes},0))")
+        put(ws, row, len(columns) + 3, f"=INDEX({settings['product_priced_as']},MATCH({product_key(row)},{settings['product_key']},0))")
+        put(ws, row, len(columns) + 4, f"=VALUE({current}{row})/{rate}", "#,##0.00")
+        put(ws, row, len(columns) + 5, f"={price_column}{row}/{rate}", "#,##0.00")
+        put(ws, row, len(columns) + 6, f"={price_column}{row}/VALUE({current}{row})-1", "0.0%")
+        for offset, (_, value, number_format, color) in enumerate(extra, start=len(columns) + len(CHECK_COLUMNS) + 1):
+            put(ws, row, offset, value(row, letter), number_format, color=color)
+    finish_table(ws, len(headers), last_row)
+    return last_row, letter
+
+
+def workbook_price(prices, row, letter):
+    return f'=INDEX({prices["prices"]},MATCH(${letter["currency"]}{row}&"|"&${letter["Tier"]}{row},{prices["key"]},0),MATCH(${letter["Priced as"]}{row},{prices["names"]},0))'
+
+
+def points_by_currency(rows):
+    point_sets = defaultdict(set)
+    for row in rows:
+        point_sets[(row["type"], row["territory"], row["currency"])].add(float(row["customer_price"]))
+    by_currency = {}
+    for (kind, territory, currency), points in point_sets.items():
+        if by_currency.setdefault(currency, points) != points:
+            raise ValueError(f"{kind} price points of {territory} differ from other {currency} territories")
+    return by_currency
+
+
+def is_round(price):
+    return price == int(price) or (price < 10 and price * 2 == int(price * 2))
+
+
+def put_rows(ws, first_column, rows, number_formats):
+    for row, values in enumerate(rows, start=2):
+        for column, (value, number_format) in enumerate(zip(values, number_formats), start=first_column):
+            put(ws, row, column, value, number_format)
+
+
+def build_points(ws, by_currency):
+    currencies = sorted(by_currency)
+    points = [(currency, point, (index + 1) * POINT_KEY_SCALE + point) for index, currency in enumerate(currencies) for point in sorted(by_currency[currency])]
+    round_points = [point for point in points if is_round(point[1])]
+    other_points = [point for point in points if not is_round(point[1])]
+    put_header(ws, 1, ["Round currency", "Round price", "Round key"])
+    put_header(ws, 1, ["Other currency", "Other price", "Other key"], first_column=5)
+    put_header(ws, 1, ["Currencies"], first_column=9)
+    put_rows(ws, 1, round_points, [None, None, "0.00"])
+    put_rows(ws, 5, other_points, [None, None, "0.00"])
+    put_rows(ws, 9, [(currency,) for currency in currencies], [None])
+    finish_table(ws, 3, len(round_points) + 1)
+    set_widths(ws, [15, 14, 18, 3, 15, 14, 18, 3, 12])
+    put_note(ws, len(round_points) + 3, "Key: the currency's position in Currencies × 10^10 + price; both lists are sorted by key.")
+    return {
+        "currencies": f"'Apple points'!$I$2:$I${len(currencies) + 1}",
+        "round_currency": f"'Apple points'!$A$2:$A${len(round_points) + 1}",
+        "round_price": f"'Apple points'!$B$2:$B${len(round_points) + 1}",
+        "round_keys": f"'Apple points'!$C$2:$C${len(round_points) + 1}",
+        "other_keys": f"'Apple points'!$G$2:$G${len(other_points) + 1}",
+    }
+
+
+def offered_formula(keys, currency_key, price):
+    return f"IFERROR(INDEX({keys},MATCH({currency_key}+{price},{keys},1))={currency_key}+{price},FALSE)"
+
+
+def apple_price_formula(settings, points, currency, currency_key, target, found_row, manual):
+    below = f"IF({found_row}=0,0,IF(INDEX({points['round_currency']},{found_row})={currency},INDEX({points['round_price']},{found_row}),0))"
+    above = f"IFERROR(IF(INDEX({points['round_currency']},{found_row}+1)={currency},INDEX({points['round_price']},{found_row}+1),0),0)"
+    round_target = f"OR({target}=INT({target}),AND({target}<10,{target}*2=INT({target}*2)))"
+    offered = f"IF({round_target},{below}={target},{offered_formula(points['other_keys'], currency_key, target)})"
+    nearby = f"IF(OR({below}>={target}*(1-{settings['apple_down_limit']}),{above}=0),{below},{above})"
+    return f'=IF({manual}<>"",{manual},IF({offered},{target},{nearby}))'
+
+
+def apple_warning_formula(settings, points, currency, currency_key, price, manual):
+    offered = f"OR({offered_formula(points['round_keys'], currency_key, price)},{offered_formula(points['other_keys'], currency_key, price)})"
+    avoided = avoided_formula(settings, price, currency)
+    return f'=IF({price}=0,"no round price point",IF(IF({manual}<>"",NOT({offered}),FALSE),"not an Apple price point",IF({avoided},"avoided number","")))'
+
+
+def build_apple_prices(ws, currencies, settings, prices, points, countries):
+    price_count = 2 * len(FAMILIES)
+    price_names = [f"{name} {period}" for name, _, _ in FAMILIES for period in ("monthly", "annual")]
+    headers = ["Key", "Currency", "Tier", "Apple territories"]
+    blocks = ["Apple", "Warning", "Manual", "Workbook", "Target", "Row"]
+    block_start = {block: len(headers) + 1 + offset * price_count for offset, block in enumerate(blocks)}
+    key_column = len(headers) + len(blocks) * price_count + 1
+    put_header(ws, 1, headers)
+    for block, start in block_start.items():
+        for index in range(price_count):
+            name = f"INDEX({prices['names']},{index + 1})"
+            put(ws, 1, start + index, f"={name}" if block == "Apple" else f'="{block} "&{name}', bold=True).fill = HEADER_FILL
+    put(ws, 1, key_column, "Currency key", bold=True).fill = HEADER_FILL
+    pairs = [(currency, tier) for currency in currencies for tier, _, _ in TIERS]
+    last_row = len(pairs) + 1
+
+    def cell(block, index, row):
+        return f"${get_column_letter(block_start[block] + index)}{row}"
+
+    for row, (currency, tier) in enumerate(pairs, start=2):
+        currency_key = f"${get_column_letter(key_column)}{row}"
+        put(ws, row, 1, f'=B{row}&"|"&C{row}', color=NOTE_COLOR)
+        put(ws, row, 2, currency)
+        put(ws, row, 3, tier)
+        put(ws, row, 4, f"=COUNTIFS({countries['apple_currency']},$B{row},{countries['tier']},$C{row})")
+        for index, name in enumerate(price_names):
+            target, found_row, manual, apple = (cell(block, index, row) for block in ("Target", "Row", "Manual", "Apple"))
+            target_formula = f"={cell('Workbook', index, row)}" if index % 2 == 0 else f"={settings['annual_months']}*{cell('Apple', index - 1, row)}"
+            put(ws, row, block_start["Workbook"] + index, f"=INDEX({prices['prices']},MATCH($A{row},{prices['key']},0),{index + 1})")
+            put(ws, row, block_start["Target"] + index, target_formula)
+            put(ws, row, block_start["Row"] + index, f"=IFERROR(MATCH({currency_key}+{target},{points['round_keys']},1),0)")
+            put(ws, row, block_start["Manual"] + index, APPLE_MANUAL_PRICES.get((currency, tier, name)), color=INPUT_COLOR)
+            put(ws, row, block_start["Apple"] + index, apple_price_formula(settings, points, f"$B{row}", currency_key, target, found_row, manual))
+            put(ws, row, block_start["Warning"] + index, apple_warning_formula(settings, points, f"$B{row}", currency_key, apple, manual))
+        put(ws, row, key_column, f"=MATCH($B{row},{points['currencies']},0)*{POINT_KEY_SCALE}", "0")
+    first_apple, last_apple = get_column_letter(block_start["Apple"]), get_column_letter(block_start["Apple"] + price_count - 1)
+    first_warning, last_warning = get_column_letter(block_start["Warning"]), get_column_letter(block_start["Warning"] + price_count - 1)
+    first_manual, last_manual = get_column_letter(block_start["Manual"]), get_column_letter(block_start["Manual"] + price_count - 1)
+    add_validation(ws, f"{first_manual}2:{last_manual}{last_row}", "Enter a positive Apple price point or leave empty.", type="decimal", operator="greaterThan", formula1="0", allow_blank=True)
+    ws.conditional_formatting.add(f"A2:{get_column_letter(key_column)}{last_row}", FormulaRule(formula=["$D2=0"], font=Font(color=UNUSED_COLOR)))
+    ws.conditional_formatting.add(f"{first_apple}2:{last_apple}{last_row}", FormulaRule(formula=[f'{first_warning}2<>""'], fill=HIGHLIGHT_FILL))
+    finish_table(ws, key_column, last_row)
+    set_widths(ws, [9, 9, 5, 10, *[16] * (len(blocks) * price_count), 16])
+    put_note(ws, last_row + 2, "One row per Apple currency and tier. Apple: the price sent to Apple. Manual: replaces the Apple price. Workbook: the price from the Prices tab.")
+    put_note(ws, last_row + 3, "Target: the workbook price; for annual prices, annual months × the Apple monthly price. Row: the position of the highest round price point at or below the target on the Apple points tab.")
+    put_note(ws, last_row + 4, "Grey rows: no Apple territory uses this currency in this tier.")
+    return {
+        "key": f"'Apple prices'!$A$2:$A${last_row}",
+        "names": f"'Apple prices'!${first_apple}$1:${last_apple}$1",
+        "prices": f"'Apple prices'!${first_apple}$2:${last_apple}${last_row}",
+        "warnings": f"'Apple prices'!${first_warning}$2:${last_warning}${last_row}",
+    }
+
+
+def apple_columns(prices, apple_prices):
+    def position(row, letter):
+        return f'MATCH(${letter["currency"]}{row}&"|"&${letter["Tier"]}{row},{apple_prices["key"]},0),MATCH(${letter["Priced as"]}{row},{apple_prices["names"]},0)'
+
+    def apple_price(row, letter):
+        return f"=INDEX({apple_prices['prices']},{position(row, letter)})"
+
+    extra = [
+        ("Workbook price", lambda row, letter: workbook_price(prices, row, letter), None, None),
+        ("Apple vs workbook", lambda row, letter: f"=${letter['price']}{row}/${letter['Workbook price']}{row}-1", "0.0%", None),
+        ("Warning", lambda row, letter: f'=INDEX({apple_prices["warnings"]},{position(row, letter)})&""', None, None),
+    ]
+    return apple_price, extra
+
+
+def play_columns(settings, prices, play_rows):
+    rows_by_number = dict(enumerate(play_rows, start=2))
+
+    def play_price(row, letter):
+        manual, workbook = f"${letter['Play manual']}{row}", f"${letter['Workbook price']}{row}"
+        return f'=IF({manual}<>"",{manual},{workbook})'
+
+    def play_manual(row, letter):
+        data = rows_by_number[row]
+        return PLAY_MANUAL_PRICES.get((data["region"], data["base_plan_id"] or data["product_id"]))
+
+    def warning(row, letter):
+        return f'=IF({avoided_formula(settings, f"${letter["price"]}{row}", f"$E{row}")},"avoided number","")'
+
+    extra = [
+        ("Workbook price", lambda row, letter: workbook_price(prices, row, letter), None, None),
+        ("Play manual", play_manual, None, INPUT_COLOR),
+        ("Warning", warning, None, None),
+    ]
+    return play_price, extra
+
+
+def build_export(ws, source, columns, last_row, price_formula):
+    put_header(ws, 1, columns)
+    for row in range(2, last_row + 1):
+        for index, name in enumerate(columns, start=1):
+            cell = f"{source}!{get_column_letter(index)}{row}"
+            put(ws, row, index, price_formula(row) if name == "price" else f'=IF({cell}="","",{cell})')
+
+
+def output_path(args):
+    if not args:
+        return Path(WORKBOOK_FILE)
+    if len(args) == 2 and args[0] == "-o":
+        return Path(args[1])
+    sys.exit(USAGE)
+
+
+def main():
+    output = output_path(sys.argv[1:])
+    if output.exists():
+        sys.exit(f"{output} already exists, nothing was written")
+    apple_rows = read_csv("apple-prices.csv")
+    play_rows = read_csv("play-prices.csv")
+    rates = read_csv("rates.csv")
+    levels = read_csv("price-levels.csv")
+    points = points_by_currency(read_csv("apple-price-points.csv"))
+    apple_currency = currency_by_code(apple_rows, "territory")
+    play_currency = currency_by_code(play_rows, "region")
+    currencies = sorted({*apple_currency.values(), *play_currency.values()})
+
+    wb = Workbook()
+    settings_ws = wb.active
+    settings_ws.title = "Settings"
+    prices_ws = wb.create_sheet("Prices")
+    apple_prices_ws = wb.create_sheet("Apple prices")
+    countries_ws = wb.create_sheet("Countries")
+    apple_ws = wb.create_sheet("Apple")
+    play_ws = wb.create_sheet("Play")
+    rates_ws = wb.create_sheet("Rates")
+    points_ws = wb.create_sheet("Apple points")
+    apple_export_ws = wb.create_sheet("apple-prices.csv")
+    play_export_ws = wb.create_sheet("play-prices.csv")
+
+    settings = build_settings(settings_ws, max(rate["rate_date"] for rate in rates))
+    countries = build_countries(countries_ws, country_rows(levels, apple_currency, play_currency), apple_currency, play_currency, settings)
+    rate_ranges = build_rates(rates_ws, rates)
+    prices = build_prices(prices_ws, currencies, settings, countries, rate_ranges)
+    add_validation(settings_ws, settings["product_cells"], "Choose a price column of the Prices sheet.", type="list", formula1=prices["names"], allow_blank=False)
+    point_ranges = build_points(points_ws, points)
+    apple_prices = build_apple_prices(apple_prices_ws, sorted(set(apple_currency.values())), settings, prices, point_ranges, countries)
+    apple_price, apple_extra = apple_columns(prices, apple_prices)
+    apple_last, apple_letter = build_store(apple_ws, APPLE_COLUMNS, apple_rows, "territory", countries["apple_code"], lambda row: f'"apple|"&$B{row}&"|"', settings, countries, rate_ranges, apple_price, apple_extra)
+    play_price, play_extra = play_columns(settings, prices, play_rows)
+    play_last, play_letter = build_store(play_ws, PLAY_COLUMNS, play_rows, "region", countries["play_code"], lambda row: f'"play|"&$B{row}&"|"&$C{row}', settings, countries, rate_ranges, play_price, play_extra)
+    play_manual_column = play_letter["Play manual"]
+    add_validation(play_ws, f"{play_manual_column}2:{play_manual_column}{play_last}", "Enter a positive price or leave empty.", type="decimal", operator="greaterThan", formula1="0", allow_blank=True)
+    for ws, letter, last_row in ((apple_ws, apple_letter, apple_last), (play_ws, play_letter, play_last)):
+        ws.conditional_formatting.add(f"{letter['price']}2:{letter['price']}{last_row}", FormulaRule(formula=[f'${letter["Warning"]}2<>""'], fill=HIGHLIGHT_FILL))
+    set_widths(apple_ws, [12, 36, 9, 9, 12, 14, 14, 10, 30, 6, 18, 12, 10, 9, 14, 12, 24])
+    set_widths(play_ws, [12, 26, 32, 7, 9, 12, 10, 30, 6, 18, 12, 10, 9, 14, 12, 18])
+    apple_decimals = 'IF(ROUND(Apple!H{row}*10,6)=ROUND(Apple!H{row}*10,0),1,2)'
+    build_export(apple_export_ws, "Apple", APPLE_COLUMNS, apple_last, lambda row: f'=FIXED(Apple!H{row},IF(ISNUMBER(SEARCH(".",Apple!E{row})),{apple_decimals.format(row=row)},0),TRUE)')
+    play_decimals = 'IF(ROUND(Play!G{row},6)=ROUND(Play!G{row},0),0,IF(ROUND(Play!G{row}*10,6)=ROUND(Play!G{row}*10,0),1,2))'
+    build_export(play_export_ws, "Play", PLAY_COLUMNS, play_last, lambda row: f"=FIXED(Play!G{row},{play_decimals.format(row=row)},TRUE)")
+
+    wb.calculation = CalcProperties(fullCalcOnLoad=True)
+    wb.save(output)
+    print(f"Wrote {output}: {len(currencies)} currencies, {len(apple_rows)} Apple rows, {len(play_rows)} Play rows")
+
+
+main()
diff --git a/scripts/prices/rates.js b/scripts/prices/rates.js
new file mode 100644
index 0000000000..1fe0bbb1db
--- /dev/null
+++ b/scripts/prices/rates.js
@@ -0,0 +1,98 @@
+#!/usr/bin/env node
+const fs = require('fs');
+const { parseArgs } = require('util');
+
+const RATES_URL = 'https://api.frankfurter.dev/v2/rates';
+
+const USAGE = `Usage:
+  node rates.js fetch [output.csv]
+  node rates.js compare <baseline.csv> <current.csv> [--threshold 20] [--currencies <file.csv>]...`;
+
+async function fetchRates(file) {
+  const url = `${RATES_URL}?base=USD`;
+  const res = await fetch(url);
+  if (!res.ok) throw new Error(`${res.status} ${url}: ${await res.text()}`);
+  const rates = (await res.json()).filter(({ quote }) => quote !== 'USD');
+  const usd = { quote: 'USD', rate: 1, date: new Date().toISOString().slice(0, 10) };
+  const rows = [usd, ...rates]
+    .map(({ quote, rate, date }) => [quote, rate, date, RATES_URL])
+    .sort(([a], [b]) => a.localeCompare(b));
+  const lines = [['currency', 'units_per_usd', 'rate_date', 'source'], ...rows].map(row => row.join(','));
+  fs.writeFileSync(file, lines.join('\n') + '\n');
+  console.log(`Wrote ${rows.length} rows to ${file}`);
+}
+
+function readColumns(file, names) {
+  const [header, ...rows] = fs.readFileSync(file, 'utf8').trim().split(/\r?\n/).map(line => line.split(','));
+  const columns = names.map(name => header.indexOf(name));
+  if (columns.includes(-1)) throw new Error(`${file}: header must include ${names.join(' and ')}`);
+  return rows.map(row => columns.map(column => row[column]));
+}
+
+function readRates(file) {
+  return new Map(readColumns(file, ['currency', 'units_per_usd']).map(([currency, units]) => {
+    const unitsPerUsd = Number(units);
+    if (!(unitsPerUsd > 0)) throw new Error(`${file}: invalid units_per_usd for ${currency}`);
+    return [currency, unitsPerUsd];
+  }));
+}
+
+function readCurrencies(file) {
+  return readColumns(file, ['currency']).map(([currency]) => currency);
+}
+
+function compareRates(baselineFile, currentFile, threshold, currencyFiles) {
+  const baseline = readRates(baselineFile);
+  const current = readRates(currentFile);
+  const currencies = currencyFiles.length > 0 ? currencyFiles.flatMap(file => readCurrencies(file)) : [...baseline.keys()];
+  const compared = [...new Set(currencies)].sort();
+  const changes = compared
+    .filter(currency => baseline.has(currency) && current.has(currency))
+    .map(currency => {
+      const before = baseline.get(currency);
+      const after = current.get(currency);
+      return { currency, before, after, percent: (after / before - 1) * 100 };
+    })
+    .filter(({ percent }) => Math.abs(percent) > threshold);
+  if (changes.length > 0) {
+    console.log('currency,baseline,current,change_percent');
+    changes.forEach(c => console.log(`${c.currency},${c.before},${c.after},${c.percent.toFixed(1)}`));
+  }
+  const missingFromCurrent = compared.filter(currency => !current.has(currency));
+  const missingFromBaseline = compared.filter(currency => !baseline.has(currency));
+  if (missingFromCurrent.length > 0) console.error(`missing from ${currentFile}: ${missingFromCurrent.join(' ')}`);
+  if (missingFromBaseline.length > 0) console.error(`missing from ${baselineFile}: ${missingFromBaseline.join(' ')}`);
+  if (missingFromCurrent.length > 0 || missingFromBaseline.length > 0) return 1;
+  return changes.length > 0 ? 2 : 0;
+}
+
+async function run([cmd, ...args]) {
+  if (cmd === 'fetch') {
+    await fetchRates(args[0] ?? 'rates.csv');
+    return 0;
+  }
+  if (cmd === 'compare') {
+    const { values, positionals } = parseArgs({
+      args,
+      allowPositionals: true,
+      options: {
+        threshold: { type: 'string', default: '20' },
+        currencies: { type: 'string', multiple: true, default: [] },
+      },
+    });
+    const [baselineFile, currentFile] = positionals;
+    const threshold = Number(values.threshold);
+    if (positionals.length === 2 && threshold >= 0) return compareRates(baselineFile, currentFile, threshold, values.currencies);
+  }
+  console.log(USAGE);
+  return 1;
+}
+
+run(process.argv.slice(2))
+  .then(code => {
+    process.exitCode = code;
+  })
+  .catch(e => {
+    console.error(e);
+    process.exitCode = 1;
+  });
diff --git a/simplex-chat.cabal b/simplex-chat.cabal
index d984704472..f654c3f843 100644
--- a/simplex-chat.cabal
+++ b/simplex-chat.cabal
@@ -173,6 +173,7 @@ library
           Simplex.Chat.Store.Postgres.Migrations.M20261010_invite_member_via_group
           Simplex.Chat.Store.Postgres.Migrations.M20261012_delivery_job_notification
           Simplex.Chat.Store.Postgres.Migrations.M20261016_badge_store_receipts
+          Simplex.Chat.Store.Postgres.Migrations.M20261019_chat_layout
           Simplex.Chat.Store.Postgres.Migrations.M20261021_badge_subscriptions
   else
       exposed-modules:
@@ -356,6 +357,7 @@ library
           Simplex.Chat.Store.SQLite.Migrations.M20261012_delivery_job_notification
           Simplex.Chat.Store.SQLite.Migrations.M20261016_badge_store_receipts
           Simplex.Chat.Store.SQLite.Migrations.M20261018_autoincrement_ids
+          Simplex.Chat.Store.SQLite.Migrations.M20261019_chat_layout
           Simplex.Chat.Store.SQLite.Migrations.M20261021_badge_subscriptions
   other-modules:
       Paths_simplex_chat
diff --git a/src/Simplex/Chat/AppSettings.hs b/src/Simplex/Chat/AppSettings.hs
index 22938dd48c..d7a13529e4 100644
--- a/src/Simplex/Chat/AppSettings.hs
+++ b/src/Simplex/Chat/AppSettings.hs
@@ -58,7 +58,8 @@ data AppSettings = AppSettings
     uiCurrentThemeIds :: Maybe (Map ThemeColorScheme Text),
     uiThemes :: Maybe [UITheme],
     oneHandUI :: Maybe Bool,
-    chatBottomBar :: Maybe Bool
+    chatBottomBar :: Maybe Bool,
+    uiChatLayout :: Maybe ChatLayout
   }
   deriving (Show)
 
@@ -109,7 +110,8 @@ defaultAppSettings =
       uiCurrentThemeIds = Nothing,
       uiThemes = Nothing,
       oneHandUI = Just True,
-      chatBottomBar = Just True
+      chatBottomBar = Just True,
+      uiChatLayout = Just CLClassic
     }
 
 defaultParseAppSettings :: AppSettings
@@ -147,7 +149,8 @@ defaultParseAppSettings =
       uiCurrentThemeIds = Nothing,
       uiThemes = Nothing,
       oneHandUI = Nothing,
-      chatBottomBar = Nothing
+      chatBottomBar = Nothing,
+      uiChatLayout = Nothing
     }
 
 combineAppSettings :: AppSettings -> AppSettings -> AppSettings
@@ -185,7 +188,8 @@ combineAppSettings platformDefaults storedSettings =
       uiCurrentThemeIds = p uiCurrentThemeIds,
       uiThemes = p uiThemes,
       oneHandUI = p oneHandUI,
-      chatBottomBar = p chatBottomBar
+      chatBottomBar = p chatBottomBar,
+      uiChatLayout = p uiChatLayout
     }
   where
     p :: (AppSettings -> Maybe a) -> Maybe a
@@ -240,6 +244,7 @@ instance FromJSON AppSettings where
     uiThemes <- p "uiThemes"
     oneHandUI <- p "oneHandUI"
     chatBottomBar <- p "chatBottomBar"
+    uiChatLayout <- p "uiChatLayout"
     pure
       AppSettings
         { appPlatform,
@@ -274,7 +279,8 @@ instance FromJSON AppSettings where
           uiCurrentThemeIds,
           uiThemes,
           oneHandUI,
-          chatBottomBar
+          chatBottomBar,
+          uiChatLayout
         }
     where
       p key = v .:? key <|> pure Nothing
diff --git a/src/Simplex/Chat/Bot.hs b/src/Simplex/Chat/Bot.hs
index 3b1c4c6da0..d08a1994f4 100644
--- a/src/Simplex/Chat/Bot.hs
+++ b/src/Simplex/Chat/Bot.hs
@@ -67,8 +67,8 @@ initializeBotAddress' logAddress pqRatchet_ doAutoAccept cc = do
         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)
       let aa = if doAutoAccept then Just AutoAccept {acceptIncognito = False} else Nothing
-          settings = AddressSettings {businessAddress = False, autoAccept = aa, autoReply = Nothing}
-      void $ sendChatCmd cc $ SetAddressSettings Nothing settings
+          settings = AddressSettings {businessAddress = False, autoAccept = aa, chatLayout = Nothing, autoReply = Nothing}
+      void $ sendChatCmd cc $ SetAddressSettings Nothing settings Nothing
 
 sendMessage :: ChatController -> Contact -> Text -> IO ()
 sendMessage cc ct = sendComposedMessage cc ct Nothing . MCText
diff --git a/src/Simplex/Chat/Controller.hs b/src/Simplex/Chat/Controller.hs
index 459a476abd..3731b112a1 100644
--- a/src/Simplex/Chat/Controller.hs
+++ b/src/Simplex/Chat/Controller.hs
@@ -598,7 +598,7 @@ data ChatCommand
   | APISetProfileAddress {userId :: UserId, enable :: Bool}
   | SetProfileAddress Bool
   | APISetAddressSettings {userId :: UserId, pqRatchet :: Maybe Bool, settings :: AddressSettings}
-  | SetAddressSettings {pqRatchet :: Maybe Bool, settings :: AddressSettings}
+  | SetAddressSettings {pqRatchet :: Maybe Bool, settings :: AddressSettings, chatLayout :: Maybe (Maybe ChatLayout)}
   | AcceptContact IncognitoEnabled ContactName
   | RejectContact ContactName Bool
   | ForwardMessage {toChatName :: ChatName, fromContactName :: ContactName, forwardedMsg :: Text}
@@ -686,6 +686,7 @@ data ChatCommand
   | SetGroupFeature AGroupFeatureNoRole GroupName GroupFeatureEnabled
   | SetGroupFeatureRole AGroupFeatureRole GroupName GroupFeatureEnabled (Maybe GroupMemberRole)
   | SetGroupMemberAdmissionReview GroupName (Maybe MemberCriteria)
+  | SetGroupChatLayout GroupName (Maybe ChatLayout)
   | SetUserTimedMessages Bool -- UserId (not used in UI)
   | SetContactTimedMessages ContactName (Maybe TimedMessagesEnabled)
   | SetGroupTimedMessages GroupName (Maybe Int)
diff --git a/src/Simplex/Chat/Library/Commands.hs b/src/Simplex/Chat/Library/Commands.hs
index 90dfed8206..8ef9eaab24 100644
--- a/src/Simplex/Chat/Library/Commands.hs
+++ b/src/Simplex/Chat/Library/Commands.hs
@@ -102,6 +102,7 @@ import Simplex.Chat.Store.Shared
 import Simplex.Chat.Types
 import Simplex.Chat.Types.Preferences
 import Simplex.Chat.Types.Shared
+import Simplex.Chat.Types.UITheme (ChatLayout (..))
 import Simplex.Chat.Util (liftIOEither, zipWith3')
 import qualified Simplex.Chat.Util as U
 import Simplex.Chat.Web (webPreviewWorker)
@@ -478,8 +479,8 @@ processChatCommand cxt nm = \case
     user <- withFastStore $ \db -> do
       user <- createUserRecordAt db (AgentUserId auId) (isTrue userChatRelay) service p True ts
       mapM_ (setUserServers db user ts) uss
-      createPresetContactCards db user `catchAllErrors` \_ -> pure ()
       createNoteFolder db user
+      createPresetContactCards db user `catchAllErrors` \_ -> pure ()
       pure user
     atomically . writeTVar u $ Just user
     pure $ CRActiveUser user
@@ -2198,14 +2199,14 @@ processChatCommand cxt nm = \case
     pure $ CRConnectionPlan user ccLink planSimplexName otherSimplexName plan
   APIConnectPlan _ Nothing _ _ -> throwChatError CEInvalidConnReq
   APIPrepareContact userId accLink verifiedDomain contactSLinkData -> withUserId userId $ \user -> do
-    let ContactShortLinkData {profile, message, business} = contactSLinkData
+    let ContactShortLinkData {profile, message, business, chatLayout} = contactSLinkData
     welcomeSharedMsgId <- forM message $ \_ -> getSharedMsgId
     case accLink of
       ACCL SCMContact ccLink
         | business -> do
             let Profile {preferences} = profile
                 groupPreferences = maybe defaultBusinessGroupPrefs businessGroupPrefs preferences
-                groupProfile = businessGroupProfile profile groupPreferences
+                groupProfile = businessGroupProfile profile groupPreferences chatLayout
             gVar <- asks random
             (gInfo, hostMember_) <- withStore $ \db -> createPreparedGroup db gVar cxt user groupProfile True ccLink welcomeSharedMsgId False GRMember Nothing verifiedDomain
             hostMember <- maybe (throwCmdError "no host member") pure hostMember_
@@ -2219,8 +2220,9 @@ processChatCommand cxt nm = \case
                   Just (AChatItem SCTGroup dir _ ci) -> Chat cInfo [CChatItem dir ci] emptyChatStats {unreadCount = 1, minUnreadItemId = chatItemId' ci}
                   _ -> Chat cInfo [] emptyChatStats
             pure $ CRNewPreparedChat user $ AChat SCTGroup chat
-      ACCL _ (CCLink cReq sLnk) -> do
-        ct <- withStore $ \db -> createPreparedContact db cxt user (linkPresHeader <$> sLnk) profile accLink welcomeSharedMsgId (True <$ verifiedDomain)
+      ACCL m (CCLink cReq sLnk) -> do
+        let ctLayout = case m of SCMContact -> chatLayout; SCMInvitation -> Nothing
+        ct <- withStore $ \db -> createPreparedContact db cxt user (linkPresHeader <$> sLnk) profile accLink welcomeSharedMsgId ctLayout (True <$ verifiedDomain)
         void $ createChatItem user (CDDirectSnd ct) False CIChatBanner Nothing Nothing (Just epochStart)
         let cd = CDDirectRcv ct
             createItem sharedMsgId content = createChatItem user cd False content sharedMsgId Nothing Nothing
@@ -2542,8 +2544,9 @@ processChatCommand cxt nm = \case
         ucl'' <- if shortLinkDataSet then setMyAddressData False pqInitKeys user ucl' else pure ucl'
         withFastStore' $ \db -> updateUserAddressSettings db userContactLinkId settings
         pure $ CRUserContactLinkUpdated user ucl''
-  SetAddressSettings pqRatchet_ settings -> withUser $ \User {userId} ->
-    processChatCommand cxt nm $ APISetAddressSettings userId pqRatchet_ settings
+  SetAddressSettings pqRatchet_ settings chatLayout_ -> withUser $ \user@User {userId} -> do
+    UserContactLink {addressSettings = AddressSettings {chatLayout}} <- withFastStore (`getUserAddress` user)
+    processChatCommand cxt nm $ APISetAddressSettings userId pqRatchet_ (settings :: AddressSettings) {chatLayout = fromMaybe chatLayout chatLayout_}
   AcceptContact incognito cName -> withUser $ \User {userId} -> do
     connReqId <- withFastStore $ \db -> getContactRequestIdByName db userId cName
     processChatCommand cxt nm $ APIAcceptContact incognito connReqId
@@ -3681,6 +3684,8 @@ processChatCommand cxt nm = \case
       case memberAdmission of
         Nothing -> p {memberAdmission = Just (emptyGroupMemberAdmission :: GroupMemberAdmission) {review = reviewAdmissionApplication}}
         Just ma -> p {memberAdmission = Just (ma :: GroupMemberAdmission) {review = reviewAdmissionApplication}}
+  SetGroupChatLayout gName chatLayout ->
+    updateGroupProfileByName gName $ \p -> p {chatLayout}
   SetUserTimedMessages onOff -> withUserProfileLock "updateProfile" $ withUser $ \user@User {profile} -> do
     let allowed = if onOff then FAYes else FANo
         pref = TimedMessagesPreference allowed Nothing
@@ -4841,7 +4846,8 @@ processChatCommand cxt nm = \case
     contactShortLinkData p settings =
       let msg = autoReply =<< settings
           business = maybe False businessAddress settings
-          contactData = ContactShortLinkData p msg business Nothing
+          layout = settings >>= \AddressSettings {chatLayout} -> chatLayout
+          contactData = ContactShortLinkData p msg business layout Nothing
        in encodeShortLinkData contactData
     relayShortLinkData :: Profile -> UserLinkData
     relayShortLinkData Profile {displayName, fullName, shortDescr, image} =
@@ -6979,7 +6985,7 @@ chatCommandP =
       "/_profile_address " *> (APISetProfileAddress <$> A.decimal <* A.space <*> onOffP),
       ("/profile_address " <|> "/pa ") *> (SetProfileAddress <$> onOffP),
       "/_address_settings " *> (APISetAddressSettings <$> A.decimal <*> optional (" pq_ratchet=" *> onOffP) <* A.space <*> jsonP),
-      "/auto_accept" *> (SetAddressSettings <$> optional (" pq_ratchet=" *> onOffP) <* A.space <*> autoAcceptP),
+      "/auto_accept" *> (uncurry . SetAddressSettings <$> optional (" pq_ratchet=" *> onOffP) <* A.space <*> autoAcceptP),
       ("/accept" <|> "/ac") *> (AcceptContact <$> incognitoP <* A.space <* char_ '@' <*> displayNameP),
       ("/reject " <|> "/rc ") *> char_ '@' *> (RejectContact <$> displayNameP <*> (" notify" $> True <|> pure False)),
       ("/markdown" <|> "/m") $> ChatHelp HSMarkdown,
@@ -7015,6 +7021,7 @@ chatCommandP =
       "/set support #" *> (SetGroupFeature (AGFNR SGFSupport) <$> displayNameP <*> (A.space *> strP)),
       "/set links #" *> (SetGroupFeatureRole (AGFR SGFSimplexLinks) <$> displayNameP <*> _strP <*> optional memberRole),
       "/set admission review #" *> (SetGroupMemberAdmissionReview <$> displayNameP <*> (A.space *> memberCriteriaP)),
+      "/set layout #" *> (SetGroupChatLayout <$> displayNameP <* A.space <*> chatLayoutP_),
       ("/incognito" <* optional (A.space *> onOffP)) $> ChatHelp HSIncognito,
       "/set device name " *> (SetLocalDeviceName <$> textP),
       "/list remote hosts" $> ListRemoteHosts,
@@ -7158,12 +7165,14 @@ chatCommandP =
                 { directMessages = Just DirectMessagesGroupPreference {enable = FEOn, role = Nothing},
                   history = Just HistoryGroupPreference {enable = FEOn}
                 }
-      pure GroupProfile {displayName = gName, fullName = "", shortDescr, description = Nothing, image = Nothing, publicGroup = Nothing, groupPreferences, memberAdmission = Nothing}
+      pure GroupProfile {displayName = gName, fullName = "", shortDescr, description = Nothing, image = Nothing, publicGroup = Nothing, groupPreferences, memberAdmission = Nothing, chatLayout = Nothing}
     channelProfile = do
       p@GroupProfile {groupPreferences = prefs_} <- groupProfile
       let prefs = (fromMaybe emptyGroupPrefs prefs_) {support  = Just SupportGroupPreference {enable = FEOff}} :: GroupPreferences
       pure p {groupPreferences = Just prefs}
     memberCriteriaP = ("all" $> Just MCAll) <|> ("off" $> Nothing)
+    chatLayoutP = ("classic" $> CLClassic) <|> ("terminal" $> CLTerminal)
+    chatLayoutP_ = ("default" $> Nothing) <|> (Just <$> chatLayoutP)
     shortDescrP = do
       descr <- A.takeWhile1 isSpace *> (T.dropWhileEnd isSpace <$> textP) <|> pure ""
       pure $ if T.null descr then Nothing else Just $ T.take 160 descr
@@ -7291,10 +7300,12 @@ chatCommandP =
     dbEncryptionConfig currentKey newKey = DBEncryptionConfig {currentKey, newKey, keepKey = Just False}
 #endif
     -- TODO [short links] parser for address settings
-    autoAcceptP = ifM onOffP (businessAA <|> addressAA) (pure $ AddressSettings False Nothing Nothing)
+    autoAcceptP = ifM onOffP (businessAA <|> addressAA) (toSettings False Nothing <$> layoutP <*> pure Nothing)
       where
-        addressAA = AddressSettings False <$> (Just . AutoAccept <$> (" incognito=" *> onOffP <|> pure False)) <*> autoReply
-        businessAA = " business" *> (AddressSettings True (Just $ AutoAccept False) <$> autoReply)
+        addressAA = toSettings False <$> (Just . AutoAccept <$> (" incognito=" *> onOffP <|> pure False)) <*> layoutP <*> autoReply
+        businessAA = " business" *> (toSettings True (Just $ AutoAccept False) <$> layoutP <*> autoReply)
+        toSettings business autoAccept chatLayout_ autoReply_ = (AddressSettings business autoAccept Nothing autoReply_, chatLayout_)
+        layoutP = optional (" layout=" *> chatLayoutP_)
         autoReply = optional (A.space *> msgContentP)
     rcCtrlAddressP = RCCtrlAddress <$> ("addr=" *> strP) <*> (" iface=" *> (quotedP <|> text1P))
     quotedP = safeDecodeUtf8 <$> (A.char '"' *> A.takeTill (== '"') <* A.char '"')
diff --git a/src/Simplex/Chat/Library/Internal.hs b/src/Simplex/Chat/Library/Internal.hs
index cd89881e4f..f69772e96c 100644
--- a/src/Simplex/Chat/Library/Internal.hs
+++ b/src/Simplex/Chat/Library/Internal.hs
@@ -78,6 +78,7 @@ import Simplex.Chat.Types
 import Simplex.Chat.Types.MemberRelations
 import Simplex.Chat.Types.Preferences
 import Simplex.Chat.Types.Shared
+import Simplex.Chat.Types.UITheme (ChatLayout)
 import Simplex.Chat.Util (encryptFile, shuffle)
 import Simplex.FileTransfer.Description (FileDescriptionURI (..), ValidFileDescription)
 import qualified Simplex.FileTransfer.Description as FD
@@ -1125,10 +1126,11 @@ acceptGroupJoinSendRejectAsync
     agentAcceptContactAsync cmdId acId False cReqInvId msg PQSupportOff subMode
     pure m
 
-acceptBusinessJoinRequestAsync :: User -> Int64 -> GroupInfoKeys -> GroupMember -> UserContactRequest -> CM (GroupInfo, GroupMember)
+acceptBusinessJoinRequestAsync :: User -> Int64 -> Maybe ChatLayout -> GroupInfoKeys -> GroupMember -> UserContactRequest -> CM (GroupInfo, GroupMember)
 acceptBusinessJoinRequestAsync
   user
   uclId
+  chatLayout
   (GIK gInfo@GroupInfo {membership = GroupMember {memberRole = userRole, memberId = userMemberId}} gks)
   clientMember@GroupMember {groupMemberId, memberId}
   UserContactRequest {agentInvitationId = AgentInvId cReqInvId, cReqChatVRange, xContactId} = do
@@ -1143,7 +1145,7 @@ acceptBusinessJoinRequestAsync
                 fromMemberName = displayName,
                 fromMemberKey = Just $ groupMemberKey gks,
                 invitedMember = MemberIdRole memberId GRMember,
-                groupProfile = businessGroupProfile userProfile groupPreferences,
+                groupProfile = businessGroupProfile userProfile groupPreferences chatLayout,
                 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,
@@ -1213,9 +1215,9 @@ rejectRelayInvitationAsync user uclId cxt groupRelayInv presHeader_ invId reqCha
     createJoiningMemberConnection db user uclId (cmdId, acId) chatV reqChatVRange groupMemberId subMode
   agentAcceptContactAsync cmdId acId False invId msg PQSupportOff subMode
 
-businessGroupProfile :: Profile -> GroupPreferences -> GroupProfile
-businessGroupProfile Profile {displayName, fullName, shortDescr, description, image} groupPreferences =
-  GroupProfile {displayName, fullName, description, shortDescr, image, publicGroup = Nothing, groupPreferences = Just groupPreferences, memberAdmission = Nothing}
+businessGroupProfile :: Profile -> GroupPreferences -> Maybe ChatLayout -> GroupProfile
+businessGroupProfile Profile {displayName, fullName, shortDescr, description, image} groupPreferences chatLayout =
+  GroupProfile {displayName, fullName, description, shortDescr, image, publicGroup = Nothing, groupPreferences = Just groupPreferences, memberAdmission = Nothing, chatLayout}
 
 introduceToModerators :: StoreCxt -> User -> GroupInfoKeys -> GroupMember -> CM ()
 introduceToModerators cxt user gInfo@(GIK g@GroupInfo {groupId} _) m@GroupMember {memberRole, memberId} = do
diff --git a/src/Simplex/Chat/Library/Subscriber.hs b/src/Simplex/Chat/Library/Subscriber.hs
index dfcd1005ab..aa4a0205ad 100644
--- a/src/Simplex/Chat/Library/Subscriber.hs
+++ b/src/Simplex/Chat/Library/Subscriber.hs
@@ -25,7 +25,7 @@ import Control.Monad.Reader
 import Data.ByteString.Char8 (ByteString)
 import qualified Data.ByteString.Char8 as B
 import qualified Data.ByteString.Lazy.Char8 as LB
-import Data.Either (lefts, partitionEithers, rights)
+import Data.Either (isLeft, lefts, partitionEithers, rights)
 import Data.Foldable (foldr', foldrM)
 import Data.Functor (($>))
 import Data.Int (Int64)
@@ -1130,7 +1130,7 @@ processAgentMessageConn cxt user@User {userId} entity gks_ corrId agentConnId ag
               XInfoProbeOk probe -> Nothing <$ xInfoProbeOk (COMGroupMember m'') probe
               BFileChunk sharedMsgId chunk -> Nothing <$ bFileChunkGroup (GIK gInfo' gks) m'' sharedMsgId chunk msgMeta
               _ -> Nothing <$ messageError ("unsupported message: " <> tshow event)
-            forM deliveryTaskContext_ $ \taskContext -> do
+            forM (if memberStatus m'' == GSMemPendingApproval then Nothing else deliveryTaskContext_) $ \taskContext -> do
               let contentChanged :: CM ()
                   contentChanged = atomically $ channelContentChanged cc groupId
               case event of
@@ -1497,7 +1497,7 @@ processAgentMessageConn cxt user@User {userId} entity gks_ corrId agentConnId ag
             -- ##### Contact requests (regular and business contacts) #####
             Nothing -> do
               let UserContactLink {connLinkContact = CCLink connReq _, shortLinkDataSet, addressSettings} = ucl
-                  AddressSettings {autoAccept} = addressSettings
+                  AddressSettings {autoAccept, chatLayout} = addressSettings
                   isSimplexTeam = sameConnReqContact connReq adminContactReq
               gVar <- asks random
               withStore (\db -> createOrUpdateContactRequest db gVar cxt user uclId ucl isSimplexTeam invId chatVRange (Just reqHeader) p xContactId_ welcomeMsgId_ requestMsg_ reqPQSup rejectionSupported) >>= \case
@@ -1540,7 +1540,7 @@ processAgentMessageConn cxt user@User {userId} entity gks_ corrId agentConnId ag
                         ct' <- acceptContactRequestAsync user uclId ct ucr incognitoProfile
                         toView $ CEvtAcceptingContactRequest user ct'
                   Just (REBusinessChat g@(GIK gInfo _) clientMember) -> do
-                    (_gInfo', _clientMember') <- acceptBusinessJoinRequestAsync user uclId g clientMember ucr
+                    (_gInfo', _clientMember') <- acceptBusinessJoinRequestAsync user uclId chatLayout g clientMember ucr
                     let cd = CDGroupRcv gInfo Nothing clientMember
                     void $ case prevUcr_ of
                       Just UserContactRequest {requestSharedMsgId = prevSharedMsgId_} ->
@@ -4193,11 +4193,16 @@ resumeDeliveryTaskWork :: DeliveryWorkerKey -> CM' ()
 resumeDeliveryTaskWork = void . getDeliveryTaskWorker False
 
 getDeliveryTaskWorker :: Bool -> DeliveryWorkerKey -> CM' Worker
-getDeliveryTaskWorker hasWork deliveryKey = do
+getDeliveryTaskWorker hasWork deliveryKey@(groupId, _) = do
   ws <- asks deliveryTaskWorkers
   a <- asks smpAgent
-  getAgentWorker "delivery_task" hasWork a deliveryKey ws $
-    runDeliveryTaskWorker a deliveryKey
+  getAgentWorker "delivery_task" hasWork a deliveryKey ws $ \w ->
+    runDeliveryTaskWorker a deliveryKey w `catchAllErrors` \e -> do
+      whenM (groupDeleted groupId) $ atomically $ TM.delete deliveryKey ws
+      throwError e
+
+groupDeleted :: GroupId -> CM Bool
+groupDeleted groupId = isLeft <$> withStore' (\db -> runExceptT $ getUserByGroupId db groupId)
 
 runDeliveryTaskWorker :: AgentClient -> DeliveryWorkerKey -> Worker -> CM ()
 runDeliveryTaskWorker a deliveryKey Worker {doWork} = do
@@ -4220,7 +4225,7 @@ runDeliveryTaskWorker a deliveryKey Worker {doWork} = do
         processDeliveryTask task
           `catchAllErrors` \e -> do
             withStore' $ \db -> setDeliveryTaskErrStatus db (deliveryTaskId task) (tshow e)
-            eToView e
+            unlessM (groupDeleted groupId) $ eToView e
       where
         processDeliveryTask :: MessageDeliveryTask -> CM ()
         processDeliveryTask task@MessageDeliveryTask {jobScope} =
@@ -4261,11 +4266,13 @@ resumeDeliveryJobWork :: DeliveryWorkerKey -> CM' ()
 resumeDeliveryJobWork = void . getDeliveryJobWorker False
 
 getDeliveryJobWorker :: Bool -> DeliveryWorkerKey -> CM' Worker
-getDeliveryJobWorker hasWork deliveryKey = do
+getDeliveryJobWorker hasWork deliveryKey@(groupId, _) = do
   ws <- asks deliveryJobWorkers
   a <- asks smpAgent
-  getAgentWorker "delivery_job" hasWork a deliveryKey ws $
-    runDeliveryJobWorker a deliveryKey
+  getAgentWorker "delivery_job" hasWork a deliveryKey ws $ \w ->
+    runDeliveryJobWorker a deliveryKey w `catchAllErrors` \e -> do
+      whenM (groupDeleted groupId) $ atomically $ TM.delete deliveryKey ws
+      throwError e
 
 -- TODO [relays] dissemination here is unsigned (relay-asserted profile).
 -- Future: members sign an XMember on channel join, relay stores it per
@@ -4308,7 +4315,7 @@ runDeliveryJobWorker a deliveryKey Worker {doWork} = do
         processDeliveryJob job
           `catchAllErrors` \e -> do
             withStore' $ \db -> setDeliveryJobErrStatus db (deliveryJobId job) (tshow e)
-            eToView e
+            unlessM (groupDeleted groupId) $ eToView e
       where
         processDeliveryJob :: MessageDeliveryJob -> CM ()
         processDeliveryJob job =
diff --git a/src/Simplex/Chat/Protocol.hs b/src/Simplex/Chat/Protocol.hs
index a4fb12cc72..62b00bb46f 100644
--- a/src/Simplex/Chat/Protocol.hs
+++ b/src/Simplex/Chat/Protocol.hs
@@ -56,6 +56,7 @@ import Simplex.Chat.Options.DB (FromField (..), ToField (..))
 import Simplex.Chat.Types
 import Simplex.Chat.Types.Preferences
 import Simplex.Chat.Types.Shared
+import Simplex.Chat.Types.UITheme (ChatLayout)
 import qualified Simplex.FileTransfer.Description as FD
 import Simplex.Messaging.Agent.Store.DB (blobFieldDecoder, fromTextField_)
 import Simplex.Messaging.Compression (Compressed, compress1, decompress1, decompressedSize)
@@ -1612,6 +1613,7 @@ data ContactShortLinkData = ContactShortLinkData
   { profile :: Profile,
     message :: Maybe MsgContent,
     business :: Bool,
+    chatLayout :: Maybe ChatLayout,
     -- set by the receiving client for the UI: the link profile's badge, verified and crypto-free.
     -- never part of the published link data (the link carries the proof inside profile).
     localBadge :: Maybe LocalBadge
diff --git a/src/Simplex/Chat/Remote.hs b/src/Simplex/Chat/Remote.hs
index 63886dcadb..235c61ce7b 100644
--- a/src/Simplex/Chat/Remote.hs
+++ b/src/Simplex/Chat/Remote.hs
@@ -297,9 +297,9 @@ cancelRemoteHost handlingError = \case
     closeConnection tls
   RHSessionConnected {rchClient, tls, rhClient = RemoteHostClient {httpClient}, pollAction} -> do
     uninterruptibleCancel pollAction
+    unless handlingError $ closeHTTP2Client httpClient `catchAny` (logError . tshow)
     cancelHostClient rchClient `catchAny` (logError . tshow)
     closeConnection tls `catchAny` (logError . tshow)
-    unless handlingError $ closeHTTP2Client httpClient `catchAny` (logError . tshow)
   where
     cancelPendingSession RHPendingSession {rchClient, rhsWaitSession} = do
       unless handlingError $ uninterruptibleCancel rhsWaitSession `catchAny` (logError . tshow)
diff --git a/src/Simplex/Chat/Store/Connections.hs b/src/Simplex/Chat/Store/Connections.hs
index 0a58b1cfd9..66abd939d3 100644
--- a/src/Simplex/Chat/Store/Connections.hs
+++ b/src/Simplex/Chat/Store/Connections.hs
@@ -122,7 +122,7 @@ getConnectionEntityKeys db cxt user@User {userId, userContactId} agentConnId = d
               c.contact_profile_id, c.local_display_name, p.display_name, p.full_name, p.short_descr, p.description, p.image, p.contact_link, p.chat_peer_type, p.local_alias, c.contact_used, c.contact_status, c.enable_ntfs, c.send_rcpts, c.favorite,
               p.preferences, p.preferences_json, c.user_preferences, c.created_at, c.updated_at, c.chat_ts, c.conn_full_link_to_connect, c.conn_short_link_to_connect, c.welcome_shared_msg_id, c.request_shared_msg_id, c.contact_request_id, cr2.rejection_supported,
               c.contact_group_member_id, c.contact_grp_inv_sent, c.grp_direct_inv_link, c.grp_direct_inv_from_group_id, c.grp_direct_inv_from_group_member_id, c.grp_direct_inv_from_member_conn_id, c.grp_direct_inv_started_connection,
-              c.ui_themes, c.chat_deleted, c.custom_data, c.chat_item_ttl,
+              c.ui_themes, c.chat_deleted, c.custom_data, c.chat_item_ttl, c.chat_layout,
               p.badge_proof, p.badge_pres_header, p.badge_expiry, p.badge_type, p.badge_verified, p.badge_extra, p.badge_master_key, p.badge_signature, p.badge_key_idx,
               p.contact_domain, p.contact_domain_proof, p.contact_domain_verified
             FROM contacts c
@@ -132,7 +132,7 @@ getConnectionEntityKeys db cxt user@User {userId, userContactId} agentConnId = d
           |]
           (userId, contactId, CSActive)
     toContact' :: UTCTime -> Int64 -> Connection -> [ChatTagId] -> ContactRow' -> Contact
-    toContact' currentTs contactId conn chatTags ((profileId, localDisplayName, displayName, fullName, shortDescr, description, image, contactLink, peerType, localAlias, BI contactUsed, contactStatus) :. (enableNtfs_, sendRcpts, BI favorite, encodedPrefs, receivedPrefs, userPreferences, createdAt, updatedAt, chatTs) :. preparedContactRow :. (contactRequestId, rejectionSupported_, contactGroupMemberId, BI contactGrpInvSent) :. groupDirectInvRow :. (uiThemes, BI chatDeleted, customData, chatItemTTL) :. badgeRow :. domainRow) =
+    toContact' currentTs contactId conn chatTags ((profileId, localDisplayName, displayName, fullName, shortDescr, description, image, contactLink, peerType, localAlias, BI contactUsed, contactStatus) :. (enableNtfs_, sendRcpts, BI favorite, encodedPrefs, receivedPrefs, userPreferences, createdAt, updatedAt, chatTs) :. preparedContactRow :. (contactRequestId, rejectionSupported_, contactGroupMemberId, BI contactGrpInvSent) :. groupDirectInvRow :. (uiThemes, BI chatDeleted, customData, chatItemTTL, chatLayout) :. badgeRow :. domainRow) =
       let preferences = chatPrefsFromRow encodedPrefs receivedPrefs
           profile = LocalProfile {profileId, displayName, fullName, shortDescr, description, image, contactLink, contactDomain = rowToContactDomain domainRow, contactDomainVerified = rowToDomainVerified domainRow, peerType, localBadge = rowToBadge currentTs badgeRow, preferences, localAlias}
           chatSettings = ChatSettings {enableNtfs = fromMaybe MFAll enableNtfs_, sendRcpts = unBI <$> sendRcpts, favorite}
@@ -141,7 +141,7 @@ getConnectionEntityKeys db cxt user@User {userId, userContactId} agentConnId = d
           preparedContact = toPreparedContact preparedContactRow
           contactRequest = UserContactRequestRef <$> contactRequestId <*> (unBI <$> rejectionSupported_)
           groupDirectInv = toGroupDirectInvitation groupDirectInvRow
-       in Contact {contactId, localDisplayName, profile, activeConn, contactUsed, contactStatus, chatSettings, userPreferences, mergedPreferences, createdAt, updatedAt, chatTs, preparedContact, contactRequestId, contactRequest, contactGroupMemberId, contactGrpInvSent, groupDirectInv, chatTags, chatItemTTL, uiThemes, chatDeleted, customData}
+       in Contact {contactId, localDisplayName, profile, activeConn, contactUsed, contactStatus, chatSettings, userPreferences, mergedPreferences, createdAt, updatedAt, chatTs, preparedContact, contactRequestId, contactRequest, contactGroupMemberId, contactGrpInvSent, groupDirectInv, chatTags, chatItemTTL, uiThemes, chatLayout, chatDeleted, customData}
     getGroupAndMember_ :: Int64 -> Connection -> ExceptT StoreError IO ((GroupInfo, GroupKeysRow), GroupMember)
     getGroupAndMember_ groupMemberId c = do
       currentTs <- liftIO getCurrentTime
@@ -155,7 +155,7 @@ getConnectionEntityKeys db cxt user@User {userId, userContactId} agentConnId = d
                   -- GroupInfo
                   g.group_id, g.local_display_name, gp.display_name, gp.full_name, gp.short_descr, g.local_alias, gp.description, gp.image, gp.group_type, gp.group_link, gp.public_group_id,
                   gp.group_web_page, gp.group_domain, gp.domain_web_page, gp.allow_embedding, gp.group_domain_proof,
-                  g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences, gp.preferences_json, gp.member_admission,
+                  g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences, gp.preferences_json, gp.member_admission, gp.chat_layout,
                   g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at,
                   g.conn_full_link_to_connect, g.conn_short_link_to_connect, g.conn_link_prepared_connection, g.conn_link_started_connection, g.welcome_shared_msg_id, g.request_shared_msg_id,
                   g.business_chat, g.business_member_id, g.customer_member_id,
diff --git a/src/Simplex/Chat/Store/ContactRequest.hs b/src/Simplex/Chat/Store/ContactRequest.hs
index 7db176bd50..897cda4c47 100644
--- a/src/Simplex/Chat/Store/ContactRequest.hs
+++ b/src/Simplex/Chat/Store/ContactRequest.hs
@@ -120,7 +120,7 @@ createOrUpdateContactRequest
                   ct.contact_id, ct.contact_profile_id, ct.local_display_name, cp.display_name, cp.full_name, cp.short_descr, cp.description, cp.image, cp.contact_link, cp.chat_peer_type, cp.local_alias, ct.contact_used, ct.contact_status, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
                   cp.preferences, cp.preferences_json, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts, ct.conn_full_link_to_connect, ct.conn_short_link_to_connect, ct.welcome_shared_msg_id, ct.request_shared_msg_id, ct.contact_request_id, cr2.rejection_supported,
                   ct.contact_group_member_id, ct.contact_grp_inv_sent, ct.grp_direct_inv_link, ct.grp_direct_inv_from_group_id, ct.grp_direct_inv_from_group_member_id, ct.grp_direct_inv_from_member_conn_id, ct.grp_direct_inv_started_connection,
-                  ct.ui_themes, ct.chat_deleted, ct.custom_data, ct.chat_item_ttl,
+                  ct.ui_themes, ct.chat_deleted, ct.custom_data, ct.chat_item_ttl, ct.chat_layout,
                   cp.badge_proof, cp.badge_pres_header, cp.badge_expiry, cp.badge_type, cp.badge_verified, cp.badge_extra, cp.badge_master_key, cp.badge_signature, cp.badge_key_idx, cp.contact_domain, cp.contact_domain_proof, cp.contact_domain_verified,
                   -- 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.xcontact_id, c.custom_user_profile_id, c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias,
diff --git a/src/Simplex/Chat/Store/Direct.hs b/src/Simplex/Chat/Store/Direct.hs
index 698feb409f..2700aa8156 100644
--- a/src/Simplex/Chat/Store/Direct.hs
+++ b/src/Simplex/Chat/Store/Direct.hs
@@ -324,7 +324,7 @@ getContactByConnReqHash db cxt user@User {userId} cReqHash1 cReqHash2 = do
             ct.contact_id, ct.contact_profile_id, ct.local_display_name, cp.display_name, cp.full_name, cp.short_descr, cp.description, cp.image, cp.contact_link, cp.chat_peer_type, cp.local_alias, ct.contact_used, ct.contact_status, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
             cp.preferences, cp.preferences_json, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts, ct.conn_full_link_to_connect, ct.conn_short_link_to_connect, ct.welcome_shared_msg_id, ct.request_shared_msg_id, ct.contact_request_id, cr2.rejection_supported,
             ct.contact_group_member_id, ct.contact_grp_inv_sent, ct.grp_direct_inv_link, ct.grp_direct_inv_from_group_id, ct.grp_direct_inv_from_group_member_id, ct.grp_direct_inv_from_member_conn_id, ct.grp_direct_inv_started_connection,
-            ct.ui_themes, ct.chat_deleted, ct.custom_data, ct.chat_item_ttl,
+            ct.ui_themes, ct.chat_deleted, ct.custom_data, ct.chat_item_ttl, ct.chat_layout,
             cp.badge_proof, cp.badge_pres_header, cp.badge_expiry, cp.badge_type, cp.badge_verified, cp.badge_extra, cp.badge_master_key, cp.badge_signature, cp.badge_key_idx,
             cp.contact_domain, cp.contact_domain_proof, cp.contact_domain_verified,
             -- Connection
@@ -404,12 +404,12 @@ createIncognitoProfile db User {userId} p = do
   createdAt <- getCurrentTime
   createIncognitoProfile_ db userId createdAt p
 
-createPreparedContact :: DB.Connection -> StoreCxt -> User -> Maybe ProofPresHeader -> Profile -> ACreatedConnLink -> Maybe SharedMsgId -> Maybe Bool -> ExceptT StoreError IO Contact
-createPreparedContact db cxt user presHeader_ p connLinkToConnect welcomeSharedMsgId verified_ = do
+createPreparedContact :: DB.Connection -> StoreCxt -> User -> Maybe ProofPresHeader -> Profile -> ACreatedConnLink -> Maybe SharedMsgId -> Maybe ChatLayout -> Maybe Bool -> ExceptT StoreError IO Contact
+createPreparedContact db cxt user presHeader_ p connLinkToConnect welcomeSharedMsgId chatLayout verified_ = do
   currentTs <- liftIO getCurrentTime
   let prepared = Just (connLinkToConnect, welcomeSharedMsgId)
       ctUserPreferences = newContactUserPrefs user p
-  ct <- getContact db cxt user =<< createContact_ db cxt user presHeader_ p ctUserPreferences prepared "" currentTs
+  ct <- getContact db cxt user =<< createContact_ db cxt user presHeader_ p ctUserPreferences prepared chatLayout "" currentTs
   liftIO $ maybe (pure ct) (setContactDomainVerified db user ct) verified_
 
 updatePreparedContactUser :: DB.Connection -> StoreCxt -> User -> Contact -> User -> ExceptT StoreError IO Contact
@@ -454,7 +454,7 @@ createDirectContact :: DB.Connection -> StoreCxt -> User -> Connection -> Maybe
 createDirectContact db cxt user Connection {connId, localAlias} presHeader_ p = do
   currentTs <- liftIO getCurrentTime
   let ctUserPreferences = newContactUserPrefs user p
-  contactId <- createContact_ db cxt user presHeader_ p ctUserPreferences Nothing localAlias currentTs
+  contactId <- createContact_ db cxt user presHeader_ p ctUserPreferences Nothing Nothing localAlias currentTs
   liftIO $ DB.execute db "UPDATE connections SET contact_id = ?, updated_at = ? WHERE connection_id = ?" (contactId, currentTs, connId)
   getContact db cxt user contactId
 
@@ -927,6 +927,7 @@ createContactFromRequest db user@User {userId, profile = LocalProfile {preferenc
             chatTags = [],
             chatItemTTL = Nothing,
             uiThemes = Nothing,
+            chatLayout = Nothing,
             chatDeleted = False,
             customData = Nothing
           }
@@ -976,7 +977,7 @@ getContact_ db cxt user@User {userId} contactId deleted = do
           ct.contact_id, ct.contact_profile_id, ct.local_display_name, cp.display_name, cp.full_name, cp.short_descr, cp.description, cp.image, cp.contact_link, cp.chat_peer_type, cp.local_alias, ct.contact_used, ct.contact_status, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
           cp.preferences, cp.preferences_json, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts, ct.conn_full_link_to_connect, ct.conn_short_link_to_connect, ct.welcome_shared_msg_id, ct.request_shared_msg_id, ct.contact_request_id, cr2.rejection_supported,
           ct.contact_group_member_id, ct.contact_grp_inv_sent, ct.grp_direct_inv_link, ct.grp_direct_inv_from_group_id, ct.grp_direct_inv_from_group_member_id, ct.grp_direct_inv_from_member_conn_id, ct.grp_direct_inv_started_connection,
-          ct.ui_themes, ct.chat_deleted, ct.custom_data, ct.chat_item_ttl,
+          ct.ui_themes, ct.chat_deleted, ct.custom_data, ct.chat_item_ttl, ct.chat_layout,
           cp.badge_proof, cp.badge_pres_header, cp.badge_expiry, cp.badge_type, cp.badge_verified, cp.badge_extra, cp.badge_master_key, cp.badge_signature, cp.badge_key_idx,
           cp.contact_domain, cp.contact_domain_proof, cp.contact_domain_verified,
           -- Connection
diff --git a/src/Simplex/Chat/Store/Groups.hs b/src/Simplex/Chat/Store/Groups.hs
index 839a3d5746..39b32b6e79 100644
--- a/src/Simplex/Chat/Store/Groups.hs
+++ b/src/Simplex/Chat/Store/Groups.hs
@@ -382,7 +382,7 @@ setGroupLinkShortLink db gLnk@GroupLink {userContactLinkId, connLinkContact = CC
 -- | creates completely new group with a single member - the current user
 createNewGroup :: DB.Connection -> StoreCxt -> User -> GroupProfile -> Maybe Profile -> MemberId -> GroupKeys -> Maybe Int64 -> ExceptT StoreError IO GroupInfo
 createNewGroup db cxt user@User {userId} groupProfile incognitoProfile memberId groupKeys publicMemberCount_ = ExceptT $ do
-  let GroupProfile {displayName, fullName, shortDescr, description, image, publicGroup, groupPreferences, memberAdmission} = groupProfile
+  let GroupProfile {displayName, fullName, shortDescr, description, image, publicGroup, groupPreferences, memberAdmission, chatLayout} = groupProfile
       (groupType_, groupLink_, publicGroupId_) = case publicGroup of
         Just PublicGroupProfile {groupType, groupLink, publicGroupId} -> (Just groupType, Just groupLink, Just publicGroupId)
         Nothing -> (Nothing, Nothing, Nothing)
@@ -406,11 +406,11 @@ createNewGroup db cxt user@User {userId} groupProfile incognitoProfile memberId
             (display_name, full_name, short_descr, description, image,
              group_type, group_link, public_group_id,
              group_web_page, group_domain, domain_web_page, allow_embedding, group_domain_proof,
-             user_id, member_admission, created_at, updated_at, preferences, preferences_json)
-          VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+             user_id, member_admission, chat_layout, created_at, updated_at, preferences, preferences_json)
+          VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
         |]
         ((displayName, fullName, shortDescr, description, image, groupType_, groupLink_, publicGroupId_) :. publicGroupAccessRow publicGroup
-          :. (userId, memberAdmission, currentTs, currentTs) :. prefsToRow groupPreferences)
+          :. (userId, memberAdmission, chatLayout, currentTs, currentTs) :. prefsToRow groupPreferences)
       profileId <- insertedRowId db
       DB.execute
         db
@@ -480,7 +480,7 @@ createGroupInvitation db cxt user@User {userId} inviter peerChatVRange GroupInvi
         DB.query db "SELECT group_id FROM groups WHERE inv_queue_info = ? AND user_id = ? LIMIT 1" (connRequest, userId)
     createGroupInvitation_ :: ExceptT StoreError IO (GroupInfoKeys, GroupMemberId)
     createGroupInvitation_ = do
-      let GroupProfile {displayName, fullName, shortDescr, description, image, groupPreferences, memberAdmission} = groupProfile
+      let GroupProfile {displayName, fullName, shortDescr, description, image, groupPreferences, memberAdmission, chatLayout} = groupProfile
           fullGroupPreferences = mergeGroupPreferences groupPreferences
       ExceptT $
         withLocalDisplayName db userId displayName $ \localDisplayName -> runExceptT $ do
@@ -488,8 +488,8 @@ createGroupInvitation db cxt user@User {userId} inviter peerChatVRange GroupInvi
           groupId <- liftIO $ do
             DB.execute
               db
-              "INSERT INTO group_profiles (display_name, full_name, short_descr, description, image, user_id, member_admission, created_at, updated_at, preferences, preferences_json) VALUES (?,?,?,?,?,?,?,?,?,?,?)"
-              ((displayName, fullName, shortDescr, description, image, userId, memberAdmission, currentTs, currentTs) :. prefsToRow groupPreferences)
+              "INSERT INTO group_profiles (display_name, full_name, short_descr, description, image, user_id, member_admission, chat_layout, created_at, updated_at, preferences, preferences_json) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)"
+              ((displayName, fullName, shortDescr, description, image, userId, memberAdmission, chatLayout, currentTs, currentTs) :. prefsToRow groupPreferences)
             profileId <- insertedRowId db
             DB.execute
               db
@@ -927,7 +927,7 @@ createGroupViaLink'
 
 createGroup_ :: DB.Connection -> UserId -> GroupProfile -> Maybe (CreatedLinkContact, Maybe SharedMsgId) -> Maybe BusinessChatInfo -> Bool -> Maybe RelayStatus -> Maybe Int64 -> Maybe C.PrivateKeyEd25519 -> UTCTime -> ExceptT StoreError IO (GroupId, Text)
 createGroup_ db userId groupProfile prepared business useRelays relayOwnStatus publicMemberCount_ memberPrivKey_ currentTs = ExceptT $ do
-  let GroupProfile {displayName, fullName, shortDescr, description, image, publicGroup, groupPreferences, memberAdmission} = groupProfile
+  let GroupProfile {displayName, fullName, shortDescr, description, image, publicGroup, groupPreferences, memberAdmission, chatLayout} = groupProfile
       (groupType_, groupLink_, publicGroupId_) = case publicGroup of
         Just PublicGroupProfile {groupType, groupLink, publicGroupId} -> (Just groupType, Just groupLink, Just publicGroupId)
         Nothing -> (Nothing, Nothing, Nothing)
@@ -940,11 +940,11 @@ createGroup_ db userId groupProfile prepared business useRelays relayOwnStatus p
             (display_name, full_name, short_descr, description, image,
              group_type, group_link, public_group_id,
              group_web_page, group_domain, domain_web_page, allow_embedding, group_domain_proof,
-             user_id, member_admission, created_at, updated_at, preferences, preferences_json)
-          VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+             user_id, member_admission, chat_layout, created_at, updated_at, preferences, preferences_json)
+          VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
         |]
         ((displayName, fullName, shortDescr, description, image, groupType_, groupLink_, publicGroupId_) :. publicGroupAccessRow publicGroup
-          :. (userId, memberAdmission, currentTs, currentTs) :. prefsToRow groupPreferences)
+          :. (userId, memberAdmission, chatLayout, currentTs, currentTs) :. prefsToRow groupPreferences)
       profileId <- insertedRowId db
       DB.execute
         db
@@ -1957,7 +1957,8 @@ createRelayRequestGroup db cxt user@User {userId} GroupRelayInvitation {fromMemb
           image = Nothing,
           publicGroup = Nothing,
           groupPreferences = Nothing,
-          memberAdmission = Nothing
+          memberAdmission = Nothing,
+          chatLayout = Nothing
         }
   (_, memberPrivKey) <- atomically $ C.generateKeyPair (drg cxt)
   (groupId, _groupLDN) <- createGroup_ db userId placeholderProfile Nothing Nothing True (Just relayStatus) Nothing (Just memberPrivKey) currentTs
@@ -2726,7 +2727,7 @@ createMemberConnection_ db userId groupMemberId agentConnId chatV peerChatVRange
   createConnection_ db userId ConnMember (Just groupMemberId) agentConnId ConnNew chatV peerChatVRange viaContact Nothing Nothing connLevel currentTs subMode PQSupportOff
 
 updateGroupProfile :: DB.Connection -> User -> GroupInfo -> GroupProfile -> ExceptT StoreError IO GroupInfo
-updateGroupProfile db user@User {userId} g@GroupInfo {groupId, localDisplayName, groupProfile = GroupProfile {displayName, publicGroup = oldPublicGroup}} p'@GroupProfile {displayName = newName, fullName, shortDescr, description, image, publicGroup, groupPreferences, memberAdmission}
+updateGroupProfile db user@User {userId} g@GroupInfo {groupId, localDisplayName, groupProfile = GroupProfile {displayName, publicGroup = oldPublicGroup}} p'@GroupProfile {displayName = newName, fullName, shortDescr, description, image, publicGroup, groupPreferences, memberAdmission, chatLayout}
   | displayName == newName = liftIO $ do
       currentTs <- getCurrentTime
       updateGroupProfile_ currentTs
@@ -2762,7 +2763,7 @@ updateGroupProfile db user@User {userId} g@GroupInfo {groupId, localDisplayName,
                   display_name = ?, full_name = ?, short_descr = ?, description = ?, image = ?,
                   group_type = ?, group_link = ?,
                   group_web_page = ?, group_domain = CASE WHEN ? THEN ? ELSE group_domain END, domain_web_page = ?, allow_embedding = ?, group_domain_proof = ?,
-                  member_admission = ?, updated_at = ?
+                  member_admission = ?, chat_layout = ?, updated_at = ?
               WHERE group_profile_id IN (
                 SELECT group_profile_id
                 FROM groups
@@ -2772,7 +2773,7 @@ updateGroupProfile db user@User {userId} g@GroupInfo {groupId, localDisplayName,
             ( prefsToRow groupPreferences
                 :. (newName, fullName, shortDescr, description, image, groupType_, groupLink_)
                 :. (groupWebPage_, isJust publicGroup, groupDomain_, domainWebPage_, allowEmbedding_, groupDomainProof_)
-                :. (memberAdmission, currentTs, userId, groupId)
+                :. (memberAdmission, chatLayout, currentTs, userId, groupId)
             )
     updateGroup_ ldn currentTs = do
       DB.execute
@@ -2836,17 +2837,17 @@ getGroupProfileById db groupId =
         SELECT gp.display_name, gp.full_name, gp.short_descr, gp.description, gp.image,
                gp.group_type, gp.group_link, gp.public_group_id,
                gp.group_web_page, gp.group_domain, gp.domain_web_page, gp.allow_embedding, gp.group_domain_proof,
-               gp.preferences, gp.preferences_json, gp.member_admission
+               gp.preferences, gp.preferences_json, gp.member_admission, gp.chat_layout
         FROM group_profiles gp
         JOIN groups g ON gp.group_profile_id = g.group_profile_id
         WHERE g.group_id = ?
       |]
       (Only groupId)
   where
-    toGroupProfile ((displayName, fullName, shortDescr, description, image, groupType_, groupLink_, publicGroupId_) :. accessRow :. (encodedPrefs, receivedPrefs, memberAdmission)) =
+    toGroupProfile ((displayName, fullName, shortDescr, description, image, groupType_, groupLink_, publicGroupId_) :. accessRow :. (encodedPrefs, receivedPrefs, memberAdmission, chatLayout)) =
       let groupPreferences = groupPrefsFromRow encodedPrefs receivedPrefs
           publicGroupAccess = toPublicGroupAccess accessRow
-       in GroupProfile {displayName, fullName, shortDescr, description, image, publicGroup = toPublicGroupProfile groupType_ groupLink_ publicGroupId_ publicGroupAccess, groupPreferences, memberAdmission}
+       in GroupProfile {displayName, fullName, shortDescr, description, image, publicGroup = toPublicGroupProfile groupType_ groupLink_ publicGroupId_ publicGroupAccess, groupPreferences, memberAdmission, chatLayout}
 
 getGroupInfoByUserContactLinkConnReq :: DB.Connection -> StoreCxt -> User -> (ConnReqContact, ConnReqContact) -> IO (Maybe GroupInfo)
 getGroupInfoByUserContactLinkConnReq db cxt user@User {userId} (cReqSchema1, cReqSchema2) = do
@@ -3312,7 +3313,7 @@ createMemberContact
               quotaErrCounter = 0
             }
         mergedPreferences = contactUserPreferences user userPreferences preferences $ connIncognito ctConn
-    pure Contact {contactId, localDisplayName, profile = memberProfile, activeConn = Just ctConn, contactUsed = True, contactStatus = CSActive, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt = currentTs, updatedAt = currentTs, chatTs = Just currentTs, preparedContact = Nothing, contactRequestId = Nothing, contactRequest = Nothing, contactGroupMemberId = Just groupMemberId, contactGrpInvSent = False, groupDirectInv = Nothing, chatTags = [], chatItemTTL = Nothing, uiThemes = Nothing, chatDeleted = False, customData = Nothing}
+    pure Contact {contactId, localDisplayName, profile = memberProfile, activeConn = Just ctConn, contactUsed = True, contactStatus = CSActive, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt = currentTs, updatedAt = currentTs, chatTs = Just currentTs, preparedContact = Nothing, contactRequestId = Nothing, contactRequest = Nothing, contactGroupMemberId = Just groupMemberId, contactGrpInvSent = False, groupDirectInv = Nothing, chatTags = [], chatItemTTL = Nothing, uiThemes = Nothing, chatLayout = Nothing, chatDeleted = False, customData = Nothing}
 
 getMemberContact :: DB.Connection -> StoreCxt -> User -> ContactId -> ExceptT StoreError IO (GroupInfo, GroupMember, Contact, ConnReqInvitation)
 getMemberContact db cxt user contactId = do
diff --git a/src/Simplex/Chat/Store/Postgres/Migrations.hs b/src/Simplex/Chat/Store/Postgres/Migrations.hs
index 46e94d1441..2f54080a29 100644
--- a/src/Simplex/Chat/Store/Postgres/Migrations.hs
+++ b/src/Simplex/Chat/Store/Postgres/Migrations.hs
@@ -57,6 +57,7 @@ import Simplex.Chat.Store.Postgres.Migrations.M20260925_badge_bindings
 import Simplex.Chat.Store.Postgres.Migrations.M20261010_invite_member_via_group
 import Simplex.Chat.Store.Postgres.Migrations.M20261012_delivery_job_notification
 import Simplex.Chat.Store.Postgres.Migrations.M20261016_badge_store_receipts
+import Simplex.Chat.Store.Postgres.Migrations.M20261019_chat_layout
 import Simplex.Chat.Store.Postgres.Migrations.M20261021_badge_subscriptions
 import Simplex.Messaging.Agent.Store.Shared (Migration (..))
 
@@ -115,6 +116,7 @@ schemaMigrations =
     ("20261010_invite_member_via_group", m20261010_invite_member_via_group, Just down_m20261010_invite_member_via_group),
     ("20261012_delivery_job_notification", m20261012_delivery_job_notification, Just down_m20261012_delivery_job_notification),
     ("20261016_badge_store_receipts", m20261016_badge_store_receipts, Just down_m20261016_badge_store_receipts),
+    ("20261019_chat_layout", m20261019_chat_layout, Just down_m20261019_chat_layout),
     ("20261021_badge_subscriptions", m20261021_badge_subscriptions, Just down_m20261021_badge_subscriptions)
   ]
 
diff --git a/src/Simplex/Chat/Store/Postgres/Migrations/M20261019_chat_layout.hs b/src/Simplex/Chat/Store/Postgres/Migrations/M20261019_chat_layout.hs
new file mode 100644
index 0000000000..a92f87afe7
--- /dev/null
+++ b/src/Simplex/Chat/Store/Postgres/Migrations/M20261019_chat_layout.hs
@@ -0,0 +1,23 @@
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE QuasiQuotes #-}
+
+module Simplex.Chat.Store.Postgres.Migrations.M20261019_chat_layout where
+
+import Data.Text (Text)
+import Text.RawString.QQ (r)
+
+m20261019_chat_layout :: Text
+m20261019_chat_layout =
+  [r|
+ALTER TABLE contacts ADD COLUMN chat_layout TEXT;
+ALTER TABLE group_profiles ADD COLUMN chat_layout TEXT;
+ALTER TABLE user_contact_links ADD COLUMN chat_layout TEXT;
+|]
+
+down_m20261019_chat_layout :: Text
+down_m20261019_chat_layout =
+  [r|
+ALTER TABLE contacts DROP COLUMN chat_layout;
+ALTER TABLE group_profiles DROP COLUMN chat_layout;
+ALTER TABLE user_contact_links DROP COLUMN chat_layout;
+|]
diff --git a/src/Simplex/Chat/Store/Postgres/Migrations/chat_schema.sql b/src/Simplex/Chat/Store/Postgres/Migrations/chat_schema.sql
index ad2c6a8a20..b410ba4ca9 100644
--- a/src/Simplex/Chat/Store/Postgres/Migrations/chat_schema.sql
+++ b/src/Simplex/Chat/Store/Postgres/Migrations/chat_schema.sql
@@ -799,7 +799,8 @@ CREATE TABLE test_chat_schema.contacts (
     grp_direct_inv_from_group_id bigint,
     grp_direct_inv_from_group_member_id bigint,
     grp_direct_inv_from_member_conn_id bigint,
-    grp_direct_inv_started_connection smallint DEFAULT 0 NOT NULL
+    grp_direct_inv_started_connection smallint DEFAULT 0 NOT NULL,
+    chat_layout text
 );
 
 
@@ -1096,7 +1097,8 @@ CREATE TABLE test_chat_schema.group_profiles (
     domain_web_page bigint,
     allow_embedding bigint,
     group_domain_proof text,
-    preferences_json text
+    preferences_json text,
+    chat_layout text
 );
 
 
@@ -1731,7 +1733,8 @@ CREATE TABLE test_chat_schema.user_contact_links (
     short_link_contact bytea,
     short_link_data_set smallint DEFAULT 0 NOT NULL,
     short_link_large_data_set smallint DEFAULT 0 NOT NULL,
-    link_priv_sig_key bytea
+    link_priv_sig_key bytea,
+    chat_layout text
 );
 
 
diff --git a/src/Simplex/Chat/Store/Profiles.hs b/src/Simplex/Chat/Store/Profiles.hs
index 10248255e3..fcb74edbdf 100644
--- a/src/Simplex/Chat/Store/Profiles.hs
+++ b/src/Simplex/Chat/Store/Profiles.hs
@@ -523,6 +523,7 @@ data GroupLinkInfo = GroupLinkInfo
 data AddressSettings = AddressSettings
   { businessAddress :: Bool, -- possibly, it can be wrapped together with acceptIncognito, or AutoAccept made sum type
     autoAccept :: Maybe AutoAccept, -- accept automatically
+    chatLayout :: Maybe ChatLayout,
     autoReply :: Maybe MsgContent -- included in short link information, sent on acceptance in case wasn't shown during connection
   }
   deriving (Eq, Show)
@@ -538,11 +539,11 @@ $(J.deriveJSON defaultJSON ''AddressSettings)
 
 $(J.deriveJSON defaultJSON ''UserContactLink)
 
-toUserContactLink :: (Int64, ConnReqContact, Maybe ShortLinkContact, BoolInt, BoolInt, BoolInt, BoolInt, BoolInt, Maybe MsgContent) -> UserContactLink
-toUserContactLink (userContactLinkId, connReq, shortLink, BI shortLinkDataSet, BI slLargeDataSet, BI businessAddress, BI autoAccept', BI acceptIncognito, autoReply) =
+toUserContactLink :: (Int64, ConnReqContact, Maybe ShortLinkContact, BoolInt, BoolInt, BoolInt, BoolInt, BoolInt, Maybe MsgContent, Maybe ChatLayout) -> UserContactLink
+toUserContactLink (userContactLinkId, connReq, shortLink, BI shortLinkDataSet, BI slLargeDataSet, BI businessAddress, BI autoAccept', BI acceptIncognito, autoReply, chatLayout) =
   UserContactLink userContactLinkId (CCLink connReq shortLink) shortLinkDataSet (BoolDef slLargeDataSet) $
     let autoAccept = if autoAccept' then Just AutoAccept {acceptIncognito} else Nothing
-     in AddressSettings {businessAddress, autoAccept, autoReply}
+     in AddressSettings {businessAddress, autoAccept, chatLayout, autoReply}
 
 getUserAddress :: DB.Connection -> User -> ExceptT StoreError IO UserContactLink
 getUserAddress db User {userId} =
@@ -555,7 +556,7 @@ getUserContactLinkById db userId userContactLinkId =
     DB.query
       db
       [sql|
-        SELECT user_contact_link_id, conn_req_contact, short_link_contact, short_link_data_set, short_link_large_data_set, business_address, auto_accept, auto_accept_incognito, auto_reply_msg_content, group_id, group_link_member_role
+        SELECT user_contact_link_id, conn_req_contact, short_link_contact, short_link_data_set, short_link_large_data_set, business_address, auto_accept, auto_accept_incognito, auto_reply_msg_content, chat_layout, group_id, group_link_member_role
         FROM user_contact_links
         WHERE user_id = ? AND user_contact_link_id = ?
       |]
@@ -597,7 +598,7 @@ getUserContactLinkViaTarget db User {userId, profile = LocalProfile {contactDoma
 userContactLinkQuery :: Query
 userContactLinkQuery =
   [sql|
-    SELECT user_contact_link_id, conn_req_contact, short_link_contact, short_link_data_set, short_link_large_data_set, business_address, auto_accept, auto_accept_incognito, auto_reply_msg_content
+    SELECT user_contact_link_id, conn_req_contact, short_link_contact, short_link_data_set, short_link_large_data_set, business_address, auto_accept, auto_accept_incognito, auto_reply_msg_content, chat_layout
     FROM user_contact_links
   |]
 
@@ -648,15 +649,15 @@ getContactWithoutConnViaShortAddress db cxt user@User {userId} shortLink = do
   maybe (pure Nothing) (fmap eitherToMaybe . runExceptT . getContact db cxt user) ctId_
 
 updateUserAddressSettings :: DB.Connection -> Int64 -> AddressSettings -> IO ()
-updateUserAddressSettings db userContactLinkId AddressSettings {businessAddress, autoAccept, autoReply} =
+updateUserAddressSettings db userContactLinkId AddressSettings {businessAddress, autoAccept, chatLayout, autoReply} =
   DB.execute
     db
     [sql|
       UPDATE user_contact_links
-      SET auto_accept = ?, auto_accept_incognito = ?, business_address = ?, auto_reply_msg_content = ?
+      SET auto_accept = ?, auto_accept_incognito = ?, business_address = ?, auto_reply_msg_content = ?, chat_layout = ?
       WHERE user_contact_link_id = ?
     |]
-    (autoAcceptValues :. (BI businessAddress, autoReply, userContactLinkId))
+    (autoAcceptValues :. (BI businessAddress, autoReply, chatLayout, userContactLinkId))
   where
     autoAcceptValues = case autoAccept of
       Just AutoAccept {acceptIncognito} -> (BI True, BI acceptIncognito)
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations.hs b/src/Simplex/Chat/Store/SQLite/Migrations.hs
index ea8a62ec24..832cb8b862 100644
--- a/src/Simplex/Chat/Store/SQLite/Migrations.hs
+++ b/src/Simplex/Chat/Store/SQLite/Migrations.hs
@@ -181,6 +181,7 @@ import Simplex.Chat.Store.SQLite.Migrations.M20261010_invite_member_via_group
 import Simplex.Chat.Store.SQLite.Migrations.M20261012_delivery_job_notification
 import Simplex.Chat.Store.SQLite.Migrations.M20261016_badge_store_receipts
 import Simplex.Chat.Store.SQLite.Migrations.M20261018_autoincrement_ids
+import Simplex.Chat.Store.SQLite.Migrations.M20261019_chat_layout
 import Simplex.Chat.Store.SQLite.Migrations.M20261021_badge_subscriptions
 import Simplex.Messaging.Agent.Store.Shared (Migration (..))
 
@@ -363,6 +364,7 @@ schemaMigrations =
     ("20261012_delivery_job_notification", m20261012_delivery_job_notification, Just down_m20261012_delivery_job_notification),
     ("20261016_badge_store_receipts", m20261016_badge_store_receipts, Just down_m20261016_badge_store_receipts),
     ("20261018_autoincrement_ids", m20261018_autoincrement_ids, Just down_m20261018_autoincrement_ids),
+    ("20261019_chat_layout", m20261019_chat_layout, Just down_m20261019_chat_layout),
     ("20261021_badge_subscriptions", m20261021_badge_subscriptions, Just down_m20261021_badge_subscriptions)
   ]
 
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/M20261019_chat_layout.hs b/src/Simplex/Chat/Store/SQLite/Migrations/M20261019_chat_layout.hs
new file mode 100644
index 0000000000..494c258c12
--- /dev/null
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/M20261019_chat_layout.hs
@@ -0,0 +1,22 @@
+{-# LANGUAGE QuasiQuotes #-}
+
+module Simplex.Chat.Store.SQLite.Migrations.M20261019_chat_layout where
+
+import Database.SQLite.Simple (Query)
+import Database.SQLite.Simple.QQ (sql)
+
+m20261019_chat_layout :: Query
+m20261019_chat_layout =
+  [sql|
+ALTER TABLE contacts ADD COLUMN chat_layout TEXT;
+ALTER TABLE group_profiles ADD COLUMN chat_layout TEXT;
+ALTER TABLE user_contact_links ADD COLUMN chat_layout TEXT;
+|]
+
+down_m20261019_chat_layout :: Query
+down_m20261019_chat_layout =
+  [sql|
+ALTER TABLE contacts DROP COLUMN chat_layout;
+ALTER TABLE group_profiles DROP COLUMN chat_layout;
+ALTER TABLE user_contact_links DROP COLUMN chat_layout;
+|]
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/agent_query_plans.txt b/src/Simplex/Chat/Store/SQLite/Migrations/agent_query_plans.txt
index a02d379f10..a70bf5e47d 100644
--- a/src/Simplex/Chat/Store/SQLite/Migrations/agent_query_plans.txt
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/agent_query_plans.txt
@@ -1535,10 +1535,6 @@ 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=?)
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt b/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt
index 3ca3f787b0..8ad6ad1a0c 100644
--- a/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt
@@ -130,7 +130,7 @@ Query:
                   ct.contact_id, ct.contact_profile_id, ct.local_display_name, cp.display_name, cp.full_name, cp.short_descr, cp.description, cp.image, cp.contact_link, cp.chat_peer_type, cp.local_alias, ct.contact_used, ct.contact_status, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
                   cp.preferences, cp.preferences_json, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts, ct.conn_full_link_to_connect, ct.conn_short_link_to_connect, ct.welcome_shared_msg_id, ct.request_shared_msg_id, ct.contact_request_id, cr2.rejection_supported,
                   ct.contact_group_member_id, ct.contact_grp_inv_sent, ct.grp_direct_inv_link, ct.grp_direct_inv_from_group_id, ct.grp_direct_inv_from_group_member_id, ct.grp_direct_inv_from_member_conn_id, ct.grp_direct_inv_started_connection,
-                  ct.ui_themes, ct.chat_deleted, ct.custom_data, ct.chat_item_ttl,
+                  ct.ui_themes, ct.chat_deleted, ct.custom_data, ct.chat_item_ttl, ct.chat_layout,
                   cp.badge_proof, cp.badge_pres_header, cp.badge_expiry, cp.badge_type, cp.badge_verified, cp.badge_extra, cp.badge_master_key, cp.badge_signature, cp.badge_key_idx, cp.contact_domain, cp.contact_domain_proof, cp.contact_domain_verified,
                   -- 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.xcontact_id, c.custom_user_profile_id, c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias,
@@ -153,7 +153,7 @@ Query:
                   -- GroupInfo
                   g.group_id, g.local_display_name, gp.display_name, gp.full_name, gp.short_descr, g.local_alias, gp.description, gp.image, gp.group_type, gp.group_link, gp.public_group_id,
                   gp.group_web_page, gp.group_domain, gp.domain_web_page, gp.allow_embedding, gp.group_domain_proof,
-                  g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences, gp.preferences_json, gp.member_admission,
+                  g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences, gp.preferences_json, gp.member_admission, gp.chat_layout,
                   g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at,
                   g.conn_full_link_to_connect, g.conn_short_link_to_connect, g.conn_link_prepared_connection, g.conn_link_started_connection, g.welcome_shared_msg_id, g.request_shared_msg_id,
                   g.business_chat, g.business_member_id, g.customer_member_id,
@@ -546,7 +546,7 @@ Query:
                   display_name = ?, full_name = ?, short_descr = ?, description = ?, image = ?,
                   group_type = ?, group_link = ?,
                   group_web_page = ?, group_domain = CASE WHEN ? THEN ? ELSE group_domain END, domain_web_page = ?, allow_embedding = ?, group_domain_proof = ?,
-                  member_admission = ?, updated_at = ?
+                  member_admission = ?, chat_layout = ?, updated_at = ?
               WHERE group_profile_id IN (
                 SELECT group_profile_id
                 FROM groups
@@ -758,7 +758,7 @@ Query:
               c.contact_profile_id, c.local_display_name, p.display_name, p.full_name, p.short_descr, p.description, p.image, p.contact_link, p.chat_peer_type, p.local_alias, c.contact_used, c.contact_status, c.enable_ntfs, c.send_rcpts, c.favorite,
               p.preferences, p.preferences_json, c.user_preferences, c.created_at, c.updated_at, c.chat_ts, c.conn_full_link_to_connect, c.conn_short_link_to_connect, c.welcome_shared_msg_id, c.request_shared_msg_id, c.contact_request_id, cr2.rejection_supported,
               c.contact_group_member_id, c.contact_grp_inv_sent, c.grp_direct_inv_link, c.grp_direct_inv_from_group_id, c.grp_direct_inv_from_group_member_id, c.grp_direct_inv_from_member_conn_id, c.grp_direct_inv_started_connection,
-              c.ui_themes, c.chat_deleted, c.custom_data, c.chat_item_ttl,
+              c.ui_themes, c.chat_deleted, c.custom_data, c.chat_item_ttl, c.chat_layout,
               p.badge_proof, p.badge_pres_header, p.badge_expiry, p.badge_type, p.badge_verified, p.badge_extra, p.badge_master_key, p.badge_signature, p.badge_key_idx,
               p.contact_domain, p.contact_domain_proof, p.contact_domain_verified
             FROM contacts c
@@ -1372,8 +1372,8 @@ Query:
             (display_name, full_name, short_descr, description, image,
              group_type, group_link, public_group_id,
              group_web_page, group_domain, domain_web_page, allow_embedding, group_domain_proof,
-             user_id, member_admission, created_at, updated_at, preferences, preferences_json)
-          VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+             user_id, member_admission, chat_layout, created_at, updated_at, preferences, preferences_json)
+          VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
         
 Plan:
 
@@ -1520,7 +1520,7 @@ Query:
             ct.contact_id, ct.contact_profile_id, ct.local_display_name, cp.display_name, cp.full_name, cp.short_descr, cp.description, cp.image, cp.contact_link, cp.chat_peer_type, cp.local_alias, ct.contact_used, ct.contact_status, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
             cp.preferences, cp.preferences_json, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts, ct.conn_full_link_to_connect, ct.conn_short_link_to_connect, ct.welcome_shared_msg_id, ct.request_shared_msg_id, ct.contact_request_id, cr2.rejection_supported,
             ct.contact_group_member_id, ct.contact_grp_inv_sent, ct.grp_direct_inv_link, ct.grp_direct_inv_from_group_id, ct.grp_direct_inv_from_group_member_id, ct.grp_direct_inv_from_member_conn_id, ct.grp_direct_inv_started_connection,
-            ct.ui_themes, ct.chat_deleted, ct.custom_data, ct.chat_item_ttl,
+            ct.ui_themes, ct.chat_deleted, ct.custom_data, ct.chat_item_ttl, ct.chat_layout,
             cp.badge_proof, cp.badge_pres_header, cp.badge_expiry, cp.badge_type, cp.badge_verified, cp.badge_extra, cp.badge_master_key, cp.badge_signature, cp.badge_key_idx,
             cp.contact_domain, cp.contact_domain_proof, cp.contact_domain_verified,
             -- Connection
@@ -2121,7 +2121,7 @@ Query:
           ct.contact_id, ct.contact_profile_id, ct.local_display_name, cp.display_name, cp.full_name, cp.short_descr, cp.description, cp.image, cp.contact_link, cp.chat_peer_type, cp.local_alias, ct.contact_used, ct.contact_status, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
           cp.preferences, cp.preferences_json, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts, ct.conn_full_link_to_connect, ct.conn_short_link_to_connect, ct.welcome_shared_msg_id, ct.request_shared_msg_id, ct.contact_request_id, cr2.rejection_supported,
           ct.contact_group_member_id, ct.contact_grp_inv_sent, ct.grp_direct_inv_link, ct.grp_direct_inv_from_group_id, ct.grp_direct_inv_from_group_member_id, ct.grp_direct_inv_from_member_conn_id, ct.grp_direct_inv_started_connection,
-          ct.ui_themes, ct.chat_deleted, ct.custom_data, ct.chat_item_ttl,
+          ct.ui_themes, ct.chat_deleted, ct.custom_data, ct.chat_item_ttl, ct.chat_layout,
           cp.badge_proof, cp.badge_pres_header, cp.badge_expiry, cp.badge_type, cp.badge_verified, cp.badge_extra, cp.badge_master_key, cp.badge_signature, cp.badge_key_idx,
           cp.contact_domain, cp.contact_domain_proof, cp.contact_domain_verified,
           -- Connection
@@ -4002,7 +4002,7 @@ Query:
         SELECT gp.display_name, gp.full_name, gp.short_descr, gp.description, gp.image,
                gp.group_type, gp.group_link, gp.public_group_id,
                gp.group_web_page, gp.group_domain, gp.domain_web_page, gp.allow_embedding, gp.group_domain_proof,
-               gp.preferences, gp.preferences_json, gp.member_admission
+               gp.preferences, gp.preferences_json, gp.member_admission, gp.chat_layout
         FROM group_profiles gp
         JOIN groups g ON gp.group_profile_id = g.group_profile_id
         WHERE g.group_id = ?
@@ -4336,7 +4336,7 @@ Plan:
 SEARCH usage_conditions USING INTEGER PRIMARY KEY (rowid=?)
 
 Query: 
-        SELECT user_contact_link_id, conn_req_contact, short_link_contact, short_link_data_set, short_link_large_data_set, business_address, auto_accept, auto_accept_incognito, auto_reply_msg_content, group_id, group_link_member_role
+        SELECT user_contact_link_id, conn_req_contact, short_link_contact, short_link_data_set, short_link_large_data_set, business_address, auto_accept, auto_accept_incognito, auto_reply_msg_content, chat_layout, group_id, group_link_member_role
         FROM user_contact_links
         WHERE user_id = ? AND user_contact_link_id = ?
       
@@ -5824,7 +5824,7 @@ SEARCH server_operators USING INTEGER PRIMARY KEY (rowid=?)
 
 Query: 
       UPDATE user_contact_links
-      SET auto_accept = ?, auto_accept_incognito = ?, business_address = ?, auto_reply_msg_content = ?
+      SET auto_accept = ?, auto_accept_incognito = ?, business_address = ?, auto_reply_msg_content = ?, chat_layout = ?
       WHERE user_contact_link_id = ?
     
 Plan:
@@ -5900,7 +5900,7 @@ Query:
       -- GroupInfo
       g.group_id, g.local_display_name, gp.display_name, gp.full_name, gp.short_descr, g.local_alias, gp.description, gp.image, gp.group_type, gp.group_link, gp.public_group_id,
       gp.group_web_page, gp.group_domain, gp.domain_web_page, gp.allow_embedding, gp.group_domain_proof,
-      g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences, gp.preferences_json, gp.member_admission,
+      g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences, gp.preferences_json, gp.member_admission, gp.chat_layout,
       g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at,
       g.conn_full_link_to_connect, g.conn_short_link_to_connect, g.conn_link_prepared_connection, g.conn_link_started_connection, g.welcome_shared_msg_id, g.request_shared_msg_id,
       g.business_chat, g.business_member_id, g.customer_member_id,
@@ -5938,7 +5938,7 @@ Query:
       -- GroupInfo
       g.group_id, g.local_display_name, gp.display_name, gp.full_name, gp.short_descr, g.local_alias, gp.description, gp.image, gp.group_type, gp.group_link, gp.public_group_id,
       gp.group_web_page, gp.group_domain, gp.domain_web_page, gp.allow_embedding, gp.group_domain_proof,
-      g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences, gp.preferences_json, gp.member_admission,
+      g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences, gp.preferences_json, gp.member_admission, gp.chat_layout,
       g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at,
       g.conn_full_link_to_connect, g.conn_short_link_to_connect, g.conn_link_prepared_connection, g.conn_link_started_connection, g.welcome_shared_msg_id, g.request_shared_msg_id,
       g.business_chat, g.business_member_id, g.customer_member_id,
@@ -5969,7 +5969,7 @@ Query:
       -- GroupInfo
       g.group_id, g.local_display_name, gp.display_name, gp.full_name, gp.short_descr, g.local_alias, gp.description, gp.image, gp.group_type, gp.group_link, gp.public_group_id,
       gp.group_web_page, gp.group_domain, gp.domain_web_page, gp.allow_embedding, gp.group_domain_proof,
-      g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences, gp.preferences_json, gp.member_admission,
+      g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences, gp.preferences_json, gp.member_admission, gp.chat_layout,
       g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at,
       g.conn_full_link_to_connect, g.conn_short_link_to_connect, g.conn_link_prepared_connection, g.conn_link_started_connection, g.welcome_shared_msg_id, g.request_shared_msg_id,
       g.business_chat, g.business_member_id, g.customer_member_id,
@@ -6743,21 +6743,21 @@ Plan:
 SCAN usage_conditions
 
 Query: 
-    SELECT user_contact_link_id, conn_req_contact, short_link_contact, short_link_data_set, short_link_large_data_set, business_address, auto_accept, auto_accept_incognito, auto_reply_msg_content
+    SELECT user_contact_link_id, conn_req_contact, short_link_contact, short_link_data_set, short_link_large_data_set, business_address, auto_accept, auto_accept_incognito, auto_reply_msg_content, chat_layout
     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 user_contact_link_id, conn_req_contact, short_link_contact, short_link_data_set, short_link_large_data_set, business_address, auto_accept, auto_accept_incognito, auto_reply_msg_content
+    SELECT user_contact_link_id, conn_req_contact, short_link_contact, short_link_data_set, short_link_large_data_set, business_address, auto_accept, auto_accept_incognito, auto_reply_msg_content, chat_layout
     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 user_contact_link_id, conn_req_contact, short_link_contact, short_link_data_set, short_link_large_data_set, business_address, auto_accept, auto_accept_incognito, auto_reply_msg_content
+    SELECT user_contact_link_id, conn_req_contact, short_link_contact, short_link_data_set, short_link_large_data_set, business_address, auto_accept, auto_accept_incognito, auto_reply_msg_content, chat_layout
     FROM user_contact_links
    WHERE user_id = ? AND short_link_contact = ?
 Plan:
@@ -7419,7 +7419,7 @@ Query: INSERT INTO contacts (contact_profile_id, local_display_name, user_id, is
 Plan:
 SEARCH users USING COVERING INDEX sqlite_autoindex_users_1 (contact_id=?)
 
-Query: INSERT INTO contacts (contact_profile_id, user_preferences, local_display_name, user_id, created_at, updated_at, chat_ts, contact_used, conn_full_link_to_connect, conn_short_link_to_connect, welcome_shared_msg_id) VALUES (?,?,?,?,?,?,?,?,?,?,?)
+Query: INSERT INTO contacts (contact_profile_id, user_preferences, local_display_name, user_id, created_at, updated_at, chat_ts, contact_used, conn_full_link_to_connect, conn_short_link_to_connect, welcome_shared_msg_id, chat_layout) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)
 Plan:
 SEARCH users USING COVERING INDEX sqlite_autoindex_users_1 (contact_id=?)
 
@@ -7450,7 +7450,7 @@ Plan:
 Query: INSERT INTO files (user_id, group_id, file_name, file_size, chunk_size, file_inline, ci_file_status, protocol, file_type, shared_msg_id, roster_transfer_id, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)
 Plan:
 
-Query: INSERT INTO group_profiles (display_name, full_name, short_descr, description, image, user_id, member_admission, created_at, updated_at, preferences, preferences_json) VALUES (?,?,?,?,?,?,?,?,?,?,?)
+Query: INSERT INTO group_profiles (display_name, full_name, short_descr, description, image, user_id, member_admission, chat_layout, created_at, updated_at, preferences, preferences_json) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)
 Plan:
 
 Query: INSERT INTO group_profiles (display_name, full_name, short_descr, image, user_id, created_at, updated_at, preferences, preferences_json) VALUES (?,?,?,?,?,?,?,?,?)
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/chat_schema.sql b/src/Simplex/Chat/Store/SQLite/Migrations/chat_schema.sql
index 6336a680a6..a17d7d7b38 100644
--- a/src/Simplex/Chat/Store/SQLite/Migrations/chat_schema.sql
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/chat_schema.sql
@@ -109,6 +109,7 @@ CREATE TABLE contacts(
   grp_direct_inv_from_group_member_id INTEGER REFERENCES group_members(group_member_id) ON DELETE SET NULL,
   grp_direct_inv_from_member_conn_id INTEGER REFERENCES connections(connection_id) ON DELETE SET NULL,
   grp_direct_inv_started_connection INTEGER NOT NULL DEFAULT 0,
+  chat_layout TEXT,
   FOREIGN KEY(user_id, local_display_name)
   REFERENCES display_names(user_id, local_display_name)
   ON DELETE CASCADE
@@ -149,7 +150,8 @@ CREATE TABLE group_profiles(
   domain_web_page INTEGER,
   allow_embedding INTEGER,
   group_domain_proof TEXT,
-  preferences_json TEXT
+  preferences_json TEXT,
+  chat_layout TEXT
 ) STRICT;
 CREATE TABLE groups(
   group_id INTEGER PRIMARY KEY AUTOINCREMENT, -- local group ID
@@ -417,6 +419,7 @@ CREATE TABLE user_contact_links(
   short_link_data_set INTEGER NOT NULL DEFAULT 0,
   short_link_large_data_set INTEGER NOT NULL DEFAULT 0,
   link_priv_sig_key BLOB,
+  chat_layout TEXT,
   UNIQUE(user_id, local_display_name)
 ) STRICT;
 CREATE TABLE contact_requests(
diff --git a/src/Simplex/Chat/Store/Shared.hs b/src/Simplex/Chat/Store/Shared.hs
index bf41d2de6e..122104fc95 100644
--- a/src/Simplex/Chat/Store/Shared.hs
+++ b/src/Simplex/Chat/Store/Shared.hs
@@ -414,10 +414,10 @@ setCommandConnId db User {userId} cmdId connId = do
 createContact :: DB.Connection -> StoreCxt -> User -> Profile -> ExceptT StoreError IO ()
 createContact db cxt user profile = do
   currentTs <- liftIO getCurrentTime
-  void $ createContact_ db cxt user Nothing profile emptyChatPrefs Nothing "" currentTs
+  void $ createContact_ db cxt user Nothing profile emptyChatPrefs Nothing Nothing "" currentTs
 
-createContact_ :: DB.Connection -> StoreCxt -> User -> Maybe ProofPresHeader -> Profile -> Preferences -> Maybe (ACreatedConnLink, Maybe SharedMsgId) -> LocalAlias -> UTCTime -> ExceptT StoreError IO ContactId
-createContact_ db cxt User {userId} presHeader_ p@Profile {displayName, fullName, shortDescr, description, image, contactLink, contactDomain, peerType, preferences} ctUserPreferences prepared localAlias currentTs =
+createContact_ :: DB.Connection -> StoreCxt -> User -> Maybe ProofPresHeader -> Profile -> Preferences -> Maybe (ACreatedConnLink, Maybe SharedMsgId) -> Maybe ChatLayout -> LocalAlias -> UTCTime -> ExceptT StoreError IO ContactId
+createContact_ db cxt User {userId} presHeader_ p@Profile {displayName, fullName, shortDescr, description, image, contactLink, contactDomain, peerType, preferences} ctUserPreferences prepared chatLayout localAlias currentTs =
   ExceptT . withLocalDisplayName db userId displayName $ \ldn -> do
     (Profile {badge}, badgeVerified) <- profileBadgeVerified presHeader_ (badgeKeys cxt) Nothing p
     DB.execute
@@ -427,8 +427,8 @@ createContact_ db cxt User {userId} presHeader_ p@Profile {displayName, fullName
     profileId <- insertedRowId db
     DB.execute
       db
-      "INSERT INTO contacts (contact_profile_id, user_preferences, local_display_name, user_id, created_at, updated_at, chat_ts, contact_used, conn_full_link_to_connect, conn_short_link_to_connect, welcome_shared_msg_id) VALUES (?,?,?,?,?,?,?,?,?,?,?)"
-      ((profileId, ctUserPreferences, ldn, userId, currentTs, currentTs, currentTs, BI True) :. toPreparedContactRow prepared)
+      "INSERT INTO contacts (contact_profile_id, user_preferences, local_display_name, user_id, created_at, updated_at, chat_ts, contact_used, conn_full_link_to_connect, conn_short_link_to_connect, welcome_shared_msg_id, chat_layout) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)"
+      ((profileId, ctUserPreferences, ldn, userId, currentTs, currentTs, currentTs, BI True) :. toPreparedContactRow prepared :. Only chatLayout)
     contactId <- insertedRowId db
     pure $ Right contactId
 
@@ -490,14 +490,14 @@ type PreparedContactRow = (Maybe AConnectionRequestUri, Maybe AConnShortLink, Ma
 
 type GroupDirectInvitationRow = (Maybe ConnReqInvitation, Maybe GroupId, Maybe GroupMemberId, Maybe Int64, BoolInt)
 
-type ContactRow' = (ProfileId, ContactName, ContactName, Text, Maybe Text, Maybe Text, Maybe ImageData, Maybe ConnLinkContact, Maybe ChatPeerType, LocalAlias, BoolInt, ContactStatus) :. (Maybe MsgFilter, Maybe BoolInt, BoolInt, Maybe Text, Maybe Text, Preferences, UTCTime, UTCTime, Maybe UTCTime) :. PreparedContactRow :. (Maybe Int64, Maybe BoolInt, Maybe GroupMemberId, BoolInt) :. GroupDirectInvitationRow :. (Maybe UIThemeEntityOverrides, BoolInt, Maybe CustomData, Maybe Int64) :. BadgeRow :. ContactDomainRow
+type ContactRow' = (ProfileId, ContactName, ContactName, Text, Maybe Text, Maybe Text, Maybe ImageData, Maybe ConnLinkContact, Maybe ChatPeerType, LocalAlias, BoolInt, ContactStatus) :. (Maybe MsgFilter, Maybe BoolInt, BoolInt, Maybe Text, Maybe Text, Preferences, UTCTime, UTCTime, Maybe UTCTime) :. PreparedContactRow :. (Maybe Int64, Maybe BoolInt, Maybe GroupMemberId, BoolInt) :. GroupDirectInvitationRow :. (Maybe UIThemeEntityOverrides, BoolInt, Maybe CustomData, Maybe Int64, Maybe ChatLayout) :. BadgeRow :. ContactDomainRow
 
 type ContactRow = Only ContactId :. ContactRow'
 
 type ContactDomainRow = (Maybe SimplexDomain, Maybe SimplexDomainProof, Maybe BoolInt)
 
 toContact :: UTCTime -> StoreCxt -> User -> [ChatTagId] -> ContactRow :. MaybeConnectionRow -> Contact
-toContact now cxt user chatTags ((Only contactId :. (profileId, localDisplayName, displayName, fullName, shortDescr, description, image, contactLink, peerType, localAlias, BI contactUsed, contactStatus) :. (enableNtfs_, sendRcpts, BI favorite, encodedPrefs, receivedPrefs, userPreferences, createdAt, updatedAt, chatTs) :. preparedContactRow :. (contactRequestId, rejectionSupported_, contactGroupMemberId, BI contactGrpInvSent) :. groupDirectInvRow :. (uiThemes, BI chatDeleted, customData, chatItemTTL) :. badgeRow :. domainRow) :. connRow) =
+toContact now cxt user chatTags ((Only contactId :. (profileId, localDisplayName, displayName, fullName, shortDescr, description, image, contactLink, peerType, localAlias, BI contactUsed, contactStatus) :. (enableNtfs_, sendRcpts, BI favorite, encodedPrefs, receivedPrefs, userPreferences, createdAt, updatedAt, chatTs) :. preparedContactRow :. (contactRequestId, rejectionSupported_, contactGroupMemberId, BI contactGrpInvSent) :. groupDirectInvRow :. (uiThemes, BI chatDeleted, customData, chatItemTTL, chatLayout) :. badgeRow :. domainRow) :. connRow) =
   let preferences = chatPrefsFromRow encodedPrefs receivedPrefs
       profile = LocalProfile {profileId, displayName, fullName, shortDescr, description, image, contactLink, contactDomain = rowToContactDomain domainRow, contactDomainVerified = rowToDomainVerified domainRow, peerType, localBadge = rowToBadge now badgeRow, preferences, localAlias}
       activeConn = toMaybeConnection cxt connRow
@@ -507,7 +507,7 @@ toContact now cxt user chatTags ((Only contactId :. (profileId, localDisplayName
       preparedContact = toPreparedContact preparedContactRow
       contactRequest = UserContactRequestRef <$> contactRequestId <*> (unBI <$> rejectionSupported_)
       groupDirectInv = toGroupDirectInvitation groupDirectInvRow
-   in Contact {contactId, localDisplayName, profile, activeConn, contactUsed, contactStatus, chatSettings, userPreferences, mergedPreferences, createdAt, updatedAt, chatTs, preparedContact, contactRequestId, contactRequest, contactGroupMemberId, contactGrpInvSent, groupDirectInv, chatTags, chatItemTTL, uiThemes, chatDeleted, customData}
+   in Contact {contactId, localDisplayName, profile, activeConn, contactUsed, contactStatus, chatSettings, userPreferences, mergedPreferences, createdAt, updatedAt, chatTs, preparedContact, contactRequestId, contactRequest, contactGroupMemberId, contactGrpInvSent, groupDirectInv, chatTags, chatItemTTL, uiThemes, chatLayout, chatDeleted, customData}
 
 rowToContactDomain :: ContactDomainRow -> Maybe SimplexDomainClaim
 rowToContactDomain (domain_, domainProof_, _) = (`SimplexDomainClaim` domainProof_) . StrJSON <$> domain_
@@ -696,7 +696,7 @@ type BusinessChatInfoRow = (Maybe BusinessChatType, Maybe MemberId, Maybe Member
 
 type GroupKeysRow = (Maybe C.PrivateKeyEd25519, Maybe C.PublicKeyEd25519, Maybe C.PrivateKeyEd25519)
 
-type GroupInfoRow = (Int64, GroupName, GroupName, Text, Maybe Text, Text, Maybe Text, Maybe ImageData, Maybe GroupType, Maybe ShortLinkContact, Maybe B64UrlByteString) :. PublicGroupAccessRow :. (Maybe MsgFilter, Maybe BoolInt, BoolInt, Maybe Text, Maybe Text, Maybe GroupMemberAdmission) :. (UTCTime, UTCTime, Maybe UTCTime, Maybe UTCTime) :. PreparedGroupRow :. BusinessChatInfoRow :. (BoolInt, Maybe RelayStatus, Maybe UIThemeEntityOverrides, Int64, Maybe Int64, Maybe VersionRoster, Maybe CustomData, Maybe Int64, Int, Maybe ConnReqContact, Maybe BoolInt) :. GroupKeysRow :. GroupMemberRow
+type GroupInfoRow = (Int64, GroupName, GroupName, Text, Maybe Text, Text, Maybe Text, Maybe ImageData, Maybe GroupType, Maybe ShortLinkContact, Maybe B64UrlByteString) :. PublicGroupAccessRow :. (Maybe MsgFilter, Maybe BoolInt, BoolInt, Maybe Text, Maybe Text, Maybe GroupMemberAdmission, Maybe ChatLayout) :. (UTCTime, UTCTime, Maybe UTCTime, Maybe UTCTime) :. PreparedGroupRow :. BusinessChatInfoRow :. (BoolInt, Maybe RelayStatus, Maybe UIThemeEntityOverrides, Int64, Maybe Int64, Maybe VersionRoster, Maybe CustomData, Maybe Int64, Int, Maybe ConnReqContact, Maybe BoolInt) :. GroupKeysRow :. GroupMemberRow
 
 type PublicGroupAccessRow = (Maybe Text, Maybe SimplexDomain, Maybe BoolInt, Maybe BoolInt, Maybe SimplexDomainProof)
 
@@ -705,13 +705,13 @@ type GroupMemberRow = (GroupMemberId, GroupId, Int64, MemberId, VersionChat, Ver
 type ProfileRow = (ProfileId, ContactName, Text, Maybe Text, Maybe Text, Maybe ImageData, Maybe ConnLinkContact, Maybe ChatPeerType, LocalAlias, Maybe Text, Maybe Text) :. BadgeRow :. ContactDomainRow
 
 toGroupInfo :: UTCTime -> StoreCxt -> Int64 -> [ChatTagId] -> GroupInfoRow -> (GroupInfo, GroupKeysRow)
-toGroupInfo now cxt userContactId chatTags ((groupId, localDisplayName, displayName, fullName, shortDescr, localAlias, description, image, groupType_, groupLink_, publicGroupId_) :. accessRow :. (enableNtfs_, sendRcpts, BI favorite, encodedPrefs, receivedPrefs, memberAdmission) :. (createdAt, updatedAt, chatTs, userMemberProfileSentAt) :. preparedGroupRow :. businessRow :. (BI useRelays, relayOwnStatus, uiThemes, currentMembers, publicMemberCount, rosterVersion, customData, chatItemTTL, membersRequireAttention, viaGroupLinkUri, groupDomainVerified) :. groupKeysRow :. userMemberRow) =
+toGroupInfo now cxt userContactId chatTags ((groupId, localDisplayName, displayName, fullName, shortDescr, localAlias, description, image, groupType_, groupLink_, publicGroupId_) :. accessRow :. (enableNtfs_, sendRcpts, BI favorite, encodedPrefs, receivedPrefs, memberAdmission, chatLayout) :. (createdAt, updatedAt, chatTs, userMemberProfileSentAt) :. preparedGroupRow :. businessRow :. (BI useRelays, relayOwnStatus, uiThemes, currentMembers, publicMemberCount, rosterVersion, customData, chatItemTTL, membersRequireAttention, viaGroupLinkUri, groupDomainVerified) :. groupKeysRow :. userMemberRow) =
   let membership = (toGroupMember now userContactId userMemberRow) {memberChatVRange = vr cxt}
       chatSettings = ChatSettings {enableNtfs = fromMaybe MFAll enableNtfs_, sendRcpts = unBI <$> sendRcpts, favorite}
       groupPreferences = groupPrefsFromRow encodedPrefs receivedPrefs
       fullGroupPreferences = mergeGroupPreferences groupPreferences
       publicGroup = toPublicGroupProfile groupType_ groupLink_ publicGroupId_ (toPublicGroupAccess accessRow)
-      groupProfile = GroupProfile {displayName, fullName, shortDescr, description, image, publicGroup, groupPreferences, memberAdmission}
+      groupProfile = GroupProfile {displayName, fullName, shortDescr, description, image, publicGroup, groupPreferences, memberAdmission, chatLayout}
       businessChat = toBusinessChatInfo (toPublicGroupAccess accessRow >>= groupDomainClaim) businessRow
       preparedGroup = toPreparedGroup preparedGroupRow
       groupSummary = GroupSummary {currentMembers, publicMemberCount}
@@ -843,7 +843,7 @@ groupInfoQueryFields =
       -- GroupInfo
       g.group_id, g.local_display_name, gp.display_name, gp.full_name, gp.short_descr, g.local_alias, gp.description, gp.image, gp.group_type, gp.group_link, gp.public_group_id,
       gp.group_web_page, gp.group_domain, gp.domain_web_page, gp.allow_embedding, gp.group_domain_proof,
-      g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences, gp.preferences_json, gp.member_admission,
+      g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences, gp.preferences_json, gp.member_admission, gp.chat_layout,
       g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at,
       g.conn_full_link_to_connect, g.conn_short_link_to_connect, g.conn_link_prepared_connection, g.conn_link_started_connection, g.welcome_shared_msg_id, g.request_shared_msg_id,
       g.business_chat, g.business_member_id, g.customer_member_id,
diff --git a/src/Simplex/Chat/Terminal/Output.hs b/src/Simplex/Chat/Terminal/Output.hs
index 7264a65bbc..c3a0a5a321 100644
--- a/src/Simplex/Chat/Terminal/Output.hs
+++ b/src/Simplex/Chat/Terminal/Output.hs
@@ -388,8 +388,9 @@ printMessage ChatTerminal {termSize = Size {height, width}, nextMessageRow} msg
 -- because of accounting for control sequences in length
 putStyled :: MonadTerminal m => StyledString -> m ()
 putStyled (s1 :<>: s2) = putStyled s1 >> putStyled s2
-putStyled (Styled [] s) = putString s
-putStyled (Styled sgr s) = setSGR sgr >> putString s >> resetAttributes
+-- putText, as putString sends a terminal command per character
+putStyled (Styled [] s) = putText (T.pack s)
+putStyled (Styled sgr s) = setSGR sgr >> putText (T.pack s) >> resetAttributes
 
 setSGR :: MonadTerminal m => [SGR] -> m ()
 setSGR = mapM_ $ \case
diff --git a/src/Simplex/Chat/Types.hs b/src/Simplex/Chat/Types.hs
index 94fd5d4fcd..842ad784a5 100644
--- a/src/Simplex/Chat/Types.hs
+++ b/src/Simplex/Chat/Types.hs
@@ -220,6 +220,7 @@ data Contact = Contact
     chatTags :: [ChatTagId],
     chatItemTTL :: Maybe Int64,
     uiThemes :: Maybe UIThemeEntityOverrides,
+    chatLayout :: Maybe ChatLayout,
     chatDeleted :: Bool,
     customData :: Maybe CustomData
   }
@@ -919,7 +920,8 @@ data GroupProfile = GroupProfile
     image :: Maybe ImageData,
     publicGroup :: Maybe PublicGroupProfile,
     groupPreferences :: Maybe GroupPreferences,
-    memberAdmission :: Maybe GroupMemberAdmission
+    memberAdmission :: Maybe GroupMemberAdmission,
+    chatLayout :: Maybe ChatLayout
   }
   deriving (Eq, Show)
 
diff --git a/src/Simplex/Chat/Types/UITheme.hs b/src/Simplex/Chat/Types/UITheme.hs
index 096cda06f5..e20a20c61c 100644
--- a/src/Simplex/Chat/Types/UITheme.hs
+++ b/src/Simplex/Chat/Types/UITheme.hs
@@ -32,7 +32,8 @@ data UIColorMode = UCMLight | UCMDark
 
 data UIThemeEntityOverrides = UIThemeEntityOverrides
   { light :: Maybe UIThemeEntityOverride,
-    dark :: Maybe UIThemeEntityOverride
+    dark :: Maybe UIThemeEntityOverride,
+    chatLayout :: Maybe ChatLayout
   }
   deriving (Eq, Show)
 
@@ -43,6 +44,30 @@ data UIThemeEntityOverride = UIThemeEntityOverride
   }
   deriving (Eq, Show)
 
+data ChatLayout = CLClassic | CLTerminal | CLUnknown Text
+  deriving (Eq, Show)
+
+instance FromJSON ChatLayout where
+  parseJSON = textParseJSON "ChatLayout"
+
+instance ToJSON ChatLayout where
+  toJSON = J.String . textEncode
+  toEncoding = JE.text . textEncode
+
+instance FromField ChatLayout where fromField = fromTextField_ textDecode
+
+instance ToField ChatLayout where toField = toField . textEncode
+
+instance TextEncoding ChatLayout where
+  textDecode s = Just $ case s of
+    "classic" -> CLClassic
+    "terminal" -> CLTerminal
+    tag -> CLUnknown tag
+  textEncode = \case
+    CLClassic -> "classic"
+    CLTerminal -> "terminal"
+    CLUnknown tag -> tag
+
 data DarkColorScheme = DCSDark | DCSBlack | DCSSimplex
   deriving (Eq, Ord, Show)
 
@@ -172,4 +197,4 @@ instance ToField UIThemeEntityOverrides where
   toField = toField . encodeJSON
 
 instance FromField UIThemeEntityOverrides where
-  fromField = fromTextField_ $ Just . fromMaybe (UIThemeEntityOverrides Nothing Nothing) . decodeJSON
+  fromField = fromTextField_ $ Just . fromMaybe (UIThemeEntityOverrides Nothing Nothing Nothing) . decodeJSON
diff --git a/src/Simplex/Chat/View.hs b/src/Simplex/Chat/View.hs
index 155281d0c5..415faf1201 100644
--- a/src/Simplex/Chat/View.hs
+++ b/src/Simplex/Chat/View.hs
@@ -1191,16 +1191,17 @@ simplexDomainLine nameType (Just SimplexDomainClaim {domain, proof}) status = ca
 
 -- TODO [short links] show all settings
 viewAddressSettings :: AddressSettings -> [StyledString]
-viewAddressSettings AddressSettings {businessAddress, autoAccept, autoReply} = case autoAccept of
+viewAddressSettings AddressSettings {businessAddress, autoAccept, chatLayout, autoReply} = case autoAccept of
   Just AutoAccept {acceptIncognito} ->
     ("auto_accept on" <> aaInfo)
-      : maybe [] ((["auto reply:"] <>) . ttyMsgContent) autoReply
+      : viewChatLayout chatLayout
+      <> maybe [] ((["auto reply:"] <>) . ttyMsgContent) autoReply
     where
       aaInfo
         | businessAddress = ", business"
         | acceptIncognito = ", incognito"
         | otherwise = ""
-  _ -> ["auto_accept off"]
+  _ -> "auto_accept off" : viewChatLayout chatLayout
 
 groupLink_ :: Bool -> StyledString -> GroupInfo -> GroupLink -> [StyledString]
 groupLink_ showFullLinks intro g GroupLink {connLinkContact = CCLink cReq shortLink, acceptMemberRole} =
@@ -1896,7 +1897,7 @@ dayTime :: UTCTime -> Text
 dayTime = T.pack . formatTime defaultTimeLocale "%Y-%m-%d %H:%M"
 
 viewContactInfo :: Contact -> Maybe ConnectionStats -> Maybe Profile -> [StyledString]
-viewContactInfo ct@Contact {contactId, profile = LocalProfile {localAlias, contactLink, localBadge, contactDomain, contactDomainVerified, description}, activeConn, uiThemes, customData} stats incognitoProfile =
+viewContactInfo ct@Contact {contactId, profile = LocalProfile {localAlias, contactLink, localBadge, contactDomain, contactDomainVerified, description}, activeConn, uiThemes, chatLayout, customData} stats incognitoProfile =
   ["contact ID: " <> sShow contactId]
     <> viewContactBadge localBadge
     <> maybe [] ((bold' "description:" :) . map plain . T.lines) description
@@ -1912,6 +1913,7 @@ viewContactInfo ct@Contact {contactId, profile = LocalProfile {localAlias, conta
     <> ["quantum resistant end-to-end encryption" | contactPQEnabled ct == CR.PQEncOn]
     <> maybe [] (\ac -> [viewPeerChatVRange (peerChatVRange ac)]) activeConn
     <> viewUITheme uiThemes
+    <> viewChatLayout chatLayout
     <> viewCustomData customData
 
 viewGroupInfo :: GroupInfo -> [StyledString]
@@ -1934,6 +1936,9 @@ viewGroupInfo gInfo@GroupInfo {groupId, businessChat, groupDomainVerified, group
 viewUITheme :: Maybe UIThemeEntityOverrides -> [StyledString]
 viewUITheme = maybe [] (\uiThemes -> ["UI themes: " <> viewJSON uiThemes])
 
+viewChatLayout :: Maybe ChatLayout -> [StyledString]
+viewChatLayout = maybe [] (\chatLayout -> ["chat layout: " <> plain (textEncode chatLayout)])
+
 viewCustomData :: Maybe CustomData -> [StyledString]
 viewCustomData = maybe [] (\(CustomData v) -> ["custom data: " <> viewJSON (J.Object v)])
 
@@ -2114,10 +2119,10 @@ countactUserPrefText cup = case cup of
 
 viewGroupUpdated :: GroupInfo -> GroupInfo -> Maybe GroupMember -> Maybe MsgSigStatus -> [StyledString]
 viewGroupUpdated
-  GroupInfo {localDisplayName = n, groupProfile = GroupProfile {fullName, shortDescr, description, image, groupPreferences = gps, memberAdmission = ma, publicGroup = pg}}
-  g'@GroupInfo {localDisplayName = n', groupProfile = GroupProfile {fullName = fullName', shortDescr = shortDescr', description = description', image = image', groupPreferences = gps', memberAdmission = ma', publicGroup = pg'}}
+  GroupInfo {localDisplayName = n, groupProfile = GroupProfile {fullName, shortDescr, description, image, groupPreferences = gps, memberAdmission = ma, chatLayout = layout, publicGroup = pg}}
+  g'@GroupInfo {localDisplayName = n', groupProfile = GroupProfile {fullName = fullName', shortDescr = shortDescr', description = description', image = image', groupPreferences = gps', memberAdmission = ma', chatLayout = layout', publicGroup = pg'}}
   m signed = do
-    let update = groupProfileUpdated <> groupPrefsUpdated <> memberAdmissionUpdated <> publicGroupAccessUpdated
+    let update = groupProfileUpdated <> groupPrefsUpdated <> memberAdmissionUpdated <> chatLayoutUpdated <> publicGroupAccessUpdated
     if null update
       then []
       else memberUpdated <> update
@@ -2142,6 +2147,9 @@ viewGroupUpdated
       memberAdmissionUpdated
         | ma == ma' = []
         | otherwise = ["changed member admission rules"]
+      chatLayoutUpdated
+        | layout == layout' = []
+        | otherwise = ["chat layout " <> maybe "removed" (("changed to: " <>) . plain . textEncode) layout']
       publicGroupAccessUpdated
         | access == access' = []
         | otherwise = ["updated public group access:" <> viewAccess access']
@@ -2156,11 +2164,12 @@ viewGroupUpdated
               <> (if allowEmbedding then " embed=on" else "")
 
 viewGroupProfile :: GroupInfo -> [StyledString]
-viewGroupProfile g@GroupInfo {groupProfile = GroupProfile {shortDescr, description, image, groupPreferences = gps}} =
+viewGroupProfile g@GroupInfo {groupProfile = GroupProfile {shortDescr, description, image, groupPreferences = gps, chatLayout}} =
   [ttyFullGroup g]
     <> maybe [] (\sd -> ["description: " <> plain sd]) shortDescr
     <> maybe [] (const ["has profile image"]) image
     <> maybe [] ((bold' "welcome message:" :) . map plain . T.lines) description
+    <> viewChatLayout chatLayout
     <> (bold' "group preferences:" : map viewPref (if useRelays' g then channelGroupFeatures else regularGroupFeatures))
   where
     viewPref (AGF f) = plain $ groupPreferenceText (pref gps)
diff --git a/tests/Bots/BadgeService/GroupIntegrationTests.hs b/tests/Bots/BadgeService/GroupIntegrationTests.hs
index 8b4cbc249a..0a632b46b5 100644
--- a/tests/Bots/BadgeService/GroupIntegrationTests.hs
+++ b/tests/Bots/BadgeService/GroupIntegrationTests.hs
@@ -171,11 +171,14 @@ runGroupServiceAs svc groupCfg action = do
   -- The web listener starts after group start-up, so the stop cannot land inside start-up's database calls.
   let started = pollUntilTrue (listening port) >> pollUntil (getStoredGroup cc)
       -- A stop inside a lane's database call leaves a statement open, and closing the store then fails.
-      settle gid = when (isJust groupCfg) $ do
-        status <- memberStatus cc gid badgeBotName
-        forM_ status $ \s -> unless (s `elem` ["removed", "left", "deleted"]) $ settleLane cc env gid
+      settle gid = when (isJust groupCfg) $ settleServingLane cc env gid
   (started >>= \ManagedGroup {mgGroupId} -> action cc env mgGroupId <* settle mgGroupId) `finally` stopGroupService t cc
 
+settleServingLane :: HasCallStack => ChatController -> ServiceState -> Int64 -> IO ()
+settleServingLane cc env gid = do
+  status <- memberStatus cc gid badgeBotName
+  forM_ status $ \s -> unless (s `elem` ["removed", "left", "deleted"]) $ settleLane cc env gid
+
 -- It returns once chat has started, while group start-up may still run; the Int is its web listener's port.
 startGroupService :: HasCallStack => GroupSvc -> Maybe GroupConfig -> IO (Async (), ChatController, ServiceState, Int)
 startGroupService svc@GroupSvc {gsCfg} groupCfg = do
@@ -228,25 +231,31 @@ withGroupOwner ps action = do
   runWithOwner svc $ \cc env _ -> action gsKey cc env
 
 runWithOwner :: HasCallStack => GroupSvc -> (ChatController -> ServiceState -> Int64 -> TestCC -> IO a) -> IO a
-runWithOwner svc@GroupSvc {gsPs} action = runGroupService svc $ \cc env gid -> withOwnerJoined gsPs cc gid $ action cc env gid
+runWithOwner svc@GroupSvc {gsPs} action = runGroupService svc $ \cc env gid -> withOwnerJoined gsPs cc env gid $ action cc env gid
 
-withOwnerJoined :: HasCallStack => TestParams -> ChatController -> Int64 -> (TestCC -> IO a) -> IO a
-withOwnerJoined ps cc gid action =
+withOwnerJoined :: HasCallStack => TestParams -> ChatController -> ServiceState -> Int64 -> (TestCC -> IO a) -> IO a
+withOwnerJoined ps cc env gid action =
   withNewTestChat ps "alice" aliceProfile $ \alice -> do
     joinGroup cc alice
     waitMemberRole cc gid "alice" "owner"
     drainUntil alice ["#" <> groupName <> ": " <> botName <> " changed your role from member to owner"]
+    joined <- lastMessageId cc
     r <- action alice
+    settleServingLane cc env gid
+    awaitBroadcasts cc joined "alice" alice
     drainConsole alice
     pure r
 
 -- Bob joins after the first member and is connected to her.
-withMemberJoined :: HasCallStack => TestParams -> ChatController -> TestCC -> (TestCC -> IO a) -> IO a
-withMemberJoined ps cc alice action =
+withMemberJoined :: HasCallStack => TestParams -> ChatController -> ServiceState -> Int64 -> TestCC -> (TestCC -> IO a) -> IO a
+withMemberJoined ps cc env gid alice action =
   withNewTestChat ps "bob" bobProfile $ \bob -> do
     joinGroup cc bob
     drainUntil alice ["#" <> groupName <> ": new member bob is connected"]
+    joined <- lastMessageId cc
     r <- action bob
+    settleServingLane cc env gid
+    awaitBroadcasts cc joined "bob" bob
     drainConsole bob
     pure r
 
@@ -315,7 +324,7 @@ testEarliestPromotedOnLaterJoin ps = do
   runWithOwner svc $ \cc env gid alice -> do
     setMemberRole cc gid "alice" "member"
     executeSql cc "UPDATE sx_badge_service_group SET owner_bootstrapped = 0"
-    withMemberJoined ps cc alice $ \_ -> do
+    withMemberJoined ps cc env gid alice $ \_ -> do
       waitMemberRole cc gid "alice" "owner"
       awaitLane cc env
       memberRoles cc gid `shouldReturn` [("alice", "owner"), ("bob", "member")]
@@ -428,7 +437,7 @@ memberStatus cc gid name =
 withTwoMembersOwnerUnset :: HasCallStack => GroupSvc -> (ChatController -> Int64 -> TestCC -> IO ()) -> IO ()
 withTwoMembersOwnerUnset svc@GroupSvc {gsPs = ps} action =
   runWithOwner svc $ \cc env gid alice ->
-    withMemberJoined ps cc alice $ \bob -> do
+    withMemberJoined ps cc env gid alice $ \bob -> do
       -- The lane must handle bob's join before the flag is cleared, or it would act on the cleared flag in this run.
       awaitLane cc env
       action cc gid bob
@@ -437,8 +446,8 @@ withTwoMembersOwnerUnset svc@GroupSvc {gsPs = ps} action =
 testFirstJoinerPromoted :: HasCallStack => TestParams -> IO ()
 testFirstJoinerPromoted ps = do
   svc <- prepareGroupService ps
-  runWithOwner svc $ \cc _ gid alice ->
-    withMemberJoined ps cc alice $ \bob -> do
+  runWithOwner svc $ \cc env gid alice ->
+    withMemberJoined ps cc env gid alice $ \bob -> do
       waitMemberRole cc gid "bob" "member"
       -- The bot queues bob's join before it introduces him, so alice's code proves the join was handled.
       sendGroupCmd alice "/issue supporter"
@@ -459,7 +468,7 @@ testFailedPromotionNotRetried ps = do
       pollUntilTrue $ mgOwnerBootstrapped <$> storedGroup cc
       awaitLane cc env
       setBotRole cc "owner"
-      withMemberJoined ps cc alice $ \_ -> awaitLane cc env
+      withMemberJoined ps cc env gid alice $ \_ -> awaitLane cc env
       memberRoles cc gid `shouldReturn` [("alice", "member"), ("bob", "member")]
       drainConsole alice
 
@@ -504,8 +513,8 @@ testRoleGatedIssue ps = do
 testBlockedMemberCommandIgnored :: HasCallStack => TestParams -> IO ()
 testBlockedMemberCommandIgnored ps = do
   svc <- prepareGroupService ps
-  runWithOwner svc $ \cc _ gid alice ->
-    withMemberJoined ps cc alice $ \bob -> do
+  runWithOwner svc $ \cc env gid alice ->
+    withMemberJoined ps cc env gid alice $ \bob -> do
       waitMemberRole cc gid "bob" "member"
       -- bob is made moderator so that only the block can refuse his command.
       send alice ("/mr #" <> groupName <> " bob moderator")
@@ -1255,6 +1264,29 @@ drainConsole cc =
     Just _ -> drainConsole cc
     Nothing -> pure ()
 
+lastMessageId :: ChatController -> IO Int64
+lastMessageId cc = fromMaybe 0 <$> queryFirst cc "SELECT COALESCE(MAX(message_id), 0) FROM messages"
+
+awaitBroadcasts :: HasCallStack => ChatController -> Int64 -> Text -> TestCC -> IO ()
+awaitBroadcasts cc joined name TestCC {chatController = memberCC} = do
+  lastBroadcast <- listToMaybe <$> queryRows cc lastBroadcastSql
+  forM_ lastBroadcast $ \(gid, sharedMsgId) -> do
+    status <- memberStatus cc gid name
+    when (maybe False (`notElem` ["removed", "left", "deleted"]) status) $
+      pollUntilTrue $ isJust <$> (queryFirst memberCC (receivedSql sharedMsgId) :: IO (Maybe Int64))
+  where
+    lastBroadcastSql =
+      "SELECT group_id, " <> hexSharedMsgId <> " FROM messages WHERE msg_sent = 1 AND message_id > " <> show joined
+        <> " AND chat_msg_event IN ('x.msg.new', 'x.msg.update', 'x.msg.del') ORDER BY message_id DESC LIMIT 1"
+    receivedSql sharedMsgId = "SELECT message_id FROM messages WHERE msg_sent = 0 AND " <> hexSharedMsgId <> " = '" <> T.unpack sharedMsgId <> "'"
+
+hexSharedMsgId :: String
+#if defined(dbPostgres)
+hexSharedMsgId = "encode(shared_msg_id, 'hex')"
+#else
+hexSharedMsgId = "hex(shared_msg_id)"
+#endif
+
 -- A console silent this long is taken as drained.
 quietPeriod :: Int
 quietPeriod = 500000
diff --git a/tests/Bots/BadgeService/GroupTests.hs b/tests/Bots/BadgeService/GroupTests.hs
index c592178a91..40baa25f12 100644
--- a/tests/Bots/BadgeService/GroupTests.hs
+++ b/tests/Bots/BadgeService/GroupTests.hs
@@ -123,7 +123,8 @@ badgeGroupTests = describe "badge group" $ do
               image = Nothing,
               publicGroup = Nothing,
               groupPreferences = Nothing,
-              memberAdmission = Nothing
+              memberAdmission = Nothing,
+              chatLayout = Nothing
             }
     it "says nothing when the config matches the group profile" $ do
       inertGroupConfig (cfg "SimpleX Badges" (Just "badge ops desk")) (profile "SimpleX Badges" (Just "badge ops desk"))
diff --git a/tests/Bots/BadgeService/WebTests.hs b/tests/Bots/BadgeService/WebTests.hs
index 1a18d53137..52d4b5ace9 100644
--- a/tests/Bots/BadgeService/WebTests.hs
+++ b/tests/Bots/BadgeService/WebTests.hs
@@ -55,7 +55,9 @@ import Data.Time.Calendar (fromGregorian)
 import Data.Time.Clock (NominalDiffTime, UTCTime (..), addUTCTime, diffUTCTime, getCurrentTime, picosecondsToDiffTime, secondsToDiffTime)
 import Data.Time.Clock.POSIX (posixSecondsToUTCTime, utcTimeToPOSIXSeconds)
 import Data.Word (Word32, Word8)
-import GHC.IO.Handle (hDuplicate, hDuplicateTo)
+import qualified GHC.IO.Device as IODevice
+import qualified GHC.IO.FD as FD
+import GHC.IO.Handle.FD (handleToFd)
 import Network.HTTP.Client (Manager, Request (..), RequestBody (..), Response, defaultManagerSettings, httpLbs, newManager, parseRequest, responseBody, responseHeaders, responseStatus, responseTimeoutMicro)
 import Network.HTTP.Types (Header, HeaderName, hCacheControl, hContentType)
 import Network.HTTP.Types.Status (statusCode)
@@ -75,7 +77,7 @@ import Simplex.Messaging.Encoding.String (textDecode, textEncode)
 import Simplex.Messaging.Util (safeDecodeUtf8, tshow)
 import System.Directory (createDirectoryIfMissing, createFileLink, doesFileExist, listDirectory)
 import System.FilePath ((</>))
-import System.IO (IOMode (..), hClose, hGetBuffering, hSetBuffering, stderr, withFile)
+import System.IO (IOMode (..), hFlush, stderr, withFile)
 import System.IO.Unsafe (unsafePerformIO)
 import System.Timeout (timeout)
 import Test.Hspec
@@ -2850,16 +2852,16 @@ stderrCaptureLock :: MVar ()
 stderrCaptureLock = unsafePerformIO $ newMVar ()
 {-# NOINLINE stderrCaptureLock #-}
 
--- hDuplicateTo changes stderr's buffering, so put the original setting back.
 capturingStderr :: IO () -> IO Text
 capturingStderr action = withMVar stderrCaptureLock $ \_ -> do
   createDirectoryIfMissing True "tests/tmp"
   withTempDirectory "tests/tmp" "badge-stderr" $ \dir -> do
     let path = dir </> "stderr.log"
     withFile path WriteMode $ \h -> do
-      buffering <- hGetBuffering stderr
-      saved <- hDuplicate stderr
-      (hDuplicateTo h stderr >> action) `E.finally` (hDuplicateTo saved stderr >> hClose saved >> hSetBuffering stderr buffering)
+      fd <- handleToFd h
+      hFlush stderr
+      saved <- IODevice.dup FD.stderr
+      (IODevice.dup2 fd FD.stderr >> action) `E.finally` (hFlush stderr >> IODevice.dup2 saved FD.stderr >> IODevice.close saved)
     T.readFile path
 
 loggedError :: Text -> Text -> Bool
diff --git a/tests/Bots/DirectoryTests.hs b/tests/Bots/DirectoryTests.hs
index 22d73f72ea..c33d9df230 100644
--- a/tests/Bots/DirectoryTests.hs
+++ b/tests/Bots/DirectoryTests.hs
@@ -14,7 +14,7 @@ import Control.Concurrent (threadDelay)
 import Control.Concurrent.Async (async, cancel)
 import Control.Concurrent.STM (atomically, peekTQueue, tryReadTMVar)
 import Control.Exception (finally)
-import Control.Monad (forM_, when, void)
+import Control.Monad (forM_, replicateM, when, void)
 import qualified Data.Aeson as J
 import qualified Data.Text as T
 import Directory.Captcha
@@ -421,12 +421,9 @@ testJoinGroup ps =
           cath <## "connection request sent!"
           cath <## "#privacy: joining the group..."
           cath <## "#privacy: you joined the group, pending approval"
-          cath <# "#privacy (support) 'SimpleX Directory_1'> Captcha is generated by SimpleX Directory service."
-          cath <## ""
-          cath <## "Send captcha text to join the group privacy."
-          captcha <- dropStrPrefix "#privacy (support) 'SimpleX Directory_1'> " . dropTime <$> getTermLine cath
-          cath <## "contact and member are merged: 'SimpleX Directory', #privacy 'SimpleX Directory_1'"
-          cath <## "use @'SimpleX Directory' <message> to send messages"
+          let merged = ["contact and member are merged: 'SimpleX Directory', #privacy 'SimpleX Directory_1'", "use @'SimpleX Directory' <message> to send messages"]
+          [_, "", "Send captcha text to join the group privacy.", captchaLine] <- filter (`notElem` merged) <$> replicateM 6 (getTermLine cath)
+          let captcha = drop 2 $ dropWhile (/= '>') captchaLine
           cath #> ("#privacy (support) " <> captcha)
           cath <# ("#privacy (support) 'SimpleX Directory'!> > cath " <> captcha)
           cath <## "      Correct, you joined the group privacy"
diff --git a/tests/ChatTests/ChatRelays.hs b/tests/ChatTests/ChatRelays.hs
index baf8d10d16..7923a6546b 100644
--- a/tests/ChatTests/ChatRelays.hs
+++ b/tests/ChatTests/ChatRelays.hs
@@ -221,7 +221,7 @@ testChatRelayTest ps =
         bob <## "Your chat address is deleted - accepted contacts will remain connected."
         bob <## "To create a new chat address use /ad"
         alice ##> ("/relay test " <> bobSLink)
-        alice <##. "relay test failed at RTSGetLink, error: "
+        alice <##.. ["relay test failed at RTSGetLink, error: ", "relay test failed at RTSConnect, error: "]
 
 testRelayProfileUpdateInAddress :: HasCallStack => TestParams -> IO ()
 testRelayProfileUpdateInAddress ps =
diff --git a/tests/ChatTests/Groups.hs b/tests/ChatTests/Groups.hs
index 81f0f5d9e2..01a504f13c 100644
--- a/tests/ChatTests/Groups.hs
+++ b/tests/ChatTests/Groups.hs
@@ -28,7 +28,7 @@ import qualified Data.ByteString.Char8 as B
 import Data.Maybe (fromMaybe, isJust, maybeToList)
 import Data.Time (UTCTime, getCurrentTime)
 import Data.Int (Int64)
-import Data.List (intercalate, isInfixOf, isSuffixOf)
+import Data.List (intercalate, isInfixOf, isSubsequenceOf, isSuffixOf)
 import qualified Data.Map.Strict as M
 import qualified Data.Text as T
 import Simplex.Chat.Badges (FileSizeLimits (..))
@@ -43,6 +43,7 @@ import Simplex.Chat.Protocol (ChatMessage (ChatMessage), ChatMsgEvent (XGrpMemNe
 import Simplex.Chat.Types
 import Simplex.Chat.Types.MemberRelations (MemberRelation (..), getRelation, setRelation)
 import Simplex.Chat.Types.Shared (GroupMemberRole (..), GroupAcceptance (..))
+import Simplex.Chat.Types.UITheme (ChatLayout (..))
 import Simplex.Messaging.Agent (joinConnection, prepareConnectionToJoin, sendMessages, vrValue)
 import Simplex.Messaging.Agent.Env.SQLite
 import Simplex.Messaging.Agent.RetryInterval
@@ -311,6 +312,7 @@ chatGroupTests = do
       it "should update channel profile (signed)" testChannelUpdateProfileSigned
       it "should preserve working link after profile update" testChannelLinkAfterProfileUpdate
       it "should preserve working link after welcome message update" testChannelLinkAfterWelcomeUpdate
+      it "should set chat layout of channel joined via relays from link data" testChannelChatLayout
       it "should preserve owner key in link data after profile update" testChannelOwnerKeyAfterLinkUpdate
       it "should update channel preferences (signed)" testChannelUpdatePrefsSigned
       it "should change member role (signed)" testChannelChangeRoleSigned
@@ -6282,7 +6284,7 @@ testGroupHistory =
 
       cath ##> "/_get chat #1 count=100"
       r <- chat <$> getTermLine cath
-      r `shouldContain` [(0, "hello"), (0, "hey!")]
+      r `shouldSatisfy` isSubsequenceOf [(0, "hello"), (0, "hey!")]
 
       -- message delivery works after sending history
       alice #> "#team 1"
@@ -6376,7 +6378,7 @@ testGroupHistoryPreferenceOff =
 
       cath ##> "/_get chat #1 count=100"
       r <- chat <$> getTermLine cath
-      r `shouldContain` [(0, "hello"), (0, "hey!")]
+      r `shouldSatisfy` isSubsequenceOf [(0, "hello"), (0, "hey!")]
 
       alice ##> "/set history #team off"
       alice <## "updated group preferences:"
@@ -6642,9 +6644,10 @@ testGroupHistoryMultipleFiles =
       cath ##> "/_get chat #1 count=100"
       r <- chatF <$> getTermLine cath
       r
-        `shouldContain` [ ((0, "hi alice"), Just $ tmpFile cath "testfile_bob_1"),
-                          ((0, "hey bob"), Just $ tmpFile cath "testfile_alice_1")
-                        ]
+        `shouldSatisfy` isSubsequenceOf
+          [ ((0, "hi alice"), Just $ tmpFile cath "testfile_bob_1"),
+            ((0, "hey bob"), Just $ tmpFile cath "testfile_alice_1")
+          ]
 
 testGroupHistoryFileCancel :: HasCallStack => TestParams -> IO ()
 testGroupHistoryFileCancel =
@@ -6862,13 +6865,14 @@ testGroupHistoryQuotes =
       cath ##> "/_get chat #1 count=100"
       r <- chat' <$> getTermLine cath
       r
-        `shouldContain` [ ((0, "ALICE"), Nothing),
-                          ((0, "BOB"), Nothing),
-                          ((0, "1"), Just (0, "ALICE")),
-                          ((0, "2"), Just (0, "BOB")),
-                          ((0, "3"), Just (0, "ALICE")),
-                          ((0, "4"), Just (0, "BOB"))
-                        ]
+        `shouldSatisfy` isSubsequenceOf
+          [ ((0, "ALICE"), Nothing),
+            ((0, "BOB"), Nothing),
+            ((0, "1"), Just (0, "ALICE")),
+            ((0, "2"), Just (0, "BOB")),
+            ((0, "3"), Just (0, "ALICE")),
+            ((0, "4"), Just (0, "BOB"))
+          ]
 
 testGroupHistoryDeletedMessage :: HasCallStack => TestParams -> IO ()
 testGroupHistoryDeletedMessage =
@@ -6970,7 +6974,7 @@ testGroupHistoryDisappearingMessage =
 
       cath ##> "/_get chat #1 count=100"
       r1 <- chat <$> getTermLine cath
-      r1 `shouldContain` [(0, "1"), (0, "2"), (0, "3"), (0, "4")]
+      r1 `shouldSatisfy` isSubsequenceOf [(0, "1"), (0, "2"), (0, "3"), (0, "4")]
 
       threadDelay 11000000
       concurrentlyN_
@@ -6990,7 +6994,7 @@ testGroupHistoryDisappearingMessage =
 
       cath ##> "/_get chat #1 count=100"
       r2 <- chat <$> getTermLine cath
-      r2 `shouldContain` [(0, "1"), (0, "4")]
+      r2 `shouldSatisfy` isSubsequenceOf [(0, "1"), (0, "4")]
       r2 `shouldNotContain` [(0, "2")]
       r2 `shouldNotContain` [(0, "3")]
 
@@ -7101,7 +7105,7 @@ testGroupHistoryUnknownMember =
 
       dan ##> "/_get chat #1 count=100"
       r <- chat <$> getTermLine dan
-      r `shouldContain` [(0, "hi from alice"), (0, "hi from bob"), (0, "hi from cath")]
+      r `shouldSatisfy` isSubsequenceOf [(0, "hi from alice"), (0, "hi from bob"), (0, "hi from cath")]
 
       dan ##> "/ms team"
       dan
@@ -10550,6 +10554,32 @@ testChannelLinkAfterWelcomeUpdate ps =
           bob <# "#team> hi"
           [cath, dan] *<# "#team> hi [>>]"
 
+testChannelChatLayout :: HasCallStack => TestParams -> IO ()
+testChannelChatLayout ps =
+  withNewTestChat ps "alice" aliceProfile $ \alice ->
+    withNewTestChatOpts ps relayTestOpts "bob" bobProfile $ \bob ->
+      withNewTestChat ps "cath" cathProfile $ \cath -> do
+        (shortLink, _fullLink) <- prepareChannel1Relay "team" alice bob
+        alice ##> "/set layout #team terminal"
+        alice <## "chat layout changed to: terminal"
+        bob <## "alice updated group #team: (signed)"
+        bob <## "chat layout changed to: terminal"
+        cath ##> ("/c " <> shortLink)
+        cath <## "#team: connection started"
+        concurrentlyN_
+          [ cath
+              <### [ "#team: joining the group (connecting to relay bob)...",
+                     "#team: you joined the group (connected to relay bob)"
+                   ],
+            do
+              bob <## "cath (Catherine): accepting request to join group #team..."
+              bob <## "#team: cath joined the group",
+            alice <### [EndsWith "introduced cath (Catherine) in the channel"]
+          ]
+        groupChatLayout alice "team" `shouldReturn` Just CLTerminal
+        groupChatLayout bob "team" `shouldReturn` Just CLTerminal
+        groupChatLayout cath "team" `shouldReturn` Just CLTerminal
+
 testChannelOwnerKeyAfterLinkUpdate :: HasCallStack => TestParams -> IO ()
 testChannelOwnerKeyAfterLinkUpdate ps =
   withNewTestChat ps "alice" aliceProfile $ \alice ->
diff --git a/tests/ChatTests/Profiles.hs b/tests/ChatTests/Profiles.hs
index db16226989..20134bbc6f 100644
--- a/tests/ChatTests/Profiles.hs
+++ b/tests/ChatTests/Profiles.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE PatternSynonyms #-}
@@ -14,7 +15,7 @@ import ChatClient
 import ChatTests.DBUtils
 import ChatTests.Utils
 import Control.Concurrent (threadDelay)
-import Control.Concurrent.Async (concurrently_)
+import Control.Concurrent.Async (concurrently, concurrently_)
 import Control.Monad
 import Control.Monad.Except
 import Control.Monad.Reader (runReaderT)
@@ -165,6 +166,12 @@ chatProfileTests = do
       it "files & media" testGroupPrefsFilesForRole
       it "SimpleX links" testGroupPrefsSimplexLinksForRole
     it "set user, contact and group UI theme" testSetUITheme
+  describe "chat layout" $ do
+    it "group chat layout from group profile" testGroupChatLayout
+    it "group chat layout from group link without prepare" testGroupLinkChatLayout
+    it "unknown chat layout stored and read" testUnknownChatLayout
+    it "contact chat layout from address" testAddressChatLayout
+    it "business chat layout from business address" testBusinessAddressChatLayout
   describe "short links" $ do
     it "should connect via one-time invitation" testShortLinkInvitation
     it "should plan and connect via one-time invitation" testPlanShortLinkInvitation
@@ -915,13 +922,14 @@ testUserBadgeGroupLinkJoiner ps = do
       alice <## "bob (Bob): accepting request to join group #team..."
       memberBadgeHeader alice "team" "bob" `shouldReturn` Just ("R", BSActive)
       bob ##> "/_start"
-      bob <## "chat started"
-      bob <## "subscribed 1 connections on server localhost"
       concurrentlyN_
         [ alice <## "#team: bob joined the group",
-          do
-            bob <## "#team: joining the group..."
-            bob <## "#team: you joined the group"
+          bob
+            <### [ "chat started",
+                   "subscribed 1 connections on server localhost",
+                   "#team: joining the group...",
+                   "#team: you joined the group"
+                 ]
         ]
       memberBadgeHeader alice "team" "bob" `shouldReturn` Just ("CG", BSActive)
 
@@ -985,9 +993,7 @@ testUserBadgeInvitedIntroduced ps = do
       bob ##> "/_stop"
       bob <## "chat stopped"
       cath ##> "/_start"
-      cath <## "chat started"
-      cath <## "subscribed 2 connections on server localhost"
-      cath <## "#team: alice added bob (Bob) to the group (connecting...)"
+      cath <### ["chat started", "subscribed 2 connections on server localhost", "#team: alice added bob (Bob) to the group (connecting...)"]
       memberBadgeHeader cath "team" "bob" `shouldReturn` Just ("CG", BSActive)
 
 testUserBadgeInvitingHost :: HasCallStack => TestParams -> IO ()
@@ -1125,7 +1131,7 @@ testUserBadgeLinkDataOtherLink ps = do
       alice ##> "/_connect 1"
       (shortLink, _) <- getInvitations alice
       Right otherProof <- badgeProof pk cred (PHLink "other link key")
-      setTestInvLinkData alice $ ContactShortLinkData aliceProfile {badge = Just otherProof} Nothing False Nothing
+      setTestInvLinkData alice $ ContactShortLinkData aliceProfile {badge = Just otherProof} Nothing False Nothing Nothing
       bob ##> ("/_connect plan 1 " <> shortLink)
       bob <## "invitation link: ok to connect"
       sLinkData <- getTermLine bob
@@ -1139,7 +1145,7 @@ testUserBadgeLinkDataNoProof =
       alice ##> "/_connect 1"
       (shortLink, _) <- getInvitations alice
       let shownBadge = ShownBadge BadgeInfo {badgeType = BTSupporter, badgeExpiry = futureDate, badgeExtra = ""} BSActive
-      setTestInvLinkData alice $ ContactShortLinkData aliceProfile Nothing False (Just shownBadge)
+      setTestInvLinkData alice $ ContactShortLinkData aliceProfile Nothing False Nothing (Just shownBadge)
       bob ##> ("/_connect plan 1 " <> shortLink)
       bob <## "invitation link: ok to connect"
       sLinkData <- getTermLine bob
@@ -3835,7 +3841,7 @@ testSetUITheme =
     alice ##> "/i #team"
     groupInfo alice
   where
-    theme cm = T.unpack $ encodeJSON UIThemeEntityOverrides {light = Nothing, dark = Just $ UIThemeEntityOverride cm Nothing defaultUIColors}
+    theme cm = T.unpack $ encodeJSON UIThemeEntityOverrides {light = Nothing, dark = Just $ UIThemeEntityOverride cm Nothing defaultUIColors, chatLayout = Just CLTerminal}
     userInfo a name = do
       a <## ("user profile: " <> name)
       a <## "use /p <name> [<bio>] to change it"
@@ -3851,6 +3857,163 @@ testSetUITheme =
       a <## "group ID: 1"
       a <## "current members: 1"
 
+testGroupChatLayout :: HasCallStack => TestParams -> IO ()
+testGroupChatLayout =
+  testChat3 aliceProfile bobProfile cathProfile $ \alice bob cath -> do
+    connectUsers alice cath
+    createGroupWithLayout alice "terminal"
+    groupChatLayout alice "team" `shouldReturn` Just CLTerminal
+    addMember "team" alice cath GRAdmin
+    cath ##> "/j team"
+    concurrently_
+      (alice <## "#team: cath joined the group")
+      (cath <## "#team: you joined the group")
+    groupChatLayout cath "team" `shouldReturn` Just CLTerminal
+    alice ##> "/create link #team"
+    (shortLink, fullLink) <- getGroupLinks alice "team" GRMember True
+    alice ##> "/set layout #team classic"
+    alice <## "chat layout changed to: classic"
+    cath <## "alice updated group #team: (signed)"
+    cath <## "chat layout changed to: classic"
+    groupChatLayout alice "team" `shouldReturn` Just CLClassic
+    groupChatLayout cath "team" `shouldReturn` Just CLClassic
+    alice ##> "/group_profile team"
+    alice <## "#team"
+    alice <## "chat layout: classic"
+    alice <## "group preferences:"
+    mapM_ (\((_, feature), _, _) -> alice <## feature) $ groupFeatures_ 0 False
+    bob ##> ("/_connect plan 1 " <> shortLink)
+    bob <## "group link: ok to connect directly"
+    groupSLinkData <- getTermLine bob
+    bob ##> ("/_prepare group 1 " <> fullLink <> " " <> shortLink <> " " <> groupSLinkData)
+    bob <## "#team: group is prepared"
+    groupChatLayout bob "team" `shouldReturn` Just CLClassic
+    alice ##> "/set layout #team default"
+    alice <## "chat layout removed"
+    cath <## "alice updated group #team: (signed)"
+    cath <## "chat layout removed"
+    groupChatLayout alice "team" `shouldReturn` Nothing
+    groupChatLayout cath "team" `shouldReturn` Nothing
+    bob ##> "/_connect group #1"
+    bob <## "#team: connection started"
+    alice <## "bob (Bob): accepting request to join group #team..."
+    concurrentlyN_
+      [ alice <## "#team: bob joined the group",
+        do
+          bob <## "#team: joining the group..."
+          bob <## "#team: you joined the group"
+          bob <## "#team: member cath (Catherine) is connected",
+        do
+          cath <## "#team: alice added bob (Bob) to the group (connecting...)"
+          cath <## "#team: new member bob is connected"
+      ]
+    groupChatLayout bob "team" `shouldReturn` Nothing
+
+createGroupWithLayout :: HasCallStack => TestCC -> String -> IO ()
+createGroupWithLayout cc layout = do
+  cc ##> ("/_group 1 {\"displayName\": \"team\", \"fullName\": \"\", \"groupPreferences\": {\"directMessages\": {\"enable\": \"on\"}, \"history\": {\"enable\": \"on\"}}, \"chatLayout\": \"" <> layout <> "\"}")
+  cc <## "group #team is created"
+  cc <## "to add members use /a team <name> or /create link #team"
+
+testGroupLinkChatLayout :: HasCallStack => TestParams -> IO ()
+testGroupLinkChatLayout =
+  testChat2 aliceProfile bobProfile $ \alice bob -> do
+    createGroupWithLayout alice "terminal"
+    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_
+      [ alice <## "#team: bob joined the group",
+        do
+          bob <## "#team: joining the group..."
+          bob <## "#team: you joined the group"
+      ]
+    groupChatLayout bob "team" `shouldReturn` Just CLTerminal
+
+testUnknownChatLayout :: HasCallStack => TestParams -> IO ()
+testUnknownChatLayout =
+  testChat aliceProfile $ \alice -> do
+    createGroupWithLayout alice "wide"
+    groupChatLayout alice "team" `shouldReturn` Just (CLUnknown "wide")
+
+testAddressChatLayout :: HasCallStack => TestParams -> IO ()
+testAddressChatLayout =
+  testChat2 aliceProfile bobProfile $ \alice bob -> do
+    alice ##> "/ad"
+    (shortLink, fullLink) <- getContactLinks alice True
+    alice ##> "/_address_settings 1 {\"businessAddress\": false, \"autoAccept\": {\"acceptIncognito\": false}, \"chatLayout\": \"terminal\"}"
+    alice <## "auto_accept on"
+    alice <## "chat layout: terminal"
+    bob ##> ("/_connect plan 1 " <> shortLink)
+    bob <## "contact address: ok to connect"
+    contactSLinkData <- getTermLine bob
+    bob ##> ("/_prepare contact 1 " <> fullLink <> " " <> shortLink <> " " <> contactSLinkData)
+    bob <## "alice: contact is prepared"
+    contactChatLayout bob "alice" `shouldReturn` Just CLTerminal
+    bob ##> "/_connect contact @2 text hello"
+    bob
+      <### [ "alice: connection started",
+             WithTime "@alice hello"
+           ]
+    alice <# "bob> hello"
+    alice <## "bob (Bob): accepting contact request..."
+    alice <## "bob (Bob): you can send messages to contact"
+    concurrently_
+      (bob <## "alice (Alice): contact is connected")
+      (alice <## "bob (Bob): contact is connected")
+    contactChatLayout bob "alice" `shouldReturn` Just CLTerminal
+    contactChatLayout alice "bob" `shouldReturn` Nothing
+    alice ##> "/auto_accept on layout=classic"
+    alice <## "auto_accept on"
+    alice <## "chat layout: classic"
+    alice ##> "/auto_accept off"
+    alice <## "auto_accept off"
+    alice <## "chat layout: classic"
+    alice ##> "/auto_accept on business"
+    alice <## "auto_accept on, business"
+    alice <## "chat layout: classic"
+    alice ##> "/auto_accept off layout=default"
+    alice <## "auto_accept off"
+    alice ##> "/_address_settings 1 {\"businessAddress\": false, \"chatLayout\": \"terminal\"}"
+    alice <## "auto_accept off"
+    alice <## "chat layout: terminal"
+    alice ##> "/_address_settings 1 {\"businessAddress\": false}"
+    alice <## "auto_accept off"
+
+testBusinessAddressChatLayout :: HasCallStack => TestParams -> IO ()
+testBusinessAddressChatLayout =
+  testChat3 businessProfile aliceProfile bobProfile $ \biz alice bob -> do
+    biz ##> "/ad"
+    (shortLink, fullLink) <- getContactLinks biz True
+    biz ##> "/auto_accept on business layout=terminal"
+    biz <## "auto_accept on, business"
+    biz <## "chat layout: terminal"
+    bob ##> ("/_connect plan 1 " <> shortLink)
+    bob <## "business address: ok to connect"
+    contactSLinkData <- getTermLine bob
+    bob ##> ("/_prepare contact 1 " <> fullLink <> " " <> shortLink <> " " <> contactSLinkData)
+    bob <## "#biz: group is prepared"
+    groupChatLayout bob "biz" `shouldReturn` Just CLTerminal
+    bob ##> "/_connect group #1"
+    bob <## "#biz: connection started"
+    biz <## "#bob (Bob): accepting business address request..."
+    bob <## "#biz: joining the group..."
+    concurrently_
+      (biz <## "#bob: bob_1 joined the group")
+      (bob <## "#biz: you joined the group")
+    groupChatLayout bob "biz" `shouldReturn` Just CLTerminal
+    groupChatLayout biz "bob" `shouldReturn` Nothing
+    alice ##> ("/c " <> fullLink)
+    alice <## "connection request sent!"
+    biz <## "#alice (Alice): accepting business address request..."
+    alice <## "#biz: joining the group..."
+    concurrently_
+      (biz <## "#alice: alice_1 joined the group")
+      (alice <## "#biz: you joined the group")
+    groupChatLayout alice "biz" `shouldReturn` Just CLTerminal
+
 testShortLinkInvitation :: HasCallStack => TestParams -> IO ()
 testShortLinkInvitation =
   testChatOpts2 testOptsNoFullLinks aliceProfile bobProfile $ \alice bob -> do
@@ -5148,14 +5311,24 @@ testShortLinkInvitationChangeUser = testChat2 aliceProfile bobProfile test
         <### [ "alisa: connection started",
                WithTime "@alisa hello"
              ]
-      concurrently_
-        (bob <## "alisa: contact is connected")
-        ( alice
-            <### [ WithTime "bob> hello",
-                   "bob (Bob): contact is connected"
-                 ]
-        )
-      alice <##> bob
+      (_, connectedFirst) <-
+        concurrently
+          (bob <## "alisa: contact is connected")
+          ( getTermLine alice >>= \case
+              "bob (Bob): contact is connected" -> do
+                alice <## "bob: standard end-to-end encryption enabled"
+                alice <# "bob> hello"
+                pure True
+              l -> do
+                dropTime l `shouldBe` "bob> hello"
+                alice <## "bob (Bob): contact is connected"
+                pure False
+          )
+      alice #> "@bob hi"
+      bob <# "alisa> hi"
+      bob #> "@alisa hey"
+      when connectedFirst $ alice <## "bob: quantum resistant end-to-end encryption enabled"
+      alice <# "bob> hey"
 
 testShortLinkAddressChangeProfile :: HasCallStack => TestParams -> IO ()
 testShortLinkAddressChangeProfile = testChat2 aliceProfile bobProfile test
diff --git a/tests/ChatTests/Utils.hs b/tests/ChatTests/Utils.hs
index c1f58aa525..a410d80ad3 100644
--- a/tests/ChatTests/Utils.hs
+++ b/tests/ChatTests/Utils.hs
@@ -33,9 +33,11 @@ import Simplex.Chat.Store.Direct (getContact, getContactIdByName, getContactRequ
 import Simplex.Chat.Store.Groups (getGroupIdByName, getGroupMember, getGroupMemberIdByName)
 import Simplex.Chat.Store.NoteFolders (createNoteFolder)
 import Simplex.Chat.Store.Profiles (getUserContactProfiles)
+import Simplex.Chat.Store.Shared (getGroupInfo)
 import Simplex.Chat.Types
 import Simplex.Chat.Types.Preferences
 import Simplex.Chat.Types.Shared
+import Simplex.Chat.Types.UITheme (ChatLayout)
 import Simplex.FileTransfer.Description (FileSize (..))
 import Simplex.Messaging.Agent.Client (agentClientStore)
 import Simplex.Messaging.Agent.Store.AgentStore (maybeFirstRow, withTransaction)
@@ -729,6 +731,20 @@ getTestCCContact cc contactId = do
     withCCUser cc $ \user ->
       runExceptT (getContact db (storeCxt chatController) user contactId) >>= either (fail . show) pure
 
+contactChatLayout :: TestCC -> ContactName -> IO (Maybe ChatLayout)
+contactChatLayout cc cName =
+  withCCTransaction cc $ \db ->
+    withCCUser cc $ \user ->
+      runExceptT (getContact db (storeCxt $ chatController cc) user =<< getContactIdByName db user cName)
+        >>= either (fail . show) (\Contact {chatLayout} -> pure chatLayout)
+
+groupChatLayout :: TestCC -> GroupName -> IO (Maybe ChatLayout)
+groupChatLayout cc gName =
+  withCCTransaction cc $ \db ->
+    withCCUser cc $ \user ->
+      runExceptT (getGroupInfo db (storeCxt $ chatController cc) user =<< getGroupIdByName db user gName)
+        >>= either (fail . show) (\GroupInfo {groupProfile = GroupProfile {chatLayout}} -> pure chatLayout)
+
 contactBadgeHeader :: TestCC -> ContactName -> IO (Maybe (String, BadgeStatus))
 contactBadgeHeader cc cName =
   withCCTransaction cc $ \db ->
diff --git a/tests/ProtocolTests.hs b/tests/ProtocolTests.hs
index 79415071f7..c93b9ee7ad 100644
--- a/tests/ProtocolTests.hs
+++ b/tests/ProtocolTests.hs
@@ -21,6 +21,7 @@ import Simplex.Chat.Protocol
 import Simplex.Chat.Types
 import Simplex.Chat.Types.Preferences
 import Simplex.Chat.Types.Shared
+import Simplex.Chat.Types.UITheme (ChatLayout (..))
 import Simplex.Messaging.Agent.Protocol
 import Simplex.Messaging.Compression (compress1)
 import qualified Simplex.Messaging.Crypto as C
@@ -194,7 +195,7 @@ testProfile :: Profile
 testProfile = Profile {displayName = "alice", fullName = "Alice", shortDescr = Nothing, description = Nothing, image = Just (ImageData "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII="), peerType = Nothing, contactLink = Nothing, preferences = testChatPreferences, badge = Nothing, contactDomain = Nothing}
 
 testGroupProfile :: GroupProfile
-testGroupProfile = GroupProfile {displayName = "team", fullName = "Team", description = Nothing, shortDescr = Nothing, image = Nothing, publicGroup = Nothing, groupPreferences = testGroupPreferences, memberAdmission = Nothing}
+testGroupProfile = GroupProfile {displayName = "team", fullName = "Team", description = Nothing, shortDescr = Nothing, image = Nothing, publicGroup = Nothing, groupPreferences = testGroupPreferences, memberAdmission = Nothing, chatLayout = Nothing}
 
 shortLinkDataTests :: Spec
 shortLinkDataTests = describe "Short link data encoding/decoding" $ do
@@ -353,6 +354,12 @@ decodeChatMessageTest = describe "Chat message encoding/decoding" $ do
   it "x.grp.inv with group link id" $
     "{\"v\":\"9\",\"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%3D3%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, fromMemberKey = Nothing, 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.info with chat layout" $
+    "{\"v\":\"9\",\"event\":\"x.grp.info\",\"params\":{\"groupProfile\":{\"fullName\":\"Team\",\"displayName\":\"team\",\"groupPreferences\":{\"reactions\":{\"enable\":\"on\"},\"voice\":{\"enable\":\"on\"}},\"chatLayout\":\"terminal\"}}}"
+      #==# XGrpInfo (testGroupProfile {chatLayout = Just CLTerminal} :: GroupProfile)
+  it "x.grp.info with unknown chat layout" $
+    "{\"v\":\"9\",\"event\":\"x.grp.info\",\"params\":{\"groupProfile\":{\"fullName\":\"Team\",\"displayName\":\"team\",\"groupPreferences\":{\"reactions\":{\"enable\":\"on\"},\"voice\":{\"enable\":\"on\"}},\"chatLayout\":\"wide\"}}}"
+      #==# XGrpInfo (testGroupProfile {chatLayout = Just $ CLUnknown "wide"} :: GroupProfile)
   it "x.grp.acpt without incognito profile" $
     "{\"v\":\"9\",\"event\":\"x.grp.acpt\",\"params\":{\"memberId\":\"AQIDBA==\"}}"
       #==# XGrpAcpt (MemberId "\1\2\3\4") Nothing Nothing
diff --git a/tests/SchemaDump.hs b/tests/SchemaDump.hs
index fecebfc8b2..5b206f2ef8 100644
--- a/tests/SchemaDump.hs
+++ b/tests/SchemaDump.hs
@@ -103,7 +103,7 @@ testSchemaMigrations = do
 
 testVerifyStrict :: IO ()
 testVerifyStrict = do
-  Right st <- createDBStore (DBOpts testDB chatDBFunctions "" False True TQOff) Store.migrations (MigrationConfig MCConsole Nothing)
+  Right st <- createDBStore (DBOpts testDB chatDBFunctions "" False True TQOff) Store.migrations (MigrationConfig MCError Nothing)
   withConnection st (`DB.query_` "SELECT name FROM sqlite_master WHERE type = 'table' AND name != 'sqlite_sequence' AND sql NOT LIKE '% STRICT'")
     `shouldReturn` ([] :: [Only Text])