remove shared-key

add-rust-environment-hash-key: false
save cache from this PR
2026-10-10 07:00:14 +03:00 · 2026-05-04 05:15:39 +02:00 · 2026-05-04 04:56:08 +02:00 · 2026-05-04 04:21:49 +02:00 · 2026-05-03 22:13:05 +02:00
212 changed files with 11804 additions and 12324 deletions
@@ -15,6 +15,6 @@ updates:
  - package-ecosystem: "github-actions"
    directory: "/"
    schedule:
-      interval: "monthly"
+      interval: "weekly"
    cooldown:
      default-days: 7
@@ -20,7 +20,7 @@ permissions: {}

 env:
  RUSTFLAGS: -Dwarnings
-  RUST_VERSION: 1.97.1
+  RUST_VERSION: 1.95.0

  # Minimum Supported Rust Version
  MSRV: 1.89.0
@@ -31,7 +31,7 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 60
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
@@ -42,8 +42,8 @@ jobs:
      - name: Cache rust cargo artifacts
        uses: swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4
        with:
-          save-if: ${{ github.ref == 'refs/heads/main' }}
-          cache-bin: false
+          save-if: false
+          add-rust-environment-hash-key: false
      - name: Run rustfmt
        run: cargo fmt --all -- --check
      - name: Run clippy
@@ -58,16 +58,30 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 60
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
-      - uses: EmbarkStudios/cargo-deny-action@3c6349835b2b7b196a839186cb8b78e02f7b5f25
+      - uses: EmbarkStudios/cargo-deny-action@91bf2b620e09e18d6eb78b92e7861937469acedb
        with:
          arguments: --workspace --all-features --locked
          command: check
          command-arguments: "-Dwarnings"

+  provider_database:
+    name: Check provider database
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          show-progress: false
+          persist-credentials: false
+      - name: Install rustfmt
+        run: rustup component add --toolchain stable-x86_64-unknown-linux-gnu rustfmt
+      - name: Check provider database
+        run: scripts/update-provider-database.sh
+
  docs:
    name: Rust doc comments
    runs-on: ubuntu-latest
@@ -75,15 +89,19 @@ jobs:
    env:
      RUSTDOCFLAGS: -Dwarnings
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
+
+      - run: rustup override set $RUST_VERSION
+        shell: bash
+
      - name: Cache rust cargo artifacts
        uses: swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4
        with:
-          save-if: ${{ github.ref == 'refs/heads/main' }}
-          cache-bin: false
+          save-if: false
+          add-rust-environment-hash-key: false
      - name: Rustdoc
        run: cargo doc --document-private-items --no-deps

@@ -114,7 +132,7 @@ jobs:
        shell: bash
        if: matrix.rust == 'latest'

-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
@@ -128,11 +146,17 @@ jobs:
      - name: Cache rust cargo artifacts
        uses: swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4
        with:
-          save-if: ${{ github.ref == 'refs/heads/main' }}
-          cache-bin: false
+          # Only save the cache from the main branch runs.
+          # No need for PRs to write to the cache.
+          ##save-if: ${{ github.ref == 'refs/heads/main' }}
+
+          # Do not hash Cargo.lock.
+          # We want the cache to be used later in PRs
+          # even if it updates some dependency.
+          add-rust-environment-hash-key: false

      - name: Install nextest
-        uses: taiki-e/install-action@3d7d7cd5ac7f994c1892ae0c06165095b9139094
+        uses: taiki-e/install-action@5f57d6cb7cd20b14a8a27f522884c4bc8a187458
        with:
          tool: nextest

@@ -157,19 +181,22 @@ jobs:
    runs-on: ${{ matrix.os }}
    timeout-minutes: 60
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false

+      - run: rustup override set $RUST_VERSION
+        shell: bash
+
      - name: Cache rust cargo artifacts
        uses: swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4
        with:
-          save-if: ${{ github.ref == 'refs/heads/main' }}
-          cache-bin: false
+          save-if: false
+          add-rust-environment-hash-key: false

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

      - name: Upload C library
        uses: actions/upload-artifact@v7
@@ -186,19 +213,22 @@ jobs:
    runs-on: ${{ matrix.os }}
    timeout-minutes: 60
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false

+      - run: rustup override set $RUST_VERSION
+        shell: bash
+
      - name: Cache rust cargo artifacts
        uses: swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4
        with:
-          save-if: ${{ github.ref == 'refs/heads/main' }}
-          cache-bin: false
+          save-if: false
+          add-rust-environment-hash-key: false

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

      - name: Upload deltachat-rpc-server
        uses: actions/upload-artifact@v7
@@ -212,7 +242,7 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 60
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
@@ -238,7 +268,7 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 60
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
@@ -288,7 +318,7 @@ jobs:
    runs-on: ${{ matrix.os }}
    timeout-minutes: 60
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
@@ -300,7 +330,7 @@ jobs:
          path: target/debug

      - name: Install python
-        uses: actions/setup-python@v7.0.0
+        uses: actions/setup-python@v6
        with:
          python-version: ${{ matrix.python }}

@@ -342,13 +372,13 @@ jobs:
    runs-on: ${{ matrix.os }}
    timeout-minutes: 60
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false

      - name: Install python
-        uses: actions/setup-python@v7.0.0
+        uses: actions/setup-python@v6
        with:
          python-version: ${{ matrix.python }}

@@ -30,11 +30,11 @@ jobs:
        arch: [aarch64, armv7l, armv6l, i686, x86_64]
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
-      - uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0
+      - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5

      - name: Build deltachat-rpc-server binaries
        run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-linux
@@ -54,11 +54,11 @@ jobs:
        arch: [aarch64, armv7l, armv6l, i686, x86_64]
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
-      - uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0
+      - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5

      - name: Build deltachat-rpc-server wheels
        run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-linux-wheel
@@ -78,11 +78,11 @@ jobs:
        arch: [win32, win64]
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
-      - uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0
+      - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5

      - name: Build deltachat-rpc-server binaries
        run: nix build .#deltachat-rpc-server-${{ matrix.arch }}
@@ -102,11 +102,11 @@ jobs:
        arch: [win32, win64]
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
-      - uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0
+      - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5

      - name: Build deltachat-rpc-server wheels
        run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-wheel
@@ -127,7 +127,7 @@ jobs:

    runs-on: macos-latest
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
@@ -153,11 +153,11 @@ jobs:
        arch: [arm64-v8a, armeabi-v7a]
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
-      - uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0
+      - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5

      - name: Build deltachat-rpc-server binaries
        run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-android
@@ -177,11 +177,11 @@ jobs:
        arch: [arm64-v8a, armeabi-v7a]
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
-      - uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0
+      - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5

      - name: Build deltachat-rpc-server wheels
        run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-android-wheel
@@ -204,11 +204,11 @@ jobs:
      contents: write
    runs-on: "ubuntu-latest"
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
-      - uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0
+      - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5

      - name: Download Linux aarch64 binary
        uses: actions/download-artifact@v7
@@ -382,7 +382,7 @@ jobs:

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

  publish_npm_package:
    name: Build & Publish npm prebuilds and deltachat-rpc-server
@@ -397,11 +397,11 @@ jobs:
      # Needed to publish the binaries to the release.
      contents: write
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
-      - uses: actions/setup-python@v7.0.0
+      - uses: actions/setup-python@v6
        with:
          python-version: "3.11"

@@ -513,12 +513,15 @@ jobs:
            deltachat-rpc-server/npm-package/*.tgz

      # Configure Node.js for publishing.
-      # Check <https://docs.npmjs.com/trusted-publishers> for the version requirements.
-      - uses: actions/setup-node@v7
+      - uses: actions/setup-node@v6
        with:
-          node-version: 24
+          node-version: 20
          registry-url: "https://registry.npmjs.org"
-          package-manager-cache: false  # never use caching in release builds
+
+      # 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'
@@ -14,7 +14,7 @@ jobs:
    name: Check that current version ends with -dev
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
@@ -17,18 +17,20 @@ jobs:
      id-token: write
      contents: read
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false

-      # Configure Node.js for publishing.
-      # Check <https://docs.npmjs.com/trusted-publishers> for the version requirements.
-      - uses: actions/setup-node@v7
+      - uses: actions/setup-node@v6
        with:
-          node-version: 24
+          node-version: 20
          registry-url: "https://registry.npmjs.org"
-          package-manager-cache: false  # never use caching in release builds
+
+      # 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
@@ -16,19 +16,16 @@ jobs:
  build_and_test:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
-      - name: Use Node.js 24
-        uses: actions/setup-node@v7
+      - name: Use Node.js 18.x
+        uses: actions/setup-node@v6
        with:
-          node-version: 24
+          node-version: 18.x
      - name: Add Rust cache
-        uses: swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4
-        with:
-          save-if: ${{ github.ref == 'refs/heads/main' }}
-          cache-bin: false
+        uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4
      - name: npm install
        working-directory: deltachat-jsonrpc/typescript
        run: npm install
@@ -21,11 +21,11 @@ jobs:
    name: check flake formatting
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
-      - uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0
+      - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5
      - run: nix fmt flake.nix -- --check

  build:
@@ -63,6 +63,7 @@ jobs:
          - deltachat-rpc-server-armv7l-linux-wheel
          - deltachat-rpc-server-i686-linux
          - deltachat-rpc-server-i686-linux-wheel
+          - deltachat-rpc-server-source
          - deltachat-rpc-server-win32
          - deltachat-rpc-server-win32-wheel
          - deltachat-rpc-server-win64
@@ -79,11 +80,11 @@ jobs:
          #- deltachat-rpc-server-x86_64-android
          #- deltachat-rpc-server-x86-android
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
-      - uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0
+      - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5
      - run: nix build .#${{ matrix.installable }}

  build-macos:
@@ -100,9 +101,9 @@ jobs:
          # because of <https://github.com/NixOS/nixpkgs/issues/413910>.
          # - deltachat-rpc-server-aarch64-darwin
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
-      - uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0
+      - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5
      - run: nix build .#${{ matrix.installable }}
@@ -13,7 +13,7 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
@@ -47,4 +47,4 @@ jobs:
          name: python-package-distributions
          path: dist/
      - name: Publish deltachat-rpc-client to PyPI
-        uses: pypa/gh-action-pypi-publish@ba38be9e461d3875417946c167d0b5f3d385a247
+        uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b
@@ -14,11 +14,11 @@ jobs:
    name: Build REPL example
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
-      - uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0
+      - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5
      - name: Build
        run: nix build .#deltachat-repl-win64
      - name: Upload binary
@@ -15,7 +15,7 @@ jobs:
      url: https://rs.delta.chat/

    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
@@ -27,7 +27,7 @@ jobs:
          mkdir -p "$HOME/.ssh"
          echo "${{ secrets.RS_DOCS_SSH_KEY }}" > "$HOME/.ssh/key"
          chmod 600 "$HOME/.ssh/key"
-          rsync -avzh -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/target/doc/ "${{ secrets.RS_DOCS_SSH_USER }}@rs.delta.chat:"
+          rsync -avzh -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/target/doc "${{ secrets.RS_DOCS_SSH_USER }}@rs.delta.chat:/var/www/html/rs.delta.chat/"

  build-python:
    runs-on: ubuntu-latest
@@ -36,12 +36,12 @@ jobs:
      url: https://py.delta.chat/

    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
          fetch-depth: 0 # Fetch history to calculate VCS version number.
-      - uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0
+      - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5
      - name: Build Python documentation
        run: nix build .#python-docs
      - name: Upload to py.delta.chat
@@ -49,7 +49,7 @@ jobs:
          mkdir -p "$HOME/.ssh"
          echo "${{ secrets.PY_DOCS_SSH_KEY }}" > "$HOME/.ssh/key"
          chmod 600 "$HOME/.ssh/key"
-          rsync -avzh --delete -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/result/html/ "${{ secrets.PY_DOCS_SSH_USER }}@py.delta.chat:"
+          rsync -avzh --delete -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/result/html/ "${{ secrets.PY_DOCS_SSH_USER }}@py.delta.chat:/var/www/html/py.delta.chat"

  build-c:
    runs-on: ubuntu-latest
@@ -58,12 +58,12 @@ jobs:
      url: https://c.delta.chat/

    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
          fetch-depth: 0 # Fetch history to calculate VCS version number.
-      - uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0
+      - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5
      - name: Build C documentation
        run: nix build .#docs
      - name: Upload to c.delta.chat
@@ -71,7 +71,7 @@ jobs:
          mkdir -p "$HOME/.ssh"
          echo "${{ secrets.C_DOCS_SSH_KEY }}" > "$HOME/.ssh/key"
          chmod 600 "$HOME/.ssh/key"
-          rsync -avzh --delete -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/result/html/ "${{ secrets.C_DOCS_SSH_USER }}@c.delta.chat:"
+          rsync -avzh --delete -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/result/html/ "${{ secrets.C_DOCS_SSH_USER }}@c.delta.chat:/var/www/html/c.delta.chat"

  build-ts:
    runs-on: ubuntu-latest
@@ -84,15 +84,15 @@ jobs:
        working-directory: ./deltachat-jsonrpc/typescript

    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
          fetch-depth: 0 # Fetch history to calculate VCS version number.
      - name: Use Node.js
-        uses: actions/setup-node@v7
+        uses: actions/setup-node@v6
        with:
-          node-version: 24
+          node-version: '18'
      - name: npm install
        run: npm install
      - name: npm run build
@@ -104,7 +104,7 @@ jobs:
          mkdir -p "$HOME/.ssh"
          echo "${{ secrets.JS_JSONRPC_DOCS_SSH_KEY }}" > "$HOME/.ssh/key"
          chmod 600 "$HOME/.ssh/key"
-          rsync -avzh --delete -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/deltachat-jsonrpc/typescript/docs/ "${{ secrets.JS_JSONRPC_DOCS_SSH_USER }}@js.jsonrpc.delta.chat:"
+          rsync -avzh --delete -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/deltachat-jsonrpc/typescript/docs/ "${{ secrets.JS_JSONRPC_DOCS_SSH_USER }}@js.jsonrpc.delta.chat:/var/www/html/js.jsonrpc.delta.chat/"

  build-cffi:
    runs-on: ubuntu-latest
@@ -113,7 +113,7 @@ jobs:
      url: https://cffi.delta.chat/

    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          show-progress: false
          persist-credentials: false
@@ -125,4 +125,4 @@ jobs:
          mkdir -p "$HOME/.ssh"
          echo "${{ secrets.CFFI_DOCS_SSH_KEY }}" > "$HOME/.ssh/key"
          chmod 600 "$HOME/.ssh/key"
-          rsync -avzh --delete -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/target/doc/ "${{ secrets.CFFI_DOCS_SSH_USER }}@delta.chat:"
+          rsync -avzh --delete -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/target/doc/ "${{ secrets.CFFI_DOCS_SSH_USER }}@delta.chat:/var/www/html/cffi.delta.chat/"
@@ -18,9 +18,9 @@ jobs:
      actions: read
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          persist-credentials: false

      - name: Run zizmor
-        uses: zizmorcore/zizmor-action@6fc4b006235f201fdab3722e17240ab420d580e5 # v0.6.1
+        uses: zizmorcore/zizmor-action@b1d7e1fb5de872772f31590499237e7cce841e8e # v0.5.3
@@ -1,530 +1,5 @@
 # Changelog

-## [2.58.0] - 2026-08-10
-
-### API-Changes
-
- [**breaking**] remove getPushState() and core's internal tracking of it
- [**breaking**] remove `dc_chatlist_get_context()`, because it was easy to misuse and likely led to crashes ([#8503](https://github.com/chatmail/core/pull/8503))
-  - instead, store reference-counted Context in `dc_msg_t`, `dc_contact_t` and `dc_chatlist_t`
- add "pinned messages" API.
-
-### Build system
-
- update all crates to Rust 2024 edition.
-
-### CI
-
- update github actions monthly instead of weekly.
-
-### Documentation
-
- clarify `ChatId::do_set_draft()` docs.
- add missing slash to ConnectionSecurity::Starttls doc comment.
-
-### Features / Changes
-
- send Autocrypt pgp key in MDNs occassionally and when relaylist changes.
- reduce unncessary gossipping of keys in group chats.
- stop requiring XDELTAPUSH capability for push notifications.
- prepare basic multi-relay onboarding ([#8444](https://github.com/chatmail/core/pull/8444))
- collect ICE servers from all relays.
- send messages to 5 relays instead of the newest 3 ones.
- allow to send reactions in broadcast channels ([#8450](https://github.com/chatmail/core/pull/8450)).
- allow only default reactions in channels broadcast ([#8545](https://github.com/chatmail/core/pull/8545)).
- resend pinned state in broadcast channels ([#8549](https://github.com/chatmail/core/pull/8549)).
-
-### Fixes
-
- **The primary transport is not synchronized between devices anymore.**
- Don't warn about correct EXIF orientation values. ([#8483](https://github.com/chatmail/core/pull/8483)).
- deltachat-rpc-client: don't depend on execnet for importing pytest plugin, remove deprecated "py" usage.
- send MDNs to all authentic relays of a contact, not just whatever `get_addr()` returns..
- mark `as_path()` function unsafe.
- python: create event emitter when EventThread is initialized.
- Don't download pre-message again if it is known already ([#8488](https://github.com/chatmail/core/pull/8488)).
- recognize self addresses in various places (instead of just the "primary").
- fix multi relay connectivity view ([#8550](https://github.com/chatmail/core/pull/8550)).
- ensure same-second primary transport change propagates correctly.
- invalidate `configured_addr` cache before sending transport sync message.
- prevent transport de-synchronization because of early fetch cancellation.
- improve connectivity HTML if quota info has an error.
-
-### Miscellaneous Tasks
-
- bump version to 2.58.0-dev.
- deps: bump actions/setup-python from 6 to 6.3.0.
- deps: bump zizmorcore/zizmor-action from 0.5.7 to 0.6.0.
- cargo: bump futures from 0.3.32 to 0.3.33.
- cargo: bump tokio from 1.52.3 to 1.53.0.
- cargo: bump regex from 1.12.4 to 1.13.1.
- disable "large futures" lint again.
- cargo: bump tokio-util from 0.7.18 to 0.7.19.
- deps: bump zizmorcore/zizmor-action from 0.6.0 to 0.6.1.
- deps: bump taiki-e/install-action from 2.83.4 to 2.85.1.
- cargo: bump `serde_json` from 1.0.150 to 1.0.151.
- deps: bump pypa/gh-action-pypi-publish from 1.14.0 to 1.14.1.
- deps: bump actions/setup-python from 6.3.0 to 7.0.0.
- cargo: introduce syn 3 dependency.
- cargo: bump anyhow from 1.0.103 to 1.0.104.
- cargo: bump serde from 1.0.228 to 1.0.229.
- cargo: bump thiserror from 2.0.18 to 2.0.19.
- cargo: bump libc from 0.2.186 to 0.2.189.
-
-### Performance
-
- Box::pin iroh::endpoint::Builder::bind in order to reduce memory usage.
-
-### Refactor
-
- use the new regex! macro.
- Remove FolderMeaning and `target_folder` ([#8456](https://github.com/chatmail/core/pull/8456)).
- Unify naming of direct/single/1:1/normal chats ([#8442](https://github.com/chatmail/core/pull/8442)).
- un-nest `prepare_msg_blob`.
- do not clean `imap_send` table on transport change.
- mark enabled ephemeral timer duration as NonZero.
- reduce the scope of unsafe in `dc_context_unref()`.
- mimefactory: separate rendering of message payload and sendable message.
-
-### Tests
-
- fix flaky `test_markseen_message_and_mdn` test.
- fix flaky `test_no_markseen_in_team_profile` ([#8500](https://github.com/chatmail/core/pull/8500)).
- Add `test_bcc_self`.
- Add test for unencrypted headers ([#8538](https://github.com/chatmail/core/pull/8538)).
- Assert log warnings and errors ([#8457](https://github.com/chatmail/core/pull/8457)).
-
-## [2.57.0] - 2026-07-25
-
-### API-Changes
-
- [**breaking**] remove heartbeat push notifications.
- [**breaking**] remove provider-db handling and provider lookup APIs.
-  - provider lookup APIs were removed from CFFI and JSON-RPC.
-
-also removes offline provider database code and generated provider data,
-provider-specific fields in configure/transport paths, and REPL providerinfo.
-
-### Documentation
-
- remove oauth2 from standards.
-
-### Features / Changes
-
- accept messages from key contacts with forged From address.
- enable TLS certificate compression.
- read SMTP recipient limit from relay IMAP metadata.
-
-### Fixes
-
- fixup CI failures.
- never merge outer To headers if standard header protection is used.
- Re-add oauth2 to serialized structs ([#8464](https://github.com/chatmail/core/pull/8464)).
- migrate transports configured on 2.56 to also have a oauth:false flag.
-
-### Miscellaneous Tasks
-
- bump version to 2.57.0-dev.
- deps: bump actions/setup-node from 6 to 7.
- deps: bump cachix/install-nix-action from 31.10.6 to 31.11.0.
- deps: bump EmbarkStudios/cargo-deny-action from 2.0.20 to 2.1.1.
- deps: bump taiki-e/install-action from 2.82.10 to 2.83.4.
- cargo: bump quinn-proto from 0.11.14 to 0.11.16.
-
-## [2.56.0] - 2026-07-21
-
-### API-Changes
-
- [**breaking**] remove all oauth support and drop DC_LP_AUTH flags.
-  - removed oauth2 module, dc_get_oauth2_url FFI function, DC_LP_AUTH flags and configured/serverflags, and the oauth2 parameter/field from SMTP/IMAP clients, JSON-RPC interfaces, and CLI tools.
-
-also contains regenerated provider data after dropping oauth in the update script.
-
-### Features / Changes
-
- do not set backup_time in exported databases.
-
-### Fixes
-
- revert 207c2e6e4c1bec43204c3b8a46fcbbff67d54b3f because some users reported problems with it.
-
-### Miscellaneous Tasks
-
- bump version to 2.56.0-dev.
-
-## [2.55.0] - 2026-07-20
-
-Minor release to fix CI because releasing 2.54.0 failed.
-
-### CI
-
- Update Node version to 24.
-
-## [2.54.0] - 2026-07-20
-
-### API-Changes
-
- [**breaking**] Deprecate `is_chatmail`.
-  - UIs should not behave differently for chatmail relays than for classical email servers; most usages of `is_chatmail` can be replaced by `force_encryption`.
- [**breaking**] `delete_transport()` must not be used by UIs anymore. Instead, `set_transport_unpublished()` must be called when a user clicks on "Remove".
- [**breaking**] `list_transports()` doesn't return unpublished relays anymore.
-  - UIs should use `list_transports()` rather than `list_transports_ex()`, because unpublished transports count as removed from the user point of view, and should not be shown in the relay list anymore.
- deltachat-rpc-client: add `Account.set_transport_unpublished()`.
- Add `MsgReadCountChanged` event.
-
-### Features / Changes
-
- Implement support for populating and maintaining a list of default relays ([#8341](https://github.com/chatmail/core/pull/8341)).
- Remove hidden relays automatically ([#8402](https://github.com/chatmail/core/pull/8402)).
- Automatically remove oldest unpublished relay in order to make space when the user wants to add more; don't allow more than 5 relays overall ([#8428](https://github.com/chatmail/core/pull/8428)).
- Add silent group changes messages as InNoticed, not InSeen.
- Remove `?emailaddress` argument from autoconfig URL that is not using a dedicated domain.
- Remove `imap::Session::sync_seen_flags()` ([#7742](https://github.com/chatmail/core/pull/7742)).
- Use CAPABILITY response code if IMAP LOGIN command returns it.
- Increase max idle timeout for iroh backup receiver to 60 seconds.
-
-### Fixes
-
- Request MDNs for resent channel messages.
- Make pre-messages w/o text want MDNs ([#8004](https://github.com/chatmail/core/pull/8004)).
- Make truncated edited messages have HTML for receivers ([#8249](https://github.com/chatmail/core/pull/8249)).
- Un-escape message footer marks in full messages (`get_html`) ([#8427](https://github.com/chatmail/core/pull/8427)).
- Hide synced chat if we only know its visibility ([#8343](https://github.com/chatmail/core/pull/8343)).
- Tombstone MDN before sending it ([#8252](https://github.com/chatmail/core/pull/8252)).
- Recreate `imap_markseen` with `PRIMARY KEY` constraint.
- Rerun the full securejoin protocol if the address was outdated ([#8358](https://github.com/chatmail/core/pull/8358)).
- Return early from `receive_imf` to not tombstone Iroh-Node-Addr message if webxdc instance isn't found ([#8372](https://github.com/chatmail/core/pull/8372)).
- Replace `last_added_location_id` with `last_added_location_timestamp`.
- Do not put locations into pre-messages.
- RUSTSEC-2026-0204 ([#8403](https://github.com/chatmail/core/pull/8403)).
- Ensure public key signatures are not in the past compared to the public key.
- Do not bubble up errors in IMAP candidate loop.
- Do not log errors if full message is not available on any transport.
- Apply reactions that arrived before the message at later time ([#8415](https://github.com/chatmail/core/pull/8415)).
-
-### Performance
-
- Add timestamp to `msgs_index7` and speed up `Chatlist::try_load()` ([#7848](https://github.com/chatmail/core/pull/7848)).
-
-### CI
-
- Update Rust to 1.97.1.
- rrsync prepends the restricted upload path, we need to leave it out ([#8405](https://github.com/chatmail/core/pull/8405)).
-
-### Documentation
-
- Update STYLE.md: macros should be used only when necessary ([#8410](https://github.com/chatmail/core/pull/8410)).
- `create_group_chat_unencrypted()` may lead to chat split on the first device.
-
-### Refactor
-
- Deprecate unused `SkipAutocrypt` param.
- Remove commented out `RenderedEmail.envelope`.
- Remove the ability to send messages with non-standard header protection.
- Make `crate::pgp::symm_encrypt_message` non-async.
- Move `ensure_secret_key_exists` into key.rs.
- Improve comment ([#8366](https://github.com/chatmail/core/pull/8366)).
- Remove `set_modseq()` function.
- Remove unnecessary reference in format string.
- Label the loop iterating over the candidates.
- Remove `GROUP BY c.id` from chatlist queries.
-
-### Tests
-
- securejoin: Check that "vc-{,request-}pubkey" messages don't contain displayname.
-
-### Miscellaneous Tasks
-
- bump version to 2.54.0-dev.
- deps: bump taiki-e/install-action from 2.81.1 to 2.81.8.
- deps: bump taiki-e/install-action from 2.81.8 to 2.81.11.
- update rPGP from 0.19.0 to 0.20.0.
- update astral-tokio-tar from 0.6.2 to 0.6.3.
- deps: bump anyhow to 1.0.103.
- deps: bump actions/checkout from 6 to 7.
- cargo: bump syn from 2.0.117 to 2.0.118.
- cargo: bump quote from 1.0.45 to 1.0.46.
- cargo: bump bytes from 1.11.1 to 1.12.0.
- cargo: bump regex from 1.12.3 to 1.12.4.
- cargo: bump log from 0.4.31 to 0.4.33.
- cargo: bump hyper from 1.9.0 to 1.10.1.
- deps: bump zizmorcore/zizmor-action from 0.5.6 to 0.5.7.
- cargo: bump chrono from 0.4.44 to 0.4.45.
- update quick-xml to 0.41.0.
- cargo: bump brotli from 8.0.2 to 8.0.4.
- cargo: bump smallvec from 1.15.1 to 1.15.2.
- deps: bump taiki-e/install-action from 2.81.11 to 2.82.6.
- update yanked spin@0.9.8 and spin@0.10.0.
- deps: bump taiki-e/install-action from 2.82.6 to 2.82.10.
- update async-imap to 0.11.3.
-
-## [2.53.0] - 2026-06-15
-
-### Features / Changes
-
- Make quality of images sent in chats more consistent between images with different aspect ratio.
- `MsgId::get_html`: Make only one db query.
- Do not log the recipient list for sent messages.
-
-### Fixes
-
- Do not trash pre-messages without text but with a webxdc update.
- Don't send or process webxdc status updates in pre-messages.
- Ignore SecureJoin messages from blocked contacts ([#8295](https://github.com/chatmail/core/pull/8295)).
- Do not abort IMAP connection if setting the push token fails.
-
-### Documentation
-
- STYLE.md: Require to list columns explicitly in `INSERT` statements.
-
-### Build system
-
- nix: switch to the "master" branch for naersk.
- flake.nix: Use hostPlatform.rust.rustcTarget instead of hardcoding it.
-
-### Miscellaneous Tasks
-
- Bump version to 2.52.0-dev.
- deps: bump taiki-e/install-action from 2.79.10 to 2.81.1.
- deps: bump EmbarkStudios/cargo-deny-action from 2.0.19 to 2.0.20.
- Bump version to 2.53.0-dev.
-
-### Refactor
-
- Move the definition of the `target_wh`-variable.
- Remove timesmearing.
-
-### Tests
-
- Print multiline chat descriptions with debug formatter.
- `exec_securejoin_qr_multi_device()`: Make inviter devices receive each other messages.
- Fixup the tests after removing timesmearing.
- Remove timeout from `pop_sent_msg_ex()`.
-
-## [2.52.0] - 2026-06-09
-
-### Fixes
-
- Update the channel title after joining if the QR code included a wrong title ([#8260](https://github.com/chatmail/core/pull/8260)).
- Don't send removal message to contact that hasn't been a chat member ([#8298](https://github.com/chatmail/core/pull/8298)).
-
-### Features / Changes
-
- Add cryptography-related statistics (`number_of_transports`, `key_version`, `key_algorithm`, `pubkey_size`, `number_of_keys`) ([#8293](https://github.com/chatmail/core/pull/8293), [#8297](https://github.com/chatmail/core/pull/8297)).
- Add IMAP folder to `Context::get_info()` ([#8285](https://github.com/chatmail/core/pull/8285)).
-
-### Miscellaneous Tasks
-
- Update preloaded DNS cache.
- Use default aws-lc-rs cryptography provider for rustls.
- Add exception for unmaintained proc-macro-error2 to deny.toml.
- cargo: bump `pin-project` from 1.1.11 to 1.1.13.
- cargo: bump `tokio` from 1.52.1 to 1.52.3.
- cargo: bump `log` from 0.4.29 to 0.4.30.
- cargo: bump `serde_json` from 1.0.149 to 1.0.150.
- deps: bump EmbarkStudios/cargo-deny-action from 2.0.18 to 2.0.19.
- deps: bump taiki-e/install-action from 2.79.2 to 2.79.10.
-
-### Build system
-
- nix: fix windows cross-compilation by adding pthreads includes.
-
-### Refactor
-
- Remove support for building "source" packages for deltachat-rpc-server.
-
-## [2.51.0] - 2026-05-29
-
-### Features / Changes
-
- Follow certificate check parameter in autoconfig.
- Immediately remove all encrypted messages from the server in single-device mode.
-
-### Fixes
-
- Fix syntax error in `only_fetch_mvbox` migration 150 resulting in failure to upgrade for `only_fetch_mvbox` users.
- Do not try to resolve proxy IPv6 addresses in square brackets.
- Do not fail to receive post-message with status updates for deleted webxdc.
- Don't make message `OutDelivered` after successful resending to new broadcast member.
-
-### Build system
-
- nix: fix downloads from crates.io in nix builds.
-
-### Documentation
-
- Fix reference in `delete_expired_imap_messages` comment.
-
-### Refactor
-
- Remove `pre_encrypt_mime_hook`.
- Make `should_delete_all_downloaded_messages` non-async.
-
-### Tests
-
- Test IPv6 addresses in HTTP(S) proxies.
- Test `bcc_self` in `test_delete_expired_imap_messages`.
- Test encrypted messages in `test_delete_expired_imap_messages`.
-
-### Miscellaneous Tasks
-
- Bump version to 2.51.0-dev.
- deps: bump zizmorcore/zizmor-action from 0.5.3 to 0.5.6.
- deps: bump taiki-e/install-action from 2.78.1 to 2.79.2.
-
-## [2.50.0] - 2026-05-22
-
-### API-Changes
-
- Add JSON-RPC APIs for location streaming.
- [**breaking**] Remove unused config `smtp_certificate_checks`.
- Deprecate old server config keys that were replaced by `add_or_update_transport()`.
- [**breaking**] remove `dc_delete_all_locations`.
- [**breaking**] Remove unused `info_only` option when loading a chatlist ([#8171](https://github.com/chatmail/core/pull/8171)).
- [**breaking**] location: avoid repeating module name in function names
- [**breaking**] deltachat-rpc-client: remove deprecated `get_fresh_messages_in_arrival_order()`.
- Remove unused `set_draft_vcard()` JSON-RPC API.
- Remove mostly-unused `sign_unencrypted` config ([#8190](https://github.com/chatmail/core/pull/8190)).
-
-### Features / Changes
-
- [**breaking**] Remove `mvbox_move` and `only_fetch_mvbox` configs. Transports have `folder` configuration to watch the folder other than `INBOX` as a replacement for `only_fetch_mvbox`. Non-chatmail transports no longer watch mvbox, each transport watches exactly one folder now.
- Add `force_encryption` config to ignore incoming unencrypted messages and enforce encryption for outgoing messages.
- Remove "Delete Messages from Server" (`delete_server_after`) config ([#8240](https://github.com/chatmail/core/pull/8240)).
- Remove `show_emails` config.
- Remove non-sticker heuristics and `force_sticker()`. UIs should make sure not to send images from gallery such as screenshots as stickers.
- Enable PQC (Post-Quantum Cryptography) support for OpenPGP. We do not generate PQC keys yet, this step is needed for forward compatibility.
- Resend the last 10 messages to new broadcast member ([#8151](https://github.com/chatmail/core/pull/8151)).
- Allow TLS connections with invalid certificate if the key is unchanged.
- Add `is_app_sender` and `is_broadcast` contexts for webxdc.
- Increase the resolution-limit `WORSE_AVATAR_SIZE` from 128 to 256.
- Change multiplier to 7/8 when scaling down avatars.
- Add error cause to connectivity view for IMAP errors.
- Remove the largely-unused ability to send multiple reactions to one message ([#8131](https://github.com/chatmail/core/pull/8131)).
- Don't show non-delivery-notfications in broadcast channels ([#8159](https://github.com/chatmail/core/pull/8159)).
- Adapt quota warning to automatic cleanup.
- Remove `Content-Description` and `Content-Disposition` from `multipart/encrypted` parts.
- Log all connection attempt errors instead of the first one.
- Remove workaround for old filtermail (part of chatmail relay) which expected exact number of newlines in OpenPGP messages.
- Remove key fingerprint from `Context.get_info()`.
- Mask local part of email addresses in `used_transport_settings`.
-
-### Fixes
-
- Trash no-op messages about self being added to groups.
- `decide_chat_assignment`: Log correct `post_msg_exists` value.
- Don't send `Chat-Group-Name*` headers for InBroadcast-s.
- Restart io on transport deletion.
- Never remove primary transport when applying `SyncTransports` message.
- Set Param::GuaranteeE2ee before preparing message blob ([#8090](https://github.com/chatmail/core/pull/8090)).
- `fetch_single_msg()`: Lock `fetch_msgs_mutex` before fetching.
- Set dir to "auto" in body tag when converting plain-text to HTML ([#8227](https://github.com/chatmail/core/pull/8227)).
- Scale up contacts messaged in groups to `IncomingTo`.
- Do not sort prefetched messages by INTERNALDATE.
- Don't resort re-sent message to the bottom ([#8145](https://github.com/chatmail/core/pull/8145)).
- Ensure that message being sent is added to the bottom ([#8027](https://github.com/chatmail/core/pull/8027)).
- Don't receive message if a deletion request was received before ([#8143](https://github.com/chatmail/core/pull/8143)).
- Emit `MsgsChanged`, not `IncomingMsg`, for messages only having special parts ([#8157](https://github.com/chatmail/core/pull/8157)).
- Generate new pre-message `Message-ID` when forwarding.
- use correct dir converting plaintext to HTML ([#8248](https://github.com/chatmail/core/pull/8248)).
- hide connectivity HTML quota if not supported.
- Delete pre-messages on the server for single-device chatmail transports ([#8240](https://github.com/chatmail/core/pull/8240)).
-
-### Build system
-
- Upgrade rustls-webpki to 0.103.12.
- Remove coredeps `Dockerfile`.
- Increase MSRV to 1.89.
-
-### CI
-
- Remove Concourse CI pipelines.
- Update Rust to 1.95.0.
- Do not store Rust cache from PRs.
- Set cache-bin to "false" for `swatinem/rust-cache` action.
- Use `--locked` flag with `cargo build`.
- Upgrade `cargo-deny-action` to v2.0.17.
-
-### Documentation
-
- Update `echobot_no_hooks.py` example.
- Discourage  `into()`, `try_into()` and `parse()` ([#8180](https://github.com/chatmail/core/pull/8180)).
- Remove outdated comment about "quota warning" device message.
- Update README.md: Use ci-chatmail instead of nine ([#8238](https://github.com/chatmail/core/pull/8238)).
- spec: remove AEAP section.
-
-### Performance
-
- Enable `clippy::large_futures` lint.
- Stop sending locations concurrently.
- Set location for all accounts in parallel.
- `is_self_addr()`: Employ the config cache to optimize for `ConfiguredAddr` passed.
-
-### Refactor
-
- Get rid of `MessageState::{OutPreparing,OutMdnRcvd}` in the db.
- Make HTML parser non-async.
- Replace `HashSet` with `BTreeSet`.
- Rename `EnteredLoginParam::load()` and save() to `load_legacy()` and `save_legacy()`.
- Remove unnecessary async block in `dc_set_location`.
- Remove unused Authentication-Results parsing ([#8172](https://github.com/chatmail/core/pull/8172)).
- Remove mostly-unused function `get_secondary_self_addrs()` ([#8173](https://github.com/chatmail/core/pull/8173)).
- Use `self_fingerprint()` where it makes sense ([#8174](https://github.com/chatmail/core/pull/8174)).
- Split `is_sending_locations_to_chat()` into two functions.
- Use regular functions rather than FromStr impls ([#8178](https://github.com/chatmail/core/pull/8178)).
- Make `Fingerprint` not implement `Display` ([#8177](https://github.com/chatmail/core/pull/8177)).
- Don't temporarily extend `signatures` for signed-only messages.
- Use some more let..else.
- Remove outdated comment.
- Un-nest `handle_edit_delete`.
- Drop support for replacing partial download stubs.
-
-### Tests
-
- Use `displayname` instead of `show_emails` for config cache test.
- Remove unused test data related to Authentication-Result parsing ([#8175](https://github.com/chatmail/core/pull/8175)).
- `EventTracker::get_matching_opt`: Return the first matching event, not last.
- Set email addresses explicitly for the test accounts.
- Use encrypted messages in more tests.
- Add `TestContext.allow_unencrypted()`.
- Online test for legacy Secure-Join key request.
-
-### Miscellaneous Tasks
-
- cargo: bump rand from 0.9.2 to 0.9.3.
- deps: bump taiki-e/install-action from 2.64.0 to 2.74.0.
- add exception for RUSTSEC-2026-0097.
- deps: bump swatinem/rust-cache from 2.8.2 to 2.9.1.
- cargo: upgrade rand 0.8.5 to rand 0.8.6.
- deps: bump zizmorcore/zizmor-action from 0.5.2 to 0.5.3.
- deps: bump pypa/gh-action-pypi-publish from 1.13.0 to 1.14.0.
- update provider database.
- cargo: update rustls-webpki to 0.103.13.
- cargo: bump openssl from 0.10.72 to 0.10.78.
- Apply rustmft after the previous commit.
- json-rpc: deprecate `send_sticker` ([#8189](https://github.com/chatmail/core/pull/8189)).
- deps: bump cachix/install-nix-action from 31.9.1 to 31.10.5.
- deps: bump taiki-e/install-action from 2.75.10 to 2.75.19.
- update astral-tokio-tar from 0.6.0 to 0.6.1.
- add exceptions for hickory-proto 0.25.2 in deny.toml.
- cargo: bump blake3 from 1.8.3 to 1.8.5.
- deny.toml: add cpufeatures duplicate dependency exception.
- cargo: bump hyper from 1.8.1 to 1.9.0.
- cargo: bump tokio from 1.50.0 to 1.52.1.
- cargo: bump libc from 0.2.184 to 0.2.186.
- cargo: bump colorutils-rs from 0.7.6 to 0.8.0.
- cargo: bump data-encoding from 2.10.0 to 2.11.0.
- cargo: bump openssl from 0.10.78 to 0.10.79.
- deps: bump taiki-e/install-action from 2.75.19 to 2.77.1.
- deps: bump cachix/install-nix-action from 31.10.5 to 31.10.6.
- allow passing arguments to scripts/clippy.sh.
- clippy::useless-borrows-in-formatting fixes.
- update zerocopy from 0.7.32 to 0.7.35.
- upgrade astral-tokio-tar to 0.6.2 ([#8255](https://github.com/chatmail/core/pull/8255)).
- deps: bump EmbarkStudios/cargo-deny-action from 2.0.17 to 2.0.18.
- cargo: bump openssl from 0.10.79 to 0.10.80.
- deps: bump taiki-e/install-action from 2.77.1 to 2.78.1.
-
 ## [2.49.0] - 2026-04-13

 ### Features / Changes
@@ -8628,12 +8103,3 @@ https://github.com/chatmail/core/pulls?q=is%3Apr+is%3Aclosed
 [2.47.0]: https://github.com/chatmail/core/compare/v2.46.0..v2.47.0
 [2.48.0]: https://github.com/chatmail/core/compare/v2.47.0..v2.48.0
 [2.49.0]: https://github.com/chatmail/core/compare/v2.48.0..v2.49.0
-[2.50.0]: https://github.com/chatmail/core/compare/v2.49.0..v2.50.0
-[2.51.0]: https://github.com/chatmail/core/compare/v2.50.0..v2.51.0
-[2.52.0]: https://github.com/chatmail/core/compare/v2.51.0..v2.52.0
-[2.53.0]: https://github.com/chatmail/core/compare/v2.52.0..v2.53.0
-[2.54.0]: https://github.com/chatmail/core/compare/v2.53.0..v2.54.0
-[2.55.0]: https://github.com/chatmail/core/compare/v2.54.0..v2.55.0
-[2.56.0]: https://github.com/chatmail/core/compare/v2.55.0..v2.56.0
-[2.57.0]: https://github.com/chatmail/core/compare/v2.56.0..v2.57.0
-[2.58.0]: https://github.com/chatmail/core/compare/v2.57.0..v2.58.0
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "2.58.0"
+version = "2.50.0-dev"
 edition = "2024"
 license = "MPL-2.0"
 rust-version = "1.89"
@@ -44,7 +44,7 @@ ratelimit = { path = "./deltachat-ratelimit" }
 anyhow = { workspace = true }
 async-broadcast = "0.7.2"
 async-channel = { workspace = true }
-async-imap = { version = "0.11.3", default-features = false, features = ["runtime-tokio", "compress"] }
+async-imap = { version = "0.11.1", default-features = false, features = ["runtime-tokio", "compress"] }
 async-native-tls = { version = "0.6", default-features = false, features = ["runtime-tokio"] }
 async-smtp = { version = "0.10.2", default-features = false, features = ["runtime-tokio"] }
 async_zip = { version = "0.0.18", default-features = false, features = ["deflate", "tokio-fs"] }
@@ -53,7 +53,7 @@ blake3 = "1.8.2"
 brotli = { version = "8", default-features=false, features = ["std"] }
 bytes = "1"
 chrono = { workspace = true, features = ["alloc", "clock", "std"] }
-colorutils-rs = { version = "0.8.0", default-features = false }
+colorutils-rs = { version = "0.7.5", default-features = false }
 data-encoding = "2.9.0"
 escaper = "0.1"
 fast-socks5 = "1"
@@ -78,10 +78,10 @@ num-derive = "0.4"
 num-traits = { workspace = true }
 parking_lot = "0.12.4"
 percent-encoding = "2.3"
-pgp = { version = "0.20.0", features = ["draft-pqc"], default-features = false }
+pgp = { version = "0.19.0", default-features = false }
 pin-project = "1"
 qrcodegen = "1.7.0"
-quick-xml = { version = "0.41", features = ["escape-html"] }
+quick-xml = { version = "0.39", features = ["escape-html"] }
 rand-old = { package = "rand", version = "0.8" }
 rand = { workspace = true }
 regex = { workspace = true }
@@ -89,6 +89,7 @@ rusqlite = { workspace = true, features = ["sqlcipher"] }
 sanitize-filename = { workspace = true }
 sdp = "0.17.1"
 serde_json = { workspace = true }
+serde_urlencoded = "0.7.1"
 serde = { workspace = true, features = ["derive"] }
 sha-1 = "0.10"
 sha2 = "0.10"
@@ -100,9 +101,9 @@ tagger = "4.3.4"
 textwrap = "0.16.2"
 thiserror = { workspace = true }
 tokio-io-timeout = "1.2.1"
-tokio-rustls = { version = "0.26.2", default-features = false, features = ["tls12", "brotli"] }
+tokio-rustls = { version = "0.26.2", default-features = false }
 tokio-stream = { version = "0.1.17", features = ["fs"] }
-astral-tokio-tar = { version = "0.6.3", default-features = false }
+astral-tokio-tar = { version = "0.6.1", default-features = false }
 tokio-util = { workspace = true }
 tokio = { workspace = true, features = ["fs", "rt-multi-thread", "macros"] }
 toml = "0.9"
@@ -59,13 +59,6 @@ If column is already declared without `NOT NULL`, use `IFNULL` function to provi
 Use `HAVING COUNT(*) > 0` clause
 to [prevent aggregate functions such as `MIN` and `MAX` from returning `NULL`](https://stackoverflow.com/questions/66527856/aggregate-functions-max-etc-return-null-instead-of-no-rows).

-List columns explicitly in `INSERT` statements:
-```
-INSERT OR IGNORE INTO download (rfc724_mid, msg_id) VALUES (?,0);
-```
-Otherwise if a new column with default value is added in a future DB version, an upgraded DB can't
-be used with the old code, e.g. after transferring a DB from a device running a newer version.
-
 Don't delete unused columns too early, but maybe after several months/releases, unused columns are
 still used by older versions, so deleting them breaks downgrading the core or importing a backup in
 an older version. Also don't change the column type, consider adding a new column with another name
@@ -181,10 +174,3 @@ Calling `into()`, `try_into()` or `parse()`
 creates an indirection,
 which is hard to follow for people who are not familiar with Rust,
 or who are not using rust-analyzer.
-
-## Use macros only when really needed
-
-Macros can be hard to read for people unfamiliar with Rust,
-and can have surprising effects like evaluating arguments multiple times.
-Therefore, macros should only be used when really needed;
-using functions is usually better.
@@ -1,7 +1,7 @@
 [package]
 name = "deltachat-contact-tools"
 version = "0.0.0" # No semver-stable versioning
-edition = "2024"
+edition = "2021"
 description = "Contact-related tools, like parsing vcards and sanitizing name and address. Meant for internal use in the deltachat crate."
 license = "MPL-2.0"

@@ -29,16 +29,17 @@

 use std::fmt;
 use std::ops::Deref;
+use std::sync::LazyLock;

-use anyhow::Result;
 use anyhow::bail;
-use regex::regex;
+use anyhow::Result;
+use regex::Regex;

 mod vcard;
-pub use vcard::{VcardContact, make_vcard, parse_vcard};
+pub use vcard::{make_vcard, parse_vcard, VcardContact};

 /// Valid contact address.
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone)]
 pub struct ContactAddress(String);

 impl Deref for ContactAddress {
@@ -87,7 +88,9 @@ impl rusqlite::types::ToSql for ContactAddress {
 /// - Removes special characters from the name, see [`sanitize_name()`]
 /// - Removes the name if it is equal to the address by setting it to ""
 pub fn sanitize_name_and_addr(name: &str, addr: &str) -> (String, String) {
-    let (name, addr) = if let Some(captures) = regex!("(.*)<(.*)>").captures(addr.as_ref()) {
+    static ADDR_WITH_NAME_REGEX: LazyLock<Regex> =
+        LazyLock::new(|| Regex::new("(.*)<(.*)>").unwrap());
+    let (name, addr) = if let Some(captures) = ADDR_WITH_NAME_REGEX.captures(addr.as_ref()) {
        (
            if name.is_empty() {
                captures.get(1).map_or("", |m| m.as_str())
@@ -1,8 +1,10 @@
+use std::sync::LazyLock;
+
 use anyhow::Context as _;
 use anyhow::Result;
 use chrono::DateTime;
 use chrono::NaiveDateTime;
-use regex::regex;
+use regex::Regex;

 use crate::sanitize_name_and_addr;

@@ -208,7 +210,9 @@ pub fn parse_vcard(vcard: &str) -> Vec<VcardContact> {
    }

    // Remove line folding, see https://datatracker.ietf.org/doc/html/rfc6350#section-3.2
-    let unfolded_lines = regex!("\r?\n[\t ]").replace_all(vcard, "");
+    static NEWLINE_AND_SPACE_OR_TAB: LazyLock<Regex> =
+        LazyLock::new(|| Regex::new("\r?\n[\t ]").unwrap());
+    let unfolded_lines = NEWLINE_AND_SPACE_OR_TAB.replace_all(vcard, "");

    let mut lines = unfolded_lines.lines().peekable();
    let mut contacts = Vec::new();
@@ -220,10 +220,7 @@ END:VCARD
        assert_eq!(contacts[0].addr, "bob@example.org".to_string());
        assert_eq!(contacts[0].authname, "Bob".to_string());
        assert_eq!(contacts[0].key, None);
-        assert_eq!(
-            contacts[0].profile_image.as_deref().unwrap(),
-            "/9j/4AAQSkZJRgABAQAAAQABAAD/4gIoSUNDX1BST0ZJTEUAAQEAAAIYAAAAAAQwAABtbnRyUkdCIFhZWiAAAAAAAAAAAAAAAABhY3NwAAAAAAAAAAAAAAAAL8bRuAJYoZUYrI4ZY3VWwxw4Ay28AAGBISScmf/2Q=="
-        );
+        assert_eq!(contacts[0].profile_image.as_deref().unwrap(), "/9j/4AAQSkZJRgABAQAAAQABAAD/4gIoSUNDX1BST0ZJTEUAAQEAAAIYAAAAAAQwAABtbnRyUkdCIFhZWiAAAAAAAAAAAAAAAABhY3NwAAAAAAAAAAAAAAAAL8bRuAJYoZUYrI4ZY3VWwxw4Ay28AAGBISScmf/2Q==");
    }
 }

@@ -247,10 +244,7 @@ END:VCARD",
    assert_eq!(contacts.len(), 1);
    assert_eq!(&contacts[0].addr, "alice@example.org");
    assert_eq!(&contacts[0].authname, "Alice Wonderland");
-    assert_eq!(
-        contacts[0].key.as_ref().unwrap(),
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    );
+    assert_eq!(contacts[0].key.as_ref().unwrap(), "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
    assert!(contacts[0].timestamp.is_err());
    assert_eq!(contacts[0].profile_image, None);
 }
@@ -278,15 +272,9 @@ END:VCARD",
    assert_eq!(contacts.len(), 1);
    assert_eq!(&contacts[0].addr, "alice@example.org");
    assert_eq!(&contacts[0].authname, "Alice");
-    assert_eq!(
-        contacts[0].key.as_ref().unwrap(),
-        "xsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa=="
-    );
+    assert_eq!(contacts[0].key.as_ref().unwrap(), "xsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa==");
    assert!(contacts[0].timestamp.is_err());
-    assert_eq!(
-        contacts[0].profile_image.as_ref().unwrap(),
-        "/9aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Z"
-    );
+    assert_eq!(contacts[0].profile_image.as_ref().unwrap(), "/9aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Z");
 }

 #[test]
@@ -1,8 +1,8 @@
 [package]
 name = "deltachat_ffi"
-version = "2.58.0"
+version = "2.50.0-dev"
 description = "Deltachat FFI"
-edition = "2024"
+edition = "2018"
 readme = "README.md"
 license = "MPL-2.0"

@@ -19,6 +19,7 @@ typedef struct _dc_chat      dc_chat_t;
 typedef struct _dc_msg       dc_msg_t;
 typedef struct _dc_contact   dc_contact_t;
 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;
@@ -412,6 +413,11 @@ char*           dc_get_blobdir               (const dc_context_t* context);
 *                    Messages in the "saved messages" chat (see dc_chat_is_self_talk()) are skipped.
 *                    Messages are deleted whether they were seen or not, the UI should clearly point that out.
 *                    See also dc_estimate_deletion_cnt().
+ * - `delete_server_after` = 0=do not delete messages from server automatically (default),
+ *                    1=delete messages directly after receiving from server, mvbox is skipped.
+ *                    >1=seconds, after which messages are deleted automatically from the server, mvbox is used as defined.
+ *                    "Saved messages" are deleted from the server as well as emails, the UI should clearly point that out.
+ *                    See also dc_estimate_deletion_cnt().
 * - `media_quality` = DC_MEDIA_QUALITY_BALANCED (0) =
 *                    good outgoing images/videos/voice quality at reasonable sizes (default)
 *                    DC_MEDIA_QUALITY_WORSE (1)
@@ -461,10 +467,7 @@ char*           dc_get_blobdir               (const dc_context_t* context);
 * - `gossip_period` = How often to gossip Autocrypt keys in chats with multiple recipients, in
 *                    seconds. 2 days by default.
 *                    This is not supposed to be changed by UIs and only used for testing.
- * - `is_chatmail`  = (deprecated) 1 if the the server is a chatmail server, 0 otherwise.
- *                    This is deprecated, UIs should not behave differently
- *                    for chatmail relays and classical email servers.
- *                    Most usages in UIs can be replaced by `force_encryption`.
+ * - `is_chatmail` = 1 if the the server is a chatmail server, 0 otherwise.
 * - `is_muted`     = Whether a context is muted by the user.
 *                    Muted contexts should not sound, vibrate or show notifications.
 *                    In contrast to `dc_set_chat_mute_duration()`,
@@ -484,7 +487,6 @@ char*           dc_get_blobdir               (const dc_context_t* context);
 *                       0 = Everybody (except explicitly blocked contacts),
 *                       1 = Contacts (default, does not include contact requests),
 *                       2 = Nobody (calls never result in a notification).
- * - `force_encryption` = 1 (default) to force encryption, 0 to allow unencrypted messages.
 *
 * Also, there are configs that are only needed
 * if you want to use the deprecated dc_configure() API, such as:
@@ -502,6 +504,7 @@ char*           dc_get_blobdir               (const dc_context_t* context);
 * - `send_pw`      = SMTP-password, guessed if left out
 * - `send_port`    = SMTP-port, guessed if left out
 * - `send_security`= SMTP-socket, one of @ref DC_SOCKET, defaults to #DC_SOCKET_AUTO
+ * - `server_flags` = IMAP-/SMTP-flags as a combination of @ref DC_LP flags, guessed if left out
 * - `proxy_enabled` = Proxy enabled. Disabled by default.
 * - `proxy_url` = Proxy URL. May contain multiple URLs separated by newline, but only the first one is used.
 * - `imap_certificate_checks` = how to check IMAP and SMTP certificates, one of the @ref DC_CERTCK flags, defaults to #DC_CERTCK_AUTO (0)
@@ -588,7 +591,36 @@ int             dc_set_config_from_qr   (dc_context_t* context, const char* qr);
 char*           dc_get_info                  (const dc_context_t* context);


-
+/**
+ * Get URL that can be used to initiate an OAuth2 authorization.
+ *
+ * If an OAuth2 authorization is possible for a given e-mail address,
+ * this function returns the URL that should be opened in a browser.
+ *
+ * If the user authorizes access,
+ * the given redirect_uri is called by the provider.
+ * It's up to the UI to handle this call.
+ *
+ * The provider will attach some parameters to the URL,
+ * most important the parameter `code` that should be set as the `mail_pw`.
+ * With `server_flags` set to #DC_LP_AUTH_OAUTH2,
+ * dc_configure() can be called as usual afterwards.
+ *
+ * @memberof dc_context_t
+ * @param context The context object.
+ * @param addr E-mail address the user has entered.
+ *     In case the user selects a different e-mail address during
+ *     authorization, this is corrected in dc_configure()
+ * @param redirect_uri URL that will get `code` that is used as `mail_pw` then.
+ *     Not all URLs are allowed here, however, the following should work:
+ *     `chat.delta:/PATH`, `http://localhost:PORT/PATH`,
+ *     `https://localhost:PORT/PATH`, `urn:ietf:wg:oauth:2.0:oob`
+ *     (the latter just displays the code the user can copy+paste then)
+ * @return URL that can be opened in the browser to start OAuth2.
+ *     Returned strings must be released using dc_str_unref().
+ *     If OAuth2 is not possible for the given e-mail address, NULL is returned.
+ */
+char*           dc_get_oauth2_url            (dc_context_t* context, const char* addr, const char* redirect_uri);


 #define DC_CONNECTIVITY_NOT_CONNECTED        1000
@@ -600,10 +632,13 @@ char*           dc_get_info                  (const dc_context_t* context);
 /**
 * Get the current connectivity, i.e. whether the device is connected to the IMAP server.
 * One of:
- * - DC_CONNECTIVITY_NOT_CONNECTED (1000): Show e.g. the string "Not connected" or a red dot
- * - DC_CONNECTIVITY_CONNECTING (2000): Show e.g. the string "Connecting…" or a yellow dot
- * - DC_CONNECTIVITY_WORKING (3000): Show e.g. the string "Getting new messages" or a spinning wheel
- * - DC_CONNECTIVITY_CONNECTED (4000): Show e.g. the string "Connected" or a green dot
+ * - DC_CONNECTIVITY_NOT_CONNECTED (1000-1999): Show e.g. the string "Not connected" or a red dot
+ * - DC_CONNECTIVITY_CONNECTING (2000-2999): Show e.g. the string "Connecting…" or a yellow dot
+ * - DC_CONNECTIVITY_WORKING (3000-3999): Show e.g. the string "Getting new messages" or a spinning wheel
+ * - DC_CONNECTIVITY_CONNECTED (>=4000): Show e.g. the string "Connected" or a green dot
+ *
+ * We don't use exact values but ranges here so that we can split up
+ * states into multiple states in the future.
 *
 * Meant as a rough overview that can be shown 
 * e.g. in the title of the main screen.
@@ -635,6 +670,24 @@ int             dc_get_connectivity          (dc_context_t* context);
 char*           dc_get_connectivity_html     (dc_context_t* context);


+#define DC_PUSH_NOT_CONNECTED 0
+#define DC_PUSH_HEARTBEAT     1
+#define DC_PUSH_CONNECTED     2
+
+/**
+ * Get the current push notification state.
+ * One of:
+ * - DC_PUSH_NOT_CONNECTED
+ * - DC_PUSH_HEARTBEAT
+ * - DC_PUSH_CONNECTED
+ *
+ * @memberof dc_context_t
+ * @param context The context object.
+ * @return Push notification state.
+ */
+int              dc_get_push_state           (dc_context_t* context);
+
+
 // connect

 /**
@@ -661,7 +714,7 @@ char*           dc_get_connectivity_html     (dc_context_t* context);
 *       to get the full configuration from well-known URLs.
 *
 *     - If _more_ options as `mail_server`, `mail_port`, `send_server`,
- *       `send_port` or `send_user` are specified,
+ *       `send_port`, `send_user` or `server_flags` are specified,
 *       **autoconfigure/autodiscover is skipped**.
 *
 * While dc_configure() returns immediately,
@@ -869,14 +922,14 @@ uint32_t        dc_create_chat_by_contact_id (dc_context_t* context, uint32_t co


 /**
- * Check, if there is a single chat with a given contact.
+ * Check, if there is a normal chat with a given contact.
 * To get the chat messages, use dc_get_chat_msgs().
 *
 * @memberof dc_context_t
 * @param context The context object as returned from dc_context_new().
 * @param contact_id The contact ID to check.
- * @return If there is a single chat with the given contact_id, this chat_id is
- *     returned. If there is no single chat with the contact_id, the function
+ * @return If there is a normal chat with the given contact_id, this chat_id is
+ *     returned. If there is no normal chat with the contact_id, the function
 *     returns 0.
 */
 uint32_t        dc_get_chat_id_by_contact_id (dc_context_t* context, uint32_t contact_id);
@@ -1173,7 +1226,7 @@ uint32_t        dc_init_webxdc_integration    (dc_context_t* context, uint32_t c
 * @memberof dc_context_t
 * @param context The context object.
 * @param chat_id The chat to place a call for.
- *     This needs to be a single chat.
+ *     This needs to be a one-to-one chat.
 * @param place_call_info any data that other devices receive
 *     in #DC_EVENT_INCOMING_CALL.
 * @param has_video Whether the call has video initially.
@@ -1408,16 +1461,16 @@ dc_chatlist_t*     dc_get_similar_chatlist   (dc_context_t* context, uint32_t ch

 /**
 * Estimate the number of messages that will be deleted
- * by the dc_set_config()-option `delete_device_after`.
+ * by the dc_set_config()-options `delete_device_after` or `delete_server_after`.
 * This is typically used to show the estimated impact to the user
 * before actually enabling deletion of old messages.
 *
 * @memberof dc_context_t
 * @param context The context object as returned from dc_context_new().
- * @param from_server Deprecated, pass 0 here
+ * @param from_server 1=Estimate deletion count for server, 0=Estimate deletion count for device
 * @param seconds Count messages older than the given number of seconds.
 * @return Number of messages that are older than the given number of seconds.
- *     Messages in the "Saved Messages" chat are not counted as they will not be deleted automatically.
+ *     Messages in the "saved messages" folder are not counted as they will not be deleted automatically.
 */
 int             dc_estimate_deletion_cnt    (dc_context_t* context, int from_server, int64_t seconds);

@@ -1579,7 +1632,7 @@ void            dc_set_chat_visibility       (dc_context_t* context, uint32_t ch
 * - 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
- *   be unexpected as (1) deleting a single chat also does not prevent new mails
+ *   be unexpected as (1) deleting a normal chat also does not prevent new mails
 *   from arriving, (2) leaving a group requires sending a message to
 *   all group members - especially for groups not used for a longer time, this is
 *   really unexpected when deletion results in contacting all members again,
@@ -1597,7 +1650,7 @@ void            dc_delete_chat               (dc_context_t* context, uint32_t ch
 /**
 * Block a chat.
 *
- * Blocking single chats blocks the corresponding contact. Blocking
+ * Blocking 1:1 chats blocks the corresponding contact. Blocking
 * mailing lists creates a pseudo-contact in the list of blocked
 * contacts, so blocked mailing lists can be discovered and unblocked
 * the same way as the contacts. Blocking group chats deletes the
@@ -1626,7 +1679,7 @@ void            dc_accept_chat               (dc_context_t* context, uint32_t ch
 /**
 * Get the contact IDs belonging to a chat.
 *
- * - for single chats, the function always returns exactly one contact,
+ * - for normal chats, the function always returns exactly one contact,
 *   DC_CONTACT_ID_SELF is returned only for SELF-chats.
 *
 * - for group chats all members are returned, DC_CONTACT_ID_SELF is returned
@@ -2064,7 +2117,7 @@ int             dc_resend_msgs               (dc_context_t* context, const uint3
 * The concrete action depends on the type of the chat and on the users settings
 * (dc_msgs_presented() may be a better name therefore, but well. :)
 *
- * - For single chats, the IMAP state is updated, MDN is sent
+ * - For normal chats, the IMAP state is updated, MDN is sent
 *   (if dc_set_config()-options `mdns_enabled` is set)
 *   and the internal state is changed to @ref DC_STATE_IN_SEEN to reflect these actions.
 *
@@ -3555,6 +3608,16 @@ dc_lot_t*        dc_chatlist_get_summary     (const dc_chatlist_t* chatlist, siz
 dc_lot_t*        dc_chatlist_get_summary2    (dc_context_t* context, uint32_t chat_id, uint32_t msg_id);


+/**
+ * Helper function to get the associated context object.
+ *
+ * @memberof dc_chatlist_t
+ * @param chatlist The chatlist object to empty.
+ * @return The context object associated with the chatlist. NULL if none or on errors.
+ */
+dc_context_t*    dc_chatlist_get_context     (dc_chatlist_t* chatlist);
+
+
 /**
 * Get info summary for a chat, in JSON format.
 *
@@ -3638,7 +3701,7 @@ char*           dc_chat_get_mailinglist_addr (const dc_chat_t* chat);


 /**
- * Get name of a chat. For single chats, this is the name of the contact.
+ * Get name of a chat. For one-to-one chats, this is the name of the contact.
 * For group chats, this is the name given e.g. to dc_create_group_chat() or
 * received by a group-creation message.
 *
@@ -3655,7 +3718,7 @@ char*           dc_chat_get_name             (const dc_chat_t* chat);
 * Get the chat's profile image.
 * For groups, this is the image set by any group member
 * using dc_set_chat_profile_image().
- * For single chats, this is the image set by each remote user on their own
+ * For normal chats, this is the image set by each remote user on their own
 * using dc_set_config(context, "selfavatar", image).
 *
 * @memberof dc_chat_t
@@ -3669,7 +3732,7 @@ char*           dc_chat_get_profile_image    (const dc_chat_t* chat);

 /**
 * Get a color for the chat.
- * For single chats, the color is calculated from the contact's e-mail address.
+ * For 1:1 chats, the color is calculated from the contact's e-mail address.
 * Otherwise, the chat name is used.
 * The color can be used for an fallback avatar with white initials
 * as well as for headlines in bubbles of group chats.
@@ -3736,7 +3799,7 @@ int             dc_chat_is_unpromoted        (const dc_chat_t* chat);


 /**
- * Check if a chat is a self talk. Self talks are single chats with
+ * Check if a chat is a self talk. Self talks are normal chats with
 * the only contact DC_CONTACT_ID_SELF.
 *
 * @memberof dc_chat_t
@@ -3791,9 +3854,9 @@ int             dc_chat_is_protected         (const dc_chat_t* chat);
 /**
 * Check if the chat is encrypted.
 *
- * Single chats with key-contacts and group chats with key-contacts
+ * 1:1 chats with key-contacts and group chats with key-contacts
 * are encrypted.
- * Single chats with emails contacts and ad-hoc groups
+ * 1:1 chats with emails contacts and ad-hoc groups
 * created for email threads are not encrypted.
 *
 * @memberof dc_chat_t
@@ -3940,6 +4003,8 @@ int             dc_msg_get_viewtype           (const dc_msg_t* msg);
 *   Marked as read on IMAP and MDN may be sent. Use dc_markseen_msgs() to mark messages as being seen.
 *
 * Outgoing message states:
+ * - @ref DC_STATE_OUT_PREPARING - For files which need time to be prepared before they can be sent,
+ *   the message enters this state before @ref DC_STATE_OUT_PENDING. Deprecated.
 * - @ref DC_STATE_OUT_DRAFT - Message saved as draft using dc_set_draft()
 * - @ref DC_STATE_OUT_PENDING - The user has pressed the "send" button but the
 *   message is not yet sent and is pending in some way. Maybe we're offline (no checkmark).
@@ -4327,16 +4392,16 @@ char*           dc_msg_get_summarytext        (const dc_msg_t* msg, int approx_c
 * display name, or NULL.
 *
 * If this returns non-NULL, put a `~` before the override-sender-name and show the
- * override-sender-name and the sender's avatar even in single chats.
+ * override-sender-name and the sender's avatar even in 1:1 chats.
 *
 * In mailing lists, sender display name and sender address do not always belong together.
 * In this case, this function gives you the name that should actually be shown over the message.
 *
- * Also, sometimes, we need to indicate a different sender in single chats:
+ * Also, sometimes, we need to indicate a different sender in 1:1 chats:
 * Suppose that our user writes an e-mail to support@delta.chat, which forwards to 
 * Bob <bob@delta.chat>, and Bob replies.
 * 
- * Then, Bob's reply is shown in our single chat with support@delta.chat and the override-sender-name is
+ * Then, Bob's reply is shown in our 1:1 chat with support@delta.chat and the override-sender-name is
 * set to `Bob`. The UI should show the sender name as `~Bob` and show the avatar, just
 * as in group messages. If the user then taps on the avatar, they can see that this message
 * comes from bob@delta.chat.
@@ -4470,7 +4535,6 @@ int             dc_msg_is_info                (const dc_msg_t* msg);
 * - DC_INFO_WEBXDC_INFO_MESSAGE (32) - Info-message created by webxdc app sending `update.info`
 * - DC_INFO_CHAT_E2EE (50) - Info-message for "Chat is end-to-end-encrypted"
 * - DC_INFO_GROUP_DESCRIPTION_CHANGED (70) - Info-message "Description changed", UI should open the profile with the description
- * - DC_INFO_MESSAGE_PINNED (71) - Message pinned, UI should scroll to the pinned message returned by dc_msg_get_parent()
 *
 * For the messages that refer to a CONTACT,
 * dc_msg_get_info_contact_id() returns the contact ID.
@@ -4530,7 +4594,6 @@ uint32_t        dc_msg_get_info_contact_id    (const dc_msg_t* msg);
 #define         DC_INFO_WEBXDC_INFO_MESSAGE       32
 #define         DC_INFO_CHAT_E2EE                 50
 #define         DC_INFO_GROUP_DESCRIPTION_CHANGED 70
-#define         DC_INFO_MESSAGE_PINNED            71


 /**
@@ -4848,8 +4911,6 @@ dc_msg_t*       dc_msg_get_quoted_msg         (const dc_msg_t* msg);
 * Used for Webxdc-info-messages
 * to jump to the corresponding instance that created the info message.
 *
- * For Pinned-info-messages, this refers to the pinned message.
- *
 * For quotes, please use the more specialized
 * dc_msg_get_quoted_text() and dc_msg_get_quoted_msg().
 *
@@ -4889,20 +4950,6 @@ uint32_t        dc_msg_get_original_msg_id    (const dc_msg_t* msg);
 */
 uint32_t        dc_msg_get_saved_msg_id     (const dc_msg_t* msg);

-
-/**
- * Check if the message is pinned.
- *
- * Pinned messages should be marked by a pin needle in the UI.
- * To pin messages or get all pinned messages, use jsonrpc's "setPinnedMessageState" and "getPinnedMessages".
- *
- * @memberof dc_msg_t
- * @param msg The message object.
- * @return 1=message is pinned, 0=message not pinned.
- */
- int             dc_msg_is_pinned           (const dc_msg_t* msg);
-
-
 /**
 * @class dc_contact_t
 *
@@ -5186,6 +5233,98 @@ int             dc_contact_is_key_contact    (dc_contact_t* contact);
 uint32_t       dc_contact_get_verifier_id      (dc_contact_t* contact);


+/**
+ * @class dc_provider_t
+ *
+ * Opaque object containing information about one single e-mail provider.
+ */
+
+
+/**
+ * Create a provider struct for the given e-mail address by local lookup.
+ *
+ * Lookup is done from the local database by extracting the domain from the e-mail address.
+ * Therefore the provider for custom domains cannot be identified.
+ *
+ * @memberof dc_provider_t
+ * @param context The context object.
+ * @param email The user's e-mail address to extract the provider info form.
+ * @return A dc_provider_t struct which can be used with the dc_provider_get_*
+ *     accessor functions. If no provider info is found, NULL will be
+ *     returned.
+ */
+dc_provider_t*  dc_provider_new_from_email            (const dc_context_t* context, const char* email);
+
+
+/**
+ * Create a provider struct for the given e-mail address by local lookup.
+ *
+ * DNS lookup is not used anymore and this function is deprecated.
+ *
+ * @memberof dc_provider_t
+ * @param context The context object.
+ * @param email The user's e-mail address to extract the provider info form.
+ * @return A dc_provider_t struct which can be used with the dc_provider_get_*
+ *     accessor functions. If no provider info is found, NULL will be
+ *     returned.
+ * @deprecated 2025-10-17 use dc_provider_new_from_email() instead.
+ */
+dc_provider_t*  dc_provider_new_from_email_with_dns    (const dc_context_t* context, const char* email);
+
+
+/**
+ * URL of the overview page.
+ *
+ * This URL allows linking to the providers page on providers.delta.chat.
+ *
+ * @memberof dc_provider_t
+ * @param provider The dc_provider_t struct.
+ * @return A string with a fully-qualified URL,
+ *     if there is no such URL, an empty string is returned, NULL is never returned.
+ *     The returned value must be released using dc_str_unref().
+ */
+char*           dc_provider_get_overview_page         (const dc_provider_t* provider);
+
+
+/**
+ * Get hints to be shown to the user on the login screen.
+ * Depending on the @ref DC_PROVIDER_STATUS returned by dc_provider_get_status(),
+ * the UI may want to highlight the hint.
+ *
+ * Moreover, the UI should display a "More information" link
+ * that forwards to the URL returned by dc_provider_get_overview_page().
+ *
+ * @memberof dc_provider_t
+ * @param provider The dc_provider_t struct.
+ * @return A string with the hint to show to the user, may contain multiple lines,
+ *     if there is no such hint, an empty string is returned, NULL is never returned.
+ *     The returned value must be released using dc_str_unref().
+ */
+char*           dc_provider_get_before_login_hint     (const dc_provider_t* provider);
+
+
+/**
+ * Whether DC works with this provider.
+ *
+ * Can be one of #DC_PROVIDER_STATUS_OK,
+ * #DC_PROVIDER_STATUS_PREPARATION or #DC_PROVIDER_STATUS_BROKEN.
+ *
+ * @memberof dc_provider_t
+ * @param provider The dc_provider_t struct.
+ * @return The status as a constant number.
+ */
+int             dc_provider_get_status                (const dc_provider_t* provider);
+
+
+/**
+ * Free the provider info struct.
+ *
+ * @memberof dc_provider_t
+ * @param provider The dc_provider_t struct.
+ */
+void            dc_provider_unref                     (dc_provider_t* provider);
+
+
 /**
 * @class dc_lot_t
 *
@@ -5450,6 +5589,13 @@ int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);
 */
 #define         DC_STATE_IN_SEEN             16

+/**
+ * Outgoing message being prepared. See dc_msg_get_state() for details.
+ *
+ * @deprecated 2024-12-07
+ */
+#define         DC_STATE_OUT_PREPARING       18
+
 /**
 * Outgoing message drafted. See dc_msg_get_state() for details.
 */
@@ -5499,7 +5645,7 @@ int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);
 #define         DC_CHAT_TYPE_UNDEFINED       0

 /**
- * A single chat with a single contact.
+ * 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.
@@ -5600,6 +5746,41 @@ int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);
 * @}
 */

+
+/**
+ * @defgroup DC_LP DC_LP
+ *
+ * Flags for configuring IMAP and SMTP servers.
+ * These flags are optional
+ * and may be set together with the username, password etc.
+ * via dc_set_config() using the key "server_flags".
+ *
+ * @addtogroup DC_LP
+ * @{
+ */
+
+
+/**
+ * Force OAuth2 authorization. This flag does not skip automatic configuration.
+ * Before calling dc_configure() with DC_LP_AUTH_OAUTH2 set,
+ * the user has to confirm access at the URL returned by dc_get_oauth2_url().
+ */
+#define DC_LP_AUTH_OAUTH2                0x2
+
+
+/**
+ * Force NORMAL authorization, this is the default.
+ * If this flag is set, automatic configuration is skipped.
+ */
+#define DC_LP_AUTH_NORMAL                0x4
+
+
+/**
+ * @}
+ */
+
+#define DC_LP_AUTH_FLAGS        (DC_LP_AUTH_OAUTH2|DC_LP_AUTH_NORMAL) // if none of these flags are set, the default is chosen
+
 /**
 * @defgroup DC_CERTCK DC_CERTCK
 *
@@ -5687,7 +5868,6 @@ void dc_jsonrpc_unref(dc_jsonrpc_instance_t* jsonrpc_instance);
 * - getAccountFileSize()
 * - importVcard(), parseVcard(), makeVcard()
 * - sendWebxdcRealtimeData, sendWebxdcRealtimeAdvertisement(), leaveWebxdcRealtime()
- * - setPinnedMessageState(), getPinnedMessages()
 *
 * @memberof dc_jsonrpc_instance_t
 * @param jsonrpc_instance jsonrpc instance as returned from dc_jsonrpc_init().
@@ -6174,15 +6354,6 @@ void dc_event_unref(dc_event_t* event);
 */
 #define DC_EVENT_MSG_DELETED              2016

-/**
- * Like @ref DC_EVENT_MSG_READ, but also fires on subsequent MDNs,
- * if there are multiple receivers, i.e. in groups and channels.
- *
- * @param data1 (int) chat_id
- * @param data2 (int) msg_id
- */
-#define DC_EVENT_MSG_READ_COUNT_CHANGED   2018
-

 /**
 * Chat changed. The name or the image of a chat group was changed or members were added or removed.
@@ -6507,6 +6678,61 @@ void dc_event_unref(dc_event_t* event);
 #define DC_MEDIA_QUALITY_WORSE    1


+/**
+ * @defgroup DC_PROVIDER_STATUS DC_PROVIDER_STATUS
+ *
+ * These constants are used as return values for dc_provider_get_status().
+ *
+ * @addtogroup DC_PROVIDER_STATUS
+ * @{
+ */
+
+/**
+ * Provider works out-of-the-box.
+ * This provider status is returned for provider where the login
+ * works by just entering the name or the e-mail address.
+ *
+ * - There is no need for the user to do any special things
+ *   (enable IMAP or so) in the provider's web interface or at other places.
+ * - There is no need for the user to enter advanced settings;
+ *   server, port etc. are known by the core.
+ *
+ * The status is returned by dc_provider_get_status().
+ */
+#define         DC_PROVIDER_STATUS_OK           1
+
+/**
+ * Provider works, but there are preparations needed.
+ *
+ * - The user has to do some special things as "Enable IMAP in the web interface",
+ *   what exactly, is described in the string returned by dc_provider_get_before_login_hints()
+ *   and, typically more detailed, in the page linked by dc_provider_get_overview_page().
+ * - There is no need for the user to enter advanced settings;
+ *   server, port etc. should be known by the core.
+ *
+ * The status is returned by dc_provider_get_status().
+ */
+#define         DC_PROVIDER_STATUS_PREPARATION  2
+
+/**
+ * Provider is not working.
+ * This provider status is returned for providers
+ * that are known to not work with Delta Chat.
+ * The UI should block logging in with this provider.
+ *
+ * More information about that is typically provided
+ * in the string returned by dc_provider_get_before_login_hints()
+ * and in the page linked by dc_provider_get_overview_page().
+ *
+ * The status is returned by dc_provider_get_status().
+ */
+#define         DC_PROVIDER_STATUS_BROKEN       3
+
+/**
+ * @}
+ */
+
+
 /**
 * @defgroup DC_CHAT_VISIBILITY DC_CHAT_VISIBILITY
 *
@@ -6730,7 +6956,7 @@ void dc_event_unref(dc_event_t* event);

 /// "Message from %1$s"
 ///
-/// Used in subjects of outgoing messages in single chats.
+/// Used in subjects of outgoing messages in one-to-one chats.
 /// - %1$s will be replaced by the name of the sender,
 ///   this is the dc_set_config()-option `displayname` or `addr`
 #define DC_STR_SUBJECT_FOR_NEW_CONTACT    73
@@ -6839,6 +7065,11 @@ void dc_event_unref(dc_event_t* event);
 /// `%1$s` will be replaced by a possibly more detailed, typically english, error description.
 #define DC_STR_ERROR                      112

+/// "Not supported by your provider."
+///
+/// Used in the connectivity view.
+#define DC_STR_NOT_SUPPORTED_BY_PROVIDER  113
+
 /// "Messages"
 ///
 /// Used as a subtitle in quota context; can be plural always.
@@ -7265,19 +7496,6 @@ void dc_event_unref(dc_event_t* event);
 /// Used when creating text for the "Encryption Info" dialogs.
 #define DC_STR_MESSAGES_ARE_E2EE 242

-/// "You pinned a message."
-#define DC_STR_MESSAGE_PINNED_BY_YOU 243
-
-/// "Message pinned by %1$s."
-#define DC_STR_MESSAGE_PINNED_BY_OTHER 244
-
-/// "Phasing out"
-///
-/// Used in connectivity view to flag unpublished relays.
-/// This should match the wording used for relay deletion confirmation,
-/// saying "Before deletion, it will be gradually phased out so your contacts can switch over smoothly"
-#define DC_STR_PHASING_OUT 245
-
 /**
 * @}
 */
@@ -230,6 +230,7 @@ pub enum LotState {
    MsgInFresh = 10,
    MsgInNoticed = 13,
    MsgInSeen = 16,
+    MsgOutPreparing = 18,
    MsgOutDraft = 19,
    MsgOutPending = 20,
    MsgOutFailed = 24,
@@ -245,6 +246,7 @@ impl From<MessageState> for LotState {
            InFresh => LotState::MsgInFresh,
            InNoticed => LotState::MsgInNoticed,
            InSeen => LotState::MsgInSeen,
+            OutPreparing => LotState::MsgOutPreparing,
            OutDraft => LotState::MsgOutDraft,
            OutPending => LotState::MsgOutPending,
            OutFailed => LotState::MsgOutFailed,
@@ -17,15 +17,13 @@ use std::ptr;
 /// }
 /// ```
 unsafe fn dc_strdup(s: *const libc::c_char) -> *mut libc::c_char {
-    unsafe {
-        let ret: *mut libc::c_char = if !s.is_null() {
-            libc::strdup(s)
-        } else {
-            libc::calloc(1, 1) as *mut libc::c_char
-        };
-        assert!(!ret.is_null());
-        ret
-    }
+    let ret: *mut libc::c_char = if !s.is_null() {
+        libc::strdup(s)
+    } else {
+        libc::calloc(1, 1) as *mut libc::c_char
+    };
+    assert!(!ret.is_null());
+    ret
 }

 /// Error type for the [OsStrExt] trait
@@ -166,40 +164,34 @@ pub(crate) trait Strdup {
    /// This function will panic when the original string contains an
    /// interior null byte as this can not be represented in raw C
    /// strings.
-    fn strdup(&self) -> *mut libc::c_char;
+    unsafe fn strdup(&self) -> *mut libc::c_char;
 }

 impl Strdup for str {
-    fn strdup(&self) -> *mut libc::c_char {
-        unsafe {
-            let tmp = CString::new_lossy(self);
-            dc_strdup(tmp.as_ptr())
-        }
+    unsafe fn strdup(&self) -> *mut libc::c_char {
+        let tmp = CString::new_lossy(self);
+        dc_strdup(tmp.as_ptr())
    }
 }

 impl Strdup for String {
-    fn strdup(&self) -> *mut libc::c_char {
+    unsafe fn strdup(&self) -> *mut libc::c_char {
        let s: &str = self;
        s.strdup()
    }
 }

 impl Strdup for std::path::Path {
-    fn strdup(&self) -> *mut libc::c_char {
-        unsafe {
-            let tmp = self.to_c_string().unwrap_or_else(|_| CString::default());
-            dc_strdup(tmp.as_ptr())
-        }
+    unsafe fn strdup(&self) -> *mut libc::c_char {
+        let tmp = self.to_c_string().unwrap_or_else(|_| CString::default());
+        dc_strdup(tmp.as_ptr())
    }
 }

 impl Strdup for [u8] {
-    fn strdup(&self) -> *mut libc::c_char {
-        unsafe {
-            let tmp = CString::new_lossy(self);
-            dc_strdup(tmp.as_ptr())
-        }
+    unsafe fn strdup(&self) -> *mut libc::c_char {
+        let tmp = CString::new_lossy(self);
+        dc_strdup(tmp.as_ptr())
    }
 }

@@ -217,15 +209,15 @@ pub(crate) trait OptStrdup {
    /// Allocate a new raw C `*char` version of this string, or NULL.
    ///
    /// See [Strdup::strdup] for details.
-    fn strdup(&self) -> *mut libc::c_char;
+    unsafe fn strdup(&self) -> *mut libc::c_char;
 }

 impl<T: AsRef<str>> OptStrdup for Option<T> {
-    fn strdup(&self) -> *mut libc::c_char {
+    unsafe fn strdup(&self) -> *mut libc::c_char {
        match self {
            Some(s) => {
                let tmp = CString::new_lossy(s.as_ref());
-                unsafe { dc_strdup(tmp.as_ptr()) }
+                dc_strdup(tmp.as_ptr())
            }
            None => ptr::null_mut(),
        }
@@ -263,18 +255,20 @@ pub(crate) fn to_opt_string_lossy(s: *const libc::c_char) -> Option<String> {
 ///
 /// [Path]: std::path::Path
 #[cfg(not(target_os = "windows"))]
-pub(crate) unsafe fn as_path<'a>(s: *const libc::c_char) -> &'a std::path::Path {
+pub(crate) fn as_path<'a>(s: *const libc::c_char) -> &'a std::path::Path {
    assert!(!s.is_null(), "cannot be used on null pointers");
    use std::os::unix::ffi::OsStrExt;
-    let c_str = unsafe { std::ffi::CStr::from_ptr(s) }.to_bytes();
-    let os_str = std::ffi::OsStr::from_bytes(c_str);
-    std::path::Path::new(os_str)
+    unsafe {
+        let c_str = std::ffi::CStr::from_ptr(s).to_bytes();
+        let os_str = std::ffi::OsStr::from_bytes(c_str);
+        std::path::Path::new(os_str)
+    }
 }

 // as_path() implementation for windows, documented above.
 #[cfg(target_os = "windows")]
-pub(crate) unsafe fn as_path<'a>(s: *const libc::c_char) -> &'a std::path::Path {
-    unsafe { as_path_unicode(s) }
+pub(crate) fn as_path<'a>(s: *const libc::c_char) -> &'a std::path::Path {
+    as_path_unicode(s)
 }

 // Implementation for as_path() on Windows.
@@ -282,7 +276,7 @@ pub(crate) unsafe fn as_path<'a>(s: *const libc::c_char) -> &'a std::path::Path
 // Having this as a separate function means it can be tested on unix
 // too.
 #[allow(dead_code)]
-unsafe fn as_path_unicode<'a>(s: *const libc::c_char) -> &'a std::path::Path {
+fn as_path_unicode<'a>(s: *const libc::c_char) -> &'a std::path::Path {
    assert!(!s.is_null(), "cannot be used on null pointers");

    let cstr = unsafe { CStr::from_ptr(s) };
@@ -370,20 +364,14 @@ mod tests {
    fn test_as_path() {
        let some_path = CString::new("/some/path").unwrap();
        let ptr = some_path.as_ptr();
-        assert_eq!(
-            unsafe { as_path(ptr) },
-            std::ffi::OsString::from("/some/path")
-        )
+        assert_eq!(as_path(ptr), std::ffi::OsString::from("/some/path"))
    }

    #[test]
    fn test_as_path_unicode_fn() {
        let some_path = CString::new("/some/path").unwrap();
        let ptr = some_path.as_ptr();
-        assert_eq!(
-            unsafe { as_path_unicode(ptr) },
-            std::ffi::OsString::from("/some/path")
-        );
+        assert_eq!(as_path_unicode(ptr), std::ffi::OsString::from("/some/path"));
    }

    #[test]
@@ -1,8 +1,8 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "2.58.0"
+version = "2.50.0-dev"
 description = "DeltaChat JSON-RPC API"
-edition = "2024"
+edition = "2021"
 license = "MPL-2.0"
 repository = "https://github.com/chatmail/core"

@@ -5,31 +5,31 @@ use std::sync::Arc;
 use std::time::Duration;
 use std::{collections::HashMap, str::FromStr};

-use anyhow::{Context, Result, anyhow, bail, ensure};
-use deltachat::EventEmitter;
+use anyhow::{anyhow, bail, ensure, Context, Result};
 pub use deltachat::accounts::Accounts;
 use deltachat::blob::BlobObject;
 use deltachat::calls::ice_servers;
 use deltachat::chat::{
-    self, Chat, ChatId, ChatItem, MessageListOptions, add_contact_to_chat, forward_msgs,
-    forward_msgs_2ctx, get_chat_media, get_chat_msgs, get_chat_msgs_ex, markfresh_chat,
-    marknoticed_all_chats, marknoticed_chat, remove_contact_from_chat,
+    self, add_contact_to_chat, forward_msgs, forward_msgs_2ctx, get_chat_media, get_chat_msgs,
+    get_chat_msgs_ex, markfresh_chat, marknoticed_all_chats, marknoticed_chat,
+    remove_contact_from_chat, Chat, ChatId, ChatItem, MessageListOptions,
 };
 use deltachat::chatlist::Chatlist;
-use deltachat::config::{Config, get_all_ui_config_keys};
+use deltachat::config::{get_all_ui_config_keys, Config};
 use deltachat::constants::DC_MSG_ID_DAYMARKER;
-use deltachat::contact::{Contact, ContactId, Origin, may_be_valid_addr};
+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::{
-    self, Message, MessageState, MsgId, Viewtype, delete_msgs_ex, get_existing_msg_ids,
-    get_msg_read_receipt_count, get_msg_read_receipts, markseen_msgs,
+    self, delete_msgs_ex, get_existing_msg_ids, get_msg_read_receipt_count, get_msg_read_receipts,
+    markseen_msgs, Message, MessageState, MsgId, Viewtype,
 };
 use deltachat::peer_channels::{
    leave_webxdc_realtime, send_webxdc_realtime_advertisement, send_webxdc_realtime_data,
 };
+use deltachat::provider::get_provider_info;
 use deltachat::qr::{self, Qr};
 use deltachat::qr_code_generator::{create_qr_svg, generate_backup_qr, get_securejoin_qr_svg};
 use deltachat::reaction::{get_msg_reactions, send_reaction};
@@ -37,9 +37,10 @@ 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::{Mutex, RwLock, watch};
+use tokio::sync::{watch, Mutex, RwLock};
 use types::login_param::EnteredLoginParam;
 use yerpc::rpc;

@@ -53,6 +54,8 @@ use types::contact::{ContactObject, VcardContact};
 use types::events::Event;
 use types::http::HttpResponse;
 use types::message::{MessageData, MessageObject, MessageReadReceipt};
+use types::notify_state::JsonrpcNotifyState;
+use types::provider_info::ProviderInfo;
 use types::reactions::JsonrpcReactions;
 use types::webxdc::WebxdcMessageInfo;

@@ -64,7 +67,7 @@ use self::types::{
        JsonrpcMessageListItem, MessageNotificationInfo, MessageSearchResult, MessageViewtype,
    },
 };
-use crate::api::types::chat_list::{ChatListItemFetchResult, get_chat_list_item_by_id};
+use crate::api::types::chat_list::{get_chat_list_item_by_id, ChatListItemFetchResult};
 use crate::api::types::login_param::TransportListEntry;
 use crate::api::types::qr::{QrObject, SecurejoinSource, SecurejoinUiPath};

@@ -327,6 +330,12 @@ impl CommandApi {
        }
    }

+    /// Get the current push notification state.
+    async fn get_push_state(&self, account_id: u32) -> Result<JsonrpcNotifyState> {
+        let ctx = self.get_context(account_id).await?;
+        Ok(ctx.push_state().await.into())
+    }
+
    /// Get the combined filesize of an account in bytes
    async fn get_account_file_size(&self, account_id: u32) -> Result<u64> {
        let ctx = self.get_context(account_id).await?;
@@ -336,6 +345,21 @@ impl CommandApi {
        Ok(dbfile + total_size)
    }

+    /// Returns provider for the given domain.
+    ///
+    /// This function looks up domain in offline database.
+    ///
+    /// For compatibility, email address can be passed to this function
+    /// instead of the domain.
+    async fn get_provider_info(
+        &self,
+        _account_id: u32,
+        email: String,
+    ) -> Result<Option<ProviderInfo>> {
+        let provider_info = get_provider_info(email.split('@').next_back().unwrap_or(""));
+        Ok(ProviderInfo::from_dc_type(provider_info))
+    }
+
    /// Checks if the context is already configured.
    async fn is_configured(&self, account_id: u32) -> Result<bool> {
        let ctx = self.get_context(account_id).await?;
@@ -502,7 +526,7 @@ impl CommandApi {
    /// - [Self::add_transport_from_qr()] to add a transport
    ///   from a server encoded in a QR code.
    /// - [Self::list_transports()] to get a list of all configured transports.
-    /// - [Self::set_transport_unpublished()] to remove a transport.
+    /// - [Self::delete_transport()] to remove a transport.
    /// - [Self::set_transport_unpublished()] to set whether contacts see this transport.
    async fn add_or_update_transport(
        &self,
@@ -528,31 +552,23 @@ impl CommandApi {

    /// Returns the list of all email accounts that are used as a transport in the current profile.
    /// Use [Self::add_or_update_transport()] to add or change a transport
-    /// and [Self::set_transport_unpublished()] to remove a transport.
+    /// and [Self::delete_transport()] to delete a transport.
+    /// Use [Self::list_transports_ex()] to additionally query
+    /// whether the transports are marked as 'unpublished'.
    async fn list_transports(&self, account_id: u32) -> Result<Vec<EnteredLoginParam>> {
        let ctx = self.get_context(account_id).await?;
        let res = ctx
            .list_transports()
            .await?
            .into_iter()
-            .filter(|t| !t.is_unpublished)
            .map(|t| t.param.into())
            .collect();
        Ok(res)
    }

-    /// Deprecated 2026-06: This is not needed by UI implementations anymore,
-    /// because unpublished relays now count as removed from the user point of view,
-    /// and must not be shown in the list of relays.
-    /// This means that UIs should use `list_transports()` instead of this function.
-    ///
    /// Returns the list of all email accounts that are used as a transport in the current profile.
-    ///
-    /// As opposed to `list_transports()`, this function also returns unpublished transports,
-    /// and for each returned transport it returns the information whether or not is `unpublished`.
-    ///
    /// Use [Self::add_or_update_transport()] to add or change a transport
-    /// and [Self::set_transport_unpublished()] to change whether a transport is 'published'.
+    /// and [Self::delete_transport()] to delete a transport.
    async fn list_transports_ex(&self, account_id: u32) -> Result<Vec<TransportListEntry>> {
        let ctx = self.get_context(account_id).await?;
        let res = ctx
@@ -564,31 +580,23 @@ impl CommandApi {
        Ok(res)
    }

-    /// Immediately deletes a transport, potentially causing messages not to arrive.
-    /// This must ONLY be used by the automated tests.
-    /// UI implementations must use [`Self::set_transport_unpublished`] instead.
+    /// Removes the transport with the specified email address
+    /// (i.e. [EnteredLoginParam::addr]).
    async fn delete_transport(&self, account_id: u32, addr: String) -> Result<()> {
        let ctx = self.get_context(account_id).await?;
        ctx.delete_transport(&addr).await
    }

    /// Change whether the transport is unpublished.
-    /// UIs should call this function when the user clicks on "Remove".
-    /// Core will keep listening on this transport for some time,
-    /// and automatically remove it once it is no longer needed.
    ///
    /// Unpublished transports are not advertised to contacts,
    /// and self-sent messages are not sent there,
    /// so that we don't cause extra messages to the corresponding inbox,
    /// but can still receive messages from contacts who don't know our new transport addresses yet.
    ///
-    /// When more transports are added by [`Self::add_or_update_transport()`] or [`Self::add_transport_from_qr`],
-    /// the least recently needed unpublished transport is automatically removed
-    /// if this is necessary in order to stay below the maximum number of allowed relays.
-    /// Also, unpublished transports that are not used to receive any new messages for a time defined by
-    /// [`UNPUBLISHED_TRANSPORT_KEEP_TIME`] are automatically removed.
-    ///
-    /// [`UNPUBLISHED_TRANSPORT_KEEP_TIME`]: deltachat::sql::UNPUBLISHED_TRANSPORT_KEEP_TIME
+    /// The default is false, but when the user updates from a version that didn't have this flag,
+    /// existing secondary transports are set to unpublished,
+    /// so that an existing transport address doesn't suddenly get spammed with a lot of messages.
    async fn set_transport_unpublished(
        &self,
        account_id: u32,
@@ -727,19 +735,10 @@ impl CommandApi {
        Ok(msg_ids)
    }

-    /// Estimates the number of messages that will be deleted
-    /// by the `set_config()`-option `delete_device_after`.
-    ///
+    /// Estimate the number of messages that will be deleted
+    /// by the set_config()-options `delete_device_after` or `delete_server_after`.
    /// This is typically used to show the estimated impact to the user
    /// before actually enabling deletion of old messages.
-    ///
-    /// Messages in the "Saved Messages" chat are not counted as they will not be deleted automatically.
-    ///
-    /// Parameters:
-    /// - `from_server`: Deprecated, pass `false` here
-    /// - `seconds`: Count messages older than the given number of seconds.
-    ///
-    /// Returns the number of messages that are older than the given number of seconds.
    async fn estimate_auto_deletion_count(
        &self,
        account_id: u32,
@@ -851,7 +850,7 @@ impl CommandApi {
    /// - 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
-    ///   be unexpected as (1) deleting a single chat also does not prevent new mails
+    ///   be unexpected as (1) deleting a normal chat also does not prevent new mails
    ///   from arriving, (2) leaving a group requires sending a message to
    ///   all group members - especially for groups not used for a longer time, this is
    ///   really unexpected when deletion results in contacting all members again,
@@ -1016,7 +1015,7 @@ impl CommandApi {

    /// Get the contact IDs belonging to a chat.
    ///
-    /// - for single chats, the function always returns exactly one contact,
+    /// - for normal chats, the function always returns exactly one contact,
    ///   DC_CONTACT_ID_SELF is returned only for SELF-chats.
    ///
    /// - for group chats all members are returned, DC_CONTACT_ID_SELF is returned
@@ -1073,9 +1072,7 @@ impl CommandApi {
    /// Create a new unencrypted group chat.
    ///
    /// Same as [`Self::create_group_chat`], but the chat is unencrypted and can only have
-    /// address-contacts. NB: Chats with similar names and the same members are merged on other
-    /// devices, but usually users don't create such chats and look up the existing one instead, so
-    /// chat split on the first device is acceptable.
+    /// address-contacts.
    async fn create_group_chat_unencrypted(&self, account_id: u32, name: String) -> Result<u32> {
        let ctx = self.get_context(account_id).await?;
        chat::create_group_unencrypted(&ctx, &name)
@@ -1100,6 +1097,9 @@ impl CommandApi {
    /// because the word "channel" already appears a lot in the code,
    /// which would make it hard to grep for it.
    ///
+    /// After creation, the chat contains no recipients and is in _unpromoted_ state;
+    /// see [`CommandApi::create_group_chat`] for more information on the unpromoted state.
+    ///
    /// Returns the created chat's id.
    async fn create_broadcast(&self, account_id: u32, chat_name: String) -> Result<u32> {
        let ctx = self.get_context(account_id).await?;
@@ -1344,7 +1344,7 @@ impl CommandApi {
    /// The concrete action depends on the type of the chat and on the users settings
    /// (dc_msgs_presented() may be a better name therefore, but well. :)
    ///
-    /// - For single chats, the IMAP state is updated, MDN is sent
+    /// - For normal chats, the IMAP state is updated, MDN is sent
    ///   (if set_config()-options `mdns_enabled` is set)
    ///   and the internal state is changed to @ref DC_STATE_IN_SEEN to reflect these actions.
    ///
@@ -1508,26 +1508,6 @@ impl CommandApi {
        MessageNotificationInfo::from_msg_id(&ctx, MsgId::new(message_id)).await
    }

-    /// Sets the "pinned" state for a message.
-    async fn set_pinned_message_state(
-        &self,
-        account_id: u32,
-        message_id: u32,
-        pinned_state: bool,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        deltachat::pinned_messages::set_pinned_state(&ctx, MsgId::new(message_id), pinned_state)
-            .await
-    }
-
-    /// Returns all pinned messages of a chat.
-    async fn get_pinned_messages(&self, account_id: u32, chat_id: u32) -> Result<Vec<u32>> {
-        let ctx = self.get_context(account_id).await?;
-        let msg_ids =
-            deltachat::pinned_messages::get_pinned_messages(&ctx, ChatId::new(chat_id)).await?;
-        Ok(msg_ids.into_iter().map(|id| id.to_u32()).collect())
-    }
-
    /// Delete messages. The messages are deleted on the current device and
    /// on the IMAP server.
    async fn delete_messages(&self, account_id: u32, message_ids: Vec<u32>) -> Result<()> {
@@ -1906,7 +1886,7 @@ impl CommandApi {
    //                   chat
    // ---------------------------------------------

-    /// Returns the [`ChatId`] for the single chat with `contact_id` if it exists.
+    /// Returns the [`ChatId`] for the 1:1 chat with `contact_id` if it exists.
    ///
    /// If it does not exist, `None` is returned.
    async fn get_chat_id_by_contact_id(
@@ -2091,10 +2071,13 @@ impl CommandApi {

    /// Get the current connectivity, i.e. whether the device is connected to the IMAP server.
    /// One of:
-    /// - DC_CONNECTIVITY_NOT_CONNECTED (1000): Show e.g. the string "Not connected" or a red dot
-    /// - DC_CONNECTIVITY_CONNECTING (2000): Show e.g. the string "Connecting…" or a yellow dot
-    /// - DC_CONNECTIVITY_WORKING (3000): Show e.g. the string "Getting new messages" or a spinning wheel
-    /// - DC_CONNECTIVITY_CONNECTED (4000): Show e.g. the string "Connected" or a green dot
+    /// - DC_CONNECTIVITY_NOT_CONNECTED (1000-1999): Show e.g. the string "Not connected" or a red dot
+    /// - DC_CONNECTIVITY_CONNECTING (2000-2999): Show e.g. the string "Connecting…" or a yellow dot
+    /// - DC_CONNECTIVITY_WORKING (3000-3999): Show e.g. the string "Getting new messages" or a spinning wheel
+    /// - DC_CONNECTIVITY_CONNECTED (>=4000): Show e.g. the string "Connected" or a green dot
+    ///
+    /// We don't use exact values but ranges here so that we can split up
+    /// states into multiple states in the future.
    ///
    /// Meant as a rough overview that can be shown
    /// e.g. in the title of the main screen.
@@ -2288,7 +2271,7 @@ impl CommandApi {
        let message = Message::load_from_db(&ctx, MsgId::new(instance_msg_id)).await?;
        let blob = message.get_webxdc_blob(&ctx, &path).await?;

-        use base64::{Engine as _, engine::general_purpose};
+        use base64::{engine::general_purpose, Engine as _};
        Ok(general_purpose::STANDARD_NO_PAD.encode(blob))
    }

@@ -1,6 +1,6 @@
 use anyhow::{Context as _, Result};

-use deltachat::calls::{CallState, call_state};
+use deltachat::calls::{call_state, CallState};
 use deltachat::context::Context;
 use deltachat::message::MsgId;
 use serde::Serialize;
@@ -1,7 +1,7 @@
 use std::time::{Duration, SystemTime};

-use anyhow::{Context as _, Result, bail};
-use deltachat::chat::{self, ChatVisibility, get_chat_contacts, get_past_chat_contacts};
+use anyhow::{bail, Context as _, Result};
+use deltachat::chat::{self, get_chat_contacts, get_past_chat_contacts, ChatVisibility};
 use deltachat::chat::{Chat, ChatId};
 use deltachat::constants::Chattype;
 use deltachat::contact::{Contact, ContactId};
@@ -4,7 +4,7 @@ use deltachat::chatlist::get_last_message_for_chat;
 use deltachat::constants::*;
 use deltachat::contact::Contact;
 use deltachat::{
-    chat::{ChatVisibility, get_chat_contacts},
+    chat::{get_chat_contacts, ChatVisibility},
    chatlist::Chatlist,
 };
 use num_traits::cast::ToPrimitive;
@@ -203,17 +203,6 @@ pub enum EventType {
        msg_id: u32,
    },

-    /// Like [`EventType::MsgRead`], but also fires on subsequent MDNs,
-    /// if there are multiple receivers, i.e. in groups and channels.
-    #[serde(rename_all = "camelCase")]
-    MsgReadCountChanged {
-        /// ID of the chat which the message belongs to.
-        chat_id: u32,
-
-        /// ID of the message that was read.
-        msg_id: u32,
-    },
-
    /// A single message was deleted.
    ///
    /// This event means that the message will no longer appear in the messagelist.
@@ -557,10 +546,6 @@ impl From<CoreEventType> for EventType {
                chat_id: chat_id.to_u32(),
                msg_id: msg_id.to_u32(),
            },
-            CoreEventType::MsgReadCountChanged { chat_id, msg_id } => MsgReadCountChanged {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
            CoreEventType::MsgDeleted { chat_id, msg_id } => MsgDeleted {
                chat_id: chat_id.to_u32(),
                msg_id: msg_id.to_u32(),
@@ -16,7 +16,7 @@ pub struct HttpResponse {

 impl From<CoreHttpResponse> for HttpResponse {
    fn from(response: CoreHttpResponse) -> Self {
-        use base64::{Engine as _, engine::general_purpose};
+        use base64::{engine::general_purpose, Engine as _};
        let blob = general_purpose::STANDARD_NO_PAD.encode(response.blob);
        let mimetype = response.mimetype;
        let encoding = response.encoding;
@@ -66,6 +66,10 @@ pub struct EnteredLoginParam {
    /// invalid hostnames.
    /// Default: Automatic
    pub certificate_checks: Option<EnteredCertificateChecks>,
+
+    /// If true, login via OAUTH2 (not recommended anymore).
+    /// Default: false
+    pub oauth2: Option<bool>,
 }

 impl From<dc::TransportListEntry> for TransportListEntry {
@@ -96,6 +100,7 @@ impl From<dc::EnteredLoginParam> for EnteredLoginParam {
            smtp_user: param.smtp.user.into_option(),
            smtp_password: param.smtp.password.into_option(),
            certificate_checks: certificate_checks.into_option(),
+            oauth2: param.oauth2.into_option(),
        }
    }
 }
@@ -122,7 +127,7 @@ impl TryFrom<EnteredLoginParam> for dc::EnteredLoginParam {
                password: param.smtp_password.unwrap_or_default(),
            },
            certificate_checks: param.certificate_checks.unwrap_or_default().into(),
-            oauth2: false,
+            oauth2: param.oauth2.unwrap_or_default(),
        })
    }
 }
@@ -169,8 +174,9 @@ impl From<Socket> for dc::Socket {
 #[derive(Serialize, Deserialize, TypeDef, schemars::JsonSchema, Default, PartialEq)]
 #[serde(rename_all = "camelCase")]
 pub enum EnteredCertificateChecks {
-    /// `Automatic` means strict certificate checks,
-    /// unless a legacy-domain override disables them.
+    /// `Automatic` means that provider database setting should be taken.
+    /// If there is no provider database setting for certificate checks,
+    /// check certificates strictly.
    #[default]
    Automatic,

@@ -103,8 +103,6 @@ pub struct MessageObject {

    saved_message_id: Option<u32>,

-    is_pinned: bool,
-
    reactions: Option<JsonrpcReactions>,

    vcard_contact: Option<VcardContact>,
@@ -265,7 +263,6 @@ impl MessageObject {
                .await?
                .map(|id| id.to_u32()),

-            is_pinned: message.is_pinned(),
            reactions,

            vcard_contact: vcard_contacts.first().cloned(),
@@ -393,11 +390,11 @@ pub enum SystemMessageType {
    LocationOnly,
    InvalidUnencryptedMail,

-    /// Single chats info message telling that SecureJoin has started and the user should wait for it
+    /// 1:1 chats info message telling that SecureJoin has started and the user should wait for it
    /// to complete.
    SecurejoinWait,

-    /// Single chats info message telling that SecureJoin is still running, but the user may already
+    /// 1:1 chats info message telling that SecureJoin is still running, but the user may already
    /// send messages.
    SecurejoinWaitTimeout,

@@ -428,8 +425,6 @@ pub enum SystemMessageType {

    CallAccepted,
    CallEnded,
-    MessagePinned,
-    MessageUnpinned,
 }

 impl From<deltachat::mimeparser::SystemMessage> for SystemMessageType {
@@ -459,8 +454,6 @@ impl From<deltachat::mimeparser::SystemMessage> for SystemMessageType {
            SystemMessage::SecurejoinWaitTimeout => SystemMessageType::SecurejoinWaitTimeout,
            SystemMessage::CallAccepted => SystemMessageType::CallAccepted,
            SystemMessage::CallEnded => SystemMessageType::CallEnded,
-            SystemMessage::MessagePinned => SystemMessageType::MessagePinned,
-            SystemMessage::MessageUnpinned => SystemMessageType::MessageUnpinned,
        }
    }
 }
@@ -733,9 +726,9 @@ impl From<deltachat::ephemeral::Timer> for EphemeralTimer {
    fn from(value: deltachat::ephemeral::Timer) -> Self {
        match value {
            deltachat::ephemeral::Timer::Disabled => EphemeralTimer::Disabled,
-            deltachat::ephemeral::Timer::Enabled { duration } => EphemeralTimer::Enabled {
-                duration: duration.get(),
-            },
+            deltachat::ephemeral::Timer::Enabled { duration } => {
+                EphemeralTimer::Enabled { duration }
+            }
        }
    }
 }
@@ -8,6 +8,8 @@ pub mod http;
 pub mod location;
 pub mod login_param;
 pub mod message;
+pub mod notify_state;
+pub mod provider_info;
 pub mod qr;
 pub mod reactions;
 pub mod webxdc;
@@ -0,0 +1,26 @@
+use deltachat::push::NotifyState;
+use serde::Serialize;
+use typescript_type_def::TypeDef;
+
+#[derive(Serialize, TypeDef, schemars::JsonSchema)]
+#[serde(rename = "NotifyState")]
+pub enum JsonrpcNotifyState {
+    /// Not subscribed to push notifications.
+    NotConnected,
+
+    /// Subscribed to heartbeat push notifications.
+    Heartbeat,
+
+    /// Subscribed to push notifications for new messages.
+    Connected,
+}
+
+impl From<NotifyState> for JsonrpcNotifyState {
+    fn from(state: NotifyState) -> Self {
+        match state {
+            NotifyState::NotConnected => Self::NotConnected,
+            NotifyState::Heartbeat => Self::Heartbeat,
+            NotifyState::Connected => Self::Connected,
+        }
+    }
+}
@@ -0,0 +1,25 @@
+use deltachat::provider::Provider;
+use num_traits::cast::ToPrimitive;
+use serde::Serialize;
+use typescript_type_def::TypeDef;
+
+#[derive(Serialize, TypeDef, schemars::JsonSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct ProviderInfo {
+    /// Unique ID, corresponding to provider database filename.
+    pub id: String,
+    pub before_login_hint: String,
+    pub overview_page: String,
+    pub status: u32, // in reality this is an enum, but for simplicity and because it gets converted into a number anyway, we use an u32 here.
+}
+
+impl ProviderInfo {
+    pub fn from_dc_type(provider: Option<&Provider>) -> Option<Self> {
+        provider.map(|p| ProviderInfo {
+            id: p.id.to_owned(),
+            before_login_hint: p.before_login_hint.to_owned(),
+            overview_page: p.overview_page.to_owned(),
+            status: p.status.to_u32().unwrap(),
+        })
+    }
+}
@@ -236,7 +236,6 @@ impl From<Qr> for QrObject {
                invitenumber,
                authcode,
                is_v3,
-                ..
            } => {
                let contact_id = contact_id.to_u32();
                let fingerprint = fingerprint.human_readable();
@@ -256,7 +255,6 @@ impl From<Qr> for QrObject {
                invitenumber,
                authcode,
                is_v3,
-                ..
            } => {
                let contact_id = contact_id.to_u32();
                let fingerprint = fingerprint.human_readable();
@@ -278,7 +276,6 @@ impl From<Qr> for QrObject {
                authcode,
                invitenumber,
                is_v3,
-                ..
            } => {
                let contact_id = contact_id.to_u32();
                let fingerprint = fingerprint.human_readable();
@@ -1,5 +1,6 @@
 use std::collections::BTreeMap;

+use deltachat::contact::ContactId;
 use deltachat::reaction::Reactions;
 use serde::Serialize;
 use typescript_type_def::TypeDef;
@@ -33,24 +34,30 @@ pub struct JsonrpcReactions {
 impl From<Reactions> for JsonrpcReactions {
    fn from(reactions: Reactions) -> Self {
        let reactions_by_contact: BTreeMap<u32, Vec<String>> = reactions
-            .by_contact
            .iter()
            .map(|(key, value)| (key.to_u32(), vec![value.as_str().to_string()]))
            .collect();
+        let self_reaction = reactions_by_contact.get(&ContactId::SELF.to_u32());

-        let reactions = reactions
-            .frequencies
-            .into_iter()
-            .map(|entry| JsonrpcReaction {
-                emoji: entry.reaction.as_str().to_string(),
-                count: entry.count,
-                is_from_self: entry.is_from_self,
-            })
-            .collect();
+        let mut reactions_v = Vec::new();
+        for (emoji, count) in reactions.emoji_sorted_by_frequency() {
+            let is_from_self = if let Some(self_reaction) = self_reaction {
+                self_reaction.contains(&emoji)
+            } else {
+                false
+            };
+
+            let reaction = JsonrpcReaction {
+                emoji,
+                count,
+                is_from_self,
+            };
+            reactions_v.push(reaction)
+        }

        JsonrpcReactions {
            reactions_by_contact,
-            reactions,
+            reactions: reactions_v,
        }
    }
 }
@@ -54,5 +54,5 @@
  },
  "type": "module",
  "types": "dist/deltachat.d.ts",
-  "version": "2.58.0"
+  "version": "2.50.0-dev"
 }
@@ -44,6 +44,7 @@ const constants = data
      key.startsWith("DC_CERTCK_") ||
      key.startsWith("DC_SOCKET_") ||
      key.startsWith("DC_LP_AUTH_") ||
+      key.startsWith("DC_PUSH_") ||
      key.startsWith("DC_TEXT1_") ||
      key.startsWith("DC_CHAT_TYPE")
    );
@@ -148,6 +148,23 @@ describe("online tests", function () {
    expect(message2.text).equal("super secret message");
    expect(message2.showPadlock).equal(true);
  });
+
+  it("get provider info for example.com", async () => {
+    const acc = await dc.rpc.addAccount();
+    const info = await dc.rpc.getProviderInfo(acc, "example.com");
+    expect(info).to.be.not.null;
+    expect(info?.overviewPage).to.equal(
+      "https://providers.delta.chat/example-com",
+    );
+    expect(info?.status).to.equal(3);
+  });
+
+  it("get provider info - domain and email should give same result", async () => {
+    const acc = await dc.rpc.addAccount();
+    const info_domain = await dc.rpc.getProviderInfo(acc, "example.com");
+    const info_email = await dc.rpc.getProviderInfo(acc, "hi@example.com");
+    expect(info_email).to.deep.equal(info_domain);
+  });
 });

 async function waitForEvent<T extends DcEvent["kind"]>(
@@ -2,7 +2,7 @@
 name = "ratelimit"
 version = "1.0.0"
 description = "Token bucket implementation"
-edition = "2024"
+edition = "2021"
 license = "MPL-2.0"

 [dependencies]
@@ -1,8 +1,8 @@
 [package]
 name = "deltachat-repl"
-version = "2.58.0"
+version = "2.50.0-dev"
 license = "MPL-2.0"
-edition = "2024"
+edition = "2021"
 repository = "https://github.com/chatmail/core"

 [dependencies]
@@ -5,10 +5,9 @@ use std::path::Path;
 use std::str::FromStr;
 use std::time::Duration;

-use anyhow::{Result, bail, ensure};
+use anyhow::{bail, ensure, Result};
 use deltachat::chat::{self, Chat, ChatId, ChatItem, ChatVisibility, MuteDuration};
 use deltachat::chatlist::*;
-use deltachat::config;
 use deltachat::constants::*;
 use deltachat::contact::*;
 use deltachat::context::*;
@@ -25,6 +24,7 @@ use deltachat::reaction::send_reaction;
 use deltachat::receive_imf::*;
 use deltachat::sql;
 use deltachat::tools::*;
+use deltachat::{config, provider};
 use tokio::fs;

 /// Reset database tables.
@@ -122,7 +122,7 @@ async fn poke_spec(context: &Context, spec: Option<&str>) -> bool {
                let name_f = entry.file_name();
                let name = name_f.to_string_lossy();
                if name.ends_with(".eml") {
-                    let path_plus_name = format!("{real_spec}/{name}");
+                    let path_plus_name = format!("{}/{}", &real_spec, name);
                    println!("Import: {path_plus_name}");
                    if poke_eml_file(context, Path::new(&path_plus_name))
                        .await
@@ -133,11 +133,11 @@ async fn poke_spec(context: &Context, spec: Option<&str>) -> bool {
                }
            }
        } else {
-            eprintln!("Import: Cannot open directory {real_spec:?}.");
+            eprintln!("Import: Cannot open directory \"{}\".", &real_spec);
            return false;
        }
    }
-    println!("Import: {read_cnt} items read from {real_spec:?}.");
+    println!("Import: {} items read from \"{}\".", read_cnt, &real_spec);
    if read_cnt > 0 {
        context.emit_msgs_changed_without_ids();
    }
@@ -179,7 +179,7 @@ async fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
        msg.get_id(),
        if msg.get_showpadlock() { "🔒" } else { "" },
        if msg.has_location() { "📍" } else { "" },
-        contact_name,
+        &contact_name,
        contact_id,
        msgtext,
        if msg.has_html() { "[HAS-HTML]️" } else { "" },
@@ -221,7 +221,7 @@ async fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
        },
        statestr,
        downloadstate,
-        temp2,
+        &temp2,
    );
 }

@@ -319,6 +319,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 info\n\
                 set <configuration-key> [<value>]\n\
                 get <configuration-key>\n\
+                 oauth2\n\
                 configure\n\
                 connect\n\
                 disconnect\n\
@@ -395,6 +396,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 joinqr <qr-content>\n\
                 setqr <qr-content>\n\
                 createqrsvg <qr-content>\n\
+                 providerinfo <addr>\n\
                 fileinfo <file>\n\
                 estimatedeletion <seconds>\n\
                 clear -- clear screen\n\
@@ -559,7 +561,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                            .map_or_else(String::new, |prefix| format!("{prefix}: ")),
                        summary.text,
                        statestr,
-                        timestr,
+                        &timestr,
                        if chat.is_sending_locations() {
                            "📍"
                        } else {
@@ -1203,21 +1205,42 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
            fs::write(&file, svg).await?;
            println!("{file:#?} written.");
        }
+        "providerinfo" => {
+            ensure!(!arg1.is_empty(), "Argument <addr> missing.");
+            match provider::get_provider_info(arg1) {
+                Some(info) => {
+                    println!("Information for provider belonging to {arg1}:");
+                    println!("status: {}", info.status as u32);
+                    println!("before_login_hint: {}", info.before_login_hint);
+                    println!("after_login_hint: {}", info.after_login_hint);
+                    println!("overview_page: {}", info.overview_page);
+                    for server in info.server.iter() {
+                        println!("server: {}:{}", server.hostname, server.port,);
+                    }
+                }
+                None => {
+                    println!("No information for provider belonging to {arg1} found.");
+                }
+            }
+        }
        "fileinfo" => {
            ensure!(!arg1.is_empty(), "Argument <file> missing.");

-            let Ok(buf) = read_file(&context, Path::new(arg1)).await else {
+            if let Ok(buf) = read_file(&context, Path::new(arg1)).await {
+                let (width, height) = get_filemeta(&buf)?;
+                println!("width={width}, height={height}");
+            } else {
                bail!("Command failed.");
-            };
-            let (width, height) = get_filemeta(&buf)?;
-            println!("width={width}, height={height}");
+            }
        }
        "estimatedeletion" => {
            ensure!(!arg1.is_empty(), "Argument <seconds> missing");
            let seconds = arg1.parse()?;
-            let from_server = false;
-            let device_cnt = message::estimate_deletion_cnt(&context, from_server, seconds).await?;
-            println!("estimated count of messages older than {seconds} seconds: {device_cnt}");
+            let device_cnt = message::estimate_deletion_cnt(&context, false, seconds).await?;
+            let server_cnt = message::estimate_deletion_cnt(&context, true, seconds).await?;
+            println!(
+                "estimated count of messages older than {seconds} seconds:\non device: {device_cnt}\non server: {server_cnt}"
+            );
        }
        "" => (),
        _ => bail!("Unknown command: \"{arg0}\" type ? for help."),
@@ -9,12 +9,14 @@ extern crate deltachat;

 use std::borrow::Cow::{self, Borrowed, Owned};

-use anyhow::{Error, bail};
-use deltachat::EventType;
+use anyhow::{bail, Error};
 use deltachat::chat::ChatId;
+use deltachat::config;
 use deltachat::context::*;
+use deltachat::oauth2::*;
 use deltachat::qr_code_generator::get_securejoin_qr_svg;
 use deltachat::securejoin::*;
+use deltachat::EventType;
 use log::{error, info, warn};
 use nu_ansi_term::Color;
 use rustyline::completion::{Completer, FilenameCompleter, Pair};
@@ -160,10 +162,11 @@ const IMEX_COMMANDS: [&str; 10] = [
    "stop",
 ];

-const DB_COMMANDS: [&str; 10] = [
+const DB_COMMANDS: [&str; 11] = [
    "info",
    "set",
    "get",
+    "oauth2",
    "configure",
    "connect",
    "disconnect",
@@ -237,7 +240,7 @@ const CONTACT_COMMANDS: [&str; 9] = [
    "import-vcard",
    "make-vcard",
 ];
-const MISC_COMMANDS: [&str; 13] = [
+const MISC_COMMANDS: [&str; 14] = [
    "getqr",
    "getqrsvg",
    "getbadqr",
@@ -245,6 +248,7 @@ const MISC_COMMANDS: [&str; 13] = [
    "joinqr",
    "setqr",
    "createqrsvg",
+    "providerinfo",
    "fileinfo",
    "estimatedeletion",
    "clear",
@@ -266,11 +270,10 @@ impl Hinter for DcHelper {
                &CONTACT_COMMANDS[..],
                &MISC_COMMANDS[..],
            ] {
-                if let Some(entry) = cmds.iter().find(|el| el.starts_with(&line[..pos]))
-                    && *entry != line
-                    && *entry != &line[..pos]
-                {
-                    return Some(entry[pos..].to_owned());
+                if let Some(entry) = cmds.iter().find(|el| el.starts_with(&line[..pos])) {
+                    if *entry != line && *entry != &line[..pos] {
+                        return Some(entry[pos..].to_owned());
+                    }
                }
            }
        }
@@ -422,6 +425,19 @@ async fn handle_cmd(
        "configure" => {
            ctx.configure().await?;
        }
+        "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 {
+                    println!("OAuth2 not available for {}.", &addr);
+                }
+            } else {
+                println!("oauth2: set addr first.");
+            }
+        }
        "clear" => {
            println!("\n\n\n");
            print!("\x1b[1;1H\x1b[2J");
@@ -29,7 +29,7 @@ $ pip install .

 1. Build `deltachat-rpc-server` with `cargo build -p deltachat-rpc-server`.
 2. Install tox `pip install -U tox`
-3. Run `CHATMAIL_DOMAIN=ci-chatmail.testrun.org PATH="../target/debug:$PATH" tox`.
+3. Run `CHATMAIL_DOMAIN=nine.testrun.org PATH="../target/debug:$PATH" tox`.

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "deltachat-rpc-client"
-version = "2.58.0"
+version = "2.50.0-dev"
 license = "MPL-2.0"
 description = "Python client for Delta Chat core JSON-RPC interface"
 classifiers = [
@@ -133,10 +133,6 @@ class Account:
        """Delete a transport."""
        self._rpc.delete_transport(self.id, addr)

-    def set_transport_unpublished(self, addr: str, unpublished: bool = True):
-        """Unpublish the transport."""
-        self._rpc.set_transport_unpublished(self.id, addr, unpublished)
-
    @futuremethod
    def list_transports(self):
        """Return the list of all email accounts that are used as a transport in the current profile."""
@@ -186,7 +182,7 @@ class Account:
        return [Contact(self, contact_id) for contact_id in contact_ids]

    def create_chat(self, account: "Account") -> Chat:
-        """Create a single chat with another account."""
+        """Create a 1:1 chat with another account."""
        return self.create_contact(account).create_chat()

    def get_device_chat(self) -> Chat:
@@ -222,7 +218,7 @@ class Account:
        return [AttrDict(contact=Contact(self, contact["id"]), **contact) for contact in contacts]

    def get_chat_by_contact(self, contact: Union[int, Contact]) -> Optional[Chat]:
-        """Return single chat for a contact if it exists."""
+        """Return 1:1 chat for a contact if it exists."""
        if isinstance(contact, Contact):
            assert contact.account == self
            contact_id = contact.id
@@ -344,6 +340,9 @@ class Account:
        because the word "channel" already appears a lot in the code,
        which would make it hard to grep for it.

+        After creation, the chat contains no recipients and is in _unpromoted_ state;
+        see `create_group()` for more information on the unpromoted state.
+
        Returns the created chat.
        """
        return Chat(self, self._rpc.create_broadcast(self.id, name))
@@ -252,7 +252,7 @@ class Chat:
    def get_contacts(self) -> list[Contact]:
        """Get the contacts belonging to this chat.

-        For single chats self-address is not included.
+        For single/direct chats self-address is not included.
        """
        contacts = self._rpc.get_chat_contacts(self.account.id, self.id)
        return [Contact(self.account, contact_id) for contact_id in contacts]
@@ -54,7 +54,6 @@ class EventType(str, Enum):
    MSG_DELIVERED = "MsgDelivered"
    MSG_FAILED = "MsgFailed"
    MSG_READ = "MsgRead"
-    MSG_READ_COUNT_CHANGED = "MsgReadCountChanged"
    MSG_DELETED = "MsgDeleted"
    CHAT_MODIFIED = "ChatModified"
    CHAT_DELETED = "ChatDeleted"
@@ -97,7 +96,7 @@ class ChatType(str, Enum):
    """Chat type."""

    SINGLE = "Single"
-    """Single chat (a chat with a with a single contact)"""
+    """1:1 chat, i.e. a direct chat with a single contact"""

    GROUP = "Group"

@@ -191,6 +190,7 @@ class MessageState(IntEnum):
    IN_FRESH = 10
    IN_NOTICED = 13
    IN_SEEN = 16
+    OUT_PREPARING = 18
    OUT_DRAFT = 19
    OUT_PENDING = 20
    OUT_FAILED = 24
@@ -231,6 +231,14 @@ class KeyGenType(IntEnum):
    RSA4096 = 3


+# "Lp" means "login parameters"
+class LpAuthFlag(IntEnum):
+    """Authorization flags."""
+
+    OAUTH2 = 0x2
+    NORMAL = 0x4
+
+
 class MediaQuality(IntEnum):
    """Media quality setting."""

@@ -246,6 +254,14 @@ class ProviderStatus(IntEnum):
    BROKEN = 3


+class PushNotifyState(IntEnum):
+    """Push notifications state."""
+
+    NOT_CONNECTED = 0
+    HEARTBEAT = 1
+    CONNECTED = 2
+
+
 class ShowEmails(IntEnum):
    """Show emails mode."""

@@ -55,7 +55,7 @@ class Contact:
        return snapshot

    def create_chat(self) -> "Chat":
-        """Create or get an existing single chat for this contact."""
+        """Create or get an existing 1:1 chat for this contact."""
        from .chat import Chat

        return Chat(
@@ -11,6 +11,8 @@ import subprocess
 import sys
 from typing import AsyncGenerator, Optional

+import execnet
+import py
 import pytest

 from . import Account, AttrDict, Bot, Chat, Client, DeltaChat, EventType, Message
@@ -102,7 +104,7 @@ class ACFactory:
        return ac_clone

    def get_accepted_chat(self, ac1: Account, ac2: Account) -> Chat:
-        """Create a new single chat between ac1 and ac2 accepted on both sides.
+        """Create a new 1:1 chat between ac1 and ac2 accepted on both sides.

        Returned chat is a chat with ac2 from ac1 point of view.
        """
@@ -174,9 +176,9 @@ def data():

    class Data:
        def __init__(self) -> None:
-            for path in pathlib.Path(__file__).parents:
-                datadir = path / "test-data"
-                if datadir.is_dir():
+            for path in reversed(py.path.local(__file__).parts()):
+                datadir = path.join("test-data")
+                if datadir.isdir():
                    self.path = datadir
                    return
            raise Exception("Data path cannot be found")
@@ -272,11 +274,10 @@ def alice_and_remote_bob(tmp_path, acfactory, get_core_python_env):
    The 'eval' function allows to remote-execute arbitrary expressions
    that can use the `bob` online account, and the `bob_contact_alice`.
    """
-    from execnet import makegateway

    def factory(core_version):
        python, rpc_server_path = get_core_python_env(core_version)
-        gw = makegateway(f"popen//python={python}")
+        gw = execnet.makegateway(f"popen//python={python}")

        accounts_dir = str(tmp_path.joinpath("account1_venv1"))
        channel = gw.remote_exec(remote_bob_loop)
@@ -87,7 +87,6 @@ def test_delivery_status_failed(acfactory: ACFactory) -> None:
    Test change status on chatlistitem when status changes failed
    """
    (alice,) = acfactory.get_online_accounts(1)
-    alice.set_config("force_encryption", "0")

    invalid_contact = alice.create_contact("example@example.com", "invalid address")
    invalid_chat = alice.get_chat_by_id(alice._rpc.create_chat_by_contact_id(alice.id, invalid_contact.id))
@@ -16,7 +16,7 @@ def test_install_venv_and_use_other_core(tmp_path, get_core_python_env):


@pytest.mark.parametrize("version", ["2.24.0"])
-def test_qr_setup_contact(acfactory, alice_and_remote_bob, version) -> None:
+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)

@@ -33,15 +33,6 @@ def test_qr_setup_contact(acfactory, alice_and_remote_bob, version) -> None:
    # Test that Bob verified Alice's profile.
    assert remote_eval("bob_contact_alice.get_snapshot().is_verified")

-    # Test that Bob can also scan a QR code
-    # of Alice for which the key is not known yet.
-    # For the test above Bob already knew the key from a vCard.
-    alice2 = acfactory.get_online_account()
-    qr_code = alice2.get_qr_code()
-    remote_eval(f"bob.secure_join({qr_code!r})")
-    remote_eval("bob.wait_for_securejoin_joiner_success()")
-    alice2.wait_for_securejoin_inviter_success()
-

 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."""
@@ -14,13 +14,10 @@ def test_moved_markseen(acfactory, direct_imap, log):
    ac2.add_or_update_transport({"addr": addr, "password": password})
    ac2.bring_online()

-    # Make sure that messages are not immediately auto-deleted on the server:
-    ac1.set_config("bcc_self", "1")
-    ac2.set_config("bcc_self", "1")
-
    log.section("ac2: creating DeltaChat folder")
    ac2_direct_imap = direct_imap(ac2)
    ac2_direct_imap.create_folder("DeltaChat")
+    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.add_or_update_transport({"addr": addr, "password": password, "imapFolder": "DeltaChat"})
@@ -60,25 +57,23 @@ def test_moved_markseen(acfactory, direct_imap, log):
 def test_markseen_message_and_mdn(acfactory, direct_imap):
    ac1, ac2 = acfactory.get_online_accounts(2)

-    # Make sure that messages are not immediately auto-deleted on the server:
-    ac1.set_config("bcc_self", "1")
-    ac2.set_config("bcc_self", "1")
+    for ac in ac1, ac2:
+        ac.set_config("delete_server_after", "0")
+
+    # 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()

-    rex = re.compile("Marked messages ([0-9,:]+) in folder INBOX as seen.")
+    rex = re.compile("Marked messages [0-9]+ in folder INBOX as seen.")

-    # Each profile flags two messages but the logged UID set
-    # covers a varying number of them, so just count UIDs mentioned.
-    # We are not processing UID ranges, here we just care for two UIDs.
    for ac in ac1, ac2:
-        uids = set()
-        while len(uids) < 2:
+        while True:
            event = ac.wait_for_event()
-            if event.kind == EventType.INFO and (match := rex.search(event.msg)):
-                uids.update(re.split("[,:]", match.group(1)))
+            if event.kind == EventType.INFO and rex.search(event.msg):
+                break

    ac1_direct_imap = direct_imap(ac1)
    ac2_direct_imap = direct_imap(ac2)
@@ -86,18 +81,17 @@ def test_markseen_message_and_mdn(acfactory, direct_imap):
    ac1_direct_imap.select_folder("INBOX")
    ac2_direct_imap.select_folder("INBOX")

-    # Check that the mdn and original message is marked as seen
-    assert len(list(ac1_direct_imap.conn.fetch(AND(seen=True), mark_seen=False))) == 2
-    assert len(list(ac2_direct_imap.conn.fetch(AND(seen=True), mark_seen=False))) == 2
+    # 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_trash_multiple_messages(acfactory, direct_imap, log):
    ac1, ac2 = acfactory.get_online_accounts(2)
    ac2.stop_io()

-    # Make sure that messages are not immediately auto-deleted on the server:
-    ac2.set_config("bcc_self", "1")
-
+    ac2.set_config("delete_server_after", "0")
    ac2.set_config("sync_msgs", "0")

    ac2.start_io()
@@ -4,29 +4,39 @@ from deltachat_rpc_client import EventType
 from deltachat_rpc_client.const import MessageState


-def test_bcc_self_is_enabled_when_setting_up_second_device(acfactory):
+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.
+    # Second device setup
+    # enables bcc_self and changes default delete_server_after.
    assert ac.get_config("bcc_self") == "1"
-    assert ac_clone.get_config("bcc_self") == "1"
+    assert ac.get_config("delete_server_after") == "0"

-    # Test manually disabling bcc_self
+    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 again
+    # 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):
@@ -37,14 +47,19 @@ def test_one_account_send_bcc_setting(acfactory, log, direct_imap):
    log.section("send out message without bcc to ourselves")
    ac1.set_config("bcc_self", "0")
    chat = ac1.create_chat(ac2)
+    self_addr = ac1.get_config("addr")
+    other_addr = ac2.get_config("addr")

    msg_out = chat.send_text("message1")
    assert not msg_out.get_snapshot().is_forwarded

    # wait for send out (no BCC)
-    ac1.wait_for_event(EventType.SMTP_MESSAGE_SENT)
+    ev = ac1.wait_for_event(EventType.SMTP_MESSAGE_SENT)
    assert ac1.get_config("bcc_self") == "0"

+    assert self_addr not in ev.msg
+    assert other_addr in ev.msg
+
    log.section("ac1: setting bcc_self=1")
    ac1.set_config("bcc_self", "1")

@@ -52,16 +67,20 @@ def test_one_account_send_bcc_setting(acfactory, log, direct_imap):
    msg_out = chat.send_text("message2")

    # wait for send out (BCC)
-    ac1.wait_for_event(EventType.SMTP_MESSAGE_SENT)
+    ev = ac1.wait_for_event(EventType.SMTP_MESSAGE_SENT)
    assert ac1.get_config("bcc_self") == "1"

-    # Second client receives only the second message, but not the first.
+    # Second client receives only second message, but not the first.
    ev_msg = ac1_clone.wait_for_event(EventType.MSGS_CHANGED)
    assert ac1_clone.get_message_by_id(ev_msg.msg_id).get_snapshot().text == "Messages are end-to-end encrypted."

    ev_msg = ac1_clone.wait_for_event(EventType.MSGS_CHANGED)
    assert ac1_clone.get_message_by_id(ev_msg.msg_id).get_snapshot().text == msg_out.get_snapshot().text

+    # now make sure we are sending message to ourselves too
+    assert self_addr in ev.msg
+    assert self_addr in ev.msg
+
    # BCC-self messages are marked as seen by the sender device.
    while True:
        event = ac1.wait_for_event()
@@ -150,9 +150,12 @@ def test_transport_synchronization(acfactory, log) -> None:
    log.section("ac1 changes the primary transport")
    ac1.set_config("configured_addr", transport3["addr"])

+    # One event for updated `add_timestamp` of the new primary transport,
+    # one event for the `configured_addr` update.
+    ac1_clone.wait_for_event(EventType.TRANSPORTS_MODIFIED)
    ac1_clone.wait_for_event(EventType.TRANSPORTS_MODIFIED)
    [transport1, transport3] = ac1_clone.list_transports()
-    assert ac1_clone.get_config("configured_addr") == transport1["addr"]
+    assert ac1_clone.get_config("configured_addr") == addr3

    log.section("ac1 removes the first transport")
    ac1.delete_transport(transport1["addr"])
@@ -171,7 +174,7 @@ def test_transport_synchronization(acfactory, log) -> None:


 def test_transport_sync_new_as_primary(acfactory, log) -> None:
-    """Test that a transport promoted on one device is usable on other devices."""
+    """Test synchronization of new transport as primary between devices."""
    ac1, bob = acfactory.get_online_accounts(2)
    ac1_clone = ac1.clone()
    ac1_clone.bring_online()
@@ -190,9 +193,9 @@ def test_transport_sync_new_as_primary(acfactory, log) -> None:
    ac1.set_config("configured_addr", transport2["addr"])

    ac1_clone.wait_for_event(EventType.TRANSPORTS_MODIFIED)
-    assert ac1_clone.get_config("configured_addr") == transport1["addr"]
+    assert ac1_clone.get_config("configured_addr") == transport2["addr"]

-    log.section("ac1_clone receives a message via the new transport")
+    log.section("ac1_clone receives a message via the new primary transport")
    ac1_chat = ac1.create_chat(bob)
    ac1_chat.send_text("Hello!")
    bob_chat_id = bob.wait_for_incoming_msg_event().chat_id
@@ -234,21 +237,10 @@ def test_transport_limit(acfactory) -> None:
        account.add_transport_from_qr(qr)

    second_addr = account.list_transports()[1]["addr"]
-    third_addr = account.list_transports()[2]["addr"]
+    account.delete_transport(second_addr)

-    # test that adding a transport after unpublishing one works again
-    account.set_transport_unpublished(second_addr)
+    # test that adding a transport after deleting one works again
    account.add_transport_from_qr(qr)
-    with pytest.raises(JsonRpcError):
-        account.add_transport_from_qr(qr)
-
-    # UIs are not expected to delete transports directly,
-    # but we still test that adding a transport
-    # after deleting one instead of unpublishing works.
-    account.delete_transport(third_addr)
-    account.add_transport_from_qr(qr)
-    with pytest.raises(JsonRpcError):
-        account.add_transport_from_qr(qr)


 def test_message_info_imap_urls(acfactory) -> None:
@@ -487,7 +487,7 @@ def test_qr_join_chat_with_pending_bobstate_issue4894(acfactory):
 def test_qr_new_group_unblocked(acfactory):
    """Regression test for a bug introduced in core v1.113.0.
    ac2 scans a verified group QR code created by ac1.
-    This results in creation of a blocked single chat with ac1 on ac2,
+    This results in creation of a blocked 1:1 chat with ac1 on ac2,
    but ac1 contact is not blocked on ac2.
    Then ac1 creates a group, adds ac2 there and promotes it by sending a message.
    ac2 should receive a message and create a contact request for the group.
@@ -704,25 +704,3 @@ def test_withdraw_securejoin_qr(acfactory):
            and "Ignoring RequestWithAuth message because of invalid auth code." in event.msg
        ):
            break
-
-
-def test_qr_scan_updates_new_relay_address(acfactory):
-    alice, bob = acfactory.get_online_accounts(2)
-
-    bob_alice_chat = bob.secure_join(alice.get_qr_code())
-    alice.wait_for_securejoin_inviter_success()
-    bob.wait_for_securejoin_joiner_success()
-
-    for ac in [alice, bob]:
-        old_addr = ac.get_config("configured_addr")
-        ac.add_transport_from_qr(acfactory.get_account_qr())
-        ac.set_config("configured_addr", ac.list_transports()[1]["addr"])
-        ac.delete_transport(old_addr)
-
-    bob.secure_join(alice.get_qr_code())
-    alice.wait_for_securejoin_inviter_success()
-    bob.wait_for_securejoin_joiner_success()
-
-    bob_alice_chat.send_text("hi")
-    snapshot = alice.wait_for_incoming_msg().get_snapshot()
-    assert snapshot.text == "hi"
@@ -91,15 +91,7 @@ def test_lowercase_address(acfactory) -> None:
    assert account.list_transports()[0]["addr"] == addr

    param = account.get_info()["used_transport_settings"]
-
-    domain = addr.rsplit("@")[-1]
-    domain_upper = addr_upper.rsplit("@")[-1]
-    assert domain in param
-    assert domain_upper not in param
-
-    # Whole address should not appear in the info,
-    # does not matter if uppercase or lowercase.
-    assert addr not in param
+    assert addr in param
    assert addr_upper not in param


@@ -221,30 +213,6 @@ def test_account(acfactory) -> None:
    alice.stop_io()


-def test_mark_fresh_vs_self_mdn(acfactory) -> None:
-    alice, bob = acfactory.get_online_accounts(2)
-    bob.set_config("bcc_self", "1")
-
-    alice_contact_bob = alice.create_contact(bob)
-    alice_chat = alice_contact_bob.create_chat()
-    alice_chat.send_text("Hello!")
-
-    event = bob.wait_for_incoming_msg_event()
-    chat_id = event.chat_id
-    msg_id = event.msg_id
-
-    bob_chat = bob.get_chat_by_id(chat_id)
-    message = bob.get_message_by_id(msg_id)
-    bob_chat.accept()
-    bob.mark_seen_messages([message])
-    bob_chat.mark_fresh()
-    assert bob_chat.get_fresh_message_count() == 1
-    alice.wait_for_event(EventType.MSG_READ)
-    alice_chat.send_text("You've read 'Hello!'")
-    bob.wait_for_incoming_msg_event()
-    assert bob_chat.get_fresh_message_count() == 2
-
-
 def test_chat(acfactory) -> None:
    alice, bob = acfactory.get_online_accounts(2)

@@ -275,7 +243,7 @@ def test_chat(acfactory) -> None:
    bob_chat_alice.unpin()
    bob_chat_alice.archive()
    bob_chat_alice.unarchive()
-    with pytest.raises(JsonRpcError):  # can't set name for single chats
+    with pytest.raises(JsonRpcError):  # can't set name for 1:1 chats
        bob_chat_alice.set_name("test")
    bob_chat_alice.set_ephemeral_timer(300)
    bob_chat_alice.get_encryption_info()
@@ -380,7 +348,7 @@ def test_receive_imf_failure(acfactory) -> None:
        snapshot.text == "❌ Failed to receive a message:"
        " Condition failed: `!context.get_config_bool(Config::SimulateReceiveImfError).await?`."
        f" Core version {version}."
-        " Please report this bug to delta@merlinux.eu or https://support.delta.chat/"
+        " Please report this bug to delta@merlinux.eu or https://support.delta.chat/."
    )

    # The failed message doesn't break the IMAP loop.
@@ -474,35 +442,6 @@ def test_reaction_seen_on_another_dev(acfactory) -> None:
    assert chat_id == alice2_chat_bob.id


-def test_2nd_device_events_when_msgs_are_seen(acfactory) -> None:
-    alice, bob = acfactory.get_online_accounts(2)
-    alice2 = alice.clone()
-    alice2.start_io()
-
-    # Get an accepted chat, otherwise alice2 won't be notified about the 2nd message.
-    chat_alice2 = alice2.create_chat(bob)
-    chat_id_alice2 = chat_alice2.get_basic_snapshot().id
-
-    chat_bob_alice = bob.create_chat(alice)
-    chat_bob_alice.send_text("Hello!")
-    msg_alice = alice.wait_for_incoming_msg()
-    assert alice2.wait_for_incoming_msg_event().chat_id == chat_id_alice2
-    chat_bob_alice.send_text("What's new?")
-    assert alice2.wait_for_incoming_msg_event().chat_id == chat_id_alice2
-    chat_alice2 = alice2.get_chat_by_id(chat_id_alice2)
-    assert chat_alice2.get_fresh_message_count() == 2
-
-    msg_alice.mark_seen()
-    assert alice2.wait_for_msgs_changed_event().chat_id == chat_id_alice2
-    assert chat_alice2.get_fresh_message_count() == 1
-
-    msg_id = alice.wait_for_msgs_changed_event().msg_id
-    msg = alice.get_message_by_id(msg_id)
-    msg.mark_seen()
-    assert alice2.wait_for_event(EventType.MSGS_NOTICED).chat_id == chat_id_alice2
-    assert chat_alice2.get_fresh_message_count() == 0
-
-
 def test_is_bot(acfactory) -> None:
    """Test that we can recognize messages submitted by bots."""
    alice, bob = acfactory.get_online_accounts(2)
@@ -747,6 +686,28 @@ def test_early_failure(tmp_path) -> None:
        rpc.start()


+def test_provider_info(rpc) -> None:
+    account_id = rpc.add_account()
+
+    provider_info = rpc.get_provider_info(account_id, "example.org")
+    assert provider_info["id"] == "example.com"
+
+    provider_info = rpc.get_provider_info(account_id, "uep7oiw4ahtaizuloith.org")
+    assert provider_info is None
+
+    # Test MX record resolution.
+    # This previously resulted in Gmail provider
+    # because MX record pointed to google.com domain,
+    # but MX record resolution has been removed.
+    provider_info = rpc.get_provider_info(account_id, "github.com")
+    assert provider_info is None
+
+    # Disable MX record resolution.
+    rpc.set_config(account_id, "proxy_enabled", "1")
+    provider_info = rpc.get_provider_info(account_id, "github.com")
+    assert provider_info is None
+
+
 def test_mdn_doesnt_break_autocrypt(acfactory) -> None:
    alice, bob = acfactory.get_online_accounts(2)

@@ -1003,11 +964,6 @@ def test_no_markseen_in_team_profile(team_profile, acfactory):

    message.mark_seen()

-    # The MDN is queued in `smtp_mdns`, which is drained only after the regular
-    # `smtp` queue, so "Outgoing message" would otherwise overtake it on the wire.
-    # Wait for the read receipt to reach Alice before queueing "Outgoing message".
-    alice.wait_for_event(EventType.MSG_READ)
-
    # Send a message and wait until it arrives
    # in order to wait until Bob2 gets the markseen message.
    # This also tests that outgoing messages
@@ -1135,7 +1091,6 @@ def test_rename_group(acfactory):
    bob.wait_for_event(EventType.CHATLIST_ITEM_CHANGED)

    for name in ["Baz", "Foo bar", "Xyzzy"]:
-        time.sleep(1)
        alice_group.set_name(name)
        bob.wait_for_event(EventType.CHATLIST_ITEM_CHANGED)
        bob.wait_for_event(EventType.CHATLIST_ITEM_CHANGED)
@@ -1277,12 +1232,10 @@ def test_leave_and_delete_group(acfactory, log):


 def test_immediate_autodelete(acfactory, direct_imap, log):
-    """
-    `bcc_self` is off by default,
-    so that messages are supposed to be immediately autodeleted
-    """
    ac1, ac2 = acfactory.get_online_accounts(2)
-    assert ac1.get_config("bcc_self") == "0"
+
+    # "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)
@@ -1,8 +1,8 @@
 [package]
 name = "deltachat-rpc-server"
-version = "2.58.0"
+version = "2.50.0-dev"
 description = "DeltaChat JSON-RPC server"
-edition = "2024"
+edition = "2021"
 readme = "README.md"
 license = "MPL-2.0"

@@ -15,5 +15,5 @@
  },
  "type": "module",
  "types": "index.d.ts",
-  "version": "2.58.0"
+  "version": "2.50.0-dev"
 }
@@ -6,7 +6,7 @@ use std::env;
 use std::path::PathBuf;
 use std::sync::Arc;

-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{anyhow, Context as _, Result};
 use deltachat::constants::DC_VERSION_STR;
 use deltachat_jsonrpc::api::{Accounts, CommandApi};
 use futures_lite::stream::StreamExt;
@@ -2,7 +2,7 @@
 name = "deltachat-time"
 version = "1.0.0"
 description = "Time-related tools"
-edition = "2024"
+edition = "2021"
 license = "MPL-2.0"

 [dependencies]
@@ -1,12 +1,12 @@
 [package]
 name = "deltachat_derive"
 version = "2.0.0"
-edition = "2024"
+edition = "2018"
 license = "MPL-2.0"

 [lib]
 proc-macro = true

 [dependencies]
-syn = "3"
+syn = "2"
 quote = "1"
@@ -14,7 +14,7 @@ pub fn to_sql_derive(input: TokenStream) -> TokenStream {
    let ast: syn::DeriveInput = syn::parse(input).unwrap();
    let name = &ast.ident;

-    let q = quote! {
+    let gen = quote! {
        impl rusqlite::types::ToSql for #name {
            fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput> {
                let num = *self as i64;
@@ -24,7 +24,7 @@ pub fn to_sql_derive(input: TokenStream) -> TokenStream {
            }
        }
    };
-    q.into()
+    gen.into()
 }

 #[proc_macro_derive(FromSql)]
@@ -32,7 +32,7 @@ pub fn from_sql_derive(input: TokenStream) -> TokenStream {
    let ast: syn::DeriveInput = syn::parse(input).unwrap();
    let name = &ast.ident;

-    let q = quote! {
+    let gen = quote! {
        impl rusqlite::types::FromSql for #name {
            fn column_result(col: rusqlite::types::ValueRef) -> rusqlite::types::FromSqlResult<Self> {
                let inner = rusqlite::types::FromSql::column_result(col)?;
@@ -44,5 +44,5 @@ pub fn from_sql_derive(input: TokenStream) -> TokenStream {
            }
        }
    };
-    q.into()
+    gen.into()
 }
@@ -18,11 +18,6 @@ ignore = [
    # this should be fixed by upgrading to iroh 1.0 once it is released.
    "RUSTSEC-2025-0134",

-    # Unmaintained proc-macro-error2
-    # Transitive dependency of typescript-type-def 0.5.13.
-    # <https://rustsec.org/advisories/RUSTSEC-2026-0173>
-    "RUSTSEC-2026-0173",
-
    # rustls-webpki v0.102.8
    # We cannot upgrade to >=0.103.10 because
    # it is a transitive dependency of iroh 0.35.0
@@ -48,12 +43,7 @@ ignore = [
    # hickory-proto 0.25.2 quadratic complexity issue.
    # Dependency of iroh 0.35.0, cannot be updated as of 2026-05-02.
    # <https://rustsec.org/advisories/RUSTSEC-2026-0119>
-    "RUSTSEC-2026-0119",
-
-    # Timing side channel in ml-dsa dependency of rPGP.
-    # We enable PQC for encryption rather than signatures.
-    # <https://rustsec.org/advisories/RUSTSEC-2025-0144>
-    "RUSTSEC-2025-0144",
+    "RUSTSEC-2026-0119"
 ]

 [bans]
@@ -65,14 +55,12 @@ skip = [
     { name = "async-channel", version = "1.9.0" },
     { name = "bitflags", version = "1.3.2" },
     { name = "constant_time_eq", version = "0.3.1" },
-     { name = "cpufeatures", version = "0.2.17" },
     { name = "derive_more-impl", version = "1.0.0" },
     { name = "derive_more", version = "1.0.0" },
     { name = "event-listener", version = "2.5.3" },
     { name = "getrandom", version = "0.2.12" },
     { name = "heck", version = "0.4.1" },
     { name = "http", version = "0.2.12" },
-     { name = "hybrid-array", version = "0.2.3" },
     { name = "linux-raw-sys", version = "0.4.14" },
     { name = "lru", version = "0.12.5" },
     { name = "netlink-packet-route", version = "0.17.1" },
@@ -83,14 +71,11 @@ skip = [
     { name = "rustix", version = "0.38.44" },
     { name = "rustls-webpki", version = "0.102.8" },
     { name = "serdect", version = "0.2.0" },
-     { name = "snafu-derive", version = "0.8.5" },
-     { name = "snafu", version = "0.8.5" },
     { 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" },
     { name = "syn", version = "1.0.109" },
-     { name = "syn", version = "2.0.118" },
     { name = "thiserror-impl", version = "1.0.69" },
     { name = "thiserror", version = "1.0.69" },
     { name = "toml_datetime", version = "0.6.11" },
@@ -3,19 +3,15 @@
    "android": {
      "inputs": {
        "devshell": "devshell",
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1779918845,
-        "narHash": "sha256-FbpOOBg15L7X6NWWmTKbSdccnH59Jq53wWmAO37d2Q8=",
+        "lastModified": 1731356359,
+        "narHash": "sha256-vYqJnu6jotmWpPT4DgzHVdvNIZcKZCIUqS8QaptsZA0=",
        "owner": "tadfisher",
        "repo": "android-nixpkgs",
-        "rev": "105c093afc8c8fbeea98f8e398403f93043eba17",
+        "rev": "c028ead7e88edb2e94cd7c90ee37593f63ae494a",
        "type": "github"
      },
      "original": {
@@ -32,11 +28,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1768818222,
-        "narHash": "sha256-460jc0+CZfyaO8+w8JNtlClB2n4ui1RbHfPTLkpwhU8=",
+        "lastModified": 1728330715,
+        "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
        "owner": "numtide",
        "repo": "devshell",
-        "rev": "255a2b1725a20d060f566e4755dbf571bbbb5f76",
+        "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
        "type": "github"
      },
      "original": {
@@ -47,17 +43,15 @@
    },
    "fenix": {
      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
+        "nixpkgs": "nixpkgs_2",
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1779876442,
-        "narHash": "sha256-O25HomVNmdROO13PEQ3Ran8Hq5EsyLmVn8Gb8JvJtJE=",
+        "lastModified": 1763361733,
+        "narHash": "sha256-ka7dpwH3HIXCyD2wl5F7cPLeRbqZoY2ullALsvxdPt8=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "2eff81fc84390a35e1565395ae945d9394856824",
+        "rev": "6c8d48e3b0ae371b19ac1485744687b788e80193",
        "type": "github"
      },
      "original": {
@@ -71,11 +65,29 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
        "type": "github"
      },
      "original": {
@@ -86,19 +98,14 @@
    },
    "naersk": {
      "inputs": {
-        "fenix": [
-          "fenix"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1780914171,
-        "narHash": "sha256-NYoa+CvsCgayY356worC9g6QoZkKJmvrj6nVdEA2Lyk=",
+        "lastModified": 1721727458,
+        "narHash": "sha256-r/xppY958gmZ4oTfLiHN0ZGuQ+RSTijDblVgVLFi1mw=",
        "owner": "nix-community",
        "repo": "naersk",
-        "rev": "41b6e9efb62fac9c16d5617e0456a715928a2206",
+        "rev": "3fb418eaf352498f6b6c30592e3beb63df42ef11",
        "type": "github"
      },
      "original": {
@@ -109,11 +116,11 @@
    },
    "nix-filter": {
      "locked": {
-        "lastModified": 1757882181,
-        "narHash": "sha256-+cCxYIh2UNalTz364p+QYmWHs0P+6wDhiWR4jDIKQIU=",
+        "lastModified": 1730207686,
+        "narHash": "sha256-SCHiL+1f7q9TAnxpasriP6fMarWE5H43t25F5/9e28I=",
        "owner": "numtide",
        "repo": "nix-filter",
-        "rev": "59c44d1909c72441144b93cf0f054be7fe764de5",
+        "rev": "776e68c1d014c3adde193a18db9d738458cd2ba4",
        "type": "github"
      },
      "original": {
@@ -124,16 +131,60 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1779931091,
-        "narHash": "sha256-gc8NEz7a++7OQPGvMv+zIjXCec1PO38XRXZRa3m97ew=",
+        "lastModified": 1731139594,
+        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1762977756,
+        "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "3052ddf0614791c1869384a868248be5607a309f",
+        "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "master",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 0,
+        "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
+        "path": "/nix/store/zq2axpgzd5kykk1v446rkffj3bxa2m2h-source",
+        "type": "path"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1747179050,
+        "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
@@ -142,20 +193,20 @@
      "inputs": {
        "android": "android",
        "fenix": "fenix",
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
        "naersk": "naersk",
        "nix-filter": "nix-filter",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs_4"
      }
    },
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1779827300,
-        "narHash": "sha256-J6pHxKoZzWCrAvOVInwBcYYWix/NWwM10Ad+i29Qc5s=",
+        "lastModified": 1762860488,
+        "narHash": "sha256-rMfWMCOo/pPefM2We0iMBLi2kLBAnYoB9thi4qS7uk4=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "c3af07ad84d68adc5e652e86f0c20009caa29014",
+        "rev": "2efc80078029894eec0699f62ec8d5c1a56af763",
        "type": "github"
      },
      "original": {
@@ -179,6 +230,21 @@
        "repo": "default",
        "type": "github"
      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
    }
  },
  "root": "root",
@@ -2,16 +2,11 @@
  description = "Chatmail core";
  inputs = {
    fenix.url = "github:nix-community/fenix";
-    fenix.inputs.nixpkgs.follows = "nixpkgs";
    flake-utils.url = "github:numtide/flake-utils";
    naersk.url = "github:nix-community/naersk";
-    naersk.inputs.nixpkgs.follows = "nixpkgs";
-    naersk.inputs.fenix.follows = "fenix";
    nix-filter.url = "github:numtide/nix-filter";
-    nixpkgs.url = "github:nixos/nixpkgs/master";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
    android.url = "github:tadfisher/android-nixpkgs";
-    android.inputs.nixpkgs.follows = "nixpkgs";
-    android.inputs.flake-utils.follows = "flake-utils";
  };
  outputs = { self, nixpkgs, flake-utils, nix-filter, naersk, fenix, android }:
    flake-utils.lib.eachDefaultSystem (system:
@@ -66,15 +61,37 @@
          ];
        };

-        # Map from architecture name to nixpkgs targets.
+        # Map from architecture name to rust targets and nixpkgs targets.
        arch2targets = {
-          "x86_64-linux" = "x86_64-unknown-linux-musl";
-          "armv7l-linux" = "armv7l-unknown-linux-musleabihf";
-          "armv6l-linux" = "armv6l-unknown-linux-musleabihf";
-          "aarch64-linux" = "aarch64-unknown-linux-musl";
-          "i686-linux" = "i686-unknown-linux-musl";
-          "x86_64-darwin" = "x86_64-darwin";
-          "aarch64-darwin" = "aarch64-darwin";
+          "x86_64-linux" = {
+            rustTarget = "x86_64-unknown-linux-musl";
+            crossTarget = "x86_64-unknown-linux-musl";
+          };
+          "armv7l-linux" = {
+            rustTarget = "armv7-unknown-linux-musleabihf";
+            crossTarget = "armv7l-unknown-linux-musleabihf";
+          };
+          "armv6l-linux" = {
+            rustTarget = "arm-unknown-linux-musleabihf";
+            crossTarget = "armv6l-unknown-linux-musleabihf";
+          };
+          "aarch64-linux" = {
+            rustTarget = "aarch64-unknown-linux-musl";
+            crossTarget = "aarch64-unknown-linux-musl";
+          };
+          "i686-linux" = {
+            rustTarget = "i686-unknown-linux-musl";
+            crossTarget = "i686-unknown-linux-musl";
+          };
+
+          "x86_64-darwin" = {
+            rustTarget = "x86_64-apple-darwin";
+            crossTarget = "x86_64-darwin";
+          };
+          "aarch64-darwin" = {
+            rustTarget = "aarch64-apple-darwin";
+            crossTarget = "aarch64-darwin";
+          };
        };
        cargoLock = {
          lockFile = ./Cargo.lock;
@@ -91,10 +108,10 @@
            auditable = false; # Avoid cargo-auditable failures.
            doCheck = false; # Disable test as it requires network access.
          };
+        pkgsWin64 = pkgs.pkgsCross.mingwW64;
        mkWin64RustPackage = packageName:
          let
-            pkgsWin64 = pkgs.pkgsCross.mingwW64;
-            rustTarget = pkgsWin64.stdenv.hostPlatform.rust.rustcTarget;
+            rustTarget = "x86_64-pc-windows-gnu";
            toolchainWin = fenixPkgs.combine [
              fenixPkgs.stable.rustc
              fenixPkgs.stable.cargo
@@ -116,8 +133,6 @@
            ];
            depsBuildBuild = [
              pkgsWin64.stdenv.cc
-            ];
-            buildInputs = [
              pkgsWin64.windows.pthreads
            ];
            auditable = false; # Avoid cargo-auditable failures.
@@ -125,22 +140,21 @@

            CARGO_BUILD_TARGET = rustTarget;
            TARGET_CC = "${pkgsWin64.stdenv.cc}/bin/${pkgsWin64.stdenv.cc.targetPrefix}cc";
-            CFLAGS_x86_64_pc_windows_gnu = "-I${pkgsWin64.windows.pthreads}/include";
            CARGO_BUILD_RUSTFLAGS = [
              "-C"
              "linker=${TARGET_CC}"
-              "-L"
-              "native=${pkgsWin64.windows.pthreads}/lib"
            ];

            CC = "${pkgsWin64.stdenv.cc}/bin/${pkgsWin64.stdenv.cc.targetPrefix}cc";
            LD = "${pkgsWin64.stdenv.cc}/bin/${pkgsWin64.stdenv.cc.targetPrefix}cc";
          };

+        pkgsWin32 = pkgs.pkgsCross.mingw32;
        mkWin32RustPackage = packageName:
          let
-            pkgsWin32 = pkgs.pkgsCross.mingw32;
-            rustTarget = pkgsWin32.stdenv.hostPlatform.rust.rustcTarget;
+            rustTarget = "i686-pc-windows-gnu";
+          in
+          let
            toolchainWin = fenixPkgs.combine [
              fenixPkgs.stable.rustc
              fenixPkgs.stable.cargo
@@ -166,8 +180,7 @@
                  };
                })).overrideAttrs (oldAttr: {
                configureFlags = oldAttr.configureFlags ++ [
-                  "--disable-sjlj-exceptions"
-                  "--with-dwarf2"
+                  "--disable-sjlj-exceptions --with-dwarf2"
                ];
              })
            );
@@ -180,12 +193,9 @@
            src = pkgs.lib.cleanSource ./.;
            nativeBuildInputs = [
              pkgs.perl # Needed to build vendored OpenSSL.
-              pkgs.nasm # aws-lc-sys requires it
            ];
            depsBuildBuild = [
              winCC
-            ];
-            buildInputs = [
              pkgsWin32.windows.pthreads
            ];
            auditable = false; # Avoid cargo-auditable failures.
@@ -193,12 +203,9 @@

            CARGO_BUILD_TARGET = rustTarget;
            TARGET_CC = "${winCC}/bin/${winCC.targetPrefix}cc";
-            CFLAGS_i686_pc_windows_gnu = "-I${pkgsWin32.windows.pthreads}/include";
            CARGO_BUILD_RUSTFLAGS = [
              "-C"
              "linker=${TARGET_CC}"
-              "-L"
-              "native=${pkgsWin32.windows.pthreads}/lib"
            ];

            CC = "${winCC}/bin/${winCC.targetPrefix}cc";
@@ -207,12 +214,14 @@

        mkCrossRustPackage = arch: packageName:
          let
-            crossTarget = arch2targets."${arch}";
+            rustTarget = arch2targets."${arch}".rustTarget;
+            crossTarget = arch2targets."${arch}".crossTarget;
            pkgsCross = import nixpkgs {
              system = system;
              crossSystem.config = crossTarget;
            };
-            rustTarget = pkgsCross.stdenv.hostPlatform.rust.rustcTarget;
+          in
+          let
            toolchain = fenixPkgs.combine [
              fenixPkgs.stable.rustc
              fenixPkgs.stable.cargo
@@ -495,6 +504,22 @@
                '';
              };

+            # Source package for deltachat-rpc-server.
+            # Fake package that downloads Linux version,
+            # needed to install deltachat-rpc-server on Android with `pip`.
+            deltachat-rpc-server-source =
+              pkgs.stdenv.mkDerivation {
+                pname = "deltachat-rpc-server-source";
+                version = manifest.version;
+                src = pkgs.lib.cleanSource ./.;
+                nativeBuildInputs = [
+                  pkgs.python3
+                  pkgs.python3Packages.wheel
+                ];
+                buildPhase = ''python3 scripts/wheel-rpc-server.py source deltachat_rpc_server-${manifest.version}.tar.gz'';
+                installPhase = ''mkdir -p $out; cp -av deltachat_rpc_server-${manifest.version}.tar.gz $out'';
+              };
+
            deltachat-rpc-client =
              pkgs.python3Packages.buildPythonPackage {
                pname = "deltachat-rpc-client";
@@ -537,7 +562,7 @@
                  deltachat-python
                  deltachat-rpc-client
                  pkgs.python3Packages.breathe
-                  pkgs.python3Packages.sphinx-rtd-theme
+                  pkgs.python3Packages.sphinx_rtd_theme
                ];
                nativeBuildInputs = [ pkgs.sphinx ];
                buildPhase = ''sphinx-build -b html -a python/doc/ dist/html'';
@@ -2,7 +2,7 @@
 name = "format-flowed"
 version = "1.0.0"
 description = "format=flowed support"
-edition = "2024"
+edition = "2021"
 license = "MPL-2.0"

 keywords = ["email"]
@@ -78,11 +78,11 @@ pub fn format_flowed(text: &str) -> String {

        let mut prefix = prefix.to_string();

-        if quote_depth > 0
-            && let Some(s) = line.strip_prefix(' ')
-        {
-            line = s;
-            prefix += " ";
+        if quote_depth > 0 {
+            if let Some(s) = line.strip_prefix(' ') {
+                line = s;
+                prefix += " ";
+            }
        }

        result += &format_line_flowed(line, &prefix);
@@ -224,7 +224,8 @@ mod tests {
    fn test_unformat_flowed() {
        let text = "this is a very long message that should be wrapped using format=flowed and \n\
            unwrapped on the receiver";
-        let expected = "this is a very long message that should be wrapped using format=flowed and \
+        let expected =
+            "this is a very long message that should be wrapped using format=flowed and \
                        unwrapped on the receiver";
        assert_eq!(unformat_flowed(text, false), expected);

@@ -254,7 +255,8 @@ mod tests {
        assert_eq!(format_flowed_quote(quote), expected);

        let quote = "this is a very long quote that should be wrapped using format=flowed and unwrapped on the receiver";
-        let expected = "> this is a very long quote that should be wrapped using format=flowed and \r\n\
+        let expected =
+            "> this is a very long quote that should be wrapped using format=flowed and \r\n\
            > unwrapped on the receiver";
        assert_eq!(format_flowed_quote(quote), expected);
    }
@@ -2,7 +2,7 @@
 name = "deltachat-fuzz"
 version = "0.0.0"
 publish = false
-edition = "2024"
+edition = "2021"
 license = "MPL-2.0"

 [dev-dependencies]
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "deltachat"
-version = "2.58.0"
+version = "2.50.0-dev"
 license = "MPL-2.0"
 description = "Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat"
 readme = "README.rst"
@@ -397,7 +397,7 @@ class Account:
        return (x for x in iter_array(dc_array, lambda x: Message.from_db(self, x)) if x is not None)

    def create_chat(self, obj) -> Chat:
-        """Create a single chat with Account, Contact or e-mail address."""
+        """Create a 1:1 chat with Account, Contact or e-mail address."""
        return self.create_contact(obj).create_chat()

    def create_group_chat(
@@ -74,7 +74,7 @@ class Chat:
        return lib.dc_chat_get_type(self._dc_chat) == const.DC_CHAT_TYPE_GROUP

    def is_single(self) -> bool:
-        """Return True if this chat is a single chat, False otherwise."""
+        """Return True if this chat is a single/direct chat, False otherwise."""
        return lib.dc_chat_get_type(self._dc_chat) == const.DC_CHAT_TYPE_SINGLE

    def is_mailinglist(self) -> bool:
@@ -271,6 +271,15 @@ class Chat:
           sent out.  This is the same object as was passed in, which
           has been modified with the new state of the core.
        """
+        if msg.is_out_preparing():
+            assert msg.id != 0
+            # get a fresh copy of dc_msg, the core needs it
+            maybe_msg = Message.from_db(self.account, msg.id)
+            if maybe_msg is not None:
+                msg = maybe_msg
+            else:
+                raise ValueError("message does not exist")
+
        sent_id = lib.dc_send_msg(self.account._dc_context, self.id, msg._dc_msg)
        if sent_id == 0:
            raise ValueError("message could not be sent")
@@ -324,6 +333,26 @@ class Chat:
            raise ValueError("message could not be sent")
        return Message.from_db(self.account, sent_id)

+    def send_prepared(self, message):
+        """send a previously prepared message.
+
+        :param message: a :class:`Message` instance previously returned by
+                        :meth:`prepare_file`.
+        :raises ValueError: if message can not be sent.
+        :returns: a :class:`deltachat.message.Message` instance as sent out.
+        """
+        assert message.id != 0 and message.is_out_preparing()
+        # get a fresh copy of dc_msg, the core needs it
+        msg = Message.from_db(self.account, message.id)
+
+        # pass 0 as chat-id because core-docs say it's ok when out-preparing
+        sent_id = lib.dc_send_msg(self.account._dc_context, 0, msg._dc_msg)
+        if sent_id == 0:
+            raise ValueError("message could not be sent")
+        assert sent_id == msg.id
+        # modify message in place to avoid bad state for the caller
+        msg._dc_msg = Message.from_db(self.account, sent_id)._dc_msg
+
    def set_draft(self, message):
        """set message as draft.

@@ -458,7 +487,7 @@ class Chat:
        """Get group profile image.

        For groups, this is the image set by any group member using
-        set_chat_profile_image(). For single chats, this is the image
+        set_chat_profile_image(). For normal chats, this is the image
        set by each remote user on their own using dc_set_config(context,
        "selfavatar", image).
        :returns: path to profile image, None if no profile image exists.
@@ -107,7 +107,7 @@ class Contact:
        return from_dc_charpointer(lib.dc_contact_get_status(self._dc_contact))

    def create_chat(self):
-        """create or get an existing single chat object for the specified contact or contact id.
+        """create or get an existing 1:1 chat object for the specified contact or contact id.

        :param contact: chat_id (int) or contact object.
        :returns: a :class:`deltachat.chat.Chat` object.
@@ -226,10 +226,6 @@ class EventThread(threading.Thread):

    def __init__(self, account: Account) -> None:
        self.account = account
-        self.event_emitter = ffi.gc(
-            lib.dc_get_event_emitter(self.account._dc_context),
-            lib.dc_event_emitter_unref,
-        )
        super(EventThread, self).__init__(name="events")
        self.daemon = True
        self._marked_for_shutdown = False
@@ -254,9 +250,13 @@ class EventThread(threading.Thread):
    def run(self) -> None:
        """get and run events until shutdown."""
        with self.log_execution("EVENT THREAD"):
+            event_emitter = ffi.gc(
+                lib.dc_get_event_emitter(self.account._dc_context),
+                lib.dc_event_emitter_unref,
+            )
            while not self._marked_for_shutdown:
                with self.swallow_and_log_exception("Unexpected error in event thread"):
-                    event = lib.dc_get_next_event(self.event_emitter)
+                    event = lib.dc_get_next_event(event_emitter)
                    if event == ffi.NULL or self._marked_for_shutdown:
                        break
                    self._process_event(event)
@@ -283,7 +283,7 @@ class Message:
        lib.dc_msg_set_override_sender_name(self._dc_msg, as_dc_charpointer(name))

    def get_sender_chat(self):
-        """return the single chat with the sender of this message.
+        """return the 1:1 chat with the sender of this message.

        :returns: :class:`deltachat.chat.Chat` instance
        """
@@ -351,12 +351,17 @@ class Message:
    def is_outgoing(self):
        """Return True if Message is outgoing."""
        return lib.dc_msg_get_state(self._dc_msg) in (
+            const.DC_STATE_OUT_PREPARING,
            const.DC_STATE_OUT_PENDING,
            const.DC_STATE_OUT_FAILED,
            const.DC_STATE_OUT_MDN_RCVD,
            const.DC_STATE_OUT_DELIVERED,
        )

+    def is_out_preparing(self):
+        """Return True if Message is outgoing, but its file is being prepared."""
+        return self._msgstate == const.DC_STATE_OUT_PREPARING
+
    def is_out_pending(self):
        """Return True if Message is outgoing, but is pending (no single checkmark)."""
        return self._msgstate == const.DC_STATE_OUT_PENDING
@@ -0,0 +1,46 @@
+"""Provider info class."""
+
+from .capi import ffi, lib
+from .cutil import as_dc_charpointer, from_dc_charpointer
+
+
+class ProviderNotFoundError(Exception):
+    """The provider information was not found."""
+
+
+class Provider:
+    """
+    Provider information.
+
+    :param domain: The email to get the provider info for.
+    """
+
+    def __init__(self, account, addr) -> None:
+        provider = ffi.gc(
+            lib.dc_provider_new_from_email(account._dc_context, as_dc_charpointer(addr)),
+            lib.dc_provider_unref,
+        )
+        if provider == ffi.NULL:
+            raise ProviderNotFoundError("Provider not found")
+        self._provider = provider
+
+    @property
+    def overview_page(self) -> str:
+        """URL to the overview page of the provider on providers.delta.chat."""
+        return from_dc_charpointer(lib.dc_provider_get_overview_page(self._provider))
+
+    @property
+    def get_before_login_hints(self) -> str:
+        """Should be shown to the user on login."""
+        return from_dc_charpointer(lib.dc_provider_get_before_login_hint(self._provider))
+
+    @property
+    def status(self) -> int:
+        """The status of the provider information.
+
+        This is one of the
+        :attr:`deltachat.const.DC_PROVIDER_STATUS_OK`,
+        :attr:`deltachat.const.DC_PROVIDER_STATUS_PREPARATION` or
+        :attr:`deltachat.const.DC_PROVIDER_STATUS_BROKEN` constants.
+        """
+        return lib.dc_provider_get_status(self._provider)
@@ -521,6 +521,7 @@ class ACFactory:
        assert "addr" in configdict and "mail_pw" in configdict, configdict
        configdict.setdefault("bcc_self", False)
        configdict.setdefault("sync_msgs", False)
+        configdict.setdefault("delete_server_after", 0)
        ac.update_config(configdict)
        self._acsetup._account2config[ac] = configdict
        self._preconfigure_key(ac)
@@ -298,6 +298,73 @@ def test_use_new_verified_group_after_going_online(acfactory, data, tmp_path, lp
    assert msg_in.text == msg_out.text


+def test_verified_group_vs_delete_server_after(acfactory, tmp_path, lp):
+    """Test for the issue #4346:
+    - User is added to a verified group.
+    - First device of the user downloads "member added" from the group.
+    - First device removes "member added" from the server.
+    - Some new messages are sent to the group.
+    - Second device comes online, receives these new messages.
+      The result is an unverified group with unverified members.
+    - First device re-gossips Autocrypt keys to the group.
+    - Now the second device has all members and group verified.
+    """
+    ac1, ac2 = acfactory.get_online_accounts(2)
+    acfactory.remove_preconfigured_keys()
+    ac2_offl = acfactory.new_online_configuring_account(cloned_from=ac2)
+    for ac in [ac2, ac2_offl]:
+        ac.set_config("bcc_self", "1")
+    ac2.set_config("delete_server_after", "1")
+    ac2.set_config("gossip_period", "0")  # Re-gossip in every message
+    acfactory.bring_accounts_online()
+    dir = tmp_path / "exportdir"
+    dir.mkdir()
+    ac2.export_self_keys(str(dir))
+    ac2_offl.import_self_keys(str(dir))
+    ac2_offl.stop_io()
+
+    lp.sec("ac1: create verified-group QR, ac2 scans and joins")
+    chat1 = ac1.create_group_chat("hello")
+    qr = chat1.get_join_qr()
+    lp.sec("ac2: start QR-code based join-group protocol")
+    chat2 = ac2.qr_join_chat(qr)
+    ac1._evtracker.wait_securejoin_inviter_progress(1000)
+    # Wait for "Member Me (<addr>) added by <addr>." message.
+    msg_in = ac2._evtracker.wait_next_incoming_message()
+    assert msg_in.is_system_message()
+
+    lp.sec("ac2: waiting for 'member added' to be deleted on the server")
+    ac2._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_DELETED")
+
+    lp.sec("ac1: sending 'hi' to the group")
+    ac2.set_config("delete_server_after", "0")
+    chat1.send_text("hi")
+
+    lp.sec("ac2_offl: going online, checking the 'hi' message")
+    ac2_offl.start_io()
+    msg_in = ac2_offl._evtracker.wait_next_incoming_message()
+    assert not msg_in.is_system_message()
+    assert msg_in.text == "hi"
+    ac2_offl_ac1_contact = msg_in.get_sender_contact()
+    assert ac2_offl_ac1_contact.addr == ac1.get_config("addr")
+    assert not ac2_offl_ac1_contact.is_verified()
+    chat2_offl = msg_in.chat
+
+    lp.sec("ac2: sending message re-gossiping Autocrypt keys")
+    chat2.send_text("hi2")
+
+    lp.sec("ac2_offl: receiving message")
+    ev = ac2_offl._evtracker.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED")
+    msg_in = ac2_offl.get_message_by_id(ev.data2)
+    assert not msg_in.is_system_message()
+    assert msg_in.text == "hi2"
+    assert msg_in.chat == chat2_offl
+    assert msg_in.get_sender_contact().addr == ac2.get_config("addr")
+    # Until we reset verifications and then send the _verified header,
+    # verification is not gossiped here:
+    assert not ac2_offl_ac1_contact.is_verified()
+
+
 def test_deleted_msgs_dont_reappear(acfactory):
    ac1 = acfactory.new_online_configuring_account()
    acfactory.bring_accounts_online()
@@ -15,9 +15,6 @@ def test_basic_imap_api(acfactory, tmp_path):
    ac1, ac2 = acfactory.get_online_accounts(2)
    chat12 = acfactory.get_accepted_chat(ac1, ac2)

-    # Make sure that messages are not immediately auto-deleted on the server:
-    ac2.set_config("bcc_self", "1")
-
    imap2 = ac2.direct_imap

    with imap2.idle() as idle2:
@@ -165,9 +162,6 @@ def test_webxdc_message(acfactory, data, lp):
    ac1, ac2 = acfactory.get_online_accounts(2)
    chat = acfactory.get_accepted_chat(ac1, ac2)

-    # Make sure that messages are not immediately auto-deleted on the server:
-    ac2.set_config("bcc_self", "1")
-
    lp.sec("ac1: prepare and send text message to ac2")
    msg1 = chat.send_text("message0")
    assert not msg1.is_webxdc()
@@ -368,10 +362,6 @@ def test_send_and_receive_message_markseen(acfactory, lp):
    # make DC's life harder wrt to encodings
    ac1.set_config("displayname", "ä name")

-    # Make sure that messages are not immediately auto-deleted on the server:
-    ac1.set_config("bcc_self", "1")
-    ac2.set_config("bcc_self", "1")
-
    # clear any fresh device messages
    ac1.get_device_chat().mark_noticed()
    ac2.get_device_chat().mark_noticed()
@@ -516,15 +506,9 @@ def test_mdn_asymmetric(acfactory, lp):
    ac1.set_config("mdns_enabled", "1")
    ac2.set_config("mdns_enabled", "1")

-    # Make sure that the mdn is not immediately auto-deleted on the server:
-    ac1.set_config("bcc_self", "1")
-
    lp.sec("sending text message from ac1 to ac2")
    msg_out = chat.send_text("message1")

-    # Wait for the message to be marked as seen on IMAP.
-    ac1._evtracker.get_info_contains("Marked messages [0-9]+ in folder INBOX as seen.")
-
    assert len(chat.get_messages()) == 1 + E2EE_INFO_MSGS

    lp.sec("disable ac1 MDNs")
@@ -541,7 +525,7 @@ def test_mdn_asymmetric(acfactory, lp):
    lp.sec("ac1: waiting for incoming activity")
    assert len(chat.get_messages()) == 1 + E2EE_INFO_MSGS

-    # Wait for the mdn to be marked as seen on IMAP.
+    # Wait for the message to be marked as seen on IMAP.
    ac1._evtracker.get_info_contains("Marked messages [0-9]+ in folder INBOX as seen.")

    # MDN is received even though MDNs are already disabled
@@ -1089,8 +1073,6 @@ def test_send_receive_locations(acfactory, lp):

 def test_delete_multiple_messages(acfactory, lp):
    ac1, ac2 = acfactory.get_online_accounts(2)
-    # Make sure that messages are not immediately auto-deleted on the server:
-    ac2.set_config("bcc_self", "1")
    chat12 = acfactory.get_accepted_chat(ac1, ac2)

    lp.sec("ac1: sending seven messages")
@@ -153,8 +153,7 @@ class TestOfflineContact:

    def test_delete_referenced_contact_hides_contact(self, acfactory):
        ac1 = acfactory.get_pseudo_configured_account()
-        ac2 = acfactory.get_pseudo_configured_account()
-        contact1 = ac1.create_contact(ac2)
+        contact1 = ac1.create_contact("some1@example.com", name="some1")
        msg = contact1.create_chat().send_text("one message")
        assert ac1.delete_contact(contact1)
        assert not msg.filemime
@@ -186,9 +185,8 @@ class TestOfflineChat:
        return acfactory.get_pseudo_configured_account()

    @pytest.fixture()
-    def chat1(self, ac1, acfactory):
-        ac2 = acfactory.get_pseudo_configured_account()
-        return ac1.create_contact(ac2).create_chat()
+    def chat1(self, ac1):
+        return ac1.create_contact("some1@example.org", name="some1").create_chat()

    def test_display(self, chat1):
        str(chat1)
@@ -406,7 +404,7 @@ class TestOfflineChat:
        contact2 = ac1.create_contact("display1 <x@example.org>", "real")
        assert contact2.name == "real"

-    def test_send_lots_of_offline_msgs(self, acfactory, chat1):
+    def test_send_lots_of_offline_msgs(self, acfactory):
        ac1 = acfactory.get_pseudo_configured_account()
        ac1.set_config("configured_mail_server", "example.org")
        ac1.set_config("configured_mail_user", "example.org")
@@ -415,13 +413,13 @@ class TestOfflineChat:
        ac1.set_config("configured_send_user", "example.org")
        ac1.set_config("configured_send_pw", "example.org")
        ac1.start_io()
+        chat = ac1.create_contact("some1@example.org", name="some1").create_chat()
        for i in range(50):
-            chat1.send_text("hello")
+            chat.send_text("hello")

    def test_create_chat_simple(self, acfactory):
        ac1 = acfactory.get_pseudo_configured_account()
-        ac2 = acfactory.get_pseudo_configured_account()
-        contact1 = ac1.create_contact(ac2)
+        contact1 = ac1.create_contact("some1@example.org", name="some1")
        contact1.create_chat().send_text("hello")

    def test_chat_message_distinctions(self, ac1, chat1):
@@ -152,8 +152,7 @@ def test_sig():

 def test_markseen_invalid_message_ids(acfactory):
    ac1 = acfactory.get_pseudo_configured_account()
-    ac2 = acfactory.get_pseudo_configured_account()
-    contact1 = ac1.create_contact(ac2)
+    contact1 = ac1.create_contact("some1@example.com", name="some1")
    chat = contact1.create_chat()
    chat.send_text("one message")
    ac1._evtracker.get_matching("DC_EVENT_MSGS_CHANGED")
@@ -171,6 +170,14 @@ def test_get_special_message_id_returns_empty_message(acfactory):
        assert msg.id == 0


+def test_provider_info_none():
+    ctx = ffi.gc(
+        lib.dc_context_new(ffi.NULL, ffi.NULL, ffi.NULL),
+        lib.dc_context_unref,
+    )
+    assert lib.dc_provider_new_from_email(ctx, cutil.as_dc_charpointer("email@unexistent.no")) == ffi.NULL
+
+
 def test_get_info_open(tmp_path):
    db_fname = tmp_path / "test.db"
    ctx = ffi.gc(
@@ -1 +1 @@
-2026-08-10
+2026-04-13
@@ -1,9 +1,3 @@
 #!/bin/sh
 # Run clippy for all Rust code in the project.
-#
-# To check, run
-#   scripts/clippy.sh 
-#
-# To automatically fix warnings, run
-#   scripts/clippy.sh --fix --allow-dirty
-cargo clippy --workspace --all-targets --all-features "$@" -- -D warnings
+cargo clippy --workspace --all-targets --all-features -- -D warnings
@@ -0,0 +1,246 @@
+#!/usr/bin/env python3
+# if the yaml import fails, run "pip install pyyaml"
+
+import sys
+import yaml
+import datetime
+from pathlib import Path
+
+out_all = ""
+out_domains = ""
+out_ids = ""
+domains_set = set()
+
+
+def camel(name):
+    words = name.split("_")
+    return "".join(w.capitalize() for i, w in enumerate(words))
+
+
+def cleanstr(s):
+    s = s.strip()
+    s = s.replace("\n", " ")
+    s = s.replace("\\", "\\\\")
+    s = s.replace('"', '\\"')
+    return s
+
+
+def file2id(f):
+    return f.stem
+
+
+def file2varname(f):
+    f = file2id(f)
+    f = f.replace(".", "_")
+    f = f.replace("-", "_")
+    return "P_" + f.upper()
+
+
+def file2url(f):
+    f = file2id(f)
+    f = f.replace(".", "-")
+    return "https://providers.delta.chat/" + f
+
+
+def process_opt(data):
+    if not "opt" in data:
+        return "ProviderOptions::new()"
+    opt = "ProviderOptions {\n"
+    opt_data = data.get("opt", "")
+    for key in opt_data:
+        value = str(opt_data[key])
+        if key == "max_smtp_rcpt_to":
+            value = "Some(" + value + ")"
+        if value in {"True", "False"}:
+            value = value.lower()
+        opt += "        " + key + ": " + value + ",\n"
+    opt += "        ..ProviderOptions::new()\n"
+    opt += "    }"
+    return opt
+
+
+def process_config_defaults(data):
+    if not "config_defaults" in data:
+        return "None"
+    defaults = "Some(&[\n"
+    config_defaults = data.get("config_defaults", "")
+    for key in config_defaults:
+        value = str(config_defaults[key])
+        defaults += (
+            "        ConfigDefault { key: Config::"
+            + camel(key)
+            + ', value: "'
+            + value
+            + '" },\n'
+        )
+    defaults += "    ])"
+    return defaults
+
+
+def process_data(data, file):
+    status = data.get("status", "")
+    if status != "OK" and status != "PREPARATION" and status != "BROKEN":
+        raise TypeError("bad status")
+
+    comment = ""
+    domains = ""
+    if not "domains" in data:
+        raise TypeError("no domains found")
+    for domain in data["domains"]:
+        domain = cleanstr(domain)
+        if domain == "" or domain.lower() != domain:
+            raise TypeError("bad domain: " + domain)
+
+        global domains_set
+        if domain in domains_set:
+            raise TypeError("domain used twice: " + domain)
+        domains_set.add(domain)
+
+        domains += '    ("' + domain + '", &' + file2varname(file) + "),\n"
+        comment += domain + ", "
+
+    ids = ""
+    ids += '    ("' + file2id(file) + '", &' + file2varname(file) + "),\n"
+
+    server = ""
+    has_imap = False
+    has_smtp = False
+    if "server" in data:
+        for s in data["server"]:
+            hostname = cleanstr(s.get("hostname", ""))
+            port = int(s.get("port", ""))
+            if hostname == "" or hostname.lower() != hostname or port <= 0:
+                raise TypeError("bad hostname or port")
+
+            protocol = s.get("type", "").upper()
+            if protocol == "IMAP":
+                has_imap = True
+            elif protocol == "SMTP":
+                has_smtp = True
+            else:
+                raise TypeError("bad protocol")
+
+            socket = s.get("socket", "").upper()
+            if socket != "STARTTLS" and socket != "SSL" and socket != "PLAIN":
+                raise TypeError("bad socket")
+
+            username_pattern = s.get("username_pattern", "EMAIL").upper()
+            if username_pattern != "EMAIL" and username_pattern != "EMAILLOCALPART":
+                raise TypeError("bad username pattern")
+
+            server += (
+                "        Server { protocol: "
+                + protocol.capitalize()
+                + ", socket: "
+                + socket.capitalize()
+                + ', hostname: "'
+                + hostname
+                + '", port: '
+                + str(port)
+                + ", username_pattern: "
+                + username_pattern.capitalize()
+                + " },\n"
+            )
+
+    opt = process_opt(data)
+    config_defaults = process_config_defaults(data)
+
+    oauth2 = data.get("oauth2", "")
+    oauth2 = "Some(Oauth2Authorizer::" + camel(oauth2) + ")" if oauth2 != "" else "None"
+
+    provider = ""
+    before_login_hint = cleanstr(data.get("before_login_hint", "") or "")
+    after_login_hint = cleanstr(data.get("after_login_hint", ""))
+    if (not has_imap and not has_smtp) or (has_imap and has_smtp):
+        provider += (
+            "static "
+            + file2varname(file)
+            + ": Provider = Provider {\n"
+        )
+        provider += '    id: "' + file2id(file) + '",\n'
+        provider += "    status: Status::" + status.capitalize() + ",\n"
+        provider += '    before_login_hint: "' + before_login_hint + '",\n'
+        provider += '    after_login_hint: "' + after_login_hint + '",\n'
+        provider += '    overview_page: "' + file2url(file) + '",\n'
+        provider += "    server: &[\n" + server + "    ],\n"
+        provider += "    opt: " + opt + ",\n"
+        provider += "    config_defaults: " + config_defaults + ",\n"
+        provider += "    oauth2_authorizer: " + oauth2 + ",\n"
+        provider += "};\n\n"
+    else:
+        raise TypeError("SMTP and IMAP must be specified together or left out both")
+
+    if status != "OK" and before_login_hint == "":
+        raise TypeError(
+            "status PREPARATION or BROKEN requires before_login_hint: " + file
+        )
+
+    # finally, add the provider
+    global out_all, out_domains, out_ids
+    out_all += "// " + file.name + ": " + comment.strip(", ") + "\n"
+
+    # also add provider with no special things to do -
+    # eg. _not_ supporting oauth2 is also an information and we can skip the mx-lookup in this case
+    out_all += provider
+    out_domains += domains
+    out_ids += ids
+
+
+def process_file(file):
+    print("processing file: {}".format(file), file=sys.stderr)
+    with open(file) as f:
+        # load_all() loads "---"-separated yamls -
+        # by coincidence, this is also the frontmatter separator :)
+        data = next(yaml.load_all(f, Loader=yaml.SafeLoader))
+        process_data(data, file)
+
+
+def process_dir(dir):
+    print("processing directory: {}".format(dir), file=sys.stderr)
+    files = sorted(f for f in dir.iterdir() if f.suffix == ".md")
+    for f in files:
+        process_file(f)
+
+
+if __name__ == "__main__":
+    if len(sys.argv) < 2:
+        raise SystemExit("usage: update.py DIR_WITH_MD_FILES > data.rs")
+
+    out_all = (
+        "// file generated by src/provider/update.py\n\n"
+        "use crate::provider::Protocol::*;\n"
+        "use crate::provider::Socket::*;\n"
+        "use crate::provider::UsernamePattern::*;\n"
+        "use crate::provider::{\n"
+        "    Config, ConfigDefault, Oauth2Authorizer, Provider, ProviderOptions, Server, Status,\n"
+        "};\n"
+        "use std::collections::HashMap;\n\n"
+        "use std::sync::LazyLock;\n\n"
+    )
+
+    process_dir(Path(sys.argv[1]))
+
+    out_all += "pub(crate) static PROVIDER_DATA: [(&str, &Provider); " + str(len(domains_set)) + "] = [\n";
+    out_all += out_domains
+    out_all += "];\n\n"
+
+    out_all += "pub(crate) static PROVIDER_IDS: LazyLock<HashMap<&'static str, &'static Provider>> = LazyLock::new(|| HashMap::from([\n"
+    out_all += out_ids
+    out_all += "]));\n\n"
+
+    if len(sys.argv) < 3:
+        now = datetime.datetime.utcnow()
+    else:
+        now = datetime.datetime.fromisoformat(sys.argv[2])
+    out_all += (
+        "pub static _PROVIDER_UPDATED: LazyLock<chrono::NaiveDate> = "
+        "LazyLock::new(|| chrono::NaiveDate::from_ymd_opt("
+        + str(now.year)
+        + ", "
+        + str(now.month)
+        + ", "
+        + str(now.day)
+        + ").unwrap());\n"
+    )
+
+    print(out_all)
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+# Updates provider database.
+# Returns 1 if the database is changed, 0 otherwise.
+set -euo pipefail
+
+export TZ=UTC
+
+# Provider database revision.
+REV=ad097ee40579c884e7757de2d3bb0a51f481a32a
+
+CORE_ROOT="$PWD"
+TMP="$(mktemp -d)"
+git clone --filter=blob:none https://github.com/chatmail/provider-db.git "$TMP"
+cd "$TMP"
+git checkout "$REV"
+DATE=$(git show -s --format=%cs)
+"$CORE_ROOT"/scripts/create-provider-data-rs.py "$TMP/_providers" "$DATE" >"$CORE_ROOT/src/provider/data.rs"
+rustfmt --edition 2024 "$CORE_ROOT/src/provider/data.rs"
+rm -fr "$TMP"
+
+cd "$CORE_ROOT"
+test -z "$(git status --porcelain src/provider/data.rs)"
@@ -20,6 +20,86 @@ Description-Content-Type: text/markdown
 """


+def build_source_package(version, filename):
+    with tarfile.open(filename, "w:gz") as pkg:
+
+        def pack(name, contents):
+            contents = contents.encode()
+            tar_info = tarfile.TarInfo(f"deltachat_rpc_server-{version}/{name}")
+            tar_info.mode = 0o644
+            tar_info.size = len(contents)
+            pkg.addfile(tar_info, BytesIO(contents))
+
+        pack("PKG-INFO", metadata_contents(version))
+        pack(
+            "pyproject.toml",
+            f"""[build-system]
+requires = ["setuptools==68.2.2", "pip"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "deltachat-rpc-server"
+version = "{version}"
+
+[project.scripts]
+deltachat-rpc-server = "deltachat_rpc_server:main"
+""",
+        )
+        pack(
+            "setup.py",
+            f"""
+import sys
+from setuptools import setup, find_packages
+from distutils.cmd import Command
+from setuptools.command.install import install
+from setuptools.command.build import build
+import subprocess
+import platform
+import tempfile
+from zipfile import ZipFile
+from pathlib import Path
+import shutil
+
+
+class BuildCommand(build):
+    def run(self):
+        tmpdir = tempfile.mkdtemp()
+        subprocess.run(
+            [
+                sys.executable,
+                "-m",
+                "pip",
+                "download",
+                "--no-input",
+                "--timeout",
+                "1000",
+                "--platform",
+                "musllinux_1_1_" + platform.machine(),
+                "--only-binary=:all:",
+                "deltachat-rpc-server=={version}",
+            ],
+            cwd=tmpdir,
+        )
+
+        wheel_path = next(Path(tmpdir).glob("*.whl"))
+        with ZipFile(wheel_path, "r") as wheel:
+            exe_path = wheel.extract("deltachat_rpc_server/deltachat-rpc-server", "src")
+            Path(exe_path).chmod(0o700)
+            wheel.extract("deltachat_rpc_server/__init__.py", "src")
+
+        shutil.rmtree(tmpdir)
+        return super().run()
+
+
+setup(
+    cmdclass={{"build": BuildCommand}},
+    package_data={{"deltachat_rpc_server": ["deltachat-rpc-server"]}},
+)
+""",
+        )
+        pack("src/deltachat_rpc_server/__init__.py", "")
+
+
 def build_wheel(version, binary, tag, windows=False):
    filename = f"deltachat_rpc_server-{version}-{tag}.whl"

@@ -88,19 +168,23 @@ def main():
    with Path("Cargo.toml").open("rb") as fp:
        cargo_manifest = tomllib.load(fp)
    version = cargo_manifest["package"]["version"]
-    arch = sys.argv[1]
-    executable = sys.argv[2]
-    tags = arch2tags[arch]
-
-    if arch in ["win32", "win64"]:
-        build_wheel(
-            version,
-            executable,
-            f"py3-none-{tags}",
-            windows=True,
-        )
+    if sys.argv[1] == "source":
+        filename = f"deltachat_rpc_server-{version}.tar.gz"
+        build_source_package(version, filename)
    else:
-        build_wheel(version, executable, f"py3-none-{tags}")
+        arch = sys.argv[1]
+        executable = sys.argv[2]
+        tags = arch2tags[arch]
+
+        if arch in ["win32", "win64"]:
+            build_wheel(
+                version,
+                executable,
+                f"py3-none-{tags}",
+                windows=True,
+            )
+        else:
+            build_wheel(version, executable, f"py3-none-{tags}")


 main()
@@ -28,6 +28,7 @@ to implement typical messenger functions.
 - [Voice messages](#voice-messages)
 - [Reactions](#reactions)
 - [Attaching a contact to a message](#attaching-a-contact-to-a-message)
+- [Transitioning to a new e-mail address (AEAP)](#transitioning-to-a-new-e-mail-address-aeap)
 - [Miscellaneous](#miscellaneous)
    - [Sync messages](#sync-messages)

@@ -196,7 +197,7 @@ If the messenger finds a valid but not existent group-id,
 the messenger MAY create a new group.
 If no group-id is found,
 the message MAY be assigned
-to a single chat with the email-address given in `From`.
+to a normal single-user chat with the email-address given in `From`.


 ## Add and remove members
@@ -614,6 +615,23 @@ chatmail clients mark the gossiped key
 as indirectly verified.


+# Transitioning to a new e-mail address (AEAP)
+
+When receiving a message:
+- If the key exists, but belongs to another address
+- AND there is a `Chat-Version` header
+- AND the message is signed correctly
+- AND the From address is (also) in the encrypted (and therefore signed) headers 
+- AND the message timestamp is newer than the contact's `lastseen`
+  (to prevent changing the address back when messages arrive out of order)
+  (this condition is not that important
+  since we will have eventual consistency even without it):
+
+  Replace the contact in _all_ groups,
+  possibly deduplicate the members list,
+  and add a system message to all of these chats.
+
+
 # Miscellaneous

 Messengers SHOULD use the header `In-Reply-To` as usual.
@@ -534,8 +534,8 @@ impl Accounts {
    }

    /// Sets notification token for Apple Push Notification service.
-    pub fn set_push_device_token(&self, token: &str) -> Result<()> {
-        self.push_subscriber.set_device_token(token);
+    pub async fn set_push_device_token(&self, token: &str) -> Result<()> {
+        self.push_subscriber.set_device_token(token).await;
        Ok(())
    }

@@ -794,7 +794,7 @@ impl Config {
                .with_push_subscriber(push_subscriber.clone())
                .build()
                .await
-                .with_context(|| format!("failed to create context from file {dbfile:?}"))?;
+                .with_context(|| format!("failed to create context from file {:?}", &dbfile))?;
            // Try to open without a passphrase,
            // but do not return an error if account is passphare-protected.
            ctx.open("".to_string()).await?;
@@ -1,178 +0,0 @@
-use std::pin::Pin;
-
-use anyhow::Result;
-use deltachat_contact_tools::addr_normalize;
-use rand::distr::{Alphanumeric, SampleString};
-use rand::seq::IndexedRandom;
-
-use crate::config::{self, Config};
-use crate::log::{LogExt, warn};
-use crate::login_param::{EnteredCertificateChecks, EnteredImapLoginParam};
-use crate::{configure::EnteredLoginParam, context::Context, tools::time};
-
-/// The target number of transports.
-const NUM_TRANSPORTS_TARGET: usize = 3;
-/// How often we want to try adding new relays.
-const AUTOMATIC_ADDITION_DEBOUNCE_SECONDS: i64 = 60 * 60; // one hour
-/// How long we ignore a relay candidate after failing to connect to it:
-const BACKOFF_PERIOD_FOR_NOT_WORKING_RELAY: i64 = 60 * 60 * 24 * 7; // one week
-
-pub(crate) fn maybe_add_additional_relays(
-    context: Context,
-) -> Pin<Box<dyn Future<Output = ()> + Send>> {
-    // We need to Box::pin the future because it wouldn't compile otherwise
-    // because Rust async doesn't support recursion:
-    // `maybe_add_additional_relays_inner()` calls `restart_io_if_running()`,
-    // which (via several other functions) calls `imap_loop()`,
-    // which (via several other functions) calls `maybe_add_additional_relays()`
-    Box::pin(async move {
-        let skip_network = false;
-        let relay_added = maybe_add_additional_relays_inner(&context, skip_network)
-            .await
-            .log_err(&context)
-            .unwrap_or(false);
-
-        if relay_added {
-            info!(context, "Restarting IO after relay addition");
-            context.restart_io_if_running().await;
-        }
-    })
-}
-
-async fn maybe_add_additional_relays_inner(context: &Context, skip_network: bool) -> Result<bool> {
-    let now = time();
-
-    let Ok(_lock) = context.background_task_mutex.try_lock() else {
-        // Housekeeping or automatic relay management is already running in another thread, do nothing.
-        return Ok(false);
-    };
-    let last_timestamp = context
-        .get_config_i64(Config::LastAutomaticRelayManagement)
-        .await?;
-    if last_timestamp > now {
-        warn!(
-            context,
-            "Clock ran backwards, unclear if automatic relay management should run. Will run it anyways."
-        );
-    } else if last_timestamp > now.saturating_sub(AUTOMATIC_ADDITION_DEBOUNCE_SECONDS) {
-        return Ok(false);
-    }
-    if !context
-        .get_config_bool(Config::AutomaticRelayManagement)
-        .await?
-    {
-        return Ok(false);
-    }
-    if context
-        .get_config_bool(Config::AutomaticRelayManagementFinished)
-        .await?
-    {
-        return Ok(false);
-    }
-    // Set the config at the beginning to avoid endless loops.
-    // Race conditions are not a concern because we locked the mutex.
-    context
-        .set_config_internal(Config::LastAutomaticRelayManagement, Some(&now.to_string()))
-        .await?;
-
-    let mut relay_added = false;
-    // Using `for` instead of `while` to prevent infinite loop
-    for _ in 0..NUM_TRANSPORTS_TARGET {
-        if context.count_transports().await? >= NUM_TRANSPORTS_TARGET {
-            context
-                .set_config_internal(
-                    Config::AutomaticRelayManagementFinished,
-                    config::from_bool(true),
-                )
-                .await?;
-
-            return Ok(relay_added);
-        }
-
-        // First, query all candidates that were not tried since `BACKOFF_PERIOD_FOR_NOT_WORKING_RELAY` seconds.
-        // Hosts that are already used are excluded.
-        let candidates = load_relay_candidates(context, now).await?;
-
-        let Some(host) = candidates.choose(&mut rand::rng()) else {
-            info!(
-                context,
-                "maybe_add_additional_relays: No suitable candidates"
-            );
-            return Ok(relay_added);
-        };
-
-        info!(
-            context,
-            "Trying to automatically add relay {host} (there were {} candidates).",
-            candidates.len(),
-        );
-
-        context
-            .sql
-            .execute(
-                "UPDATE relay_candidates SET last_tried=? WHERE host=?",
-                (now, host),
-            )
-            .await?;
-        let param = login_param_from_host(host);
-        let res = crate::configure::configure(context, &param, skip_network).await;
-        if let Err(e) = res {
-            warn!(
-                context,
-                "Failed to automatically add a relay {host}: {e:#}."
-            );
-        } else {
-            info!(context, "Successfully automatically added relay {host}.");
-            relay_added = true;
-        }
-    }
-
-    Ok(relay_added)
-}
-
-async fn load_relay_candidates(context: &Context, now: i64) -> Result<Vec<String>, anyhow::Error> {
-    let cutoff_timestamp = now.saturating_sub(BACKOFF_PERIOD_FOR_NOT_WORKING_RELAY);
-    let candidates: Vec<String> = context
-        .sql
-        .query_map_vec(
-            // This also selects candidates which have last_tried in the future,
-            // essentially treating them as never tried,
-            // so if some timestamp far in the future is accidentally stored,
-            // we are not stuck never trying the candidate.
-            // After trying the candidate, last_tried will be corrected to the current time.
-            "SELECT host FROM relay_candidates WHERE (last_tried<? OR last_tried>?)
-                AND NOT EXISTS (
-                    SELECT 1
-                    FROM transports
-                    WHERE substr(addr, instr(addr, '@') + 1) = host
-                )",
-            (cutoff_timestamp, now),
-            |row| Ok(row.get::<_, String>(0)?),
-        )
-        .await?;
-
-    Ok(candidates)
-}
-
-pub(crate) fn login_param_from_host(host: &str) -> EnteredLoginParam {
-    let rng = &mut rand::rng();
-    let username = Alphanumeric.sample_string(rng, 9);
-    let addr = username + "@" + host;
-    let addr = addr_normalize(&addr);
-    // 22 * log2(26 * 2 + 10) = 130 bits of entropy
-    let password = Alphanumeric.sample_string(rng, 22);
-
-    EnteredLoginParam {
-        addr,
-        imap: EnteredImapLoginParam {
-            password,
-            ..Default::default()
-        },
-        smtp: Default::default(),
-        certificate_checks: EnteredCertificateChecks::Strict,
-        oauth2: false,
-    }
-}
-
-#[cfg(test)]
-mod automatic_relay_management_tests;
@@ -1,292 +0,0 @@
-use std::time::Duration;
-
-use super::*;
-use crate::test_utils::TestContext;
-use crate::tools::SystemTime;
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_load_relay_candidates_single() -> Result<()> {
-    let t = &TestContext::new_alice().await;
-    enable_config(t).await;
-    let now = time();
-
-    t.sql.execute("DELETE FROM relay_candidates", ()).await?;
-
-    // This host should be returned by load_relay_candidates():
-    t.sql
-        .execute(
-            "INSERT INTO relay_candidates (host, last_tried) VALUES (?, ?)",
-            ("never_tried.example", 0),
-        )
-        .await?;
-
-    // This host was recently tried and should not be returned:
-    t.sql
-        .execute(
-            "INSERT INTO relay_candidates (host, last_tried) VALUES (?, ?)",
-            ("recent.example", now),
-        )
-        .await?;
-
-    // This host is already in use (alice@example.org) and should not be returned:
-    t.sql
-        .execute(
-            "INSERT INTO relay_candidates (host, last_tried) VALUES (?, ?)",
-            ("example.org", 0),
-        )
-        .await?;
-
-    let candidates = load_relay_candidates(t, now).await?;
-
-    assert_eq!(candidates, vec!["never_tried.example".to_string()]);
-
-    Ok(())
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_load_relay_candidates_multiple() -> Result<()> {
-    let t = &TestContext::new().await;
-    enable_config(t).await;
-    let now = time();
-
-    t.sql.execute("DELETE FROM relay_candidates", ()).await?;
-    for host in ["a.example", "b.example", "c.example"] {
-        t.sql
-            .execute(
-                "INSERT INTO relay_candidates (host, last_tried) VALUES (?, ?)",
-                (host, 0),
-            )
-            .await?;
-    }
-
-    let mut candidates = load_relay_candidates(t, now).await?;
-    candidates.sort();
-
-    assert_eq!(
-        candidates,
-        vec![
-            "a.example".to_string(),
-            "b.example".to_string(),
-            "c.example".to_string()
-        ]
-    );
-    Ok(())
-}
-
-async fn assert_automatic_relay_management_does_nothing(t: &TestContext) {
-    let transports_before = t.count_transports().await.unwrap();
-    let config_before = t
-        .get_config_i64(Config::LastAutomaticRelayManagement)
-        .await
-        .unwrap();
-
-    let skip_network = false; // No need to skip network, nothing is supposed to happen
-    let relay_added = maybe_add_additional_relays_inner(t, skip_network)
-        .await
-        .unwrap();
-    assert_eq!(relay_added, false);
-
-    let config_after = t
-        .get_config_i64(Config::LastAutomaticRelayManagement)
-        .await
-        .unwrap();
-    let transports_after = t.count_transports().await.unwrap();
-
-    assert_eq!(config_after, config_before);
-    assert_eq!(transports_before, transports_after);
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_maybe_add_additional_relays_mutex_held() -> Result<()> {
-    let t = &TestContext::new().await;
-    enable_config(t).await;
-
-    // Hold the housekeeping mutex ourselves, simulating another task
-    // already running housekeeping or relay management.
-    let _lock = t.background_task_mutex.lock().await;
-
-    assert_automatic_relay_management_does_nothing(t).await;
-
-    Ok(())
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_maybe_add_additional_relays_debounce() -> Result<()> {
-    let t = &TestContext::new_alice().await;
-    enable_config(t).await;
-    let some_seconds_ago = time() - 10;
-
-    // Pretend automatic relay management just ran.
-    t.set_config_internal(
-        Config::LastAutomaticRelayManagement,
-        Some(&some_seconds_ago.to_string()),
-    )
-    .await?;
-
-    assert_automatic_relay_management_does_nothing(t).await;
-
-    Ok(())
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_maybe_add_additional_relays_disabled() {
-    // By default, automatic relay management is disabled:
-    let t = &TestContext::new_alice().await;
-    assert_automatic_relay_management_does_nothing(t).await;
-}
-
-/// Runs maybe_add_additional_relays_inner(), then deletes one of the transports.
-/// Even after AUTOMATIC_ADDITION_DEBOUNCE_SECONDS,
-/// running automatic transport management again should not add back a transport.
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_maybe_add_additional_relays_does_nothing_after_finishing_once() -> Result<()> {
-    let t = &TestContext::new_alice().await;
-    enable_config(t).await;
-
-    let skip_network = true;
-    let relay_added = maybe_add_additional_relays_inner(t, skip_network).await?;
-    assert!(relay_added);
-
-    let transports = t.list_transports().await?;
-    t.delete_transport(&transports.last().unwrap().param.addr)
-        .await?;
-
-    SystemTime::shift(Duration::from_secs(
-        AUTOMATIC_ADDITION_DEBOUNCE_SECONDS as u64 + 1,
-    ));
-
-    let transports_count = t.count_transports().await?;
-    assert_eq!(transports_count, NUM_TRANSPORTS_TARGET - 1);
-
-    assert!(
-        t.get_config_bool(Config::AutomaticRelayManagementFinished)
-            .await?
-    );
-    assert_automatic_relay_management_does_nothing(t).await;
-
-    Ok(())
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_maybe_add_additional_relays_add_one() -> Result<()> {
-    let t = &TestContext::new_alice().await;
-    enable_config(t).await;
-    let now = time();
-
-    t.sql.execute("DELETE FROM relay_candidates", ()).await?;
-    t.sql
-        .execute(
-            "INSERT INTO relay_candidates (host, last_tried) VALUES (?, ?)",
-            ("relay.example", 0),
-        )
-        .await?;
-
-    let transports_before = t.count_transports().await?;
-
-    let skip_network = true;
-    let relay_added = maybe_add_additional_relays_inner(t, skip_network).await?;
-    assert!(relay_added);
-
-    let config_after = t
-        .get_config_i64(Config::LastAutomaticRelayManagement)
-        .await?;
-    assert!(config_after >= now);
-
-    let transports_after = t.count_transports().await?;
-    assert_eq!(transports_after, transports_before + 1);
-
-    Ok(())
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_maybe_add_additional_relays_add_multiple() -> Result<()> {
-    let t = &TestContext::new_alice().await;
-    enable_config(t).await;
-    let now = time();
-
-    t.sql.execute("DELETE FROM relay_candidates", ()).await?;
-    for host in ["a.example", "b.example", "c.example", "d.example"] {
-        t.sql
-            .execute(
-                "INSERT INTO relay_candidates (host, last_tried) VALUES (?, ?)",
-                (host, 0),
-            )
-            .await?;
-    }
-
-    let skip_network = true;
-    let relay_added = maybe_add_additional_relays_inner(t, skip_network).await?;
-    assert!(relay_added);
-
-    let config_after = t
-        .get_config_i64(Config::LastAutomaticRelayManagement)
-        .await?;
-    assert!(config_after >= now);
-
-    let transports_after = t.count_transports().await?;
-    assert_eq!(transports_after, NUM_TRANSPORTS_TARGET);
-
-    Ok(())
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_maybe_add_additional_relays_failure() -> Result<()> {
-    let t = &TestContext::new_alice().await;
-    enable_config(t).await;
-    let now = time();
-
-    t.sql.execute("DELETE FROM relay_candidates", ()).await?;
-    for i in 1..10 {
-        t.sql
-            .execute(
-                "INSERT INTO relay_candidates (host, last_tried) VALUES (?, ?)",
-                (format!("{i}.invalid.example"), 0),
-            )
-            .await?;
-    }
-
-    let transports_before = t.count_transports().await?;
-
-    // Don't skip network, since we want the relay addition to fail
-    let skip_network = false;
-    let relay_added = maybe_add_additional_relays_inner(t, skip_network).await?;
-    assert_eq!(relay_added, false);
-
-    // The config is still updated:
-    let config_after = t
-        .get_config_i64(Config::LastAutomaticRelayManagement)
-        .await?;
-    assert!(config_after >= now);
-
-    let transports_after = t.count_transports().await?;
-    assert_eq!(transports_after, transports_before);
-
-    // Some of the candidates should have an updated last_tried:
-    assert!(
-        t.sql
-            .exists(
-                "SELECT COUNT(*) FROM relay_candidates WHERE last_tried>=?",
-                (now,)
-            )
-            .await?
-    );
-
-    // ...but not all, because there might be many relay candidates
-    // and we don't want to try all of them in a single call:
-    assert_eq!(load_relay_candidates(t, now).await?.is_empty(), false);
-
-    t.assert_warns_or_errors(&[
-        "DNS lookup with memory cache failure",
-        "Could not find DNS resolutions",
-    ])
-    .await;
-
-    Ok(())
-}
-
-async fn enable_config(context: &Context) {
-    context
-        .set_config_bool(Config::AutomaticRelayManagement, true)
-        .await
-        .unwrap();
-}
@@ -1,6 +1,6 @@
 //! # Blob directory management.

-use std::cmp::{max, min};
+use std::cmp::max;
 use std::io::{Cursor, Seek};
 use std::iter::FusedIterator;
 use std::mem;
@@ -12,7 +12,7 @@ use futures::StreamExt;
 use image::ImageReader;
 use image::{DynamicImage, GenericImage, GenericImageView, ImageFormat, Pixel, Rgba};
 use image::{codecs::jpeg::JpegEncoder, metadata::Orientation};
-use num_traits::{FromPrimitive, cast};
+use num_traits::FromPrimitive;
 use tokio::{fs, task};
 use tokio_stream::wrappers::ReadDirStream;

@@ -382,9 +382,14 @@ impl<'a> BlobObject<'a> {
            }
            img.apply_orientation(orientation);

-            // max_wh is the maximum image width and height, i.e. the resolution-limit,
-            // as set by `Config::MediaQuality`.
+            // max_wh is the maximum image width and height, i.e. the resolution-limit.
+            // target_wh target-resolution for resizing the image.
            let exceeds_wh = img.width() > max_wh || img.height() > max_wh;
+            let mut target_wh = if exceeds_wh {
+                max_wh
+            } else {
+                max(img.width(), img.height())
+            };
            let exceeds_max_bytes = nr_bytes > max_bytes as u64;

            let jpeg_quality = 75;
@@ -423,35 +428,6 @@ impl<'a> BlobObject<'a> {
                        });

            if do_scale {
-                let longest_side_len = max(img.width(), img.height());
-
-                // target_wh will be used as the target-resolution for resizing the image,
-                // so that the longest sides of the image match the target-resolution.
-                let mut target_wh = if !is_avatar {
-                    let area_sqrt = (f64::from(img.width()) * f64::from(img.height())).sqrt();
-                    // Limit resolution to the number of pixels that fit within max_wh * max_wh,
-                    // so that the image-quality does not depend on the aspect-ratio.
-                    let mut resolution_limit: u32 = cast(
-                        (f64::from(longest_side_len) * (f64::from(max_wh) / area_sqrt)).floor(),
-                    )
-                    .unwrap_or(max_wh);
-                    // Align at least one dimension of the resampled image to a multiple of 8 pixels,
-                    // to have fewer partially used JPEG-blocks (which represent 8x8 pixels each).
-                    if resolution_limit < longest_side_len && resolution_limit > 8 {
-                        while !resolution_limit.is_multiple_of(8) {
-                            resolution_limit -= 1
-                        }
-                    }
-                    resolution_limit
-                } else {
-                    max_wh
-                };
-
-                target_wh = min(target_wh, longest_side_len);
-
-                // For images in JPEG-format, 65535 pixels is the maximum resolution per dimension.
-                target_wh = min(target_wh, 65535);
-
                loop {
                    if mem::take(&mut add_white_bg) {
                        self::add_white_bg(&mut img);
@@ -573,7 +549,7 @@ fn exif_orientation(exif: &exif::Exif, context: &Context) -> Orientation {
        && let Some(val) = orientation.value.get_uint(0)
        && let Ok(val) = TryInto::<u8>::try_into(val)
    {
-        return Orientation::from_exif(val).unwrap_or_else(|| {
+        return Orientation::from_exif(val).unwrap_or({
            warn!(context, "Exif orientation value ignored: {val:?}.");
            Orientation::NoTransforms
        });
@@ -406,8 +406,8 @@ async fn test_recode_image_balanced_png() {
        extension: "png",
        original_width: 1920,
        original_height: 1080,
-        compressed_width: 848,
-        compressed_height: 477,
+        compressed_width: constants::WORSE_IMAGE_SIZE,
+        compressed_height: constants::WORSE_IMAGE_SIZE * 1080 / 1920,
        ..Default::default()
    }
    .test()
@@ -497,8 +497,8 @@ async fn test_recode_image_rgba_png_to_jpeg() {
        extension: "png",
        original_width: 1920,
        original_height: 1080,
-        compressed_width: 848,
-        compressed_height: 477,
+        compressed_width: constants::WORSE_IMAGE_SIZE,
+        compressed_height: constants::WORSE_IMAGE_SIZE * 1080 / 1920,
        ..Default::default()
    }
    .test()
@@ -517,8 +517,8 @@ async fn test_recode_image_huge_jpg() {
        has_exif: true,
        original_width: 1920,
        original_height: 1080,
-        compressed_width: 1704,
-        compressed_height: 959,
+        compressed_width: constants::BALANCED_IMAGE_SIZE,
+        compressed_height: constants::BALANCED_IMAGE_SIZE * 1080 / 1920,
        ..Default::default()
    }
    .test()
@@ -201,7 +201,7 @@ impl Context {
        let chat = Chat::load_from_db(self, chat_id).await?;
        ensure!(
            chat.typ == Chattype::Single,
-            "Can only place calls in single chats"
+            "Can only place calls in 1:1 chats"
        );
        ensure!(!chat.is_self_talk(), "Cannot call self");

@@ -617,7 +617,7 @@ pub async fn call_state(context: &Context, msg_id: MsgId) -> Result<CallState> {

 /// ICE server for JSON serialization.
 #[derive(Serialize, Debug, Clone, PartialEq)]
-pub(crate) struct IceServer {
+struct IceServer {
    /// STUN or TURN URLs.
    pub urls: Vec<String>,

@@ -655,7 +655,7 @@ pub(crate) async fn create_ice_servers_from_metadata(
 }

 /// STUN or TURN server with unresolved DNS name.
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Clone)]
 pub(crate) enum UnresolvedIceServer {
    /// STUN server.
    Stun { hostname: String, port: u16 },
@@ -676,7 +676,7 @@ pub(crate) enum UnresolvedIceServer {
 pub(crate) async fn resolve_ice_servers(
    context: &Context,
    unresolved_ice_servers: Vec<UnresolvedIceServer>,
-) -> Result<Vec<IceServer>> {
+) -> Result<String> {
    let mut result: Vec<IceServer> = Vec::new();

    // Do not use cache because there is no TLS.
@@ -733,7 +733,8 @@ pub(crate) async fn resolve_ice_servers(
            },
        }
    }
-    Ok(result)
+    let json = serde_json::to_string(&result)?;
+    Ok(json)
 }

 /// Creates JSON with ICE servers when no TURN servers are known.
@@ -769,19 +770,12 @@ pub(crate) fn create_fallback_ice_servers() -> Vec<UnresolvedIceServer> {
 /// because it itself cannot utilize DNS. See
 /// <https://github.com/deltachat/deltachat-desktop/issues/5447>.
 pub async fn ice_servers(context: &Context) -> Result<String> {
-    let mut unresolved_ice_servers: Vec<UnresolvedIceServer> = context
-        .metadata
-        .read()
-        .await
-        .values()
-        .flat_map(|metadata| metadata.ice_servers.clone())
-        .collect();
-    unresolved_ice_servers.sort();
-    unresolved_ice_servers.dedup();
-
-    let ice_servers = resolve_ice_servers(context, unresolved_ice_servers).await?;
-    let json = serde_json::to_string(&ice_servers)?;
-    Ok(json)
+    if let Some(ref metadata) = *context.metadata.read().await {
+        let ice_servers = resolve_ice_servers(context, metadata.ice_servers.clone()).await?;
+        Ok(ice_servers)
+    } else {
+        Ok("[]".to_string())
+    }
 }

 /// "Who can call me" config options.
@@ -4,7 +4,6 @@ use crate::config::Config;
 use crate::constants::DC_CHAT_ID_TRASH;
 use crate::message::MessageState;
 use crate::receive_imf::receive_imf;
-use crate::test_utils;
 use crate::test_utils::{TestContext, TestContextManager};

 struct CallSetup {
@@ -635,23 +634,20 @@ async fn test_forward_call() -> Result<()> {
 async fn test_end_text_call() -> Result<()> {
    let mut tcm = TestContextManager::new();
    let alice = &tcm.alice().await;
-    let bob = &tcm.bob().await;

-    let encrypted_message = test_utils::encrypt_raw_message(
-        bob,
-        &[alice],
-        b"From: bob@example.net\r\n\
-        To: alice@example.org\r\n\
-        Message-ID: <first@example.net>\r\n\
-        Date: Sun, 22 Mar 2020 22:37:57 +0000\r\n\
-        Chat-Version: 1.0\r\n\
-        \r\n\
-        Hello\r\n",
+    let received1 = receive_imf(
+        alice,
+        b"From: bob@example.net\n\
+        To: alice@example.org\n\
+        Message-ID: <first@example.net>\n\
+        Date: Sun, 22 Mar 2020 22:37:57 +0000\n\
+        Chat-Version: 1.0\n\
+        \n\
+        Hello\n",
+        false,
    )
-    .await?;
-    let received1 = receive_imf(alice, encrypted_message.as_bytes(), false)
-        .await?
-        .unwrap();
+    .await?
+    .unwrap();
    assert_eq!(received1.msg_ids.len(), 1);
    let msg = Message::load_from_db(alice, received1.msg_ids[0])
        .await
@@ -660,26 +656,23 @@ async fn test_end_text_call() -> Result<()> {

    // Receiving "Call ended" message that refers
    // to the text message does not result in an error.
-    let encrypted_message2 = test_utils::encrypt_raw_message(
-        bob,
-        &[alice],
-        b"From: bob@example.net\r\n\
-        To: alice@example.org\r\n\
-        Message-ID: <second@example.net>\r\n\
-        Date: Sun, 22 Mar 2020 23:37:57 +0000\r\n\
-        In-Reply-To: <first@example.net>\r\n\
-        Chat-Version: 1.0\r\n\
-        Chat-Content: call-ended\r\n\
-        \r\n\
-        Call ended\r\n",
+    let received2 = receive_imf(
+        alice,
+        b"From: bob@example.net\n\
+        To: alice@example.org\n\
+        Message-ID: <second@example.net>\n\
+        Date: Sun, 22 Mar 2020 23:37:57 +0000\n\
+        In-Reply-To: <first@example.net>\n\
+        Chat-Version: 1.0\n\
+        Chat-Content: call-ended\n\
+        \n\
+        Call ended\n",
+        false,
    )
-    .await?;
-    let received2 = receive_imf(alice, encrypted_message2.as_bytes(), false)
-        .await?
-        .unwrap();
+    .await?
+    .unwrap();
    assert_eq!(received2.msg_ids.len(), 1);
    assert_eq!(received2.chat_id, DC_CHAT_ID_TRASH);
-    alice.assert_warn("does not refer to a call message").await;

    Ok(())
 }
@@ -115,40 +115,35 @@ impl Chatlist {
            ChatId::new(0)
        };

-        macro_rules! last_visible_msg_id_in {
-            ($chat_id:expr) => {
-                concat!(
-                    "
-(SELECT id FROM msgs WHERE
-    -- state=`OutDraft`.
-    state=19 AND hidden=1 AND chat_id=",
-                    $chat_id,
-                    " OR
-    -- `InFresh`...`OutDelivered` inclusive, except `OutDraft`.
-    state IN (10,13,16,20,24,26) AND hidden=0 AND chat_id=",
-                    $chat_id,
-                    "
-ORDER BY timestamp DESC, id DESC LIMIT 1)"
-                )
-            };
-        }
-        // The list starts with the newest chats.
+        // select with left join and minimum:
+        //
+        // - the inner select must use `hidden` and _not_ `m.hidden`
+        //   which would refer the outer select and take a lot of time
+        // - `GROUP BY` is needed several messages may have the same
+        //   timestamp
+        // - the list starts with the newest chats
        //
        // The query shows messages from blocked contacts in
        // groups. Otherwise it would be hard to follow conversations.
        let ids = if let Some(query_contact_id) = query_contact_id {
            // show chats shared with a given contact
-            context.sql.query_map_vec(concat!(
+            context.sql.query_map_vec(
                "SELECT c.id, m.id
                 FROM chats c
                 LEFT JOIN msgs m
                        ON c.id=m.chat_id
-                       AND m.id=", last_visible_msg_id_in!("c.id"), "
+                       AND m.id=(
+                               SELECT id
+                                 FROM msgs
+                                WHERE chat_id=c.id
+                                  AND (hidden=0 OR state=?1)
+                                  ORDER BY timestamp DESC, id DESC LIMIT 1)
                 WHERE c.id>9
                   AND c.blocked!=1
-                   AND c.id IN(SELECT chat_id FROM chats_contacts WHERE contact_id=? AND add_timestamp >= remove_timestamp)
-                 ORDER BY c.archived=? DESC, IFNULL(NULLIF(m.timestamp,0),c.created_timestamp) DESC, m.id DESC"),
-                (query_contact_id, ChatVisibility::Pinned),
+                   AND c.id IN(SELECT chat_id FROM chats_contacts WHERE contact_id=?2 AND add_timestamp >= remove_timestamp)
+                 GROUP BY c.id
+                 ORDER BY c.archived=?3 DESC, IFNULL(NULLIF(m.timestamp,0),c.created_timestamp) DESC, m.id DESC;",
+                (MessageState::OutDraft, query_contact_id, ChatVisibility::Pinned),
                process_row,
            ).await?
        } else if flag_archived_only {
@@ -159,21 +154,22 @@ ORDER BY timestamp DESC, id DESC LIMIT 1)"
            context
                .sql
                .query_map_vec(
-                    concat!(
-                        "
-                 SELECT c.id, m.id
+                    "SELECT c.id, m.id
                 FROM chats c
                 LEFT JOIN msgs m
                        ON c.id=m.chat_id
-                       AND m.id=",
-                        last_visible_msg_id_in!("c.id"),
-                        "
+                       AND m.id=(
+                               SELECT id
+                                 FROM msgs
+                                WHERE chat_id=c.id
+                                  AND (hidden=0 OR state=?)
+                                  ORDER BY timestamp DESC, id DESC LIMIT 1)
                 WHERE c.id>9
                   AND c.blocked!=1
                   AND c.archived=1
-                 ORDER BY IFNULL(NULLIF(m.timestamp,0),c.created_timestamp) DESC, m.id DESC"
-                    ),
-                    (),
+                 GROUP BY c.id
+                 ORDER BY IFNULL(NULLIF(m.timestamp,0),c.created_timestamp) DESC, m.id DESC;",
+                    (MessageState::OutDraft,),
                    process_row,
                )
                .await?
@@ -192,18 +188,24 @@ ORDER BY timestamp DESC, id DESC LIMIT 1)"
            let str_like_cmd = format!("%{}%", query.to_lowercase());
            context
                .sql
-                .query_map_vec(concat!(
+                .query_map_vec(
                    "SELECT c.id, m.id
                 FROM chats c
                 LEFT JOIN msgs m
                        ON c.id=m.chat_id
-                       AND m.id=", last_visible_msg_id_in!("c.id"), "
-                 WHERE c.id>9 AND c.id!=?
+                       AND m.id=(
+                               SELECT id
+                                 FROM msgs
+                                WHERE chat_id=c.id
+                                  AND (hidden=0 OR state=?1)
+                                  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 ?
-                   AND (NOT ? OR EXISTS (SELECT 1 FROM msgs m WHERE m.chat_id = c.id AND m.state == ? AND hidden=0))
-                 ORDER BY IFNULL(NULLIF(m.timestamp,0),c.created_timestamp) DESC, m.id DESC"),
-                    (skip_id, str_like_cmd, only_unread, MessageState::InFresh),
+                   AND IFNULL(c.name_normalized,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(NULLIF(m.timestamp,0),c.created_timestamp) DESC, m.id DESC;",
+                    (MessageState::OutDraft, skip_id, str_like_cmd, only_unread, MessageState::InFresh),
                    process_row,
                )
                .await?
@@ -235,19 +237,25 @@ ORDER BY timestamp DESC, id DESC LIMIT 1)"
                    })
                    .collect::<std::result::Result<Vec<_>, _>>()
                };
-                context.sql.query_map(concat!(
+                context.sql.query_map(
                    "SELECT c.id, c.type, c.param, m.id
                     FROM chats c
                     LEFT JOIN msgs m
                            ON c.id=m.chat_id
-                           AND m.id=", last_visible_msg_id_in!("c.id"), "
+                           AND m.id=(
+                                   SELECT id
+                                     FROM msgs
+                                    WHERE chat_id=c.id
+                                      AND (hidden=0 OR state=?)
+                                      ORDER BY timestamp DESC, id DESC LIMIT 1)
                     WHERE c.id>9 AND c.id!=?
                       AND c.blocked=0
                       AND NOT c.archived=?
                       AND (c.type!=? OR c.id IN(SELECT chat_id FROM chats_contacts WHERE contact_id=? AND add_timestamp >= remove_timestamp))
-                     ORDER BY c.id=? DESC, c.archived=? DESC, IFNULL(NULLIF(m.timestamp,0),c.created_timestamp) DESC, m.id DESC"),
+                     GROUP BY c.id
+                     ORDER BY c.id=? DESC, c.archived=? DESC, IFNULL(NULLIF(m.timestamp,0),c.created_timestamp) DESC, m.id DESC;",
                    (
-                        skip_id, ChatVisibility::Archived,
+                        MessageState::OutDraft, skip_id, ChatVisibility::Archived,
                        Chattype::Group, ContactId::SELF,
                        sort_id_up, ChatVisibility::Pinned,
                    ),
@@ -256,17 +264,23 @@ ORDER BY timestamp DESC, id DESC LIMIT 1)"
                ).await?
            } else {
                //  show normal chatlist
-                context.sql.query_map_vec(concat!(
+                context.sql.query_map_vec(
                    "SELECT c.id, m.id
                     FROM chats c
                     LEFT JOIN msgs m
                            ON c.id=m.chat_id
-                           AND m.id=", last_visible_msg_id_in!("c.id"), "
+                           AND m.id=(
+                                   SELECT id
+                                     FROM msgs
+                                    WHERE chat_id=c.id
+                                      AND (hidden=0 OR state=?)
+                                      ORDER BY timestamp DESC, id DESC LIMIT 1)
                     WHERE c.id>9 AND c.id!=?
                       AND (c.blocked=0 OR c.blocked=2)
                       AND NOT c.archived=?
-                     ORDER BY c.id=0 DESC, c.archived=? DESC, IFNULL(NULLIF(m.timestamp,0),c.created_timestamp) DESC, m.id DESC"),
-                    (skip_id, ChatVisibility::Archived, ChatVisibility::Pinned),
+                     GROUP BY c.id
+                     ORDER BY c.id=0 DESC, c.archived=? DESC, IFNULL(NULLIF(m.timestamp,0),c.created_timestamp) DESC, m.id DESC;",
+                    (MessageState::OutDraft, skip_id, ChatVisibility::Archived, ChatVisibility::Pinned),
                    process_row,
                ).await?
            };
@@ -651,9 +665,8 @@ mod tests {
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_search_single_chat() -> anyhow::Result<()> {
        let t = TestContext::new_alice().await;
-        t.allow_unencrypted().await?;

-        // receive a single chat message
+        // receive a one-to-one-message
        receive_imf(
            &t,
            b"From: Bob Authname <bob@example.org>\n\
@@ -681,12 +694,12 @@ mod tests {
        let chat = Chat::load_from_db(&t, chat_id).await?;
        assert_eq!(chat.get_name(), "Bob Authname");

-        // check, the single chat can be found using chatlist search query
+        // check, the one-to-one-chat can be found using chatlist search query
        let chats = Chatlist::try_load(&t, 0, Some("bob authname"), None).await?;
        assert_eq!(chats.len(), 1);
        assert_eq!(chats.get_chat_id(0).unwrap(), chat_id);

-        // change the name of the contact; this also changes the name of the single chat
+        // change the name of the contact; this also changes the name of the one-to-one-chat
        let test_id = Contact::create(&t, "Bob Nickname", "bob@example.org").await?;
        assert_eq!(contact_id, test_id);
        let chat = Chat::load_from_db(&t, chat_id).await?;
@@ -696,7 +709,7 @@ mod tests {
        let chats = Chatlist::try_load(&t, 0, Some("bob nickname"), None).await?;
        assert_eq!(chats.len(), 1);

-        // revert contact to authname, this again changes the name of the single chat
+        // revert contact to authname, this again changes the name of the one-to-one-chat
        let test_id = Contact::create(&t, "", "bob@example.org").await?;
        assert_eq!(contact_id, test_id);
        let chat = Chat::load_from_db(&t, chat_id).await?;
@@ -712,9 +725,8 @@ mod tests {
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_search_single_chat_without_authname() -> anyhow::Result<()> {
        let t = TestContext::new_alice().await;
-        t.allow_unencrypted().await?;

-        // receive a single chat message without authname set
+        // receive a one-to-one-message without authname set
        receive_imf(
            &t,
            b"From: bob@example.org\n\
@@ -737,12 +749,12 @@ mod tests {
        let chat = Chat::load_from_db(&t, chat_id).await?;
        assert_eq!(chat.get_name(), "bob@example.org");

-        // check, the single chat can be found using chatlist search query
+        // check, the one-to-one-chat can be found using chatlist search query
        let chats = Chatlist::try_load(&t, 0, Some("bob@example.org"), None).await?;
        assert_eq!(chats.len(), 1);
        assert_eq!(chats.get_chat_id(0)?, chat_id);

-        // change the name of the contact; this also changes the name of the single chat
+        // change the name of the contact; this also changes the name of the one-to-one-chat
        let test_id = Contact::create(&t, "Bob Nickname", "bob@example.org").await?;
        assert_eq!(contact_id, test_id);
        let chat = Chat::load_from_db(&t, chat_id).await?;
@@ -753,7 +765,7 @@ mod tests {
        assert_eq!(chats.len(), 1);
        assert_eq!(chats.get_chat_id(0)?, chat_id);

-        // revert name change, this again changes the name of the single chat to the email-address
+        // revert name change, this again changes the name of the one-to-one-chat to the email-address
        let test_id = Contact::create(&t, "", "bob@example.org").await?;
        assert_eq!(contact_id, test_id);
        let chat = Chat::load_from_db(&t, chat_id).await?;
@@ -17,9 +17,10 @@ use crate::context::Context;
 use crate::events::EventType;
 use crate::log::LogExt;
 use crate::mimefactory::RECOMMENDED_FILE_SIZE;
+use crate::provider::Provider;
 use crate::sync::{self, Sync::*, SyncData};
 use crate::tools::{get_abs_path, time};
-use crate::transport::{add_pseudo_transport, send_sync_transports};
+use crate::transport::{ConfiguredLoginParam, add_pseudo_transport, send_sync_transports};
 use crate::{constants, stats};

 /// The available configuration keys.
@@ -117,6 +118,15 @@ pub enum Config {
    /// SMTP server security (e.g. TLS, STARTTLS).
    SendSecurity,

+    /// Deprecated(2026-04).
+    /// Use EnteredLoginParam and add_transport{from_qr}()/list_transports() instead.
+    ///
+    /// Whether to use OAuth 2.
+    ///
+    /// Historically contained other bitflags, which are now deprecated.
+    /// Should not be extended in the future, create new config keys instead.
+    ServerFlags,
+
    /// True if proxy is enabled.
    ///
    /// Can be used to disable proxy without erasing known URLs.
@@ -184,6 +194,17 @@ pub enum Config {
    #[strum(props(default = "0"))] // also change MediaQuality.default() on changes
    MediaQuality,

+    /// Timer in seconds after which the message is deleted from the
+    /// server.
+    ///
+    /// 0 means messages are never deleted by Delta Chat.
+    ///
+    /// Value 1 is treated as "delete at once": messages are deleted
+    /// immediately, without moving to DeltaChat folder.
+    ///
+    /// Default is 1 for chatmail accounts without `BccSelf`, 0 otherwise.
+    DeleteServerAfter,
+
    /// Timer in seconds after which the message is deleted from the
    /// device.
    ///
@@ -192,9 +213,7 @@ pub enum Config {
    #[strum(props(default = "0"))]
    DeleteDeviceAfter,

-    /// The primary email address, used for sending and background fetch.
-    ///
-    /// Device-local, other devices keep their own primary transport.
+    /// The primary email address.
    ConfiguredAddr,

    /// Deprecated(2026-04).
@@ -290,24 +309,27 @@ pub enum Config {
    /// Configured SMTP server password.
    ConfiguredSendPw,

+    /// Deprecated(2026-04).
+    /// Use ConfiguredLoginParam and add_transport{from_qr}()/list_transports() instead.
+    ///
+    /// Whether OAuth 2 is used with configured provider.
+    ConfiguredServerFlags,
+
    /// Configured folder for incoming messages.
    ConfiguredInboxFolder,

    /// Unix timestamp of the last successful configuration.
    ConfiguredTimestamp,

+    /// ID of the configured provider from the provider database.
+    ConfiguredProvider,
+
    /// Deprecated(2026-04).
    /// Use [`Context::is_configured()`] instead.
    ///
    /// True if account is configured.
    Configured,

-    /// Deprecated, we are trying to get rid of this global setting.
-    /// It is possible to configure a profile with both chatmail relays
-    /// and classical email servers.
-    ///
-    /// Most usages in UIs can be replaced by `force_encryption`.
-    ///
    /// True if account is a chatmail account.
    IsChatmail,

@@ -348,21 +370,9 @@ pub enum Config {
    /// Timestamp of the last time housekeeping was run
    LastHousekeeping,

-    /// Timestamp of the last time accumulated broadcast channel reactions were sent
-    LastReactionsBroadcast,
-
    /// Timestamp of the last `CantDecryptOutgoingMsgs` notification.
    LastCantDecryptOutgoingMsgs,

-    /// Timestamp of the last time automatic relay management was run
-    LastAutomaticRelayManagement,
-
-    /// Whether to automatically add/remove transports
-    AutomaticRelayManagement,
-
-    /// Whether automatic relay management successfully added the desired number of relays
-    AutomaticRelayManagementFinished,
-
    /// Whether to avoid using IMAP IDLE even if the server supports it.
    ///
    /// This is a developer option for testing "fake idle".
@@ -453,9 +463,20 @@ 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.
@@ -465,13 +486,6 @@ pub enum Config {
    /// 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,
-
-    /// Force encryption.
-    ///
-    /// When enabled, unencrypted messages cannot be sent
-    /// and incoming unencrypted messages are not fetched and not processed.
-    #[strum(props(default = "1"))]
-    ForceEncryption,
 }

 impl Config {
@@ -487,11 +501,7 @@ impl Config {
    pub(crate) fn is_synced(&self) -> bool {
        matches!(
            self,
-            Self::Displayname
-                | Self::MdnsEnabled
-                | Self::Selfavatar
-                | Self::Selfstatus
-                | Self::ForceEncryption,
+            Self::Displayname | Self::MdnsEnabled | Self::Selfavatar | Self::Selfstatus,
        )
    }

@@ -544,6 +554,14 @@ impl Context {
        // Default values
        let val = match key {
            Config::ConfiguredInboxFolder => Some("INBOX".to_string()),
+            Config::DeleteServerAfter => {
+                match !Box::pin(self.get_config_bool(Config::BccSelf)).await?
+                    && Box::pin(self.is_chatmail()).await?
+                {
+                    true => Some("1".to_string()),
+                    false => Some("0".to_string()),
+                }
+            }
            Config::Addr => self.get_config_opt(Config::ConfiguredAddr).await?,
            _ => key.get_str("default").map(|s| s.to_string()),
        };
@@ -624,6 +642,33 @@ impl Context {
        self.get_config_bool(Config::MdnsEnabled).await
    }

+    /// Gets configured "delete_server_after" value.
+    ///
+    /// `None` means never delete the message, `Some(0)` means delete
+    /// at once, `Some(x)` means delete after `x` seconds.
+    pub async fn get_config_delete_server_after(&self) -> Result<Option<i64>> {
+        let val = match self
+            .get_config_parsed::<i64>(Config::DeleteServerAfter)
+            .await?
+            .unwrap_or(0)
+        {
+            0 => None,
+            1 => Some(0),
+            x => Some(x),
+        };
+        Ok(val)
+    }
+
+    /// Gets the configured provider.
+    ///
+    /// The provider is determined by the current primary transport.
+    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)
+    }
+
    /// Gets configured "delete_device_after" value.
    ///
    /// `None` means never delete the message, `Some(x)` means delete
@@ -790,38 +835,35 @@ impl Context {
                                (addr,),
                            )?;

-                            // `is_published=1`: an unpublished primary would be missing
-                            // from the relay list in the public key, so contacts would
-                            // never send to it.
-                            //
-                            // The timestamp must strictly increase because
-                            // other devices ignore the row update otherwise,
-                            // and contacts only adopt the re-signed key
-                            // if its signature timestamp increases.
+                            // Update the timestamp for the primary transport
+                            // so it becomes the first in `get_all_self_addrs()` list
+                            // and the list of relays distributed in the public key.
+                            // This ensures that messages will be sent
+                            // to the primary relay by the contacts
+                            // and will be fetched in background_fetch()
+                            // which only fetches from the primary transport.
                            transaction
                                .execute(
-                                    "UPDATE transports
-                                     SET add_timestamp=MAX(?, add_timestamp+1), is_published=1
-                                     WHERE addr=?",
+                                    "UPDATE transports SET add_timestamp=?, is_published=1 WHERE addr=?",
                                    (time(), addr),
                                )
                                .context(
                                    "Failed to update add_timestamp for the new primary transport",
                                )?;

-                            // Clean up SMTP queue.
+                            // 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?;
-                    // Invalidate the cache so the sync message cannot read a stale primary address.
-                    self.sql.uncache_raw_config("configured_addr").await;
                    send_sync_transports(self).await?;
+                    self.sql.uncache_raw_config("configured_addr").await;
                }
            }
            _ => {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
link2xt	dcb39b5525	remove shared-key	2026-05-04 05:15:39 +02:00
link2xt	1abdd85422	add-rust-environment-hash-key: false	2026-05-04 04:56:08 +02:00
link2xt	02dc992a7b	save cache from this PR	2026-05-04 04:21:49 +02:00
link2xt	81e9e65af3	ci: make Rust cache more useful Separate the cache for different Rust versions and only write to the cache from the main branch.	2026-05-03 22:13:05 +02:00
@@ -1 +1 @@
 -08-10
 -04-13