feat: Do not copy Auto-Submitted header into outer part

Before, copying Auto-Submitted to the outer headers was needed for moving such messages, e.g. multi-device sync messages, to the DeltaChat folder. Now all encrypted messages are moved.
feat: Do not copy Chat-Version header into outer part
2026-04-06 15:42:10 +03:00 · 2025-11-10 06:08:52 -03:00 · 2025-11-10 05:34:31 -03:00 · 2025-11-10 05:34:31 -03:00 · 2025-11-10 05:34:31 -03:00 · 2025-11-10 05:32:40 -03:00
171 changed files with 6039 additions and 11692 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,18 +20,17 @@ permissions: {}

 env:
  RUSTFLAGS: -Dwarnings
-  RUST_VERSION: 1.92.0
+  RUST_VERSION: 1.91.0

  # Minimum Supported Rust Version
-  MSRV: 1.88.0
+  MSRV: 1.85.0

 jobs:
  lint_rust:
    name: Lint Rust
    runs-on: ubuntu-latest
-    timeout-minutes: 60
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false
@@ -40,7 +39,7 @@ jobs:
      - run: rustup override set $RUST_VERSION
        shell: bash
      - name: Cache rust cargo artifacts
-        uses: swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5
+        uses: swatinem/rust-cache@v2
      - name: Run rustfmt
        run: cargo fmt --all -- --check
      - name: Run clippy
@@ -53,13 +52,12 @@ jobs:
  cargo_deny:
    name: cargo deny
    runs-on: ubuntu-latest
-    timeout-minutes: 60
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false
-      - uses: EmbarkStudios/cargo-deny-action@76cd80eb775d7bbbd2d80292136d74d39e1b4918
+      - uses: EmbarkStudios/cargo-deny-action@v2
        with:
          arguments: --all-features --workspace
          command: check
@@ -68,9 +66,8 @@ jobs:
  provider_database:
    name: Check provider database
    runs-on: ubuntu-latest
-    timeout-minutes: 60
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false
@@ -82,16 +79,15 @@ jobs:
  docs:
    name: Rust doc comments
    runs-on: ubuntu-latest
-    timeout-minutes: 60
    env:
      RUSTDOCFLAGS: -Dwarnings
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false
      - name: Cache rust cargo artifacts
-        uses: swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5
+        uses: swatinem/rust-cache@v2
      - name: Rustdoc
        run: cargo doc --document-private-items --no-deps

@@ -111,7 +107,6 @@ jobs:
          - os: ubuntu-latest
            rust: minimum
    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
    steps:
      - run:
          echo "RUSTUP_TOOLCHAIN=$MSRV" >> $GITHUB_ENV
@@ -122,7 +117,7 @@ jobs:
        shell: bash
        if: matrix.rust == 'latest'

-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false
@@ -134,10 +129,10 @@ jobs:
        shell: bash

      - name: Cache rust cargo artifacts
-        uses: swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5
+        uses: swatinem/rust-cache@v2

      - name: Install nextest
-        uses: taiki-e/install-action@69e777b377e4ec209ddad9426ae3e0c1008b0ef3
+        uses: taiki-e/install-action@v2
        with:
          tool: nextest

@@ -160,21 +155,20 @@ jobs:
      matrix:
        os: [ubuntu-latest, macos-latest]
    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false

      - name: Cache rust cargo artifacts
-        uses: swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5
+        uses: swatinem/rust-cache@v2

      - name: Build C library
        run: cargo build -p deltachat_ffi

      - name: Upload C library
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: ${{ matrix.os }}-libdeltachat.a
          path: target/debug/libdeltachat.a
@@ -186,21 +180,20 @@ jobs:
      matrix:
        os: [ubuntu-latest, macos-latest, windows-latest]
    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false

      - name: Cache rust cargo artifacts
-        uses: swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5
+        uses: swatinem/rust-cache@v2

      - name: Build deltachat-rpc-server
        run: cargo build -p deltachat-rpc-server

      - name: Upload deltachat-rpc-server
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: ${{ matrix.os }}-deltachat-rpc-server
          path: ${{ matrix.os == 'windows-latest' && 'target/debug/deltachat-rpc-server.exe' || 'target/debug/deltachat-rpc-server' }}
@@ -209,9 +202,8 @@ jobs:
  python_lint:
    name: Python lint
    runs-on: ubuntu-latest
-    timeout-minutes: 60
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false
@@ -227,38 +219,6 @@ jobs:
        working-directory: deltachat-rpc-client
        run: tox -e lint

-  # mypy does not work with PyPy since mypy 1.19
-  # as it introduced native `librt` dependency
-  # that uses CPython internals.
-  # We only run mypy with CPython because of this.
-  cffi_python_mypy:
-    name: CFFI Python mypy
-    needs: ["c_library", "python_lint"]
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          show-progress: false
-          persist-credentials: false
-
-      - name: Download libdeltachat.a
-        uses: actions/download-artifact@v7
-        with:
-          name: ubuntu-latest-libdeltachat.a
-          path: target/debug
-
-      - name: Install tox
-        run: pip install tox
-
-      - name: Run mypy
-        env:
-          DCC_RS_TARGET: debug
-          DCC_RS_DEV: ${{ github.workspace }}
-        working-directory: python
-        run: tox -e mypy
-
-
  cffi_python_tests:
    name: CFFI Python tests
    needs: ["c_library", "python_lint"]
@@ -278,22 +238,21 @@ jobs:
          - os: macos-latest
            python: pypy3.10

-          # Minimum Supported Python Version = 3.10
+          # Minimum Supported Python Version = 3.8
          # This is the minimum version for which manylinux Python wheels are
          # built. Test it with minimum supported Rust version.
          - os: ubuntu-latest
-            python: "3.10"
+            python: 3.8

    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false

      - name: Download libdeltachat.a
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: ${{ matrix.os }}-libdeltachat.a
          path: target/debug
@@ -312,7 +271,7 @@ jobs:
          DCC_RS_TARGET: debug
          DCC_RS_DEV: ${{ github.workspace }}
        working-directory: python
-        run: tox -e doc,py
+        run: tox -e mypy,doc,py

  rpc_python_tests:
    name: JSON-RPC Python tests
@@ -334,14 +293,13 @@ jobs:
          - os: macos-latest
            python: pypy3.10

-          # Minimum Supported Python Version = 3.10
+          # Minimum Supported Python Version = 3.8
          - os: ubuntu-latest
-            python: "3.10"
+            python: 3.8

    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false
@@ -355,7 +313,7 @@ jobs:
        run: pip install tox

      - name: Download deltachat-rpc-server
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: ${{ matrix.os }}-deltachat-rpc-server
          path: target/debug
--- a/.github/workflows/deltachat-rpc-server.yml
+++ b/.github/workflows/deltachat-rpc-server.yml
@@ -30,46 +30,22 @@ jobs:
        arch: [aarch64, armv7l, armv6l, i686, x86_64]
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false
-      - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
+      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31

      - name: Build deltachat-rpc-server binaries
        run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-linux

      - name: Upload binary
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: deltachat-rpc-server-${{ matrix.arch }}-linux
          path: result/bin/deltachat-rpc-server
          if-no-files-found: error

-  build_linux_wheel:
-    name: Linux wheel
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: [aarch64, armv7l, armv6l, i686, x86_64]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          show-progress: false
-          persist-credentials: false
-      - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
-
-      - name: Build deltachat-rpc-server wheels
-        run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-linux-wheel
-
-      - name: Upload wheel
-        uses: actions/upload-artifact@v6
-        with:
-          name: deltachat-rpc-server-${{ matrix.arch }}-linux-wheel
-          path: result/*.whl
-          if-no-files-found: error
-
  build_windows:
    name: Windows
    strategy:
@@ -78,46 +54,22 @@ jobs:
        arch: [win32, win64]
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false
-      - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
+      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31

      - name: Build deltachat-rpc-server binaries
        run: nix build .#deltachat-rpc-server-${{ matrix.arch }}

      - name: Upload binary
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: deltachat-rpc-server-${{ matrix.arch }}
          path: result/bin/deltachat-rpc-server.exe
          if-no-files-found: error

-  build_windows_wheel:
-    name: Windows wheel
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: [win32, win64]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          show-progress: false
-          persist-credentials: false
-      - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
-
-      - name: Build deltachat-rpc-server wheels
-        run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-wheel
-
-      - name: Upload wheel
-        uses: actions/upload-artifact@v6
-        with:
-          name: deltachat-rpc-server-${{ matrix.arch }}-wheel
-          path: result/*.whl
-          if-no-files-found: error
-
  build_macos:
    name: macOS
    strategy:
@@ -127,7 +79,7 @@ jobs:

    runs-on: macos-latest
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false
@@ -139,7 +91,7 @@ jobs:
        run: cargo build --release --package deltachat-rpc-server --target ${{ matrix.arch }}-apple-darwin --features vendored

      - name: Upload binary
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: deltachat-rpc-server-${{ matrix.arch }}-macos
          path: target/${{ matrix.arch }}-apple-darwin/release/deltachat-rpc-server
@@ -153,49 +105,25 @@ jobs:
        arch: [arm64-v8a, armeabi-v7a]
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false
-      - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
+      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31

      - name: Build deltachat-rpc-server binaries
        run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-android

      - name: Upload binary
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: deltachat-rpc-server-${{ matrix.arch }}-android
          path: result/bin/deltachat-rpc-server
          if-no-files-found: error

-  build_android_wheel:
-    name: Android wheel
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: [arm64-v8a, armeabi-v7a]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          show-progress: false
-          persist-credentials: false
-      - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
-
-      - name: Build deltachat-rpc-server wheels
-        run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-android-wheel
-
-      - name: Upload wheel
-        uses: actions/upload-artifact@v6
-        with:
-          name: deltachat-rpc-server-${{ matrix.arch }}-android-wheel
-          path: result/*.whl
-          if-no-files-found: error
-
  publish:
    name: Build wheels and upload binaries to the release
-    needs: ["build_linux", "build_linux_wheel", "build_windows", "build_windows_wheel", "build_macos", "build_android", "build_android_wheel"]
+    needs: ["build_linux", "build_windows", "build_macos"]
    environment:
      name: pypi
      url: https://pypi.org/p/deltachat-rpc-server
@@ -204,132 +132,78 @@ jobs:
      contents: write
    runs-on: "ubuntu-latest"
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false
-      - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
+      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31

      - name: Download Linux aarch64 binary
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: deltachat-rpc-server-aarch64-linux
          path: deltachat-rpc-server-aarch64-linux.d

-      - name: Download Linux aarch64 wheel
-        uses: actions/download-artifact@v7
-        with:
-          name: deltachat-rpc-server-aarch64-linux-wheel
-          path: deltachat-rpc-server-aarch64-linux-wheel.d
-
      - name: Download Linux armv7l binary
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: deltachat-rpc-server-armv7l-linux
          path: deltachat-rpc-server-armv7l-linux.d

-      - name: Download Linux armv7l wheel
-        uses: actions/download-artifact@v7
-        with:
-          name: deltachat-rpc-server-armv7l-linux-wheel
-          path: deltachat-rpc-server-armv7l-linux-wheel.d
-
      - name: Download Linux armv6l binary
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: deltachat-rpc-server-armv6l-linux
          path: deltachat-rpc-server-armv6l-linux.d

-      - name: Download Linux armv6l wheel
-        uses: actions/download-artifact@v7
-        with:
-          name: deltachat-rpc-server-armv6l-linux-wheel
-          path: deltachat-rpc-server-armv6l-linux-wheel.d
-
      - name: Download Linux i686 binary
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: deltachat-rpc-server-i686-linux
          path: deltachat-rpc-server-i686-linux.d

-      - name: Download Linux i686 wheel
-        uses: actions/download-artifact@v7
-        with:
-          name: deltachat-rpc-server-i686-linux-wheel
-          path: deltachat-rpc-server-i686-linux-wheel.d
-
      - name: Download Linux x86_64 binary
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: deltachat-rpc-server-x86_64-linux
          path: deltachat-rpc-server-x86_64-linux.d

-      - name: Download Linux x86_64 wheel
-        uses: actions/download-artifact@v7
-        with:
-          name: deltachat-rpc-server-x86_64-linux-wheel
-          path: deltachat-rpc-server-x86_64-linux-wheel.d
-
      - name: Download Win32 binary
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: deltachat-rpc-server-win32
          path: deltachat-rpc-server-win32.d

-      - name: Download Win32 wheel
-        uses: actions/download-artifact@v7
-        with:
-          name: deltachat-rpc-server-win32-wheel
-          path: deltachat-rpc-server-win32-wheel.d
-
      - name: Download Win64 binary
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: deltachat-rpc-server-win64
          path: deltachat-rpc-server-win64.d

-      - name: Download Win64 wheel
-        uses: actions/download-artifact@v7
-        with:
-          name: deltachat-rpc-server-win64-wheel
-          path: deltachat-rpc-server-win64-wheel.d
-
      - name: Download macOS binary for x86_64
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: deltachat-rpc-server-x86_64-macos
          path: deltachat-rpc-server-x86_64-macos.d

      - name: Download macOS binary for aarch64
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: deltachat-rpc-server-aarch64-macos
          path: deltachat-rpc-server-aarch64-macos.d

      - name: Download Android binary for arm64-v8a
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: deltachat-rpc-server-arm64-v8a-android
          path: deltachat-rpc-server-arm64-v8a-android.d

-      - name: Download Android wheel for arm64-v8a
-        uses: actions/download-artifact@v7
-        with:
-          name: deltachat-rpc-server-arm64-v8a-android-wheel
-          path: deltachat-rpc-server-arm64-v8a-android-wheel.d
-
      - name: Download Android binary for armeabi-v7a
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: deltachat-rpc-server-armeabi-v7a-android
          path: deltachat-rpc-server-armeabi-v7a-android.d

-      - name: Download Android wheel for armeabi-v7a
-        uses: actions/download-artifact@v7
-        with:
-          name: deltachat-rpc-server-armeabi-v7a-android-wheel
-          path: deltachat-rpc-server-armeabi-v7a-android-wheel.d
-
      - name: Create bin/ directory
        run: |
          mkdir -p bin
@@ -348,21 +222,38 @@ jobs:
      - name: List binaries
        run: ls -l bin/

+      # Python 3.11 is needed for tomllib used in scripts/wheel-rpc-server.py
+      - name: Install python 3.12
+        uses: actions/setup-python@v6
+        with:
+          python-version: 3.12
+
      - name: Install wheel
        run: pip install wheel

-      - name: Build deltachat-rpc-server Python wheels
+      - name: Build deltachat-rpc-server Python wheels and source package
        run: |
          mkdir -p dist
-          mv deltachat-rpc-server-aarch64-linux-wheel.d/*.whl dist/
-          mv deltachat-rpc-server-armv7l-linux-wheel.d/*.whl dist/
-          mv deltachat-rpc-server-armv6l-linux-wheel.d/*.whl dist/
-          mv deltachat-rpc-server-i686-linux-wheel.d/*.whl dist/
-          mv deltachat-rpc-server-x86_64-linux-wheel.d/*.whl dist/
-          mv deltachat-rpc-server-win64-wheel.d/*.whl dist/
-          mv deltachat-rpc-server-win32-wheel.d/*.whl dist/
-          mv deltachat-rpc-server-arm64-v8a-android-wheel.d/*.whl dist/
-          mv deltachat-rpc-server-armeabi-v7a-android-wheel.d/*.whl dist/
+          nix build .#deltachat-rpc-server-x86_64-linux-wheel
+          cp result/*.whl dist/
+          nix build .#deltachat-rpc-server-armv7l-linux-wheel
+          cp result/*.whl dist/
+          nix build .#deltachat-rpc-server-armv6l-linux-wheel
+          cp result/*.whl dist/
+          nix build .#deltachat-rpc-server-aarch64-linux-wheel
+          cp result/*.whl dist/
+          nix build .#deltachat-rpc-server-i686-linux-wheel
+          cp result/*.whl dist/
+          nix build .#deltachat-rpc-server-win64-wheel
+          cp result/*.whl dist/
+          nix build .#deltachat-rpc-server-win32-wheel
+          cp result/*.whl dist/
+          nix build .#deltachat-rpc-server-arm64-v8a-android-wheel
+          cp result/*.whl dist/
+          nix build .#deltachat-rpc-server-armeabi-v7a-android-wheel
+          cp result/*.whl dist/
+          nix build .#deltachat-rpc-server-source
+          cp result/*.tar.gz dist/
          python3 scripts/wheel-rpc-server.py x86_64-darwin bin/deltachat-rpc-server-x86_64-macos
          python3 scripts/wheel-rpc-server.py aarch64-darwin bin/deltachat-rpc-server-aarch64-macos
          mv *.whl dist/
@@ -380,24 +271,21 @@ jobs:
            --repo ${{ github.repository }} \
            bin/* dist/*

-      - name: Publish deltachat-rpc-server to PyPI
+      - name: Publish deltachat-rpc-client to PyPI
        if: github.event_name == 'release'
-        uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e
+        uses: pypa/gh-action-pypi-publish@release/v1

  publish_npm_package:
    name: Build & Publish npm prebuilds and deltachat-rpc-server
    needs: ["build_linux", "build_windows", "build_macos"]
    runs-on: "ubuntu-latest"
-    environment:
-      name: npm-stdio-rpc-server
-      url: https://www.npmjs.com/package/@deltachat/stdio-rpc-server
    permissions:
      id-token: write

      # Needed to publish the binaries to the release.
      contents: write
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false
@@ -406,67 +294,67 @@ jobs:
          python-version: "3.11"

      - name: Download Linux aarch64 binary
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: deltachat-rpc-server-aarch64-linux
          path: deltachat-rpc-server-aarch64-linux.d

      - name: Download Linux armv7l binary
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: deltachat-rpc-server-armv7l-linux
          path: deltachat-rpc-server-armv7l-linux.d

      - name: Download Linux armv6l binary
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: deltachat-rpc-server-armv6l-linux
          path: deltachat-rpc-server-armv6l-linux.d

      - name: Download Linux i686 binary
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: deltachat-rpc-server-i686-linux
          path: deltachat-rpc-server-i686-linux.d

      - name: Download Linux x86_64 binary
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: deltachat-rpc-server-x86_64-linux
          path: deltachat-rpc-server-x86_64-linux.d

      - name: Download Win32 binary
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: deltachat-rpc-server-win32
          path: deltachat-rpc-server-win32.d

      - name: Download Win64 binary
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: deltachat-rpc-server-win64
          path: deltachat-rpc-server-win64.d

      - name: Download macOS binary for x86_64
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: deltachat-rpc-server-x86_64-macos
          path: deltachat-rpc-server-x86_64-macos.d

      - name: Download macOS binary for aarch64
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: deltachat-rpc-server-aarch64-macos
          path: deltachat-rpc-server-aarch64-macos.d

      - name: Download Android binary for arm64-v8a
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: deltachat-rpc-server-arm64-v8a-android
          path: deltachat-rpc-server-arm64-v8a-android.d

      - name: Download Android binary for armeabi-v7a
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: deltachat-rpc-server-armeabi-v7a-android
          path: deltachat-rpc-server-armeabi-v7a-android.d
@@ -496,7 +384,7 @@ jobs:
          ls -lah

      - name: Upload to artifacts
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: deltachat-rpc-server-npm-package
          path: deltachat-rpc-server/npm-package/*.tgz
@@ -518,14 +406,11 @@ jobs:
          node-version: 20
          registry-url: "https://registry.npmjs.org"

-      # Ensure npm 11.5.1 or later is installed.
-      # It is needed for <https://docs.npmjs.com/trusted-publishers>
-      - name: Update npm
-        run: npm install -g npm@latest
-
      - name: Publish npm packets for prebuilds and `@deltachat/stdio-rpc-server`
        if: github.event_name == 'release'
        working-directory: deltachat-rpc-server/npm-package
        run: |
          ls -lah platform_package
          for platform in *.tgz; do npm publish --provenance "$platform" --access public; done
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
--- a/.github/workflows/jsonrpc-client-npm-package.yml
+++ b/.github/workflows/jsonrpc-client-npm-package.yml
@@ -10,14 +10,11 @@ jobs:
  pack-module:
    name: "Publish @deltachat/jsonrpc-client"
    runs-on: ubuntu-latest
-    environment:
-      name: npm-jsonrpc-client
-      url: https://www.npmjs.com/package/@deltachat/jsonrpc-client
    permissions:
      id-token: write
      contents: read
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false
@@ -27,11 +24,6 @@ jobs:
          node-version: 20
          registry-url: "https://registry.npmjs.org"

-      # Ensure npm 11.5.1 or later is installed.
-      # It is needed for <https://docs.npmjs.com/trusted-publishers>
-      - name: Update npm
-        run: npm install -g npm@latest
-
      - name: Install dependencies without running scripts
        working-directory: deltachat-jsonrpc/typescript
        run: npm install --ignore-scripts
@@ -45,3 +37,5 @@ jobs:
      - name: Publish
        working-directory: deltachat-jsonrpc/typescript
        run: npm publish --provenance deltachat-jsonrpc-client-* --access public
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
--- a/.github/workflows/jsonrpc.yml
+++ b/.github/workflows/jsonrpc.yml
@@ -16,7 +16,7 @@ jobs:
  build_and_test:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false
@@ -25,7 +25,7 @@ jobs:
        with:
          node-version: 18.x
      - name: Add Rust cache
-        uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5
+        uses: Swatinem/rust-cache@v2
      - name: npm install
        working-directory: deltachat-jsonrpc/typescript
        run: npm install
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -21,11 +21,11 @@ jobs:
    name: check flake formatting
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false
-      - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
+      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
      - run: nix fmt flake.nix -- --check

  build:
@@ -80,11 +80,11 @@ jobs:
          #- deltachat-rpc-server-x86_64-android
          #- deltachat-rpc-server-x86-android
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false
-      - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
+      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
      - run: nix build .#${{ matrix.installable }}

  build-macos:
@@ -101,9 +101,9 @@ jobs:
          # because of <https://github.com/NixOS/nixpkgs/issues/413910>.
          # - deltachat-rpc-server-aarch64-darwin
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false
-      - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
+      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
      - run: nix build .#${{ matrix.installable }}
--- a/.github/workflows/publish-deltachat-rpc-client-pypi.yml
+++ b/.github/workflows/publish-deltachat-rpc-client-pypi.yml
@@ -13,7 +13,7 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false
@@ -23,7 +23,7 @@ jobs:
        working-directory: deltachat-rpc-client
        run: python3 -m build
      - name: Store the distribution packages
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: python-package-distributions
          path: deltachat-rpc-client/dist/
@@ -42,9 +42,9 @@ jobs:

    steps:
      - name: Download all the dists
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: python-package-distributions
          path: dist/
      - name: Publish deltachat-rpc-client to PyPI
-        uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e
+        uses: pypa/gh-action-pypi-publish@release/v1
--- a/.github/workflows/repl.yml
+++ b/.github/workflows/repl.yml
@@ -14,15 +14,15 @@ jobs:
    name: Build REPL example
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false
-      - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
+      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
      - name: Build
        run: nix build .#deltachat-repl-win64
      - name: Upload binary
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: repl.exe
          path: "result/bin/deltachat-repl.exe"
--- a/.github/workflows/upload-docs.yml
+++ b/.github/workflows/upload-docs.yml
@@ -13,7 +13,7 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false
@@ -31,12 +31,12 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false
          fetch-depth: 0 # Fetch history to calculate VCS version number.
-      - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
+      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
      - name: Build Python documentation
        run: nix build .#python-docs
      - name: Upload to py.delta.chat
@@ -50,12 +50,12 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false
          fetch-depth: 0 # Fetch history to calculate VCS version number.
-      - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
+      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
      - name: Build C documentation
        run: nix build .#docs
      - name: Upload to c.delta.chat
@@ -72,7 +72,7 @@ jobs:
        working-directory: ./deltachat-jsonrpc/typescript

    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false
--- a/.github/workflows/upload-ffi-docs.yml
+++ b/.github/workflows/upload-ffi-docs.yml
@@ -16,7 +16,7 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
        with:
          show-progress: false
          persist-credentials: false
--- a/.github/workflows/zizmor-scan.yml
+++ b/.github/workflows/zizmor-scan.yml
@@ -14,12 +14,12 @@ jobs:
      security-events: write
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
        with:
          persist-credentials: false

      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867
+        uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41

      - name: Run zizmor
        run: uvx zizmor --format sarif . > results.sarif
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,489 +1,5 @@
 # Changelog

-## [2.38.0] - 2026-01-22
-
-### API-Changes
-
- [**breaking**] Jsonrpc: remove `contacts` from `FullChat`. To migrate load contacts on demand via `get_contacts_by_ids` using `FullChat.contactIds` ([#7282](https://github.com/chatmail/core/pull/7282)).
- jsonrpc: Add run_until parameter for bots ([#7688](https://github.com/chatmail/core/pull/7688)).
- rust, jsonrpc: Add `get_message_read_receipt_count` method ([#7732](https://github.com/chatmail/core/pull/7732)).
- rust and jsonrpc: Marknoticed_all_chats method to mark all chats as notices, including muted ones. ([#7709](https://github.com/chatmail/core/pull/7709)).
- Public re-export of Connectivity ([#7737](https://github.com/chatmail/core/pull/7737)).
-
-### Documentation
-
- Fix chat types.
- Set_config_from_qr() configures context for "DCACCOUNT:" and "DCLOGIN:" QRs ([#7450](https://github.com/chatmail/core/pull/7450)).
- Fix formatting of `indoc!` link.
-
-### Features / Changes
-
- Pre-messages / next version of download on demand ([#7371](https://github.com/chatmail/core/pull/7371)).
- Connectivity view: move quota up and combine with IMAP state. ([#7653](https://github.com/chatmail/core/pull/7653)).
- Execute sync message before checking for primary transport update.
- Disable partial search by contact address.
- Don't put text into post-message ([#7714](https://github.com/chatmail/core/pull/7714)).
- Don't scale up Origin of multiple and broadcast recipients when sending a message.
- pgp: Use preferred hash algorithm for signing instead of hardcoded SHA256.
- In teamprofiles, don't mark chat as read on outgoing message ([#7717](https://github.com/chatmail/core/pull/7717)).
- Send and apply MDNs to self ([#7005](https://github.com/chatmail/core/pull/7005))
-
-### Fixes
-
- Do not show contact address in message info ([#7695](https://github.com/chatmail/core/pull/7695)).
- Take transport_id into account when marking messages with \Seen flags.
- Send bcc-self messages to all own relays ([#7656](https://github.com/chatmail/core/pull/7656)).
- Only emit TransportsModified if transports are really modified.
- Logging errors in deltachat-rpc-server during startup ([#7707](https://github.com/chatmail/core/pull/7707)).
- Use only lowercase letters for stats id ([#7700](https://github.com/chatmail/core/pull/7700)).
- Hide incoming broadcasts in `DC_GCL_FOR_FORWARDING` ([#7726](https://github.com/chatmail/core/pull/7726)).
- Do not resolve ICE server hostnames during IMAP loop.
- More reliable parsing of `dclogin:` links with ip address as host ([#7734](https://github.com/chatmail/core/pull/7734)).
- Don't remember old channel members in the database ([#7716](https://github.com/chatmail/core/pull/7716)).
- Make it possible to leave and immediately delete a chat ([#7744](https://github.com/chatmail/core/pull/7744)).
- Emit MsgsChanged instead of MsgsNoticed on self-MDN if chat still has fresh messages.
- Prevent possible infinite loop with invalid `smtp` row ([#7746](https://github.com/chatmail/core/pull/7746)).
- Sync broadcast subscribers list ([#7578](https://github.com/chatmail/core/pull/7578))
-
-### Refactor
-
- Don't use `concat!` in sql statements ([#7720](https://github.com/chatmail/core/pull/7720)).
-
-### Tests
-
- Port test_dont_move_sync_msgs to JSON-RPC ([#7676](https://github.com/chatmail/core/pull/7676)).
- rpc-client: Replace remaining print()s with `logging` ([#6082](https://github.com/chatmail/core/pull/6082)).
-
-## [2.37.0] - 2026-01-08
-
-### API-Changes
-
- JSON-RPC API `get_all_ui_config_keys` to get all "ui.*" config keys ([#7579](https://github.com/chatmail/core/pull/7579)).
- Add `who_can_call_me` config option.
- cffi api to create account manager with existing events channel to see events emitted during startup. `dc_event_channel_new`, `dc_event_channel_unref`, `dc_event_channel_get_event_emitter` and `dc_accounts_new_with_event_channel` ([#7609](https://github.com/chatmail/core/pull/7609)).
-
-### Features / Changes
-
- Config option to skip seen synchronization ([#7694](https://github.com/chatmail/core/pull/7694)).
- More text instead of sender in channel summary.
-
-### Fixes
-
- Do not rely on Secure-Join header to detect {vc,vg}-request.
-
-### Documentation
-
- Update instructions to UI where to display the address.
-
-### Miscellaneous Tasks
-
- cargo: bump rsa from 0.9.9 to 0.9.10.
- Update lru 0.12.3 to 0.12.5 and add RUSTSEC-2026-0002 exception.
-
-### Refactor
-
- ffi: Replace implicit drop in cffi with explicit `drop(Arc::from_raw(var))` ([#7664](https://github.com/chatmail/core/pull/7664)).
-
-### Tests
-
- Regression test for vc-request encrypted by the server.
- Test that channel summary does not have sender name.
-
-## [2.36.0] - 2026-01-03
-
-### CI
-
- Pin GitHub Action references.
-
-### API-Changes
-
- Add transports event to FFI.
-
-### Features / Changes
-
- Add core version to `receive_imf` failure message.
- Connectivity view: quota for all transports ([#7630](https://github.com/chatmail/core/pull/7630)).
- Send sync messages over SMTP and do not move them to mvbox.
-
-### Fixes
-
- When accepting group, add members with `Origin::IncomingTo` and sort them down in the contact list (7592).
- Update fallback welcome message.
- `inner_configure`: Check Config::OnlyFetchMvbox before MvboxMove for multi-transport ([#7637](https://github.com/chatmail/core/pull/7637)).
- Reset options not available for chatmail on chatmail profiles.
- Don't send webxdc notification for `notify: "*"` when chat is muted ([#7658](https://github.com/chatmail/core/pull/7658)).
-
-### Documentation
-
- `delete_chat()`: don't lie that messages aren't deleted from server.
- Remove references to removed `sentbox_watch` config.
- Update documentation for `TransportsModified` event.
-
-### Tests
-
- Contact list after accepting group with unknown contacts ([#7592](https://github.com/chatmail/core/pull/7592)).
- Port test_import_export_online_all to JSON-RPC ([#7411](https://github.com/chatmail/core/pull/7411)).
-
-### Refactor
-
- Turn `DC_VERSION_STR` into `&str`.
- ffi: Remove one pointer indirection for `dc_accounts_t`.
-
-### Miscellaneous Tasks
-
- deps: Bump actions/download-artifact from 6 to 7.
- deps: Bump actions/upload-artifact from 5 to 6.
- deps: Bump astral-sh/setup-uv from 7.1.4 to 7.1.6.
- deps: Bump cachix/install-nix-action from 31.8.4 to 31.9.0.
- cargo: Bump serde_json from 1.0.145 to 1.0.147.
- cargo: Bump uuid from 1.18.1 to 1.19.0.
- cargo: Bump toml from 0.9.8 to 0.9.10+spec-1.1.0.
- cargo: Bump tempfile from 3.23.0 to 3.24.0.
- cargo: Bump libc from 0.2.177 to 0.2.178.
- cargo: Bump tracing from 0.1.41 to 0.1.44.
- cargo: Bump hyper-util from 0.1.18 to 0.1.19.
- cargo: Bump log from 0.4.28 to 0.4.29.
- cargo: Bump rustls-pki-types from 1.13.0 to 1.13.2.
- cargo: Bump criterion from 0.7.0 to 0.8.1.
-
-## [2.35.0] - 2025-12-16
-
-### API-Changes
-
- Add blob dir size to storage info ([#7605](https://github.com/chatmail/core/pull/7605)).
-
-### Features / Changes
-
- Use `turn.delta.chat` as fallback TURN server ([#7382](https://github.com/chatmail/core/pull/7382)).
- Add ip addresses of known public chatmail relays from https://chatmail.at/relays to DNS cache ([#7607](https://github.com/chatmail/core/pull/7607)).
- Improve error messages on adding relays.
- Add transport addresses to IMAP URLs in message info.
- `lookup_host_with_cache()`: Don't return empty address list ([#7596](https://github.com/chatmail/core/pull/7596)).
-
-### Fixes
-
- `get_chat_msgs_ex()`: Don't match on "S=" (Cmd) in param payload.
- Remove `SecurejoinWait` info message when received Alice's key ([#7585](https://github.com/chatmail/core/pull/7585)).
- Do not set normalized name for existing chats and contacts in a migration.
- Remove now redundant "used_account_settings" and "entered_account_settings" from `Context.get_info()` ([#7587](https://github.com/chatmail/core/pull/7587)).
- Don't use fallback servers if got TURN servers from IMAP METADATA.
- Use fallback ICE servers if server can't IMAP METADATA ([#7382](https://github.com/chatmail/core/pull/7382)).
- Add explicit limit for adding relays (5 at the moment) ([#7611](https://github.com/chatmail/core/pull/7611)).
- Take `transport_id` into account when using `imap` table.
-
-### CI
-
- Update Rust to 1.92.0.
-
-### Miscellaneous Tasks
-
- Apply Rust 1.92.0 clippy suggestions.
-
-### Other
-
- Log entered login params and actual used params on configuration failure ([#7610](https://github.com/chatmail/core/pull/7610)).
-
-## [2.34.0] - 2025-12-11
-
-### API-Changes
-
- rpc-client: Accept `Account` for `Chat.{add,remove}_contact()`.
- rpc-client: Add `Chat.num_contacts()`.
- Forwarding messages to another profile ([#7491](https://github.com/chatmail/core/pull/7491)).
-
-### Features / Changes
-
- Double ringing time to 120 seconds.
- Better logging for failing securejoin messages ([#7593](https://github.com/chatmail/core/pull/7593)).
- Add multi-transport information to `Context.get_info` ([#7583](https://github.com/chatmail/core/pull/7583))
-
-### Fixes
-
- Multi-transport: all transports were shown as "inbox" in connectivity view, now they are shown by their hostname ([#7582](https://github.com/chatmail/core/pull/7582)).
- Multi-transport: Synchronize primary transport immediately after changing it.
- Use u64 instead of usize to calculate storage usage.
- Use u64 to represent the number of bytes in backup files.
- Use u64 to count the number of bytes sent/received over the network.
- Use logging macros instead of emitting event directly, so that it is also logged by tracing ([#7459](https://github.com/chatmail/core/pull/7459)).
- Let securejoin succeed even if the chat was deleted in the meantime ([#7594](https://github.com/chatmail/core/pull/7594)).
-
-### Miscellaneous Tasks
-
- Add RUSTSEC-2025-0134 exception to deny.toml.
-
-### Refactor
-
- Use u16 instead of usize to represent progress bar.
- Remove EncryptHelper.prefer_encrypt.
- Add params when forwarding message instead of removing unneeded ones.
-
-### Tests
-
- Port test_synchronize_member_list_on_group_rejoin to JSON-RPC.
- Test setting up second device between core versions.
-
-## [2.33.0] - 2025-12-05
-
-### Features / Changes
-
- Case-insensitive search for non-ASCII chat and contact names ([#7477](https://github.com/chatmail/core/pull/7477)).
-
-### Fixes
-
- Recognize all transport addresses as own addresses.
-
-## [2.32.0] - 2025-12-04
-
-Version bump to trigger publishing of npm prebuilds
-that failed to be published for 2.31.0 due to not configured "trusted publishers".
-
-### Features / Changes
-
- Lookup_or_create_adhoc_group(): Add context to SQL errors ([#7554](https://github.com/chatmail/core/pull/7554)).
-
-## [2.31.0] - 2025-12-04
-
-### CI
-
- Update npm before publishing packages.
-
-### Features / Changes
-
- Use v2 SEIPD when sending messages to self.
-
-## [2.30.0] - 2025-12-04
-
-### Features / Changes
-
- Disable SNI for STARTTLS ([#7499](https://github.com/chatmail/core/pull/7499)).
- Introduce cross-core testing along with improvements to test frameworking.
- Synchronize transports via sync messages.
-
-### Fixes
-
- Fix shutdown shortly after call.
-
-### API-Changes
-
- Add `TransportsModified` event (for tests).
-
-### CI
-
- Use "trusted publishing" for NPM packages.
-
-### Miscellaneous Tasks
-
- deps: Bump actions/checkout from 5 to 6.
- cargo: Bump syn from 2.0.110 to 2.0.111.
- deps: Bump astral-sh/setup-uv from 7.1.3 to 7.1.4.
- cargo: Bump sdp from 0.8.0 to 0.10.0.
- Remove two outdated todo comments ([#7550](https://github.com/chatmail/core/pull/7550)).
-
-## [2.29.0] - 2025-12-01
-
-### API-Changes
-
- deltachat-rpc-client: Add Message.exists().
-
-### Features / Changes
-
- [**breaking**] Increase backup version from 3 to 4.
- Hide `To` header in encrypted messages.
- `deltachat_rpc_client.Rpc` accepts `rpc_server_path` for using a particular deltachat-rpc-server ([#7493](https://github.com/chatmail/core/pull/7493)).
- Don't send `Chat-Group-Avatar` header in unencrypted groups.
- Don't update `self-{avatar,status}` from received messages ([#7002](https://github.com/chatmail/core/pull/7002)).
-
-### Fixes
-
- `CREATE INDEX imap_only_rfc724_mid ON imap(rfc724_mid)` ([#7490](https://github.com/chatmail/core/pull/7490)).
- Use the same webxdc ratelimit for all email servers.
- Handle the case when account does not exist in `get_existing_msg_ids()`.
- Don't send self-avatar in unencrypted messages ([#7136](https://github.com/chatmail/core/pull/7136)).
- Do not configure folders during transport configuration.
- Upload sync messages only with the primary transport.
- Do not use deprecated ConfiguredProvider in get_configured_provider.
-
-### Build system
-
- Make scripts for remote testing usable.
- Increase minimum supported Python version to 3.10.
- Use SPDX license expression in Python package metadata.
-
-### CI
-
- Set timeout-minutes for all jobs in ci.yaml workflow.
- Do not install Python manually to bulid RPC server wheels.
- Do not build fake RPC server source packages.
- Build Python wheels in separate jobs.
-
-### Refactor
-
- [**breaking**] Remove some unneeded stock strings ([#7496](https://github.com/chatmail/core/pull/7496)).
- Strike events in rpc-client request handling, get result from queue.
- Use ConfiguredProvider config directly when loading legacy settings.
- Remove update_icons and disable_server_delete migrations.
- Use `SYMMETRIC_KEY_ALGORITHM` constant in `symm_encrypt_message()`.
- Make signing key non-optional for `pk_encrypt`.
-
-### Tests
-
- `test_remove_member_bcc`: Test unencrypted group as it was initially.
-
-### Miscellaneous Tasks
-
- deps: Bump cachix/install-nix-action from 31.8.1 to 31.8.4.
- cargo: Bump hyper from 1.7.0 to 1.8.1.
- cargo: Bump human-panic from 2.0.3 to 2.0.4.
- cargo: Bump hyper-util from 0.1.17 to 0.1.18.
- cargo: Bump rusqlite from 0.36.0 to 0.37.0.
- cargo: Bump tokio-util from 0.7.16 to 0.7.17.
- cargo: Bump toml from 0.9.7 to 0.9.8.
- cargo: Bump proptest from 1.8.0 to 1.9.0.
- cargo: Bump parking_lot from 0.12.4 to 0.12.5.
- cargo: Bump syn from 2.0.106 to 2.0.110.
- cargo: Bump quick-xml from 0.38.3 to 0.38.4.
- cargo: Bump rustls-pki-types from 1.12.0 to 1.13.0.
- cargo: Bump nu-ansi-term from 0.50.1 to 0.50.3.
- cargo: Bump sanitize-filename from 0.5.0 to 0.6.0.
- cargo: Bump quote from 1.0.41 to 1.0.42.
- cargo: Bump libc from 0.2.176 to 0.2.177.
- cargo: Bump bytes from 1.10.1 to 1.11.0.
- cargo: Bump image from 0.25.8 to 0.25.9.
- cargo: Bump rand from 0.9.0 to 0.9.2 ([#7501](https://github.com/chatmail/core/pull/7501)).
- cargo: Bump tokio from 1.45.1 to 1.48.0.
-
-## [2.28.0] - 2025-11-23
-
-### API-Changes
-
- New API `get_existing_msg_ids()` to check if the messages with given IDs exist.
- Add API to get storage usage information. (JSON-RPC method: `get_storage_usage_report_string`) ([#7486](https://github.com/chatmail/core/pull/7486)).
-
-### Features / Changes
-
- Experimentaly allow adding second transport.
-  There is no synchronization yet, so UIs should not allow the user to change the address manually and only expose the ability to add transports if `bcc_self` is disabled.
- Default `bcc_self` to 0 for all new accounts.
- Rephrase "Establishing end-to-end encryption" -> "Establishing connection".
- Stock string for joining a channel ([#7480](https://github.com/chatmail/core/pull/7480)).
-
-### Fixes
-
- Limit the range of `Date` to up to 6 days in the past.
- `ContactId::set_name_ex()`: Emit ContactsChanged when transaction is completed.
- Set SQLite busy timeout to 1 minute on iOS.
- Sort system messages to the bottom of the chat.
- Assign outgoing self-sent unencrypted messages to ad-hoc groups with only SELF ([#7409](https://github.com/chatmail/core/pull/7409)).
- Add missing stock strings.
- Look up or create ad-hoc group if there are duplicate addresses in "To".
-
-### Documentation
-
- Add missing RFC 9788, link 'Header Protection for Cryptographically Protected Email' as other RFC.
- Remove unsupported RFC 3503 (`$MDNSent` flag) from the list of standards.
- Mark database encryption support as deprecated ([#7403](https://github.com/chatmail/core/pull/7403)).
-
-### Build system
-
- Increase Minimum Supported Rust Version to 1.88.0.
- Update rPGP from 0.17.0 to 0.18.0.
- nix: Update `fenix` and use it for all Rust builds.
-
-### CI
-
- Do not use --encoding option for rst-lint.
-
-### Refactor
-
- Use `HashMap::extract_if()` stabilized in Rust 1.88.0.
- Remove some easy to remove unwrap() calls.
-
-### Tests
-
- Contact shalln't be verified by another having unknown verifier.
-
-## [2.27.0] - 2025-11-16
-
-### API-Changes
-
- Add APIs to stop background fetch.
- [**breaking**]: rename JSON-RPC method accounts_background_fetch() into background_fetch()
- rpc-client: Add APIs for background fetch.
- rpc-client: Add Account.wait_for_msg().
- Deprecate deletion timer string for '1 Minute'.
-
-### Features / Changes
-
- Implement RFC 9788 (Header Protection for Cryptographically Protected Email) ([#7130](https://github.com/chatmail/core/pull/7130)).
- Tweak initial info-message for unencrypted chats ([#7427](https://github.com/chatmail/core/pull/7427)).
- Add Contact::get_or_gen_color. Use it in CFFI and JSON-RPC to avoid gray self-color ([#7374](https://github.com/chatmail/core/pull/7374)).
- [**breaking**] Withdraw broadcast invites. Add Qr::WithdrawJoinBroadcast and Qr::ReviveJoinBroadcast QR code types. ([#7439](https://github.com/chatmail/core/pull/7439)).
-
-### Fixes
-
- Set `get_max_smtp_rcpt_to` for chatmail to the actual limit of 1000 instead of unlimited. ([#7432](https://github.com/chatmail/core/pull/7432)).
- Always set bcc_self on backup import/export.
- Escape connectivity HTML.
- Send webm as file, it is not supported by all UI.
-
-### Build system
-
- nix: Exclude CONTRIBUTING.md from the source files.
-
-### Refactor
-
- Use wait_for_incoming_msg() in more tests.
-
-### Tests
-
- Fix flaky test_send_receive_locations.
- Port folder-related CFFI tests to JSON-RPC.
- HP-Outer headers are added to messages with standard Header Protection ([#7130](https://github.com/chatmail/core/pull/7130)).
- rpc-client: Test_qr_securejoin_broadcast: Wait for incoming message before getting chatlist ([#7442](https://github.com/chatmail/core/pull/7442)).
- Add pytest fixture for account manager.
- Test background_fetch() and stop_background_fetch().
-
-## [2.26.0] - 2025-11-11
-
-### API-Changes
-
- [**breaking**] JSON-RPC: `chat_type` now contains a variant of a string enum/union. Affected places: `FullChat.chat_type`, `BasicChat.chat_type`, `ChatListItemFetchResult::ChatListItem.chat_type`, `Event:: SecurejoinInviterProgress.chat_type` and `MessageSearchResult.chat_type` ([#7285](https://github.com/chatmail/core/pull/7285))
-
-### Features / Changes
-
- Error toast for "Not creating securejoin QR for old broadcast".
-
-### Fixes
-
- `is_encrypted()` should be true for Saved Messages chat so messages there are editable.
- Do not return an error from `receive_imf` if we fail to add a member because we are not in chat.
- Do not add QR inviter to groups immediately.
- Do not ignore I/O errors in `BlobObject::store_from_base64`.
-
-### Miscellaneous Tasks
-
- Rustfmt.
-
-### Refactor
-
- imap: Move resync request from Context to Imap.
- Replace imap:: calls in migration 73 with SQL queries.
- Remove unused imports.
-
-### Documentation
-
- Readme: update language binding section to avoid usage of cffi in new projects ([#7380](https://github.com/chatmail/core/pull/7380)).
- Fix Context::set_stock_translation reference.
-
-### Tests
-
- Test editing saved messages.
- Remove ThreadPoolExecutor from test_wait_next_messages.
- Move test_two_group_securejoins from receive_imf to securejoin module.
- At the end of securejoin Bob has two members in a group chat.
- Bob has 0 members in the chat until securejoin finishes.
- Do not add QR inviter to groups right after scanning the code.
-
 ## [2.25.0] - 2025-11-05

 ### Features / Changes
@@ -7585,16 +7101,3 @@ https://github.com/chatmail/core/pulls?q=is%3Apr+is%3Aclosed
 [2.23.0]: https://github.com/chatmail/core/compare/v2.22.0..v2.23.0
 [2.24.0]: https://github.com/chatmail/core/compare/v2.23.0..v2.24.0
 [2.25.0]: https://github.com/chatmail/core/compare/v2.24.0..v2.25.0
-[2.26.0]: https://github.com/chatmail/core/compare/v2.25.0..v2.26.0
-[2.27.0]: https://github.com/chatmail/core/compare/v2.26.0..v2.27.0
-[2.28.0]: https://github.com/chatmail/core/compare/v2.27.0..v2.28.0
-[2.29.0]: https://github.com/chatmail/core/compare/v2.28.0..v2.29.0
-[2.30.0]: https://github.com/chatmail/core/compare/v2.29.0..v2.30.0
-[2.31.0]: https://github.com/chatmail/core/compare/v2.30.0..v2.31.0
-[2.32.0]: https://github.com/chatmail/core/compare/v2.31.0..v2.32.0
-[2.33.0]: https://github.com/chatmail/core/compare/v2.32.0..v2.33.0
-[2.34.0]: https://github.com/chatmail/core/compare/v2.33.0..v2.34.0
-[2.35.0]: https://github.com/chatmail/core/compare/v2.34.0..v2.35.0
-[2.36.0]: https://github.com/chatmail/core/compare/v2.35.0..v2.36.0
-[2.37.0]: https://github.com/chatmail/core/compare/v2.36.0..v2.37.0
-[2.38.0]: https://github.com/chatmail/core/compare/v2.37.0..v2.38.0
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-# Contributing to chatmail core
+# Contributing to Delta Chat

 ## Bug reports

--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "deltachat"
-version = "2.38.0"
+version = "2.25.0"
 edition = "2024"
 license = "MPL-2.0"
-rust-version = "1.88"
+rust-version = "1.85"
 repository = "https://github.com/chatmail/core"

 [profile.dev]
@@ -78,7 +78,7 @@ num-derive = "0.4"
 num-traits = { workspace = true }
 parking_lot = "0.12.4"
 percent-encoding = "2.3"
-pgp = { version = "0.18.0", default-features = false }
+pgp = { version = "0.17.0", default-features = false }
 pin-project = "1"
 qrcodegen = "1.7.0"
 quick-xml = { version = "0.38", features = ["escape-html"] }
@@ -88,7 +88,7 @@ regex = { workspace = true }
 rusqlite = { workspace = true, features = ["sqlcipher"] }
 rustls-pki-types = "1.12.0"
 sanitize-filename = { workspace = true }
-sdp = "0.10.0"
+sdp = "0.8.0"
 serde_json = { workspace = true }
 serde_urlencoded = "0.7.1"
 serde = { workspace = true, features = ["derive"] }
@@ -111,12 +111,11 @@ toml = "0.9"
 tracing = "0.1.41"
 url = "2"
 uuid = { version = "1", features = ["serde", "v4"] }
-walkdir = "2.5.0"
 webpki-roots = "0.26.8"

 [dev-dependencies]
 anyhow = { workspace = true, features = ["backtrace"] } # Enable `backtrace` feature in tests.
-criterion = { version = "0.8.1", features = ["async_tokio"] }
+criterion = { version = "0.7.0", features = ["async_tokio"] }
 futures-lite = { workspace = true }
 log = { workspace = true }
 nu-ansi-term = { workspace = true }
@@ -195,14 +194,14 @@ nu-ansi-term = "0.50"
 num-traits = "0.2"
 rand = "0.9"
 regex = "1.10"
-rusqlite = "0.37"
-sanitize-filename = "0.6"
+rusqlite = "0.36"
+sanitize-filename = "0.5"
 serde = "1.0"
 serde_json = "1"
-tempfile = "3.24.0"
+tempfile = "3.23.0"
 thiserror = "2"
 tokio = "1"
-tokio-util = "0.7.17"
+tokio-util = "0.7.16"
 tracing-subscriber = "0.3"
 yerpc = "0.6.4"

--- a/STYLE.md
+++ b/STYLE.md
@@ -16,12 +16,11 @@ id INTEGER PRIMARY KEY AUTOINCREMENT,
 text TEXT DEFAULT '' NOT NULL -- message text
 ) STRICT",
    )
-    .await
-    .context("CREATE TABLE messages")?;
+    .await?;
 ```

 Do not use macros like [`concat!`](https://doc.rust-lang.org/std/macro.concat.html)
-or [`indoc!`](https://docs.rs/indoc).
+or [`indoc!](https://docs.rs/indoc).
 Do not escape newlines like this:
 ```
    sql.execute(
@@ -30,8 +29,7 @@ id INTEGER PRIMARY KEY AUTOINCREMENT, \
 text TEXT DEFAULT '' NOT NULL \
 ) STRICT",
    )
-    .await
-    .context("CREATE TABLE messages")?;
+    .await?;
 ```
 Escaping newlines
 is prone to errors like this if space before backslash is missing:
@@ -65,9 +63,6 @@ an older version. Also don't change the column type, consider adding a new colum
 instead. Finally, never change column semantics, this is especially dangerous because the `STRICT`
 keyword doesn't help here.

-Consider adding context to `anyhow` errors for SQL statements using `.context()` so that it's
-possible to understand from logs which statement failed. See [Errors](#errors) for more info.
-
 ## Errors

 Delta Chat core mostly uses [`anyhow`](https://docs.rs/anyhow/) errors.
--- a/benches/decrypting.rs
+++ b/benches/decrypting.rs
@@ -38,7 +38,7 @@ use deltachat::{
    internals_for_benches::key_from_asc,
    internals_for_benches::parse_and_get_text,
    internals_for_benches::store_self_keypair,
-    pgp::{KeyPair, SeipdVersion, decrypt, pk_encrypt, symm_encrypt_message},
+    pgp::{KeyPair, decrypt, pk_encrypt, symm_encrypt_message},
    stock_str::StockStrings,
 };
 use rand::{Rng, rng};
@@ -108,10 +108,9 @@ fn criterion_benchmark(c: &mut Criterion) {
            pk_encrypt(
                plain.clone(),
                vec![black_box(key_pair.public.clone())],
-                key_pair.secret.clone(),
+                Some(key_pair.secret.clone()),
                true,
                true,
-                SeipdVersion::V2,
            )
            .await
            .unwrap()
--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "2.38.0"
+version = "2.25.0"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
--- a/deltachat-ffi/deltachat.h
+++ b/deltachat-ffi/deltachat.h
@@ -22,7 +22,6 @@ typedef struct _dc_lot       dc_lot_t;
 typedef struct _dc_provider  dc_provider_t;
 typedef struct _dc_event     dc_event_t;
 typedef struct _dc_event_emitter dc_event_emitter_t;
-typedef struct _dc_event_channel dc_event_channel_t;
 typedef struct _dc_jsonrpc_instance dc_jsonrpc_instance_t;
 typedef struct _dc_backup_provider dc_backup_provider_t;

@@ -248,7 +247,7 @@ typedef struct _dc_event_emitter dc_accounts_event_emitter_t;
 // create/open/config/information

 /**
- * Create a new context object and try to open it. If
+ * Create a new context object and try to open it without passphrase. If
 * database is encrypted, the result is the same as using
 * dc_context_new_closed() and the database should be opened with
 * dc_context_open() before using.
@@ -284,13 +283,8 @@ dc_context_t*   dc_context_new_closed        (const char* dbfile);


 /**
- * Opens the database with the given passphrase.
- * NB: Nonempty passphrase (db encryption) is deprecated 2025-11:
- * - Db encryption does nothing with blobs, so fs/disk encryption is recommended.
- * - Isolation from other apps is needed anyway.
- *
- * This can only be used on closed context, such as
- * created by dc_context_new_closed(). If the database
+ * Opens the database with the given passphrase. This can only be used on
+ * closed context, such as created by dc_context_new_closed(). If the database
 * is new, this operation sets the database passphrase. For existing databases
 * the passphrase should be the one used to encrypt the database the first
 * time.
@@ -307,8 +301,6 @@ int             dc_context_open              (dc_context_t *context, const char*

 /**
 * Changes the passphrase on the open database.
- * Deprecated 2025-11, see `dc_context_open()` for reasoning.
- *
 * Existing database must already be encrypted and the passphrase cannot be NULL or empty.
 * It is impossible to encrypt unencrypted database with this method and vice versa.
 *
@@ -430,13 +422,16 @@ char*           dc_get_blobdir               (const dc_context_t* context);
 *                    1=send a copy of outgoing messages to self (default).
 *                    Sending messages to self is needed for a proper multi-account setup,
 *                    however, on the other hand, may lead to unwanted notifications in non-delta clients.
+ * - `sentbox_watch`= 1=watch `Sent`-folder for changes,
+ *                    0=do not watch the `Sent`-folder (default).
 * - `mvbox_move`   = 1=detect chat messages,
 *                    move them to the `DeltaChat` folder,
 *                    and watch the `DeltaChat` folder for updates (default),
 *                    0=do not move chat-messages
 * - `only_fetch_mvbox` = 1=Do not fetch messages from folders other than the
 *                    `DeltaChat` folder. Messages will still be fetched from the
- *                    spam folder.
+ *                    spam folder and `sendbox_watch` will also still be respected
+ *                    if enabled.
 *                    0=watch all folders normally (default)
 * - `show_emails`  = DC_SHOW_EMAILS_OFF (0)=
 *                    show direct replies to chats only,
@@ -486,15 +481,12 @@ char*           dc_get_blobdir               (const dc_context_t* context);
 *                    0=use IMAP IDLE if the server supports it.
 *                    This is a developer option used for testing polling used as an IDLE fallback.
 * - `download_limit` = Messages up to this number of bytes are downloaded automatically.
- *                    For messages with large attachments, two messages are sent:
- *                    a Pre-Message containing metadata and text and a Post-Message additionally
- *                    containing the attachment. NB: Some "extra" metadata like avatars and gossiped
- *                    encryption keys is stripped from post-messages to save traffic.
- *                    Pre-Messages are shown as placeholder messages. They can be downloaded fully
- *                    using dc_download_full_msg() later. Post-Messages are automatically
- *                    downloaded if they are smaller than the download_limit. Other messages are
- *                    always auto-downloaded.
- *                    0 = no limit (default).
+ *                    For larger messages, only the header is downloaded and a placeholder is shown.
+ *                    These messages can be downloaded fully using dc_download_full_msg() later.
+ *                    The limit is compared against raw message sizes, including headers.
+ *                    The actually used limit may be corrected
+ *                    to not mess up with non-delivery-reports or read-receipts.
+ *                    0=no limit (default).
 *                    Changes affect future messages only.
 * - `protect_autocrypt` = Enable Header Protection for Autocrypt header.
 *                    This is an experimental option not compatible to other MUAs
@@ -520,10 +512,6 @@ char*           dc_get_blobdir               (const dc_context_t* context);
 * - `webxdc_realtime_enabled` = Whether the realtime APIs should be enabled.
 *                               0 = WebXDC realtime API is disabled and behaves as noop.
 *                               1 = WebXDC realtime API is enabled (default).
- * - `who_can_call_me` = Who can cause call notifications.
- *                       0 = Everybody (except explicitly blocked contacts),
- *                       1 = Contacts (default, does not include contact requests),
- *                       2 = Nobody (calls never result in a notification).
 *
 * If you want to retrieve a value, use dc_get_config().
 *
@@ -580,10 +568,11 @@ int             dc_set_stock_translation(dc_context_t* context, uint32_t stock_i

 /**
 * Set configuration values from a QR code.
- * Before this function is called, dc_check_qr() should be used to get the QR code type.
+ * Before this function is called, dc_check_qr() should confirm the type of the
+ * QR code is DC_QR_ACCOUNT or DC_QR_LOGIN.
 *
- * DC_QR_ACCOUNT and DC_QR_LOGIN QR codes configure the context, but I/O mustn't be started for such
- * QR codes.
+ * Internally, the function will call dc_set_config() with the appropriate keys,
+ * e.g. `addr` and `mail_pw` for DC_QR_ACCOUNT and DC_QR_LOGIN.
 *
 * @memberof dc_context_t
 * @param context The context object.
@@ -894,7 +883,7 @@ int             dc_preconfigure_keypair        (dc_context_t* context, const cha
 *       the pseudo-chat DC_CHAT_ID_ARCHIVED_LINK is added if there are _any_ archived
 *       chats
 *     - the flag DC_GCL_FOR_FORWARDING sorts "Saved messages" to the top of the chatlist
- *       and hides the "Device chat", contact requests and incoming broadcasts.
+ *       and hides the "Device chat" and contact requests.
 *       typically used on forwarding, may be combined with DC_GCL_NO_SPECIALS
 *       to also hide the archive link.
 *     - if the flag DC_GCL_NO_SPECIALS is set, archive link is not added
@@ -1563,7 +1552,7 @@ dc_array_t*     dc_wait_next_msgs            (dc_context_t* context);
 * Mark all messages in a chat as _noticed_.
 * _Noticed_ messages are no longer _fresh_ and do not count as being unseen
 * but are still waiting for being marked as "seen" using dc_markseen_msgs()
- * (read receipts aren't sent for noticed messages).
+ * (IMAP/MDNs is not done for noticed messages).
 *
 * Calling this function usually results in the event #DC_EVENT_MSGS_NOTICED.
 * See also dc_markseen_msgs().
@@ -1615,10 +1604,10 @@ void            dc_set_chat_visibility       (dc_context_t* context, uint32_t ch
 *
 * Messages are deleted from the device and the chat database entry is deleted.
 * After that, the event #DC_EVENT_MSGS_CHANGED is posted.
- * Messages are deleted from the server in background.
 *
 * Things that are _not_ done implicitly:
 *
+ * - Messages are **not deleted from the server**.
 * - The chat or the contact is **not blocked**, so new messages from the user/the group may appear
 *   and the user may create the chat again.
 * - **Groups are not left** - this would
@@ -2589,10 +2578,8 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
 #define         DC_QR_ERROR                  400 // text1=error string
 #define         DC_QR_WITHDRAW_VERIFYCONTACT 500
 #define         DC_QR_WITHDRAW_VERIFYGROUP   502 // text1=groupname
-#define         DC_QR_WITHDRAW_JOINBROADCAST 504 // text1=broadcast name
 #define         DC_QR_REVIVE_VERIFYCONTACT   510
 #define         DC_QR_REVIVE_VERIFYGROUP     512 // text1=groupname
-#define         DC_QR_REVIVE_JOINBROADCAST   514 // text1=broadcast name
 #define         DC_QR_LOGIN                  520 // text1=email_address

 /**
@@ -3096,7 +3083,7 @@ int dc_receive_backup (dc_context_t* context, const char* qr);

 /**
 * Create a new account manager.
- * The account manager takes a directory
+ * The account manager takes an directory
 * where all context-databases are placed in.
 * To add a context to the account manager,
 * use dc_accounts_add_account() or dc_accounts_migrate_account().
@@ -3118,35 +3105,6 @@ int dc_receive_backup (dc_context_t* context, const char* qr);
 */
 dc_accounts_t* dc_accounts_new                  (const char* dir, int writable);

-/**
- * Create a new account manager with an existing events channel,
- * which allows you to see events emitted during startup.
- * 
- * The account manager takes a directory
- * where all context-databases are placed in.
- * To add a context to the account manager,
- * use dc_accounts_add_account() or dc_accounts_migrate_account().
- * All account information are persisted.
- * To remove a context from the account manager,
- * use dc_accounts_remove_account().
- *
- * @memberof dc_accounts_t
- * @param dir The directory to create the context-databases in.
- *     If the directory does not exist,
- *     dc_accounts_new_with_event_channel() will try to create it.
- * @param writable Whether the returned account manager is writable, i.e. calling these functions on
- *     it is possible: dc_accounts_add_account(), dc_accounts_add_closed_account(),
- *     dc_accounts_migrate_account(), dc_accounts_remove_account(), dc_accounts_select_account().
- * @param dc_event_channel_t Events Channel to be used for this accounts manager, 
- *      create one with dc_event_channel_new().
- *      This channel is consumed by this method and can not be used again afterwards,
- *      so be sure to call `dc_event_channel_get_event_emitter` before.
- * @return An account manager object.
- *     The object must be passed to the other account manager functions
- *     and must be freed using dc_accounts_unref() after usage.
- *     On errors, NULL is returned.
- */
-dc_accounts_t* dc_accounts_new_with_event_channel(const char* dir, int writable, dc_event_channel_t* events_channel);

 /**
 * Free an account manager object.
@@ -3338,30 +3296,12 @@ void           dc_accounts_maybe_network_lost    (dc_accounts_t* accounts);
 * without forgetting to create notifications caused by timing race conditions.
 *
 * @memberof dc_accounts_t
- * @param accounts The account manager as created by dc_accounts_new().
 * @param timeout The timeout in seconds
 * @return Return 1 if DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE was emitted and 0 otherwise.
 */
 int            dc_accounts_background_fetch    (dc_accounts_t* accounts, uint64_t timeout);


-/**
- * Stop ongoing background fetch.
- *
- * Calling this function allows to stop dc_accounts_background_fetch() early.
- * dc_accounts_background_fetch() will then return immediately
- * and emit DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE unless
- * if it has failed and returned 0.
- *
- * If there is no ongoing dc_accounts_background_fetch() call,
- * calling this function does nothing.
- *
- * @memberof dc_accounts_t
- * @param accounts The account manager as created by dc_accounts_new().
- */
-void           dc_accounts_stop_background_fetch (dc_accounts_t *accounts);
-
-
 /**
 * Sets device token for Apple Push Notification service.
 * Returns immediately.
@@ -3387,12 +3327,8 @@ void           dc_accounts_set_push_device_token (dc_accounts_t* accounts, const
 *     Must be freed using dc_event_emitter_unref() after usage.
 *
 * Note: Use only one event emitter per account manager.
- * The result of having multiple event emitters is unspecified.
- * Currently events are broadcasted to all existing event emitters,
- * but previous versions delivered events to only one event emitter
- * and this behavior may change again in the future.
- * Events emitted before creation of event emitter
- * are not available to event emitter.
+ * Having more than one event emitter running at the same time on the same account manager
+ * will result in events randomly delivered to the one or to the other.
 */
 dc_event_emitter_t* dc_accounts_get_event_emitter (dc_accounts_t* accounts);

@@ -3769,7 +3705,30 @@ uint32_t        dc_chat_get_id               (const dc_chat_t* chat);


 /**
- * Get chat type as one of the @ref DC_CHAT_TYPE constants.
+ * Get chat type as one of the @ref DC_CHAT_TYPE constants:
+ *
+ * - @ref DC_CHAT_TYPE_SINGLE - a normal chat is a chat with a single contact,
+ *   chats_contacts contains one record for the user. DC_CONTACT_ID_SELF
+ *   (see dc_contact_t::id) is added _only_ for a self talk.
+ *   These chats are created by dc_create_chat_by_contact_id().
+ *
+ * - @ref DC_CHAT_TYPE_GROUP - a group chat, chats_contacts contain all group
+ *   members, incl. DC_CONTACT_ID_SELF.
+ *   Groups are created by dc_create_group_chat().
+ *
+ * - @ref DC_CHAT_TYPE_MAILINGLIST - a mailing list, this is similar to groups,
+ *   however, the member list cannot be retrieved completely
+ *   and cannot be changed using this api.
+ *   Mailing lists are created as needed by incoming messages
+ *   and usually require some special server;
+ *   they cannot be created by a function call as the other chat types.
+ *   Moreover, for now, mailing lists are read-only.
+ *
+ * - @ref DC_CHAT_TYPE_BROADCAST - a broadcast list,
+ *   the recipients will get messages in a one-to-one chats and
+ *   the sender will get answers in a one-to-one as well.
+ *   chats_contacts contain all recipients but DC_CONTACT_ID_SELF.
+ *   Broadcasts are created by dc_create_broadcast_list().
 *
 * @memberof dc_chat_t
 * @param chat The chat object.
@@ -4325,7 +4284,6 @@ char*             dc_msg_get_webxdc_info      (const dc_msg_t* msg);
 /**
 * Get the size of the file. Returns the size of the file associated with a
 * message, if applicable.
- * If message is a pre-message, then this returns the size of the file to be downloaded.
 *
 * Typically, this is used to show the size of document files, e.g. a PDF.
 *
@@ -5343,8 +5301,8 @@ int             dc_contact_is_key_contact    (dc_contact_t* contact);
 *
 * - If dc_contact_get_verifier_id() != 0,
 *   display text "Introduced by ..."
- *   with the name of the contact
- *   formatted by dc_contact_get_name().
+ *   with the name and address of the contact
+ *   formatted by dc_contact_get_name_n_addr().
 *   Prefix the text by a green checkmark.
 *
 * - If dc_contact_get_verifier_id() == 0 and dc_contact_is_verified() != 0,
@@ -5775,32 +5733,17 @@ int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);
 #define         DC_CHAT_TYPE_UNDEFINED       0

 /**
- * A one-to-one chat with a single contact.
- *
- * dc_get_chat_contacts() contains one record for the user.
- * DC_CONTACT_ID_SELF is added _only_ for a self talk.
- * These chats are created by dc_create_chat_by_contact_id().
+ * A one-to-one chat with a single contact. See dc_chat_get_type() for details.
 */
 #define         DC_CHAT_TYPE_SINGLE          100

 /**
- * A group chat.
- *
- * dc_get_chat_contacts() contain all group members,
- * including DC_CONTACT_ID_SELF.
- * Groups are created by dc_create_group_chat().
+ * A group chat. See dc_chat_get_type() for details.
 */
 #define         DC_CHAT_TYPE_GROUP           120

 /**
- * A mailing list.
- *
- * This is similar to groups,
- * however, the member list cannot be retrieved completely
- * and cannot be changed using an API from this library.
- * Mailing lists are created as needed by incoming messages
- * and usually require some special server;
- * they cannot be created by a function call as the other chat types.
+ * A mailing list. See dc_chat_get_type() for details.
 */
 #define         DC_CHAT_TYPE_MAILINGLIST     140

@@ -6029,62 +5972,6 @@ char* dc_jsonrpc_next_response(dc_jsonrpc_instance_t* jsonrpc_instance);
 */
 char* dc_jsonrpc_blocking_call(dc_jsonrpc_instance_t* jsonrpc_instance, const char *input);

-/**
- * @class dc_event_channel_t
- *
- * Opaque object that is used to create an event emitter which can be used log events during startup of an accounts manger.
- * Only used for dc_accounts_new_with_event_channel().
- * To use it:
- *   1. create an events channel with `dc_event_channel_new()`.
- *   2. get an event emitter for it with `dc_event_channel_get_event_emitter()`.
- *   3. use it to create your account manager with `dc_accounts_new_with_event_channel()`, which consumes the channel.
- *   4. free the empty channel wrapper object with `dc_event_channel_unref()`.
- */
-
- /**
-  * Create a new event channel.
-  *
-  * @memberof dc_event_channel_t
-  * @return An event channel wrapper object (dc_event_channel_t).
-  */
- dc_event_channel_t* dc_event_channel_new();
- 
- /**
-  * Release/free the events channel structure.
-  * This function releases the memory of the `dc_event_channel_t` structure.
-  *
-  * you can call it after calling dc_accounts_new_with_event_channel,
-  * which took the events channel out of it already, so this just frees the underlying option.
-  * 
-  * @memberof dc_event_channel_t
-  */
-void dc_event_channel_unref(dc_event_channel_t* event_channel);
-
-/**
- * Create the event emitter that is used to receive events.
- * 
- * The library will emit various @ref DC_EVENT events, such as "new message", "message read" etc.
- * To get these events, you have to create an event emitter using this function
- * and call dc_get_next_event() on the emitter.
- *
- * This is similar to dc_get_event_emitter(), which, however,
- * must not be called for accounts handled by the account manager.
- * 
- * @memberof dc_event_channel_t
- * @param The event channel.
- * @return Returns the event emitter, NULL on errors.
- *     Must be freed using dc_event_emitter_unref() after usage.
- * 
- * Note: Use only one event emitter per account manager / event channel.
- * The result of having multiple event emitters is unspecified.
- * Currently events are broadcasted to all existing event emitters,
- * but previous versions delivered events to only one event emitter
- * and this behavior may change again in the future.
- * Events emitted before creation of event emitter
- * are not available to event emitter.
- */
-dc_event_emitter_t* dc_event_channel_get_event_emitter(dc_event_channel_t* event_channel);
-
 /**
 * @class dc_event_emitter_t
 *
@@ -6788,16 +6675,6 @@ void dc_event_unref(dc_event_t* event);
 */
 #define DC_EVENT_CALL_ENDED                               2580

-/**
- * Transport relay added/deleted or default has changed.
- * UI should update the list.
- *
- * The event is emitted when the transports are modified on another device
- * using the JSON-RPC calls `add_or_update_transport`, `add_transport_from_qr`, `delete_transport`
- * or `set_config(configured_addr)`.
- */
-#define DC_EVENT_TRANSPORTS_MODIFIED           2600
-

 /**
 * @}
@@ -7311,6 +7188,11 @@ void dc_event_unref(dc_event_t* event);
 /// Used as device message text.
 #define DC_STR_SELF_DELETED_MSG_BODY      91

+/// "'Delete messages from server' turned off as now all folders are affected."
+///
+/// Used as device message text.
+#define DC_STR_SERVER_TURNED_OFF          92
+
 /// "Message deletion timer is set to %1$s minutes."
 ///
 /// Used in status messages.
@@ -7359,9 +7241,22 @@ void dc_event_unref(dc_event_t* event);
 /// `%1$s` will be replaced by the percentage used
 #define DC_STR_QUOTA_EXCEEDING_MSG_BODY   98

-/// @deprecated Deprecated 2025-11-12, this string is no longer needed.
+/// "%1$s message"
+///
+/// Used as the message body when a message
+/// was not yet downloaded completely
+/// (dc_msg_get_download_state() is e.g. @ref DC_DOWNLOAD_AVAILABLE).
+///
+/// `%1$s` will be replaced by human-readable size (e.g. "1.2 MiB").
 #define DC_STR_PARTIAL_DOWNLOAD_MSG_BODY  99

+/// "Download maximum available until %1$s"
+///
+/// Appended after some separator to @ref DC_STR_PARTIAL_DOWNLOAD_MSG_BODY.
+///
+/// `%1$s` will be replaced by human-readable date and time.
+#define DC_STR_DOWNLOAD_AVAILABILITY      100
+
 /// "Multi Device Synchronization"
 ///
 /// Used in subjects of outgoing sync messages.
@@ -7387,6 +7282,12 @@ void dc_event_unref(dc_event_t* event);
 /// Used as a headline in the connectivity view.
 #define DC_STR_OUTGOING_MESSAGES          104

+/// "Storage on %1$s"
+///
+/// Used as a headline in the connectivity view.
+///
+/// `%1$s` will be replaced by the domain of the configured e-mail address.
+#define DC_STR_STORAGE_ON_DOMAIN          105

 /// @deprecated Deprecated 2022-04-16, this string is no longer needed.
 #define DC_STR_ONE_MOMENT                 106
@@ -7449,7 +7350,8 @@ void dc_event_unref(dc_event_t* event);
 /// May be followed by the info-messages
 /// #DC_STR_SECURE_JOIN_REPLIES, #DC_STR_CONTACT_VERIFIED and #DC_STR_MSGADDMEMBER.
 ///
-/// `%1$s` and `%2$s` will be replaced by name of the inviter.
+/// `%1$s` will be replaced by name and address of the inviter,
+/// `%2$s` will be replaced by the name of the inviter.
 #define DC_STR_SECURE_JOIN_STARTED        117

 /// "%1$s replied, waiting for being added to the group…"
@@ -7466,7 +7368,7 @@ void dc_event_unref(dc_event_t* event);
 ///
 /// Subtitle for verification qrcode svg image generated by the core.
 ///
-/// `%1$s` will be replaced by name of the inviter.
+/// `%1$s` will be replaced by name and address of the inviter.
 #define DC_STR_SETUP_CONTACT_QR_DESC      119

 /// "Scan to join %1$s"
@@ -7487,6 +7389,19 @@ void dc_event_unref(dc_event_t* event);
 /// @deprecated 2025-06-05
 #define DC_STR_AEAP_ADDR_CHANGED          122

+/// "You changed your email address from %1$s to %2$s.
+/// If you now send a message to a group, contacts there will automatically
+/// replace the old with your new address.\n\n It's highly advised to set up 
+/// your old email provider to forward all emails to your new email address. 
+/// Otherwise you might miss messages of contacts who did not get your new 
+/// address yet." + the link to the AEAP blog post
+/// 
+/// As soon as there is a post about AEAP, the UIs should add it:
+/// set_stock_translation(123, getString(aeap_explanation) + "\n\n" + AEAP_BLOG_LINK)
+///
+/// Used in a device message that explains AEAP.
+#define DC_STR_AEAP_EXPLANATION_AND_LINK  123
+
 /// "You changed group name from \"%1$s\" to \"%2$s\"."
 ///
 /// `%1$s` will be replaced by the old group name.
@@ -7497,7 +7412,7 @@ void dc_event_unref(dc_event_t* event);
 ///
 /// `%1$s` will be replaced by the old group name.
 /// `%2$s` will be replaced by the new group name.
-/// `%3$s` will be replaced by name of the contact who did the action.
+/// `%3$s` will be replaced by name and address of the contact who did the action.
 #define DC_STR_GROUP_NAME_CHANGED_BY_OTHER 125

 /// "You changed the group image."
@@ -7505,7 +7420,7 @@ void dc_event_unref(dc_event_t* event);

 /// "Group image changed by %1$s."
 ///
-/// `%1$s` will be replaced by name of the contact who did the action.
+/// `%1$s` will be replaced by name and address of the contact who did the action.
 #define DC_STR_GROUP_IMAGE_CHANGED_BY_OTHER 127

 /// "You added member %1$s."
@@ -7517,23 +7432,23 @@ void dc_event_unref(dc_event_t* event);

 /// "Member %1$s added by %2$s."
 ///
-/// `%1$s` will be replaced by name of the contact added to the group.
-/// `%2$s` will be replaced by name of the contact who did the action.
+/// `%1$s` will be replaced by name and address of the contact added to the group.
+/// `%2$s` will be replaced by name and address of the contact who did the action.
 ///
 /// Used in status messages.
 #define DC_STR_ADD_MEMBER_BY_OTHER 129

 /// "You removed member %1$s."
 ///
-/// `%1$s` will be replaced by name of the contact removed from the group.
+/// `%1$s` will be replaced by name and address of the contact removed from the group.
 ///
 /// Used in status messages.
 #define DC_STR_REMOVE_MEMBER_BY_YOU 130

 /// "Member %1$s removed by %2$s."
 ///
-/// `%1$s` will be replaced by name of the contact removed from the group.
-/// `%2$s` will be replaced by name of the contact who did the action.
+/// `%1$s` will be replaced by name and address of the contact removed from the group.
+/// `%2$s` will be replaced by name and address of the contact who did the action.
 ///
 /// Used in status messages.
 #define DC_STR_REMOVE_MEMBER_BY_OTHER 131
@@ -7545,7 +7460,7 @@ void dc_event_unref(dc_event_t* event);

 /// "Group left by %1$s."
 ///
-/// `%1$s` will be replaced by name of the contact.
+/// `%1$s` will be replaced by name and address of the contact.
 ///
 /// Used in status messages.
 #define DC_STR_GROUP_LEFT_BY_OTHER 133
@@ -7557,7 +7472,7 @@ void dc_event_unref(dc_event_t* event);

 /// "Group image deleted by %1$s."
 ///
-/// `%1$s` will be replaced by name of the contact.
+/// `%1$s` will be replaced by name and address of the contact.
 ///
 /// Used in status messages.
 #define DC_STR_GROUP_IMAGE_DELETED_BY_OTHER 135
@@ -7569,7 +7484,7 @@ void dc_event_unref(dc_event_t* event);

 /// "Location streaming enabled by %1$s."
 ///
-/// `%1$s` will be replaced by name of the contact.
+/// `%1$s` will be replaced by name and address of the contact.
 ///
 /// Used in status messages.
 #define DC_STR_LOCATION_ENABLED_BY_OTHER 137
@@ -7581,7 +7496,7 @@ void dc_event_unref(dc_event_t* event);

 /// "Message deletion timer is disabled by %1$s."
 ///
-/// `%1$s` will be replaced by name of the contact.
+/// `%1$s` will be replaced by name and address of the contact.
 ///
 /// Used in status messages.
 #define DC_STR_EPHEMERAL_TIMER_DISABLED_BY_OTHER 139
@@ -7596,20 +7511,21 @@ void dc_event_unref(dc_event_t* event);
 /// "Message deletion timer is set to %1$s s by %2$s."
 ///
 /// `%1$s` will be replaced by the number of seconds (always >1) the timer is set to.
-/// `%2$s` will be replaced by name of the contact.
+/// `%2$s` will be replaced by name and address of the contact.
 ///
 /// Used in status messages.
 #define DC_STR_EPHEMERAL_TIMER_SECONDS_BY_OTHER 141

 /// "You set message deletion timer to 1 minute."
 ///
-/// @deprecated 2025-11-14, this string is no longer needed
+/// Used in status messages.
 #define DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_YOU 142

 /// "Message deletion timer is set to 1 minute by %1$s."
 ///
-/// `%1$s` will be replaced by name of the contact.
-/// @deprecated 2025-11-14, this string is no longer needed
+/// `%1$s` will be replaced by name and address of the contact.
+///
+/// Used in status messages.
 #define DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_OTHER 143

 /// "You set message deletion timer to 1 hour."
@@ -7619,7 +7535,7 @@ void dc_event_unref(dc_event_t* event);

 /// "Message deletion timer is set to 1 hour by %1$s."
 ///
-/// `%1$s` will be replaced by name of the contact.
+/// `%1$s` will be replaced by name and address of the contact.
 ///
 /// Used in status messages.
 #define DC_STR_EPHEMERAL_TIMER_1_HOUR_BY_OTHER 145
@@ -7631,7 +7547,7 @@ void dc_event_unref(dc_event_t* event);

 /// "Message deletion timer is set to 1 day by %1$s."
 ///
-/// `%1$s` will be replaced by name of the contact.
+/// `%1$s` will be replaced by name and address of the contact.
 ///
 /// Used in status messages.
 #define DC_STR_EPHEMERAL_TIMER_1_DAY_BY_OTHER 147
@@ -7643,7 +7559,7 @@ void dc_event_unref(dc_event_t* event);

 /// "Message deletion timer is set to 1 week by %1$s."
 ///
-/// `%1$s` will be replaced by name of the contact.
+/// `%1$s` will be replaced by name and address of the contact.
 ///
 /// Used in status messages.
 #define DC_STR_EPHEMERAL_TIMER_1_WEEK_BY_OTHER 149
@@ -7660,7 +7576,7 @@ void dc_event_unref(dc_event_t* event);
 /// Used in status messages.
 ///
 /// `%1$s` will be replaced by the number of minutes (always >1) the timer is set to.
-/// `%2$s` will be replaced by name of the contact.
+/// `%2$s` will be replaced by name and address of the contact.
 #define DC_STR_EPHEMERAL_TIMER_MINUTES_BY_OTHER 151

 /// "You set message deletion timer to %1$s hours."
@@ -7675,7 +7591,7 @@ void dc_event_unref(dc_event_t* event);
 /// Used in status messages.
 ///
 /// `%1$s` will be replaced by the number of hours (always >1) the timer is set to.
-/// `%2$s` will be replaced by name of the contact.
+/// `%2$s` will be replaced by name and address of the contact.
 #define DC_STR_EPHEMERAL_TIMER_HOURS_BY_OTHER 153

 /// "You set message deletion timer to %1$s days."
@@ -7690,7 +7606,7 @@ void dc_event_unref(dc_event_t* event);
 /// Used in status messages.
 ///
 /// `%1$s` will be replaced by the number of days (always >1) the timer is set to.
-/// `%2$s` will be replaced by name of the contact.
+/// `%2$s` will be replaced by name and address of the contact.
 #define DC_STR_EPHEMERAL_TIMER_DAYS_BY_OTHER 155

 /// "You set message deletion timer to %1$s weeks."
@@ -7705,7 +7621,7 @@ void dc_event_unref(dc_event_t* event);
 /// Used in status messages.
 ///
 /// `%1$s` will be replaced by the number of weeks (always >1) the timer is set to.
-/// `%2$s` will be replaced by name of the contact.
+/// `%2$s` will be replaced by name and address of the contact.
 #define DC_STR_EPHEMERAL_TIMER_WEEKS_BY_OTHER 157

 /// "You set message deletion timer to 1 year."
@@ -7715,14 +7631,14 @@ void dc_event_unref(dc_event_t* event);

 /// "Message deletion timer is set to 1 year by %1$s."
 ///
-/// `%1$s` will be replaced by name of the contact.
+/// `%1$s` will be replaced by name and address of the contact.
 ///
 /// Used in status messages.
 #define DC_STR_EPHEMERAL_TIMER_1_YEAR_BY_OTHER 159

 /// "Scan to set up second device for %1$s"
 ///
-/// `%1$s` will be replaced by name of the account.
+/// `%1$s` will be replaced by name and address of the account.
 #define DC_STR_BACKUP_TRANSFER_QR 162

 /// "Account transferred to your second device."
@@ -7735,6 +7651,12 @@ void dc_event_unref(dc_event_t* event);
 /// Used in info messages.
 #define DC_STR_CHAT_PROTECTION_ENABLED 170

+/// "%1$s sent a message from another device."
+///
+/// Used in info messages.
+/// @deprecated 2025-07
+#define DC_STR_CHAT_PROTECTION_DISABLED 171
+
 /// "Others will only see this group after you sent a first message."
 ///
 /// Used as the first info messages in newly created groups.
@@ -7771,12 +7693,7 @@ void dc_event_unref(dc_event_t* event);
 /// Used in summaries.
 #define DC_STR_REACTED_BY 177

-/// "Member %1$s removed."
-///
-/// `%1$s` will be replaced by name of the removed contact.
-#define DC_STR_REMOVE_MEMBER 178
-
-/// "Establishing connection, please wait…"
+/// "Establishing guaranteed end-to-end encryption, please wait…"
 ///
 /// Used as info message.
 #define DC_STR_SECUREJOIN_WAIT 190
@@ -7820,22 +7737,7 @@ void dc_event_unref(dc_event_t* event);
 /// Subtitle for channel join qrcode svg image generated by the core.
 ///
 /// `%1$s` will be replaced with the channel name.
-#define DC_STR_SECURE_JOIN_CHANNEL_QR_DESC 201
-
-/// "You joined the channel."
-#define DC_STR_MSG_YOU_JOINED_CHANNEL 202
-
-/// "%1$s invited you to join this channel. Waiting for the device of %2$s to reply…"
-///
-/// Added as an info-message directly after scanning a QR code for joining a broadcast channel.
-///
-/// `%1$s` and `%2$s` will both be replaced by the name of the inviter.
-#define DC_STR_SECURE_JOIN_CHANNEL_STARTED 203
-
-/// "The attachment contains anonymous usage statistics, which help us improve Delta Chat. Thank you!"
-///
-/// Used as the message body for statistics sent out.
-#define DC_STR_STATS_MSG_BODY 210
+#define DC_STR_SECURE_JOIN_CHANNEL_QR_DESC  201

 /// "Proxy Enabled"
 ///
@@ -7847,11 +7749,6 @@ void dc_event_unref(dc_event_t* event);
 /// Description in connectivity view when proxy is enabled.
 #define DC_STR_PROXY_ENABLED_DESCRIPTION  221

-/// "Messages in this chat use classic email and are not encrypted."
-///
-/// Used as the first info messages in newly created classic email threads.
-#define DC_STR_CHAT_UNENCRYPTED_EXPLANATON 230
-
 /**
 * @}
 */
--- a/deltachat-ffi/src/lib.rs
+++ b/deltachat-ffi/src/lib.rs
@@ -15,9 +15,10 @@ use std::collections::BTreeMap;
 use std::convert::TryFrom;
 use std::fmt::Write;
 use std::future::Future;
+use std::ops::Deref;
 use std::ptr;
 use std::str::FromStr;
-use std::sync::{Arc, LazyLock, Mutex};
+use std::sync::{Arc, LazyLock};
 use std::time::{Duration, SystemTime};

 use anyhow::Context as _;
@@ -558,7 +559,6 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
        EventType::IncomingCallAccepted { .. } => 2560,
        EventType::OutgoingCallAccepted { .. } => 2570,
        EventType::CallEnded { .. } => 2580,
-        EventType::TransportsModified => 2600,
        #[allow(unreachable_patterns)]
        #[cfg(test)]
        _ => unreachable!("This is just to silence a rust_analyzer false-positive"),
@@ -593,8 +593,7 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
        | EventType::AccountsBackgroundFetchDone
        | EventType::ChatlistChanged
        | EventType::AccountsChanged
-        | EventType::AccountsItemChanged
-        | EventType::TransportsModified => 0,
+        | EventType::AccountsItemChanged => 0,
        EventType::IncomingReaction { contact_id, .. }
        | EventType::IncomingWebxdcNotify { contact_id, .. } => contact_id.to_u32() as libc::c_int,
        EventType::MsgsChanged { chat_id, .. }
@@ -682,8 +681,7 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
        | EventType::IncomingCallAccepted { .. }
        | EventType::OutgoingCallAccepted { .. }
        | EventType::CallEnded { .. }
-        | EventType::EventChannelOverflow { .. }
-        | EventType::TransportsModified => 0,
+        | EventType::EventChannelOverflow { .. } => 0,
        EventType::MsgsChanged { msg_id, .. }
        | EventType::ReactionsChanged { msg_id, .. }
        | EventType::IncomingReaction { msg_id, .. }
@@ -782,8 +780,7 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
        | EventType::AccountsChanged
        | EventType::AccountsItemChanged
        | EventType::IncomingCallAccepted { .. }
-        | EventType::WebxdcRealtimeAdvertisementReceived { .. }
-        | EventType::TransportsModified => ptr::null_mut(),
+        | EventType::WebxdcRealtimeAdvertisementReceived { .. } => ptr::null_mut(),
        EventType::IncomingCall {
            place_call_info, ..
        } => {
@@ -4243,17 +4240,7 @@ pub unsafe extern "C" fn dc_contact_get_color(contact: *mut dc_contact_t) -> u32
        return 0;
    }
    let ffi_contact = &*contact;
-    let ctx = &*ffi_contact.context;
-    block_on(async move {
-        ffi_contact
-            .contact
-            // We don't want any UIs displaying gray self-color.
-            .get_or_gen_color(ctx)
-            .await
-            .context("Contact::get_color()")
-            .log_err(ctx)
-            .unwrap_or(0)
-    })
+    ffi_contact.contact.get_color()
 }

 #[no_mangle]
@@ -4738,13 +4725,33 @@ pub unsafe extern "C" fn dc_provider_unref(provider: *mut dc_provider_t) {

 /// Reader-writer lock wrapper for accounts manager to guarantee thread safety when using
 /// `dc_accounts_t` in multiple threads at once.
-pub type dc_accounts_t = RwLock<Accounts>;
+pub struct AccountsWrapper {
+    inner: Arc<RwLock<Accounts>>,
+}
+
+impl Deref for AccountsWrapper {
+    type Target = Arc<RwLock<Accounts>>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.inner
+    }
+}
+
+impl AccountsWrapper {
+    fn new(accounts: Accounts) -> Self {
+        let inner = Arc::new(RwLock::new(accounts));
+        Self { inner }
+    }
+}
+
+/// Struct representing a list of deltachat accounts.
+pub type dc_accounts_t = AccountsWrapper;

 #[no_mangle]
 pub unsafe extern "C" fn dc_accounts_new(
    dir: *const libc::c_char,
    writable: libc::c_int,
-) -> *const dc_accounts_t {
+) -> *mut dc_accounts_t {
    setup_panic!();

    if dir.is_null() {
@@ -4755,99 +4762,7 @@ pub unsafe extern "C" fn dc_accounts_new(
    let accs = block_on(Accounts::new(as_path(dir).into(), writable != 0));

    match accs {
-        Ok(accs) => Arc::into_raw(Arc::new(RwLock::new(accs))),
-        Err(err) => {
-            // We are using Anyhow's .context() and to show the inner error, too, we need the {:#}:
-            eprintln!("failed to create accounts: {err:#}");
-            ptr::null_mut()
-        }
-    }
-}
-
-pub type dc_event_channel_t = Mutex<Option<Events>>;
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_event_channel_new() -> *mut dc_event_channel_t {
-    Box::into_raw(Box::new(Mutex::new(Some(Events::new()))))
-}
-
-/// Release the events channel structure.
-///
-/// This function releases the memory of the `dc_event_channel_t` structure.
-///
-/// you can call it after calling dc_accounts_new_with_event_channel,
-/// which took the events channel out of it already, so this just frees the underlying option.
-#[no_mangle]
-pub unsafe extern "C" fn dc_event_channel_unref(event_channel: *mut dc_event_channel_t) {
-    if event_channel.is_null() {
-        eprintln!("ignoring careless call to dc_event_channel_unref()");
-        return;
-    }
-    drop(Box::from_raw(event_channel))
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_event_channel_get_event_emitter(
-    event_channel: *mut dc_event_channel_t,
-) -> *mut dc_event_emitter_t {
-    if event_channel.is_null() {
-        eprintln!("ignoring careless call to dc_event_channel_get_event_emitter()");
-        return ptr::null_mut();
-    }
-
-    let Some(event_channel) = &*(*event_channel)
-        .lock()
-        .expect("call to dc_event_channel_get_event_emitter() failed: mutex is poisoned")
-    else {
-        eprintln!(
-            "ignoring careless call to dc_event_channel_get_event_emitter() 
-            -> channel was already consumed, make sure you call this before dc_accounts_new_with_event_channel"
-        );
-        return ptr::null_mut();
-    };
-
-    let emitter = event_channel.get_emitter();
-
-    Box::into_raw(Box::new(emitter))
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_accounts_new_with_event_channel(
-    dir: *const libc::c_char,
-    writable: libc::c_int,
-    event_channel: *mut dc_event_channel_t,
-) -> *const dc_accounts_t {
-    setup_panic!();
-
-    if dir.is_null() || event_channel.is_null() {
-        eprintln!("ignoring careless call to dc_accounts_new_with_event_channel()");
-        return ptr::null_mut();
-    }
-
-    // consuming channel enforce that you need to get the event emitter
-    // before initializing the account manager,
-    // so that you don't miss events/errors during initialisation.
-    // It also prevents you from using the same channel on multiple account managers.
-    let Some(event_channel) = (*event_channel)
-        .lock()
-        .expect("call to dc_event_channel_get_event_emitter() failed: mutex is poisoned")
-        .take()
-    else {
-        eprintln!(
-            "ignoring careless call to dc_accounts_new_with_event_channel()
-            -> channel was already consumed"
-        );
-        return ptr::null_mut();
-    };
-
-    let accs = block_on(Accounts::new_with_events(
-        as_path(dir).into(),
-        writable != 0,
-        event_channel,
-    ));
-
-    match accs {
-        Ok(accs) => Arc::into_raw(Arc::new(RwLock::new(accs))),
+        Ok(accs) => Box::into_raw(Box::new(AccountsWrapper::new(accs))),
        Err(err) => {
            // We are using Anyhow's .context() and to show the inner error, too, we need the {:#}:
            eprintln!("failed to create accounts: {err:#}");
@@ -4860,17 +4775,17 @@ pub unsafe extern "C" fn dc_accounts_new_with_event_channel(
 ///
 /// This function releases the memory of the `dc_accounts_t` structure.
 #[no_mangle]
-pub unsafe extern "C" fn dc_accounts_unref(accounts: *const dc_accounts_t) {
+pub unsafe extern "C" fn dc_accounts_unref(accounts: *mut dc_accounts_t) {
    if accounts.is_null() {
        eprintln!("ignoring careless call to dc_accounts_unref()");
        return;
    }
-    drop(Arc::from_raw(accounts));
+    let _ = Box::from_raw(accounts);
 }

 #[no_mangle]
 pub unsafe extern "C" fn dc_accounts_get_account(
-    accounts: *const dc_accounts_t,
+    accounts: *mut dc_accounts_t,
    id: u32,
 ) -> *mut dc_context_t {
    if accounts.is_null() {
@@ -4887,7 +4802,7 @@ pub unsafe extern "C" fn dc_accounts_get_account(

 #[no_mangle]
 pub unsafe extern "C" fn dc_accounts_get_selected_account(
-    accounts: *const dc_accounts_t,
+    accounts: *mut dc_accounts_t,
 ) -> *mut dc_context_t {
    if accounts.is_null() {
        eprintln!("ignoring careless call to dc_accounts_get_selected_account()");
@@ -4903,7 +4818,7 @@ pub unsafe extern "C" fn dc_accounts_get_selected_account(

 #[no_mangle]
 pub unsafe extern "C" fn dc_accounts_select_account(
-    accounts: *const dc_accounts_t,
+    accounts: *mut dc_accounts_t,
    id: u32,
 ) -> libc::c_int {
    if accounts.is_null() {
@@ -4927,13 +4842,13 @@ pub unsafe extern "C" fn dc_accounts_select_account(
 }

 #[no_mangle]
-pub unsafe extern "C" fn dc_accounts_add_account(accounts: *const dc_accounts_t) -> u32 {
+pub unsafe extern "C" fn dc_accounts_add_account(accounts: *mut dc_accounts_t) -> u32 {
    if accounts.is_null() {
        eprintln!("ignoring careless call to dc_accounts_add_account()");
        return 0;
    }

-    let accounts = &*accounts;
+    let accounts = &mut *accounts;

    block_on(async move {
        let mut accounts = accounts.write().await;
@@ -4948,13 +4863,13 @@ pub unsafe extern "C" fn dc_accounts_add_account(accounts: *const dc_accounts_t)
 }

 #[no_mangle]
-pub unsafe extern "C" fn dc_accounts_add_closed_account(accounts: *const dc_accounts_t) -> u32 {
+pub unsafe extern "C" fn dc_accounts_add_closed_account(accounts: *mut dc_accounts_t) -> u32 {
    if accounts.is_null() {
        eprintln!("ignoring careless call to dc_accounts_add_closed_account()");
        return 0;
    }

-    let accounts = &*accounts;
+    let accounts = &mut *accounts;

    block_on(async move {
        let mut accounts = accounts.write().await;
@@ -4970,7 +4885,7 @@ pub unsafe extern "C" fn dc_accounts_add_closed_account(accounts: *const dc_acco

 #[no_mangle]
 pub unsafe extern "C" fn dc_accounts_remove_account(
-    accounts: *const dc_accounts_t,
+    accounts: *mut dc_accounts_t,
    id: u32,
 ) -> libc::c_int {
    if accounts.is_null() {
@@ -4978,7 +4893,7 @@ pub unsafe extern "C" fn dc_accounts_remove_account(
        return 0;
    }

-    let accounts = &*accounts;
+    let accounts = &mut *accounts;

    block_on(async move {
        let mut accounts = accounts.write().await;
@@ -4996,7 +4911,7 @@ pub unsafe extern "C" fn dc_accounts_remove_account(

 #[no_mangle]
 pub unsafe extern "C" fn dc_accounts_migrate_account(
-    accounts: *const dc_accounts_t,
+    accounts: *mut dc_accounts_t,
    dbfile: *const libc::c_char,
 ) -> u32 {
    if accounts.is_null() || dbfile.is_null() {
@@ -5004,7 +4919,7 @@ pub unsafe extern "C" fn dc_accounts_migrate_account(
        return 0;
    }

-    let accounts = &*accounts;
+    let accounts = &mut *accounts;
    let dbfile = to_string_lossy(dbfile);

    block_on(async move {
@@ -5025,7 +4940,7 @@ pub unsafe extern "C" fn dc_accounts_migrate_account(
 }

 #[no_mangle]
-pub unsafe extern "C" fn dc_accounts_get_all(accounts: *const dc_accounts_t) -> *mut dc_array_t {
+pub unsafe extern "C" fn dc_accounts_get_all(accounts: *mut dc_accounts_t) -> *mut dc_array_t {
    if accounts.is_null() {
        eprintln!("ignoring careless call to dc_accounts_get_all()");
        return ptr::null_mut();
@@ -5039,18 +4954,18 @@ pub unsafe extern "C" fn dc_accounts_get_all(accounts: *const dc_accounts_t) ->
 }

 #[no_mangle]
-pub unsafe extern "C" fn dc_accounts_start_io(accounts: *const dc_accounts_t) {
+pub unsafe extern "C" fn dc_accounts_start_io(accounts: *mut dc_accounts_t) {
    if accounts.is_null() {
        eprintln!("ignoring careless call to dc_accounts_start_io()");
        return;
    }

-    let accounts = &*accounts;
+    let accounts = &mut *accounts;
    block_on(async move { accounts.write().await.start_io().await });
 }

 #[no_mangle]
-pub unsafe extern "C" fn dc_accounts_stop_io(accounts: *const dc_accounts_t) {
+pub unsafe extern "C" fn dc_accounts_stop_io(accounts: *mut dc_accounts_t) {
    if accounts.is_null() {
        eprintln!("ignoring careless call to dc_accounts_stop_io()");
        return;
@@ -5061,7 +4976,7 @@ pub unsafe extern "C" fn dc_accounts_stop_io(accounts: *const dc_accounts_t) {
 }

 #[no_mangle]
-pub unsafe extern "C" fn dc_accounts_maybe_network(accounts: *const dc_accounts_t) {
+pub unsafe extern "C" fn dc_accounts_maybe_network(accounts: *mut dc_accounts_t) {
    if accounts.is_null() {
        eprintln!("ignoring careless call to dc_accounts_maybe_network()");
        return;
@@ -5072,7 +4987,7 @@ pub unsafe extern "C" fn dc_accounts_maybe_network(accounts: *const dc_accounts_
 }

 #[no_mangle]
-pub unsafe extern "C" fn dc_accounts_maybe_network_lost(accounts: *const dc_accounts_t) {
+pub unsafe extern "C" fn dc_accounts_maybe_network_lost(accounts: *mut dc_accounts_t) {
    if accounts.is_null() {
        eprintln!("ignoring careless call to dc_accounts_maybe_network_lost()");
        return;
@@ -5084,7 +4999,7 @@ pub unsafe extern "C" fn dc_accounts_maybe_network_lost(accounts: *const dc_acco

 #[no_mangle]
 pub unsafe extern "C" fn dc_accounts_background_fetch(
-    accounts: *const dc_accounts_t,
+    accounts: *mut dc_accounts_t,
    timeout_in_seconds: u64,
 ) -> libc::c_int {
    if accounts.is_null() || timeout_in_seconds <= 2 {
@@ -5102,20 +5017,9 @@ pub unsafe extern "C" fn dc_accounts_background_fetch(
    1
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_accounts_stop_background_fetch(accounts: *const dc_accounts_t) {
-    if accounts.is_null() {
-        eprintln!("ignoring careless call to dc_accounts_stop_background_fetch()");
-        return;
-    }
-
-    let accounts = &*accounts;
-    block_on(accounts.read()).stop_background_fetch();
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_accounts_set_push_device_token(
-    accounts: *const dc_accounts_t,
+    accounts: *mut dc_accounts_t,
    token: *const libc::c_char,
 ) {
    if accounts.is_null() {
@@ -5138,7 +5042,7 @@ pub unsafe extern "C" fn dc_accounts_set_push_device_token(

 #[no_mangle]
 pub unsafe extern "C" fn dc_accounts_get_event_emitter(
-    accounts: *const dc_accounts_t,
+    accounts: *mut dc_accounts_t,
 ) -> *mut dc_event_emitter_t {
    if accounts.is_null() {
        eprintln!("ignoring careless call to dc_accounts_get_event_emitter()");
@@ -5158,16 +5062,16 @@ pub struct dc_jsonrpc_instance_t {

 #[no_mangle]
 pub unsafe extern "C" fn dc_jsonrpc_init(
-    account_manager: *const dc_accounts_t,
+    account_manager: *mut dc_accounts_t,
 ) -> *mut dc_jsonrpc_instance_t {
    if account_manager.is_null() {
        eprintln!("ignoring careless call to dc_jsonrpc_init()");
        return ptr::null_mut();
    }

-    let account_manager = Arc::from_raw(account_manager);
+    let account_manager = &*account_manager;
    let cmd_api = block_on(deltachat_jsonrpc::api::CommandApi::from_arc(
-        account_manager.clone(),
+        account_manager.inner.clone(),
    ));

    let (request_handle, receiver) = RpcClient::new();
--- a/deltachat-ffi/src/lot.rs
+++ b/deltachat-ffi/src/lot.rs
@@ -58,10 +58,8 @@ impl Lot {
                Qr::Text { text } => Some(Cow::Borrowed(text)),
                Qr::WithdrawVerifyContact { .. } => None,
                Qr::WithdrawVerifyGroup { grpname, .. } => Some(Cow::Borrowed(grpname)),
-                Qr::WithdrawJoinBroadcast { name, .. } => Some(Cow::Borrowed(name)),
                Qr::ReviveVerifyContact { .. } => None,
                Qr::ReviveVerifyGroup { grpname, .. } => Some(Cow::Borrowed(grpname)),
-                Qr::ReviveJoinBroadcast { name, .. } => Some(Cow::Borrowed(name)),
                Qr::Login { address, .. } => Some(Cow::Borrowed(address)),
            },
            Self::Error(err) => Some(Cow::Borrowed(err)),
@@ -114,10 +112,8 @@ impl Lot {
                Qr::Text { .. } => LotState::QrText,
                Qr::WithdrawVerifyContact { .. } => LotState::QrWithdrawVerifyContact,
                Qr::WithdrawVerifyGroup { .. } => LotState::QrWithdrawVerifyGroup,
-                Qr::WithdrawJoinBroadcast { .. } => LotState::QrWithdrawJoinBroadcast,
                Qr::ReviveVerifyContact { .. } => LotState::QrReviveVerifyContact,
                Qr::ReviveVerifyGroup { .. } => LotState::QrReviveVerifyGroup,
-                Qr::ReviveJoinBroadcast { .. } => LotState::QrReviveJoinBroadcast,
                Qr::Login { .. } => LotState::QrLogin,
            },
            Self::Error(_err) => LotState::QrError,
@@ -142,11 +138,9 @@ impl Lot {
                Qr::Url { .. } => Default::default(),
                Qr::Text { .. } => Default::default(),
                Qr::WithdrawVerifyContact { contact_id, .. } => contact_id.to_u32(),
-                Qr::WithdrawVerifyGroup { .. } | Qr::WithdrawJoinBroadcast { .. } => {
-                    Default::default()
-                }
+                Qr::WithdrawVerifyGroup { .. } => Default::default(),
                Qr::ReviveVerifyContact { contact_id, .. } => contact_id.to_u32(),
-                Qr::ReviveVerifyGroup { .. } | Qr::ReviveJoinBroadcast { .. } => Default::default(),
+                Qr::ReviveVerifyGroup { .. } => Default::default(),
                Qr::Login { .. } => Default::default(),
            },
            Self::Error(_) => Default::default(),
@@ -213,15 +207,11 @@ pub enum LotState {

    /// text1=groupname
    QrWithdrawVerifyGroup = 502,
-    /// text1=broadcast channel name
-    QrWithdrawJoinBroadcast = 504,

    QrReviveVerifyContact = 510,

    /// text1=groupname
    QrReviveVerifyGroup = 512,
-    /// text1=groupname
-    QrReviveJoinBroadcast = 514,

    /// text1=email_address
    QrLogin = 520,
--- a/deltachat-jsonrpc/Cargo.toml
+++ b/deltachat-jsonrpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "2.38.0"
+version = "2.25.0"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
 license = "MPL-2.0"
@@ -19,6 +19,7 @@ yerpc = { workspace = true, features = ["anyhow_expose", "openrpc"] }
 typescript-type-def = { version = "0.5.13", features = ["json_value"] }
 tokio = { workspace = true }
 sanitize-filename = { workspace = true }
+walkdir = "2.5.0"
 base64 = { workspace = true }

 [dev-dependencies]
--- a/deltachat-jsonrpc/src/api.rs
+++ b/deltachat-jsonrpc/src/api.rs
@@ -10,21 +10,20 @@ pub use deltachat::accounts::Accounts;
 use deltachat::blob::BlobObject;
 use deltachat::calls::ice_servers;
 use deltachat::chat::{
-    self, add_contact_to_chat, forward_msgs, forward_msgs_2ctx, get_chat_media, get_chat_msgs,
-    get_chat_msgs_ex, marknoticed_all_chats, marknoticed_chat, remove_contact_from_chat, Chat,
-    ChatId, ChatItem, MessageListOptions,
+    self, add_contact_to_chat, forward_msgs, get_chat_media, get_chat_msgs, get_chat_msgs_ex,
+    marknoticed_chat, remove_contact_from_chat, Chat, ChatId, ChatItem, MessageListOptions,
 };
 use deltachat::chatlist::Chatlist;
-use deltachat::config::{get_all_ui_config_keys, Config};
+use deltachat::config::Config;
 use deltachat::constants::DC_MSG_ID_DAYMARKER;
 use deltachat::contact::{may_be_valid_addr, Contact, ContactId, Origin};
 use deltachat::context::get_info;
 use deltachat::ephemeral::Timer;
 use deltachat::imex;
 use deltachat::location;
+use deltachat::message::get_msg_read_receipts;
 use deltachat::message::{
-    self, delete_msgs_ex, get_existing_msg_ids, get_msg_read_receipt_count, get_msg_read_receipts,
-    markseen_msgs, Message, MessageState, MsgId, Viewtype,
+    self, delete_msgs_ex, markseen_msgs, Message, MessageState, MsgId, Viewtype,
 };
 use deltachat::peer_channels::{
    leave_webxdc_realtime, send_webxdc_realtime_advertisement, send_webxdc_realtime_data,
@@ -35,13 +34,13 @@ use deltachat::qr_code_generator::{generate_backup_qr, get_securejoin_qr_svg};
 use deltachat::reaction::{get_msg_reactions, send_reaction};
 use deltachat::securejoin;
 use deltachat::stock_str::StockMessage;
-use deltachat::storage_usage::{get_blobdir_storage_usage, get_storage_usage};
 use deltachat::webxdc::StatusUpdateSerial;
 use deltachat::EventEmitter;
 use sanitize_filename::is_sanitized;
 use tokio::fs;
 use tokio::sync::{watch, Mutex, RwLock};
 use types::login_param::EnteredLoginParam;
+use walkdir::WalkDir;
 use yerpc::rpc;

 pub mod types;
@@ -121,14 +120,14 @@ impl CommandApi {
        }
    }

-    async fn get_context_opt(&self, id: u32) -> Option<deltachat::context::Context> {
-        self.accounts.read().await.get_account(id)
-    }
-
    async fn get_context(&self, id: u32) -> Result<deltachat::context::Context> {
-        self.get_context_opt(id)
+        let sc = self
+            .accounts
+            .read()
            .await
-            .ok_or_else(|| anyhow!("account with id {id} not found"))
+            .get_account(id)
+            .ok_or_else(|| anyhow!("account with id {id} not found"))?;
+        Ok(sc)
    }

    async fn with_state<F, T>(&self, id: u32, with_state: F) -> T
@@ -274,7 +273,7 @@ impl CommandApi {
    /// The `AccountsBackgroundFetchDone` event is emitted at the end even in case of timeout.
    /// Process all events until you get this one and you can safely return to the background
    /// without forgetting to create notifications caused by timing race conditions.
-    async fn background_fetch(&self, timeout_in_seconds: f64) -> Result<()> {
+    async fn accounts_background_fetch(&self, timeout_in_seconds: f64) -> Result<()> {
        let future = {
            let lock = self.accounts.read().await;
            lock.background_fetch(std::time::Duration::from_secs_f64(timeout_in_seconds))
@@ -284,11 +283,6 @@ impl CommandApi {
        Ok(())
    }

-    async fn stop_background_fetch(&self) -> Result<()> {
-        self.accounts.read().await.stop_background_fetch();
-        Ok(())
-    }
-
    // ---------------------------------------------
    // Methods that work on individual accounts
    // ---------------------------------------------
@@ -329,7 +323,13 @@ impl CommandApi {
    async fn get_account_file_size(&self, account_id: u32) -> Result<u64> {
        let ctx = self.get_context(account_id).await?;
        let dbfile = ctx.get_dbfile().metadata()?.len();
-        let total_size = get_blobdir_storage_usage(&ctx);
+        let total_size = WalkDir::new(ctx.get_blobdir())
+            .max_depth(2)
+            .into_iter()
+            .filter_map(|entry| entry.ok())
+            .filter_map(|entry| entry.metadata().ok())
+            .filter(|metadata| metadata.is_file())
+            .fold(0, |acc, m| acc + m.len());

        Ok(dbfile + total_size)
    }
@@ -361,13 +361,6 @@ impl CommandApi {
        ctx.get_info().await
    }

-    /// Get storage usage report as formatted string
-    async fn get_storage_usage_report_string(&self, account_id: u32) -> Result<String> {
-        let ctx = self.get_context(account_id).await?;
-        let storage_usage = get_storage_usage(&ctx).await?;
-        Ok(storage_usage.to_string())
-    }
-
    /// Get the blob dir.
    async fn get_blob_dir(&self, account_id: u32) -> Result<Option<String>> {
        let ctx = self.get_context(account_id).await?;
@@ -416,11 +409,11 @@ impl CommandApi {
        Ok(())
    }

-    /// Set configuration values from a QR code (technically from the URI stored in it).
-    /// Before this function is called, `check_qr()` should be used to get the QR code type.
+    /// Set configuration values from a QR code. (technically from the URI that is stored in the qrcode)
+    /// Before this function is called, `checkQr()` should confirm the type of the
+    /// QR code is `account` or `webrtcInstance`.
    ///
-    /// "DCACCOUNT:" and "DCLOGIN:" QR codes configure the account, but I/O mustn't be started for
-    /// such QR codes, consider using [`Self::add_transport_from_qr`] which also restarts I/O.
+    /// Internally, the function will call dc_set_config() with the appropriate keys,
    async fn set_config_from_qr(&self, account_id: u32, qr_content: String) -> Result<()> {
        let ctx = self.get_context(account_id).await?;
        qr::set_config_from_qr(&ctx, &qr_content).await
@@ -452,12 +445,6 @@ impl CommandApi {
        Ok(result)
    }

-    /// Returns all `ui.*` config keys that were set by the UI.
-    async fn get_all_ui_config_keys(&self, account_id: u32) -> Result<Vec<String>> {
-        let ctx = self.get_context(account_id).await?;
-        get_all_ui_config_keys(&ctx).await
-    }
-
    async fn set_stock_strings(&self, strings: HashMap<u32, String>) -> Result<()> {
        let accounts = self.accounts.read().await;
        for (stock_id, stock_message) in strings {
@@ -801,11 +788,11 @@ impl CommandApi {
    /// Delete a chat.
    ///
    /// Messages are deleted from the device and the chat database entry is deleted.
-    /// After that, a `MsgsChanged` event is emitted.
-    /// Messages are deleted from the server in background.
+    /// After that, the event #DC_EVENT_MSGS_CHANGED is posted.
    ///
    /// Things that are _not done_ implicitly:
    ///
+    /// - Messages are **not deleted from the server**.
    /// - The chat or the contact is **not blocked**, so new messages from the user/the group may appear as a contact request
    ///   and the user may create the chat again.
    /// - **Groups are not left** - this would
@@ -1164,24 +1151,10 @@ impl CommandApi {
        Ok(None)
    }

-    /// Mark all messages in all chats as _noticed_.
-    /// Skips messages from blocked contacts, but does not skip messages in muted chats.
-    ///
-    /// _Noticed_ messages are no longer _fresh_ and do not count as being unseen
-    /// but are still waiting for being marked as "seen" using markseen_msgs()
-    /// (read receipts aren't sent for noticed messages).
-    ///
-    /// Calling this function usually results in the event #DC_EVENT_MSGS_NOTICED.
-    /// See also markseen_msgs().
-    pub async fn marknoticed_all_chats(&self, account_id: u32) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        marknoticed_all_chats(&ctx).await
-    }
-
    ///  Mark all messages in a chat as _noticed_.
    ///  _Noticed_ messages are no longer _fresh_ and do not count as being unseen
    ///  but are still waiting for being marked as "seen" using markseen_msgs()
-    ///  (read receipts aren't sent for noticed messages).
+    ///  (IMAP/MDNs is not done for noticed messages).
    ///
    ///  Calling this function usually results in the event #DC_EVENT_MSGS_NOTICED.
    ///  See also markseen_msgs().
@@ -1317,24 +1290,6 @@ impl CommandApi {
            .collect())
    }

-    /// Checks if the messages with given IDs exist.
-    ///
-    /// Returns IDs of existing messages.
-    async fn get_existing_msg_ids(&self, account_id: u32, msg_ids: Vec<u32>) -> Result<Vec<u32>> {
-        if let Some(context) = self.get_context_opt(account_id).await {
-            let msg_ids: Vec<MsgId> = msg_ids.into_iter().map(MsgId::new).collect();
-            let existing_msg_ids = get_existing_msg_ids(&context, &msg_ids).await?;
-            Ok(existing_msg_ids
-                .into_iter()
-                .map(|msg_id| msg_id.to_u32())
-                .collect())
-        } else {
-            // Account does not exist, so messages do not exist either,
-            // but this is not an error.
-            Ok(Vec::new())
-        }
-    }
-
    async fn get_message_list_items(
        &self,
        account_id: u32,
@@ -1448,18 +1403,6 @@ impl CommandApi {
        MessageInfo::from_msg_id(&ctx, MsgId::new(message_id)).await
    }

-    /// Returns count of read receipts on message.
-    ///
-    /// This view count is meant as a feedback measure for the channel owner only.
-    async fn get_message_read_receipt_count(
-        &self,
-        account_id: u32,
-        message_id: u32,
-    ) -> Result<usize> {
-        let ctx = self.get_context(account_id).await?;
-        get_msg_read_receipt_count(&ctx, MsgId::new(message_id)).await
-    }
-
    /// Returns contacts that sent read receipts and the time of reading.
    async fn get_message_read_receipts(
        &self,
@@ -2234,27 +2177,6 @@ impl CommandApi {
        forward_msgs(&ctx, &message_ids, ChatId::new(chat_id)).await
    }

-    /// Forward messages to a chat in another account.
-    /// See [`Self::forward_messages`] for more info.
-    async fn forward_messages_to_account(
-        &self,
-        src_account_id: u32,
-        src_message_ids: Vec<u32>,
-        dst_account_id: u32,
-        dst_chat_id: u32,
-    ) -> Result<()> {
-        let src_ctx = self.get_context(src_account_id).await?;
-        let dst_ctx = self.get_context(dst_account_id).await?;
-        let src_message_ids: Vec<MsgId> = src_message_ids.into_iter().map(MsgId::new).collect();
-        forward_msgs_2ctx(
-            &src_ctx,
-            &src_message_ids,
-            &dst_ctx,
-            ChatId::new(dst_chat_id),
-        )
-        .await
-    }
-
    /// Resend messages and make information available for newly added chat members.
    /// Resending sends out the original message, however, recipients and webxdc-status may differ.
    /// Clients that already have the original message can still ignore the resent message as
--- a/deltachat-jsonrpc/src/api/types/account.rs
+++ b/deltachat-jsonrpc/src/api/types/account.rs
@@ -15,7 +15,7 @@ pub enum Account {
        display_name: Option<String>,
        addr: Option<String>,
        // size: u32,
-        profile_image: Option<String>,
+        profile_image: Option<String>, // TODO: This needs to be converted to work with blob http server.
        color: String,
        /// Optional tag as "Work", "Family".
        /// Meant to help profile owner to differ between profiles with similar names.
@@ -32,10 +32,7 @@ impl Account {
            let addr = ctx.get_config(Config::Addr).await?;
            let profile_image = ctx.get_config(Config::Selfavatar).await?;
            let color = color_int_to_hex_string(
-                Contact::get_by_id(ctx, ContactId::SELF)
-                    .await?
-                    .get_or_gen_color(ctx)
-                    .await?,
+                Contact::get_by_id(ctx, ContactId::SELF).await?.get_color(),
            );
            let private_tag = ctx.get_config(Config::PrivateTag).await?;
            Ok(Account::Configured {
--- a/deltachat-jsonrpc/src/api/types/chat.rs
+++ b/deltachat-jsonrpc/src/api/types/chat.rs
@@ -10,6 +10,7 @@ use serde::{Deserialize, Serialize};
 use typescript_type_def::TypeDef;

 use super::color_int_to_hex_string;
+use super::contact::ContactObject;

 #[derive(Serialize, TypeDef, schemars::JsonSchema)]
 #[serde(rename_all = "camelCase")]
@@ -47,6 +48,7 @@ pub struct FullChat {
    chat_type: JsonrpcChatType,
    is_unpromoted: bool,
    is_self_talk: bool,
+    contacts: Vec<ContactObject>,
    contact_ids: Vec<u32>,

    /// Contact IDs of the past chat members.
@@ -67,7 +69,7 @@ pub struct FullChat {
    // but that would be an extra DB query.
    self_in_group: bool,
    is_muted: bool,
-    ephemeral_timer: u32,
+    ephemeral_timer: u32, //TODO look if there are more important properties in newer core versions
    can_send: bool,
    was_seen_recently: bool,
    mailing_list_address: Option<String>,
@@ -81,6 +83,20 @@ impl FullChat {
        let contact_ids = get_chat_contacts(context, rust_chat_id).await?;
        let past_contact_ids = get_past_chat_contacts(context, rust_chat_id).await?;

+        let mut contacts = Vec::with_capacity(contact_ids.len());
+
+        for contact_id in &contact_ids {
+            contacts.push(
+                ContactObject::try_from_dc_contact(
+                    context,
+                    Contact::get_by_id(context, *contact_id)
+                        .await
+                        .context("failed to load contact")?,
+                )
+                .await?,
+            )
+        }
+
        let profile_image = match chat.get_profile_image(context).await? {
            Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
            None => None,
@@ -116,6 +132,7 @@ impl FullChat {
            chat_type: chat.get_type().into(),
            is_unpromoted: chat.is_unpromoted(),
            is_self_talk: chat.is_self_talk(),
+            contacts,
            contact_ids: contact_ids.iter().map(|id| id.to_u32()).collect(),
            past_contact_ids: past_contact_ids.iter().map(|id| id.to_u32()).collect(),
            color,
@@ -133,6 +150,7 @@ impl FullChat {
 }

 /// cheaper version of fullchat, omits:
+/// - contacts
 /// - contact_ids
 /// - fresh_message_counter
 /// - ephemeral_timer
--- a/deltachat-jsonrpc/src/api/types/contact.rs
+++ b/deltachat-jsonrpc/src/api/types/contact.rs
@@ -47,7 +47,8 @@ pub struct ContactObject {
    ///
    /// - If `verifierId` != 0,
    ///   display text "Introduced by ..."
-    ///   with the name of the contact.
+    ///   with the name and address of the contact
+    ///   formatted by `name_and_addr`/`nameAndAddr`.
    ///   Prefix the text by a green checkmark.
    ///
    /// - If `verifierId` == 0 and `isVerified` != 0,
--- a/deltachat-jsonrpc/src/api/types/events.rs
+++ b/deltachat-jsonrpc/src/api/types/events.rs
@@ -271,7 +271,7 @@ pub enum EventType {
        /// Progress.
        ///
        /// 0=error, 1-999=progress in permille, 1000=success and done
-        progress: u16,
+        progress: usize,

        /// Progress comment or error, something to display to the user.
        comment: Option<String>,
@@ -282,7 +282,7 @@ pub enum EventType {
    #[serde(rename_all = "camelCase")]
    ImexProgress {
        /// 0=error, 1-999=progress in permille, 1000=success and done
-        progress: u16,
+        progress: usize,
    },

    /// A file has been exported. A file has been written by imex().
@@ -313,7 +313,7 @@ pub enum EventType {
        chat_id: u32,

        /// Progress, always 1000.
-        progress: u16,
+        progress: usize,
    },

    /// Progress information of a secure-join handshake from the view of the joiner
@@ -329,7 +329,7 @@ pub enum EventType {
        /// 400=vg-/vc-request-with-auth sent, typically shown as "alice@addr verified, introducing myself."
        /// (Bob has verified alice and waits until Alice does the same for him)
        /// 1000=vg-member-added/vc-contact-confirm received
-        progress: u16,
+        progress: usize,
    },

    /// The connectivity to the server changed.
@@ -460,15 +460,6 @@ pub enum EventType {
        /// ID of the chat which the message belongs to.
        chat_id: u32,
    },
-
-    /// One or more transports has changed.
-    ///
-    /// UI should update the list.
-    ///
-    /// This event is emitted when transport
-    /// synchronization messages arrives,
-    /// but not when the UI modifies the transport list by itself.
-    TransportsModified,
 }

 impl From<CoreEventType> for EventType {
@@ -651,8 +642,6 @@ impl From<CoreEventType> for EventType {
                msg_id: msg_id.to_u32(),
                chat_id: chat_id.to_u32(),
            },
-            CoreEventType::TransportsModified => TransportsModified,
-
            #[allow(unreachable_patterns)]
            #[cfg(test)]
            _ => unreachable!("This is just to silence a rust_analyzer false-positive"),
--- a/deltachat-jsonrpc/src/api/types/message.rs
+++ b/deltachat-jsonrpc/src/api/types/message.rs
@@ -92,9 +92,6 @@ pub struct MessageObject {

    file: Option<String>,
    file_mime: Option<String>,
-
-    /// The size of the file in bytes, if applicable.
-    /// If message is a pre-message, then this is the size of the file to be downloaded.
    file_bytes: u64,
    file_name: Option<String>,

--- a/deltachat-jsonrpc/src/api/types/qr.rs
+++ b/deltachat-jsonrpc/src/api/types/qr.rs
@@ -157,21 +157,6 @@ pub enum QrObject {
        /// Authentication code.
        authcode: String,
    },
-    /// Ask the user if they want to withdraw their own broadcast channel invite QR code.
-    WithdrawJoinBroadcast {
-        /// Broadcast name.
-        name: String,
-        /// ID, uniquely identifying this chat. Called grpid for historic reasons.
-        grpid: String,
-        /// Contact ID. Always `ContactId::SELF`.
-        contact_id: u32,
-        /// Fingerprint of the contact key as scanned from the QR code.
-        fingerprint: String,
-        /// Invite number.
-        invitenumber: String,
-        /// Authentication code.
-        authcode: String,
-    },
    /// Ask the user if they want to revive their own QR code.
    ReviveVerifyContact {
        /// Contact ID.
@@ -198,21 +183,6 @@ pub enum QrObject {
        /// Authentication code.
        authcode: String,
    },
-    /// Ask the user if they want to revive their own broadcast channel invite QR code.
-    ReviveJoinBroadcast {
-        /// Broadcast name.
-        name: String,
-        /// Globally unique chat ID. Called grpid for historic reasons.
-        grpid: String,
-        /// Contact ID. Always `ContactId::SELF`.
-        contact_id: u32,
-        /// Fingerprint of the contact key as scanned from the QR code.
-        fingerprint: String,
-        /// Invite number.
-        invitenumber: String,
-        /// Authentication code.
-        authcode: String,
-    },
    /// `dclogin:` scheme parameters.
    ///
    /// Ask the user if they want to login with the email address.
@@ -336,25 +306,6 @@ impl From<Qr> for QrObject {
                    authcode,
                }
            }
-            Qr::WithdrawJoinBroadcast {
-                name,
-                grpid,
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::WithdrawJoinBroadcast {
-                    name,
-                    grpid,
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
            Qr::ReviveVerifyContact {
                contact_id,
                fingerprint,
@@ -389,25 +340,6 @@ impl From<Qr> for QrObject {
                    authcode,
                }
            }
-            Qr::ReviveJoinBroadcast {
-                name,
-                grpid,
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::ReviveJoinBroadcast {
-                    name,
-                    grpid,
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
            Qr::Login { address, .. } => QrObject::Login { address },
        }
    }
--- a/deltachat-jsonrpc/typescript/package.json
+++ b/deltachat-jsonrpc/typescript/package.json
@@ -54,5 +54,5 @@
  },
  "type": "module",
  "types": "dist/deltachat.d.ts",
-  "version": "2.38.0"
+  "version": "2.25.0"
 }
--- a/deltachat-jsonrpc/typescript/test/online.ts
+++ b/deltachat-jsonrpc/typescript/test/online.ts
@@ -64,7 +64,6 @@ describe("online tests", function () {
    await dc.rpc.setConfig(accountId1, "addr", account1.email);
    await dc.rpc.setConfig(accountId1, "mail_pw", account1.password);
    await dc.rpc.configure(accountId1);
-    await waitForEvent(dc, "ImapInboxIdle", accountId1);

    accountId2 = await dc.rpc.addAccount();
    await dc.rpc.batchSetConfig(accountId2, {
@@ -72,7 +71,6 @@ describe("online tests", function () {
      mail_pw: account2.password,
    });
    await dc.rpc.configure(accountId2);
-    await waitForEvent(dc, "ImapInboxIdle", accountId2);
    accountsConfigured = true;
  });

--- a/deltachat-repl/Cargo.toml
+++ b/deltachat-repl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-repl"
-version = "2.38.0"
+version = "2.25.0"
 license = "MPL-2.0"
 edition = "2021"
 repository = "https://github.com/chatmail/core"
--- a/deltachat-repl/src/cmdline.rs
+++ b/deltachat-repl/src/cmdline.rs
@@ -1231,7 +1231,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
        "setqr" => {
            ensure!(!arg1.is_empty(), "Argument <qr-content> missing.");
            match set_config_from_qr(&context, arg1).await {
-                Ok(()) => eprintln!("Config set from the QR code."),
+                Ok(()) => println!("Config set from QR code, you can now call 'configure'"),
                Err(err) => eprintln!("Cannot set config from QR code: {err:?}"),
            }
        }
--- a/deltachat-repl/src/main.rs
+++ b/deltachat-repl/src/main.rs
@@ -430,12 +430,12 @@ async fn handle_cmd(
        }
        "oauth2" => {
            if let Some(addr) = ctx.get_config(config::Config::Addr).await? {
-                if let Some(oauth2_url) =
-                    get_oauth2_url(&ctx, &addr, "chat.delta:/com.b44t.messenger").await?
-                {
-                    println!("Open the following url, set mail_pw to the generated token and server_flags to 2:\n{oauth2_url}");
-                } else {
+                let oauth2_url =
+                    get_oauth2_url(&ctx, &addr, "chat.delta:/com.b44t.messenger").await?;
+                if oauth2_url.is_none() {
                    println!("OAuth2 not available for {}.", &addr);
+                } else {
+                    println!("Open the following url, set mail_pw to the generated token and server_flags to 2:\n{}", oauth2_url.unwrap());
                }
            } else {
                println!("oauth2: set addr first.");
--- a/deltachat-rpc-client/README.md
+++ b/deltachat-rpc-client/README.md
@@ -30,15 +30,6 @@ $ pip install .

 Additional arguments to `tox` are passed to pytest, e.g. `tox -- -s` does not capture test output.

-
-## Activating current checkout of deltachat-rpc-client and -server for development 
-
-Go to root repository directory and run: 
-```
-$ scripts/make-rpc-testenv.sh 
-$ source venv/bin/activate 
-```
-
 ## Using in REPL

 Setup a development environment:
--- a/deltachat-rpc-client/pyproject.toml
+++ b/deltachat-rpc-client/pyproject.toml
@@ -1,18 +1,20 @@
 [build-system]
-requires = ["setuptools>=77"]
+requires = ["setuptools>=45"]
 build-backend = "setuptools.build_meta"

 [project]
 name = "deltachat-rpc-client"
-version = "2.38.0"
-license = "MPL-2.0"
+version = "2.25.0"
 description = "Python client for Delta Chat core JSON-RPC interface"
 classifiers = [
    "Development Status :: 5 - Production/Stable",
    "Intended Audience :: Developers",
+    "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
    "Operating System :: POSIX :: Linux",
    "Operating System :: MacOS :: MacOS X",
    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
    "Programming Language :: Python :: 3.10",
    "Programming Language :: Python :: 3.11",
    "Programming Language :: Python :: 3.12",
@@ -22,7 +24,7 @@ classifiers = [
    "Topic :: Communications :: Email"
 ]
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.8"

 [tool.setuptools.package-data]
 deltachat_rpc_client = [
--- a/deltachat-rpc-client/src/deltachat_rpc_client/_utils.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/_utils.py
@@ -44,13 +44,8 @@ class AttrDict(dict):
        super().__setattr__(attr, val)


-def _forever(_event: AttrDict) -> bool:
-    return False
-
-
 def run_client_cli(
    hooks: Optional[Iterable[Tuple[Callable, Union[type, "EventFilter"]]]] = None,
-    until: Callable[[AttrDict], bool] = _forever,
    argv: Optional[list] = None,
    **kwargs,
 ) -> None:
@@ -60,11 +55,10 @@ def run_client_cli(
    """
    from .client import Client

-    _run_cli(Client, until, hooks, argv, **kwargs)
+    _run_cli(Client, hooks, argv, **kwargs)


 def run_bot_cli(
-    until: Callable[[AttrDict], bool] = _forever,
    hooks: Optional[Iterable[Tuple[Callable, Union[type, "EventFilter"]]]] = None,
    argv: Optional[list] = None,
    **kwargs,
@@ -75,12 +69,11 @@ def run_bot_cli(
    """
    from .client import Bot

-    _run_cli(Bot, until, hooks, argv, **kwargs)
+    _run_cli(Bot, hooks, argv, **kwargs)


 def _run_cli(
    client_type: Type["Client"],
-    until: Callable[[AttrDict], bool] = _forever,
    hooks: Optional[Iterable[Tuple[Callable, Union[type, "EventFilter"]]]] = None,
    argv: Optional[list] = None,
    **kwargs,
@@ -118,7 +111,7 @@ def _run_cli(
                kwargs={"email": args.email, "password": args.password},
            )
            configure_thread.start()
-        client.run_until(until)
+        client.run_forever()


 def extract_addr(text: str) -> str:
--- a/deltachat-rpc-client/src/deltachat_rpc_client/account.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/account.py
@@ -130,10 +130,6 @@ class Account:
        """Add a new transport using a QR code."""
        yield self._rpc.add_transport_from_qr.future(self.id, qr)

-    def delete_transport(self, addr: str):
-        """Delete a transport."""
-        self._rpc.delete_transport(self.id, addr)
-
    @futuremethod
    def list_transports(self):
        """Return the list of all email accounts that are used as a transport in the current profile."""
@@ -421,21 +417,12 @@ class Account:
        """Wait for messages noticed event and return it."""
        return self.wait_for_event(EventType.MSGS_NOTICED)

-    def wait_for_msg(self, event_type) -> Message:
-        """Wait for an event about the message.
-
-        Consumes all events before the matching event.
-        Returns a message corresponding to the msg_id field of the event.
-        """
-        event = self.wait_for_event(event_type)
-        return self.get_message_by_id(event.msg_id)
-
    def wait_for_incoming_msg(self):
        """Wait for incoming message and return it.

        Consumes all events before the next incoming message event.
        """
-        return self.wait_for_msg(EventType.INCOMING_MSG)
+        return self.get_message_by_id(self.wait_for_incoming_msg_event().msg_id)

    def wait_for_securejoin_inviter_success(self):
        """Wait until SecureJoin process finishes successfully on the inviter side."""
--- a/deltachat-rpc-client/src/deltachat_rpc_client/chat.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/chat.py
@@ -219,12 +219,10 @@ class Chat:
        """Mark all messages in this chat as noticed."""
        self._rpc.marknoticed_chat(self.account.id, self.id)

-    def add_contact(self, *contact: Union[int, str, Contact, "Account"]) -> None:
+    def add_contact(self, *contact: Union[int, str, Contact]) -> None:
        """Add contacts to this group."""
-        from .account import Account
-
        for cnt in contact:
-            if isinstance(cnt, (str, Account)):
+            if isinstance(cnt, str):
                contact_id = self.account.create_contact(cnt).id
            elif not isinstance(cnt, int):
                contact_id = cnt.id
@@ -232,12 +230,10 @@ class Chat:
                contact_id = cnt
            self._rpc.add_contact_to_chat(self.account.id, self.id, contact_id)

-    def remove_contact(self, *contact: Union[int, str, Contact, "Account"]) -> None:
+    def remove_contact(self, *contact: Union[int, str, Contact]) -> None:
        """Remove members from this group."""
-        from .account import Account
-
        for cnt in contact:
-            if isinstance(cnt, (str, Account)):
+            if isinstance(cnt, str):
                contact_id = self.account.create_contact(cnt).id
            elif not isinstance(cnt, int):
                contact_id = cnt.id
@@ -253,10 +249,6 @@ class Chat:
        contacts = self._rpc.get_chat_contacts(self.account.id, self.id)
        return [Contact(self.account, contact_id) for contact_id in contacts]

-    def num_contacts(self) -> int:
-        """Return number of contacts in this chat."""
-        return len(self.get_contacts())
-
    def get_past_contacts(self) -> list[Contact]:
        """Get past contacts for this chat."""
        past_contacts = self._rpc.get_past_chat_contacts(self.account.id, self.id)
--- a/deltachat-rpc-client/src/deltachat_rpc_client/client.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/client.py
@@ -14,7 +14,6 @@ from typing import (

 from ._utils import (
    AttrDict,
-    _forever,
    parse_system_add_remove,
    parse_system_image_changed,
    parse_system_title_changed,
@@ -92,28 +91,19 @@ class Client:

    def run_forever(self) -> None:
        """Process events forever."""
-        self.run_until(_forever)
+        self.run_until(lambda _: False)

    def run_until(self, func: Callable[[AttrDict], bool]) -> AttrDict:
-        """Start the event processing loop."""
+        """Process events until the given callable evaluates to True.
+
+        The callable should accept an AttrDict object representing the
+        last processed event. The event is returned when the callable
+        evaluates to True.
+        """
        self.logger.debug("Listening to incoming events...")
        if self.is_configured():
            self.account.start_io()
        self._process_messages()  # Process old messages.
-        return self._process_events(until_func=func)  # Loop over incoming events
-
-    def _process_events(
-        self,
-        until_func: Callable[[AttrDict], bool],
-        until_event: EventType = False,
-    ) -> AttrDict:
-        """Process events until the given callable evaluates to True,
-        or until a certain event happens.
-
-        The until_func callable should accept an AttrDict object representing
-        the last processed event. The event is returned when the callable
-        evaluates to True.
-        """
        while True:
            event = self.account.wait_for_event()
            event["kind"] = EventType(event.kind)
@@ -122,13 +112,10 @@ class Client:
            if event.kind == EventType.INCOMING_MSG:
                self._process_messages()

-            stop = until_func(event)
+            stop = func(event)
            if stop:
                return event

-            if event.kind == until_event:
-                return event
-
    def _on_event(self, event: AttrDict, filter_type: Type[EventFilter] = RawEvent) -> None:
        for hook, evfilter in self._hooks.get(filter_type, []):
            if evfilter.filter(event):
--- a/deltachat-rpc-client/src/deltachat_rpc_client/const.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/const.py
@@ -80,7 +80,6 @@ class EventType(str, Enum):
    CONFIG_SYNCED = "ConfigSynced"
    WEBXDC_REALTIME_DATA = "WebxdcRealtimeData"
    WEBXDC_REALTIME_ADVERTISEMENT_RECEIVED = "WebxdcRealtimeAdvertisementReceived"
-    TRANSPORTS_MODIFIED = "TransportsModified"


 class ChatId(IntEnum):
--- a/deltachat-rpc-client/src/deltachat_rpc_client/deltachat.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/deltachat.py
@@ -4,7 +4,7 @@ from __future__ import annotations

 from typing import TYPE_CHECKING

-from ._utils import AttrDict, futuremethod
+from ._utils import AttrDict
 from .account import Account

 if TYPE_CHECKING:
@@ -39,15 +39,6 @@ class DeltaChat:
        """Stop the I/O of all accounts."""
        self.rpc.stop_io_for_all_accounts()

-    @futuremethod
-    def background_fetch(self, timeout_in_seconds: int) -> None:
-        """Run background fetch for all accounts."""
-        yield self.rpc.background_fetch.future(timeout_in_seconds)
-
-    def stop_background_fetch(self) -> None:
-        """Stop ongoing background fetch."""
-        self.rpc.stop_background_fetch()
-
    def maybe_network(self) -> None:
        """Indicate that the network conditions might have changed."""
        self.rpc.maybe_network()
--- a/deltachat-rpc-client/src/deltachat_rpc_client/message.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/message.py
@@ -44,14 +44,6 @@ class Message:
        read_receipts = self._rpc.get_message_read_receipts(self.account.id, self.id)
        return [AttrDict(read_receipt) for read_receipt in read_receipts]

-    def get_read_receipt_count(self) -> int:
-        """
-        Returns count of read receipts on message.
-
-        This view count is meant as a feedback measure for the channel owner only.
-        """
-        return self._rpc.get_message_read_receipt_count(self.account.id, self.id)
-
    def get_reactions(self) -> Optional[AttrDict]:
        """Get message reactions."""
        reactions = self._rpc.get_message_reactions(self.account.id, self.id)
@@ -68,10 +60,6 @@ class Message:
        """Mark the message as seen."""
        self._rpc.markseen_msgs(self.account.id, [self.id])

-    def exists(self) -> bool:
-        """Return True if the message exists."""
-        return bool(self._rpc.get_existing_msg_ids(self.account.id, [self.id]))
-
    def continue_autocrypt_key_transfer(self, setup_code: str) -> None:
        """Continue the Autocrypt Setup Message key transfer.

--- a/deltachat-rpc-client/src/deltachat_rpc_client/pytestplugin.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/pytestplugin.py
@@ -2,16 +2,10 @@

 from __future__ import annotations

-import logging
 import os
-import pathlib
-import platform
 import random
-import subprocess
-import sys
 from typing import AsyncGenerator, Optional

-import execnet
 import py
 import pytest

@@ -26,18 +20,6 @@ Currently this is "End-to-end encryption available".
 """


-def pytest_report_header():
-    for base in os.get_exec_path():
-        fn = pathlib.Path(base).joinpath(base, "deltachat-rpc-server")
-        if fn.exists():
-            proc = subprocess.Popen([str(fn), "--version"], stderr=subprocess.PIPE)
-            proc.wait()
-            version = proc.stderr.read().decode().strip()
-            return f"deltachat-rpc-server: {fn} [{version}]"
-
-    return None
-
-
 class ACFactory:
    """Test account factory."""

@@ -58,17 +40,12 @@ class ACFactory:
        username = "ci-" + "".join(random.choice("2345789acdefghjkmnpqrstuvwxyz") for i in range(6))
        return f"{username}@{domain}", f"{username}${username}"

-    def get_account_qr(self):
-        """Return "dcaccount:" QR code for testing chatmail relay."""
-        domain = os.getenv("CHATMAIL_DOMAIN")
-        return f"dcaccount:{domain}"
-
    @futuremethod
    def new_configured_account(self):
        """Create a new configured account."""
        account = self.get_unconfigured_account()
-        qr = self.get_account_qr()
-        yield account.add_transport_from_qr.future(qr)
+        domain = os.getenv("CHATMAIL_DOMAIN")
+        yield account.add_transport_from_qr.future(f"dcaccount:{domain}")

        assert account.is_configured()
        return account
@@ -100,7 +77,6 @@ class ACFactory:
        ac_clone = self.get_unconfigured_account()
        for transport in transports:
            ac_clone.add_or_update_transport(transport)
-        ac_clone.bring_online()
        return ac_clone

    def get_accepted_chat(self, ac1: Account, ac2: Account) -> Chat:
@@ -159,15 +135,9 @@ def rpc(tmp_path) -> AsyncGenerator:


@pytest.fixture
-def dc(rpc) -> DeltaChat:
-    """Return account manager."""
-    return DeltaChat(rpc)
-
-
-@pytest.fixture
-def acfactory(dc) -> AsyncGenerator:
+def acfactory(rpc) -> AsyncGenerator:
    """Return account factory fixture."""
-    return ACFactory(dc)
+    return ACFactory(DeltaChat(rpc))


@pytest.fixture
@@ -205,143 +175,13 @@ def log():

    class Printer:
        def section(self, msg: str) -> None:
-            logging.info("\n%s %s %s", "=" * 10, msg, "=" * 10)
+            print()
+            print("=" * 10, msg, "=" * 10)

        def step(self, msg: str) -> None:
-            logging.info("%s step %s %s", "-" * 5, msg, "-" * 5)
+            print("-" * 5, "step " + msg, "-" * 5)

        def indent(self, msg: str) -> None:
-            logging.info("  " + msg)
+            print("  " + msg)

    return Printer()
-
-
-#
-# support for testing against different deltachat-rpc-server/clients
-# installed into a temporary virtualenv and connected via 'execnet' channels
-#
-
-
-def find_path(venv, name):
-    is_windows = platform.system() == "Windows"
-    bin = venv / ("bin" if not is_windows else "Scripts")
-
-    tryadd = [""]
-    if is_windows:
-        tryadd += os.environ["PATHEXT"].split(os.pathsep)
-    for ext in tryadd:
-        p = bin.joinpath(name + ext)
-        if p.exists():
-            return str(p)
-
-    return None
-
-
-@pytest.fixture(scope="session")
-def get_core_python_env(tmp_path_factory):
-    """Return a factory to create virtualenv environments with rpc server/client packages
-    installed.
-
-    The factory takes a version and returns a (python_path, rpc_server_path) tuple
-    of the respective binaries in the virtualenv.
-    """
-
-    envs = {}
-
-    def get_versioned_venv(core_version):
-        venv = envs.get(core_version)
-        if not venv:
-            venv = tmp_path_factory.mktemp(f"temp-{core_version}")
-            subprocess.check_call([sys.executable, "-m", "venv", venv])
-
-            python = find_path(venv, "python")
-            pkgs = [f"deltachat-rpc-server=={core_version}", f"deltachat-rpc-client=={core_version}", "pytest"]
-            subprocess.check_call([python, "-m", "pip", "install"] + pkgs)
-
-            envs[core_version] = venv
-        python = find_path(venv, "python")
-        rpc_server_path = find_path(venv, "deltachat-rpc-server")
-        logging.info(f"Paths:\npython={python}\nrpc_server={rpc_server_path}")
-        return python, rpc_server_path
-
-    return get_versioned_venv
-
-
-@pytest.fixture
-def alice_and_remote_bob(tmp_path, acfactory, get_core_python_env):
-    """return local Alice account, a contact to bob, and a remote 'eval' function for bob.
-
-    The 'eval' function allows to remote-execute arbitrary expressions
-    that can use the `bob` online account, and the `bob_contact_alice`.
-    """
-
-    def factory(core_version):
-        python, rpc_server_path = get_core_python_env(core_version)
-        gw = execnet.makegateway(f"popen//python={python}")
-
-        accounts_dir = str(tmp_path.joinpath("account1_venv1"))
-        channel = gw.remote_exec(remote_bob_loop)
-        cm = os.environ.get("CHATMAIL_DOMAIN")
-
-        # trigger getting an online account on bob's side
-        channel.send((accounts_dir, str(rpc_server_path), cm))
-
-        # meanwhile get a local alice account
-        alice = acfactory.get_online_account()
-        channel.send(alice.self_contact.make_vcard())
-
-        # wait for bob to have started
-        sysinfo = channel.receive()
-        assert sysinfo == f"v{core_version}"
-        bob_vcard = channel.receive()
-        [alice_contact_bob] = alice.import_vcard(bob_vcard)
-
-        def eval(eval_str):
-            channel.send(eval_str)
-            return channel.receive()
-
-        return alice, alice_contact_bob, eval
-
-    return factory
-
-
-def remote_bob_loop(channel):
-    # This function executes with versioned
-    # deltachat-rpc-client/server packages
-    # installed into the virtualenv.
-    #
-    # The "channel" argument is a send/receive pipe
-    # to the process that runs the corresponding remote_exec(remote_bob_loop)
-
-    import os
-
-    from deltachat_rpc_client import DeltaChat, Rpc
-    from deltachat_rpc_client.pytestplugin import ACFactory
-
-    accounts_dir, rpc_server_path, chatmail_domain = channel.receive()
-    os.environ["CHATMAIL_DOMAIN"] = chatmail_domain
-
-    # older core versions don't support specifying rpc_server_path
-    # so we can't just pass `rpc_server_path` argument to Rpc constructor
-    basepath = os.path.dirname(rpc_server_path)
-    os.environ["PATH"] = os.pathsep.join([basepath, os.environ["PATH"]])
-    rpc = Rpc(accounts_dir=accounts_dir)
-
-    with rpc:
-        dc = DeltaChat(rpc)
-        channel.send(dc.rpc.get_system_info()["deltachat_core_version"])
-        acfactory = ACFactory(dc)
-        bob = acfactory.get_online_account()
-        alice_vcard = channel.receive()
-        [alice_contact] = bob.import_vcard(alice_vcard)
-        ns = {"bob": bob, "bob_contact_alice": alice_contact}
-        channel.send(bob.self_contact.make_vcard())
-
-        while 1:
-            eval_str = channel.receive()
-            res = eval(eval_str, ns)
-            try:
-                channel.send(res)
-            except Exception:
-                # some unserializable result
-                channel.send(None)
--- a/deltachat-rpc-client/src/deltachat_rpc_client/rpc.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/rpc.py
@@ -9,7 +9,7 @@ import os
 import subprocess
 import sys
 from queue import Empty, Queue
-from threading import Thread
+from threading import Event, Thread
 from typing import Any, Iterator, Optional


@@ -17,6 +17,25 @@ class JsonRpcError(Exception):
    """JSON-RPC error."""


+class RpcFuture:
+    """RPC future waiting for RPC call result."""
+
+    def __init__(self, rpc: "Rpc", request_id: int, event: Event):
+        self.rpc = rpc
+        self.request_id = request_id
+        self.event = event
+
+    def __call__(self):
+        """Wait for the future to return the result."""
+        self.event.wait()
+        response = self.rpc.request_results.pop(self.request_id)
+        if "error" in response:
+            raise JsonRpcError(response["error"])
+        if "result" in response:
+            return response["result"]
+        return None
+
+
 class RpcMethod:
    """RPC method."""

@@ -38,26 +57,20 @@ class RpcMethod:
            "params": args,
            "id": request_id,
        }
-        self.rpc.request_results[request_id] = queue = Queue()
+        event = Event()
+        self.rpc.request_events[request_id] = event
        self.rpc.request_queue.put(request)

-        def rpc_future():
-            """Wait for the request to receive a result."""
-            response = queue.get()
-            if "error" in response:
-                raise JsonRpcError(response["error"])
-            return response.get("result", None)
-
-        return rpc_future
+        return RpcFuture(self.rpc, request_id, event)


 class Rpc:
    """RPC client."""

-    def __init__(self, accounts_dir: Optional[str] = None, rpc_server_path="deltachat-rpc-server", **kwargs):
+    def __init__(self, accounts_dir: Optional[str] = None, **kwargs):
        """Initialize RPC client.

-        The 'kwargs' arguments will be passed to subprocess.Popen().
+        The given arguments will be passed to subprocess.Popen().
        """
        if accounts_dir:
            kwargs["env"] = {
@@ -66,12 +79,13 @@ class Rpc:
            }

        self._kwargs = kwargs
-        self.rpc_server_path = rpc_server_path
        self.process: subprocess.Popen
        self.id_iterator: Iterator[int]
        self.event_queues: dict[int, Queue]
-        # Map from request ID to a Queue which provides a single result
-        self.request_results: dict[int, Queue]
+        # Map from request ID to `threading.Event`.
+        self.request_events: dict[int, Event]
+        # Map from request ID to the result.
+        self.request_results: dict[int, Any]
        self.request_queue: Queue[Any]
        self.closing: bool
        self.reader_thread: Thread
@@ -80,18 +94,27 @@ class Rpc:

    def start(self) -> None:
        """Start RPC server subprocess."""
-        popen_kwargs = {"stdin": subprocess.PIPE, "stdout": subprocess.PIPE}
        if sys.version_info >= (3, 11):
-            # Prevent subprocess from capturing SIGINT.
-            popen_kwargs["process_group"] = 0
+            self.process = subprocess.Popen(
+                "deltachat-rpc-server",
+                stdin=subprocess.PIPE,
+                stdout=subprocess.PIPE,
+                # Prevent subprocess from capturing SIGINT.
+                process_group=0,
+                **self._kwargs,
+            )
        else:
-            # `process_group` is not supported before Python 3.11.
-            popen_kwargs["preexec_fn"] = os.setpgrp  # noqa: PLW1509
-
-        popen_kwargs.update(self._kwargs)
-        self.process = subprocess.Popen(self.rpc_server_path, **popen_kwargs)
+            self.process = subprocess.Popen(
+                "deltachat-rpc-server",
+                stdin=subprocess.PIPE,
+                stdout=subprocess.PIPE,
+                # `process_group` is not supported before Python 3.11.
+                preexec_fn=os.setpgrp,  # noqa: PLW1509
+                **self._kwargs,
+            )
        self.id_iterator = itertools.count(start=1)
        self.event_queues = {}
+        self.request_events = {}
        self.request_results = {}
        self.request_queue = Queue()
        self.closing = False
@@ -126,7 +149,9 @@ class Rpc:
                response = json.loads(line)
                if "id" in response:
                    response_id = response["id"]
-                    self.request_results.pop(response_id).put(response)
+                    event = self.request_events.pop(response_id)
+                    self.request_results[response_id] = response
+                    event.set()
                else:
                    logging.warning("Got a response without ID: %s", response)
        except Exception:
--- a/deltachat-rpc-client/tests/conftest.py
+++ b/deltachat-rpc-client/tests/conftest.py
@@ -2,7 +2,6 @@ from __future__ import annotations

 import imaplib
 import io
-import logging
 import pathlib
 import ssl
 from contextlib import contextmanager
@@ -46,13 +45,13 @@ class DirectImap:
        try:
            self.conn.logout()
        except (OSError, imaplib.IMAP4.abort):
-            logging.warning("Could not logout direct_imap conn")
+            print("Could not logout direct_imap conn")

    def create_folder(self, foldername):
        try:
            self.conn.folder.create(foldername)
        except errors.MailboxFolderCreateError as e:
-            logging.warning(f"Cannot create '{foldername}', probably it already exists: {str(e)}")
+            print("Can't create", foldername, "probably it already exists:", str(e))

    def select_folder(self, foldername: str) -> tuple:
        assert not self._idling
@@ -86,17 +85,17 @@ class DirectImap:

    def get_all_messages(self) -> list[MailMessage]:
        assert not self._idling
-        return list(self.conn.fetch(mark_seen=False))
+        return list(self.conn.fetch())

    def get_unread_messages(self) -> list[str]:
        assert not self._idling
-        return [msg.uid for msg in self.conn.fetch(AND(seen=False), mark_seen=False)]
+        return [msg.uid for msg in self.conn.fetch(AND(seen=False))]

    def mark_all_read(self):
        messages = self.get_unread_messages()
        if messages:
            res = self.conn.flag(messages, MailMessageFlags.SEEN, True)
-            logging.info(f"Marked seen: {messages} {res}")
+            print("marked seen:", messages, res)

    def get_unread_cnt(self) -> int:
        return len(self.get_unread_messages())
@@ -174,6 +173,7 @@ class DirectImap:
 class IdleManager:
    def __init__(self, direct_imap) -> None:
        self.direct_imap = direct_imap
+        self.log = direct_imap.account.log
        # fetch latest messages before starting idle so that it only
        # returns messages that arrive anew
        self.direct_imap.conn.fetch("1:*")
@@ -181,11 +181,14 @@ class IdleManager:

    def check(self, timeout=None) -> list[bytes]:
        """(blocking) wait for next idle message from server."""
-        return self.direct_imap.conn.idle.poll(timeout=timeout)
+        self.log("imap-direct: calling idle_check")
+        res = self.direct_imap.conn.idle.poll(timeout=timeout)
+        self.log(f"imap-direct: idle_check returned {res!r}")
+        return res

-    def wait_for_new_message(self) -> bytes:
+    def wait_for_new_message(self, timeout=None) -> bytes:
        while True:
-            for item in self.check():
+            for item in self.check(timeout=timeout):
                if b"EXISTS" in item or b"RECENT" in item:
                    return item

@@ -193,8 +196,10 @@ class IdleManager:
        """Return first message with SEEN flag from a running idle-stream."""
        while True:
            for item in self.check(timeout=timeout):
-                if FETCH in item and FLAGS in item and rb"\Seen" in item:
-                    return int(item.split(b" ")[1])
+                if FETCH in item:
+                    self.log(str(item))
+                    if FLAGS in item and rb"\Seen" in item:
+                        return int(item.split(b" ")[1])

    def done(self):
        """send idle-done to server if we are currently in idle mode."""
--- a/deltachat-rpc-client/tests/test_calls.py
+++ b/deltachat-rpc-client/tests/test_calls.py
@@ -107,48 +107,3 @@ def test_no_contact_request_call(acfactory) -> None:
            msg = bob.get_message_by_id(event.msg_id)
            if msg.get_snapshot().text == "Hello!":
                break
-
-
-def test_who_can_call_me_nobody(acfactory) -> None:
-    alice, bob = acfactory.get_online_accounts(2)
-
-    # Bob sets "who can call me" to "nobody" (2)
-    bob.set_config("who_can_call_me", "2")
-
-    # Bob even accepts Alice in advance so the chat does not appear as contact request.
-    bob.create_chat(alice)
-
-    alice_chat_bob = alice.create_chat(bob)
-    alice_chat_bob.place_outgoing_call("offer")
-    alice_chat_bob.send_text("Hello!")
-
-    # Notification for "Hello!" message should arrive
-    # without the call ringing.
-    while True:
-        event = bob.wait_for_event()
-
-        # There should be no incoming call notification.
-        assert event.kind != EventType.INCOMING_CALL
-
-        if event.kind == EventType.INCOMING_MSG:
-            msg = bob.get_message_by_id(event.msg_id)
-            if msg.get_snapshot().text == "Hello!":
-                break
-
-
-def test_who_can_call_me_everybody(acfactory) -> None:
-    """Test that if "who can call me" setting is set to "everybody", calls arrive even in contact request chats."""
-    alice, bob = acfactory.get_online_accounts(2)
-
-    # Bob sets "who can call me" to "nobody" (0)
-    bob.set_config("who_can_call_me", "0")
-
-    alice_chat_bob = alice.create_chat(bob)
-    alice_chat_bob.place_outgoing_call("offer")
-    incoming_call_event = bob.wait_for_event(EventType.INCOMING_CALL)
-
-    incoming_call_message = Message(bob, incoming_call_event.msg_id)
-
-    # Even with the call arriving, the chat is still in the contact request mode.
-    incoming_chat = incoming_call_message.get_snapshot().chat
-    assert incoming_chat.get_basic_snapshot().is_contact_request
--- a/deltachat-rpc-client/tests/test_chatlist_events.py
+++ b/deltachat-rpc-client/tests/test_chatlist_events.py
@@ -1,5 +1,7 @@
 from __future__ import annotations

+import base64
+import os
 from typing import TYPE_CHECKING

 from deltachat_rpc_client import Account, EventType, const
@@ -127,7 +129,7 @@ def test_download_on_demand(acfactory: ACFactory) -> None:
    msg.get_snapshot().chat.accept()
    bob.get_chat_by_id(chat_id).send_message(
        "Hello World, this message is bigger than 5 bytes",
-        file="../test-data/image/screenshot.jpg",
+        html=base64.b64encode(os.urandom(300000)).decode("utf-8"),
    )

    message = alice.wait_for_incoming_msg()
--- a/deltachat-rpc-client/tests/test_cross_core.py
+++ b/deltachat-rpc-client/tests/test_cross_core.py
@@ -1,57 +0,0 @@
-import subprocess
-
-import pytest
-
-from deltachat_rpc_client import DeltaChat, Rpc
-
-
-def test_install_venv_and_use_other_core(tmp_path, get_core_python_env):
-    python, rpc_server_path = get_core_python_env("2.24.0")
-    subprocess.check_call([python, "-m", "pip", "install", "deltachat-rpc-server==2.24.0"])
-    rpc = Rpc(accounts_dir=tmp_path.joinpath("accounts"), rpc_server_path=rpc_server_path)
-
-    with rpc:
-        dc = DeltaChat(rpc)
-        assert dc.rpc.get_system_info()["deltachat_core_version"] == "v2.24.0"
-
-
-@pytest.mark.parametrize("version", ["2.24.0"])
-def test_qr_setup_contact(alice_and_remote_bob, version) -> None:
-    """Test other-core Bob profile can do securejoin with Alice on current core."""
-    alice, alice_contact_bob, remote_eval = alice_and_remote_bob(version)
-
-    qr_code = alice.get_qr_code()
-    remote_eval(f"bob.secure_join({qr_code!r})")
-    alice.wait_for_securejoin_inviter_success()
-
-    # Test that Alice verified Bob's profile.
-    alice_contact_bob_snapshot = alice_contact_bob.get_snapshot()
-    assert alice_contact_bob_snapshot.is_verified
-
-    remote_eval("bob.wait_for_securejoin_joiner_success()")
-
-    # Test that Bob verified Alice's profile.
-    assert remote_eval("bob_contact_alice.get_snapshot().is_verified")
-
-
-def test_send_and_receive_message(alice_and_remote_bob) -> None:
-    """Test other-core Bob profile can send a message to Alice on current core."""
-    alice, alice_contact_bob, remote_eval = alice_and_remote_bob("2.20.0")
-
-    remote_eval("bob_contact_alice.create_chat().send_text('hello')")
-
-    msg = alice.wait_for_incoming_msg()
-    assert msg.get_snapshot().text == "hello"
-
-
-def test_second_device(acfactory, alice_and_remote_bob) -> None:
-    """Test setting up current version as a second device for old version."""
-    _alice, alice_contact_bob, remote_eval = alice_and_remote_bob("2.20.0")
-
-    remote_eval("locals().setdefault('future', bob._rpc.provide_backup.future(bob.id))")
-    qr = remote_eval("bob._rpc.get_backup_qr(bob.id)")
-    new_account = acfactory.get_unconfigured_account()
-    new_account._rpc.get_backup(new_account.id, qr)
-    remote_eval("locals()['future']()")
-
-    assert new_account.get_config("addr") == remote_eval("bob.get_config('addr')")
--- a/deltachat-rpc-client/tests/test_folders.py
+++ b/deltachat-rpc-client/tests/test_folders.py
@@ -1,538 +0,0 @@
-import logging
-import re
-import time
-
-import pytest
-from imap_tools import AND, U
-
-from deltachat_rpc_client import Contact, EventType, Message
-
-
-def test_move_works(acfactory):
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac2.set_config("mvbox_move", "1")
-    ac2.bring_online()
-
-    chat = ac1.create_chat(ac2)
-    chat.send_text("message1")
-
-    # Message is moved to the movebox
-    ac2.wait_for_event(EventType.IMAP_MESSAGE_MOVED)
-
-    # Message is downloaded
-    msg = ac2.wait_for_incoming_msg().get_snapshot()
-    assert msg.text == "message1"
-
-
-def test_move_avoids_loop(acfactory, direct_imap):
-    """Test that the message is only moved from INBOX to DeltaChat.
-
-    This is to avoid busy loop if moved message reappears in the Inbox
-    or some scanned folder later.
-    For example, this happens on servers that alias `INBOX.DeltaChat` to `DeltaChat` folder,
-    so the message moved to `DeltaChat` appears as a new message in the `INBOX.DeltaChat` folder.
-    We do not want to move this message from `INBOX.DeltaChat` to `DeltaChat` again.
-    """
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac2.set_config("mvbox_move", "1")
-    ac2.set_config("delete_server_after", "0")
-    ac2.bring_online()
-
-    # Create INBOX.DeltaChat folder and make sure
-    # it is detected by full folder scan.
-    ac2_direct_imap = direct_imap(ac2)
-    ac2_direct_imap.create_folder("INBOX.DeltaChat")
-    ac2.stop_io()
-    ac2.start_io()
-
-    while True:
-        event = ac2.wait_for_event()
-        # Wait until the end of folder scan.
-        if event.kind == EventType.INFO and "Found folders:" in event.msg:
-            break
-
-    ac1_chat = acfactory.get_accepted_chat(ac1, ac2)
-    ac1_chat.send_text("Message 1")
-
-    # Message is moved to the DeltaChat folder and downloaded.
-    ac2_msg1 = ac2.wait_for_incoming_msg().get_snapshot()
-    assert ac2_msg1.text == "Message 1"
-
-    # Move the message to the INBOX.DeltaChat again.
-    # We assume that test server uses "." as the delimiter.
-    ac2_direct_imap.select_folder("DeltaChat")
-    ac2_direct_imap.conn.move(["*"], "INBOX.DeltaChat")
-
-    ac1_chat.send_text("Message 2")
-    ac2_msg2 = ac2.wait_for_incoming_msg().get_snapshot()
-    assert ac2_msg2.text == "Message 2"
-
-    # Stop and start I/O to trigger folder scan.
-    ac2.stop_io()
-    ac2.start_io()
-    while True:
-        event = ac2.wait_for_event()
-        # Wait until the end of folder scan.
-        if event.kind == EventType.INFO and "Found folders:" in event.msg:
-            break
-
-    # Check that Message 1 is still in the INBOX.DeltaChat folder
-    # and Message 2 is in the DeltaChat folder.
-    ac2_direct_imap.select_folder("INBOX")
-    assert len(ac2_direct_imap.get_all_messages()) == 0
-    ac2_direct_imap.select_folder("DeltaChat")
-    assert len(ac2_direct_imap.get_all_messages()) == 1
-    ac2_direct_imap.select_folder("INBOX.DeltaChat")
-    assert len(ac2_direct_imap.get_all_messages()) == 1
-
-
-def test_reactions_for_a_reordering_move(acfactory, direct_imap):
-    """When a batch of messages is moved from Inbox to DeltaChat folder with a single MOVE command,
-    their UIDs may be reordered (e.g. Gmail is known for that) which led to that messages were
-    processed by receive_imf in the wrong order, and, particularly, reactions were processed before
-    messages they refer to and thus dropped.
-    """
-    (ac1,) = acfactory.get_online_accounts(1)
-
-    addr, password = acfactory.get_credentials()
-    ac2 = acfactory.get_unconfigured_account()
-    ac2.add_or_update_transport({"addr": addr, "password": password})
-    ac2.set_config("mvbox_move", "1")
-    assert ac2.is_configured()
-
-    ac2.bring_online()
-    chat1 = acfactory.get_accepted_chat(ac1, ac2)
-    ac2.stop_io()
-
-    logging.info("sending message + reaction from ac1 to ac2")
-    msg1 = chat1.send_text("hi")
-    msg1.wait_until_delivered()
-    # It's is sad, but messages must differ in their INTERNALDATEs to be processed in the correct
-    # order by DC, and most (if not all) mail servers provide only seconds precision.
-    time.sleep(1.1)
-    react_str = "\N{THUMBS UP SIGN}"
-    msg1.send_reaction(react_str).wait_until_delivered()
-
-    logging.info("moving messages to ac2's DeltaChat folder in the reverse order")
-    ac2_direct_imap = direct_imap(ac2)
-    ac2_direct_imap.connect()
-    for uid in sorted([m.uid for m in ac2_direct_imap.get_all_messages()], reverse=True):
-        ac2_direct_imap.conn.move(uid, "DeltaChat")
-
-    logging.info("receiving messages by ac2")
-    ac2.start_io()
-    msg2 = Message(ac2, ac2.wait_for_reactions_changed().msg_id)
-    assert msg2.get_snapshot().text == msg1.get_snapshot().text
-    reactions = msg2.get_reactions()
-    contacts = [Contact(ac2, int(i)) for i in reactions.reactions_by_contact]
-    assert len(contacts) == 1
-    assert contacts[0].get_snapshot().address == ac1.get_config("addr")
-    assert list(reactions.reactions_by_contact.values())[0] == [react_str]
-
-
-def test_delete_deltachat_folder(acfactory, direct_imap):
-    """Test that DeltaChat folder is recreated if user deletes it manually."""
-    ac1 = acfactory.new_configured_account()
-    ac1.set_config("mvbox_move", "1")
-    ac1.bring_online()
-
-    ac1_direct_imap = direct_imap(ac1)
-    ac1_direct_imap.conn.folder.delete("DeltaChat")
-    assert "DeltaChat" not in ac1_direct_imap.list_folders()
-
-    # Wait until new folder is created and UIDVALIDITY is updated.
-    while True:
-        event = ac1.wait_for_event()
-        if event.kind == EventType.INFO and "transport 1: UID validity for folder DeltaChat changed from " in event.msg:
-            break
-
-    ac2 = acfactory.get_online_account()
-    ac2.create_chat(ac1).send_text("hello")
-    msg = ac1.wait_for_incoming_msg().get_snapshot()
-    assert msg.text == "hello"
-
-    assert "DeltaChat" in ac1_direct_imap.list_folders()
-
-
-def test_dont_show_emails(acfactory, direct_imap, log):
-    """Most mailboxes have a "Drafts" folder where constantly new emails appear but we don't actually want to show them.
-    So: If it's outgoing AND there is no Received header, then ignore the email.
-
-    If the draft email is sent out and received later (i.e. it's in "Inbox"), it must be shown.
-
-    Also, test that unknown emails in the Spam folder are not shown."""
-    ac1 = acfactory.new_configured_account()
-    ac1.stop_io()
-    ac1.set_config("show_emails", "2")
-
-    ac1.create_contact("alice@example.org").create_chat()
-
-    ac1_direct_imap = direct_imap(ac1)
-    ac1_direct_imap.create_folder("Drafts")
-    ac1_direct_imap.create_folder("Spam")
-    ac1_direct_imap.create_folder("Junk")
-
-    # Learn UID validity for all folders.
-    ac1.set_config("scan_all_folders_debounce_secs", "0")
-    ac1.start_io()
-    ac1.wait_for_event(EventType.IMAP_INBOX_IDLE)
-    ac1.stop_io()
-
-    ac1_direct_imap.append(
-        "Drafts",
-        """
-        From: ac1 <{}>
-        Subject: subj
-        To: alice@example.org
-        Message-ID: <aepiors@example.org>
-        Content-Type: text/plain; charset=utf-8
-
-        message in Drafts received later
-    """.format(
-            ac1.get_config("configured_addr"),
-        ),
-    )
-    ac1_direct_imap.append(
-        "Spam",
-        """
-        From: unknown.address@junk.org
-        Subject: subj
-        To: {}
-        Message-ID: <spam.message@junk.org>
-        Content-Type: text/plain; charset=utf-8
-
-        Unknown message in Spam
-    """.format(
-            ac1.get_config("configured_addr"),
-        ),
-    )
-    ac1_direct_imap.append(
-        "Spam",
-        """
-        From: unknown.address@junk.org, unkwnown.add@junk.org
-        Subject: subj
-        To: {}
-        Message-ID: <spam.message2@junk.org>
-        Content-Type: text/plain; charset=utf-8
-
-        Unknown & malformed message in Spam
-    """.format(
-            ac1.get_config("configured_addr"),
-        ),
-    )
-    ac1_direct_imap.append(
-        "Spam",
-        """
-        From: delta<address: inbox@nhroy.com>
-        Subject: subj
-        To: {}
-        Message-ID: <spam.message99@junk.org>
-        Content-Type: text/plain; charset=utf-8
-
-        Unknown & malformed message in Spam
-    """.format(
-            ac1.get_config("configured_addr"),
-        ),
-    )
-    ac1_direct_imap.append(
-        "Spam",
-        """
-        From: alice@example.org
-        Subject: subj
-        To: {}
-        Message-ID: <spam.message3@junk.org>
-        Content-Type: text/plain; charset=utf-8
-
-        Actually interesting message in Spam
-    """.format(
-            ac1.get_config("configured_addr"),
-        ),
-    )
-    ac1_direct_imap.append(
-        "Junk",
-        """
-        From: unknown.address@junk.org
-        Subject: subj
-        To: {}
-        Message-ID: <spam.message@junk.org>
-        Content-Type: text/plain; charset=utf-8
-
-        Unknown message in Junk
-    """.format(
-            ac1.get_config("configured_addr"),
-        ),
-    )
-
-    ac1.set_config("scan_all_folders_debounce_secs", "0")
-    log.section("All prepared, now let DC find the message")
-    ac1.start_io()
-
-    # Wait until each folder was scanned, this is necessary for this test to test what it should test:
-    ac1.wait_for_event(EventType.IMAP_INBOX_IDLE)
-
-    fresh_msgs = list(ac1.get_fresh_messages())
-    msg = fresh_msgs[0].get_snapshot()
-    chat_msgs = msg.chat.get_messages()
-    assert len(chat_msgs) == 1
-    assert msg.text == "subj – Actually interesting message in Spam"
-
-    assert not any("unknown.address" in c.get_full_snapshot().name for c in ac1.get_chatlist())
-    ac1_direct_imap.select_folder("Spam")
-    assert ac1_direct_imap.get_uid_by_message_id("spam.message@junk.org")
-
-    ac1.stop_io()
-    log.section("'Send out' the draft by moving it to Inbox, and wait for DC to display it this time")
-    ac1_direct_imap.select_folder("Drafts")
-    uid = ac1_direct_imap.get_uid_by_message_id("aepiors@example.org")
-    ac1_direct_imap.conn.move(uid, "Inbox")
-
-    ac1.start_io()
-    event = ac1.wait_for_event(EventType.MSGS_CHANGED)
-    msg2 = Message(ac1, event.msg_id).get_snapshot()
-
-    assert msg2.text == "subj – message in Drafts received later"
-    assert len(msg.chat.get_messages()) == 2
-
-
-def test_move_works_on_self_sent(acfactory):
-    ac1, ac2 = acfactory.get_online_accounts(2)
-
-    # Enable movebox and wait until it is created.
-    ac1.set_config("mvbox_move", "1")
-    ac1.set_config("bcc_self", "1")
-    ac1.bring_online()
-
-    chat = ac1.create_chat(ac2)
-    chat.send_text("message1")
-    ac1.wait_for_event(EventType.IMAP_MESSAGE_MOVED)
-    chat.send_text("message2")
-    ac1.wait_for_event(EventType.IMAP_MESSAGE_MOVED)
-    chat.send_text("message3")
-    ac1.wait_for_event(EventType.IMAP_MESSAGE_MOVED)
-
-
-def test_moved_markseen(acfactory, direct_imap):
-    """Test that message already moved to DeltaChat folder is marked as seen."""
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac2.set_config("mvbox_move", "1")
-    ac2.set_config("delete_server_after", "0")
-    ac2.set_config("sync_msgs", "0")  # Do not send a sync message when accepting a contact request.
-    ac2.bring_online()
-
-    ac2.stop_io()
-    ac2_direct_imap = direct_imap(ac2)
-    with ac2_direct_imap.idle() as idle2:
-        ac1.create_chat(ac2).send_text("Hello!")
-        idle2.wait_for_new_message()
-
-    # Emulate moving of the message to DeltaChat folder by Sieve rule.
-    ac2_direct_imap.conn.move(["*"], "DeltaChat")
-    ac2_direct_imap.select_folder("DeltaChat")
-    assert len(list(ac2_direct_imap.conn.fetch("*", mark_seen=False))) == 1
-
-    with ac2_direct_imap.idle() as idle2:
-        ac2.start_io()
-
-        ev = ac2.wait_for_event(EventType.MSGS_CHANGED)
-        msg = ac2.get_message_by_id(ev.msg_id)
-        assert msg.get_snapshot().text == "Messages are end-to-end encrypted."
-
-        ev = ac2.wait_for_event(EventType.INCOMING_MSG)
-        msg = ac2.get_message_by_id(ev.msg_id)
-        chat = ac2.get_chat_by_id(ev.chat_id)
-
-        # Accept the contact request.
-        chat.accept()
-        msg.mark_seen()
-        idle2.wait_for_seen()
-
-    assert len(list(ac2_direct_imap.conn.fetch(AND(seen=True, uid=U(1, "*")), mark_seen=False))) == 1
-
-
-@pytest.mark.parametrize("mvbox_move", [True, False])
-def test_markseen_message_and_mdn(acfactory, direct_imap, mvbox_move):
-    ac1, ac2 = acfactory.get_online_accounts(2)
-
-    for ac in ac1, ac2:
-        ac.set_config("delete_server_after", "0")
-        if mvbox_move:
-            ac.set_config("mvbox_move", "1")
-            ac.bring_online()
-
-    # Do not send BCC to self, we only want to test MDN on ac1.
-    ac1.set_config("bcc_self", "0")
-
-    acfactory.get_accepted_chat(ac1, ac2).send_text("hi")
-    msg = ac2.wait_for_incoming_msg()
-    msg.mark_seen()
-
-    if mvbox_move:
-        rex = re.compile("Marked messages [0-9]+ in folder DeltaChat as seen.")
-    else:
-        rex = re.compile("Marked messages [0-9]+ in folder INBOX as seen.")
-
-    for ac in ac1, ac2:
-        while True:
-            event = ac.wait_for_event()
-            if event.kind == EventType.INFO and rex.search(event.msg):
-                break
-
-    folder = "mvbox" if mvbox_move else "inbox"
-    ac1_direct_imap = direct_imap(ac1)
-    ac2_direct_imap = direct_imap(ac2)
-
-    ac1_direct_imap.select_config_folder(folder)
-    ac2_direct_imap.select_config_folder(folder)
-
-    # Check that the mdn is marked as seen
-    assert len(list(ac1_direct_imap.conn.fetch(AND(seen=True), mark_seen=False))) == 1
-    # Check original message is marked as seen
-    assert len(list(ac2_direct_imap.conn.fetch(AND(seen=True), mark_seen=False))) == 1
-
-
-def test_mvbox_and_trash(acfactory, direct_imap, log):
-    log.section("ac1: start with mvbox")
-    ac1 = acfactory.get_online_account()
-    ac1.set_config("mvbox_move", "1")
-    ac1.bring_online()
-
-    log.section("ac2: start without a mvbox")
-    ac2 = acfactory.get_online_account()
-
-    log.section("ac1: create trash")
-    ac1_direct_imap = direct_imap(ac1)
-    ac1_direct_imap.create_folder("Trash")
-    ac1.set_config("scan_all_folders_debounce_secs", "0")
-    ac1.stop_io()
-    ac1.start_io()
-
-    log.section("ac1: send message and wait for ac2 to receive it")
-    acfactory.get_accepted_chat(ac1, ac2).send_text("message1")
-    assert ac2.wait_for_incoming_msg().get_snapshot().text == "message1"
-
-    assert ac1.get_config("configured_mvbox_folder") == "DeltaChat"
-    while ac1.get_config("configured_trash_folder") != "Trash":
-        ac1.wait_for_event(EventType.CONNECTIVITY_CHANGED)
-
-
-@pytest.mark.parametrize(
-    ("folder", "move", "expected_destination"),
-    [
-        (
-            "xyz",
-            False,
-            "xyz",
-        ),  # Test that emails aren't found in a random folder
-        (
-            "xyz",
-            True,
-            "xyz",
-        ),  # ...emails are found in a random folder and downloaded without moving
-        (
-            "Spam",
-            False,
-            "INBOX",
-        ),  # ...emails are moved from the spam folder to the Inbox
-    ],
-)
-# Testrun.org does not support the CREATE-SPECIAL-USE capability, which means that we can't create a folder with
-# the "\Junk" flag (see https://tools.ietf.org/html/rfc6154). So, we can't test spam folder detection by flag.
-def test_scan_folders(acfactory, log, direct_imap, folder, move, expected_destination):
-    """Delta Chat periodically scans all folders for new messages to make sure we don't miss any."""
-    variant = folder + "-" + str(move) + "-" + expected_destination
-    log.section("Testing variant " + variant)
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac1.set_config("delete_server_after", "0")
-    if move:
-        ac1.set_config("mvbox_move", "1")
-        ac1.bring_online()
-
-    ac1.stop_io()
-    ac1_direct_imap = direct_imap(ac1)
-    ac1_direct_imap.create_folder(folder)
-
-    # Wait until each folder was selected once and we are IDLEing:
-    ac1.start_io()
-    ac1.bring_online()
-
-    ac1.stop_io()
-    assert folder in ac1_direct_imap.list_folders()
-
-    log.section("Send a message from ac2 to ac1 and manually move it to `folder`")
-    ac1_direct_imap.select_config_folder("inbox")
-    with ac1_direct_imap.idle() as idle1:
-        acfactory.get_accepted_chat(ac2, ac1).send_text("hello")
-        idle1.wait_for_new_message()
-    ac1_direct_imap.conn.move(["*"], folder)  # "*" means "biggest UID in mailbox"
-
-    log.section("start_io() and see if DeltaChat finds the message (" + variant + ")")
-    ac1.set_config("scan_all_folders_debounce_secs", "0")
-    ac1.start_io()
-    chat = ac1.create_chat(ac2)
-    n_msgs = 1  # "Messages are end-to-end encrypted."
-    if folder == "Spam":
-        msg = ac1.wait_for_incoming_msg().get_snapshot()
-        assert msg.text == "hello"
-        n_msgs += 1
-    else:
-        ac1.wait_for_event(EventType.IMAP_INBOX_IDLE)
-    assert len(chat.get_messages()) == n_msgs
-
-    # The message has reached its destination.
-    ac1_direct_imap.select_folder(expected_destination)
-    assert len(ac1_direct_imap.get_all_messages()) == 1
-    if folder != expected_destination:
-        ac1_direct_imap.select_folder(folder)
-        assert len(ac1_direct_imap.get_all_messages()) == 0
-
-
-def test_trash_multiple_messages(acfactory, direct_imap, log):
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac2.stop_io()
-
-    # Create the Trash folder on IMAP server and configure deletion to it. There was a bug that if
-    # Trash wasn't configured initially, it can't be configured later, let's check this.
-    log.section("Creating trash folder")
-    ac2_direct_imap = direct_imap(ac2)
-    ac2_direct_imap.create_folder("Trash")
-    ac2.set_config("delete_server_after", "0")
-    ac2.set_config("sync_msgs", "0")
-    ac2.set_config("delete_to_trash", "1")
-
-    log.section("Check that Trash can be configured initially as well")
-    ac3 = ac2.clone()
-    ac3.bring_online()
-    assert ac3.get_config("configured_trash_folder")
-    ac3.stop_io()
-
-    ac2.start_io()
-    chat12 = acfactory.get_accepted_chat(ac1, ac2)
-
-    log.section("ac1: sending 3 messages")
-    texts = ["first", "second", "third"]
-    for text in texts:
-        chat12.send_text(text)
-
-    log.section("ac2: waiting for all messages on the other side")
-    to_delete = []
-    for text in texts:
-        msg = ac2.wait_for_incoming_msg().get_snapshot()
-        assert msg.text in texts
-        if text != "second":
-            to_delete.append(msg)
-    # ac2 has received some messages, this is impossible w/o the trash folder configured, let's
-    # check the configuration.
-    assert ac2.get_config("configured_trash_folder") == "Trash"
-
-    log.section("ac2: deleting all messages except second")
-    assert len(to_delete) == len(texts) - 1
-    ac2.delete_messages(to_delete)
-
-    log.section("ac2: test that only one message is left")
-    while 1:
-        ac2.wait_for_event(EventType.IMAP_MESSAGE_MOVED)
-        ac2_direct_imap.select_config_folder("inbox")
-        nr_msgs = len(ac2_direct_imap.get_all_messages())
-        assert nr_msgs > 0
-        if nr_msgs == 1:
-            break
--- a/deltachat-rpc-client/tests/test_iroh_webxdc.py
+++ b/deltachat-rpc-client/tests/test_iroh_webxdc.py
@@ -84,7 +84,7 @@ def test_realtime_sequentially(acfactory, path_to_webxdc):

    # share a webxdc app between ac1 and ac2
    ac1_webxdc_msg = acfactory.send_message(from_account=ac1, to_account=ac2, text="play", file=path_to_webxdc)
-    ac2_webxdc_msg = ac2.wait_for_incoming_msg()
+    ac2_webxdc_msg = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id)
    snapshot = ac2_webxdc_msg.get_snapshot()
    assert snapshot.text == "play"

@@ -94,7 +94,7 @@ def test_realtime_sequentially(acfactory, path_to_webxdc):
    acfactory.send_message(from_account=ac1, to_account=ac2, text="ping1")

    log("waiting for incoming message on ac2")
-    snapshot = ac2.wait_for_incoming_msg().get_snapshot()
+    snapshot = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot()
    assert snapshot.text == "ping1"

    log("sending ac2 -> ac1 realtime advertisement and additional message")
@@ -102,7 +102,7 @@ def test_realtime_sequentially(acfactory, path_to_webxdc):
    acfactory.send_message(from_account=ac2, to_account=ac1, text="ping2")

    log("waiting for incoming message on ac1")
-    snapshot = ac1.wait_for_incoming_msg().get_snapshot()
+    snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
    assert snapshot.text == "ping2"

    log("sending realtime data ac1 -> ac2")
--- a/deltachat-rpc-client/tests/test_multidevice.py
+++ b/deltachat-rpc-client/tests/test_multidevice.py
@@ -4,41 +4,6 @@ from deltachat_rpc_client import EventType
 from deltachat_rpc_client.const import MessageState


-def test_bcc_self_delete_server_after_defaults(acfactory):
-    """Test default values for bcc_self and delete_server_after."""
-    ac = acfactory.get_online_account()
-
-    # Initially after getting online
-    # the setting bcc_self is set to 0 because there is only one device
-    # and delete_server_after is "1", meaning immediate deletion.
-    assert ac.get_config("bcc_self") == "0"
-    assert ac.get_config("delete_server_after") == "1"
-
-    # Setup a second device.
-    ac_clone = ac.clone()
-    ac_clone.bring_online()
-
-    # Second device setup
-    # enables bcc_self and changes default delete_server_after.
-    assert ac.get_config("bcc_self") == "1"
-    assert ac.get_config("delete_server_after") == "0"
-
-    assert ac_clone.get_config("bcc_self") == "1"
-    assert ac_clone.get_config("delete_server_after") == "0"
-
-    # Manually disabling bcc_self
-    # also restores the default for delete_server_after.
-    ac.set_config("bcc_self", "0")
-    assert ac.get_config("bcc_self") == "0"
-    assert ac.get_config("delete_server_after") == "1"
-
-    # Cloning the account again enables bcc_self
-    # even though it was manually disabled.
-    ac_clone = ac.clone()
-    assert ac.get_config("bcc_self") == "1"
-    assert ac.get_config("delete_server_after") == "0"
-
-
 def test_one_account_send_bcc_setting(acfactory, log, direct_imap):
    ac1, ac2 = acfactory.get_online_accounts(2)
    ac1_clone = ac1.clone()
--- a/deltachat-rpc-client/tests/test_multitransport.py
+++ b/deltachat-rpc-client/tests/test_multitransport.py
@@ -1,301 +0,0 @@
-import pytest
-
-from deltachat_rpc_client import EventType
-from deltachat_rpc_client.rpc import JsonRpcError
-
-
-def test_add_second_address(acfactory) -> None:
-    account = acfactory.new_configured_account()
-    assert len(account.list_transports()) == 1
-
-    # When the first transport is created,
-    # mvbox_move and only_fetch_mvbox should be disabled.
-    assert account.get_config("mvbox_move") == "0"
-    assert account.get_config("only_fetch_mvbox") == "0"
-    assert account.get_config("show_emails") == "2"
-
-    qr = acfactory.get_account_qr()
-    account.add_transport_from_qr(qr)
-    assert len(account.list_transports()) == 2
-
-    account.add_transport_from_qr(qr)
-    assert len(account.list_transports()) == 3
-
-    first_addr = account.list_transports()[0]["addr"]
-    second_addr = account.list_transports()[1]["addr"]
-
-    # Cannot delete the first address.
-    with pytest.raises(JsonRpcError):
-        account.delete_transport(first_addr)
-
-    account.delete_transport(second_addr)
-    assert len(account.list_transports()) == 2
-
-    # Enabling mvbox_move or only_fetch_mvbox
-    # is not allowed when multi-transport is enabled.
-    for option in ["mvbox_move", "only_fetch_mvbox"]:
-        with pytest.raises(JsonRpcError):
-            account.set_config(option, "1")
-
-    with pytest.raises(JsonRpcError):
-        account.set_config("show_emails", "0")
-
-
-@pytest.mark.parametrize("key", ["mvbox_move", "only_fetch_mvbox"])
-def test_no_second_transport_with_mvbox(acfactory, key) -> None:
-    """Test that second transport cannot be configured if mvbox is used."""
-    account = acfactory.new_configured_account()
-    assert len(account.list_transports()) == 1
-
-    assert account.get_config("mvbox_move") == "0"
-    assert account.get_config("only_fetch_mvbox") == "0"
-
-    qr = acfactory.get_account_qr()
-    account.set_config(key, "1")
-
-    with pytest.raises(JsonRpcError):
-        account.add_transport_from_qr(qr)
-
-
-def test_no_second_transport_without_classic_emails(acfactory) -> None:
-    """Test that second transport cannot be configured if classic emails are not fetched."""
-    account = acfactory.new_configured_account()
-    assert len(account.list_transports()) == 1
-
-    assert account.get_config("show_emails") == "2"
-
-    qr = acfactory.get_account_qr()
-    account.set_config("show_emails", "0")
-
-    with pytest.raises(JsonRpcError):
-        account.add_transport_from_qr(qr)
-
-
-def test_change_address(acfactory) -> None:
-    """Test Alice configuring a second transport and setting it as a primary one."""
-    alice, bob = acfactory.get_online_accounts(2)
-
-    bob_addr = bob.get_config("configured_addr")
-    bob.create_chat(alice)
-
-    alice_chat_bob = alice.create_chat(bob)
-    alice_chat_bob.send_text("Hello!")
-
-    msg1 = bob.wait_for_incoming_msg().get_snapshot()
-    sender_addr1 = msg1.sender.get_snapshot().address
-
-    alice.stop_io()
-    old_alice_addr = alice.get_config("configured_addr")
-    alice_vcard = alice.self_contact.make_vcard()
-    assert old_alice_addr in alice_vcard
-    qr = acfactory.get_account_qr()
-    alice.add_transport_from_qr(qr)
-    new_alice_addr = alice.list_transports()[1]["addr"]
-    with pytest.raises(JsonRpcError):
-        # Cannot use the address that is not
-        # configured for any transport.
-        alice.set_config("configured_addr", bob_addr)
-
-    # Load old address so it is cached.
-    assert alice.get_config("configured_addr") == old_alice_addr
-    alice.set_config("configured_addr", new_alice_addr)
-    # Make sure that setting `configured_addr` invalidated the cache.
-    assert alice.get_config("configured_addr") == new_alice_addr
-
-    alice_vcard = alice.self_contact.make_vcard()
-    assert old_alice_addr not in alice_vcard
-    assert new_alice_addr in alice_vcard
-    with pytest.raises(JsonRpcError):
-        alice.delete_transport(new_alice_addr)
-    alice.start_io()
-
-    alice_chat_bob.send_text("Hello again!")
-
-    msg2 = bob.wait_for_incoming_msg().get_snapshot()
-    sender_addr2 = msg2.sender.get_snapshot().address
-
-    assert msg1.sender == msg2.sender
-    assert sender_addr1 != sender_addr2
-    assert sender_addr1 == old_alice_addr
-    assert sender_addr2 == new_alice_addr
-
-
-@pytest.mark.parametrize("is_chatmail", ["0", "1"])
-def test_mvbox_move_first_transport(acfactory, is_chatmail) -> None:
-    """Test that mvbox_move is disabled by default even for non-chatmail accounts.
-    Disabling mvbox_move is required to be able to setup a second transport.
-    """
-    account = acfactory.get_unconfigured_account()
-
-    account.set_config("fix_is_chatmail", "1")
-    account.set_config("is_chatmail", is_chatmail)
-
-    # The default value when the setting is unset is "1".
-    # This is not changed for compatibility with old databases
-    # imported from backups.
-    assert account.get_config("mvbox_move") == "1"
-
-    qr = acfactory.get_account_qr()
-    account.add_transport_from_qr(qr)
-
-    # Once the first transport is set up,
-    # mvbox_move is disabled.
-    assert account.get_config("mvbox_move") == "0"
-    assert account.get_config("is_chatmail") == is_chatmail
-
-
-def test_reconfigure_transport(acfactory) -> None:
-    """Test that reconfiguring the transport works
-    even if settings not supported for multi-transport
-    like mvbox_move are enabled."""
-    account = acfactory.get_online_account()
-    account.set_config("mvbox_move", "1")
-
-    [transport] = account.list_transports()
-    account.add_or_update_transport(transport)
-
-    # Reconfiguring the transport should not reset
-    # the settings as if when configuring the first transport.
-    assert account.get_config("mvbox_move") == "1"
-
-
-def test_transport_synchronization(acfactory, log) -> None:
-    """Test synchronization of transports between devices."""
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac1_clone = ac1.clone()
-    ac1_clone.bring_online()
-
-    qr = acfactory.get_account_qr()
-
-    ac1.add_transport_from_qr(qr)
-    ac1_clone.wait_for_event(EventType.TRANSPORTS_MODIFIED)
-    assert len(ac1.list_transports()) == 2
-    assert len(ac1_clone.list_transports()) == 2
-
-    ac1_clone.add_transport_from_qr(qr)
-    ac1.wait_for_event(EventType.TRANSPORTS_MODIFIED)
-    assert len(ac1.list_transports()) == 3
-    assert len(ac1_clone.list_transports()) == 3
-
-    log.section("ac1 clone removes second transport")
-    [transport1, transport2, transport3] = ac1_clone.list_transports()
-    addr3 = transport3["addr"]
-    ac1_clone.delete_transport(transport2["addr"])
-
-    ac1.wait_for_event(EventType.TRANSPORTS_MODIFIED)
-    [transport1, transport3] = ac1.list_transports()
-
-    log.section("ac1 changes the primary transport")
-    ac1.set_config("configured_addr", transport3["addr"])
-
-    ac1_clone.wait_for_event(EventType.TRANSPORTS_MODIFIED)
-    [transport1, transport3] = ac1_clone.list_transports()
-    assert ac1_clone.get_config("configured_addr") == addr3
-
-    log.section("ac1 removes the first transport")
-    ac1.delete_transport(transport1["addr"])
-
-    ac1_clone.wait_for_event(EventType.TRANSPORTS_MODIFIED)
-    [transport3] = ac1_clone.list_transports()
-    assert transport3["addr"] == addr3
-    assert ac1_clone.get_config("configured_addr") == addr3
-
-    ac2_chat = ac2.create_chat(ac1)
-    ac2_chat.send_text("Hello!")
-
-    assert ac1.wait_for_incoming_msg().get_snapshot().text == "Hello!"
-    assert ac1_clone.wait_for_incoming_msg().get_snapshot().text == "Hello!"
-
-
-def test_transport_sync_new_as_primary(acfactory, log) -> None:
-    """Test synchronization of new transport as primary between devices."""
-    ac1 = acfactory.get_online_account()
-    ac1_clone = ac1.clone()
-    ac1_clone.bring_online()
-
-    qr = acfactory.get_account_qr()
-
-    ac1.add_transport_from_qr(qr)
-    ac1_transports = ac1.list_transports()
-    assert len(ac1_transports) == 2
-    [transport1, transport2] = ac1_transports
-    ac1_clone.wait_for_event(EventType.TRANSPORTS_MODIFIED)
-    assert len(ac1_clone.list_transports()) == 2
-    assert ac1_clone.get_config("configured_addr") == transport1["addr"]
-
-    log.section("ac1 changes the primary transport")
-    ac1.set_config("configured_addr", transport2["addr"])
-
-    ac1_clone.wait_for_event(EventType.TRANSPORTS_MODIFIED)
-    assert ac1_clone.get_config("configured_addr") == transport2["addr"]
-
-
-def test_recognize_self_address(acfactory) -> None:
-    alice, bob = acfactory.get_online_accounts(2)
-
-    bob_chat = bob.create_chat(alice)
-
-    qr = acfactory.get_account_qr()
-    alice.add_transport_from_qr(qr)
-
-    new_alice_addr = alice.list_transports()[1]["addr"]
-    alice.set_config("configured_addr", new_alice_addr)
-
-    bob_chat.send_text("Hello!")
-    msg = alice.wait_for_incoming_msg().get_snapshot()
-    assert msg.chat == alice.create_chat(bob)
-
-
-def test_transport_limit(acfactory) -> None:
-    """Test transports limit."""
-    account = acfactory.get_online_account()
-    qr = acfactory.get_account_qr()
-
-    limit = 5
-
-    for _ in range(1, limit):
-        account.add_transport_from_qr(qr)
-
-    assert len(account.list_transports()) == limit
-
-    with pytest.raises(JsonRpcError):
-        account.add_transport_from_qr(qr)
-
-    second_addr = account.list_transports()[1]["addr"]
-    account.delete_transport(second_addr)
-
-    # test that adding a transport after deleting one works again
-    account.add_transport_from_qr(qr)
-
-
-def test_message_info_imap_urls(acfactory, log) -> None:
-    """Test that message info contains IMAP URLs of where the message was received."""
-    alice, bob = acfactory.get_online_accounts(2)
-
-    log.section("Alice adds ac1 clone removes second transport")
-    qr = acfactory.get_account_qr()
-    for i in range(3):
-        alice.add_transport_from_qr(qr)
-        # Wait for all transports to go IDLE after adding each one.
-        for _ in range(i + 1):
-            alice.bring_online()
-
-    new_alice_addr = alice.list_transports()[2]["addr"]
-    alice.set_config("configured_addr", new_alice_addr)
-
-    # Enable multi-device mode so messages are not deleted immediately.
-    alice.set_config("bcc_self", "1")
-
-    # Bob creates chat, learning about Alice's currently selected transport.
-    # This is where he will send the message.
-    bob_chat = bob.create_chat(alice)
-
-    # Alice changes the transport again.
-    alice.set_config("configured_addr", alice.list_transports()[3]["addr"])
-
-    bob_chat.send_text("Hello!")
-
-    msg = alice.wait_for_incoming_msg()
-    for alice_transport in alice.list_transports():
-        addr = alice_transport["addr"]
-        assert (addr == new_alice_addr) == (addr in msg.get_info())
--- a/deltachat-rpc-client/tests/test_securejoin.py
+++ b/deltachat-rpc-client/tests/test_securejoin.py
@@ -86,7 +86,7 @@ def test_qr_securejoin(acfactory):
    alice_contact_bob_snapshot = alice_contact_bob.get_snapshot()
    assert alice_contact_bob_snapshot.is_verified

-    snapshot = bob.wait_for_incoming_msg().get_snapshot()
+    snapshot = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot()
    assert snapshot.text == "Member Me added by {}.".format(alice.get_config("addr"))

    # Test that Bob verified Alice's profile.
@@ -140,15 +140,15 @@ def test_qr_securejoin_broadcast(acfactory, all_devices_online):
        return chat

    def wait_for_broadcast_messages(ac):
-        snapshot1 = ac.wait_for_incoming_msg().get_snapshot()
-        assert snapshot1.text == "You joined the channel."
-
-        snapshot2 = ac.wait_for_incoming_msg().get_snapshot()
-        assert snapshot2.text == "Hello everyone!"
-
        chat = get_broadcast(ac)
-        assert snapshot1.chat_id == chat.id
-        assert snapshot2.chat_id == chat.id
+
+        snapshot = ac.wait_for_incoming_msg().get_snapshot()
+        assert snapshot.text == "You joined the channel."
+        assert snapshot.chat_id == chat.id
+
+        snapshot = ac.wait_for_incoming_msg().get_snapshot()
+        assert snapshot.text == "Hello everyone!"
+        assert snapshot.chat_id == chat.id

    def check_account(ac, contact, inviter_side, please_wait_info_msg=False):
        # Check that the chat partner is verified.
@@ -158,29 +158,29 @@ def test_qr_securejoin_broadcast(acfactory, all_devices_online):
        chat = get_broadcast(ac)
        chat_msgs = chat.get_messages()

-        encrypted_msg = chat_msgs.pop(0).get_snapshot()
+        if please_wait_info_msg:
+            first_msg = chat_msgs.pop(0).get_snapshot()
+            assert first_msg.text == "Establishing guaranteed end-to-end encryption, please wait…"
+            assert first_msg.is_info
+
+        encrypted_msg = chat_msgs[0].get_snapshot()
        assert encrypted_msg.text == "Messages are end-to-end encrypted."
        assert encrypted_msg.is_info

-        if please_wait_info_msg:
-            first_msg = chat_msgs.pop(0).get_snapshot()
-            assert "invited you to join this channel" in first_msg.text
-            assert first_msg.is_info
-
-        member_added_msg = chat_msgs.pop(0).get_snapshot()
+        member_added_msg = chat_msgs[1].get_snapshot()
        if inviter_side:
            assert member_added_msg.text == f"Member {contact_snapshot.display_name} added."
        else:
            assert member_added_msg.text == "You joined the channel."
        assert member_added_msg.is_info

-        hello_msg = chat_msgs.pop(0).get_snapshot()
+        hello_msg = chat_msgs[2].get_snapshot()
        assert hello_msg.text == "Hello everyone!"
        assert not hello_msg.is_info
        assert hello_msg.show_padlock
        assert hello_msg.error is None

-        assert len(chat_msgs) == 0
+        assert len(chat_msgs) == 3

        chat_snapshot = chat.get_full_snapshot()
        assert chat_snapshot.is_encrypted
@@ -255,7 +255,7 @@ def test_qr_securejoin_contact_request(acfactory) -> None:
    alice_chat_bob = alice_contact_bob.create_chat()
    alice_chat_bob.send_text("Hello!")

-    snapshot = bob.wait_for_incoming_msg().get_snapshot()
+    snapshot = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot()
    assert snapshot.text == "Hello!"
    bob_chat_alice = snapshot.chat
    assert bob_chat_alice.get_basic_snapshot().is_contact_request
@@ -299,7 +299,8 @@ def test_qr_readreceipt(acfactory) -> None:

    logging.info("Bob and Charlie receive a group")

-    bob_message = bob.wait_for_incoming_msg()
+    bob_msg_id = bob.wait_for_incoming_msg_event().msg_id
+    bob_message = bob.get_message_by_id(bob_msg_id)
    bob_snapshot = bob_message.get_snapshot()
    assert bob_snapshot.text == "Hello"

@@ -310,7 +311,8 @@ def test_qr_readreceipt(acfactory) -> None:

    bob_out_message = bob_snapshot.chat.send_message(text="Hi from Bob!")

-    charlie_message = charlie.wait_for_incoming_msg()
+    charlie_msg_id = charlie.wait_for_incoming_msg_event().msg_id
+    charlie_message = charlie.get_message_by_id(charlie_msg_id)
    charlie_snapshot = charlie_message.get_snapshot()
    assert charlie_snapshot.text == "Hi from Bob!"

@@ -385,7 +387,7 @@ def test_verified_group_member_added_recovery(acfactory) -> None:
    ac3_contact_ac2 = ac3.create_contact(ac2)
    ac3_chat.remove_contact(ac3_contact_ac2_old)

-    snapshot = ac1.wait_for_incoming_msg().get_snapshot()
+    snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
    assert "removed" in snapshot.text

    ac3_chat.add_contact(ac3_contact_ac2)
@@ -398,17 +400,18 @@ def test_verified_group_member_added_recovery(acfactory) -> None:
    logging.info("ac2 got event message: %s", snapshot.text)
    assert "added" in snapshot.text

-    snapshot = ac1.wait_for_incoming_msg().get_snapshot()
+    snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
    assert "added" in snapshot.text

    chat = Chat(ac2, chat_id)
    chat.send_text("Works again!")

-    message = ac3.wait_for_incoming_msg()
+    msg_id = ac3.wait_for_incoming_msg_event().msg_id
+    message = ac3.get_message_by_id(msg_id)
    snapshot = message.get_snapshot()
    assert snapshot.text == "Works again!"

-    snapshot = ac1.wait_for_incoming_msg().get_snapshot()
+    snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
    assert snapshot.text == "Works again!"

    ac1_contact_ac2 = ac1.create_contact(ac2)
@@ -444,7 +447,7 @@ def test_qr_join_chat_with_pending_bobstate_issue4894(acfactory):
    # ensure ac1 can write and ac2 receives messages in verified chat
    ch1.send_text("ac1 says hello")
    while 1:
-        snapshot = ac2.wait_for_incoming_msg().get_snapshot()
+        snapshot = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot()
        if snapshot.text == "ac1 says hello":
            break

@@ -465,7 +468,7 @@ def test_qr_join_chat_with_pending_bobstate_issue4894(acfactory):
    # ensure ac2 receives message in VG
    vg.send_text("hello")
    while 1:
-        msg = ac2.wait_for_incoming_msg().get_snapshot()
+        msg = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot()
        if msg.text == "hello":
            break

@@ -502,7 +505,7 @@ def test_qr_new_group_unblocked(acfactory):
    ac2.wait_for_incoming_msg_event()

    ac1_new_chat.send_text("Hello!")
-    ac2_msg = ac2.wait_for_incoming_msg().get_snapshot()
+    ac2_msg = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot()
    assert ac2_msg.text == "Hello!"
    assert ac2_msg.chat.get_basic_snapshot().is_contact_request

@@ -527,7 +530,7 @@ def test_aeap_flow_verified(acfactory):

    logging.info("receiving first message")
    ac2.wait_for_incoming_msg_event()  # member added message
-    msg_in_1 = ac2.wait_for_incoming_msg().get_snapshot()
+    msg_in_1 = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot()
    assert msg_in_1.text == msg_out.text

    logging.info("changing email account")
@@ -541,7 +544,7 @@ def test_aeap_flow_verified(acfactory):
    msg_out = chat.send_text("changed address").get_snapshot()

    logging.info("receiving second message")
-    msg_in_2 = ac2.wait_for_incoming_msg()
+    msg_in_2 = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id)
    msg_in_2_snapshot = msg_in_2.get_snapshot()
    assert msg_in_2_snapshot.text == msg_out.text
    assert msg_in_2_snapshot.chat.id == msg_in_1.chat.id
@@ -573,7 +576,7 @@ def test_gossip_verification(acfactory) -> None:
    bob_group_chat.add_contact(bob_contact_carol)
    bob_group_chat.send_message(text="Hello Autocrypt group")

-    snapshot = carol.wait_for_incoming_msg().get_snapshot()
+    snapshot = carol.get_message_by_id(carol.wait_for_incoming_msg_event().msg_id).get_snapshot()
    assert snapshot.text == "Hello Autocrypt group"
    assert snapshot.show_padlock

@@ -589,7 +592,7 @@ def test_gossip_verification(acfactory) -> None:
    bob_group_chat.add_contact(bob_contact_carol)
    bob_group_chat.send_message(text="Hello Securejoin group")

-    snapshot = carol.wait_for_incoming_msg().get_snapshot()
+    snapshot = carol.get_message_by_id(carol.wait_for_incoming_msg_event().msg_id).get_snapshot()
    assert snapshot.text == "Hello Securejoin group"
    assert snapshot.show_padlock

@@ -617,7 +620,7 @@ def test_securejoin_after_contact_resetup(acfactory) -> None:
    ac1.wait_for_securejoin_joiner_success()

    # ac1 waits for member added message and creates a QR code.
-    snapshot = ac1.wait_for_incoming_msg().get_snapshot()
+    snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
    assert snapshot.text == "Member Me added by {}.".format(ac3.get_config("addr"))
    ac1_qr_code = snapshot.chat.get_qr_code()

@@ -654,7 +657,7 @@ def test_securejoin_after_contact_resetup(acfactory) -> None:

    # Wait for member added.
    logging.info("ac2 waits for member added message")
-    snapshot = ac2.wait_for_incoming_msg().get_snapshot()
+    snapshot = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot()
    assert snapshot.is_info
    ac2_chat = snapshot.chat
    assert len(ac2_chat.get_contacts()) == 3
@@ -676,7 +679,7 @@ def test_withdraw_securejoin_qr(acfactory):

    alice.clear_all_events()

-    snapshot = bob.wait_for_incoming_msg().get_snapshot()
+    snapshot = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot()
    assert snapshot.text == "Member Me added by {}.".format(alice.get_config("addr"))
    bob_chat.leave()

@@ -696,6 +699,6 @@ def test_withdraw_securejoin_qr(acfactory):
        event = alice.wait_for_event()
        if (
            event.kind == EventType.WARNING
-            and "Ignoring RequestWithAuth message because of invalid auth code." in event.msg
+            and "Ignoring vg-request-with-auth message because of invalid auth code." in event.msg
        ):
            break
--- a/deltachat-rpc-client/tests/test_something.py
+++ b/deltachat-rpc-client/tests/test_something.py
@@ -5,11 +5,12 @@ import logging
 import os
 import socket
 import subprocess
+import time
 from unittest.mock import MagicMock

 import pytest

-from deltachat_rpc_client import EventType, events
+from deltachat_rpc_client import Contact, EventType, Message, events
 from deltachat_rpc_client.const import DownloadState, MessageState
 from deltachat_rpc_client.pytestplugin import E2EE_INFO_MSGS
 from deltachat_rpc_client.rpc import JsonRpcError
@@ -89,9 +90,12 @@ def test_lowercase_address(acfactory) -> None:
    assert account.get_config("configured_addr") == addr
    assert account.list_transports()[0]["addr"] == addr

-    param = account.get_info()["used_transport_settings"]
-    assert addr in param
-    assert addr_upper not in param
+    for param in [
+        account.get_info()["used_account_settings"],
+        account.get_info()["entered_account_settings"],
+    ]:
+        assert addr in param
+        assert addr_upper not in param


 def test_configure_ip(acfactory) -> None:
@@ -332,27 +336,28 @@ def test_receive_imf_failure(acfactory) -> None:
    alice_contact_bob = alice.create_contact(bob, "Bob")
    alice_chat_bob = alice_contact_bob.create_chat()

-    bob.set_config("simulate_receive_imf_error", "1")
+    bob.set_config("fail_on_receiving_full_msg", "1")
    alice_chat_bob.send_text("Hello!")
    event = bob.wait_for_event(EventType.MSGS_CHANGED)
    assert event.chat_id == bob.get_device_chat().id
    msg_id = event.msg_id
    message = bob.get_message_by_id(msg_id)
    snapshot = message.get_snapshot()
-    version = bob.get_info()["deltachat_core_version"]
    assert (
        snapshot.text == "❌ Failed to receive a message:"
-        " Condition failed: `!context.get_config_bool(Config::SimulateReceiveImfError).await?`."
-        f" Core version {version}."
+        " Condition failed: `!context.get_config_bool(Config::FailOnReceivingFullMsg).await?`."
        " Please report this bug to delta@merlinux.eu or https://support.delta.chat/."
    )

    # The failed message doesn't break the IMAP loop.
-    bob.set_config("simulate_receive_imf_error", "0")
+    bob.set_config("fail_on_receiving_full_msg", "0")
    alice_chat_bob.send_text("Hello again!")
-    message = bob.wait_for_incoming_msg()
+    event = bob.wait_for_incoming_msg_event()
+    msg_id = event.msg_id
+    message = bob.get_message_by_id(msg_id)
    snapshot = message.get_snapshot()
    assert snapshot.text == "Hello again!"
+    assert snapshot.download_state == DownloadState.DONE
    assert snapshot.error is None


@@ -370,41 +375,17 @@ def test_selfavatar_sync(acfactory, data, log) -> None:
    alice.set_config("selfavatar", image)
    avatar_config = alice.get_config("selfavatar")
    avatar_hash = os.path.basename(avatar_config)
-    logging.info(f"Avatar hash is {avatar_hash}")
+    print("Info: avatar hash is ", avatar_hash)

    log.section("First device receives avatar change")
    alice2.wait_for_event(EventType.SELFAVATAR_CHANGED)
    avatar_config2 = alice2.get_config("selfavatar")
    avatar_hash2 = os.path.basename(avatar_config2)
-    logging.info(f"Avatar hash on second device is {avatar_hash2}")
+    print("Info: avatar hash on second device is ", avatar_hash2)
    assert avatar_hash == avatar_hash2
    assert avatar_config != avatar_config2


-def test_dont_move_sync_msgs(acfactory, direct_imap):
-    addr, password = acfactory.get_credentials()
-    ac1 = acfactory.get_unconfigured_account()
-    ac1.set_config("bcc_self", "1")
-    ac1.set_config("fix_is_chatmail", "1")
-    ac1.add_or_update_transport({"addr": addr, "password": password})
-    ac1.bring_online()
-    ac1_direct_imap = direct_imap(ac1)
-
-    ac1_direct_imap.select_folder("Inbox")
-    # Sync messages may also be sent during configuration.
-    inbox_msg_cnt = len(ac1_direct_imap.get_all_messages())
-
-    ac1.set_config("displayname", "Alice")
-    ac1.wait_for_event(EventType.MSG_DELIVERED)
-    ac1.set_config("displayname", "Bob")
-    ac1.wait_for_event(EventType.MSG_DELIVERED)
-    ac1_direct_imap.select_folder("Inbox")
-    assert len(ac1_direct_imap.get_all_messages()) == inbox_msg_cnt + 2
-
-    ac1_direct_imap.select_folder("DeltaChat")
-    assert len(ac1_direct_imap.get_all_messages()) == 0
-
-
 def test_reaction_seen_on_another_dev(acfactory) -> None:
    alice, bob = acfactory.get_online_accounts(2)
    alice2 = alice.clone()
@@ -442,7 +423,10 @@ def test_is_bot(acfactory) -> None:
    alice.set_config("bot", "1")
    alice_chat_bob.send_text("Hello!")

-    snapshot = bob.wait_for_incoming_msg().get_snapshot()
+    event = bob.wait_for_incoming_msg_event()
+    message = bob.get_message_by_id(event.msg_id)
+    snapshot = message.get_snapshot()
+    assert snapshot.chat_id == event.chat_id
    assert snapshot.text == "Hello!"
    assert snapshot.is_bot

@@ -488,7 +472,7 @@ def test_bot(acfactory) -> None:


 def test_wait_next_messages(acfactory) -> None:
-    alice = acfactory.get_online_account()
+    alice = acfactory.new_configured_account()

    # Create a bot account so it does not receive device messages in the beginning.
    addr, password = acfactory.get_credentials()
@@ -496,7 +480,6 @@ def test_wait_next_messages(acfactory) -> None:
    bot.set_config("bot", "1")
    bot.add_or_update_transport({"addr": addr, "password": password})
    assert bot.is_configured()
-    bot.bring_online()

    # There are no old messages and the call returns immediately.
    assert not bot.wait_next_messages()
@@ -529,110 +512,13 @@ def test_import_export_backup(acfactory, tmp_path) -> None:
    assert alice2.manager.get_system_info()


-def test_import_export_online_all(acfactory, tmp_path, data, log) -> None:
-    (ac1, some1) = acfactory.get_online_accounts(2)
-
-    log.section("create some chat content")
-    some1_addr = some1.get_config("addr")
-    chat1 = ac1.create_contact(some1).create_chat()
-    chat1.send_text("msg1")
-    assert len(ac1.get_contacts()) == 1
-
-    original_image_path = data.get_path("image/avatar64x64.png")
-    chat1.send_file(str(original_image_path))
-
-    # Add another 100KB file that ensures that the progress is smooth enough
-    path = tmp_path / "attachment.txt"
-    with path.open("w") as file:
-        file.truncate(100000)
-    chat1.send_file(str(path))
-
-    def assert_account_is_proper(ac):
-        contacts = ac.get_contacts()
-        assert len(contacts) == 1
-        contact2 = contacts[0]
-        assert contact2.get_snapshot().address == some1_addr
-        chat2 = contact2.create_chat()
-        messages = chat2.get_messages()
-        assert len(messages) == 3 + E2EE_INFO_MSGS
-        assert messages[0 + E2EE_INFO_MSGS].get_snapshot().text == "msg1"
-        snapshot = messages[1 + E2EE_INFO_MSGS].get_snapshot()
-        assert snapshot.file_mime == "image/png"
-        assert os.stat(snapshot.file).st_size == os.stat(original_image_path).st_size
-        ac.set_config("displayname", "new displayname")
-        assert ac.get_config("displayname") == "new displayname"
-
-    assert_account_is_proper(ac1)
-
-    backupdir = tmp_path / "backup"
-    backupdir.mkdir()
-
-    log.section(f"export all to {backupdir}")
-    ac1.stop_io()
-    ac1.export_backup(backupdir)
-    progress = 0
-    files_written = []
-    while True:
-        event = ac1.wait_for_event()
-        if event.kind == EventType.IMEX_PROGRESS:
-            assert event.progress > 0  # Progress 0 indicates error.
-            assert event.progress < progress + 250
-            progress = event.progress
-            if progress == 1000:
-                break
-        elif event.kind == EventType.IMEX_FILE_WRITTEN:
-            files_written.append(event.path)
-        else:
-            logging.info(event)
-    assert len(files_written) == 1
-    assert os.path.exists(files_written[0])
-    ac1.start_io()
-
-    log.section("get fresh empty account")
-    ac2 = acfactory.get_unconfigured_account()
-
-    log.section("import backup and check it's proper")
-    ac2.import_backup(files_written[0])
-    progress = 0
-    while True:
-        event = ac2.wait_for_event()
-        if event.kind == EventType.IMEX_PROGRESS:
-            assert event.progress > 0  # Progress 0 indicates error.
-            assert event.progress < progress + 250
-            progress = event.progress
-            if progress == 1000:
-                break
-        else:
-            logging.info(event)
-    assert_account_is_proper(ac1)
-    assert_account_is_proper(ac2)
-
-    log.section(f"Second-time export all to {backupdir}")
-    ac1.stop_io()
-    ac1.export_backup(backupdir)
-    while True:
-        event = ac1.wait_for_event()
-        if event.kind == EventType.IMEX_PROGRESS:
-            assert event.progress > 0
-            if event.progress == 1000:
-                break
-        elif event.kind == EventType.IMEX_FILE_WRITTEN:
-            files_written.append(event.path)
-        else:
-            logging.info(event)
-    assert len(files_written) == 2
-    assert os.path.exists(files_written[1])
-    assert files_written[1] != files_written[0]
-    assert len(list(backupdir.glob("*.tar"))) == 2
-
-
 def test_import_export_keys(acfactory, tmp_path) -> None:
    alice, bob = acfactory.get_online_accounts(2)

    alice_chat_bob = alice.create_chat(bob)
    alice_chat_bob.send_text("Hello Bob!")

-    snapshot = bob.wait_for_incoming_msg().get_snapshot()
+    snapshot = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot()
    assert snapshot.text == "Hello Bob!"

    # Alice resetups account, but keeps the key.
@@ -644,7 +530,7 @@ def test_import_export_keys(acfactory, tmp_path) -> None:

    snapshot.chat.accept()
    snapshot.chat.send_text("Hello Alice!")
-    snapshot = alice.wait_for_incoming_msg().get_snapshot()
+    snapshot = alice.get_message_by_id(alice.wait_for_incoming_msg_event().msg_id).get_snapshot()
    assert snapshot.text == "Hello Alice!"
    assert snapshot.show_padlock

@@ -689,13 +575,18 @@ def test_mdn_doesnt_break_autocrypt(acfactory) -> None:

    # Alice sends a message to Bob.
    alice_chat_bob.send_text("Hello Bob!")
-    snapshot = bob.wait_for_incoming_msg().get_snapshot()
+    event = bob.wait_for_incoming_msg_event()
+    msg_id = event.msg_id
+    message = bob.get_message_by_id(msg_id)
+    snapshot = message.get_snapshot()

    # Bob sends a message to Alice.
    bob_chat_alice = snapshot.chat
    bob_chat_alice.accept()
    bob_chat_alice.send_text("Hello Alice!")
-    message = alice.wait_for_incoming_msg()
+    event = alice.wait_for_incoming_msg_event()
+    msg_id = event.msg_id
+    message = alice.get_message_by_id(msg_id)
    snapshot = message.get_snapshot()
    assert snapshot.show_padlock

@@ -705,10 +596,111 @@ def test_mdn_doesnt_break_autocrypt(acfactory) -> None:

    # Bob sends a message to Alice, it should also be encrypted.
    bob_chat_alice.send_text("Hi Alice!")
-    snapshot = alice.wait_for_incoming_msg().get_snapshot()
+    event = alice.wait_for_incoming_msg_event()
+    msg_id = event.msg_id
+    message = alice.get_message_by_id(msg_id)
+    snapshot = message.get_snapshot()
    assert snapshot.show_padlock


+def test_reaction_to_partially_fetched_msg(acfactory, tmp_path):
+    """See https://github.com/deltachat/deltachat-core-rust/issues/3688 "Partially downloaded
+    messages are received out of order".
+
+    If the Inbox contains X small messages followed by Y large messages followed by Z small
+    messages, Delta Chat first downloaded a batch of X+Z messages, and then a batch of Y messages.
+
+    This bug was discovered by @Simon-Laux while testing reactions PR #3644 and can be reproduced
+    with online test as follows:
+    - Bob enables download limit and goes offline.
+    - Alice sends a large message to Bob and reacts to this message with a thumbs-up.
+    - Bob goes online
+    - Bob first processes a reaction message and throws it away because there is no corresponding
+      message, then processes a partially downloaded message.
+    - As a result, Bob does not see a reaction
+    """
+    download_limit = 300000
+    ac1, ac2 = acfactory.get_online_accounts(2)
+    ac1_addr = ac1.get_config("addr")
+    chat = ac1.create_chat(ac2)
+    ac2.set_config("download_limit", str(download_limit))
+    ac2.stop_io()
+
+    logging.info("sending small+large messages from ac1 to ac2")
+    msgs = []
+    msgs.append(chat.send_text("hi"))
+    path = tmp_path / "large"
+    path.write_bytes(os.urandom(download_limit + 1))
+    msgs.append(chat.send_file(str(path)))
+    for m in msgs:
+        m.wait_until_delivered()
+
+    logging.info("sending a reaction to the large message from ac1 to ac2")
+    # TODO: Find the reason of an occasional message reordering on the server (so that the reaction
+    # has a lower UID than the previous message). W/a is to sleep for some time to let the reaction
+    # have a later INTERNALDATE.
+    time.sleep(1.1)
+    react_str = "\N{THUMBS UP SIGN}"
+    msgs.append(msgs[-1].send_reaction(react_str))
+    msgs[-1].wait_until_delivered()
+
+    ac2.start_io()
+
+    logging.info("wait for ac2 to receive a reaction")
+    msg2 = Message(ac2, ac2.wait_for_reactions_changed().msg_id)
+    assert msg2.get_sender_contact().get_snapshot().address == ac1_addr
+    assert msg2.get_snapshot().download_state == DownloadState.AVAILABLE
+    reactions = msg2.get_reactions()
+    contacts = [Contact(ac2, int(i)) for i in reactions.reactions_by_contact]
+    assert len(contacts) == 1
+    assert contacts[0].get_snapshot().address == ac1_addr
+    assert list(reactions.reactions_by_contact.values())[0] == [react_str]
+
+
+def test_reactions_for_a_reordering_move(acfactory, direct_imap):
+    """When a batch of messages is moved from Inbox to DeltaChat folder with a single MOVE command,
+    their UIDs may be reordered (e.g. Gmail is known for that) which led to that messages were
+    processed by receive_imf in the wrong order, and, particularly, reactions were processed before
+    messages they refer to and thus dropped.
+    """
+    (ac1,) = acfactory.get_online_accounts(1)
+
+    addr, password = acfactory.get_credentials()
+    ac2 = acfactory.get_unconfigured_account()
+    ac2.add_or_update_transport({"addr": addr, "password": password})
+    ac2.set_config("mvbox_move", "1")
+    assert ac2.is_configured()
+
+    ac2.bring_online()
+    chat1 = acfactory.get_accepted_chat(ac1, ac2)
+    ac2.stop_io()
+
+    logging.info("sending message + reaction from ac1 to ac2")
+    msg1 = chat1.send_text("hi")
+    msg1.wait_until_delivered()
+    # It's is sad, but messages must differ in their INTERNALDATEs to be processed in the correct
+    # order by DC, and most (if not all) mail servers provide only seconds precision.
+    time.sleep(1.1)
+    react_str = "\N{THUMBS UP SIGN}"
+    msg1.send_reaction(react_str).wait_until_delivered()
+
+    logging.info("moving messages to ac2's DeltaChat folder in the reverse order")
+    ac2_direct_imap = direct_imap(ac2)
+    ac2_direct_imap.connect()
+    for uid in sorted([m.uid for m in ac2_direct_imap.get_all_messages()], reverse=True):
+        ac2_direct_imap.conn.move(uid, "DeltaChat")
+
+    logging.info("receiving messages by ac2")
+    ac2.start_io()
+    msg2 = Message(ac2, ac2.wait_for_reactions_changed().msg_id)
+    assert msg2.get_snapshot().text == msg1.get_snapshot().text
+    reactions = msg2.get_reactions()
+    contacts = [Contact(ac2, int(i)) for i in reactions.reactions_by_contact]
+    assert len(contacts) == 1
+    assert contacts[0].get_snapshot().address == ac1.get_config("addr")
+    assert list(reactions.reactions_by_contact.values())[0] == [react_str]
+
+
@pytest.mark.parametrize("n_accounts", [3, 2])
 def test_download_limit_chat_assignment(acfactory, tmp_path, n_accounts):
    download_limit = 300000
@@ -720,172 +712,37 @@ def test_download_limit_chat_assignment(acfactory, tmp_path, n_accounts):
    for account in others:
        chat = account.create_chat(alice)
        chat.send_text("Hello Alice!")
-        assert alice.wait_for_incoming_msg().get_snapshot().text == "Hello Alice!"
+        assert alice.get_message_by_id(alice.wait_for_incoming_msg_event().msg_id).get_snapshot().text == "Hello Alice!"

        contact = alice.create_contact(account)
        alice_group.add_contact(contact)

+    if n_accounts == 2:
+        bob_chat_alice = bob.create_chat(alice)
    bob.set_config("download_limit", str(download_limit))

    alice_group.send_text("hi")
-    snapshot = bob.wait_for_incoming_msg().get_snapshot()
+    snapshot = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot()
    assert snapshot.text == "hi"
    bob_group = snapshot.chat

    path = tmp_path / "large"
    path.write_bytes(os.urandom(download_limit + 1))

-    n_done = 0
    for i in range(10):
        logging.info("Sending message %s", i)
        alice_group.send_file(str(path))
-        snapshot = bob.wait_for_incoming_msg().get_snapshot()
-        if snapshot.download_state == DownloadState.DONE:
-            n_done += 1
-            # Work around lost and reordered pre-messages.
-            assert n_done <= 1
+        snapshot = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot()
+        assert snapshot.download_state == DownloadState.AVAILABLE
+        if n_accounts > 2:
+            assert snapshot.chat == bob_group
        else:
-            assert snapshot.download_state == DownloadState.AVAILABLE
-        assert snapshot.chat == bob_group
-
-
-def test_download_small_msg_first(acfactory, tmp_path):
-    download_limit = 70000
-
-    alice, bob0 = acfactory.get_online_accounts(2)
-    bob1 = bob0.clone()
-    bob1.set_config("download_limit", str(download_limit))
-
-    chat = alice.create_chat(bob0)
-    path = tmp_path / "large_enough"
-    path.write_bytes(os.urandom(download_limit + 1))
-    # Less than 140K, so sent w/o a pre-message.
-    chat.send_file(str(path))
-    chat.send_text("hi")
-    bob0.create_chat(alice)
-    assert bob0.wait_for_incoming_msg().get_snapshot().text == ""
-    assert bob0.wait_for_incoming_msg().get_snapshot().text == "hi"
-
-    bob1.start_io()
-    bob1.create_chat(alice)
-    assert bob1.wait_for_incoming_msg().get_snapshot().text == "hi"
-    assert bob1.wait_for_incoming_msg().get_snapshot().text == ""
-
-
-@pytest.mark.parametrize("delete_chat", [False, True])
-def test_delete_available_msg(acfactory, tmp_path, direct_imap, delete_chat):
-    """
-    Tests `DownloadState.AVAILABLE` message deletion on the receiver side.
-    Also tests pre- and post-message deletion on the sender side.
-    """
-    # Min. UI setting as of v2.35
-    download_limit = 163840
-    alice, bob = acfactory.get_online_accounts(2)
-    bob.set_config("download_limit", str(download_limit))
-    # Avoid immediate deletion from the server
-    alice.set_config("bcc_self", "1")
-    bob.set_config("bcc_self", "1")
-
-    chat_alice = alice.create_chat(bob)
-    path = tmp_path / "large"
-    path.write_bytes(os.urandom(download_limit + 1))
-    msg_alice = chat_alice.send_file(str(path))
-    msg_bob = bob.wait_for_incoming_msg()
-    msg_bob_snapshot = msg_bob.get_snapshot()
-    assert msg_bob_snapshot.download_state == DownloadState.AVAILABLE
-    chat_bob = bob.get_chat_by_id(msg_bob_snapshot.chat_id)
-
-    # Avoid DeleteMessages sync message
-    bob.set_config("bcc_self", "0")
-    if delete_chat:
-        chat_bob.delete()
-    else:
-        bob.delete_messages([msg_bob])
-    alice.wait_for_event(EventType.SMTP_MESSAGE_SENT)
-    alice.wait_for_event(EventType.SMTP_MESSAGE_SENT)
-    alice.set_config("bcc_self", "0")
-    if delete_chat:
-        chat_alice.delete()
-    else:
-        alice.delete_messages([msg_alice])
-    for acc in [bob, alice]:
-        if not delete_chat:
-            acc.wait_for_event(EventType.MSG_DELETED)
-        acc_direct_imap = direct_imap(acc)
-        # Messages may be deleted separately
-        while True:
-            acc.wait_for_event(EventType.IMAP_MESSAGE_DELETED)
-            while True:
-                event = acc.wait_for_event()
-                if event.kind == EventType.INFO and "Close/expunge succeeded." in event.msg:
-                    break
-            if len(acc_direct_imap.get_all_messages()) == 0:
-                break
-
-
-def test_delete_fully_downloaded_msg(acfactory, tmp_path, direct_imap):
-    alice, bob = acfactory.get_online_accounts(2)
-    # Avoid immediate deletion from the server
-    bob.set_config("bcc_self", "1")
-
-    chat_alice = alice.create_chat(bob)
-    path = tmp_path / "large"
-    # Big enough to be sent with a pre-message
-    path.write_bytes(os.urandom(300000))
-    chat_alice.send_file(str(path))
-
-    msg = bob.wait_for_incoming_msg()
-    msg_snapshot = msg.get_snapshot()
-    assert msg_snapshot.download_state == DownloadState.AVAILABLE
-    msgs_changed_event = bob.wait_for_msgs_changed_event()
-    assert msgs_changed_event.msg_id == msg.id
-    msg_snapshot = msg.get_snapshot()
-    assert msg_snapshot.download_state == DownloadState.DONE
-
-    bob_direct_imap = direct_imap(bob)
-    assert len(bob_direct_imap.get_all_messages()) == 2
-    # Avoid DeleteMessages sync message
-    bob.set_config("bcc_self", "0")
-    bob.delete_messages([msg])
-    bob.wait_for_event(EventType.MSG_DELETED)
-    # Messages may be deleted separately
-    while True:
-        bob.wait_for_event(EventType.IMAP_MESSAGE_DELETED)
-        while True:
-            event = bob.wait_for_event()
-            if event.kind == EventType.INFO and "Close/expunge succeeded." in event.msg:
-                break
-        if len(bob_direct_imap.get_all_messages()) == 0:
-            break
-
-
-def test_imap_autodelete_fully_downloaded_msg(acfactory, tmp_path, direct_imap):
-    alice, bob = acfactory.get_online_accounts(2)
-
-    chat_alice = alice.create_chat(bob)
-    path = tmp_path / "large"
-    # Big enough to be sent with a pre-message
-    path.write_bytes(os.urandom(300000))
-    chat_alice.send_file(str(path))
-
-    msg = bob.wait_for_incoming_msg()
-    msg_snapshot = msg.get_snapshot()
-    assert msg_snapshot.download_state == DownloadState.AVAILABLE
-    msgs_changed_event = bob.wait_for_msgs_changed_event()
-    assert msgs_changed_event.msg_id == msg.id
-    msg_snapshot = msg.get_snapshot()
-    assert msg_snapshot.download_state == DownloadState.DONE
-
-    bob_direct_imap = direct_imap(bob)
-    # Messages may be deleted separately
-    while True:
-        if len(bob_direct_imap.get_all_messages()) == 0:
-            break
-        bob.wait_for_event(EventType.IMAP_MESSAGE_DELETED)
-        while True:
-            event = bob.wait_for_event()
-            if event.kind == EventType.INFO and "Close/expunge succeeded." in event.msg:
-                break
+            # Group contains only Alice and Bob,
+            # so partially downloaded messages are
+            # hard to distinguish from private replies to group messages.
+            #
+            # Message may be a private reply, so we assign it to 1:1 chat with Alice.
+            assert snapshot.chat == bob_chat_alice


 def test_markseen_contact_request(acfactory):
@@ -902,8 +759,8 @@ def test_markseen_contact_request(acfactory):
    alice_chat_bob = alice.create_chat(bob)
    alice_chat_bob.send_text("Hello Bob!")

-    message = bob.wait_for_incoming_msg()
-    message2 = bob2.wait_for_incoming_msg()
+    message = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id)
+    message2 = bob2.get_message_by_id(bob2.wait_for_incoming_msg_event().msg_id)
    assert message2.get_snapshot().state == MessageState.IN_FRESH

    message.mark_seen()
@@ -911,47 +768,6 @@ def test_markseen_contact_request(acfactory):
    assert message2.get_snapshot().state == MessageState.IN_SEEN


-@pytest.mark.parametrize("team_profile", [True, False])
-def test_no_markseen_in_team_profile(team_profile, acfactory):
-    """
-    Test that seen status is synchronized iff `team_profile` isn't set.
-    """
-    alice, bob = acfactory.get_online_accounts(2)
-    if team_profile:
-        bob.set_config("team_profile", "1")
-
-    # Bob sets up a second device.
-    bob2 = bob.clone()
-    bob2.start_io()
-
-    alice_chat_bob = alice.create_chat(bob)
-    bob_chat_alice = bob.create_chat(alice)
-    bob2.create_chat(alice)
-    alice_chat_bob.send_text("Hello Bob!")
-
-    message = bob.wait_for_incoming_msg()
-    message2 = bob2.wait_for_incoming_msg()
-    assert message2.get_snapshot().state == MessageState.IN_FRESH
-
-    message.mark_seen()
-
-    # Send a message and wait until it arrives
-    # in order to wait until Bob2 gets the markseen message.
-    # This also tests that outgoing messages
-    # don't mark preceeding messages as seen in team profiles.
-    bob_chat_alice.send_text("Outgoing message")
-    while True:
-        outgoing = bob2.wait_for_msg(EventType.MSGS_CHANGED)
-        if outgoing.id != 0:
-            break
-    assert outgoing.get_snapshot().text == "Outgoing message"
-
-    if team_profile:
-        assert message2.get_snapshot().state == MessageState.IN_FRESH
-    else:
-        assert message2.get_snapshot().state == MessageState.IN_SEEN
-
-
 def test_read_receipt(acfactory):
    """
    Test sending a read receipt and ensure it is attributed to the correct contact.
@@ -966,14 +782,11 @@ def test_read_receipt(acfactory):
    msg = bob.wait_for_incoming_msg()
    msg.mark_seen()

-    read_msg = alice.wait_for_msg(EventType.MSG_READ)
+    read_msg = alice.get_message_by_id(alice.wait_for_event(EventType.MSG_READ).msg_id)
    read_receipts = read_msg.get_read_receipts()
    assert len(read_receipts) == 1
    assert read_receipts[0].contact_id == alice_contact_bob.id

-    read_receipt_cnt = read_msg.get_read_receipt_count()
-    assert read_receipt_cnt == 1
-

 def test_get_http_response(acfactory):
    alice = acfactory.new_configured_account()
@@ -986,7 +799,7 @@ def test_configured_imap_certificate_checks(acfactory):
    alice = acfactory.new_configured_account()

    # Certificate checks should be configured (not None)
-    assert "cert_strict" in alice.get_info().used_transport_settings
+    assert "cert_strict" in alice.get_info().used_account_settings

    # "cert_old_automatic" is the value old Delta Chat core versions used
    # to mean user entered "imap_certificate_checks=0" (Automatic)
@@ -999,7 +812,7 @@ def test_configured_imap_certificate_checks(acfactory):
    #
    # Core 1.142.4, 1.142.5 and 1.142.6 saved this value due to bug.
    # This test is a regression test to prevent this happening again.
-    assert "cert_old_automatic" not in alice.get_info().used_transport_settings
+    assert "cert_old_automatic" not in alice.get_info().used_account_settings


 def test_no_old_msg_is_fresh(acfactory):
@@ -1075,6 +888,30 @@ def test_get_all_accounts_deadlock(rpc):
        all_accounts()


+def test_delete_deltachat_folder(acfactory, direct_imap):
+    """Test that DeltaChat folder is recreated if user deletes it manually."""
+    ac1 = acfactory.new_configured_account()
+    ac1.set_config("mvbox_move", "1")
+    ac1.bring_online()
+
+    ac1_direct_imap = direct_imap(ac1)
+    ac1_direct_imap.conn.folder.delete("DeltaChat")
+    assert "DeltaChat" not in ac1_direct_imap.list_folders()
+
+    # Wait until new folder is created and UIDVALIDITY is updated.
+    while True:
+        event = ac1.wait_for_event()
+        if event.kind == EventType.INFO and "uid/validity change folder DeltaChat" in event.msg:
+            break
+
+    ac2 = acfactory.get_online_account()
+    ac2.create_chat(ac1).send_text("hello")
+    msg = ac1.wait_for_incoming_msg().get_snapshot()
+    assert msg.text == "hello"
+
+    assert "DeltaChat" in ac1_direct_imap.list_folders()
+
+
@pytest.mark.parametrize("all_devices_online", [True, False])
 def test_leave_broadcast(acfactory, all_devices_online):
    alice, bob = acfactory.get_online_accounts(2)
@@ -1111,15 +948,15 @@ def test_leave_broadcast(acfactory, all_devices_online):
        contact_snapshot = contact.get_snapshot()
        chat_msgs = chat.get_messages()

+        if please_wait_info_msg:
+            first_msg = chat_msgs.pop(0).get_snapshot()
+            assert first_msg.text == "Establishing guaranteed end-to-end encryption, please wait…"
+            assert first_msg.is_info
+
        encrypted_msg = chat_msgs.pop(0).get_snapshot()
        assert encrypted_msg.text == "Messages are end-to-end encrypted."
        assert encrypted_msg.is_info

-        if please_wait_info_msg:
-            first_msg = chat_msgs.pop(0).get_snapshot()
-            assert "invited you to join this channel" in first_msg.text
-            assert first_msg.is_info
-
        member_added_msg = chat_msgs.pop(0).get_snapshot()
        if inviter_side:
            assert member_added_msg.text == f"Member {contact_snapshot.display_name} added."
@@ -1175,181 +1012,3 @@ def test_leave_broadcast(acfactory, all_devices_online):
        bob2.wait_for_event(EventType.CHAT_MODIFIED)

    check_account(bob2, bob2.create_contact(alice), inviter_side=False)
-
-
-def test_leave_and_delete_group(acfactory, log):
-    alice, bob = acfactory.get_online_accounts(2)
-
-    log.section("Alice creates a group")
-    alice_chat = alice.create_group("Group")
-    alice_chat.add_contact(bob)
-    assert len(alice_chat.get_contacts()) == 2  # Alice and Bob
-    alice_chat.send_text("hello")
-
-    log.section("Bob sees the group, and leaves and deletes it")
-    msg = bob.wait_for_incoming_msg().get_snapshot()
-    assert msg.text == "hello"
-    msg.chat.accept()
-
-    msg.chat.leave()
-    # Bob deletes the chat. This must not prevent the leave message from being sent.
-    msg.chat.delete()
-
-    log.section("Alice receives the delete message")
-    # After Bob left, only Alice will be left in the group:
-    while len(alice_chat.get_contacts()) != 1:
-        alice.wait_for_event(EventType.CHAT_MODIFIED)
-
-
-def test_immediate_autodelete(acfactory, direct_imap, log):
-    ac1, ac2 = acfactory.get_online_accounts(2)
-
-    # "1" means delete immediately, while "0" means do not delete
-    ac2.set_config("delete_server_after", "1")
-
-    log.section("ac1: create chat with ac2")
-    chat1 = ac1.create_chat(ac2)
-    ac2.create_chat(ac1)
-
-    log.section("ac1: send message to ac2")
-    sent_msg = chat1.send_text("hello")
-
-    msg = ac2.wait_for_incoming_msg()
-    assert msg.get_snapshot().text == "hello"
-
-    log.section("ac2: wait for close/expunge on autodelete")
-    ac2.wait_for_event(EventType.IMAP_MESSAGE_DELETED)
-    while True:
-        event = ac2.wait_for_event()
-        if event.kind == EventType.INFO and "Close/expunge succeeded." in event.msg:
-            break
-
-    log.section("ac2: check that message was autodeleted on server")
-    ac2_direct_imap = direct_imap(ac2)
-    assert len(ac2_direct_imap.get_all_messages()) == 0
-
-    log.section("ac2: Mark deleted message as seen and check that read receipt arrives")
-    msg.mark_seen()
-    ev = ac1.wait_for_event(EventType.MSG_READ)
-    assert ev.chat_id == chat1.id
-    assert ev.msg_id == sent_msg.id
-
-
-def test_background_fetch(acfactory, dc):
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac1.stop_io()
-
-    ac1_chat = ac1.create_chat(ac2)
-
-    ac2_chat = ac2.create_chat(ac1)
-    ac2_chat.send_text("Hello!")
-
-    while True:
-        dc.background_fetch(300)
-        messages = ac1_chat.get_messages()
-        snapshot = messages[-1].get_snapshot()
-        if snapshot.text == "Hello!":
-            break
-
-    # Stopping background fetch immediately after starting
-    # does not result in any errors.
-    background_fetch_future = dc.background_fetch.future(300)
-    dc.stop_background_fetch()
-    background_fetch_future()
-
-    # Starting background fetch with zero timeout is ok,
-    # it should terminate immediately.
-    dc.background_fetch(0)
-
-    # Background fetch can still be used to send and receive messages.
-    ac2_chat.send_text("Hello again!")
-
-    while True:
-        dc.background_fetch(300)
-        messages = ac1_chat.get_messages()
-        snapshot = messages[-1].get_snapshot()
-        if snapshot.text == "Hello again!":
-            break
-
-
-def test_message_exists(acfactory):
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    chat = ac1.create_chat(ac2)
-    message1 = chat.send_text("Hello!")
-    message2 = chat.send_text("Hello again!")
-    assert message1.exists()
-    assert message2.exists()
-
-    ac1.delete_messages([message1])
-    assert not message1.exists()
-    assert message2.exists()
-
-    # There is no error when checking if
-    # the message exists for deleted account.
-    ac1.remove()
-    assert not message1.exists()
-    assert not message2.exists()
-
-
-def test_synchronize_member_list_on_group_rejoin(acfactory, log):
-    """
-    Test that user recreates group member list when it joins the group again.
-    ac1 creates a group with two other accounts: ac2 and ac3
-    Then it removes ac2, removes ac3 and adds ac2 back.
-    ac2 did not see that ac3 is removed, so it should rebuild member list from scratch.
-    """
-    log.section("setting up accounts, accepted with each other")
-    ac1, ac2, ac3 = accounts = acfactory.get_online_accounts(3)
-
-    log.section("ac1: creating group chat with 2 other members")
-    chat = ac1.create_group("title1")
-    chat.add_contact(ac2)
-    chat.add_contact(ac3)
-
-    log.section("ac1: send message to new group chat")
-    msg = chat.send_text("hello")
-    assert chat.num_contacts() == 3
-
-    log.section("checking that the chat arrived correctly")
-    for ac in accounts[1:]:
-        msg = ac.wait_for_incoming_msg().get_snapshot()
-        assert msg.text == "hello"
-        assert msg.chat.num_contacts() == 3
-        msg.chat.accept()
-
-    log.section("ac1: removing ac2")
-    chat.remove_contact(ac2)
-
-    log.section("ac2: wait for a message about removal from the chat")
-    ac2.wait_for_incoming_msg()
-    log.section("ac1: removing ac3")
-    chat.remove_contact(ac3)
-
-    log.section("ac1: adding ac2 back")
-    chat.add_contact(ac2)
-
-    log.section("ac2: check that ac3 is removed")
-    msg = ac2.wait_for_incoming_msg()
-
-    assert chat.num_contacts() == 2
-    assert msg.get_snapshot().chat.num_contacts() == 2
-
-
-def test_large_message(acfactory) -> None:
-    """
-    Test sending large message without download limit set,
-    so it is sent with pre-message but downloaded without user interaction.
-    """
-    alice, bob = acfactory.get_online_accounts(2)
-
-    alice_chat_bob = alice.create_chat(bob)
-    alice_chat_bob.send_message(
-        "Hello World, this message is bigger than 5 bytes",
-        file="../test-data/image/screenshot.jpg",
-    )
-
-    msg = bob.wait_for_incoming_msg()
-    msgs_changed_event = bob.wait_for_msgs_changed_event()
-    assert msg.id == msgs_changed_event.msg_id
-    snapshot = msg.get_snapshot()
-    assert snapshot.text == "Hello World, this message is bigger than 5 bytes"
--- a/deltachat-rpc-server/Cargo.toml
+++ b/deltachat-rpc-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "2.38.0"
+version = "2.25.0"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"
--- a/deltachat-rpc-server/npm-package/package.json
+++ b/deltachat-rpc-server/npm-package/package.json
@@ -15,5 +15,5 @@
  },
  "type": "module",
  "types": "index.d.ts",
-  "version": "2.38.0"
+  "version": "2.25.0"
 }
--- a/deltachat-rpc-server/src/main.rs
+++ b/deltachat-rpc-server/src/main.rs
@@ -24,14 +24,6 @@ use yerpc::{RpcClient, RpcSession};

 #[tokio::main(flavor = "multi_thread")]
 async fn main() {
-    // Logs from `log` crate and traces from `tracing` crate
-    // are configurable with `RUST_LOG` environment variable
-    // and go to stderr to avoid interfering with JSON-RPC using stdout.
-    tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .with_writer(std::io::stderr)
-        .init();
-
    let r = main_impl().await;
    // From tokio documentation:
    // "For technical reasons, stdin is implemented by using an ordinary blocking read on a separate
@@ -51,7 +43,7 @@ async fn main_impl() -> Result<()> {
            if let Some(arg) = args.next() {
                return Err(anyhow!("Unrecognized argument {arg:?}"));
            }
-            eprintln!("{DC_VERSION_STR}");
+            eprintln!("{}", &*DC_VERSION_STR);
            return Ok(());
        } else if first_arg.to_str() == Some("--openrpc") {
            if let Some(arg) = args.next() {
@@ -72,6 +64,14 @@ async fn main_impl() -> Result<()> {
    #[cfg(target_family = "unix")]
    let mut sigterm = signal_unix::signal(signal_unix::SignalKind::terminate())?;

+    // Logs from `log` crate and traces from `tracing` crate
+    // are configurable with `RUST_LOG` environment variable
+    // and go to stderr to avoid interfering with JSON-RPC using stdout.
+    tracing_subscriber::fmt()
+        .with_env_filter(EnvFilter::from_default_env())
+        .with_writer(std::io::stderr)
+        .init();
+
    let path = std::env::var("DC_ACCOUNTS_PATH").unwrap_or_else(|_| "accounts".to_string());
    log::info!("Starting with accounts directory `{path}`.");
    let writable = true;
--- a/deny.toml
+++ b/deny.toml
@@ -12,16 +12,6 @@ ignore = [

    # Unmaintained paste
    "RUSTSEC-2024-0436",
-
-    # Unmaintained rustls-pemfile
-    # It is a transitive dependency of iroh 0.35.0,
-    # this should be fixed by upgrading to iroh 1.0 once it is released.
-    "RUSTSEC-2025-0134",
-
-    # Old versions of "lru" are transitive dependencies of iroh 0.35.0.
-    # <https://rustsec.org/advisories/RUSTSEC-2026-0002>
-    # <https://github.com/chatmail/core/issues/7692>
-    "RUSTSEC-2026-0002",
 ]

 [bans]
@@ -36,10 +26,11 @@ skip = [
     { name = "derive_more", version = "1.0.0" },
     { name = "event-listener", version = "2.5.3" },
     { name = "getrandom", version = "0.2.12" },
+     { name = "hashbrown", version = "0.14.5" },
     { name = "heck", version = "0.4.1" },
     { name = "http", version = "0.2.12" },
     { name = "linux-raw-sys", version = "0.4.14" },
-     { name = "lru", version = "0.12.5" },
+     { name = "lru", version = "0.12.3" },
     { name = "netlink-packet-route", version = "0.17.1" },
     { name = "nom", version = "7.1.3" },
     { name = "rand_chacha", version = "0.3.1" },
@@ -47,7 +38,6 @@ skip = [
     { name = "rand", version = "0.8.5" },
     { name = "rustix", version = "0.38.44" },
     { name = "serdect", version = "0.2.0" },
-     { name = "socket2", version = "0.5.9" },
     { name = "spin", version = "0.9.8" },
     { name = "strum_macros", version = "0.26.2" },
     { name = "strum", version = "0.26.2" },
@@ -72,6 +62,7 @@ skip = [
     { name = "windows_x86_64_gnu" },
     { name = "windows_x86_64_gnullvm" },
     { name = "windows_x86_64_msvc" },
+     { name = "zerocopy", version = "0.7.32" },
 ]


--- a/flake.lock
+++ b/flake.lock
@@ -47,11 +47,11 @@
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1763361733,
-        "narHash": "sha256-ka7dpwH3HIXCyD2wl5F7cPLeRbqZoY2ullALsvxdPt8=",
+        "lastModified": 1747291057,
+        "narHash": "sha256-9Wir6aLJAeJKqdoQUiwfKdBn7SyNXTJGRSscRyVOo2Y=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "6c8d48e3b0ae371b19ac1485744687b788e80193",
+        "rev": "76ffc1b7b3ec8078fe01794628b6abff35cbda8f",
        "type": "github"
      },
      "original": {
@@ -147,11 +147,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1762977756,
-        "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
+        "lastModified": 1747179050,
+        "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
+        "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
        "type": "github"
      },
      "original": {
@@ -202,11 +202,11 @@
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1762860488,
-        "narHash": "sha256-rMfWMCOo/pPefM2We0iMBLi2kLBAnYoB9thi4qS7uk4=",
+        "lastModified": 1746889290,
+        "narHash": "sha256-h3LQYZgyv2l3U7r+mcsrEOGRldaK0zJFwAAva4hV/6g=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "2efc80078029894eec0699f62ec8d5c1a56af763",
+        "rev": "2bafe9d96c6734aacfd49e115f6cf61e7adc68bc",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,5 @@
 {
-  description = "Chatmail core";
+  description = "Delta Chat core";
  inputs = {
    fenix.url = "github:nix-community/fenix";
    flake-utils.url = "github:numtide/flake-utils";
@@ -14,15 +14,7 @@
        pkgs = nixpkgs.legacyPackages.${system};
        inherit (pkgs.stdenv) isDarwin;
        fenixPkgs = fenix.packages.${system};
-        fenixToolchain = fenixPkgs.combine [
-          fenixPkgs.stable.rustc
-          fenixPkgs.stable.cargo
-          fenixPkgs.stable.rust-std
-        ];
-        naersk' = pkgs.callPackage naersk {
-          cargo = fenixToolchain;
-          rustc = fenixToolchain;
-        };
+        naersk' = pkgs.callPackage naersk { };
        manifest = (pkgs.lib.importTOML ./Cargo.toml).package;
        androidSdk = android.sdk.${system} (sdkPkgs:
          builtins.attrValues {
@@ -42,6 +34,7 @@
            ./Cargo.lock
            ./Cargo.toml
            ./CMakeLists.txt
+            ./CONTRIBUTING.md
            ./deltachat_derive
            ./deltachat-contact-tools
            ./deltachat-ffi
@@ -478,12 +471,6 @@
              };

            libdeltachat =
-              let
-                rustPlatform = (pkgs.makeRustPlatform {
-                  cargo = fenixToolchain;
-                  rustc = fenixToolchain;
-                });
-              in
              pkgs.stdenv.mkDerivation {
                pname = "libdeltachat";
                version = manifest.version;
@@ -493,9 +480,8 @@
                nativeBuildInputs = [
                  pkgs.perl # Needed to build vendored OpenSSL.
                  pkgs.cmake
-                  rustPlatform.cargoSetupHook
-                  fenixPkgs.stable.rustc
-                  fenixPkgs.stable.cargo
+                  pkgs.rustPlatform.cargoSetupHook
+                  pkgs.cargo
                ];

                postInstall = ''
--- a/python/examples/test_examples.py
+++ b/python/examples/test_examples.py
@@ -14,7 +14,6 @@ def datadir():
    return None


-@pytest.mark.skip("The test is flaky in CI and crashes the interpreter as of 2025-11-12")
 def test_echo_quit_plugin(acfactory, lp):
    lp.sec("creating one echo_and_quit bot")
    botproc = acfactory.run_bot_process(echo_and_quit)
--- a/python/pyproject.toml
+++ b/python/pyproject.toml
@@ -1,20 +1,20 @@
 [build-system]
-requires = ["setuptools>=77", "wheel", "cffi>=1.0.0", "pkgconfig"]
+requires = ["setuptools>=45", "wheel", "cffi>=1.0.0", "pkgconfig"]
 build-backend = "setuptools.build_meta"

 [project]
 name = "deltachat"
-version = "2.38.0"
-license = "MPL-2.0"
+version = "2.25.0"
 description = "Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat"
 readme = "README.rst"
-requires-python = ">=3.10"
+requires-python = ">=3.8"
 authors = [
    { name = "holger krekel, Floris Bruynooghe, Bjoern Petersen and contributors" },
 ]
 classifiers = [
    "Development Status :: 5 - Production/Stable",
    "Intended Audience :: Developers",
+    "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
    "Programming Language :: Python :: 3",
    "Topic :: Communications :: Chat",
    "Topic :: Communications :: Email",
@@ -23,6 +23,7 @@ classifiers = [
 dependencies = [
    "cffi>=1.0.0",
    "imap-tools",
+    "importlib_metadata;python_version<'3.8'",
    "pluggy",
    "requests",
 ]
--- a/python/tests/test_0_complex_or_slow.py
+++ b/python/tests/test_0_complex_or_slow.py
@@ -1,3 +1,4 @@
+import sys
 import time

 import deltachat as dc
@@ -62,6 +63,56 @@ class TestGroupStressTests:
        # Message should be encrypted because keys of other members are gossiped
        assert msg.is_encrypted()

+    def test_synchronize_member_list_on_group_rejoin(self, acfactory, lp):
+        """
+        Test that user recreates group member list when it joins the group again.
+        ac1 creates a group with two other accounts: ac2 and ac3
+        Then it removes ac2, removes ac3 and adds ac2 back.
+        ac2 did not see that ac3 is removed, so it should rebuild member list from scratch.
+        """
+        lp.sec("setting up accounts, accepted with each other")
+        accounts = acfactory.get_online_accounts(3)
+        acfactory.introduce_each_other(accounts)
+        ac1, ac2, ac3 = accounts
+
+        lp.sec("ac1: creating group chat with 2 other members")
+        chat = ac1.create_group_chat("title1", contacts=[ac2, ac3])
+        assert not chat.is_promoted()
+
+        lp.sec("ac1: send message to new group chat")
+        msg = chat.send_text("hello")
+        assert chat.is_promoted() and msg.is_encrypted()
+
+        assert chat.num_contacts() == 3
+
+        lp.sec("checking that the chat arrived correctly")
+        for ac in accounts[1:]:
+            msg = ac._evtracker.wait_next_incoming_message()
+            assert msg.text == "hello"
+            print("chat is", msg.chat)
+            assert msg.chat.num_contacts() == 3
+
+        lp.sec("ac1: removing ac2")
+        chat.remove_contact(ac2)
+
+        lp.sec("ac2: wait for a message about removal from the chat")
+        msg = ac2._evtracker.wait_next_incoming_message()
+
+        lp.sec("ac1: removing ac3")
+        chat.remove_contact(ac3)
+
+        lp.sec("ac1: adding ac2 back")
+        # Group is promoted, message is sent automatically
+        assert chat.is_promoted()
+        chat.add_contact(ac2)
+
+        lp.sec("ac2: check that ac3 is removed")
+        msg = ac2._evtracker.wait_next_incoming_message()
+
+        assert chat.num_contacts() == 2
+        assert msg.chat.num_contacts() == 2
+        acfactory.dump_imap_summary(sys.stdout)
+

 def test_qr_verified_group_and_chatting(acfactory, lp):
    ac1, ac2, ac3 = acfactory.get_online_accounts(3)
--- a/python/tests/test_1_online.py
+++ b/python/tests/test_1_online.py
@@ -1,13 +1,15 @@
 import os
 import queue
 import sys
+import base64
 from datetime import datetime, timezone

 import pytest
-from imap_tools import AND
+from imap_tools import AND, U

 import deltachat as dc
 from deltachat import account_hookimpl, Message
+from deltachat.tracker import ImexTracker
 from deltachat.testplugin import E2EE_INFO_MSGS


@@ -220,6 +222,38 @@ def test_webxdc_huge_update(acfactory, data, lp):
    assert update["payload"] == payload


+def test_webxdc_download_on_demand(acfactory, data, lp):
+    ac1, ac2 = acfactory.get_online_accounts(2)
+    acfactory.introduce_each_other([ac1, ac2])
+    chat = acfactory.get_accepted_chat(ac1, ac2)
+
+    msg1 = Message.new_empty(ac1, "webxdc")
+    msg1.set_text("message1")
+    msg1.set_file(data.get_path("webxdc/minimal.xdc"))
+    msg1 = chat.send_msg(msg1)
+    assert msg1.is_webxdc()
+    assert msg1.filename
+
+    msg2 = ac2._evtracker.wait_next_incoming_message()
+    assert msg2.is_webxdc()
+
+    lp.sec("ac2 sets download limit")
+    ac2.set_config("download_limit", "100")
+    assert msg1.send_status_update({"payload": base64.b64encode(os.urandom(300000))}, "some test data")
+    ac2_update = ac2._evtracker.wait_next_incoming_message()
+    assert ac2_update.download_state == dc.const.DC_DOWNLOAD_AVAILABLE
+    assert not msg2.get_status_updates()
+
+    ac2_update.download_full()
+    ac2._evtracker.get_matching("DC_EVENT_WEBXDC_STATUS_UPDATE")
+    assert msg2.get_status_updates()
+
+    # Get a event notifying that the message disappeared from the chat.
+    msgs_changed_event = ac2._evtracker.get_matching("DC_EVENT_MSGS_CHANGED")
+    assert msgs_changed_event.data1 == msg2.chat.id
+    assert msgs_changed_event.data2 == 0
+
+
 def test_enable_mvbox_move(acfactory, lp):
    (ac1,) = acfactory.get_online_accounts(1)

@@ -235,6 +269,130 @@ def test_enable_mvbox_move(acfactory, lp):
    assert ac2._evtracker.wait_next_incoming_message().text == "message1"


+def test_mvbox_thread_and_trash(acfactory, lp):
+    lp.sec("ac1: start with mvbox thread")
+    ac1 = acfactory.new_online_configuring_account(mvbox_move=True)
+
+    lp.sec("ac2: start without a mvbox thread")
+    ac2 = acfactory.new_online_configuring_account(mvbox_move=False)
+
+    lp.sec("ac2 and ac1: waiting for configuration")
+    acfactory.bring_accounts_online()
+
+    lp.sec("ac1: create trash")
+    ac1.direct_imap.create_folder("Trash")
+    ac1.set_config("scan_all_folders_debounce_secs", "0")
+    ac1.stop_io()
+    ac1.start_io()
+
+    lp.sec("ac1: send message and wait for ac2 to receive it")
+    acfactory.get_accepted_chat(ac1, ac2).send_text("message1")
+    assert ac2._evtracker.wait_next_incoming_message().text == "message1"
+
+    assert ac1.get_config("configured_mvbox_folder") == "DeltaChat"
+    while ac1.get_config("configured_trash_folder") != "Trash":
+        ac1._evtracker.get_matching("DC_EVENT_CONNECTIVITY_CHANGED")
+
+
+def test_move_works(acfactory):
+    ac1 = acfactory.new_online_configuring_account()
+    ac2 = acfactory.new_online_configuring_account(mvbox_move=True)
+    acfactory.bring_accounts_online()
+    chat = acfactory.get_accepted_chat(ac1, ac2)
+    chat.send_text("message1")
+
+    # Message is moved to the movebox
+    ac2._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
+
+    # Message is downloaded
+    ev = ac2._evtracker.get_matching("DC_EVENT_INCOMING_MSG")
+    assert ev.data2 > dc.const.DC_CHAT_ID_LAST_SPECIAL
+
+
+def test_move_avoids_loop(acfactory):
+    """Test that the message is only moved from INBOX to DeltaChat.
+
+    This is to avoid busy loop if moved message reappears in the Inbox
+    or some scanned folder later.
+    For example, this happens on servers that alias `INBOX.DeltaChat` to `DeltaChat` folder,
+    so the message moved to `DeltaChat` appears as a new message in the `INBOX.DeltaChat` folder.
+    We do not want to move this message from `INBOX.DeltaChat` to `DeltaChat` again.
+    """
+    ac1 = acfactory.new_online_configuring_account()
+    ac2 = acfactory.new_online_configuring_account(mvbox_move=True)
+    acfactory.bring_accounts_online()
+
+    # Create INBOX.DeltaChat folder and make sure
+    # it is detected by full folder scan.
+    ac2.direct_imap.create_folder("INBOX.DeltaChat")
+    ac2.stop_io()
+    ac2.start_io()
+    ac2._evtracker.get_info_contains("Found folders:")  #  Wait until the end of folder scan.
+
+    ac1_chat = acfactory.get_accepted_chat(ac1, ac2)
+    ac1_chat.send_text("Message 1")
+
+    # Message is moved to the DeltaChat folder and downloaded.
+    ac2_msg1 = ac2._evtracker.wait_next_incoming_message()
+    assert ac2_msg1.text == "Message 1"
+
+    # Move the message to the INBOX.DeltaChat again.
+    # We assume that test server uses "." as the delimiter.
+    ac2.direct_imap.select_folder("DeltaChat")
+    ac2.direct_imap.conn.move(["*"], "INBOX.DeltaChat")
+
+    ac1_chat.send_text("Message 2")
+    ac2_msg2 = ac2._evtracker.wait_next_incoming_message()
+    assert ac2_msg2.text == "Message 2"
+
+    # Stop and start I/O to trigger folder scan.
+    ac2.stop_io()
+    ac2.start_io()
+    ac2._evtracker.get_info_contains("Found folders:")  #  Wait until the end of folder scan.
+
+    # Check that Message 1 is still in the INBOX.DeltaChat folder
+    # and Message 2 is in the DeltaChat folder.
+    ac2.direct_imap.select_folder("INBOX")
+    assert len(ac2.direct_imap.get_all_messages()) == 0
+    ac2.direct_imap.select_folder("DeltaChat")
+    assert len(ac2.direct_imap.get_all_messages()) == 1
+    ac2.direct_imap.select_folder("INBOX.DeltaChat")
+    assert len(ac2.direct_imap.get_all_messages()) == 1
+
+
+def test_move_works_on_self_sent(acfactory):
+    ac1 = acfactory.new_online_configuring_account(mvbox_move=True)
+    ac2 = acfactory.new_online_configuring_account()
+    acfactory.bring_accounts_online()
+    ac1.set_config("bcc_self", "1")
+
+    chat = acfactory.get_accepted_chat(ac1, ac2)
+    chat.send_text("message1")
+    ac1._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
+    chat.send_text("message2")
+    ac1._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
+    chat.send_text("message3")
+    ac1._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
+
+
+def test_move_sync_msgs(acfactory):
+    ac1 = acfactory.new_online_configuring_account(bcc_self=True, sync_msgs=True, fix_is_chatmail=True)
+    acfactory.bring_accounts_online()
+
+    ac1.direct_imap.select_folder("DeltaChat")
+    # Sync messages may also be sent during the configuration.
+    mvbox_msg_cnt = len(ac1.direct_imap.get_all_messages())
+
+    ac1.set_config("displayname", "Alice")
+    ac1._evtracker.get_matching("DC_EVENT_MSG_DELIVERED")
+    ac1.set_config("displayname", "Bob")
+    ac1._evtracker.get_matching("DC_EVENT_MSG_DELIVERED")
+    ac1.direct_imap.select_folder("Inbox")
+    assert len(ac1.direct_imap.get_all_messages()) == 0
+    ac1.direct_imap.select_folder("DeltaChat")
+    assert len(ac1.direct_imap.get_all_messages()) == mvbox_msg_cnt + 2
+
+
 def test_forward_messages(acfactory, lp):
    ac1, ac2 = acfactory.get_online_accounts(2)
    chat = ac1.create_chat(ac2)
@@ -449,6 +607,39 @@ def test_send_and_receive_message_markseen(acfactory, lp):
        pass  # mark_seen_messages() has generated events before it returns


+def test_moved_markseen(acfactory):
+    """Test that message already moved to DeltaChat folder is marked as seen."""
+    ac1 = acfactory.new_online_configuring_account()
+    ac2 = acfactory.new_online_configuring_account(mvbox_move=True)
+    acfactory.bring_accounts_online()
+
+    ac2.stop_io()
+    with ac2.direct_imap.idle() as idle2:
+        ac1.create_chat(ac2).send_text("Hello!")
+        idle2.wait_for_new_message()
+
+    # Emulate moving of the message to DeltaChat folder by Sieve rule.
+    ac2.direct_imap.conn.move(["*"], "DeltaChat")
+    ac2.direct_imap.select_folder("DeltaChat")
+
+    with ac2.direct_imap.idle() as idle2:
+        ac2.start_io()
+
+        ev = ac2._evtracker.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED")
+        msg = ac2.get_message_by_id(ev.data2)
+        assert msg.text == "Messages are end-to-end encrypted."
+
+        ev = ac2._evtracker.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED")
+        msg = ac2.get_message_by_id(ev.data2)
+
+        # Accept the contact request.
+        msg.chat.accept()
+        ac2.mark_seen_messages([msg])
+        uid = idle2.wait_for_seen()
+
+    assert len(list(ac2.direct_imap.conn.fetch(AND(seen=True, uid=U(uid, "*"))))) == 1
+
+
 def test_message_override_sender_name(acfactory, lp):
    ac1, ac2 = acfactory.get_online_accounts(2)
    ac1.set_config("displayname", "ac1-default-displayname")
@@ -483,6 +674,36 @@ def test_message_override_sender_name(acfactory, lp):
    assert not msg2.override_sender_name


+@pytest.mark.parametrize("mvbox_move", [True, False])
+def test_markseen_message_and_mdn(acfactory, mvbox_move):
+    # Please only change this test if you are very sure that it will still catch the issues it catches now.
+    # We had so many problems with markseen, if in doubt, rather create another test, it can't harm.
+    ac1 = acfactory.new_online_configuring_account(mvbox_move=mvbox_move)
+    ac2 = acfactory.new_online_configuring_account(mvbox_move=mvbox_move)
+    acfactory.bring_accounts_online()
+    # Do not send BCC to self, we only want to test MDN on ac1.
+    ac1.set_config("bcc_self", "0")
+
+    acfactory.get_accepted_chat(ac1, ac2).send_text("hi")
+    msg = ac2._evtracker.wait_next_incoming_message()
+
+    ac2.mark_seen_messages([msg])
+
+    folder = "mvbox" if mvbox_move else "inbox"
+    for ac in [ac1, ac2]:
+        if mvbox_move:
+            ac._evtracker.get_info_contains("Marked messages [0-9]+ in folder DeltaChat as seen.")
+        else:
+            ac._evtracker.get_info_contains("Marked messages [0-9]+ in folder INBOX as seen.")
+    ac1.direct_imap.select_config_folder(folder)
+    ac2.direct_imap.select_config_folder(folder)
+
+    # Check that the mdn is marked as seen
+    assert len(list(ac1.direct_imap.conn.fetch(AND(seen=True)))) == 1
+    # Check original message is marked as seen
+    assert len(list(ac2.direct_imap.conn.fetch(AND(seen=True)))) == 1
+
+
 def test_reply_privately(acfactory):
    ac1, ac2 = acfactory.get_online_accounts(2)

@@ -632,6 +853,140 @@ def test_no_draft_if_cant_send(acfactory):
    assert device_chat.get_draft() is None


+def test_dont_show_emails(acfactory, lp):
+    """Most mailboxes have a "Drafts" folder where constantly new emails appear but we don't actually want to show them.
+    So: If it's outgoing AND there is no Received header, then ignore the email.
+
+    If the draft email is sent out and received later (i.e. it's in "Inbox"), it must be shown.
+
+    Also, test that unknown emails in the Spam folder are not shown."""
+    ac1 = acfactory.new_online_configuring_account()
+    ac1.set_config("show_emails", "2")
+    ac1.create_contact("alice@example.org").create_chat()
+
+    acfactory.wait_configured(ac1)
+    ac1.direct_imap.create_folder("Drafts")
+    ac1.direct_imap.create_folder("Spam")
+    ac1.direct_imap.create_folder("Junk")
+
+    acfactory.bring_accounts_online()
+    ac1.stop_io()
+
+    ac1.direct_imap.append(
+        "Drafts",
+        """
+        From: ac1 <{}>
+        Subject: subj
+        To: alice@example.org
+        Message-ID: <aepiors@example.org>
+        Content-Type: text/plain; charset=utf-8
+
+        message in Drafts received later
+    """.format(
+            ac1.get_config("configured_addr"),
+        ),
+    )
+    ac1.direct_imap.append(
+        "Spam",
+        """
+        From: unknown.address@junk.org
+        Subject: subj
+        To: {}
+        Message-ID: <spam.message@junk.org>
+        Content-Type: text/plain; charset=utf-8
+
+        Unknown message in Spam
+    """.format(
+            ac1.get_config("configured_addr"),
+        ),
+    )
+    ac1.direct_imap.append(
+        "Spam",
+        """
+        From: unknown.address@junk.org, unkwnown.add@junk.org
+        Subject: subj
+        To: {}
+        Message-ID: <spam.message2@junk.org>
+        Content-Type: text/plain; charset=utf-8
+
+        Unknown & malformed message in Spam
+    """.format(
+            ac1.get_config("configured_addr"),
+        ),
+    )
+    ac1.direct_imap.append(
+        "Spam",
+        """
+        From: delta<address: inbox@nhroy.com>
+        Subject: subj
+        To: {}
+        Message-ID: <spam.message99@junk.org>
+        Content-Type: text/plain; charset=utf-8
+
+        Unknown & malformed message in Spam
+    """.format(
+            ac1.get_config("configured_addr"),
+        ),
+    )
+    ac1.direct_imap.append(
+        "Spam",
+        """
+        From: alice@example.org
+        Subject: subj
+        To: {}
+        Message-ID: <spam.message3@junk.org>
+        Content-Type: text/plain; charset=utf-8
+
+        Actually interesting message in Spam
+    """.format(
+            ac1.get_config("configured_addr"),
+        ),
+    )
+    ac1.direct_imap.append(
+        "Junk",
+        """
+        From: unknown.address@junk.org
+        Subject: subj
+        To: {}
+        Message-ID: <spam.message@junk.org>
+        Content-Type: text/plain; charset=utf-8
+
+        Unknown message in Junk
+    """.format(
+            ac1.get_config("configured_addr"),
+        ),
+    )
+
+    ac1.set_config("scan_all_folders_debounce_secs", "0")
+    lp.sec("All prepared, now let DC find the message")
+    ac1.start_io()
+
+    # Wait until each folder was scanned, this is necessary for this test to test what it should test:
+    ac1._evtracker.wait_idle_inbox_ready()
+
+    fresh_msgs = list(ac1.get_fresh_messages())
+    msg = fresh_msgs[0]
+    chat_msgs = msg.chat.get_messages()
+    assert len(chat_msgs) == 1
+    assert any(msg.text == "subj – Actually interesting message in Spam" for msg in chat_msgs)
+
+    assert not any("unknown.address" in c.get_name() for c in ac1.get_chats())
+    ac1.direct_imap.select_folder("Spam")
+    assert ac1.direct_imap.get_uid_by_message_id("spam.message@junk.org")
+
+    ac1.stop_io()
+    lp.sec("'Send out' the draft by moving it to Inbox, and wait for DC to display it this time")
+    ac1.direct_imap.select_folder("Drafts")
+    uid = ac1.direct_imap.get_uid_by_message_id("aepiors@example.org")
+    ac1.direct_imap.conn.move(uid, "Inbox")
+
+    ac1.start_io()
+    msg2 = ac1._evtracker.wait_next_messages_changed()
+
+    assert msg2.text == "subj – message in Drafts received later"
+    assert len(msg.chat.get_messages()) == 2
+
+
 def test_bot(acfactory, lp):
    """Test that bot messages can be identified as such"""
    ac1, ac2 = acfactory.get_online_accounts(2)
@@ -774,6 +1129,86 @@ def test_send_and_receive_image(acfactory, lp, data):
    assert m == msg_in


+def test_import_export_online_all(acfactory, tmp_path, data, lp):
+    (ac1, some1) = acfactory.get_online_accounts(2)
+
+    lp.sec("create some chat content")
+    some1_addr = some1.get_config("addr")
+    chat1 = ac1.create_contact(some1).create_chat()
+    chat1.send_text("msg1")
+    assert len(ac1.get_contacts()) == 1
+
+    original_image_path = data.get_path("d.png")
+    chat1.send_image(original_image_path)
+
+    # Add another 100KB file that ensures that the progress is smooth enough
+    path = tmp_path / "attachment.txt"
+    with path.open("w") as file:
+        file.truncate(100000)
+    chat1.send_file(str(path))
+
+    def assert_account_is_proper(ac):
+        contacts = ac.get_contacts()
+        assert len(contacts) == 1
+        contact2 = contacts[0]
+        assert contact2.addr == some1_addr
+        chat2 = contact2.create_chat()
+        messages = chat2.get_messages()
+        assert len(messages) == 3 + E2EE_INFO_MSGS
+        assert messages[0 + E2EE_INFO_MSGS].text == "msg1"
+        assert messages[1 + E2EE_INFO_MSGS].filemime == "image/png"
+        assert os.stat(messages[1 + E2EE_INFO_MSGS].filename).st_size == os.stat(original_image_path).st_size
+        ac.set_config("displayname", "new displayname")
+        assert ac.get_config("displayname") == "new displayname"
+
+    assert_account_is_proper(ac1)
+
+    backupdir = tmp_path / "backup"
+    backupdir.mkdir()
+
+    lp.sec(f"export all to {backupdir}")
+    with ac1.temp_plugin(ImexTracker()) as imex_tracker:
+        ac1.stop_io()
+        ac1.imex(str(backupdir), dc.const.DC_IMEX_EXPORT_BACKUP)
+
+        # check progress events for export
+        assert imex_tracker.wait_progress(1, progress_upper_limit=249)
+        assert imex_tracker.wait_progress(250, progress_upper_limit=499)
+        assert imex_tracker.wait_progress(500, progress_upper_limit=749)
+        assert imex_tracker.wait_progress(750, progress_upper_limit=999)
+
+        paths = imex_tracker.wait_finish()
+        assert len(paths) == 1
+        path = paths[0]
+        assert os.path.exists(path)
+        ac1.start_io()
+
+    lp.sec("get fresh empty account")
+    ac2 = acfactory.get_unconfigured_account()
+
+    lp.sec("get latest backup file")
+    path2 = ac2.get_latest_backupfile(str(backupdir))
+    assert path2 == path
+
+    lp.sec("import backup and check it's proper")
+    with ac2.temp_plugin(ImexTracker()) as imex_tracker:
+        ac2.import_all(path)
+
+        # check progress events for import
+        assert imex_tracker.wait_progress(1, progress_upper_limit=249)
+        assert imex_tracker.wait_progress(1000)
+
+    assert_account_is_proper(ac1)
+    assert_account_is_proper(ac2)
+
+    lp.sec(f"Second-time export all to {backupdir}")
+    ac1.stop_io()
+    path2 = ac1.export_all(str(backupdir))
+    assert os.path.exists(path2)
+    assert path2 != path
+    assert ac2.get_latest_backupfile(str(backupdir)) == path2
+
+
 def test_qr_email_capitalization(acfactory, lp):
    """Regression test for a bug
    that resulted in failure to propagate verification
@@ -1074,15 +1509,9 @@ def test_send_receive_locations(acfactory, lp):
    assert locations[0].latitude == 2.0
    assert locations[0].longitude == 3.0
    assert locations[0].accuracy == 0.5
+    assert locations[0].timestamp > now
    assert locations[0].marker is None

-    # Make sure the timestamp is not in the past.
-    # Note that location timestamp has only 1 second precision,
-    # while `now` has a fractional part, so we have to truncate it
-    # first, otherwise `now` may appear to be in the future
-    # even though it is the same second.
-    assert int(locations[0].timestamp.timestamp()) >= int(now.timestamp())
-
    contact = ac2.create_contact(ac1)
    locations2 = chat2.get_locations(contact=contact)
    assert len(locations2) == 1
@@ -1093,6 +1522,38 @@ def test_send_receive_locations(acfactory, lp):
    assert not locations3


+def test_immediate_autodelete(acfactory, lp):
+    ac1 = acfactory.new_online_configuring_account()
+    ac2 = acfactory.new_online_configuring_account()
+    acfactory.bring_accounts_online()
+
+    # "1" means delete immediately, while "0" means do not delete
+    ac2.set_config("delete_server_after", "1")
+
+    lp.sec("ac1: create chat with ac2")
+    chat1 = ac1.create_chat(ac2)
+    ac2.create_chat(ac1)
+
+    lp.sec("ac1: send message to ac2")
+    sent_msg = chat1.send_text("hello")
+
+    msg = ac2._evtracker.wait_next_incoming_message()
+    assert msg.text == "hello"
+
+    lp.sec("ac2: wait for close/expunge on autodelete")
+    ac2._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_DELETED")
+    ac2._evtracker.get_info_contains("Close/expunge succeeded.")
+
+    lp.sec("ac2: check that message was autodeleted on server")
+    assert len(ac2.direct_imap.get_all_messages()) == 0
+
+    lp.sec("ac2: Mark deleted message as seen and check that read receipt arrives")
+    msg.mark_seen()
+    ev = ac1._evtracker.get_matching("DC_EVENT_MSG_READ")
+    assert ev.data1 == chat1.id
+    assert ev.data2 == sent_msg.id
+
+
 def test_delete_multiple_messages(acfactory, lp):
    ac1, ac2 = acfactory.get_online_accounts(2)
    chat12 = acfactory.get_accepted_chat(ac1, ac2)
@@ -1125,6 +1586,55 @@ def test_delete_multiple_messages(acfactory, lp):
            break


+def test_trash_multiple_messages(acfactory, lp):
+    ac1, ac2 = acfactory.get_online_accounts(2)
+    ac2.stop_io()
+
+    # Create the Trash folder on IMAP server and configure deletion to it. There was a bug that if
+    # Trash wasn't configured initially, it can't be configured later, let's check this.
+    lp.sec("Creating trash folder")
+    ac2.direct_imap.create_folder("Trash")
+    ac2.set_config("delete_to_trash", "1")
+
+    lp.sec("Check that Trash can be configured initially as well")
+    ac3 = acfactory.new_online_configuring_account(cloned_from=ac2)
+    acfactory.bring_accounts_online()
+    assert ac3.get_config("configured_trash_folder")
+    ac3.stop_io()
+
+    ac2.start_io()
+    chat12 = acfactory.get_accepted_chat(ac1, ac2)
+
+    lp.sec("ac1: sending 3 messages")
+    texts = ["first", "second", "third"]
+    for text in texts:
+        chat12.send_text(text)
+
+    lp.sec("ac2: waiting for all messages on the other side")
+    to_delete = []
+    for text in texts:
+        msg = ac2._evtracker.wait_next_incoming_message()
+        assert msg.text in texts
+        if text != "second":
+            to_delete.append(msg)
+    # ac2 has received some messages, this is impossible w/o the trash folder configured, let's
+    # check the configuration.
+    assert ac2.get_config("configured_trash_folder") == "Trash"
+
+    lp.sec("ac2: deleting all messages except second")
+    assert len(to_delete) == len(texts) - 1
+    ac2.delete_messages(to_delete)
+
+    lp.sec("ac2: test that only one message is left")
+    while 1:
+        ac2._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
+        ac2.direct_imap.select_config_folder("inbox")
+        nr_msgs = len(ac2.direct_imap.get_all_messages())
+        assert nr_msgs > 0
+        if nr_msgs == 1:
+            break
+
+
 def test_configure_error_msgs_wrong_pw(acfactory):
    (ac1,) = acfactory.get_online_accounts(1)

@@ -1163,17 +1673,16 @@ def test_configure_error_msgs_invalid_server(acfactory):
        ev = ac2._evtracker.get_matching("DC_EVENT_CONFIGURE_PROGRESS")
        if ev.data1 == 0:
            break
-    err_lower = ev.data2.lower()
    # Can't connect so it probably should say something about "internet"
    # again, should not repeat itself
    # If this fails then probably `e.msg.to_lowercase().contains("could not resolve")`
    # in configure.rs returned false because the error message was changed
    # (i.e. did not contain "could not resolve" anymore)
-    assert (err_lower.count("internet") + err_lower.count("network")) == 1
+    assert (ev.data2.count("internet") + ev.data2.count("network")) == 1
    # Should mention that it can't connect:
-    assert err_lower.count("connect") == 1
+    assert ev.data2.count("connect") == 1
    # The users do not know what "configuration" is
-    assert "configuration" not in err_lower
+    assert "configuration" not in ev.data2.lower()


 def test_status(acfactory):
@@ -1249,6 +1758,71 @@ def test_group_quote(acfactory, lp):
    assert received_reply.quote.id == out_msg.id


+@pytest.mark.parametrize(
+    ("folder", "move", "expected_destination"),
+    [
+        (
+            "xyz",
+            False,
+            "xyz",
+        ),  # Test that emails aren't found in a random folder
+        (
+            "xyz",
+            True,
+            "xyz",
+        ),  # ...emails are found in a random folder and downloaded without moving
+        (
+            "Spam",
+            False,
+            "INBOX",
+        ),  # ...emails are moved from the spam folder to the Inbox
+    ],
+)
+# Testrun.org does not support the CREATE-SPECIAL-USE capability, which means that we can't create a folder with
+# the "\Junk" flag (see https://tools.ietf.org/html/rfc6154). So, we can't test spam folder detection by flag.
+def test_scan_folders(acfactory, lp, folder, move, expected_destination):
+    """Delta Chat periodically scans all folders for new messages to make sure we don't miss any."""
+    variant = folder + "-" + str(move) + "-" + expected_destination
+    lp.sec("Testing variant " + variant)
+    ac1 = acfactory.new_online_configuring_account(mvbox_move=move)
+    ac2 = acfactory.new_online_configuring_account()
+
+    acfactory.wait_configured(ac1)
+    ac1.direct_imap.create_folder(folder)
+
+    # Wait until each folder was selected once and we are IDLEing:
+    acfactory.bring_accounts_online()
+    ac1.stop_io()
+    assert folder in ac1.direct_imap.list_folders()
+
+    lp.sec("Send a message to from ac2 to ac1 and manually move it to `folder`")
+    ac1.direct_imap.select_config_folder("inbox")
+    with ac1.direct_imap.idle() as idle1:
+        acfactory.get_accepted_chat(ac2, ac1).send_text("hello")
+        idle1.wait_for_new_message()
+    ac1.direct_imap.conn.move(["*"], folder)  # "*" means "biggest UID in mailbox"
+
+    lp.sec("start_io() and see if DeltaChat finds the message (" + variant + ")")
+    ac1.set_config("scan_all_folders_debounce_secs", "0")
+    ac1.start_io()
+    chat = ac1.create_chat(ac2)
+    n_msgs = 1  # "Messages are end-to-end encrypted."
+    if folder == "Spam":
+        msg = ac1._evtracker.wait_next_incoming_message()
+        assert msg.text == "hello"
+        n_msgs += 1
+    else:
+        ac1._evtracker.wait_idle_inbox_ready()
+    assert len(chat.get_messages()) == n_msgs
+
+    # The message has reached its destination.
+    ac1.direct_imap.select_folder(expected_destination)
+    assert len(ac1.direct_imap.get_all_messages()) == 1
+    if folder != expected_destination:
+        ac1.direct_imap.select_folder(folder)
+        assert len(ac1.direct_imap.get_all_messages()) == 0
+
+
 def test_archived_muted_chat(acfactory, lp):
    """If an archived and muted chat receives a new message, DC_EVENT_MSGS_CHANGED for
    DC_CHAT_ID_ARCHIVED_LINK must be generated if the chat had only seen messages previously.
--- a/python/tests/test_3_offline.py
+++ b/python/tests/test_3_offline.py
@@ -35,7 +35,7 @@ class TestOfflineAccountBasic:
        d = ac1.get_info()
        assert d["arch"]
        assert d["number_of_chats"] == "0"
-        assert d["bcc_self"] == "0"
+        assert d["bcc_self"] == "1"

    def test_is_not_configured(self, acfactory):
        ac1 = acfactory.get_unconfigured_account()
@@ -69,7 +69,7 @@ class TestOfflineAccountBasic:
    def test_has_bccself(self, acfactory):
        ac1 = acfactory.get_unconfigured_account()
        assert "bcc_self" in ac1.get_config("sys.config_keys").split()
-        assert ac1.get_config("bcc_self") == "0"
+        assert ac1.get_config("bcc_self") == "1"

    def test_selfcontact_if_unconfigured(self, acfactory):
        ac1 = acfactory.get_unconfigured_account()
--- a/python/tox.ini
+++ b/python/tox.ini
@@ -46,7 +46,7 @@ deps =
 commands =
    ruff format --diff setup.py src/deltachat examples/ tests/
    ruff check src/deltachat tests/ examples/
-    rst-lint README.rst
+    rst-lint --encoding 'utf-8' README.rst

 [testenv:mypy]
 deps =
--- a/release-date.in
+++ b/release-date.in
@@ -1 +1 @@
-2026-01-22
+2025-11-05
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -26,10 +26,10 @@ and an own build machine.
   i.e. `deltachat-rpc-client` and `deltachat-rpc-server`.

 - `remote_tests_python.sh` rsyncs to a build machine and runs
-  JSON-RPC Python tests remotely on the build machine. 
+  `run-python-test.sh` remotely on the build machine. 

 - `remote_tests_rust.sh` rsyncs to the build machine and runs
-  Rust tests remotely on the build machine. 
+  `run-rust-test.sh` remotely on the build machine. 

 - `run-doxygen.sh` generates C-docs which are then uploaded to https://c.delta.chat/

--- a/scripts/coredeps/install-rust.sh
+++ b/scripts/coredeps/install-rust.sh
@@ -7,7 +7,7 @@ set -euo pipefail
 #
 # Avoid using rustup here as it depends on reading /proc/self/exe and
 # has problems running under QEMU.
-RUST_VERSION=1.92.0
+RUST_VERSION=1.91.0

 ARCH="$(uname -m)"
 test -f "/lib/libc.musl-$ARCH.so.1" && LIBC=musl || LIBC=gnu
--- a/scripts/remote_tests_python.sh
+++ b/scripts/remote_tests_python.sh
@@ -1,32 +1,45 @@
-#!/usr/bin/env bash
-set -euo pipefail
+#!/bin/bash 

-set -x
-if ! test -v SSHTARGET; then
-	echo >&2 SSHTARGET is not set
-	exit 1
-fi
-BUILDDIR=ci_builds/chatmailcore
+BUILD_ID=${1:?specify build ID}
+
+SSHTARGET=${SSHTARGET-ci@b1.delta.chat}
+BUILDDIR=ci_builds/$BUILD_ID

 echo "--- Copying files to $SSHTARGET:$BUILDDIR"

-rsync -az --delete --mkpath --files-from=<(git ls-files) ./ "$SSHTARGET:$BUILDDIR"
+set -xe
+
+ssh -oBatchMode=yes -oStrictHostKeyChecking=no  $SSHTARGET mkdir -p "$BUILDDIR"
+git ls-files >.rsynclist 
+# we seem to need .git for setuptools_scm versioning 
+find .git >>.rsynclist
+rsync --delete --files-from=.rsynclist -az ./ "$SSHTARGET:$BUILDDIR"
+
+set +x

 echo "--- Running Python tests remotely"

-ssh -oBatchMode=yes -- "$SSHTARGET" <<_HERE
+ssh $SSHTARGET <<_HERE
    set +x -e

    # make sure all processes exit when ssh dies
    shopt -s huponexit

-    export RUSTC_WRAPPER=\`command -v sccache\`
+    export RUSTC_WRAPPER=\`which sccache\`
    cd $BUILDDIR
+    export TARGET=release
    export CHATMAIL_DOMAIN=$CHATMAIL_DOMAIN

-    scripts/make-rpc-testenv.sh
-    . venv/bin/activate
+    #we rely on tox/virtualenv being available in the host
+    #rm -rf virtualenv venv
+    #virtualenv -q -p python3.7 venv 
+    #source venv/bin/activate
+    #pip install -q tox virtualenv

-    cd deltachat-rpc-client
-    pytest -n6 $@
+    set -x
+    which python
+    source \$HOME/venv/bin/activate
+    which python
+
+    bash scripts/run-python-test.sh 
 _HERE
--- a/scripts/remote_tests_rust.sh
+++ b/scripts/remote_tests_rust.sh
@@ -1,25 +1,29 @@
-#!/usr/bin/env bash
-set -euo pipefail
+#!/bin/bash 

-if ! test -v SSHTARGET; then
-        echo >&2 SSHTARGET is not set
-        exit 1
-fi
-BUILDDIR=ci_builds/chatmailcore
+BUILD_ID=${1:?specify build ID}
+
+SSHTARGET=${SSHTARGET-ci@b1.delta.chat}
+BUILDDIR=ci_builds/$BUILD_ID
+
+set -e

 echo "--- Copying files to $SSHTARGET:$BUILDDIR"

-rsync -az --delete --mkpath --files-from=<(git ls-files) ./ "$SSHTARGET:$BUILDDIR"
+ssh -oBatchMode=yes -oStrictHostKeyChecking=no $SSHTARGET mkdir -p "$BUILDDIR"
+git ls-files >.rsynclist
+rsync --delete --files-from=.rsynclist -az ./ "$SSHTARGET:$BUILDDIR"

 echo "--- Running Rust tests remotely"

-ssh -oBatchMode=yes -- "$SSHTARGET" <<_HERE
+ssh $SSHTARGET <<_HERE
    set +x -e
    # make sure all processes exit when ssh dies
    shopt -s huponexit
-    export RUSTC_WRAPPER=\`command -v sccache\`
+    export RUSTC_WRAPPER=\`which sccache\`
    cd $BUILDDIR
+    export TARGET=x86_64-unknown-linux-gnu
+    export RUSTC_WRAPPER=sccache

-    cargo nextest run
+    bash scripts/run-rust-test.sh
 _HERE

--- a/scripts/run_all.sh
+++ b/scripts/run_all.sh
@@ -31,6 +31,6 @@ unset CHATMAIL_DOMAIN

 # Try to build wheels for a range of interpreters, but don't fail if they are not available.
 # E.g. musllinux_1_1 does not have PyPy interpreters as of 2022-07-10
-tox --workdir "$TOXWORKDIR" -e py310,py311,py312,py313,pypy310 --skip-missing-interpreters true
+tox --workdir "$TOXWORKDIR" -e py38,py39,py310,py311,py312,py313,pypy38,pypy39,pypy310 --skip-missing-interpreters true

 auditwheel repair "$TOXWORKDIR"/wheelhouse/deltachat* -w "$TOXWORKDIR/wheelhouse"
--- a/src/accounts.rs
+++ b/src/accounts.rs
@@ -3,12 +3,8 @@
 use std::collections::{BTreeMap, BTreeSet};
 use std::future::Future;
 use std::path::{Path, PathBuf};
-use std::sync::Arc;

 use anyhow::{Context as _, Result, bail, ensure};
-use async_channel::{self, Receiver, Sender};
-use futures::FutureExt as _;
-use futures_lite::FutureExt as _;
 use serde::{Deserialize, Serialize};
 use tokio::fs;
 use tokio::io::AsyncWriteExt;
@@ -45,13 +41,6 @@ pub struct Accounts {

    /// Push notification subscriber shared between accounts.
    push_subscriber: PushSubscriber,
-
-    /// Channel sender to cancel ongoing background_fetch().
-    ///
-    /// If background_fetch() is not running, this is `None`.
-    /// New background_fetch() should not be started if this
-    /// contains `Some`.
-    background_fetch_interrupt_sender: Arc<parking_lot::Mutex<Option<Sender<()>>>>,
 }

 impl Accounts {
@@ -60,18 +49,8 @@ impl Accounts {
        if writable && !dir.exists() {
            Accounts::create(&dir).await?;
        }
-        let events = Events::new();
-        Accounts::open(events, dir, writable).await
-    }

-    /// Loads or creates an accounts folder at the given `dir`.
-    /// Uses an existing events channel.
-    pub async fn new_with_events(dir: PathBuf, writable: bool, events: Events) -> Result<Self> {
-        if writable && !dir.exists() {
-            Accounts::create(&dir).await?;
-        }
-
-        Accounts::open(events, dir, writable).await
+        Accounts::open(dir, writable).await
    }

    /// Get the ID used to log events.
@@ -95,14 +74,14 @@ impl Accounts {

    /// Opens an existing accounts structure. Will error if the folder doesn't exist,
    /// no account exists and no config exists.
-    async fn open(events: Events, dir: PathBuf, writable: bool) -> Result<Self> {
+    async fn open(dir: PathBuf, writable: bool) -> Result<Self> {
        ensure!(dir.exists(), "directory does not exist");

        let config_file = dir.join(CONFIG_NAME);
        ensure!(config_file.exists(), "{config_file:?} does not exist");

        let config = Config::from_file(config_file, writable).await?;
-
+        let events = Events::new();
        let stockstrings = StockStrings::new();
        let push_subscriber = PushSubscriber::new();
        let accounts = config
@@ -117,7 +96,6 @@ impl Accounts {
            events,
            stockstrings,
            push_subscriber,
-            background_fetch_interrupt_sender: Default::default(),
        })
    }

@@ -374,11 +352,6 @@ impl Accounts {
    ///
    /// This is an auxiliary function and not part of public API.
    /// Use [Accounts::background_fetch] instead.
-    ///
-    /// This function is cancellation-safe.
-    /// It is intended to be cancellable,
-    /// either because of the timeout or because background
-    /// fetch was explicitly cancelled.
    async fn background_fetch_no_timeout(accounts: Vec<Context>, events: Events) {
        let n_accounts = accounts.len();
        events.emit(Event {
@@ -387,11 +360,6 @@ impl Accounts {
                "Starting background fetch for {n_accounts} accounts."
            )),
        });
-        ::tracing::event!(
-            ::tracing::Level::INFO,
-            account_id = 0,
-            "Starting background fetch for {n_accounts} accounts."
-        );
        let mut set = JoinSet::new();
        for account in accounts {
            set.spawn(async move {
@@ -407,41 +375,17 @@ impl Accounts {
                "Finished background fetch for {n_accounts} accounts."
            )),
        });
-        ::tracing::event!(
-            ::tracing::Level::INFO,
-            account_id = 0,
-            "Finished background fetch for {n_accounts} accounts."
-        );
    }

    /// Auxiliary function for [Accounts::background_fetch].
-    ///
-    /// Runs `background_fetch` until it finishes
-    /// or until the timeout.
-    ///
-    /// Produces `AccountsBackgroundFetchDone` event in every case
-    /// and clears [`Self::background_fetch_interrupt_sender`]
-    /// so a new background fetch can be started.
-    ///
-    /// This function is not cancellation-safe.
-    /// Cancelling it before it returns may result
-    /// in not being able to run any new background fetch
-    /// if interrupt sender was not cleared.
    async fn background_fetch_with_timeout(
        accounts: Vec<Context>,
        events: Events,
        timeout: std::time::Duration,
-        interrupt_sender: Arc<parking_lot::Mutex<Option<Sender<()>>>>,
-        interrupt_receiver: Option<Receiver<()>>,
    ) {
-        let Some(interrupt_receiver) = interrupt_receiver else {
-            // Nothing to do if we got no interrupt receiver.
-            return;
-        };
        if let Err(_err) = tokio::time::timeout(
            timeout,
-            Self::background_fetch_no_timeout(accounts, events.clone())
-                .race(interrupt_receiver.recv().map(|_| ())),
+            Self::background_fetch_no_timeout(accounts, events.clone()),
        )
        .await
        {
@@ -449,26 +393,15 @@ impl Accounts {
                id: 0,
                typ: EventType::Warning("Background fetch timed out.".to_string()),
            });
-            ::tracing::event!(
-                ::tracing::Level::WARN,
-                account_id = 0,
-                "Background fetch timed out."
-            );
        }
        events.emit(Event {
            id: 0,
            typ: EventType::AccountsBackgroundFetchDone,
        });
-        (*interrupt_sender.lock()) = None;
    }

    /// Performs a background fetch for all accounts in parallel with a timeout.
    ///
-    /// Ongoing background fetch can also be cancelled manually
-    /// by calling `stop_background_fetch()`, in which case it will
-    /// return immediately even before the timeout expiration
-    /// or finishing fetching.
-    ///
    /// The `AccountsBackgroundFetchDone` event is emitted at the end,
    /// process all events until you get this one and you can safely return to the background
    /// without forgetting to create notifications caused by timing race conditions.
@@ -481,39 +414,7 @@ impl Accounts {
    ) -> impl Future<Output = ()> + use<> {
        let accounts: Vec<Context> = self.accounts.values().cloned().collect();
        let events = self.events.clone();
-        let (sender, receiver) = async_channel::bounded(1);
-        let receiver = {
-            let mut lock = self.background_fetch_interrupt_sender.lock();
-            if (*lock).is_some() {
-                // Another background_fetch() is already running,
-                // return immeidately.
-                None
-            } else {
-                *lock = Some(sender);
-                Some(receiver)
-            }
-        };
-        Self::background_fetch_with_timeout(
-            accounts,
-            events,
-            timeout,
-            self.background_fetch_interrupt_sender.clone(),
-            receiver,
-        )
-    }
-
-    /// Interrupts ongoing background_fetch() call,
-    /// making it return early.
-    ///
-    /// This method allows to cancel background_fetch() early,
-    /// e.g. on Android, when `Service.onTimeout` is called.
-    ///
-    /// If there is no ongoing background_fetch(), does nothing.
-    pub fn stop_background_fetch(&self) {
-        let mut lock = self.background_fetch_interrupt_sender.lock();
-        if let Some(sender) = lock.take() {
-            sender.try_send(()).ok();
-        }
+        Self::background_fetch_with_timeout(accounts, events, timeout)
    }

    /// Emits a single event.
@@ -703,12 +604,13 @@ impl Config {
        // Convert them to relative paths.
        let mut modified = false;
        for account in &mut config.inner.accounts {
-            if account.dir.is_absolute()
-                && let Some(old_path_parent) = account.dir.parent()
-                && let Ok(new_path) = account.dir.strip_prefix(old_path_parent)
-            {
-                account.dir = new_path.to_path_buf();
-                modified = true;
+            if account.dir.is_absolute() {
+                if let Some(old_path_parent) = account.dir.parent() {
+                    if let Ok(new_path) = account.dir.strip_prefix(old_path_parent) {
+                        account.dir = new_path.to_path_buf();
+                        modified = true;
+                    }
+                }
            }
        }
        if modified && writable {
--- a/src/blob.rs
+++ b/src/blob.rs
@@ -234,13 +234,8 @@ impl<'a> BlobObject<'a> {
    /// If `data` represents an image of known format, this adds the corresponding extension.
    ///
    /// Even though this function is not async, it's OK to call it from an async context.
-    ///
-    /// Returns an error if there is an I/O problem,
-    /// but in case of a failure to decode base64 returns `Ok(None)`.
-    pub(crate) fn store_from_base64(context: &Context, data: &str) -> Result<Option<String>> {
-        let Ok(buf) = base64::engine::general_purpose::STANDARD.decode(data) else {
-            return Ok(None);
-        };
+    pub(crate) fn store_from_base64(context: &Context, data: &str) -> Result<String> {
+        let buf = base64::engine::general_purpose::STANDARD.decode(data)?;
        let name = if let Ok(format) = image::guess_format(&buf) {
            if let Some(ext) = format.extensions_str().first() {
                format!("file.{ext}")
@@ -251,7 +246,7 @@ impl<'a> BlobObject<'a> {
            String::new()
        };
        let blob = BlobObject::create_and_deduplicate_from_bytes(context, &buf, &name)?;
-        Ok(Some(blob.as_name().to_string()))
+        Ok(blob.as_name().to_string())
    }

    /// Recode image to avatar size.
--- a/src/blob/blob_tests.rs
+++ b/src/blob/blob_tests.rs
@@ -173,8 +173,11 @@ async fn test_selfavatar_outside_blobdir() {
        .unwrap();
    let avatar_blob = t.get_config(Config::Selfavatar).await.unwrap().unwrap();
    let avatar_path = Path::new(&avatar_blob);
+    assert!(
+        avatar_blob.ends_with("7dde69e06b5ae6c27520a436bbfd65b.jpg"),
+        "The avatar filename should be its hash, put instead it's {avatar_blob}"
+    );
    let scaled_avatar_size = file_size(avatar_path).await;
-    info!(&t, "Scaled avatar size: {scaled_avatar_size}.");
    assert!(scaled_avatar_size < avatar_bytes.len() as u64);

    check_image_size(avatar_src, 1000, 1000);
@@ -184,11 +187,6 @@ async fn test_selfavatar_outside_blobdir() {
        constants::BALANCED_AVATAR_SIZE,
    );

-    assert!(
-        avatar_blob.ends_with("2a048b6fcd86448032b854ea1ad7608.jpg"),
-        "The avatar filename should be its hash, but instead it's {avatar_blob}"
-    );
-
    let mut blob = BlobObject::create_and_deduplicate(&t, avatar_path, avatar_path).unwrap();
    let viewtype = &mut Viewtype::Image;
    let strict_limits = true;
--- a/src/calls.rs
+++ b/src/calls.rs
@@ -4,21 +4,18 @@
 //! This means, the "Call ID" is a "Message ID" - similar to Webxdc IDs.
 use crate::chat::ChatIdBlocked;
 use crate::chat::{Chat, ChatId, send_msg};
-use crate::config::Config;
 use crate::constants::{Blocked, Chattype};
 use crate::contact::ContactId;
-use crate::context::{Context, WeakContext};
+use crate::context::Context;
 use crate::events::EventType;
 use crate::headerdef::HeaderDef;
 use crate::log::warn;
-use crate::message::{Message, MsgId, Viewtype};
+use crate::message::{self, Message, MsgId, Viewtype};
 use crate::mimeparser::{MimeMessage, SystemMessage};
 use crate::net::dns::lookup_host_with_cache;
 use crate::param::Param;
-use crate::tools::{normalize_text, time};
+use crate::tools::time;
 use anyhow::{Context as _, Result, ensure};
-use deltachat_derive::{FromSql, ToSql};
-use num_traits::FromPrimitive;
 use sdp::SessionDescription;
 use serde::Serialize;
 use std::io::Cursor;
@@ -36,7 +33,7 @@ use tokio::time::sleep;
 ///
 /// For the caller, this means they should also not wait longer,
 /// as the callee won't start the call afterwards.
-const RINGING_SECONDS: i64 = 120;
+const RINGING_SECONDS: i64 = 60;

 // For persisting parameters in the call, we use Param::Arg*

@@ -89,7 +86,7 @@ impl CallInfo {
            .sql
            .execute(
                "UPDATE msgs SET txt=?, txt_normalized=? WHERE id=?",
-                (text, normalize_text(text), self.msg.id),
+                (text, message::normalize_text(text), self.msg.id),
            )
            .await?;
        Ok(())
@@ -202,9 +199,8 @@ impl Context {
        call.id = send_msg(self, chat_id, &mut call).await?;

        let wait = RINGING_SECONDS;
-        let context = self.get_weak_context();
        task::spawn(Context::emit_end_call_if_unaccepted(
-            context,
+            self.clone(),
            wait.try_into()?,
            call.id,
        ));
@@ -295,12 +291,11 @@ impl Context {
    }

    async fn emit_end_call_if_unaccepted(
-        context: WeakContext,
+        context: Context,
        wait: u64,
        call_id: MsgId,
    ) -> Result<()> {
        sleep(Duration::from_secs(wait)).await;
-        let context = context.upgrade()?;
        let Some(mut call) = context.load_call_by_id(call_id).await? else {
            warn!(
                context,
@@ -351,39 +346,30 @@ impl Context {
                            false
                        }
                    };
-                    let can_call_me = match who_can_call_me(self).await? {
-                        WhoCanCallMe::Contacts => ChatIdBlocked::lookup_by_contact(self, from_id)
-                            .await?
-                            .is_some_and(|chat_id_blocked| {
-                                match chat_id_blocked.blocked {
-                                    Blocked::Not => true,
-                                    Blocked::Yes | Blocked::Request => {
-                                        // Do not notify about incoming calls
-                                        // from contact requests and blocked contacts.
-                                        //
-                                        // User can still access the call and accept it
-                                        // via the chat in case of contact requests.
-                                        false
-                                    }
-                                }
-                            }),
-                        WhoCanCallMe::Everybody => ChatIdBlocked::lookup_by_contact(self, from_id)
-                            .await?
-                            .is_none_or(|chat_id_blocked| chat_id_blocked.blocked != Blocked::Yes),
-                        WhoCanCallMe::Nobody => false,
-                    };
-                    if can_call_me {
-                        self.emit_event(EventType::IncomingCall {
-                            msg_id: call.msg.id,
-                            chat_id: call.msg.chat_id,
-                            place_call_info: call.place_call_info.to_string(),
-                            has_video,
-                        });
+                    if let Some(chat_id_blocked) =
+                        ChatIdBlocked::lookup_by_contact(self, from_id).await?
+                    {
+                        match chat_id_blocked.blocked {
+                            Blocked::Not => {
+                                self.emit_event(EventType::IncomingCall {
+                                    msg_id: call.msg.id,
+                                    chat_id: call.msg.chat_id,
+                                    place_call_info: call.place_call_info.to_string(),
+                                    has_video,
+                                });
+                            }
+                            Blocked::Yes | Blocked::Request => {
+                                // Do not notify about incoming calls
+                                // from contact requests and blocked contacts.
+                                //
+                                // User can still access the call and accept it
+                                // via the chat in case of contact requests.
+                            }
+                        }
                    }
                    let wait = call.remaining_ring_seconds();
-                    let context = self.get_weak_context();
                    task::spawn(Context::emit_end_call_if_unaccepted(
-                        context,
+                        self.clone(),
                        wait.try_into()?,
                        call.msg.id,
                    ));
@@ -617,7 +603,33 @@ struct IceServer {
    pub credential: Option<String>,
 }

-/// Creates ICE servers from a line received over IMAP METADATA.
+/// Creates JSON with ICE servers.
+async fn create_ice_servers(
+    context: &Context,
+    hostname: &str,
+    port: u16,
+    username: &str,
+    password: &str,
+) -> Result<String> {
+    // Do not use cache because there is no TLS.
+    let load_cache = false;
+    let urls: Vec<String> = lookup_host_with_cache(context, hostname, port, "", load_cache)
+        .await?
+        .into_iter()
+        .map(|addr| format!("turn:{addr}"))
+        .collect();
+
+    let ice_server = IceServer {
+        urls,
+        username: Some(username.to_string()),
+        credential: Some(password.to_string()),
+    };
+
+    let json = serde_json::to_string(&[ice_server])?;
+    Ok(json)
+}
+
+/// Creates JSON with ICE servers from a line received over IMAP METADATA.
 ///
 /// IMAP METADATA returns a line such as
 /// `example.com:3478:1758650868:8Dqkyyu11MVESBqjbIylmB06rv8=`
@@ -627,107 +639,20 @@ struct IceServer {
 /// while `8Dqkyyu11MVESBqjbIylmB06rv8=`
 /// is the password.
 pub(crate) async fn create_ice_servers_from_metadata(
+    context: &Context,
    metadata: &str,
-) -> Result<(i64, Vec<UnresolvedIceServer>)> {
+) -> Result<(i64, String)> {
    let (hostname, rest) = metadata.split_once(':').context("Missing hostname")?;
    let (port, rest) = rest.split_once(':').context("Missing port")?;
    let port = u16::from_str(port).context("Failed to parse the port")?;
    let (ts, password) = rest.split_once(':').context("Missing timestamp")?;
    let expiration_timestamp = i64::from_str(ts).context("Failed to parse the timestamp")?;
-    let ice_servers = vec![UnresolvedIceServer::Turn {
-        hostname: hostname.to_string(),
-        port,
-        username: ts.to_string(),
-        credential: password.to_string(),
-    }];
+    let ice_servers = create_ice_servers(context, hostname, port, ts, password).await?;
    Ok((expiration_timestamp, ice_servers))
 }

-/// STUN or TURN server with unresolved DNS name.
-#[derive(Debug, Clone)]
-pub(crate) enum UnresolvedIceServer {
-    /// STUN server.
-    Stun { hostname: String, port: u16 },
-
-    /// TURN server with the username and password.
-    Turn {
-        hostname: String,
-        port: u16,
-        username: String,
-        credential: String,
-    },
-}
-
-/// Resolves domain names of ICE servers.
-///
-/// On failure to resolve, logs the error
-/// and skips the server, but does not fail.
-pub(crate) async fn resolve_ice_servers(
-    context: &Context,
-    unresolved_ice_servers: Vec<UnresolvedIceServer>,
-) -> Result<String> {
-    let mut result: Vec<IceServer> = Vec::new();
-
-    // Do not use cache because there is no TLS.
-    let load_cache = false;
-
-    for unresolved_ice_server in unresolved_ice_servers {
-        match unresolved_ice_server {
-            UnresolvedIceServer::Stun { hostname, port } => {
-                match lookup_host_with_cache(context, &hostname, port, "", load_cache).await {
-                    Ok(addrs) => {
-                        let urls: Vec<String> = addrs
-                            .into_iter()
-                            .map(|addr| format!("stun:{addr}"))
-                            .collect();
-                        let stun_server = IceServer {
-                            urls,
-                            username: None,
-                            credential: None,
-                        };
-                        result.push(stun_server);
-                    }
-                    Err(err) => {
-                        warn!(
-                            context,
-                            "Failed to resolve STUN {hostname}:{port}: {err:#}."
-                        );
-                    }
-                }
-            }
-            UnresolvedIceServer::Turn {
-                hostname,
-                port,
-                username,
-                credential,
-            } => match lookup_host_with_cache(context, &hostname, port, "", load_cache).await {
-                Ok(addrs) => {
-                    let urls: Vec<String> = addrs
-                        .into_iter()
-                        .map(|addr| format!("turn:{addr}"))
-                        .collect();
-                    let turn_server = IceServer {
-                        urls,
-                        username: Some(username),
-                        credential: Some(credential),
-                    };
-                    result.push(turn_server);
-                }
-                Err(err) => {
-                    warn!(
-                        context,
-                        "Failed to resolve TURN {hostname}:{port}: {err:#}."
-                    );
-                }
-            },
-        }
-    }
-    let json = serde_json::to_string(&result)?;
-    Ok(json)
-}
-
 /// Creates JSON with ICE servers when no TURN servers are known.
-pub(crate) fn create_fallback_ice_servers() -> Vec<UnresolvedIceServer> {
+pub(crate) async fn create_fallback_ice_servers(context: &Context) -> Result<String> {
    // Do not use public STUN server from https://stunprotocol.org/.
    // It changes the hostname every year
    // (e.g. stunserver2025.stunprotocol.org
@@ -735,18 +660,25 @@ pub(crate) fn create_fallback_ice_servers() -> Vec<UnresolvedIceServer> {
    // because of bandwidth costs:
    // <https://github.com/jselbie/stunserver/issues/50>

-    vec![
-        UnresolvedIceServer::Stun {
-            hostname: "nine.testrun.org".to_string(),
-            port: STUN_PORT,
-        },
-        UnresolvedIceServer::Turn {
-            hostname: "turn.delta.chat".to_string(),
-            port: STUN_PORT,
-            username: "public".to_string(),
-            credential: "o4tR7yG4rG2slhXqRUf9zgmHz".to_string(),
-        },
-    ]
+    // We use nine.testrun.org for a default STUN server.
+    let hostname = "nine.testrun.org";
+
+    // Do not use cache because there is no TLS.
+    let load_cache = false;
+    let urls: Vec<String> = lookup_host_with_cache(context, hostname, STUN_PORT, "", load_cache)
+        .await?
+        .into_iter()
+        .map(|addr| format!("stun:{addr}"))
+        .collect();
+
+    let ice_server = IceServer {
+        urls,
+        username: None,
+        credential: None,
+    };
+
+    let json = serde_json::to_string(&[ice_server])?;
+    Ok(json)
 }

 /// Returns JSON with ICE servers.
@@ -760,39 +692,11 @@ pub(crate) fn create_fallback_ice_servers() -> Vec<UnresolvedIceServer> {
 /// <https://github.com/deltachat/deltachat-desktop/issues/5447>.
 pub async fn ice_servers(context: &Context) -> Result<String> {
    if let Some(ref metadata) = *context.metadata.read().await {
-        let ice_servers = resolve_ice_servers(context, metadata.ice_servers.clone()).await?;
-        Ok(ice_servers)
+        Ok(metadata.ice_servers.clone())
    } else {
        Ok("[]".to_string())
    }
 }

-/// "Who can call me" config options.
-#[derive(
-    Debug, Default, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, FromSql, ToSql,
-)]
-#[repr(u8)]
-pub enum WhoCanCallMe {
-    /// Everybody can call me if they are not blocked.
-    ///
-    /// This includes contact requests.
-    Everybody = 0,
-
-    /// Every contact who is not blocked and not a contact request, can call.
-    #[default]
-    Contacts = 1,
-
-    /// Nobody can call me.
-    Nobody = 2,
-}
-
-/// Returns currently configuration of the "who can call me" option.
-async fn who_can_call_me(context: &Context) -> Result<WhoCanCallMe> {
-    let who_can_call_me =
-        WhoCanCallMe::from_i32(context.get_config_int(Config::WhoCanCallMe).await?)
-            .unwrap_or_default();
-    Ok(who_can_call_me)
-}
-
 #[cfg(test)]
 mod calls_tests;
--- a/src/calls/calls_tests.rs
+++ b/src/calls/calls_tests.rs
@@ -2,7 +2,7 @@ use super::*;
 use crate::chat::forward_msgs;
 use crate::config::Config;
 use crate::constants::DC_CHAT_ID_TRASH;
-use crate::receive_imf::receive_imf;
+use crate::receive_imf::{receive_imf, receive_imf_from_inbox};
 use crate::test_utils::{TestContext, TestContextManager};

 struct CallSetup {
@@ -610,3 +610,65 @@ async fn test_end_text_call() -> Result<()> {

    Ok(())
 }
+
+/// Tests that partially downloaded "call ended"
+/// messages are not processed.
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_no_partial_calls() -> Result<()> {
+    let mut tcm = TestContextManager::new();
+    let alice = &tcm.alice().await;
+
+    let seen = false;
+
+    // The messages in the test
+    // have no `Date` on purpose,
+    // so they are treated as new.
+    let received_call = receive_imf(
+        alice,
+        b"From: bob@example.net\n\
+        To: alice@example.org\n\
+        Message-ID: <first@example.net>\n\
+        Chat-Version: 1.0\n\
+        Chat-Content: call\n\
+        Chat-Webrtc-Room: YWFhYWFhYWFhCg==\n\
+        \n\
+        Hello, this is a call\n",
+        seen,
+    )
+    .await?
+    .unwrap();
+    assert_eq!(received_call.msg_ids.len(), 1);
+    let call_msg = Message::load_from_db(alice, received_call.msg_ids[0])
+        .await
+        .unwrap();
+    assert_eq!(call_msg.viewtype, Viewtype::Call);
+    assert_eq!(call_state(alice, call_msg.id).await?, CallState::Alerting);
+
+    let imf_raw = b"From: bob@example.net\n\
+        To: alice@example.org\n\
+        Message-ID: <second@example.net>\n\
+        In-Reply-To: <first@example.net>\n\
+        Chat-Version: 1.0\n\
+        Chat-Content: call-ended\n\
+        \n\
+        Call ended\n";
+    receive_imf_from_inbox(
+        alice,
+        "second@example.net",
+        imf_raw,
+        seen,
+        Some(imf_raw.len().try_into().unwrap()),
+    )
+    .await?;
+
+    // The call is still not ended.
+    assert_eq!(call_state(alice, call_msg.id).await?, CallState::Alerting);
+
+    // Fully downloading the message ends the call.
+    receive_imf_from_inbox(alice, "second@example.net", imf_raw, seen, None)
+        .await
+        .context("Failed to fully download end call message")?;
+    assert_eq!(call_state(alice, call_msg.id).await?, CallState::Missed);
+
+    Ok(())
+}
--- a/src/chat.rs
+++ b/src/chat.rs
--- a/src/chat/chat_tests.rs
+++ b/src/chat/chat_tests.rs
@@ -1,7 +1,6 @@
 use std::sync::Arc;

 use super::*;
-use crate::Event;
 use crate::chatlist::get_archived_cnt;
 use crate::constants::{DC_GCL_ARCHIVED_ONLY, DC_GCL_NO_SPECIALS};
 use crate::ephemeral::Timer;
@@ -816,6 +815,15 @@ async fn test_self_talk() -> Result<()> {
    assert!(msg.get_showpadlock());

    let sent_msg = t.pop_sent_msg().await;
+    let payload = sent_msg.payload();
+    // Make sure the `To` field contains the address and not
+    // "undisclosed recipients".
+    // Otherwise Delta Chat core <1.153.0 assigns the message
+    // to the trash chat.
+    assert_eq!(
+        payload.match_indices("To: <alice@example.org>\r\n").count(),
+        1
+    );

    let t2 = TestContext::new_alice().await;
    t2.recv_msg(&sent_msg).await;
@@ -1230,7 +1238,7 @@ async fn test_unarchive_if_muted() -> Result<()> {
    chat_id.set_visibility(&t, ChatVisibility::Archived).await?;
    set_muted(&t, chat_id, MuteDuration::Forever).await?;
    send_text_msg(&t, chat_id, "out".to_string()).await?;
-    add_info_msg(&t, chat_id, "info").await?;
+    add_info_msg(&t, chat_id, "info", time()).await?;
    assert_eq!(get_archived_cnt(&t).await?, 1);

    // finally, unarchive on sending to not muted chat
@@ -1241,96 +1249,6 @@ async fn test_unarchive_if_muted() -> Result<()> {
    Ok(())
 }

-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_marknoticed_all_chats() -> Result<()> {
-    let mut tcm = TestContextManager::new();
-    let alice = &tcm.alice().await;
-    let bob = &tcm.bob().await;
-
-    tcm.section("alice: create chats & promote them by sending a message");
-
-    let alice_chat_normal = alice
-        .create_group_with_members("Chat (normal)", &[alice, bob])
-        .await;
-    send_text_msg(alice, alice_chat_normal, "Hi".to_string()).await?;
-
-    let alice_chat_muted = alice
-        .create_group_with_members("Chat (muted)", &[alice, bob])
-        .await;
-    send_text_msg(alice, alice_chat_muted, "Hi".to_string()).await?;
-    set_muted(&alice.ctx, alice_chat_muted, MuteDuration::Forever).await?;
-
-    let alice_chat_archived_and_muted = alice
-        .create_group_with_members("Chat (archived and muted)", &[alice, bob])
-        .await;
-    send_text_msg(alice, alice_chat_archived_and_muted, "Hi".to_string()).await?;
-    set_muted(
-        &alice.ctx,
-        alice_chat_archived_and_muted,
-        MuteDuration::Forever,
-    )
-    .await?;
-    alice_chat_archived_and_muted
-        .set_visibility(&alice.ctx, ChatVisibility::Archived)
-        .await?;
-
-    tcm.section("bob: receive messages, accept all chats and send a reply to each messsage");
-
-    while let Some(sent_msg) = alice.pop_sent_msg_opt(Duration::default()).await {
-        let bob_message = bob.recv_msg(&sent_msg).await;
-        let bob_chat_id = bob_message.chat_id;
-        bob_chat_id.accept(bob).await?;
-        send_text_msg(bob, bob_chat_id, "reply".to_string()).await?;
-    }
-
-    tcm.section("alice: receive replies from bob");
-    while let Some(sent_msg) = bob.pop_sent_msg_opt(Duration::default()).await {
-        alice.recv_msg(&sent_msg).await;
-    }
-    // ensure chats have unread messages
-    assert_eq!(alice_chat_normal.get_fresh_msg_cnt(alice).await?, 1);
-    assert_eq!(alice_chat_muted.get_fresh_msg_cnt(alice).await?, 1);
-    assert_eq!(
-        alice_chat_archived_and_muted
-            .get_fresh_msg_cnt(alice)
-            .await?,
-        1
-    );
-
-    tcm.section("alice: mark as read");
-    alice.evtracker.clear_events();
-    marknoticed_all_chats(alice).await?;
-    tcm.section("alice: check that chats are no longer unread and that chatlist update events were received");
-    assert_eq!(alice_chat_normal.get_fresh_msg_cnt(alice).await?, 0);
-    assert_eq!(alice_chat_muted.get_fresh_msg_cnt(alice).await?, 0);
-    assert_eq!(
-        alice_chat_archived_and_muted
-            .get_fresh_msg_cnt(alice)
-            .await?,
-        0
-    );
-
-    let emitted_events = alice.evtracker.take_events();
-    for event in &[
-        EventType::ChatlistItemChanged {
-            chat_id: Some(alice_chat_normal),
-        },
-        EventType::ChatlistItemChanged {
-            chat_id: Some(alice_chat_muted),
-        },
-        EventType::ChatlistItemChanged {
-            chat_id: Some(alice_chat_archived_and_muted),
-        },
-        EventType::ChatlistItemChanged {
-            chat_id: Some(DC_CHAT_ID_ARCHIVED_LINK),
-        },
-    ] {
-        assert!(emitted_events.iter().any(|Event { typ, .. }| typ == event));
-    }
-
-    Ok(())
-}
-
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_archive_fresh_msgs() -> Result<()> {
    let t = TestContext::new_alice().await;
@@ -1719,7 +1637,7 @@ async fn test_set_mute_duration() {
 async fn test_add_info_msg() -> Result<()> {
    let t = TestContext::new().await;
    let chat_id = create_group(&t, "foo").await?;
-    add_info_msg(&t, chat_id, "foo info").await?;
+    add_info_msg(&t, chat_id, "foo info", time()).await?;

    let msg = t.get_last_msg_in(chat_id).await;
    assert_eq!(msg.get_chat_id(), chat_id);
@@ -1741,11 +1659,11 @@ async fn test_add_info_msg_with_cmd() -> Result<()> {
        chat_id,
        "foo bar info",
        SystemMessage::EphemeralTimerChanged,
-        None,
        time(),
        None,
        None,
        None,
+        None,
    )
    .await?;

@@ -2714,6 +2632,12 @@ async fn test_can_send_group() -> Result<()> {
 /// the recipients can't see the identity of their fellow recipients.
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_broadcast_members_cant_see_each_other() -> Result<()> {
+    fn contains(parsed: &MimeMessage, s: &str) -> bool {
+        assert_eq!(parsed.decrypting_failed, false);
+        let decoded_str = std::str::from_utf8(&parsed.decoded_data).unwrap();
+        decoded_str.contains(s)
+    }
+
    let mut tcm = TestContextManager::new();
    let alice = &tcm.alice().await;
    let bob = &tcm.bob().await;
@@ -2745,8 +2669,8 @@ async fn test_broadcast_members_cant_see_each_other() -> Result<()> {
        );
        let parsed = charlie.parse_msg(&auth_required).await;
        assert!(parsed.get_header(HeaderDef::AutocryptGossip).is_some());
-        assert!(parsed.decoded_data_contains("charlie@example.net"));
-        assert_eq!(parsed.decoded_data_contains("bob@example.net"), false);
+        assert!(contains(&parsed, "charlie@example.net"));
+        assert_eq!(contains(&parsed, "bob@example.net"), false);

        let parsed_by_bob = bob.parse_msg(&auth_required).await;
        assert!(parsed_by_bob.decrypting_failed);
@@ -2774,8 +2698,8 @@ async fn test_broadcast_members_cant_see_each_other() -> Result<()> {
        );
        let parsed = charlie.parse_msg(&member_added).await;
        assert!(parsed.get_header(HeaderDef::AutocryptGossip).is_some());
-        assert!(parsed.decoded_data_contains("charlie@example.net"));
-        assert_eq!(parsed.decoded_data_contains("bob@example.net"), false);
+        assert!(contains(&parsed, "charlie@example.net"));
+        assert_eq!(contains(&parsed, "bob@example.net"), false);

        let parsed_by_bob = bob.parse_msg(&member_added).await;
        assert!(parsed_by_bob.decrypting_failed);
@@ -2789,8 +2713,8 @@ async fn test_broadcast_members_cant_see_each_other() -> Result<()> {
        let hi_msg = alice.send_text(alice_broadcast_id, "hi").await;
        let parsed = charlie.parse_msg(&hi_msg).await;
        assert_eq!(parsed.header_exists(HeaderDef::AutocryptGossip), false);
-        assert_eq!(parsed.decoded_data_contains("charlie@example.net"), false);
-        assert_eq!(parsed.decoded_data_contains("bob@example.net"), false);
+        assert_eq!(contains(&parsed, "charlie@example.net"), false);
+        assert_eq!(contains(&parsed, "bob@example.net"), false);

        let parsed_by_bob = bob.parse_msg(&hi_msg).await;
        assert_eq!(parsed_by_bob.decrypting_failed, false);
@@ -2806,8 +2730,8 @@ async fn test_broadcast_members_cant_see_each_other() -> Result<()> {
            "charlie@example.net alice@example.org"
        );
        let parsed = charlie.parse_msg(&member_removed).await;
-        assert!(parsed.decoded_data_contains("charlie@example.net"));
-        assert_eq!(parsed.decoded_data_contains("bob@example.net"), false);
+        assert!(contains(&parsed, "charlie@example.net"));
+        assert_eq!(contains(&parsed, "bob@example.net"), false);

        let parsed_by_bob = bob.parse_msg(&member_removed).await;
        assert!(parsed_by_bob.decrypting_failed);
@@ -2953,123 +2877,6 @@ async fn test_broadcast_multidev() -> Result<()> {
    Ok(())
 }

-/// Test that, if the broadcast channel owner has multiple devices
-/// and they have diverging views on the recipients,
-/// it is synced when sending a member-addition message.
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_broadcast_recipients_sync1() -> Result<()> {
-    let mut tcm = TestContextManager::new();
-    let alice1 = &tcm.alice().await;
-    let alice2 = &tcm.alice().await;
-    let bob = &tcm.bob().await;
-    let charlie = &tcm.charlie().await;
-    for a in &[alice1, alice2] {
-        a.set_config_bool(Config::SyncMsgs, true).await?;
-    }
-
-    // Alice1 creates a broadcast and adds Bob, but for some reason
-    // (e.g. because alice2 runs an older version of DC),
-    // Alice2 doesn't get to know about it
-    let a1_broadcast_id = create_broadcast(alice1, "Channel".to_string()).await?;
-    alice1.send_sync_msg().await.unwrap();
-    alice1.pop_sent_msg().await;
-
-    let qr = get_securejoin_qr(alice1, Some(a1_broadcast_id))
-        .await
-        .unwrap();
-    tcm.exec_securejoin_qr(bob, alice1, &qr).await;
-
-    // The first sync message got lost, so, alice2 doesn't know about the channel now
-    sync(alice1, alice2).await;
-    let a2_chatlist = Chatlist::try_load(alice2, 0, Some("Channel"), None).await?;
-    assert!(a2_chatlist.is_empty());
-
-    // Alice1 adds Charlie to the broadcast channel,
-    // and now, Alice2 receives the messages
-    join_securejoin(charlie, &qr).await.unwrap();
-
-    let request = charlie.pop_sent_msg().await;
-    alice1.recv_msg_trash(&request).await;
-    alice2.recv_msg_trash(&request).await;
-
-    let auth_required = alice1.pop_sent_msg().await;
-    charlie.recv_msg_trash(&auth_required).await;
-    alice2.recv_msg_trash(&auth_required).await;
-
-    let request_with_auth = charlie.pop_sent_msg().await;
-    alice1.recv_msg_trash(&request_with_auth).await;
-    alice2.recv_msg_trash(&request_with_auth).await;
-
-    let member_added = alice1.pop_sent_msg().await;
-    let a2_member_added = alice2.recv_msg(&member_added).await;
-    let _c_member_added = charlie.recv_msg(&member_added).await;
-
-    // Alice1 will now sync the full member list to Alice2:
-    sync(alice1, alice2).await;
-    let a2_chatlist = Chatlist::try_load(alice2, 0, Some("Channel"), None).await?;
-    assert_eq!(a2_chatlist.get_msg_id(0)?.unwrap(), a2_member_added.id);
-
-    let a2_bob_contact = alice2.add_or_lookup_contact_id(bob).await;
-    let a2_charlie_contact = alice2.add_or_lookup_contact_id(charlie).await;
-
-    let a2_chat_members = get_chat_contacts(alice2, a2_member_added.chat_id).await?;
-    assert!(a2_chat_members.contains(&a2_bob_contact));
-    assert!(a2_chat_members.contains(&a2_charlie_contact));
-    assert_eq!(a2_chat_members.len(), 2);
-
-    Ok(())
-}
-
-/// Test that, if the broadcast channel owner has multiple devices
-/// and they have diverging views on the recipients,
-/// sync messages only add members but don't remove them.
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_broadcast_recipients_sync2() -> Result<()> {
-    let mut tcm = TestContextManager::new();
-    let alice1 = &tcm.alice().await;
-    let alice2 = &tcm.alice().await;
-    let bob = &tcm.bob().await;
-    let charlie = &tcm.charlie().await;
-    for a in &[alice1, alice2] {
-        a.set_config_bool(Config::SyncMsgs, true).await?;
-    }
-
-    let a1_broadcast_id = create_broadcast(alice1, "Channel".to_string()).await?;
-    sync(alice1, alice2).await;
-
-    tcm.section("Alice1 adds Bob, but Alice2 misses it for some reason");
-    let qr = get_securejoin_qr(alice1, Some(a1_broadcast_id))
-        .await
-        .unwrap();
-    tcm.exec_securejoin_qr(bob, alice1, &qr).await;
-
-    tcm.section("Alice2 adds Charlie, but Alice1 misses it for some reason");
-    let a2_broadcast_id = Chatlist::try_load(alice2, 0, Some("Channel"), None)
-        .await?
-        .get_chat_id(0)
-        .unwrap();
-    let qr = get_securejoin_qr(alice2, Some(a2_broadcast_id))
-        .await
-        .unwrap();
-    tcm.exec_securejoin_qr(charlie, alice2, &qr).await;
-
-    tcm.section("The sync messages should correct the problem");
-    sync(alice1, alice2).await;
-    sync(alice2, alice1).await;
-
-    for (alice, broadcast_id) in [(alice1, a1_broadcast_id), (alice2, a2_broadcast_id)] {
-        let bob_contact = alice.add_or_lookup_contact_id(bob).await;
-        let charlie_contact = alice.add_or_lookup_contact_id(charlie).await;
-
-        let chat_members = get_chat_contacts(alice, broadcast_id).await?;
-        assert!(chat_members.contains(&bob_contact));
-        assert!(chat_members.contains(&charlie_contact));
-        assert_eq!(chat_members.len(), 2);
-    }
-
-    Ok(())
-}
-
 /// - Create a broadcast channel
 /// - Send a message into it in order to promote it
 /// - Add a contact
@@ -3324,7 +3131,7 @@ async fn test_broadcast_channel_protected_listid() -> Result<()> {
        .await?
        .grpid;

-    let parsed = mimeparser::MimeMessage::from_bytes(bob, sent.payload.as_bytes()).await?;
+    let parsed = mimeparser::MimeMessage::from_bytes(bob, sent.payload.as_bytes(), None).await?;
    assert_eq!(
        parsed.get_mailinglist_header().unwrap(),
        format!("My Channel <{}>", alice_list_id)
@@ -3435,11 +3242,6 @@ async fn test_remove_member_from_broadcast() -> Result<()> {
    let alice_bob_contact_id = alice.add_or_lookup_contact_id(bob).await;
    remove_contact_from_chat(alice, alice_chat_id, alice_bob_contact_id).await?;

-    // Alice must not remember old members,
-    // because we would like to remember the minimum information possible
-    let past_contacts = get_past_chat_contacts(alice, alice_chat_id).await?;
-    assert_eq!(past_contacts.len(), 0);
-
    let remove_msg = alice.pop_sent_msg().await;
    let rcvd = bob.recv_msg(&remove_msg).await;
    assert_eq!(rcvd.text, "Member Me removed by alice@example.org.");
@@ -3524,8 +3326,11 @@ async fn test_leave_broadcast_multidevice() -> Result<()> {
    remove_contact_from_chat(bob0, bob_chat_id, ContactId::SELF).await?;

    let leave_msg = bob0.pop_sent_msg().await;
-    let parsed = MimeMessage::from_bytes(bob1, leave_msg.payload().as_bytes()).await?;
-    assert_eq!(parsed.parts[0].msg, "I left the group.");
+    let parsed = MimeMessage::from_bytes(bob1, leave_msg.payload().as_bytes(), None).await?;
+    assert_eq!(
+        parsed.parts[0].msg,
+        stock_str::msg_group_left_remote(bob0).await
+    );

    let rcvd = bob1.recv_msg(&leave_msg).await;

@@ -4708,7 +4513,7 @@ async fn test_info_not_referenced() -> Result<()> {

    let bob_received_message = tcm.send_recv_accept(alice, bob, "Hi!").await;
    let bob_chat_id = bob_received_message.chat_id;
-    add_info_msg(bob, bob_chat_id, "Some info").await?;
+    add_info_msg(bob, bob_chat_id, "Some info", create_smeared_timestamp(bob)).await?;

    // Bob sends a message.
    // This message should reference Alice's "Hi!" message and not the info message.
@@ -5453,44 +5258,6 @@ async fn test_send_delete_request_no_encryption() -> Result<()> {
    Ok(())
 }

-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_forward_msgs_2ctx() -> Result<()> {
-    let mut tcm = TestContextManager::new();
-    let alice = &tcm.alice().await;
-    let bob = &tcm.bob().await;
-
-    let alice_chat = alice.create_chat(bob).await;
-    let alice_sent = alice.send_text(alice_chat.id, "hi").await;
-    let bob_alice_msg = bob.recv_msg(&alice_sent).await;
-    let bob_chat_id = bob_alice_msg.chat_id;
-    bob_chat_id.accept(bob).await?;
-
-    let bob_text = "Hi, did you know we're using the same device so i have access to your profile?";
-    let bob_sent = bob.send_text(bob_chat_id, bob_text).await;
-    alice.recv_msg(&bob_sent).await;
-    let alice_chat_len = alice_chat.id.get_msg_cnt(alice).await?;
-
-    forward_msgs_2ctx(
-        bob,
-        &[bob_alice_msg.id, bob_sent.sender_msg_id],
-        alice,
-        alice_chat.id,
-    )
-    .await?;
-    assert_eq!(alice_chat.id.get_msg_cnt(alice).await?, alice_chat_len + 2);
-    let msg = alice.get_last_msg().await;
-    assert!(msg.is_forwarded());
-    assert_eq!(msg.text, bob_text);
-    assert_eq!(msg.from_id, ContactId::SELF);
-
-    let sent = alice.pop_sent_msg().await;
-    let msg = bob.recv_msg(&sent).await;
-    assert!(msg.is_forwarded());
-    assert_eq!(msg.text, bob_text);
-    assert_eq!(msg.from_id, bob_alice_msg.from_id);
-    Ok(())
-}
-
 /// Tests that in multi-device setup
 /// second device learns the key of a contact
 /// via Autocrypt-Gossip in 1:1 chats.
--- a/src/chatlist.rs
+++ b/src/chatlist.rs
@@ -76,7 +76,7 @@ impl Chatlist {
    ///   the pseudo-chat DC_CHAT_ID_ARCHIVED_LINK is added if there are *any* archived
    ///   chats
    /// - the flag DC_GCL_FOR_FORWARDING sorts "Saved messages" to the top of the chatlist
-    ///   and hides the device-chat, contact requests and incoming broadcasts.
+    ///   and hides the device-chat and contact requests
    ///   typically used on forwarding, may be combined with DC_GCL_NO_SPECIALS
    /// - if the flag DC_GCL_NO_SPECIALS is set, archive link is not added
    ///   to the list (may be used eg. for selecting chats on forwarding, the flag is
@@ -185,7 +185,7 @@ impl Chatlist {
                warn!(context, "Cannot update special chat names: {err:#}.")
            }

-            let str_like_cmd = format!("%{}%", query.to_lowercase());
+            let str_like_cmd = format!("%{query}%");
            context
                .sql
                .query_map_vec(
@@ -201,7 +201,7 @@ impl Chatlist {
                                  ORDER BY timestamp DESC, id DESC LIMIT 1)
                 WHERE c.id>9 AND c.id!=?2
                   AND c.blocked!=1
-                   AND IFNULL(c.name_normalized,c.name) LIKE ?3
+                   AND c.name LIKE ?3
                   AND (NOT ?4 OR EXISTS (SELECT 1 FROM msgs m WHERE m.chat_id = c.id AND m.state == ?5 AND hidden=0))
                 GROUP BY c.id
                 ORDER BY IFNULL(m.timestamp,c.created_timestamp) DESC, m.id DESC;",
@@ -224,9 +224,8 @@ impl Chatlist {
                let process_rows = |rows: rusqlite::AndThenRows<_>| {
                    rows.filter_map(|row: std::result::Result<(_, _, Params, _), _>| match row {
                        Ok((chat_id, typ, param, msg_id)) => {
-                            if typ == Chattype::InBroadcast
-                                || (typ == Chattype::Mailinglist
-                                    && param.get(Param::ListPost).is_none_or_empty())
+                            if typ == Chattype::Mailinglist
+                                && param.get(Param::ListPost).is_none_or_empty()
                            {
                                None
                            } else {
@@ -397,6 +396,8 @@ impl Chatlist {
            if lastmsg.from_id == ContactId::SELF {
                None
            } else if chat.typ == Chattype::Group
+                || chat.typ == Chattype::OutBroadcast
+                || chat.typ == Chattype::InBroadcast
                || chat.typ == Chattype::Mailinglist
                || chat.is_self_talk()
            {
@@ -470,11 +471,10 @@ mod tests {
    use super::*;
    use crate::chat::save_msgs;
    use crate::chat::{
-        add_contact_to_chat, create_broadcast, create_group, get_chat_contacts,
-        remove_contact_from_chat, send_text_msg, set_chat_name,
+        add_contact_to_chat, create_group, get_chat_contacts, remove_contact_from_chat,
+        send_text_msg,
    };
    use crate::receive_imf::receive_imf;
-    use crate::securejoin::get_securejoin_qr;
    use crate::stock_str::StockMessage;
    use crate::test_utils::TestContext;
    use crate::test_utils::TestContextManager;
@@ -482,7 +482,7 @@ mod tests {
    use std::time::Duration;

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_try_load() -> Result<()> {
+    async fn test_try_load() {
        let mut tcm = TestContextManager::new();
        let bob = &tcm.bob().await;
        let chat_id1 = create_group(bob, "a chat").await.unwrap();
@@ -552,15 +552,6 @@ mod tests {
            .await
            .unwrap();
        assert_eq!(chats.len(), 1);
-
-        let chat_id = create_group(bob, "Δ-chat").await.unwrap();
-        let chats = Chatlist::try_load(bob, 0, Some("δ"), None).await?;
-        assert_eq!(chats.len(), 1);
-        assert_eq!(chats.ids[0].0, chat_id);
-        set_chat_name(bob, chat_id, "abcδe").await?;
-        let chats = Chatlist::try_load(bob, 0, Some("Δ"), None).await?;
-        assert_eq!(chats.len(), 1);
-        Ok(())
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -598,41 +589,6 @@ mod tests {
        assert_eq!(chats.len(), 1);
    }

-    /// Test that DC_CHAT_TYPE_IN_BROADCAST are hidden
-    /// and DC_CHAT_TYPE_OUT_BROADCAST are shown in chatlist for forwarding.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_broadcast_visiblity_on_forward() -> Result<()> {
-        let mut tcm = TestContextManager::new();
-        let alice = &tcm.alice().await;
-        let bob = &tcm.bob().await;
-
-        let alice_broadcast_a_id = create_broadcast(alice, "Channel Alice".to_string()).await?;
-        let qr = get_securejoin_qr(alice, Some(alice_broadcast_a_id))
-            .await
-            .unwrap();
-        let bob_broadcast_a_id = tcm.exec_securejoin_qr(bob, alice, &qr).await;
-        let bob_broadcast_b_id = create_broadcast(bob, "Channel Bob".to_string()).await?;
-
-        let chats = Chatlist::try_load(bob, DC_GCL_FOR_FORWARDING, None, None)
-            .await
-            .unwrap();
-
-        assert!(
-            !chats
-                .iter()
-                .any(|(chat_id, _)| chat_id == &bob_broadcast_a_id),
-            "alice broadcast is not shown in bobs forwarding chatlist"
-        );
-        assert!(
-            chats
-                .iter()
-                .any(|(chat_id, _)| chat_id == &bob_broadcast_b_id),
-            "bobs own broadcast is shown in his forwarding chatlist"
-        );
-
-        Ok(())
-    }
-
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_search_special_chat_names() {
        let t = TestContext::new_alice().await;
@@ -841,32 +797,6 @@ mod tests {
        Ok(())
    }

-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_no_summary_prefix_for_channel() -> Result<()> {
-        let mut tcm = TestContextManager::new();
-        let alice = tcm.alice().await;
-        let bob = tcm.bob().await;
-
-        let alice_chat_id = create_broadcast(&alice, "alice's channel".to_string()).await?;
-        let qr = get_securejoin_qr(&alice, Some(alice_chat_id)).await?;
-        tcm.exec_securejoin_qr(&bob, &alice, &qr).await;
-
-        send_text_msg(&alice, alice_chat_id, "hi".into()).await?;
-        let sent1 = alice.pop_sent_msg().await;
-        let chatlist = Chatlist::try_load(&alice, 0, None, None).await?;
-        let summary = chatlist.get_summary(&alice, 0, None).await?;
-        assert!(summary.prefix.is_none());
-        assert_eq!(summary.text, "hi");
-
-        bob.recv_msg(&sent1).await;
-        let chatlist = Chatlist::try_load(&bob, 0, None, None).await?;
-        let summary = chatlist.get_summary(&bob, 0, None).await?;
-        assert!(summary.prefix.is_none());
-        assert_eq!(summary.text, "hi");
-
-        Ok(())
-    }
-
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_load_broken() {
        let t = TestContext::new_bob().await;
--- a/src/config.rs
+++ b/src/config.rs
@@ -13,14 +13,15 @@ use strum_macros::{AsRefStr, Display, EnumIter, EnumString};
 use tokio::fs;

 use crate::blob::BlobObject;
+use crate::configure::EnteredLoginParam;
 use crate::context::Context;
 use crate::events::EventType;
 use crate::log::LogExt;
 use crate::mimefactory::RECOMMENDED_FILE_SIZE;
-use crate::provider::Provider;
+use crate::provider::{Provider, get_provider_by_id};
 use crate::sync::{self, Sync::*, SyncData};
 use crate::tools::get_abs_path;
-use crate::transport::{ConfiguredLoginParam, add_pseudo_transport, send_sync_transports};
+use crate::transport::ConfiguredLoginParam;
 use crate::{constants, stats};

 /// The available configuration keys.
@@ -143,11 +144,11 @@ pub enum Config {

    /// Send BCC copy to self.
    ///
-    /// Should be enabled for multi-device setups.
+    /// Should be enabled for multidevice setups.
+    /// Default is 0 for chatmail accounts, 1 otherwise.
    ///
    /// This is automatically enabled when importing/exporting a backup,
    /// setting up a second device, or receiving a sync message.
-    #[strum(props(default = "0"))]
    BccSelf,

    /// True if Message Delivery Notifications (read receipts) should
@@ -203,7 +204,7 @@ pub enum Config {
    /// `ProviderOptions::delete_to_trash`.
    DeleteToTrash,

-    /// The primary email address.
+    /// The primary email address. Also see `SecondaryAddrs`.
    ConfiguredAddr,

    /// List of configured IMAP servers as a JSON array.
@@ -305,6 +306,10 @@ pub enum Config {
    /// Meant to help profile owner to differ between profiles with similar names.
    PrivateTag,

+    /// All secondary self addresses separated by spaces
+    /// (`addr1@example.org addr2@example.org addr3@example.org`)
+    SecondaryAddrs,
+
    /// Read-only core version string.
    #[strum(serialize = "sys.version")]
    SysVersion,
@@ -354,17 +359,7 @@ pub enum Config {
    DonationRequestNextCheck,

    /// Defines the max. size (in bytes) of messages downloaded automatically.
-    ///
-    /// For messages with large attachments, two messages are sent:
-    /// a Pre-Message containing metadata and text and a Post-Message additionally
-    /// containing the attachment. NB: Some "extra" metadata like avatars and gossiped
-    /// encryption keys is stripped from post-messages to save traffic.
-    /// Pre-Messages are shown as placeholder messages. They can be downloaded fully using
-    /// `MsgId::download_full()` later. Post-Messages are automatically downloaded if they are
-    /// smaller than the download_limit. Other messages are always auto-downloaded.
-    ///
    /// 0 = no limit.
-    /// Changes only affect future messages.
    #[strum(props(default = "0"))]
    DownloadLimit,

@@ -443,29 +438,8 @@ pub enum Config {
    /// storing the same token multiple times on the server.
    EncryptedDeviceToken,

-    /// Enables running test hooks, e.g. see `InnerContext::pre_encrypt_mime_hook`.
-    /// This way is better than conditional compilation, i.e. `#[cfg(test)]`, because tests not
-    /// using this still run unmodified code.
-    TestHooks,
-
-    /// Return an error from `receive_imf_inner()`. For tests.
-    SimulateReceiveImfError,
-
-    /// Enable composing emails with Header Protection as defined in
-    /// <https://www.rfc-editor.org/rfc/rfc9788.html> "Header Protection for Cryptographically
-    /// Protected Email".
-    #[strum(props(default = "1"))]
-    StdHeaderProtectionComposing,
-
-    /// Who can call me.
-    ///
-    /// The options are from the `WhoCanCallMe` enum.
-    #[strum(props(default = "1"))]
-    WhoCanCallMe,
-
-    /// Experimental option denoting that the current profile is shared between multiple team members.
-    /// For now, the only effect of this option is that seen flags are not synchronized.
-    TeamProfile,
+    /// Return an error from `receive_imf_inner()` for a fully downloaded message. For tests.
+    FailOnReceivingFullMsg,
 }

 impl Config {
@@ -492,10 +466,7 @@ impl Config {

    /// Whether the config option needs an IO scheduler restart to take effect.
    pub(crate) fn needs_io_restart(&self) -> bool {
-        matches!(
-            self,
-            Config::MvboxMove | Config::OnlyFetchMvbox | Config::ConfiguredAddr
-        )
+        matches!(self, Config::MvboxMove | Config::OnlyFetchMvbox)
    }
 }

@@ -524,7 +495,7 @@ impl Context {
                        .into_owned()
                })
            }
-            Config::SysVersion => Some(constants::DC_VERSION_STR.to_string()),
+            Config::SysVersion => Some((*constants::DC_VERSION_STR).clone()),
            Config::SysMsgsizeMaxRecommended => Some(format!("{RECOMMENDED_FILE_SIZE}")),
            Config::SysConfigKeys => Some(get_config_keys_string()),
            _ => self.sql.get_raw_config(key.as_ref()).await?,
@@ -541,6 +512,10 @@ impl Context {

        // Default values
        let val = match key {
+            Config::BccSelf => match Box::pin(self.is_chatmail()).await? {
+                false => Some("1".to_string()),
+                true => Some("0".to_string()),
+            },
            Config::ConfiguredInboxFolder => Some("INBOX".to_string()),
            Config::DeleteServerAfter => {
                match !Box::pin(self.get_config_bool(Config::BccSelf)).await?
@@ -625,6 +600,12 @@ impl Context {
            && !self.get_config_bool(Config::Bot).await?)
    }

+    /// Returns whether sync messages should be uploaded to the mvbox.
+    pub(crate) async fn should_move_sync_msgs(&self) -> Result<bool> {
+        Ok(self.get_config_bool(Config::MvboxMove).await?
+            || !self.get_config_bool(Config::IsChatmail).await?)
+    }
+
    /// Returns whether MDNs should be requested.
    pub(crate) async fn should_request_mdns(&self) -> Result<bool> {
        match self.get_config_bool_opt(Config::MdnsEnabled).await? {
@@ -655,14 +636,15 @@ impl Context {
        Ok(val)
    }

-    /// Gets the configured provider.
+    /// Gets the configured provider, as saved in the `configured_provider` value.
    ///
-    /// The provider is determined by the current primary transport.
+    /// The provider is determined by `get_provider_info()` during configuration and then saved
+    /// to the db in `param.save_to_database()`, together with all the other `configured_*` values.
    pub async fn get_configured_provider(&self) -> Result<Option<&'static Provider>> {
-        let provider = ConfiguredLoginParam::load(self)
-            .await?
-            .and_then(|(_transport_id, param)| param.provider);
-        Ok(provider)
+        if let Some(cfg) = self.get_config(Config::ConfiguredProvider).await? {
+            return Ok(get_provider_by_id(&cfg));
+        }
+        Ok(None)
    }

    /// Gets configured "delete_device_after" value.
@@ -683,7 +665,7 @@ impl Context {
            Config::Selfavatar if value.is_empty() => None,
            Config::Selfavatar => {
                config_value = BlobObject::store_from_base64(self, value)?;
-                config_value.as_deref()
+                Some(config_value.as_str())
            }
            _ => Some(value),
        };
@@ -724,16 +706,6 @@ impl Context {
    pub async fn set_config(&self, key: Config, value: Option<&str>) -> Result<()> {
        Self::check_config(key, value)?;

-        let n_transports = self.count_transports().await?;
-        if n_transports > 1
-            && matches!(
-                key,
-                Config::MvboxMove | Config::OnlyFetchMvbox | Config::ShowEmails
-            )
-        {
-            bail!("Cannot reconfigure {key} when multiple transports are configured");
-        }
-
        let _pause = match key.needs_io_restart() {
            true => self.scheduler.pause(self).await?,
            _ => Default::default(),
@@ -819,51 +791,19 @@ impl Context {
                    .await?;
            }
            Config::ConfiguredAddr => {
-                let Some(addr) = value else {
-                    bail!("Cannot unset configured_addr");
-                };
-
-                if !self.is_configured().await? {
+                if self.is_configured().await? {
+                    bail!("Cannot change ConfiguredAddr");
+                }
+                if let Some(addr) = value {
                    info!(
                        self,
                        "Creating a pseudo configured account which will not be able to send or receive messages. Only meant for tests!"
                    );
-                    add_pseudo_transport(self, addr).await?;
-                    self.sql
-                        .set_raw_config(Config::ConfiguredAddr.as_ref(), Some(addr))
-                        .await?;
-                } else {
-                    self.sql
-                        .transaction(|transaction| {
-                            if transaction.query_row(
-                                "SELECT COUNT(*) FROM transports WHERE addr=?",
-                                (addr,),
-                                |row| {
-                                    let res: i64 = row.get(0)?;
-                                    Ok(res)
-                                },
-                            )? == 0
-                            {
-                                bail!("Address does not belong to any transport.");
-                            }
-                            transaction.execute(
-                                "UPDATE config SET value=? WHERE keyname='configured_addr'",
-                                (addr,),
-                            )?;
-
-                            // Clean up SMTP and IMAP APPEND queue.
-                            //
-                            // The messages in the queue have a different
-                            // From address so we cannot send them over
-                            // the new SMTP transport.
-                            transaction.execute("DELETE FROM smtp", ())?;
-                            transaction.execute("DELETE FROM imap_send", ())?;
-
-                            Ok(())
-                        })
-                        .await?;
-                    send_sync_transports(self).await?;
-                    self.sql.uncache_raw_config("configured_addr").await;
+                    ConfiguredLoginParam::from_json(&format!(
+                        r#"{{"addr":"{addr}","imap":[],"imap_user":"","imap_password":"","smtp":[],"smtp_user":"","smtp_password":"","certificate_checks":"Automatic","oauth2":false}}"#
+                    ))?
+                    .save_to_transports_table(self, &EnteredLoginParam::default())
+                    .await?;
                }
            }
            _ => {
@@ -894,7 +834,7 @@ impl Context {
        {
            return Ok(());
        }
-        self.scheduler.interrupt_smtp().await;
+        self.scheduler.interrupt_inbox().await;
        Ok(())
    }

@@ -958,7 +898,17 @@ impl Context {
    /// This should only be used by test code and during configure.
    #[cfg(test)] // AEAP is disabled, but there are still tests for it
    pub(crate) async fn set_primary_self_addr(&self, primary_new: &str) -> Result<()> {
-        self.quota.write().await.clear();
+        self.quota.write().await.take();
+
+        // add old primary address (if exists) to secondary addresses
+        let mut secondary_addrs = self.get_all_self_addrs().await?;
+        // never store a primary address also as a secondary
+        secondary_addrs.retain(|a| !addr_cmp(a, primary_new));
+        self.set_config_internal(
+            Config::SecondaryAddrs,
+            Some(secondary_addrs.join(" ").as_str()),
+        )
+        .await?;

        self.sql
            .set_raw_config(Config::ConfiguredAddr.as_ref(), Some(primary_new))
@@ -967,7 +917,7 @@ impl Context {
        Ok(())
    }

-    /// Returns the primary self address followed by all secondary ones.
+    /// Returns all primary and secondary self addresses.
    pub(crate) async fn get_all_self_addrs(&self) -> Result<Vec<String>> {
        let primary_addrs = self.get_config(Config::ConfiguredAddr).await?.into_iter();
        let secondary_addrs = self.get_secondary_self_addrs().await?.into_iter();
@@ -977,10 +927,14 @@ impl Context {

    /// Returns all secondary self addresses.
    pub(crate) async fn get_secondary_self_addrs(&self) -> Result<Vec<String>> {
-        self.sql.query_map_vec("SELECT addr FROM transports WHERE addr NOT IN (SELECT value FROM config WHERE keyname='configured_addr')", (), |row| {
-            let addr: String = row.get(0)?;
-            Ok(addr)
-        }).await
+        let secondary_addrs = self
+            .get_config(Config::SecondaryAddrs)
+            .await?
+            .unwrap_or_default();
+        Ok(secondary_addrs
+            .split_ascii_whitespace()
+            .map(|s| s.to_string())
+            .collect())
    }

    /// Returns the primary self address.
@@ -1003,18 +957,5 @@ fn get_config_keys_string() -> String {
    format!(" {keys} ")
 }

-/// Returns all `ui.*` config keys that were set by the UI.
-pub async fn get_all_ui_config_keys(context: &Context) -> Result<Vec<String>> {
-    let ui_keys = context
-        .sql
-        .query_map_vec(
-            "SELECT keyname FROM config WHERE keyname GLOB 'ui.*' ORDER BY config.id",
-            (),
-            |row| Ok(row.get::<_, String>(0)?),
-        )
-        .await?;
-    Ok(ui_keys)
-}
-
 #[cfg(test)]
 mod config_tests;
--- a/src/config/config_tests.rs
+++ b/src/config/config_tests.rs
@@ -81,37 +81,6 @@ async fn test_ui_config() -> Result<()> {
    Ok(())
 }

-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_get_all_ui_config_keys() -> Result<()> {
-    let t = TestContext::new().await;
-
-    t.set_ui_config("ui.android.screen_security", Some("safe"))
-        .await?;
-    t.set_ui_config("ui.lastchatid", Some("231")).await?;
-    t.set_ui_config(
-        "ui.desktop.webxdcBounds.528490",
-        Some(r#"{"x":954,"y":356,"width":378,"height":671}"#),
-    )
-    .await?;
-    t.set_ui_config(
-        "ui.desktop.webxdcBounds.556543",
-        Some(r#"{"x":954,"y":356,"width":378,"height":671}"#),
-    )
-    .await?;
-
-    assert_eq!(
-        get_all_ui_config_keys(&t).await?,
-        vec![
-            "ui.android.screen_security",
-            "ui.lastchatid",
-            "ui.desktop.webxdcBounds.528490",
-            "ui.desktop.webxdcBounds.556543"
-        ]
-    );
-
-    Ok(())
-}
-
 /// Regression test for https://github.com/deltachat/deltachat-core-rust/issues/3012
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_set_config_bool() -> Result<()> {
@@ -125,6 +94,59 @@ async fn test_set_config_bool() -> Result<()> {
    Ok(())
 }

+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_self_addrs() -> Result<()> {
+    let alice = TestContext::new_alice().await;
+
+    assert!(alice.is_self_addr("alice@example.org").await?);
+    assert_eq!(alice.get_all_self_addrs().await?, vec!["alice@example.org"]);
+    assert!(!alice.is_self_addr("alice@alice.com").await?);
+
+    // Test adding the same primary address
+    alice.set_primary_self_addr("alice@example.org").await?;
+    alice.set_primary_self_addr("Alice@Example.Org").await?;
+    assert_eq!(alice.get_all_self_addrs().await?, vec!["Alice@Example.Org"]);
+
+    // Test adding a new (primary) self address
+    // The address is trimmed during configure by `LoginParam::from_database()`,
+    // so `set_primary_self_addr()` doesn't have to trim it.
+    alice.set_primary_self_addr("Alice@alice.com").await?;
+    assert!(alice.is_self_addr("aliCe@example.org").await?);
+    assert!(alice.is_self_addr("alice@alice.com").await?);
+    assert_eq!(
+        alice.get_all_self_addrs().await?,
+        vec!["Alice@alice.com", "Alice@Example.Org"]
+    );
+
+    // Check that the entry is not duplicated
+    alice.set_primary_self_addr("alice@alice.com").await?;
+    alice.set_primary_self_addr("alice@alice.com").await?;
+    assert_eq!(
+        alice.get_all_self_addrs().await?,
+        vec!["alice@alice.com", "Alice@Example.Org"]
+    );
+
+    // Test switching back
+    alice.set_primary_self_addr("alice@example.org").await?;
+    assert_eq!(
+        alice.get_all_self_addrs().await?,
+        vec!["alice@example.org", "alice@alice.com"]
+    );
+
+    // Test setting a new primary self address, the previous self address
+    // should be kept as a secondary self address
+    alice.set_primary_self_addr("alice@alice.xyz").await?;
+    assert_eq!(
+        alice.get_all_self_addrs().await?,
+        vec!["alice@alice.xyz", "alice@example.org", "alice@alice.com"]
+    );
+    assert!(alice.is_self_addr("alice@example.org").await?);
+    assert!(alice.is_self_addr("alice@alice.com").await?);
+    assert!(alice.is_self_addr("Alice@alice.xyz").await?);
+
+    Ok(())
+}
+
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_mdns_default_behaviour() -> Result<()> {
    let t = &TestContext::new_alice().await;
@@ -256,6 +278,7 @@ async fn test_sync() -> Result<()> {
    Ok(())
 }

+/// Sync message mustn't be sent if self-{status,avatar} is changed by a self-sent message.
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_no_sync_on_self_sent_msg() -> Result<()> {
    let mut tcm = TestContextManager::new();
@@ -265,16 +288,16 @@ async fn test_no_sync_on_self_sent_msg() -> Result<()> {
        a.set_config_bool(Config::SyncMsgs, true).await?;
    }

-    let status = "Sent via usual message";
+    let status = "Synced via usual message";
    alice0.set_config(Config::Selfstatus, Some(status)).await?;
    alice0.send_sync_msg().await?;
-    alice0.pop_sent_msg().await;
+    alice0.pop_sent_sync_msg().await;
    let status1 = "Synced via sync message";
    alice1.set_config(Config::Selfstatus, Some(status1)).await?;
    tcm.send_recv(alice0, alice1, "hi Alice!").await;
    assert_eq!(
        alice1.get_config(Config::Selfstatus).await?,
-        Some(status1.to_string())
+        Some(status.to_string())
    );
    sync(alice1, alice0).await;
    assert_eq!(
@@ -292,7 +315,7 @@ async fn test_no_sync_on_self_sent_msg() -> Result<()> {
        .set_config(Config::Selfavatar, Some(file.to_str().unwrap()))
        .await?;
    alice0.send_sync_msg().await?;
-    alice0.pop_sent_msg().await;
+    alice0.pop_sent_sync_msg().await;
    let file = alice1.dir.path().join("avatar.jpg");
    let bytes = include_bytes!("../../test-data/image/avatar1000x1000.jpg");
    tokio::fs::write(&file, bytes).await?;
@@ -305,7 +328,7 @@ async fn test_no_sync_on_self_sent_msg() -> Result<()> {
        alice1
            .get_config(Config::Selfavatar)
            .await?
-            .filter(|path| path.ends_with(".jpg"))
+            .filter(|path| path.ends_with(".png"))
            .is_some()
    );
    sync(alice1, alice0).await;
--- a/src/configure.rs
+++ b/src/configure.rs
@@ -27,7 +27,7 @@ use crate::config::{self, Config};
 use crate::constants::NON_ALPHANUMERIC_WITHOUT_DOT;
 use crate::context::Context;
 use crate::imap::Imap;
-use crate::log::warn;
+use crate::log::{LogExt, warn};
 use crate::login_param::EnteredCertificateChecks;
 pub use crate::login_param::EnteredLoginParam;
 use crate::message::Message;
@@ -40,14 +40,11 @@ use crate::sync::Sync::*;
 use crate::tools::time;
 use crate::transport::{
    ConfiguredCertificateChecks, ConfiguredLoginParam, ConfiguredServerLoginParam,
-    ConnectionCandidate, send_sync_transports,
+    ConnectionCandidate,
 };
 use crate::{EventType, stock_str};
 use crate::{chat, provider};
-
-/// Maximum number of relays
-/// see <https://github.com/chatmail/core/issues/7608>
-pub(crate) const MAX_TRANSPORT_RELAYS: usize = 5;
+use deltachat_contact_tools::addr_cmp;

 macro_rules! progress {
    ($context:tt, $progress:expr, $comment:expr) => {
@@ -133,6 +130,12 @@ impl Context {
            "cannot configure, database not opened."
        );
        param.addr = addr_normalize(&param.addr);
+        let old_addr = self.get_config(Config::ConfiguredAddr).await?;
+        if self.is_configured().await? && !addr_cmp(&old_addr.unwrap_or_default(), &param.addr) {
+            let error_msg = "Changing your email address is not supported right now. Check back in a few months!";
+            progress!(self, 0, Some(error_msg.to_string()));
+            bail!(error_msg);
+        }
        let cancel_channel = self.alloc_ongoing().await?;

        let res = self
@@ -201,129 +204,23 @@ impl Context {
        Ok(transports)
    }

-    /// Returns the number of configured transports.
-    pub async fn count_transports(&self) -> Result<usize> {
-        self.sql.count("SELECT COUNT(*) FROM transports", ()).await
-    }
-
    /// Removes the transport with the specified email address
    /// (i.e. [EnteredLoginParam::addr]).
-    pub async fn delete_transport(&self, addr: &str) -> Result<()> {
-        let now = time();
-        let removed_transport_id = self
-            .sql
-            .transaction(|transaction| {
-                let primary_addr = transaction.query_row(
-                    "SELECT value FROM config WHERE keyname='configured_addr'",
-                    (),
-                    |row| {
-                        let addr: String = row.get(0)?;
-                        Ok(addr)
-                    },
-                )?;
-
-                if primary_addr == addr {
-                    bail!("Cannot delete primary transport");
-                }
-                let (transport_id, add_timestamp) = transaction.query_row(
-                    "DELETE FROM transports WHERE addr=? RETURNING id, add_timestamp",
-                    (addr,),
-                    |row| {
-                        let id: u32 = row.get(0)?;
-                        let add_timestamp: i64 = row.get(1)?;
-                        Ok((id, add_timestamp))
-                    },
-                )?;
-                transaction.execute("DELETE FROM imap WHERE transport_id=?", (transport_id,))?;
-                transaction.execute(
-                    "DELETE FROM imap_sync WHERE transport_id=?",
-                    (transport_id,),
-                )?;
-
-                // Removal timestamp should not be lower than addition timestamp
-                // to be accepted by other devices when synced.
-                let remove_timestamp = std::cmp::max(now, add_timestamp);
-
-                transaction.execute(
-                    "INSERT INTO removed_transports (addr, remove_timestamp)
-                     VALUES (?, ?)
-                     ON CONFLICT (addr)
-                     DO UPDATE SET remove_timestamp = excluded.remove_timestamp",
-                    (addr, remove_timestamp),
-                )?;
-
-                Ok(transport_id)
-            })
-            .await?;
-        send_sync_transports(self).await?;
-        self.quota.write().await.remove(&removed_transport_id);
-
-        Ok(())
+    #[expect(clippy::unused_async)]
+    pub async fn delete_transport(&self, _addr: &str) -> Result<()> {
+        bail!(
+            "Adding and removing additional transports is not supported yet. Check back in a few months!"
+        )
    }

    async fn inner_configure(&self, param: &EnteredLoginParam) -> Result<()> {
        info!(self, "Configure ...");

        let old_addr = self.get_config(Config::ConfiguredAddr).await?;
-        if old_addr.is_some()
-            && !self
-                .sql
-                .exists(
-                    "SELECT COUNT(*) FROM transports WHERE addr=?",
-                    (&param.addr,),
-                )
-                .await?
-        {
-            // Should be checked before `MvboxMove` because the latter makes no sense in presense of
-            // `OnlyFetchMvbox` and even grayed out in the UIs in this case.
-            if self.get_config(Config::OnlyFetchMvbox).await?.as_deref() != Some("0") {
-                bail!(
-                    "To use additional relays, disable the legacy option \"Settings / Advanced / Only Fetch from DeltaChat Folder\"."
-                );
-            }
-            if self.get_config(Config::MvboxMove).await?.as_deref() != Some("0") {
-                bail!(
-                    "To use additional relays, disable the legacy option \"Settings / Advanced / Move automatically to DeltaChat Folder\"."
-                );
-            }
-            if self.get_config(Config::ShowEmails).await?.as_deref() != Some("2") {
-                bail!(
-                    "To use additional relays, set the legacy option \"Settings / Advanced / Show Classic Emails\" to \"All\"."
-                );
-            }
-
-            if self
-                .sql
-                .count("SELECT COUNT(*) FROM transports", ())
-                .await?
-                >= MAX_TRANSPORT_RELAYS
-            {
-                bail!(
-                    "You have reached the maximum number of relays ({}).",
-                    MAX_TRANSPORT_RELAYS
-                )
-            }
-        }
-
-        let provider = match configure(self, param).await {
-            Err(error) => {
-                // Log entered and actual params
-                let configured_param = get_configured_param(self, param).await;
-                warn!(
-                    self,
-                    "configure failed: Entered params: {}. Used params: {}. Error: {error}.",
-                    param.to_string(),
-                    configured_param
-                        .map(|param| param.to_string())
-                        .unwrap_or("error".to_owned())
-                );
-                return Err(error);
-            }
-            Ok(provider) => provider,
-        };
+        let provider = configure(self, param).await?;
        self.set_config_internal(Config::NotifyAboutWrongPw, Some("1"))
            .await?;
-        on_configure_completed(self, provider).await?;
+        on_configure_completed(self, provider, old_addr).await?;
        Ok(())
    }
 }
@@ -331,6 +228,7 @@ impl Context {
 async fn on_configure_completed(
    context: &Context,
    provider: Option<&'static Provider>,
+    old_addr: Option<String>,
 ) -> Result<()> {
    if let Some(provider) = provider {
        if let Some(config_defaults) = provider.config_defaults {
@@ -360,6 +258,21 @@ async fn on_configure_completed(
        }
    }

+    if let Some(new_addr) = context.get_config(Config::ConfiguredAddr).await? {
+        if let Some(old_addr) = old_addr {
+            if !addr_cmp(&new_addr, &old_addr) {
+                let mut msg = Message::new_text(
+                    stock_str::aeap_explanation_and_link(context, &old_addr, &new_addr).await,
+                );
+                chat::add_device_msg(context, None, Some(&mut msg))
+                    .await
+                    .context("Cannot add AEAP explanation")
+                    .log_err(context)
+                    .ok();
+            }
+        }
+    }
+
    Ok(())
 }

@@ -591,40 +504,71 @@ async fn configure(ctx: &Context, param: &EnteredLoginParam) -> Result<Option<&'

    // Configure IMAP

-    let transport_id = 0;
    let (_s, r) = async_channel::bounded(1);
-    let mut imap = Imap::new(ctx, transport_id, configured_param.clone(), r).await?;
+    let mut imap = Imap::new(
+        configured_param.imap.clone(),
+        configured_param.imap_password.clone(),
+        proxy_config,
+        &configured_param.addr,
+        strict_tls,
+        configured_param.oauth2,
+        r,
+    );
    let configuring = true;
-    if let Err(err) = imap.connect(ctx, configuring).await {
-        bail!(
+    let mut imap_session = match imap.connect(ctx, configuring).await {
+        Ok(session) => session,
+        Err(err) => bail!(
            "{}",
            nicer_configuration_error(ctx, format!("{err:#}")).await
-        );
+        ),
    };

    progress!(ctx, 850);

    // Wait for SMTP configuration
-    smtp_config_task.await??;
+    smtp_config_task.await.unwrap()?;

    progress!(ctx, 900);

-    let is_configured = ctx.is_configured().await?;
-    if !is_configured {
-        ctx.sql.set_raw_config("mvbox_move", Some("0")).await?;
-        ctx.sql.set_raw_config("only_fetch_mvbox", None).await?;
+    let is_chatmail = match ctx.get_config_bool(Config::FixIsChatmail).await? {
+        false => {
+            let is_chatmail = imap_session.is_chatmail();
+            ctx.set_config(
+                Config::IsChatmail,
+                Some(match is_chatmail {
+                    false => "0",
+                    true => "1",
+                }),
+            )
+            .await?;
+            is_chatmail
+        }
+        true => ctx.get_config_bool(Config::IsChatmail).await?,
+    };
+    if is_chatmail {
+        ctx.set_config(Config::MvboxMove, Some("0")).await?;
+        ctx.set_config(Config::OnlyFetchMvbox, None).await?;
+        ctx.set_config(Config::ShowEmails, None).await?;
    }

+    let create_mvbox = !is_chatmail;
+    imap.configure_folders(ctx, &mut imap_session, create_mvbox)
+        .await?;
+
+    let create = true;
+    imap_session
+        .select_with_uidvalidity(ctx, "INBOX", create)
+        .await
+        .context("could not read INBOX status")?;
+
    drop(imap);

    progress!(ctx, 910);

    let provider = configured_param.provider;
    configured_param
-        .clone()
-        .save_to_transports_table(ctx, param, time())
+        .save_to_transports_table(ctx, param)
        .await?;
-    send_sync_transports(ctx).await?;

    ctx.set_config_internal(Config::ConfiguredTimestamp, Some(&time().to_string()))
        .await?;
--- a/src/configure/auto_mozilla.rs
+++ b/src/configure/auto_mozilla.rs
@@ -154,10 +154,10 @@ fn parse_xml_reader<B: BufRead>(
                    if let Some(incoming_server) = parse_server(reader, event)? {
                        incoming_servers.push(incoming_server);
                    }
-                } else if tag == "outgoingserver"
-                    && let Some(outgoing_server) = parse_server(reader, event)?
-                {
-                    outgoing_servers.push(outgoing_server);
+                } else if tag == "outgoingserver" {
+                    if let Some(outgoing_server) = parse_server(reader, event)? {
+                        outgoing_servers.push(outgoing_server);
+                    }
                }
            }
            Event::Eof => break,
--- a/src/constants.rs
+++ b/src/constants.rs
@@ -2,13 +2,16 @@

 #![allow(missing_docs)]

+use std::sync::LazyLock;
+
 use deltachat_derive::{FromSql, ToSql};
 use percent_encoding::{AsciiSet, NON_ALPHANUMERIC};
 use serde::{Deserialize, Serialize};

 use crate::chat::ChatId;

-pub static DC_VERSION_STR: &str = env!("CARGO_PKG_VERSION");
+pub static DC_VERSION_STR: LazyLock<String> =
+    LazyLock::new(|| env!("CARGO_PKG_VERSION").to_string());

 /// Set of characters to percent-encode in email addresses and names.
 pub(crate) const NON_ALPHANUMERIC_WITHOUT_DOT: &AsciiSet = &NON_ALPHANUMERIC.remove(b'.');
@@ -220,9 +223,6 @@ pub(crate) const DC_FOLDERS_CONFIGURED_VERSION: i32 = 5;
 // `max_smtp_rcpt_to` in the provider db.
 pub(crate) const DEFAULT_MAX_SMTP_RCPT_TO: usize = 50;

-/// Same as `DEFAULT_MAX_SMTP_RCPT_TO`, but for chatmail relays.
-pub(crate) const DEFAULT_CHATMAIL_MAX_SMTP_RCPT_TO: usize = 999;
-
 /// How far the last quota check needs to be in the past to be checked by the background function (in seconds).
 pub(crate) const DC_BACKGROUND_FETCH_QUOTA_CHECK_RATELIMIT: u64 = 12 * 60 * 60; // 12 hours

--- a/src/contact.rs
+++ b/src/contact.rs
@@ -36,7 +36,7 @@ use crate::message::MessageState;
 use crate::mimeparser::AvatarAction;
 use crate::param::{Param, Params};
 use crate::sync::{self, Sync::*};
-use crate::tools::{SystemTime, duration_to_str, get_abs_path, normalize_text, time, to_lowercase};
+use crate::tools::{SystemTime, duration_to_str, get_abs_path, time, to_lowercase};
 use crate::{chat, chatlist_events, ensure_and_debug_assert_ne, stock_str};

 /// Time during which a contact is considered as seen recently.
@@ -115,23 +115,9 @@ impl ContactId {
        let row = context
            .sql
            .transaction(|transaction| {
-                let authname;
-                let name_or_authname = if !name.is_empty() {
-                    name
-                } else {
-                    authname = transaction.query_row(
-                        "SELECT authname FROM contacts WHERE id=?",
-                        (self,),
-                        |row| {
-                            let authname: String = row.get(0)?;
-                            Ok(authname)
-                        },
-                    )?;
-                    &authname
-                };
                let is_changed = transaction.execute(
-                    "UPDATE contacts SET name=?1, name_normalized=?2 WHERE id=?3 AND name!=?1",
-                    (name, normalize_text(name_or_authname), self),
+                    "UPDATE contacts SET name=?1 WHERE id=?2 AND name!=?1",
+                    (name, self),
                )? > 0;
                if is_changed {
                    update_chat_names(context, transaction, self)?;
@@ -144,37 +130,35 @@ impl ContactId {
                            Ok((addr, fingerprint))
                        },
                    )?;
+                    context.emit_event(EventType::ContactsChanged(Some(self)));
                    Ok(Some((addr, fingerprint)))
                } else {
                    Ok(None)
                }
            })
            .await?;
-        if row.is_some() {
-            context.emit_event(EventType::ContactsChanged(Some(self)));
-        }

-        if sync.into()
-            && let Some((addr, fingerprint)) = row
-        {
-            if fingerprint.is_empty() {
-                chat::sync(
-                    context,
-                    chat::SyncId::ContactAddr(addr),
-                    chat::SyncAction::Rename(name.to_string()),
-                )
-                .await
-                .log_err(context)
-                .ok();
-            } else {
-                chat::sync(
-                    context,
-                    chat::SyncId::ContactFingerprint(fingerprint),
-                    chat::SyncAction::Rename(name.to_string()),
-                )
-                .await
-                .log_err(context)
-                .ok();
+        if sync.into() {
+            if let Some((addr, fingerprint)) = row {
+                if fingerprint.is_empty() {
+                    chat::sync(
+                        context,
+                        chat::SyncId::ContactAddr(addr),
+                        chat::SyncAction::Rename(name.to_string()),
+                    )
+                    .await
+                    .log_err(context)
+                    .ok();
+                } else {
+                    chat::sync(
+                        context,
+                        chat::SyncId::ContactFingerprint(fingerprint),
+                        chat::SyncAction::Rename(name.to_string()),
+                    )
+                    .await
+                    .log_err(context)
+                    .ok();
+                }
            }
        }
        Ok(())
@@ -385,33 +369,38 @@ async fn import_vcard_contact(context: &Context, contact: &VcardContact) -> Resu
        return Ok(id);
    }
    let path = match &contact.profile_image {
-        Some(image) => match BlobObject::store_from_base64(context, image)? {
-            None => {
+        Some(image) => match BlobObject::store_from_base64(context, image) {
+            Err(e) => {
                warn!(
                    context,
-                    "import_vcard_contact: Could not decode avatar for {}.", contact.addr
+                    "import_vcard_contact: Could not decode and save avatar for {}: {e:#}.",
+                    contact.addr
                );
                None
            }
-            Some(path) => Some(path),
+            Ok(path) => Some(path),
        },
        None => None,
    };
-    if let Some(path) = path
-        && let Err(e) = set_profile_image(context, id, &AvatarAction::Change(path)).await
-    {
-        warn!(
-            context,
-            "import_vcard_contact: Could not set avatar for {}: {e:#}.", contact.addr
-        );
+    if let Some(path) = path {
+        // Currently this value doesn't matter as we don't import the contact of self.
+        let was_encrypted = false;
+        if let Err(e) =
+            set_profile_image(context, id, &AvatarAction::Change(path), was_encrypted).await
+        {
+            warn!(
+                context,
+                "import_vcard_contact: Could not set avatar for {}: {e:#}.", contact.addr
+            );
+        }
    }
-    if let Some(biography) = &contact.biography
-        && let Err(e) = set_status(context, id, biography.to_owned()).await
-    {
-        warn!(
-            context,
-            "import_vcard_contact: Could not set biography for {}: {e:#}.", contact.addr
-        );
+    if let Some(biography) = &contact.biography {
+        if let Err(e) = set_status(context, id, biography.to_owned(), false, false).await {
+            warn!(
+                context,
+                "import_vcard_contact: Could not set biography for {}: {e:#}.", contact.addr
+            );
+        }
    }
    Ok(id)
 }
@@ -981,22 +970,11 @@ impl Contact {
                        } else {
                            row_name
                        };
-                        let new_authname = if update_authname {
-                            name.to_string()
-                        } else {
-                            row_authname
-                        };

                        transaction.execute(
-                            "UPDATE contacts SET name=?, name_normalized=?, addr=?, origin=?, authname=? WHERE id=?",
+                            "UPDATE contacts SET name=?, addr=?, origin=?, authname=? WHERE id=?;",
                            (
-                                &new_name,
-                                normalize_text(
-                                    if !new_name.is_empty() {
-                                        &new_name
-                                    } else {
-                                        &new_authname
-                                    }),
+                                new_name,
                                if update_addr {
                                    addr.to_string()
                                } else {
@@ -1007,7 +985,11 @@ impl Contact {
                                } else {
                                    row_origin
                                },
-                                &new_authname,
+                                if update_authname {
+                                    name.to_string()
+                                } else {
+                                    row_authname
+                                },
                                row_id,
                            ),
                        )?;
@@ -1019,18 +1001,18 @@ impl Contact {
                        sth_modified = Modifier::Modified;
                    }
                } else {
+                    let update_name = manual;
+                    let update_authname = !manual;
+
                    transaction.execute(
-                        "
-INSERT INTO contacts (name, name_normalized, addr, fingerprint, origin, authname)
-VALUES (?, ?, ?, ?, ?, ?)
-                        ",
+                        "INSERT INTO contacts (name, addr, fingerprint, origin, authname)
+                         VALUES (?, ?, ?, ?, ?);",
                        (
-                            if manual { &name } else { "" },
-                            normalize_text(&name),
+                            if update_name { &name } else { "" },
                            &addr,
                            fingerprint,
                            origin,
-                            if manual { "" } else { &name },
+                            if update_authname { &name } else { "" },
                        ),
                    )?;

@@ -1133,27 +1115,23 @@ VALUES (?, ?, ?, ?, ?, ?)
            Origin::IncomingReplyTo
        };
        if query.is_some() {
-            let query_lowercased = query.unwrap_or("").to_lowercase();
-            let s3str_like_cmd = format!("%{}%", query_lowercased);
+            let s3str_like_cmd = format!("%{}%", query.unwrap_or(""));
            context
                .sql
                .query_map(
-                    "
-SELECT c.id, c.addr FROM contacts c
-WHERE c.id>?
-    AND (c.fingerprint='')=?
-    AND c.origin>=?
-    AND c.blocked=0
-    AND (IFNULL(c.name_normalized,IIF(c.name='',c.authname,c.name)) LIKE ? OR c.addr LIKE ?)
-ORDER BY c.origin>=? DESC, c.last_seen DESC, c.id DESC
-                    ",
+                    "SELECT c.id, c.addr FROM contacts c
+                 WHERE c.id>?
+                 AND (c.fingerprint='')=?
+                 AND c.origin>=? \
+                 AND c.blocked=0 \
+                 AND (iif(c.name='',c.authname,c.name) LIKE ? OR c.addr LIKE ?) \
+                 ORDER BY c.last_seen DESC, c.id DESC;",
                    (
                        ContactId::LAST_SPECIAL,
                        flag_address,
                        minimal_origin,
                        &s3str_like_cmd,
-                        &query_lowercased,
-                        Origin::CreateChat,
+                        &s3str_like_cmd,
                    ),
                    |row| {
                        let id: ContactId = row.get(0)?;
@@ -1203,13 +1181,8 @@ ORDER BY c.origin>=? DESC, c.last_seen DESC, c.id DESC
                 AND (fingerprint='')=?
                 AND origin>=?
                 AND blocked=0
-                 ORDER BY origin>=? DESC, last_seen DESC, id DESC",
-                    (
-                        ContactId::LAST_SPECIAL,
-                        flag_address,
-                        minimal_origin,
-                        Origin::CreateChat,
-                    ),
+                 ORDER BY last_seen DESC, id DESC;",
+                    (ContactId::LAST_SPECIAL, flag_address, minimal_origin),
                    |row| {
                        let id: ContactId = row.get(0)?;
                        let addr: String = row.get(1)?;
@@ -1279,18 +1252,8 @@ ORDER BY c.origin>=? DESC, c.last_seen DESC, c.id DESC
                    };
                    // Always do an update in case the blocking is reset or name is changed.
                    transaction.execute(
-                        "
-UPDATE contacts
-SET name=?, name_normalized=IIF(?1='',name_normalized,?), origin=?, blocked=1, fingerprint=?
-WHERE addr=?
-                        ",
-                        (
-                            &name,
-                            normalize_text(&name),
-                            Origin::MailinglistAddress,
-                            fingerprint,
-                            &grpid,
-                        ),
+                        "UPDATE contacts SET name=?, origin=?, blocked=1, fingerprint=? WHERE addr=?",
+                        (&name, Origin::MailinglistAddress, fingerprint, &grpid),
                    )?;
                }
                Ok(())
@@ -1545,6 +1508,18 @@ WHERE addr=?
        &self.addr
    }

+    /// Get authorized name or address.
+    ///
+    /// This string is suitable for sending over email
+    /// as it does not leak the locally set name.
+    pub(crate) fn get_authname_or_addr(&self) -> String {
+        if !self.authname.is_empty() {
+            (&self.authname).into()
+        } else {
+            (&self.addr).into()
+        }
+    }
+
    /// Get a summary of name and address.
    ///
    /// The returned string is either "Name (email@domain.com)" or just
@@ -1590,33 +1565,20 @@ WHERE addr=?
        if show_fallback_icon && !self.id.is_special() && !self.is_key_contact() {
            return Ok(Some(chat::get_unencrypted_icon(context).await?));
        }
-        if let Some(image_rel) = self.param.get(Param::ProfileImage)
-            && !image_rel.is_empty()
-        {
-            return Ok(Some(get_abs_path(context, Path::new(image_rel))));
+        if let Some(image_rel) = self.param.get(Param::ProfileImage) {
+            if !image_rel.is_empty() {
+                return Ok(Some(get_abs_path(context, Path::new(image_rel))));
+            }
        }
        Ok(None)
    }

    /// Returns a color for the contact.
-    /// For self-contact this returns gray if own keypair doesn't exist yet.
-    /// See also [`self::get_color`].
+    /// See [`self::get_color`].
    pub fn get_color(&self) -> u32 {
        get_color(self.id == ContactId::SELF, &self.addr, &self.fingerprint())
    }

-    /// Returns a color for the contact.
-    /// Ensures that the color isn't gray. For self-contact this generates own keypair if it doesn't
-    /// exist yet.
-    /// See also [`self::get_color`].
-    pub async fn get_or_gen_color(&self, context: &Context) -> Result<u32> {
-        let mut fpr = self.fingerprint();
-        if fpr.is_none() && self.id == ContactId::SELF {
-            fpr = Some(load_self_public_key(context).await?.dc_fingerprint());
-        }
-        Ok(get_color(self.id == ContactId::SELF, &self.addr, &fpr))
-    }
-
    /// Gets the contact's status.
    ///
    /// Status is the last signature received in a message from this contact.
@@ -1659,7 +1621,8 @@ WHERE addr=?
    ///
    /// If this returns Some(_),
    /// display green checkmark in the profile and "Introduced by ..." line
-    /// with the name of the contact.
+    /// with the name and address of the contact
+    /// formatted by [Self::get_name_n_addr].
    ///
    /// If this returns `Some(None)`, then the contact is verified,
    /// but it's unclear by whom.
@@ -1764,8 +1727,8 @@ fn update_chat_names(
        };

        let count = transaction.execute(
-            "UPDATE chats SET name=?1, name_normalized=?2 WHERE id=?3 AND name!=?1",
-            (&chat_name, normalize_text(&chat_name), chat_id),
+            "UPDATE chats SET name=?1 WHERE id=?2 AND name!=?1",
+            (chat_name, chat_id),
        )?;

        if count > 0 {
@@ -1825,11 +1788,10 @@ WHERE type=? AND id IN (

        // also unblock mailinglist
        // if the contact is a mailinglist address explicitly created to allow unblocking
-        if !new_blocking
-            && contact.origin == Origin::MailinglistAddress
-            && let Some((chat_id, ..)) = chat::get_chat_id_by_grpid(context, &contact.addr).await?
-        {
-            chat_id.unblock_ex(context, Nosync).await?;
+        if !new_blocking && contact.origin == Origin::MailinglistAddress {
+            if let Some((chat_id, ..)) = chat::get_chat_id_by_grpid(context, &contact.addr).await? {
+                chat_id.unblock_ex(context, Nosync).await?;
+            }
        }

        if sync.into() {
@@ -1859,19 +1821,25 @@ WHERE type=? AND id IN (
 /// The given profile image is expected to be already in the blob directory
 /// as profile images can be set only by receiving messages, this should be always the case, however.
 ///
-/// For contact SELF, the image is not saved in the contact-database but as Config::Selfavatar.
+/// For contact SELF, the image is not saved in the contact-database but as Config::Selfavatar;
+/// this typically happens if we see message with our own profile image.
 pub(crate) async fn set_profile_image(
    context: &Context,
    contact_id: ContactId,
    profile_image: &AvatarAction,
+    was_encrypted: bool,
 ) -> Result<()> {
    let mut contact = Contact::get_by_id(context, contact_id).await?;
    let changed = match profile_image {
        AvatarAction::Change(profile_image) => {
            if contact_id == ContactId::SELF {
-                context
-                    .set_config_ex(Nosync, Config::Selfavatar, Some(profile_image))
-                    .await?;
+                if was_encrypted {
+                    context
+                        .set_config_ex(Nosync, Config::Selfavatar, Some(profile_image))
+                        .await?;
+                } else {
+                    info!(context, "Do not use unencrypted selfavatar.");
+                }
            } else {
                contact.param.set(Param::ProfileImage, profile_image);
            }
@@ -1879,9 +1847,13 @@ pub(crate) async fn set_profile_image(
        }
        AvatarAction::Delete => {
            if contact_id == ContactId::SELF {
-                context
-                    .set_config_ex(Nosync, Config::Selfavatar, None)
-                    .await?;
+                if was_encrypted {
+                    context
+                        .set_config_ex(Nosync, Config::Selfavatar, None)
+                        .await?;
+                } else {
+                    info!(context, "Do not use unencrypted selfavatar deletion.");
+                }
            } else {
                contact.param.remove(Param::ProfileImage);
            }
@@ -1898,16 +1870,22 @@ pub(crate) async fn set_profile_image(

 /// Sets contact status.
 ///
-/// For contact SELF, the status is not saved in the contact table, but as Config::Selfstatus.
+/// For contact SELF, the status is not saved in the contact table, but as Config::Selfstatus.  This
+/// is only done if message is sent from Delta Chat and it is encrypted, to synchronize signature
+/// between Delta Chat devices.
 pub(crate) async fn set_status(
    context: &Context,
    contact_id: ContactId,
    status: String,
+    encrypted: bool,
+    has_chat_version: bool,
 ) -> Result<()> {
    if contact_id == ContactId::SELF {
-        context
-            .set_config_ex(Nosync, Config::Selfstatus, Some(&status))
-            .await?;
+        if encrypted && has_chat_version {
+            context
+                .set_config_ex(Nosync, Config::Selfstatus, Some(&status))
+                .await?;
+        }
    } else {
        let mut contact = Contact::get_by_id(context, contact_id).await?;

--- a/src/contact/contact_tests.rs
+++ b/src/contact/contact_tests.rs
@@ -4,7 +4,8 @@ use super::*;
 use crate::chat::{Chat, get_chat_contacts, send_text_msg};
 use crate::chatlist::Chatlist;
 use crate::receive_imf::receive_imf;
-use crate::test_utils::{self, TestContext, TestContextManager, TimeShiftFalsePositiveNote, sync};
+use crate::securejoin::get_securejoin_qr;
+use crate::test_utils::{self, TestContext, TestContextManager, TimeShiftFalsePositiveNote};

 #[test]
 fn test_contact_id_values() {
@@ -60,16 +61,16 @@ async fn test_get_contacts() -> Result<()> {
    let context = tcm.bob().await;
    let alice = tcm.alice().await;
    alice
-        .set_config(Config::Displayname, Some("MyNameIsΔ"))
+        .set_config(Config::Displayname, Some("MyName"))
        .await?;

    // Alice is not in the contacts yet.
    let contacts = Contact::get_all(&context.ctx, 0, Some("Alice")).await?;
    assert_eq!(contacts.len(), 0);
-    let contacts = Contact::get_all(&context.ctx, 0, Some("MyNameIsΔ")).await?;
+    let contacts = Contact::get_all(&context.ctx, 0, Some("MyName")).await?;
    assert_eq!(contacts.len(), 0);

-    let claire_id = Contact::create(&context, "Δ-someone", "claire@example.org").await?;
+    let claire_id = Contact::create(&context, "someone", "claire@example.org").await?;
    let dave_id = Contact::create(&context, "", "dave@example.org").await?;

    let id = context.add_or_lookup_contact_id(&alice).await;
@@ -77,33 +78,28 @@ async fn test_get_contacts() -> Result<()> {

    let contact = Contact::get_by_id(&context, id).await.unwrap();
    assert_eq!(contact.get_name(), "");
-    assert_eq!(contact.get_authname(), "MyNameIsΔ");
-    assert_eq!(contact.get_display_name(), "MyNameIsΔ");
+    assert_eq!(contact.get_authname(), "MyName");
+    assert_eq!(contact.get_display_name(), "MyName");

    // Search by name.
    let contacts = Contact::get_all(&context, 0, Some("myname")).await?;
    assert_eq!(contacts.len(), 1);
    assert_eq!(contacts.first(), Some(&id));

-    // Search by address is case-insensitive, but only returns direct matches.
+    // Search by address.
    let contacts = Contact::get_all(&context, 0, Some("alice@example.org")).await?;
    assert_eq!(contacts.len(), 1);
    assert_eq!(contacts.first(), Some(&id));
-    let contacts = Contact::get_all(&context, 0, Some("Alice@example.org")).await?;
-    assert_eq!(contacts.len(), 1);
-    assert_eq!(contacts.first(), Some(&id));
-    let contacts = Contact::get_all(&context, 0, Some("alice@")).await?;
-    assert_eq!(contacts.len(), 0);

    let contacts = Contact::get_all(&context, 0, Some("Foobar")).await?;
    assert_eq!(contacts.len(), 0);

-    // Set Alice name manually.
-    id.set_name(&context, "Δ-someone").await?;
+    // Set Alice name to "someone" manually.
+    id.set_name(&context, "someone").await?;
    let contact = Contact::get_by_id(&context.ctx, id).await.unwrap();
-    assert_eq!(contact.get_name(), "Δ-someone");
-    assert_eq!(contact.get_authname(), "MyNameIsΔ");
-    assert_eq!(contact.get_display_name(), "Δ-someone");
+    assert_eq!(contact.get_name(), "someone");
+    assert_eq!(contact.get_authname(), "MyName");
+    assert_eq!(contact.get_display_name(), "someone");

    // Not searchable by authname, because it is not displayed.
    let contacts = Contact::get_all(&context, 0, Some("MyName")).await?;
@@ -113,9 +109,7 @@ async fn test_get_contacts() -> Result<()> {
        info!(&context, "add_self={add_self}");

        // Search key-contacts by display name (same as manually set name).
-        let contacts = Contact::get_all(&context.ctx, add_self, Some("Δ-someone")).await?;
-        assert_eq!(contacts, vec![id]);
-        let contacts = Contact::get_all(&context.ctx, add_self, Some("δ-someon")).await?;
+        let contacts = Contact::get_all(&context.ctx, add_self, Some("someone")).await?;
        assert_eq!(contacts, vec![id]);

        // Get all key-contacts.
@@ -127,7 +121,7 @@ async fn test_get_contacts() -> Result<()> {
    }

    // Search address-contacts by display name.
-    let contacts = Contact::get_all(&context, constants::DC_GCL_ADDRESS, Some("Δ-someone")).await?;
+    let contacts = Contact::get_all(&context, constants::DC_GCL_ADDRESS, Some("someone")).await?;
    assert_eq!(contacts, vec![claire_id]);

    // Get all address-contacts. Newer contacts go first.
@@ -141,16 +135,6 @@ async fn test_get_contacts() -> Result<()> {
    .await?;
    assert_eq!(contacts, vec![dave_id, claire_id, ContactId::SELF]);

-    // Reset the user-provided name for Alice.
-    id.set_name(&context, "").await?;
-    let contact = Contact::get_by_id(&context.ctx, id).await.unwrap();
-    assert_eq!(contact.get_name(), "");
-    assert_eq!(contact.get_authname(), "MyNameIsΔ");
-    assert_eq!(contact.get_display_name(), "MyNameIsΔ");
-    let contacts = Contact::get_all(&context, 0, Some("MyName")).await?;
-    assert_eq!(contacts.len(), 1);
-    let contacts = Contact::get_all(&context, 0, Some("δ")).await?;
-    assert_eq!(contacts.len(), 1);
    Ok(())
 }

@@ -791,21 +775,16 @@ async fn test_contact_get_color() -> Result<()> {
 }

 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_self_color() -> Result<()> {
+async fn test_self_color_vs_key() -> Result<()> {
    let mut tcm = TestContextManager::new();
    let t = &tcm.unconfigured().await;
    t.configure_addr("alice@example.org").await;
    assert!(t.is_configured().await?);
-    let self_contact = Contact::get_by_id(t, ContactId::SELF).await?;
-    let color = self_contact.get_color();
+    let color = Contact::get_by_id(t, ContactId::SELF).await?.get_color();
    assert_eq!(color, 0x808080);
-    let color = self_contact.get_or_gen_color(t).await?;
-    assert_ne!(color, 0x808080);
-    let color1 = self_contact.get_or_gen_color(t).await?;
-    assert_eq!(color1, color);
-
-    let bob = &tcm.bob().await;
-    assert_eq!(bob.add_or_lookup_contact(t).await.get_color(), color);
+    get_securejoin_qr(t, None).await?;
+    let color1 = Contact::get_by_id(t, ContactId::SELF).await?.get_color();
+    assert_ne!(color1, color);
    Ok(())
 }

@@ -867,7 +846,8 @@ CCCB 5AA9 F6E1 141C 9431
    Ok(())
 }

-/// Tests that self-status is not synchronized from outgoing messages.
+/// Tests that status is synchronized when sending encrypted BCC-self messages and not
+/// synchronized when the message is not encrypted.
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_synchronize_status() -> Result<()> {
    let mut tcm = TestContextManager::new();
@@ -886,12 +866,21 @@ async fn test_synchronize_status() -> Result<()> {
        .await?;
    let chat = alice1.create_email_chat(bob).await;

-    // Alice sends an unencrypted message to Bob from the first device.
+    // Alice sends a message to Bob from the first device.
    send_text_msg(alice1, chat.id, "Hello".to_string()).await?;
    let sent_msg = alice1.pop_sent_msg().await;

+    // Message is not encrypted.
+    let message = sent_msg.load_from_db().await;
+    assert!(!message.get_showpadlock());
+
    // Alice's second devices receives a copy of outgoing message.
    alice2.recv_msg(&sent_msg).await;
+
+    // Bob receives message.
+    bob.recv_msg(&sent_msg).await;
+
+    // Message was not encrypted, so status is not copied.
    assert_eq!(alice2.get_config(Config::Selfstatus).await?, default_status);

    // Alice sends encrypted message.
@@ -899,9 +888,17 @@ async fn test_synchronize_status() -> Result<()> {
    send_text_msg(alice1, chat.id, "Hello".to_string()).await?;
    let sent_msg = alice1.pop_sent_msg().await;

+    // Second message is encrypted.
+    let message = sent_msg.load_from_db().await;
+    assert!(message.get_showpadlock());
+
    // Alice's second devices receives a copy of second outgoing message.
    alice2.recv_msg(&sent_msg).await;
-    assert_eq!(alice2.get_config(Config::Selfstatus).await?, default_status);
+
+    assert_eq!(
+        alice2.get_config(Config::Selfstatus).await?,
+        Some("New status".to_string())
+    );

    Ok(())
 }
@@ -914,9 +911,9 @@ async fn test_selfavatar_changed_event() -> Result<()> {
    // Alice has two devices.
    let alice1 = &tcm.alice().await;
    let alice2 = &tcm.alice().await;
-    for a in [alice1, alice2] {
-        a.set_config_bool(Config::SyncMsgs, true).await?;
-    }
+
+    // Bob has one device.
+    let bob = &tcm.bob().await;

    assert_eq!(alice1.get_config(Config::Selfavatar).await?, None);

@@ -932,7 +929,17 @@ async fn test_selfavatar_changed_event() -> Result<()> {
        .get_matching(|e| matches!(e, EventType::SelfavatarChanged))
        .await;

-    sync(alice1, alice2).await;
+    // Alice sends a message.
+    let alice1_chat_id = alice1.create_chat(bob).await.id;
+    send_text_msg(alice1, alice1_chat_id, "Hello".to_string()).await?;
+    let sent_msg = alice1.pop_sent_msg().await;
+
+    // The message is encrypted.
+    let message = sent_msg.load_from_db().await;
+    assert!(message.get_showpadlock());
+
+    // Alice's second device receives a copy of the outgoing message.
+    alice2.recv_msg(&sent_msg).await;

    // Alice's second device applies the selfavatar.
    assert!(alice2.get_config(Config::Selfavatar).await?.is_some());
--- a/src/context.rs
+++ b/src/context.rs
@@ -5,7 +5,7 @@ use std::ffi::OsString;
 use std::ops::Deref;
 use std::path::{Path, PathBuf};
 use std::sync::atomic::AtomicBool;
-use std::sync::{Arc, OnceLock, Weak};
+use std::sync::{Arc, OnceLock};
 use std::time::Duration;

 use anyhow::{Context as _, Result, bail, ensure};
@@ -23,6 +23,7 @@ use crate::imap::{FolderMeaning, Imap, ServerMetadata};
 use crate::key::self_fingerprint;
 use crate::log::warn;
 use crate::logged_debug_assert;
+use crate::login_param::EnteredLoginParam;
 use crate::message::{self, MessageState, MsgId};
 use crate::net::tls::TlsSessionStore;
 use crate::peer_channels::Iroh;
@@ -36,8 +37,6 @@ use crate::tools::{self, duration_to_str, time, time_elapsed};
 use crate::transport::ConfiguredLoginParam;
 use crate::{chatlist_events, stats};

-pub use crate::scheduler::connectivity::Connectivity;
-
 /// Builder for the [`Context`].
 ///
 /// Many arguments to the [`Context`] are kind of optional and only needed to handle
@@ -47,7 +46,7 @@ pub use crate::scheduler::connectivity::Connectivity;
 ///
 /// # Examples
 ///
-/// Creating a new database:
+/// Creating a new unencrypted database:
 ///
 /// ```
 /// # let rt = tokio::runtime::Runtime::new().unwrap();
@@ -62,6 +61,24 @@ pub use crate::scheduler::connectivity::Connectivity;
 /// drop(context);
 /// # });
 /// ```
+///
+/// To use an encrypted database provide a password.  If the database does not yet exist it
+/// will be created:
+///
+/// ```
+/// # let rt = tokio::runtime::Runtime::new().unwrap();
+/// # rt.block_on(async move {
+/// use deltachat::context::ContextBuilder;
+///
+/// let dir = tempfile::tempdir().unwrap();
+/// let context = ContextBuilder::new(dir.path().join("db"))
+///      .with_password("secret".into())
+///      .open()
+///      .await
+///      .unwrap();
+/// drop(context);
+/// # });
+/// ```
 #[derive(Clone, Debug)]
 pub struct ContextBuilder {
    dbfile: PathBuf,
@@ -133,13 +150,9 @@ impl ContextBuilder {
    }

    /// Sets the password to unlock the database.
-    /// Deprecated 2025-11:
-    /// - Db encryption does nothing with blobs, so fs/disk encryption is recommended.
-    /// - Isolation from other apps is needed anyway.
    ///
    /// If an encrypted database is used it must be opened with a password.  Setting a
    /// password on a new database will enable encryption.
-    #[deprecated(since = "TBD")]
    pub fn with_password(mut self, password: String) -> Self {
        self.password = Some(password);
        self
@@ -167,7 +180,7 @@ impl ContextBuilder {

    /// Builds the [`Context`] and opens it.
    ///
-    /// Returns error if context cannot be opened.
+    /// Returns error if context cannot be opened with the given passphrase.
    pub async fn open(self) -> Result<Context> {
        let password = self.password.clone().unwrap_or_default();
        let context = self.build().await?;
@@ -202,25 +215,6 @@ impl Deref for Context {
    }
 }

-/// A weak reference to a [`Context`]
-///
-/// Can be used to obtain a [`Context`]. An existing weak reference does not prevent the corresponding [`Context`] from being dropped.
-#[derive(Clone, Debug)]
-pub(crate) struct WeakContext {
-    inner: Weak<InnerContext>,
-}
-
-impl WeakContext {
-    /// Returns the [`Context`] if it is still available.
-    pub(crate) fn upgrade(&self) -> Result<Context> {
-        let inner = self
-            .inner
-            .upgrade()
-            .ok_or_else(|| anyhow::anyhow!("Inner struct has been dropped"))?;
-        Ok(Context { inner })
-    }
-}
-
 /// Actual context, expensive to clone.
 #[derive(Debug)]
 pub struct InnerContext {
@@ -245,9 +239,9 @@ pub struct InnerContext {
    pub(crate) scheduler: SchedulerState,
    pub(crate) ratelimit: RwLock<Ratelimit>,

-    /// Recently loaded quota information for each trasnport, if any.
-    /// If quota was never tried to load, then the transport doesn't have an entry in the BTreeMap.
-    pub(crate) quota: RwLock<BTreeMap<u32, QuotaInfo>>,
+    /// Recently loaded quota information, if any.
+    /// Set to `None` if quota was never tried to load.
+    pub(crate) quota: RwLock<Option<QuotaInfo>>,

    /// Notify about new messages.
    ///
@@ -309,17 +303,6 @@ pub struct InnerContext {
    /// `Connectivity` values for mailboxes, unordered. Used to compute the aggregate connectivity,
    /// see [`Context::get_connectivity()`].
    pub(crate) connectivities: parking_lot::Mutex<Vec<ConnectivityStore>>,
-
-    #[expect(clippy::type_complexity)]
-    /// Transforms the root of the cryptographic payload before encryption.
-    pub(crate) pre_encrypt_mime_hook: parking_lot::Mutex<
-        Option<
-            for<'a> fn(
-                &Context,
-                mail_builder::mime::MimePart<'a>,
-            ) -> mail_builder::mime::MimePart<'a>,
-        >,
-    >,
 }

 /// The state of ongoing process.
@@ -353,7 +336,7 @@ pub fn get_info() -> BTreeMap<&'static str, String> {
    #[cfg(not(debug_assertions))]
    res.insert("debug_assertions", "Off".to_string());

-    res.insert("deltachat_core_version", format!("v{DC_VERSION_STR}"));
+    res.insert("deltachat_core_version", format!("v{}", &*DC_VERSION_STR));
    res.insert("sqlite_version", rusqlite::version().to_string());
    res.insert("arch", (std::mem::size_of::<usize>() * 8).to_string());
    res.insert("num_cpus", num_cpus::get().to_string());
@@ -405,20 +388,10 @@ impl Context {
        Ok(context)
    }

-    /// Returns a weak reference to this [`Context`].
-    pub(crate) fn get_weak_context(&self) -> WeakContext {
-        WeakContext {
-            inner: Arc::downgrade(&self.inner),
-        }
-    }
-
    /// Opens the database with the given passphrase.
-    /// NB: Db encryption is deprecated, so `passphrase` should be empty normally. See
-    /// [`ContextBuilder::with_password()`] for reasoning.
    ///
    /// Returns true if passphrase is correct, false is passphrase is not correct. Fails on other
    /// errors.
-    #[deprecated(since = "TBD")]
    pub async fn open(&self, passphrase: String) -> Result<bool> {
        if self.sql.check_passphrase(passphrase.clone()).await? {
            self.sql.open(self, passphrase).await?;
@@ -429,7 +402,6 @@ impl Context {
    }

    /// Changes encrypted database passphrase.
-    /// Deprecated 2025-11, see [`ContextBuilder::with_password()`] for reasoning.
    pub async fn change_passphrase(&self, passphrase: String) -> Result<()> {
        self.sql.change_passphrase(passphrase).await?;
        Ok(())
@@ -480,8 +452,8 @@ impl Context {
            translated_stockstrings: stockstrings,
            events,
            scheduler: SchedulerState::new(),
-            ratelimit: RwLock::new(Ratelimit::new(Duration::new(3, 0), 3.0)), // Allow at least 1 message every second + a burst of 3.
-            quota: RwLock::new(BTreeMap::new()),
+            ratelimit: RwLock::new(Ratelimit::new(Duration::new(60, 0), 6.0)), // Allow at least 1 message every 10 seconds + a burst of 6.
+            quota: RwLock::new(None),
            new_msgs_notify,
            server_id: RwLock::new(None),
            metadata: RwLock::new(None),
@@ -495,7 +467,6 @@ impl Context {
            iroh: Arc::new(RwLock::new(None)),
            self_fingerprint: OnceLock::new(),
            connectivities: parking_lot::Mutex::new(Vec::new()),
-            pre_encrypt_mime_hook: None.into(),
        };

        let ctx = Context {
@@ -512,6 +483,12 @@ impl Context {
            return;
        }

+        if self.is_chatmail().await.unwrap_or_default() {
+            let mut lock = self.ratelimit.write().await;
+            // Allow at least 1 message every second + a burst of 3.
+            *lock = Ratelimit::new(Duration::new(3, 0), 3.0);
+        }
+
        // The next line is mainly for iOS:
        // iOS starts a separate process for receiving notifications and if the user concurrently
        // starts the app, the UI process opens the database but waits with calling start_io()
@@ -568,7 +545,7 @@ impl Context {
            .and_then(|provider| provider.opt.max_smtp_rcpt_to)
            .map_or_else(
                || match is_chatmail {
-                    true => constants::DEFAULT_CHATMAIL_MAX_SMTP_RCPT_TO,
+                    true => usize::MAX,
                    false => constants::DEFAULT_MAX_SMTP_RCPT_TO,
                },
                usize::from,
@@ -616,17 +593,13 @@ impl Context {
            }

            // Update quota (to send warning if full) - but only check it once in a while.
-            // note: For now this only checks quota of primary transport,
-            // because background check only checks primary transport at the moment
            if self
-                .quota_needs_update(
-                    session.transport_id(),
-                    DC_BACKGROUND_FETCH_QUOTA_CHECK_RATELIMIT,
-                )
+                .quota_needs_update(DC_BACKGROUND_FETCH_QUOTA_CHECK_RATELIMIT)
                .await
-                && let Err(err) = self.update_recent_quota(&mut session).await
            {
-                warn!(self, "Failed to update quota: {err:#}.");
+                if let Err(err) = self.update_recent_quota(&mut session).await {
+                    warn!(self, "Failed to update quota: {err:#}.");
+                }
            }
        }

@@ -822,17 +795,11 @@ impl Context {

    /// Returns information about the context as key-value pairs.
    pub async fn get_info(&self) -> Result<BTreeMap<&'static str, String>> {
-        let secondary_addrs = self.get_secondary_self_addrs().await?.join(", ");
-        let all_transports: Vec<String> = ConfiguredLoginParam::load_all(self)
+        let l = EnteredLoginParam::load(self).await?;
+        let l2 = ConfiguredLoginParam::load(self)
            .await?
-            .into_iter()
-            .map(|(transport_id, param)| format!("{transport_id}: {param}"))
-            .collect();
-        let all_transports = if all_transports.is_empty() {
-            "Not configured".to_string()
-        } else {
-            all_transports.join(",")
-        };
+            .map_or_else(|| "Not configured".to_string(), |param| param.to_string());
+        let secondary_addrs = self.get_secondary_self_addrs().await?.join(", ");
        let chats = get_chat_cnt(self).await?;
        let unblocked_msgs = message::get_unblocked_msg_cnt(self).await;
        let request_msgs = message::get_request_msg_cnt(self).await;
@@ -911,7 +878,8 @@ impl Context {
                .unwrap_or_else(|| "<unset>".to_string()),
        );
        res.insert("proxy_enabled", proxy_enabled.to_string());
-        res.insert("used_transport_settings", all_transports);
+        res.insert("entered_account_settings", l.to_string());
+        res.insert("used_account_settings", l2);

        if let Some(server_id) = &*self.server_id.read().await {
            res.insert("imap_server_id", format!("{server_id:?}"));
@@ -956,10 +924,6 @@ impl Context {
            "show_emails",
            self.get_config_int(Config::ShowEmails).await?.to_string(),
        );
-        res.insert(
-            "who_can_call_me",
-            self.get_config_int(Config::WhoCanCallMe).await?.to_string(),
-        );
        res.insert(
            "download_limit",
            self.get_config_int(Config::DownloadLimit)
@@ -1088,23 +1052,12 @@ impl Context {
                .to_string(),
        );
        res.insert(
-            "test_hooks",
+            "fail_on_receiving_full_msg",
            self.sql
-                .get_raw_config("test_hooks")
+                .get_raw_config("fail_on_receiving_full_msg")
                .await?
                .unwrap_or_default(),
        );
-        res.insert(
-            "std_header_protection_composing",
-            self.sql
-                .get_raw_config("std_header_protection_composing")
-                .await?
-                .unwrap_or_default(),
-        );
-        res.insert(
-            "team_profile",
-            self.get_config_bool(Config::TeamProfile).await?.to_string(),
-        );

        let elapsed = time_elapsed(&self.creation_time);
        res.insert("uptime", duration_to_str(elapsed));
@@ -1122,19 +1075,21 @@ impl Context {
        let list = self
            .sql
            .query_map_vec(
-                "SELECT m.id
-FROM msgs m
-LEFT JOIN contacts ct
-    ON m.from_id=ct.id
-LEFT JOIN chats c
-    ON m.chat_id=c.id
-WHERE m.state=?
-AND m.hidden=0
-AND m.chat_id>9
-AND ct.blocked=0
-AND c.blocked=0
-AND NOT(c.muted_until=-1 OR c.muted_until>?)
-ORDER BY m.timestamp DESC,m.id DESC",
+                concat!(
+                    "SELECT m.id",
+                    " FROM msgs m",
+                    " LEFT JOIN contacts ct",
+                    "        ON m.from_id=ct.id",
+                    " LEFT JOIN chats c",
+                    "        ON m.chat_id=c.id",
+                    " WHERE m.state=?",
+                    "   AND m.hidden=0",
+                    "   AND m.chat_id>9",
+                    "   AND ct.blocked=0",
+                    "   AND c.blocked=0",
+                    "   AND NOT(c.muted_until=-1 OR c.muted_until>?)",
+                    " ORDER BY m.timestamp DESC,m.id DESC;"
+                ),
                (MessageState::InFresh, time()),
                |row| {
                    let msg_id: MsgId = row.get(0)?;
@@ -1340,5 +1295,10 @@ ORDER BY m.timestamp DESC,m.id DESC",
    }
 }

+/// Returns core version as a string.
+pub fn get_version_str() -> &'static str {
+    &DC_VERSION_STR
+}
+
 #[cfg(test)]
 mod context_tests;
--- a/src/context/context_tests.rs
+++ b/src/context/context_tests.rs
@@ -297,7 +297,6 @@ async fn test_get_info_completeness() {
        "encrypted_device_token",
        "stats_last_update",
        "stats_last_old_contact_id",
-        "simulate_receive_imf_error", // only used in tests
    ];
    let t = TestContext::new().await;
    let info = t.get_info().await.unwrap();
--- a/src/debug_logging.rs
+++ b/src/debug_logging.rs
@@ -115,13 +115,15 @@ pub async fn maybe_set_logging_xdc_inner(
    filename: Option<&str>,
    msg_id: MsgId,
 ) -> anyhow::Result<()> {
-    if viewtype == Viewtype::Webxdc
-        && let Some(filename) = filename
-        && filename.starts_with("debug_logging")
-        && filename.ends_with(".xdc")
-        && chat_id.is_self_talk(context).await?
-    {
-        set_debug_logging_xdc(context, Some(msg_id)).await?;
+    if viewtype == Viewtype::Webxdc {
+        if let Some(filename) = filename {
+            if filename.starts_with("debug_logging")
+                && filename.ends_with(".xdc")
+                && chat_id.is_self_talk(context).await?
+            {
+                set_debug_logging_xdc(context, Some(msg_id)).await?;
+            }
+        }
    }
    Ok(())
 }
--- a/src/dehtml.rs
+++ b/src/dehtml.rs
@@ -13,7 +13,6 @@ use quick_xml::{

 use crate::simplify::{SimplifiedText, simplify_quote};

-#[derive(Default)]
 struct Dehtml {
    strbuilder: String,
    quote: String,
@@ -26,9 +25,6 @@ struct Dehtml {
    /// Everything between `<div name="quote">` and `<div name="quoted-content">` is usually metadata
    /// If this is > `0`, then we are inside a `<div name="quoted-content">`.
    divs_since_quoted_content_div: u32,
-    /// `<div class="header-protection-legacy-display">` elements should be omitted, see
-    /// <https://www.rfc-editor.org/rfc/rfc9788.html#section-4.5.3.3>.
-    divs_since_hp_legacy_display: u32,
    /// All-Inkl just puts the quote into `<blockquote> </blockquote>`. This count is
    /// increased at each `<blockquote>` and decreased at each `</blockquote>`.
    blockquotes_since_blockquote: u32,
@@ -52,25 +48,20 @@ impl Dehtml {
    }

    fn get_add_text(&self) -> AddText {
-        // Everything between `<div name="quoted">` and `<div name="quoted_content">` is
-        // metadata which we don't want.
-        if self.divs_since_quote_div > 0 && self.divs_since_quoted_content_div == 0
-            || self.divs_since_hp_legacy_display > 0
-        {
-            AddText::No
+        if self.divs_since_quote_div > 0 && self.divs_since_quoted_content_div == 0 {
+            AddText::No // Everything between `<div name="quoted">` and `<div name="quoted_content">` is metadata which we don't want
        } else {
            self.add_text
        }
    }
 }

-#[derive(Debug, Default, PartialEq, Clone, Copy)]
+#[derive(Debug, PartialEq, Clone, Copy)]
 enum AddText {
    /// Inside `<script>`, `<style>` and similar tags
    /// which contents should not be displayed.
    No,

-    #[default]
    YesRemoveLineEnds,

    /// Inside `<pre>`.
@@ -130,7 +121,12 @@ fn dehtml_quick_xml(buf: &str) -> (String, String) {

    let mut dehtml = Dehtml {
        strbuilder: String::with_capacity(buf.len()),
-        ..Default::default()
+        quote: String::new(),
+        add_text: AddText::YesRemoveLineEnds,
+        last_href: None,
+        divs_since_quote_div: 0,
+        divs_since_quoted_content_div: 0,
+        blockquotes_since_blockquote: 0,
    };

    let mut reader = quick_xml::Reader::from_str(buf);
@@ -248,7 +244,6 @@ fn dehtml_endtag_cb(event: &BytesEnd, dehtml: &mut Dehtml) {
        "div" => {
            pop_tag(&mut dehtml.divs_since_quote_div);
            pop_tag(&mut dehtml.divs_since_quoted_content_div);
-            pop_tag(&mut dehtml.divs_since_hp_legacy_display);

            *dehtml.get_buf() += "\n\n";
            dehtml.add_text = AddText::YesRemoveLineEnds;
@@ -300,8 +295,6 @@ fn dehtml_starttag_cb<B: std::io::BufRead>(
        "div" => {
            maybe_push_tag(event, reader, "quote", &mut dehtml.divs_since_quote_div);
            maybe_push_tag(event, reader, "quoted-content", &mut dehtml.divs_since_quoted_content_div);
-            maybe_push_tag(event, reader, "header-protection-legacy-display",
-                &mut dehtml.divs_since_hp_legacy_display);

            *dehtml.get_buf() += "\n\n";
            dehtml.add_text = AddText::YesRemoveLineEnds;
@@ -546,27 +539,6 @@ mod tests {
        assert_eq!(txt.text.trim(), "two\nlines");
    }

-    #[test]
-    fn test_hp_legacy_display() {
-        let input = r#"
-<html><head><title></title></head><body>
-<div class="header-protection-legacy-display">
-<pre>Subject: Dinner plans</pre>
-</div>
-<p>
-Let's meet at Rama's Roti Shop at 8pm and go to the park
-from there.
-</p>
-</body>
-</html>
-        "#;
-        let txt = dehtml(input).unwrap();
-        assert_eq!(
-            txt.text.trim(),
-            "Let's meet at Rama's Roti Shop at 8pm and go to the park from there."
-        );
-    }
-
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_quote_div() {
        let input = include_str!("../test-data/message/gmx-quote-body.eml");
--- a/src/download.rs
+++ b/src/download.rs
@@ -1,19 +1,27 @@
 //! # Download large messages manually.

+use std::cmp::max;
 use std::collections::BTreeMap;

 use anyhow::{Result, anyhow, bail, ensure};
 use deltachat_derive::{FromSql, ToSql};
 use serde::{Deserialize, Serialize};

+use crate::config::Config;
 use crate::context::Context;
 use crate::imap::session::Session;
-use crate::log::warn;
-use crate::message::{self, Message, MsgId, rfc724_mid_exists};
-use crate::{EventType, chatlist_events};
+use crate::message::{Message, MsgId, Viewtype};
+use crate::mimeparser::{MimeMessage, Part};
+use crate::tools::time;
+use crate::{EventType, chatlist_events, stock_str};

-pub(crate) mod post_msg_metadata;
-pub(crate) use post_msg_metadata::PostMsgMetadata;
+/// Download limits should not be used below `MIN_DOWNLOAD_LIMIT`.
+///
+/// For better UX, some messages as add-member, non-delivery-reports (NDN) or read-receipts (MDN)
+/// should always be downloaded completely to handle them correctly,
+/// also in larger groups and if group and contact avatar are attached.
+/// Most of these cases are caught by `MIN_DOWNLOAD_LIMIT`.
+pub(crate) const MIN_DOWNLOAD_LIMIT: u32 = 163840;

 /// If a message is downloaded only partially
 /// and `delete_server_after` is set to small timeouts (eg. "at once"),
@@ -21,16 +29,6 @@ pub(crate) use post_msg_metadata::PostMsgMetadata;
 /// `MIN_DELETE_SERVER_AFTER` increases the timeout in this case.
 pub(crate) const MIN_DELETE_SERVER_AFTER: i64 = 48 * 60 * 60;

-/// From this point onward outgoing messages are considered large
-/// and get a Pre-Message, which announces the Post-Message.
-/// This is only about sending so we can modify it any time.
-/// Current value is a bit less than the minimum auto-download setting from the UIs (which is 160
-/// KiB).
-pub(crate) const PRE_MSG_ATTACHMENT_SIZE_THRESHOLD: u64 = 140_000;
-
-/// Max size for pre messages. A warning is emitted when this is exceeded.
-pub(crate) const PRE_MSG_SIZE_WARNING_THRESHOLD: usize = 150_000;
-
 /// Download state of the message.
 #[derive(
    Debug,
@@ -66,8 +64,20 @@ pub enum DownloadState {
    InProgress = 1000,
 }

+impl Context {
+    // Returns validated download limit or `None` for "no limit".
+    pub(crate) async fn download_limit(&self) -> Result<Option<u32>> {
+        let download_limit = self.get_config_int(Config::DownloadLimit).await?;
+        if download_limit <= 0 {
+            Ok(None)
+        } else {
+            Ok(Some(max(MIN_DOWNLOAD_LIMIT, download_limit as u32)))
+        }
+    }
+}
+
 impl MsgId {
-    /// Schedules Post-Message download for partially downloaded message.
+    /// Schedules full message download for partially downloaded message.
    pub async fn download_full(self, context: &Context) -> Result<()> {
        let msg = Message::load_from_db(context, self).await?;
        match msg.download_state() {
@@ -76,22 +86,11 @@ impl MsgId {
            }
            DownloadState::InProgress => return Err(anyhow!("Download already in progress.")),
            DownloadState::Available | DownloadState::Failure => {
-                if msg.rfc724_mid().is_empty() {
-                    return Err(anyhow!("Download not possible, message has no rfc724_mid"));
-                }
                self.update_download_state(context, DownloadState::InProgress)
                    .await?;
-                info!(
-                    context,
-                    "Requesting full download of {:?}.",
-                    msg.rfc724_mid()
-                );
                context
                    .sql
-                    .execute(
-                        "INSERT INTO download (rfc724_mid, msg_id) VALUES (?,?)",
-                        (msg.rfc724_mid(), msg.id),
-                    )
+                    .execute("INSERT INTO download (msg_id) VALUES (?)", (self,))
                    .await?;
                context.scheduler.interrupt_inbox().await;
            }
@@ -140,18 +139,25 @@ impl Message {
 /// Most messages are downloaded automatically on fetch instead.
 pub(crate) async fn download_msg(
    context: &Context,
-    rfc724_mid: String,
+    msg_id: MsgId,
    session: &mut Session,
 ) -> Result<()> {
-    let transport_id = session.transport_id();
+    let Some(msg) = Message::load_from_db_optional(context, msg_id).await? else {
+        // If partially downloaded message was already deleted
+        // we do not know its Message-ID anymore
+        // so cannot download it.
+        //
+        // Probably the message expired due to `delete_device_after`
+        // setting or was otherwise removed from the device,
+        // so we don't want it to reappear anyway.
+        return Ok(());
+    };
+
    let row = context
        .sql
        .query_row_optional(
-            "SELECT uid, folder FROM imap
-             WHERE rfc724_mid=?
-             AND transport_id=?
-             AND target!=''",
-            (&rfc724_mid, transport_id),
+            "SELECT uid, folder FROM imap WHERE rfc724_mid=? AND target!=''",
+            (&msg.rfc724_mid,),
            |row| {
                let server_uid: u32 = row.get(0)?;
                let server_folder: String = row.get(1)?;
@@ -162,13 +168,11 @@ pub(crate) async fn download_msg(

    let Some((server_uid, server_folder)) = row else {
        // No IMAP record found, we don't know the UID and folder.
-        return Err(anyhow!(
-            "IMAP location for {rfc724_mid:?} post-message is unknown"
-        ));
+        return Err(anyhow!("Call download_full() again to try over."));
    };

    session
-        .fetch_single_msg(context, &server_folder, server_uid, rfc724_mid)
+        .fetch_single_msg(context, &server_folder, server_uid, msg.rfc724_mid.clone())
        .await?;
    Ok(())
 }
@@ -201,7 +205,7 @@ impl Session {
        let mut uid_message_ids: BTreeMap<u32, String> = BTreeMap::new();
        uid_message_ids.insert(uid, rfc724_mid);
        let (sender, receiver) = async_channel::unbounded();
-        self.fetch_many_msgs(context, folder, vec![uid], &uid_message_ids, sender)
+        self.fetch_many_msgs(context, folder, vec![uid], &uid_message_ids, false, sender)
            .await?;
        if receiver.recv().await.is_err() {
            bail!("Failed to fetch UID {uid}");
@@ -210,139 +214,41 @@ impl Session {
    }
 }

-async fn set_state_to_failure(context: &Context, rfc724_mid: &str) -> Result<()> {
-    if let Some(msg_id) = rfc724_mid_exists(context, rfc724_mid).await? {
-        // Update download state to failure
-        // so it can be retried.
-        //
-        // On success update_download_state() is not needed
-        // as receive_imf() already
-        // set the state and emitted the event.
-        msg_id
-            .update_download_state(context, DownloadState::Failure)
-            .await?;
-    }
-    Ok(())
-}
-
-async fn available_post_msgs_contains_rfc724_mid(
-    context: &Context,
-    rfc724_mid: &str,
-) -> Result<bool> {
-    Ok(context
-        .sql
-        .query_get_value::<String>(
-            "SELECT rfc724_mid FROM available_post_msgs WHERE rfc724_mid=?",
-            (&rfc724_mid,),
-        )
-        .await?
-        .is_some())
-}
-
-async fn delete_from_available_post_msgs(context: &Context, rfc724_mid: &str) -> Result<()> {
-    context
-        .sql
-        .execute(
-            "DELETE FROM available_post_msgs WHERE rfc724_mid=?",
-            (&rfc724_mid,),
-        )
-        .await?;
-    Ok(())
-}
-
-async fn delete_from_downloads(context: &Context, rfc724_mid: &str) -> Result<()> {
-    context
-        .sql
-        .execute("DELETE FROM download WHERE rfc724_mid=?", (&rfc724_mid,))
-        .await?;
-    Ok(())
-}
-
-pub(crate) async fn msg_is_downloaded_for(context: &Context, rfc724_mid: &str) -> Result<bool> {
-    Ok(message::rfc724_mid_exists(context, rfc724_mid)
-        .await?
-        .is_some())
-}
-
-pub(crate) async fn download_msgs(context: &Context, session: &mut Session) -> Result<()> {
-    let rfc724_mids = context
-        .sql
-        .query_map_vec("SELECT rfc724_mid FROM download", (), |row| {
-            let rfc724_mid: String = row.get(0)?;
-            Ok(rfc724_mid)
-        })
-        .await?;
-
-    for rfc724_mid in &rfc724_mids {
-        let res = download_msg(context, rfc724_mid.clone(), session).await;
-        if res.is_ok() {
-            delete_from_downloads(context, rfc724_mid).await?;
-            delete_from_available_post_msgs(context, rfc724_mid).await?;
-        }
-        if let Err(err) = res {
-            warn!(
+impl MimeMessage {
+    /// Creates a placeholder part and add that to `parts`.
+    ///
+    /// To create the placeholder, only the outermost header can be used,
+    /// the mime-structure itself is not available.
+    ///
+    /// The placeholder part currently contains a text with size and availability of the message.
+    pub(crate) async fn create_stub_from_partial_download(
+        &mut self,
+        context: &Context,
+        org_bytes: u32,
+    ) -> Result<()> {
+        let mut text = format!(
+            "[{}]",
+            stock_str::partial_download_msg_body(context, org_bytes).await
+        );
+        if let Some(delete_server_after) = context.get_config_delete_server_after().await? {
+            let until = stock_str::download_availability(
                context,
-                "Failed to download message rfc724_mid={rfc724_mid}: {:#}.", err
-            );
-            if !msg_is_downloaded_for(context, rfc724_mid).await? {
-                // This is probably a classical email that vanished before we could download it
-                warn!(
-                    context,
-                    "{rfc724_mid} download failed and there is no downloaded pre-message."
-                );
-                delete_from_downloads(context, rfc724_mid).await?;
-            } else if available_post_msgs_contains_rfc724_mid(context, rfc724_mid).await? {
-                warn!(
-                    context,
-                    "{rfc724_mid} is in available_post_msgs table but we failed to fetch it,
-                    so set the message to DownloadState::Failure - probably it was deleted on the server in the meantime"
-                );
-                set_state_to_failure(context, rfc724_mid).await?;
-                delete_from_downloads(context, rfc724_mid).await?;
-                delete_from_available_post_msgs(context, rfc724_mid).await?;
-            } else {
-                // leave the message in DownloadState::InProgress;
-                // it will be downloaded once it arrives.
-            }
-        }
-    }
+                time() + max(delete_server_after, MIN_DELETE_SERVER_AFTER),
+            )
+            .await;
+            text += format!(" [{until}]").as_str();
+        };

-    Ok(())
-}
+        info!(context, "Partial download: {}", text);

-/// Downloads known post-messages without pre-messages
-/// in order to guard against lost pre-messages.
-pub(crate) async fn download_known_post_messages_without_pre_message(
-    context: &Context,
-    session: &mut Session,
-) -> Result<()> {
-    let rfc724_mids = context
-        .sql
-        .query_map_vec("SELECT rfc724_mid FROM available_post_msgs", (), |row| {
-            let rfc724_mid: String = row.get(0)?;
-            Ok(rfc724_mid)
-        })
-        .await?;
-    for rfc724_mid in &rfc724_mids {
-        if !msg_is_downloaded_for(context, rfc724_mid).await? {
-            // Download the Post-Message unconditionally,
-            // because the Pre-Message got lost.
-            // The message may be in the wrong order,
-            // but at least we have it at all.
-            let res = download_msg(context, rfc724_mid.clone(), session).await;
-            if res.is_ok() {
-                delete_from_available_post_msgs(context, rfc724_mid).await?;
-            }
-            if let Err(err) = res {
-                warn!(
-                    context,
-                    "download_known_post_messages_without_pre_message: Failed to download message rfc724_mid={rfc724_mid}: {:#}.",
-                    err
-                );
-            }
-        }
+        self.do_add_single_part(Part {
+            typ: Viewtype::Text,
+            msg: text,
+            ..Default::default()
+        });
+
+        Ok(())
    }
-    Ok(())
 }

 #[cfg(test)]
@@ -350,8 +256,11 @@ mod tests {
    use num_traits::FromPrimitive;

    use super::*;
-    use crate::chat::send_msg;
-    use crate::test_utils::TestContext;
+    use crate::chat::{get_chat_msgs, send_msg};
+    use crate::ephemeral::Timer;
+    use crate::message::delete_msgs;
+    use crate::receive_imf::receive_imf_from_inbox;
+    use crate::test_utils::{E2EE_INFO_MSGS, TestContext, TestContextManager};

    #[test]
    fn test_downloadstate_values() {
@@ -369,6 +278,29 @@ mod tests {
        );
    }

+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_download_limit() -> Result<()> {
+        let t = TestContext::new_alice().await;
+
+        assert_eq!(t.download_limit().await?, None);
+
+        t.set_config(Config::DownloadLimit, Some("200000")).await?;
+        assert_eq!(t.download_limit().await?, Some(200000));
+
+        t.set_config(Config::DownloadLimit, Some("20000")).await?;
+        assert_eq!(t.download_limit().await?, Some(MIN_DOWNLOAD_LIMIT));
+
+        t.set_config(Config::DownloadLimit, None).await?;
+        assert_eq!(t.download_limit().await?, None);
+
+        for val in &["0", "-1", "-100", "", "foo"] {
+            t.set_config(Config::DownloadLimit, Some(val)).await?;
+            assert_eq!(t.download_limit().await?, None);
+        }
+
+        Ok(())
+    }
+
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_update_download_state() -> Result<()> {
        let t = TestContext::new_alice().await;
@@ -400,4 +332,230 @@ mod tests {

        Ok(())
    }
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_partial_receive_imf() -> Result<()> {
+        let t = TestContext::new_alice().await;
+
+        let header = "Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\
+             From: bob@example.com\n\
+             To: alice@example.org\n\
+             Subject: foo\n\
+             Message-ID: <Mr.12345678901@example.com>\n\
+             Chat-Version: 1.0\n\
+             Date: Sun, 22 Mar 2020 22:37:57 +0000\
+             Content-Type: text/plain";
+
+        receive_imf_from_inbox(
+            &t,
+            "Mr.12345678901@example.com",
+            header.as_bytes(),
+            false,
+            Some(100000),
+        )
+        .await?;
+        let msg = t.get_last_msg().await;
+        assert_eq!(msg.download_state(), DownloadState::Available);
+        assert_eq!(msg.get_subject(), "foo");
+        assert!(
+            msg.get_text()
+                .contains(&stock_str::partial_download_msg_body(&t, 100000).await)
+        );
+
+        receive_imf_from_inbox(
+            &t,
+            "Mr.12345678901@example.com",
+            format!("{header}\n\n100k text...").as_bytes(),
+            false,
+            None,
+        )
+        .await?;
+        let msg = t.get_last_msg().await;
+        assert_eq!(msg.download_state(), DownloadState::Done);
+        assert_eq!(msg.get_subject(), "foo");
+        assert_eq!(msg.get_text(), "100k text...");
+
+        Ok(())
+    }
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_partial_download_and_ephemeral() -> Result<()> {
+        let t = TestContext::new_alice().await;
+        let chat_id = t
+            .create_chat_with_contact("bob", "bob@example.org")
+            .await
+            .id;
+        chat_id
+            .set_ephemeral_timer(&t, Timer::Enabled { duration: 60 })
+            .await?;
+
+        // download message from bob partially, this must not change the ephemeral timer
+        receive_imf_from_inbox(
+            &t,
+            "first@example.org",
+            b"From: Bob <bob@example.org>\n\
+                    To: Alice <alice@example.org>\n\
+                    Chat-Version: 1.0\n\
+                    Subject: subject\n\
+                    Message-ID: <first@example.org>\n\
+                    Date: Sun, 14 Nov 2021 00:10:00 +0000\
+                    Content-Type: text/plain",
+            false,
+            Some(100000),
+        )
+        .await?;
+        assert_eq!(
+            chat_id.get_ephemeral_timer(&t).await?,
+            Timer::Enabled { duration: 60 }
+        );
+
+        Ok(())
+    }
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_status_update_expands_to_nothing() -> Result<()> {
+        let alice = TestContext::new_alice().await;
+        let bob = TestContext::new_bob().await;
+        let chat_id = alice.create_chat(&bob).await.id;
+
+        let file = alice.get_blobdir().join("minimal.xdc");
+        tokio::fs::write(&file, include_bytes!("../test-data/webxdc/minimal.xdc")).await?;
+        let mut instance = Message::new(Viewtype::File);
+        instance.set_file_and_deduplicate(&alice, &file, None, None)?;
+        let _sent1 = alice.send_msg(chat_id, &mut instance).await;
+
+        alice
+            .send_webxdc_status_update(instance.id, r#"{"payload":7}"#)
+            .await?;
+        alice.flush_status_updates().await?;
+        let sent2 = alice.pop_sent_msg().await;
+        let sent2_rfc724_mid = sent2.load_from_db().await.rfc724_mid;
+
+        // not downloading the status update results in an placeholder
+        receive_imf_from_inbox(
+            &bob,
+            &sent2_rfc724_mid,
+            sent2.payload().as_bytes(),
+            false,
+            Some(sent2.payload().len() as u32),
+        )
+        .await?;
+        let msg = bob.get_last_msg().await;
+        let chat_id = msg.chat_id;
+        assert_eq!(
+            get_chat_msgs(&bob, chat_id).await?.len(),
+            E2EE_INFO_MSGS + 1
+        );
+        assert_eq!(msg.download_state(), DownloadState::Available);
+
+        // downloading the status update afterwards expands to nothing and moves the placeholder to trash-chat
+        // (usually status updates are too small for not being downloaded directly)
+        receive_imf_from_inbox(
+            &bob,
+            &sent2_rfc724_mid,
+            sent2.payload().as_bytes(),
+            false,
+            None,
+        )
+        .await?;
+        assert_eq!(get_chat_msgs(&bob, chat_id).await?.len(), E2EE_INFO_MSGS);
+        assert!(
+            Message::load_from_db_optional(&bob, msg.id)
+                .await?
+                .is_none()
+        );
+
+        Ok(())
+    }
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_mdn_expands_to_nothing() -> Result<()> {
+        let bob = TestContext::new_bob().await;
+        let raw = b"Subject: Message opened\n\
+            Date: Mon, 10 Jan 2020 00:00:00 +0000\n\
+            Chat-Version: 1.0\n\
+            Message-ID: <bar@example.org>\n\
+            To: Alice <alice@example.org>\n\
+            From: Bob <bob@example.org>\n\
+            Content-Type: multipart/report; report-type=disposition-notification;\n\t\
+            boundary=\"kJBbU58X1xeWNHgBtTbMk80M5qnV4N\"\n\
+            \n\
+            \n\
+            --kJBbU58X1xeWNHgBtTbMk80M5qnV4N\n\
+            Content-Type: text/plain; charset=utf-8\n\
+            \n\
+            bla\n\
+            \n\
+            \n\
+            --kJBbU58X1xeWNHgBtTbMk80M5qnV4N\n\
+            Content-Type: message/disposition-notification\n\
+            \n\
+            Reporting-UA: Delta Chat 1.88.0\n\
+            Original-Recipient: rfc822;bob@example.org\n\
+            Final-Recipient: rfc822;bob@example.org\n\
+            Original-Message-ID: <foo@example.org>\n\
+            Disposition: manual-action/MDN-sent-automatically; displayed\n\
+            \n\
+            \n\
+            --kJBbU58X1xeWNHgBtTbMk80M5qnV4N--\n\
+            ";
+
+        // not downloading the mdn results in an placeholder
+        receive_imf_from_inbox(&bob, "bar@example.org", raw, false, Some(raw.len() as u32)).await?;
+        let msg = bob.get_last_msg().await;
+        let chat_id = msg.chat_id;
+        assert_eq!(get_chat_msgs(&bob, chat_id).await?.len(), 1);
+        assert_eq!(msg.download_state(), DownloadState::Available);
+
+        // downloading the mdn afterwards expands to nothing and deletes the placeholder directly
+        // (usually mdn are too small for not being downloaded directly)
+        receive_imf_from_inbox(&bob, "bar@example.org", raw, false, None).await?;
+        assert_eq!(get_chat_msgs(&bob, chat_id).await?.len(), 0);
+        assert!(
+            Message::load_from_db_optional(&bob, msg.id)
+                .await?
+                .is_none()
+        );
+
+        Ok(())
+    }
+
+    /// Tests that fully downloading the message
+    /// works even if the Message-ID already exists
+    /// in the database assigned to the trash chat.
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_partial_download_trashed() -> Result<()> {
+        let mut tcm = TestContextManager::new();
+        let alice = &tcm.alice().await;
+
+        let imf_raw = b"From: Bob <bob@example.org>\n\
+              To: Alice <alice@example.org>\n\
+              Chat-Version: 1.0\n\
+              Subject: subject\n\
+              Message-ID: <first@example.org>\n\
+              Date: Sun, 14 Nov 2021 00:10:00 +0000\
+              Content-Type: text/plain";
+
+        // Download message from Bob partially.
+        let partial_received_msg =
+            receive_imf_from_inbox(alice, "first@example.org", imf_raw, false, Some(100000))
+                .await?
+                .unwrap();
+        assert_eq!(partial_received_msg.msg_ids.len(), 1);
+
+        // Delete the received message.
+        // Not it is still in the database,
+        // but in the trash chat.
+        delete_msgs(alice, &[partial_received_msg.msg_ids[0]]).await?;
+
+        // Fully download message after deletion.
+        let full_received_msg =
+            receive_imf_from_inbox(alice, "first@example.org", imf_raw, false, None).await?;
+
+        // The message does not reappear.
+        // However, `receive_imf` should not fail.
+        assert!(full_received_msg.is_none());
+
+        Ok(())
+    }
 }
--- a/src/download/post_msg_metadata.rs
+++ b/src/download/post_msg_metadata.rs
@@ -1,251 +0,0 @@
-use anyhow::{Context as _, Result};
-use num_traits::ToPrimitive;
-use serde::{Deserialize, Serialize};
-
-use crate::context::Context;
-use crate::log::warn;
-use crate::message::Message;
-use crate::message::Viewtype;
-use crate::param::{Param, Params};
-
-/// Metadata contained in Pre-Message that describes the Post-Message.
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-pub struct PostMsgMetadata {
-    /// size of the attachment in bytes
-    pub(crate) size: u64,
-    /// Real viewtype of message
-    pub(crate) viewtype: Viewtype,
-    /// the original file name
-    pub(crate) filename: String,
-    /// Width and height of the image or video
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub(crate) wh: Option<(i32, i32)>,
-    /// Duration of audio file or video in milliseconds
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub(crate) duration: Option<i32>,
-}
-
-impl PostMsgMetadata {
-    /// Returns `PostMsgMetadata` for messages with file attachment and `None` otherwise.
-    pub(crate) async fn from_msg(context: &Context, message: &Message) -> Result<Option<Self>> {
-        if !message.viewtype.has_file() {
-            return Ok(None);
-        }
-
-        let size = message
-            .get_filebytes(context)
-            .await?
-            .context("Unexpected: file has no size")?;
-        let filename = message
-            .param
-            .get(Param::Filename)
-            .unwrap_or_default()
-            .to_owned();
-        let wh = {
-            match (
-                message.param.get_int(Param::Width),
-                message.param.get_int(Param::Height),
-            ) {
-                (None, None) => None,
-                (Some(width), Some(height)) => Some((width, height)),
-                wh => {
-                    warn!(
-                        context,
-                        "Message {} misses width or height: {:?}.", message.id, wh
-                    );
-                    None
-                }
-            }
-        };
-        let duration = message.param.get_int(Param::Duration);
-
-        Ok(Some(Self {
-            size,
-            filename,
-            viewtype: message.viewtype,
-            wh,
-            duration,
-        }))
-    }
-
-    pub(crate) fn to_header_value(&self) -> Result<String> {
-        Ok(serde_json::to_string(&self)?)
-    }
-
-    pub(crate) fn try_from_header_value(value: &str) -> Result<Self> {
-        Ok(serde_json::from_str(value)?)
-    }
-}
-
-impl Params {
-    /// Applies data from post_msg_metadata to Params
-    pub(crate) fn apply_post_msg_metadata(
-        &mut self,
-        post_msg_metadata: &PostMsgMetadata,
-    ) -> &mut Self {
-        self.set(Param::PostMessageFileBytes, post_msg_metadata.size);
-        if !post_msg_metadata.filename.is_empty() {
-            self.set(Param::Filename, &post_msg_metadata.filename);
-        }
-        self.set_i64(
-            Param::PostMessageViewtype,
-            post_msg_metadata.viewtype.to_i64().unwrap_or_default(),
-        );
-        if let Some((width, height)) = post_msg_metadata.wh {
-            self.set(Param::Width, width);
-            self.set(Param::Height, height);
-        }
-        if let Some(duration) = post_msg_metadata.duration {
-            self.set(Param::Duration, duration);
-        }
-
-        self
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use anyhow::Result;
-    use pretty_assertions::assert_eq;
-
-    use crate::{
-        message::{Message, Viewtype},
-        test_utils::{TestContextManager, create_test_image},
-    };
-
-    use super::PostMsgMetadata;
-
-    /// Build from message with file attachment
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_build_from_file_msg() -> Result<()> {
-        let mut tcm = TestContextManager::new();
-        let alice = &tcm.alice().await;
-
-        let mut file_msg = Message::new(Viewtype::File);
-        file_msg.set_file_from_bytes(alice, "test.bin", &vec![0u8; 1_000_000], None)?;
-        let post_msg_metadata = PostMsgMetadata::from_msg(alice, &file_msg).await?;
-        assert_eq!(
-            post_msg_metadata,
-            Some(PostMsgMetadata {
-                size: 1_000_000,
-                viewtype: Viewtype::File,
-                filename: "test.bin".to_string(),
-                wh: None,
-                duration: None,
-            })
-        );
-        Ok(())
-    }
-
-    /// Build from message with image attachment
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_build_from_image_msg() -> Result<()> {
-        let mut tcm = TestContextManager::new();
-        let alice = &tcm.alice().await;
-        let mut image_msg = Message::new(Viewtype::Image);
-
-        let (width, height) = (1080, 1920);
-        let test_img = create_test_image(width, height)?;
-        image_msg.set_file_from_bytes(alice, "vacation.png", &test_img, None)?;
-        // this is usually done while sending,
-        // but we don't send it here, so we need to call it ourself
-        image_msg.try_calc_and_set_dimensions(alice).await?;
-        let post_msg_metadata = PostMsgMetadata::from_msg(alice, &image_msg).await?;
-        assert_eq!(
-            post_msg_metadata,
-            Some(PostMsgMetadata {
-                size: 1816098,
-                viewtype: Viewtype::Image,
-                filename: "vacation.png".to_string(),
-                wh: Some((width as i32, height as i32)),
-                duration: None,
-            })
-        );
-
-        Ok(())
-    }
-
-    /// Test that serialisation results in expected format
-    #[test]
-    fn test_serialize_to_header() -> Result<()> {
-        assert_eq!(
-            PostMsgMetadata {
-                size: 1_000_000,
-                viewtype: Viewtype::File,
-                filename: "test.bin".to_string(),
-                wh: None,
-                duration: None,
-            }
-            .to_header_value()?,
-            "{\"size\":1000000,\"viewtype\":\"File\",\"filename\":\"test.bin\"}"
-        );
-        assert_eq!(
-            PostMsgMetadata {
-                size: 5_342_765,
-                viewtype: Viewtype::Image,
-                filename: "vacation.png".to_string(),
-                wh: Some((1080, 1920)),
-                duration: None,
-            }
-            .to_header_value()?,
-            "{\"size\":5342765,\"viewtype\":\"Image\",\"filename\":\"vacation.png\",\"wh\":[1080,1920]}"
-        );
-        assert_eq!(
-            PostMsgMetadata {
-                size: 5_000,
-                viewtype: Viewtype::Audio,
-                filename: "audio-DD-MM-YY.ogg".to_string(),
-                wh: None,
-                duration: Some(152_310),
-            }
-            .to_header_value()?,
-            "{\"size\":5000,\"viewtype\":\"Audio\",\"filename\":\"audio-DD-MM-YY.ogg\",\"duration\":152310}"
-        );
-
-        Ok(())
-    }
-
-    /// Test that deserialisation from expected format works
-    /// This test will become important for compatibility between versions in the future
-    #[test]
-    fn test_deserialize_from_header() -> Result<()> {
-        assert_eq!(
-            serde_json::from_str::<PostMsgMetadata>(
-                "{\"size\":1000000,\"viewtype\":\"File\",\"filename\":\"test.bin\",\"wh\":null,\"duration\":null}"
-            )?,
-            PostMsgMetadata {
-                size: 1_000_000,
-                viewtype: Viewtype::File,
-                filename: "test.bin".to_string(),
-                wh: None,
-                duration: None,
-            }
-        );
-        assert_eq!(
-            serde_json::from_str::<PostMsgMetadata>(
-                "{\"size\":5342765,\"viewtype\":\"Image\",\"filename\":\"vacation.png\",\"wh\":[1080,1920]}"
-            )?,
-            PostMsgMetadata {
-                size: 5_342_765,
-                viewtype: Viewtype::Image,
-                filename: "vacation.png".to_string(),
-                wh: Some((1080, 1920)),
-                duration: None,
-            }
-        );
-        assert_eq!(
-            serde_json::from_str::<PostMsgMetadata>(
-                "{\"size\":5000,\"viewtype\":\"Audio\",\"filename\":\"audio-DD-MM-YY.ogg\",\"duration\":152310}"
-            )?,
-            PostMsgMetadata {
-                size: 5_000,
-                viewtype: Viewtype::Audio,
-                filename: "audio-DD-MM-YY.ogg".to_string(),
-                wh: None,
-                duration: Some(152_310),
-            }
-        );
-
-        Ok(())
-    }
-}
--- a/src/e2ee.rs
+++ b/src/e2ee.rs
@@ -8,27 +8,33 @@ use mail_builder::mime::MimePart;
 use crate::aheader::{Aheader, EncryptPreference};
 use crate::context::Context;
 use crate::key::{SignedPublicKey, load_self_public_key, load_self_secret_key};
-use crate::pgp::{self, SeipdVersion};
+use crate::pgp;

 #[derive(Debug)]
 pub struct EncryptHelper {
+    pub prefer_encrypt: EncryptPreference,
    pub addr: String,
    pub public_key: SignedPublicKey,
 }

 impl EncryptHelper {
    pub async fn new(context: &Context) -> Result<EncryptHelper> {
+        let prefer_encrypt = EncryptPreference::Mutual;
        let addr = context.get_primary_self_addr().await?;
        let public_key = load_self_public_key(context).await?;

-        Ok(EncryptHelper { addr, public_key })
+        Ok(EncryptHelper {
+            prefer_encrypt,
+            addr,
+            public_key,
+        })
    }

    pub fn get_aheader(&self) -> Aheader {
        Aheader {
            addr: self.addr.clone(),
            public_key: self.public_key.clone(),
-            prefer_encrypt: EncryptPreference::Mutual,
+            prefer_encrypt: self.prefer_encrypt,
            verified: false,
        }
    }
@@ -41,7 +47,6 @@ impl EncryptHelper {
        mail_to_encrypt: MimePart<'static>,
        compress: bool,
        anonymous_recipients: bool,
-        seipd_version: SeipdVersion,
    ) -> Result<String> {
        let sign_key = load_self_secret_key(context).await?;

@@ -52,10 +57,9 @@ impl EncryptHelper {
        let ctext = pgp::pk_encrypt(
            raw_message,
            keyring,
-            sign_key,
+            Some(sign_key),
            compress,
            anonymous_recipients,
-            seipd_version,
        )
        .await?;

--- a/src/ephemeral.rs
+++ b/src/ephemeral.rs
@@ -241,9 +241,10 @@ pub(crate) async fn stock_ephemeral_timer_changed(
    match timer {
        Timer::Disabled => stock_str::msg_ephemeral_timer_disabled(context, from_id).await,
        Timer::Enabled { duration } => match duration {
-            0..=60 => {
+            0..=59 => {
                stock_str::msg_ephemeral_timer_enabled(context, &timer.to_string(), from_id).await
            }
+            60 => stock_str::msg_ephemeral_timer_minute(context, from_id).await,
            61..=3599 => {
                stock_str::msg_ephemeral_timer_minutes(
                    context,
@@ -474,10 +475,8 @@ pub(crate) async fn delete_expired_messages(context: &Context, now: i64) -> Resu
                // If you change which information is preserved here, also change `MsgId::trash()`
                // and other places it references.
                let mut del_msg_stmt = transaction.prepare(
-                    "
-INSERT OR REPLACE INTO msgs (id, rfc724_mid, pre_rfc724_mid, timestamp, chat_id)
-SELECT ?1, rfc724_mid, pre_rfc724_mid, timestamp, ? FROM msgs WHERE id=?1
-                    ",
+                    "INSERT OR REPLACE INTO msgs (id, rfc724_mid, timestamp, chat_id)
+                     SELECT ?1, rfc724_mid, timestamp, ? FROM msgs WHERE id=?1",
                )?;
                let mut del_location_stmt =
                    transaction.prepare("DELETE FROM locations WHERE independent=1 AND id=?")?;
--- a/src/ephemeral/ephemeral_tests.rs
+++ b/src/ephemeral/ephemeral_tests.rs
@@ -38,7 +38,7 @@ async fn test_stock_ephemeral_messages() {
    assert_eq!(
        stock_ephemeral_timer_changed(&context, Timer::Enabled { duration: 60 }, ContactId::SELF)
            .await,
-        "You set message deletion timer to 60 s."
+        "You set message deletion timer to 1 minute."
    );
    assert_eq!(
        stock_ephemeral_timer_changed(&context, Timer::Enabled { duration: 90 }, ContactId::SELF)
@@ -142,7 +142,7 @@ async fn test_ephemeral_enable_disable() -> Result<()> {
    let bob_received_message = bob.recv_msg(&sent).await;
    assert_eq!(
        bob_received_message.text,
-        "Message deletion timer is set to 60 s by alice@example.org."
+        "Message deletion timer is set to 1 minute by alice@example.org."
    );
    assert_eq!(
        chat_bob.get_ephemeral_timer(bob).await?,
@@ -451,8 +451,6 @@ async fn test_delete_expired_imap_messages() -> Result<()> {
    let t = TestContext::new_alice().await;
    const HOUR: i64 = 60 * 60;
    let now = time();
-    let transport_id = 1;
-    let uidvalidity = 12345;
    for (id, timestamp, ephemeral_timestamp) in &[
        (900, now - 2 * HOUR, 0),
        (1000, now - 23 * HOUR - MIN_DELETE_SERVER_AFTER, 0),
@@ -472,8 +470,8 @@ async fn test_delete_expired_imap_messages() -> Result<()> {
               .await?;
        t.sql
            .execute(
-                "INSERT INTO imap (transport_id, rfc724_mid, folder, uid, target, uidvalidity) VALUES (?, ?,'INBOX',?, 'INBOX', ?);",
-                (transport_id, &message_id, id, uidvalidity),
+                "INSERT INTO imap (rfc724_mid, folder, uid, target) VALUES (?,'INBOX',?, 'INBOX');",
+                (&message_id, id),
            )
            .await?;
    }
--- a/src/events/chatlist_events.rs
+++ b/src/events/chatlist_events.rs
@@ -30,10 +30,9 @@ pub(crate) async fn emit_chatlist_item_changed_for_contact_chat(
    match ChatId::lookup_by_contact(context, contact_id).await {
        Ok(Some(chat_id)) => self::emit_chatlist_item_changed(context, chat_id),
        Ok(None) => {}
-        Err(error) => error!(
-            context,
+        Err(error) => context.emit_event(EventType::Error(format!(
            "failed to find chat id for contact for chatlist event: {error:?}"
-        ),
+        ))),
    }
 }

--- a/src/events/payload.rs
+++ b/src/events/payload.rs
@@ -243,7 +243,7 @@ pub enum EventType {
        /// Progress.
        ///
        /// 0=error, 1-999=progress in permille, 1000=success and done
-        progress: u16,
+        progress: usize,

        /// Progress comment or error, something to display to the user.
        comment: Option<String>,
@@ -253,7 +253,7 @@ pub enum EventType {
    ///
    /// @param data1 (usize) 0=error, 1-999=progress in permille, 1000=success and done
    /// @param data2 0
-    ImexProgress(u16),
+    ImexProgress(usize),

    /// A file has been exported. A file has been written by imex().
    /// This event may be sent multiple times by a single call to imex().
@@ -280,7 +280,7 @@ pub enum EventType {
        chat_type: Chattype,

        /// Progress, always 1000.
-        progress: u16,
+        progress: usize,
    },

    /// Progress information of a secure-join handshake from the view of the joiner
@@ -295,7 +295,7 @@ pub enum EventType {
        /// 400=vg-/vc-request-with-auth sent, typically shown as "alice@addr verified, introducing myself."
        /// (Bob has verified alice and waits until Alice does the same for him)
        /// 1000=vg-member-added/vc-contact-confirm received
-        progress: u16,
+        progress: usize,
    },

    /// The connectivity to the server changed.
@@ -417,15 +417,6 @@ pub enum EventType {
        chat_id: ChatId,
    },

-    /// One or more transports has changed or another transport is primary now.
-    ///
-    /// UI should update the list.
-    ///
-    /// This event is emitted when a transport
-    /// synchronization message modifies transports,
-    /// but not when the UI modifies the transport list by itself.
-    TransportsModified,
-
    /// Event for using in tests, e.g. as a fence between normally generated events.
    #[cfg(test)]
    Test,
--- a/src/headerdef.rs
+++ b/src/headerdef.rs
@@ -102,21 +102,6 @@ pub enum HeaderDef {
    /// used to encrypt and decrypt messages.
    /// This secret is sent to a new member in the member-addition message.
    ChatBroadcastSecret,
-    /// A message with a large attachment is split into two messages:
-    /// A pre-message, which contains everything but the attachment,
-    /// and a Post-Message.
-    /// The Pre-Message gets a `Chat-Post-Message-Id` header
-    /// referencing the Post-Message's rfc724_mid.
-    ChatPostMessageId,
-
-    /// Announces Post-Message metadata in a Pre-Message.
-    /// Contains a serialized `PostMsgMetadata` struct.
-    ChatPostMessageMetadata,
-
-    /// This message is preceded by a Pre-Message
-    /// and thus this message can be skipped while fetching messages.
-    /// This is an unprotected header.
-    ChatIsPostMessage,

    /// [Autocrypt](https://autocrypt.org/) header.
    Autocrypt,
@@ -153,18 +138,12 @@ pub enum HeaderDef {
    /// Advertised gossip topic for one webxdc.
    IrohGossipTopic,

-    /// See <https://www.rfc-editor.org/rfc/rfc9788.html#name-hp-outer-header-field>.
-    HpOuter,
-
    #[cfg(test)]
    TestHeader,
 }

 impl HeaderDef {
    /// Returns the corresponding header string.
-    ///
-    /// Format is lower-kebab-case for easy comparisons.
-    /// This method is used in message receiving and testing.
    pub fn get_headername(&self) -> &'static str {
        self.into()
    }
--- a/src/html.rs
+++ b/src/html.rs
@@ -169,28 +169,27 @@ impl HtmlMsgParser {
            MimeMultipartType::Single => {
                let mimetype = mail.ctype.mimetype.parse::<Mime>()?;
                if mimetype == mime::TEXT_HTML {
-                    if self.html.is_empty()
-                        && let Ok(decoded_data) = mail.get_body()
-                    {
-                        self.html = decoded_data;
+                    if self.html.is_empty() {
+                        if let Ok(decoded_data) = mail.get_body() {
+                            self.html = decoded_data;
+                        }
+                    }
+                } else if mimetype == mime::TEXT_PLAIN && self.plain.is_none() {
+                    if let Ok(decoded_data) = mail.get_body() {
+                        self.plain = Some(PlainText {
+                            text: decoded_data,
+                            flowed: if let Some(format) = mail.ctype.params.get("format") {
+                                format.as_str().eq_ignore_ascii_case("flowed")
+                            } else {
+                                false
+                            },
+                            delsp: if let Some(delsp) = mail.ctype.params.get("delsp") {
+                                delsp.as_str().eq_ignore_ascii_case("yes")
+                            } else {
+                                false
+                            },
+                        });
                    }
-                } else if mimetype == mime::TEXT_PLAIN
-                    && self.plain.is_none()
-                    && let Ok(decoded_data) = mail.get_body()
-                {
-                    self.plain = Some(PlainText {
-                        text: decoded_data,
-                        flowed: if let Some(format) = mail.ctype.params.get("format") {
-                            format.as_str().eq_ignore_ascii_case("flowed")
-                        } else {
-                            false
-                        },
-                        delsp: if let Some(delsp) = mail.ctype.params.get("delsp") {
-                            delsp.as_str().eq_ignore_ascii_case("yes")
-                        } else {
-                            false
-                        },
-                    });
                }
                Ok(())
            }
@@ -214,29 +213,31 @@ impl HtmlMsgParser {
            MimeMultipartType::Message => Ok(()),
            MimeMultipartType::Single => {
                let mimetype = mail.ctype.mimetype.parse::<Mime>()?;
-                if mimetype.type_() == mime::IMAGE
-                    && let Some(cid) = mail.headers.get_header_value(HeaderDef::ContentId)
-                    && let Ok(cid) = parse_message_id(&cid)
-                    && let Ok(replacement) = mimepart_to_data_url(mail)
-                {
-                    let re_string = format!(
-                        "(<img[^>]*src[^>]*=[^>]*)(cid:{})([^>]*>)",
-                        regex::escape(&cid)
-                    );
-                    match regex::Regex::new(&re_string) {
-                        Ok(re) => {
-                            self.html = re
-                                .replace_all(
-                                    &self.html,
-                                    format!("${{1}}{replacement}${{3}}").as_str(),
-                                )
-                                .as_ref()
-                                .to_string()
+                if mimetype.type_() == mime::IMAGE {
+                    if let Some(cid) = mail.headers.get_header_value(HeaderDef::ContentId) {
+                        if let Ok(cid) = parse_message_id(&cid) {
+                            if let Ok(replacement) = mimepart_to_data_url(mail) {
+                                let re_string = format!(
+                                    "(<img[^>]*src[^>]*=[^>]*)(cid:{})([^>]*>)",
+                                    regex::escape(&cid)
+                                );
+                                match regex::Regex::new(&re_string) {
+                                    Ok(re) => {
+                                        self.html = re
+                                            .replace_all(
+                                                &self.html,
+                                                format!("${{1}}{replacement}${{3}}").as_str(),
+                                            )
+                                            .as_ref()
+                                            .to_string()
+                                    }
+                                    Err(e) => warn!(
+                                        context,
+                                        "Cannot create regex for cid: {} throws {}", re_string, e
+                                    ),
+                                }
+                            }
                        }
-                        Err(e) => warn!(
-                            context,
-                            "Cannot create regex for cid: {} throws {}", re_string, e
-                        ),
                    }
                }
                Ok(())
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
iequidoo	267026b44e	feat: Do not copy Auto-Submitted header into outer part Before, copying Auto-Submitted to the outer headers was needed for moving such messages, e.g. multi-device sync messages, to the DeltaChat folder. Now all encrypted messages are moved.	2025-11-10 06:08:52 -03:00
iequidoo	22da92c563	feat: Do not copy Chat-Version header into outer part Chat-Version is used sometimes by Sieve filters to move messages to DeltaChat folder: `37beed6ad9/data/conf/dovecot/global_sieve_before` This probably prevents notifications to MUAs that don't watch DeltaChat but watch INBOX. There are however disadvantages to exposing Chat-Version: 1. Spam filters may not like this header and it is difficult or impossible to tell if `Chat-Version` plays role in rejecting the message or delivering it into Spam folder. If there is no such header visible to the spam filter, this possibility can be ruled out. 2. Replies to chat messages may have no `Chat-Version` but have to be moved anyway. 3. The user may have no control over the Sieve filter, but it comes preconfigured in mailcow, so it is not possible to disable it on the client. Thanks to link2xt for providing this motivation. NOTE: Old Delta Chat will assign partially downloaded replies to an ad-hoc group with the sender instead of the 1:1 chat, but we're removing partial downloads anyway.	2025-11-10 05:34:31 -03:00
iequidoo	357f7107a6	feat: Move all encrypted messages to mvbox if MvboxMove is on Before, only replies to chat messages were moved to the mvbox because we're removing Chat-Version from outer headers, but there's no much sense in moving only replies and not moving original messages and MDNs. Instead, move all encrypted messages. Users should be informed about this in UIs, so if a user has another PGP-capable MUA, probably they should disable MvboxMove. Moreover, untying this logic from References and In-Reply-To allows to remove them from outer headers too, the "Header Protection for Cryptographically Protected Email" RFC even suggests such a behavior: https://datatracker.ietf.org/doc/html/rfc9788#name-offering-more-ambitious-hea.	2025-11-10 05:34:31 -03:00
iequidoo	d96b4beff1	feat: Don't download group messages unconditionally There was a comment that group messages should always be downloaded to avoid inconsistent group state, but this is solved by the group consistency algo nowadays in the sense that inconsistent group state won't spread to other members if we send to the group. Moreover, encrypted messages are now always downloaded, and unencrypted chat replies too, and as for ad-hoc groups, `Config::ShowEmails` controls everything.	2025-11-10 05:34:31 -03:00
iequidoo	56c605fa0a	feat: imap: Don't prefetch Chat-Version; try to find out message encryption state instead Instead, prefetch Secure-Join, Content-Type and Subject headers, try to find out if the message is encrypted, i.e.: - if its Content-Type is "multipart/encrypted" - or Subject is "..." or "[...]" as some MUAs use "multipart/mixed"; we can't only look at Subject as it's not mandatory; and depending on this decide on the target folder and whether the message should be downloaded. There's no much sense in downloading unencrypted "Chat-Version"-containing messages if `ShowEmails` is `Off` or `AcceptedContacts`, unencrypted Delta Chat messages should be considered as usual emails, there's even the "New E-Mail" feature in UIs nowadays which sends such messages. Don't prefetch Auto-Submitted as well, this becomes unnecessary. Changed behavior: before, "Chat-Version"-containing messages were moved from INBOX to DeltaChat, now such encrypted messages may remain in INBOX -- if there's no parent message or it's not `MessengerMessage`. Don't unconditionally move encrypted messages yet because the account may be shared with other software which doesn't and shouldn't look into the DeltaChat folder.	2025-11-10 05:32:40 -03:00
@@ -1 +1 @@
 -01-22
 -11-05