api: expose Message-ID (aka rfc724_mid) in JSON-RPC API

2026-04-06 15:42:10 +03:00 · 2023-11-22 12:01:20 +00:00
146 changed files with 5266 additions and 9708 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,11 +24,9 @@ jobs:
    name: Lint Rust
    runs-on: ubuntu-latest
    env:
-      RUSTUP_TOOLCHAIN: 1.76.0
+      RUSTUP_TOOLCHAIN: 1.74.0
    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - uses: actions/checkout@v3
      - name: Install rustfmt and clippy
        run: rustup toolchain install $RUSTUP_TOOLCHAIN --profile minimal --component rustfmt --component clippy
      - name: Cache rust cargo artifacts
@@ -44,9 +42,7 @@ jobs:
    name: cargo deny
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - uses: actions/checkout@v3
      - uses: EmbarkStudios/cargo-deny-action@v1
        with:
          arguments: --all-features --workspace
@@ -57,9 +53,7 @@ jobs:
    name: Check provider database
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - uses: actions/checkout@v3
      - name: Check provider database
        run: scripts/update-provider-database.sh

@@ -69,9 +63,8 @@ jobs:
    env:
      RUSTDOCFLAGS: -Dwarnings
    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - name: Checkout sources
+        uses: actions/checkout@v3
      - name: Cache rust cargo artifacts
        uses: swatinem/rust-cache@v2
      - name: Rustdoc
@@ -82,21 +75,19 @@ jobs:
    strategy:
      matrix:
        include:
-          - os: ubuntu-latest
-            rust: 1.76.0
-          - os: windows-latest
-            rust: 1.76.0
-          - os: macos-latest
-            rust: 1.76.0
-
-          # Minimum Supported Rust Version = 1.74.0
          - os: ubuntu-latest
            rust: 1.74.0
+          - os: windows-latest
+            rust: 1.74.0
+          - os: macos-latest
+            rust: 1.74.0
+
+          # Minimum Supported Rust Version = 1.70.0
+          - os: ubuntu-latest
+            rust: 1.70.0
    runs-on: ${{ matrix.os }}
    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - uses: actions/checkout@v3

      - name: Install Rust ${{ matrix.rust }}
        run: rustup toolchain install --profile minimal ${{ matrix.rust }}
@@ -120,9 +111,7 @@ jobs:
        os: [ubuntu-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - uses: actions/checkout@v3

      - name: Cache rust cargo artifacts
        uses: swatinem/rust-cache@v2
@@ -131,7 +120,7 @@ jobs:
        run: cargo build -p deltachat_ffi --features jsonrpc

      - name: Upload C library
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: ${{ matrix.os }}-libdeltachat.a
          path: target/debug/libdeltachat.a
@@ -144,9 +133,7 @@ jobs:
        os: [ubuntu-latest, macos-latest, windows-latest]
    runs-on: ${{ matrix.os }}
    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - uses: actions/checkout@v3

      - name: Cache rust cargo artifacts
        uses: swatinem/rust-cache@v2
@@ -155,7 +142,7 @@ jobs:
        run: cargo build -p deltachat-rpc-server

      - name: Upload deltachat-rpc-server
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: ${{ matrix.os }}-deltachat-rpc-server
          path: ${{ matrix.os == 'windows-latest' && 'target/debug/deltachat-rpc-server.exe' || 'target/debug/deltachat-rpc-server' }}
@@ -165,9 +152,8 @@ jobs:
    name: Python lint
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - name: Checkout sources
+        uses: actions/checkout@v3

      - name: Install tox
        run: pip install tox
@@ -207,18 +193,16 @@ jobs:

    runs-on: ${{ matrix.os }}
    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - uses: actions/checkout@v3

      - name: Download libdeltachat.a
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
        with:
          name: ${{ matrix.os }}-libdeltachat.a
          path: target/debug

      - name: Install python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v4
        with:
          python-version: ${{ matrix.python }}

@@ -259,12 +243,10 @@ jobs:

    runs-on: ${{ matrix.os }}
    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - uses: actions/checkout@v3

      - name: Install python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v4
        with:
          python-version: ${{ matrix.python }}

@@ -272,7 +254,7 @@ jobs:
        run: pip install tox

      - name: Download deltachat-rpc-server
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
        with:
          name: ${{ matrix.os }}-deltachat-rpc-server
          path: target/debug
--- a/.github/workflows/deltachat-rpc-server.yml
+++ b/.github/workflows/deltachat-rpc-server.yml
@@ -21,27 +21,22 @@ jobs:
  # Build a version statically linked against musl libc
  # to avoid problems with glibc version incompatibility.
  build_linux:
-    name: Build deltachat-rpc-server for Linux
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: [aarch64, armv7l, armv6l, i686, x86_64]
-    runs-on: ubuntu-latest
+    name: Cross-compile deltachat-rpc-server for x86_64, i686, aarch64 and armv7 Linux
+    runs-on: ubuntu-22.04
    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - uses: actions/checkout@v3
+
+      - name: Install ziglang
+        run: pip install wheel ziglang==0.11.0

      - name: Build deltachat-rpc-server binaries
-        run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-linux
+        run: sh scripts/zig-rpc-server.sh

-      - name: Upload binary
-        uses: actions/upload-artifact@v4
+      - name: Upload dist directory with Linux binaries
+        uses: actions/upload-artifact@v3
        with:
-          name: deltachat-rpc-server-${{ matrix.arch }}-linux
-          path: result/bin/deltachat-rpc-server
+          name: linux
+          path: dist/
          if-no-files-found: error

  build_windows:
@@ -49,23 +44,32 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        arch: [win32, win64]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
+        include:
+          - os: windows-latest
+            artifact: win32.exe
+            path: deltachat-rpc-server.exe
+            target: i686-pc-windows-msvc

-      - name: Build deltachat-rpc-server binaries
-        run: nix build .#deltachat-rpc-server-${{ matrix.arch }}
+          - os: windows-latest
+            artifact: win64.exe
+            path: deltachat-rpc-server.exe
+            target: x86_64-pc-windows-msvc
+
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup rust target
+        run: rustup target add ${{ matrix.target }}
+
+      - name: Build
+        run: cargo build --release --package deltachat-rpc-server --target ${{ matrix.target }} --features vendored

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

  build_macos:
@@ -73,13 +77,13 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        arch: [x86_64, aarch64]
+        include:
+          - arch: x86_64
+          - arch: aarch64

    runs-on: macos-latest
    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - uses: actions/checkout@v3

      - name: Setup rust target
        run: rustup target add ${{ matrix.arch }}-apple-darwin
@@ -88,7 +92,7 @@ jobs:
        run: cargo build --release --package deltachat-rpc-server --target ${{ matrix.arch }}-apple-darwin --features vendored

      - name: Upload binary
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: deltachat-rpc-server-${{ matrix.arch }}-macos
          path: target/${{ matrix.arch }}-apple-darwin/release/deltachat-rpc-server
@@ -96,85 +100,53 @@ jobs:

  publish:
    name: Build wheels and upload binaries to the release
-    needs: ["build_linux", "build_macos"]
+    needs: ["build_linux", "build_windows", "build_macos"]
    permissions:
      contents: write
    runs-on: "ubuntu-latest"
    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - uses: actions/checkout@v3

-      - name: Download Linux aarch64 binary
-        uses: actions/download-artifact@v4
+      - name: Download Linux binaries
+        uses: actions/download-artifact@v3
        with:
-          name: deltachat-rpc-server-aarch64-linux
-          path: deltachat-rpc-server-aarch64-linux.d
+          name: linux
+          path: dist/

-      - name: Download Linux armv7l binary
-        uses: actions/download-artifact@v4
+      - name: Download win32 binary
+        uses: actions/download-artifact@v3
        with:
-          name: deltachat-rpc-server-armv7l-linux
-          path: deltachat-rpc-server-armv7l-linux.d
+          name: deltachat-rpc-server-win32.exe
+          path: deltachat-rpc-server-win32.exe.d

-      - name: Download Linux armv6l binary
-        uses: actions/download-artifact@v4
+      - name: Download win64 binary
+        uses: actions/download-artifact@v3
        with:
-          name: deltachat-rpc-server-armv6l-linux
-          path: deltachat-rpc-server-armv6l-linux.d
-
-      - name: Download Linux i686 binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-i686-linux
-          path: deltachat-rpc-server-i686-linux.d
-
-      - name: Download Linux x86_64 binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-x86_64-linux
-          path: deltachat-rpc-server-x86_64-linux.d
-
-      - name: Download Win32 binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-win32
-          path: deltachat-rpc-server-win32.d
-
-      - name: Download Win64 binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-win64
-          path: deltachat-rpc-server-win64.d
+          name: deltachat-rpc-server-win64.exe
+          path: deltachat-rpc-server-win64.exe.d

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

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

      - name: Flatten dist/ directory
        run: |
-          mkdir -p dist
-          mv deltachat-rpc-server-aarch64-linux.d/deltachat-rpc-server dist/deltachat-rpc-server-aarch64-linux
-          mv deltachat-rpc-server-armv7l-linux.d/deltachat-rpc-server dist/deltachat-rpc-server-armv7l-linux
-          mv deltachat-rpc-server-armv6l-linux.d/deltachat-rpc-server dist/deltachat-rpc-server-armv6l-linux
-          mv deltachat-rpc-server-i686-linux.d/deltachat-rpc-server dist/deltachat-rpc-server-i686-linux
-          mv deltachat-rpc-server-x86_64-linux.d/deltachat-rpc-server dist/deltachat-rpc-server-x86_64-linux
-          mv deltachat-rpc-server-win32.d/deltachat-rpc-server.exe dist/deltachat-rpc-server-win32.exe
-          mv deltachat-rpc-server-win64.d/deltachat-rpc-server.exe dist/deltachat-rpc-server-win64.exe
+          mv deltachat-rpc-server-win32.exe.d/deltachat-rpc-server.exe dist/deltachat-rpc-server-win32.exe
+          mv deltachat-rpc-server-win64.exe.d/deltachat-rpc-server.exe dist/deltachat-rpc-server-win64.exe
          mv deltachat-rpc-server-x86_64-macos.d/deltachat-rpc-server dist/deltachat-rpc-server-x86_64-macos
          mv deltachat-rpc-server-aarch64-macos.d/deltachat-rpc-server dist/deltachat-rpc-server-aarch64-macos

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

@@ -188,7 +160,6 @@ jobs:
        run: ls -l dist/

      - name: Upload binaries to the GitHub release
-        if: github.event_name == 'release'
        env:
          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
        run: |
--- a/.github/workflows/jsonrpc-client-npm-package.yml
+++ b/.github/workflows/jsonrpc-client-npm-package.yml
@@ -13,9 +13,8 @@ jobs:
    steps:
      - name: Install tree
        run: sudo apt install tree
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - name: Checkout
+        uses: actions/checkout@v3
      - uses: actions/setup-node@v3
        with:
          node-version: "18"
@@ -50,7 +49,7 @@ jobs:
          ls -lah
          mv $(find deltachat-jsonrpc-client-*) $DELTACHAT_JSONRPC_TAR_GZ
      - name: Upload Prebuild
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: deltachat-jsonrpc-client.tgz
          path: deltachat-jsonrpc/typescript/${{ env.DELTACHAT_JSONRPC_TAR_GZ }}
--- a/.github/workflows/jsonrpc.yml
+++ b/.github/workflows/jsonrpc.yml
@@ -14,9 +14,7 @@ jobs:
  build_and_test:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - uses: actions/checkout@v3
      - name: Use Node.js 18.x
        uses: actions/setup-node@v3
        with:
--- a/.github/workflows/node-docs.yml
+++ b/.github/workflows/node-docs.yml
@@ -14,9 +14,7 @@ jobs:
  generate:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - uses: actions/checkout@v3

      - name: Use Node.js 18.x
        uses: actions/setup-node@v3
--- a/.github/workflows/node-package.yml
+++ b/.github/workflows/node-package.yml
@@ -14,9 +14,8 @@ jobs:
      matrix:
        os: [macos-latest, windows-latest]
    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - name: Checkout
+        uses: actions/checkout@v3
      - uses: actions/setup-node@v3
        with:
          node-version: "18"
@@ -57,7 +56,7 @@ jobs:
          tar -zcvf "${{ matrix.os }}.tar.gz" -C prebuilds .

      - name: Upload Prebuild
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: ${{ matrix.os }}
          path: node/${{ matrix.os }}.tar.gz
@@ -75,9 +74,8 @@ jobs:
      - name: Change working directory owner
        run: chown root:root .

-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - name: Checkout
+        uses: actions/checkout@v3
      - uses: actions/setup-node@v3
        with:
          node-version: "18"
@@ -127,7 +125,7 @@ jobs:
          tar -zcvf "linux.tar.gz" -C prebuilds .

      - name: Upload Prebuild
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: linux
          path: node/linux.tar.gz
@@ -139,9 +137,8 @@ jobs:
    steps:
      - name: Install tree
        run: sudo apt install tree
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - name: Checkout
+        uses: actions/checkout@v3
      - uses: actions/setup-node@v2
        with:
          node-version: "18"
@@ -168,23 +165,23 @@ jobs:
          node --version
          echo $DELTACHAT_NODE_TAR_GZ
      - name: Download Linux prebuild
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v1
        with:
          name: linux
      - name: Download macOS prebuild
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v1
        with:
          name: macos-latest
      - name: Download Windows prebuild
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v1
        with:
          name: windows-latest
      - shell: bash
        run: |
          mkdir node/prebuilds
-          tar -xvzf linux.tar.gz -C node/prebuilds
-          tar -xvzf macos-latest.tar.gz -C node/prebuilds
-          tar -xvzf windows-latest.tar.gz -C node/prebuilds
+          tar -xvzf linux/linux.tar.gz -C node/prebuilds
+          tar -xvzf macos-latest/macos-latest.tar.gz -C node/prebuilds
+          tar -xvzf windows-latest/windows-latest.tar.gz -C node/prebuilds
          tree node/prebuilds
          rm -rf linux macos-latest windows-latest
      - name: Install dependencies without running scripts
@@ -204,7 +201,7 @@ jobs:
          ls -lah
          mv $(find deltachat-node-*) $DELTACHAT_NODE_TAR_GZ
      - name: Upload prebuild
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: deltachat-node.tgz
          path: ${{ env.DELTACHAT_NODE_TAR_GZ }}
--- a/.github/workflows/node-tests.yml
+++ b/.github/workflows/node-tests.yml
@@ -23,9 +23,8 @@ jobs:
      matrix:
        os: [ubuntu-latest, macos-latest, windows-latest]
    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - name: Checkout
+        uses: actions/checkout@v3
      - uses: actions/setup-node@v3
        with:
          node-version: "18"
--- a/.github/workflows/repl.yml
+++ b/.github/workflows/repl.yml
@@ -10,17 +10,15 @@ on:
 jobs:
  build_repl:
    name: Build REPL example
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - uses: actions/checkout@v3
+
      - name: Build
-        run: nix build .#deltachat-repl-win64
+        run: cargo build -p deltachat-repl --features vendored
+
      - name: Upload binary
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: repl.exe
-          path: "result/bin/deltachat-repl.exe"
+          path: "target/debug/deltachat-repl.exe"
--- a/.github/workflows/upload-docs.yml
+++ b/.github/workflows/upload-docs.yml
@@ -1,4 +1,4 @@
-name: Build & Deploy Documentation on rs.delta.chat, c.delta.chat, py.delta.chat
+name: Build & Deploy Documentation on rs.delta.chat

 on:
  push:
@@ -6,13 +6,11 @@ on:
      - main

 jobs:
-  build-rs:
+  build:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - uses: actions/checkout@v3
      - name: Build the documentation with cargo
        run: |
          cargo doc --package deltachat --no-deps --document-private-items
@@ -24,41 +22,3 @@ jobs:
          HOST: "delta.chat"
          SOURCE: "target/doc"
          TARGET: "/var/www/html/rs/"
-
-  build-python:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          fetch-depth: 0 # Fetch history to calculate VCS version number.
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
-      - name: Build Python documentation
-        run: nix build .#python-docs
-      - name: Upload to py.delta.chat
-        run: |
-          mkdir -p "$HOME/.ssh"
-          echo "${{ secrets.CODESPEAK_KEY }}" > "$HOME/.ssh/key"
-          chmod 600 "$HOME/.ssh/key"
-          rsync -avzh -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/result/html/ "delta@py.delta.chat:/home/delta/build/master"
-
-  build-c:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          fetch-depth: 0 # Fetch history to calculate VCS version number.
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
-      - name: Build C documentation
-        run: nix build .#docs
-      - name: Upload to py.delta.chat
-        run: |
-          mkdir -p "$HOME/.ssh"
-          echo "${{ secrets.CODESPEAK_KEY }}" > "$HOME/.ssh/key"
-          chmod 600 "$HOME/.ssh/key"
-          rsync -avzh -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/result/html/ "delta@c.delta.chat:/home/delta/build-c/master"
--- a/.github/workflows/upload-ffi-docs.yml
+++ b/.github/workflows/upload-ffi-docs.yml
@@ -14,15 +14,15 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - uses: actions/checkout@v3
      - name: Build the documentation with cargo
        run: |
          cargo doc --package deltachat_ffi --no-deps
      - name: Upload to cffi.delta.chat
-        run: |
-          mkdir -p "$HOME/.ssh"
-          echo "${{ secrets.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.USERNAME }}@delta.chat:/var/www/html/cffi/"
+        uses: up9cloud/action-rsync@v1.3
+        env:
+          USER: ${{ secrets.USERNAME }}
+          KEY: ${{ secrets.KEY }}
+          HOST: "delta.chat"
+          SOURCE: "target/doc"
+          TARGET: "/var/www/html/cffi/"
--- a/.github/workflows/upload-python-docs.yml
+++ b/.github/workflows/upload-python-docs.yml
@@ -0,0 +1,25 @@
+name: Build & Deploy Documentation on py.delta.chat
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0 # Fetch history to calculate VCS version number.
+      - name: Build Python documentation
+        run: scripts/build-python-docs.sh
+      - name: Upload to py.delta.chat
+        uses: up9cloud/action-rsync@v1.3
+        env:
+          USER: delta
+          KEY: ${{ secrets.CODESPEAK_KEY }}
+          HOST: "lists.codespeak.net"
+          SOURCE: "dist/html/"
+          TARGET: "/home/delta/build/master"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,407 +1,5 @@
 # Changelog

-## [1.136.0] - 2024-03-04
-
-### Features / Changes
-
- Recognise Trash folder by name ([#5275](https://github.com/deltachat/deltachat-core-rust/pull/5275)).
- Send Chat-Group-Avatar as inline base64 ([#5253](https://github.com/deltachat/deltachat-core-rust/pull/5253)).
- Self-Reporting: Report number of protected/encrypted/unencrypted chats ([#5292](https://github.com/deltachat/deltachat-core-rust/pull/5292)).
-
-### Fixes
-
- Don't send sync messages on self-{status,avatar} update from self-sent messages ([#5289](https://github.com/deltachat/deltachat-core-rust/pull/5289)).
- imap: Allow `maybe_network` to interrupt connection ratelimit.
- imap: Set connectivity to "connecting" only after ratelimit.
- Remove `Group-ID` from `Message-ID`.
- Prioritize protected `Message-ID` over `X-Microsoft-Original-Message-ID`.
-
-### API-Changes
-
- Make `store_self_keypair` private.
- Add `ContextBuilder.build()` to build Context without opening.
- `dc_accounts_set_push_device_token` and `dc_get_push_state` APIs for iOS push notifications.
-
-### Build system
-
- Tag armv6 wheels with tags accepted by PyPI.
- Unpin OpenSSL.
- Remove deprecated `unmaintained` field from deny.toml.
- Do not vendor OpenSSL when cross-compiling ([#5316](https://github.com/deltachat/deltachat-core-rust/pull/5316)).
- Increase MSRV to 1.74.0.
-
-### CI
-
- Upgrade setup-python GitHub Action.
- Update to Rust 1.76 and fix clippy warnings.
- Build Python docs with Nix.
- Upload python docs without GH actions.
- Upload cffi docs without GH actions.
- Build c.delta.chat docs with nix.
-
-### Other
-
- refactor: move more methods from Imap into Session.
- Add deltachat-time to sources.
-
-### Refactor
-
- Remove Session from Imap structure.
- Merge ImapConfig into Imap.
- Get rid of ImapActionResult.
- Build contexts using ContextBuilder.
- Do not send `Secure-Join-Group` in `vg-request`.
-
-### Tests
-
- Fix `test_verified_oneonone_chat_broken_by_device_change()` ([#5280](https://github.com/deltachat/deltachat-core-rust/pull/5280)).
- `get_protected_chat()`: Use FFIEventTracker instead of `dc_wait_next_msgs()` ([#5207](https://github.com/deltachat/deltachat-core-rust/pull/5207)).
- Fixup `tests/test_3_offline.py::TestOfflineAccountBasic::test_wrong_db`.
- Fix pytest compat ([#5317](https://github.com/deltachat/deltachat-core-rust/pull/5317)).
-
-## [1.135.1] - 2024-02-20
-
-### Features / Changes
-
- Sync self-avatar across devices ([#4893](https://github.com/deltachat/deltachat-core-rust/pull/4893)).
- Sync Config::Selfstatus across devices ([#4893](https://github.com/deltachat/deltachat-core-rust/pull/4893)).
- Remove webxdc sending limit.
-
-### Fixes
-
- Never encrypt `{vc,vg}-request` SecureJoin messages.
- Apply Autocrypt headers if timestamp is unchanged.
- `Context::get_info`: Report displayname as "displayname" (w/o underscore).
-
-### Tests
-
- Mock `SystemTime::now()` for the tests.
- Add a test on protection message sort timestamp ([#5088](https://github.com/deltachat/deltachat-core-rust/pull/5088)).
-
-### Build system
-
- Add flake.nix.
- Add footer template for git-cliff.
-
-### CI
-
- Update GitHub Actions `actions/upload-artifact`, `actions/download-artifact`, `actions/checkout`.
- Build deltachat-repl for Windows with nix.
- Build deltachat-rpc-server with nix.
- Try to upload deltachat-rpc-server only on release.
-
-### Refactor
-
- `create_keypair`: Remove unnecessary `map_err`.
- Return error with a cause when failing to export keys.
- Rename incorrectly named variables in `create_keypair`.
-
-## [1.135.1] - 2024-02-20
-
-### CI
-
- Update actions/upload-artifact.
- Use actions/download-artifact@v4.
- Replace download-artifact v1 with v4.
- Update to actions/checkout@v4.
- Fixup node-package.yml after artifact actions upgrade.
-
-### Features / Changes
-
- Mock SystemTime::now() for the tests.
- Remove webxdc sending limit.
- Sync self-avatar across devices ([#4893](https://github.com/deltachat/deltachat-core-rust/pull/4893)).
- Sync Config::Selfstatus across devices ([#4893](https://github.com/deltachat/deltachat-core-rust/pull/4893)).
-
-### Fixes
-
- Context::get_info: Report displayname as "displayname" (w/o underscore).
- Never encrypt {vc,vg}-request.
-
-### Other
-
- Cleanup changelog ([#5265](https://github.com/deltachat/deltachat-core-rust/pull/5265))
-
-somehow a whole issue sneaked in :).
-
-### Refactor
-
- create_keypair: Remove unnecessary map_err.
- Return error with a cause when failing to export keys.
- Rename incorrectly named variables in create_keypair.
-
-### Tests
-
- Add a test on protection message sort timestamp ([#5088](https://github.com/deltachat/deltachat-core-rust/pull/5088)).
-
-## [1.135.0] - 2024-02-13
-
-### Features / Changes
-
- Add wildcard pattern support to provider database.
- Add device message about outgoing undecryptable messages ([#5164](https://github.com/deltachat/deltachat-core-rust/pull/5164)).
- Context::set_config(): Restart IO scheduler if needed ([#5111](https://github.com/deltachat/deltachat-core-rust/pull/5111)).
- Server_sent_unsolicited_exists(): Log folder name.
- Cache system time instead of looking at the clock several times in a row.
- Basic self-reporting ([#5129](https://github.com/deltachat/deltachat-core-rust/pull/5129)).
-
-### Fixes
-
- Dehtml: Don't just truncate text when trying to decode ([#5223](https://github.com/deltachat/deltachat-core-rust/pull/5223)).
- Mark the gossip keys from the message as verified, not the ones from the db ([#5247](https://github.com/deltachat/deltachat-core-rust/pull/5247)).
- Guarantee immediate message deletion if delete_server_after == 0 ([#5201](https://github.com/deltachat/deltachat-core-rust/pull/5201)).
- Never allow a message timestamp to be a lot in the future ([#5249](https://github.com/deltachat/deltachat-core-rust/pull/5249)).
- Imap::configure_mvbox: Do select_with_uidvalidity() before return.
- ImapSession::select_or_create_folder(): Don't fail if folder is created in parallel.
- Emit ConfigSynced event on the second device.
- Create mvbox on setting mvbox_move.
- Use SystemTime instead of Instant everywhere.
- Restore database rows removed in previous release; this ensures compatibility when adding second device or importing backup and not all devices run the new core ([#5254](https://github.com/deltachat/deltachat-core-rust/pull/5254))
-
-### Miscellaneous Tasks
-
- cargo: Bump image from 0.24.7 to 0.24.8.
- cargo: Bump chrono from 0.4.31 to 0.4.33.
- cargo: Bump futures-lite from 2.1.0 to 2.2.0.
- cargo: Bump pin-project from 1.1.3 to 1.1.4.
- cargo: Bump iana-time-zone from yanked 0.1.59 to 0.1.60.
- cargo: Bump smallvec from 1.11.2 to 1.13.1.
- cargo: Bump base64 from 0.21.5 to 0.21.7.
- cargo: Bump regex from 1.10.2 to 1.10.3.
- cargo: Bump libc from 0.2.151 to 0.2.153.
- cargo: Bump reqwest from 0.11.23 to 0.11.24.
- cargo: Bump axum from 0.7.3 to 0.7.4.
- cargo: Bump uuid from 1.6.1 to 1.7.0.
- cargo: Bump fast-socks5 from 0.9.2 to 0.9.5.
- cargo: Bump serde_json from 1.0.111 to 1.0.113.
- cargo: Bump syn from 2.0.46 to 2.0.48.
- cargo: Bump serde from 1.0.194 to 1.0.196.
- cargo: Bump toml from 0.8.8 to 0.8.10.
- cargo: Update to strum 0.26.
- Cargo update.
- scripts: Do not install deltachat-rpc-client twice.
-
-### Other
-
- Update welcome image, thanks @paulaluap
- Merge pull request #5243 from deltachat/dependabot/cargo/pin-project-1.1.4
- Merge pull request #5241 from deltachat/dependabot/cargo/futures-lite-2.2.0
- Merge pull request #5236 from deltachat/dependabot/cargo/chrono-0.4.33
- Merge pull request #5235 from deltachat/dependabot/cargo/image-0.24.8
-
-
-### Refactor
-
- Resultify token::exists.
-
-### Tests
-
- Delete_server_after="1" should cause immediate message deletion ([#5201](https://github.com/deltachat/deltachat-core-rust/pull/5201)).
-
-## [1.134.0] - 2024-01-31
-
-### API-Changes
-
- [**breaking**] JSON-RPC: device message api now requires `Option<MessageData>` instead of `String` for the message ([#5211](https://github.com/deltachat/deltachat-core-rust/pull/5211)).
- CFFI: add `dc_accounts_background_fetch` and event `DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE`.
- JSON-RPC: add `accounts_background_fetch`.
-
-### Features / Changes
-
- `Qr::check_qr()`: Accept i.delta.chat invite links ([#5217](https://github.com/deltachat/deltachat-core-rust/pull/5217)).
- Add support for IMAP METADATA, fetching `/shared/comment` and `/shared/admin` and displaying it in account info.
-
-### Fixes
-
- Add tolerance for macOS and iOS changing `#` to `%23`.
- Do not drop unknown report attachments, such as TLS reports.
- Treat only "Auto-Submitted: auto-generated" messages as bot-sent ([#5213](https://github.com/deltachat/deltachat-core-rust/pull/5213)).
- `Chat::resend_msgs`: Guarantee strictly increasing time in the `Date` header.
- Delete resent messages on receiver side ([#5155](https://github.com/deltachat/deltachat-core-rust/pull/5155)).
- Fix iOS build issue.
-
-### CI
-
- Add/remove necessary newlines to fix Python lint.
-
-### Tests
-
- `test_import_export_online_all`: Send the message to the existing address to avoid errors ([#5220](https://github.com/deltachat/deltachat-core-rust/pull/5220)).
-
-## [1.133.2] - 2024-01-24
-
-### Fixes
-
- Downgrade OpenSSL from 3.2.0 to 3.1.4 ([#5206](https://github.com/deltachat/deltachat-core-rust/issues/5206))
- No new chats for MDNs with alias ([#5196](https://github.com/deltachat/deltachat-core-rust/issues/5196)) ([#5199](https://github.com/deltachat/deltachat-core-rust/pull/5199)).
-
-## [1.133.1] - 2024-01-21
-
-### API-Changes
-
- Add `is_bot` to cffi and jsonrpc ([#5197](https://github.com/deltachat/deltachat-core-rust/pull/5197)).
-
-### Features / Changes
-
- Add system message when provider does not allow unencrypted messages ([#5195](https://github.com/deltachat/deltachat-core-rust/pull/5195)).
-
-### Fixes
-
- `Chat::send_msg`: Remove encryption-related params from already sent message. This allows to send received encrypted `dc_msg_t` object to unencrypted chat, e.g. in a Python bot.
- Set message download state to Failure on IMAP errors. This avoids partially downloaded messages getting stuck in "Downloading..." state without actually being in a download queue.
- BCC-to-self even if server deletion is set to "at once". This is a workaround for SMTP servers which do not return response in time, BCC-self works as a confirmation that message was sent out successfully and does not need more retries.
- node: Run tests with native ESM modules instead of `esm` ([#5194](https://github.com/deltachat/deltachat-core-rust/pull/5194)).
- Use Quoted-Printable MIME encoding for the text part ([#3986](https://github.com/deltachat/deltachat-core-rust/pull/3986)).
-
-### Tests
-
- python: Add `get_protected_chat` to testplugin.py.
-
-## [1.133.0] - 2024-01-14
-
-### Features / Changes
-
- Securejoin protocol implementation refinements
-  - Track forward and backward verification separately ([#5089](https://github.com/deltachat/deltachat-core-rust/pull/5089)) to avoid inconsistent states.
-  - Mark 1:1 chat as verified for Bob early. 1:1 chat with Alice is verified as soon as Alice's key is verified rather than at the end of the protocol.
- Put Message-ID into hidden headers and take it from there on receiver ([#4798](https://github.com/deltachat/deltachat-core-rust/pull/4798)). This works around servers which generate their own Message-ID and overwrite the one generated by Delta Chat.
- deltachat-repl: Enable INFO logging by default and add timestamps.
- Add `ConfigSynced` (`DC_EVENT_CONFIG_SYNCED`) event which is emitted when configuration is changed via synchronization message or synchronization message for configuration is sent. UI may refresh elments based on the configuration key which is a part of the event.
- Sync contact creation/rename across devices ([#5163](https://github.com/deltachat/deltachat-core-rust/pull/5163)).
- Encrypt MDNs ([#5175](https://github.com/deltachat/deltachat-core-rust/pull/5175)).
- Only try to configure non-strict TLS checks if explicitly set ([#5181](https://github.com/deltachat/deltachat-core-rust/pull/5181)).
-
-### Build system
-
- Use released version of iroh 0.4.2 for "setup second device" feature.
-
-### CI
-
- Update to Rust 1.75.0.
- Downgrade `chai` from 4.4.0 to 4.3.10.
-
-### Documentation
-
- Add a link <https://www.ietf.org/archive/id/draft-bucksch-autoconfig-00.html> to autoconfig RFC draft.
- Update securejoin link in `standards.md` from <https://countermitm.readthedocs.io/> to <https://securejoin.readthedocs.io>.
- Restore "Constants" page in Doxygen >=1.9.8
-
-### Fixes
-
- imap: Limit the rate of LOGIN attempts rather than connection attempts. This is to avoid having to wait for rate limiter right after switching from a bad or offline network to a working network while still guarding against reconnection loop.
- Do not ignore `peerstate.save_to_db()` errors.
- securejoin: Mark 1:1s as protected regardless of the Config::VerifiedOneOnOneChats.
- Delete received outgoing messages from SMTP queue ([#5115](https://github.com/deltachat/deltachat-core-rust/pull/5115)).
- imap: Fail fast on `LIST` errors to avoid busy loop when connection is lost.
- Split SMTP jobs already in `chat::create_send_msg_jobs()` ([#5115](https://github.com/deltachat/deltachat-core-rust/pull/5115)).
- Do not remove contents from unencrypted [Schleuder](https://schleuder.org/) mailing lists messages.
- Reset message error when scheduling resending ([#5119](https://github.com/deltachat/deltachat-core-rust/pull/5119)).
- Emit events more reliably when starting and stopping I/O ([#5101](https://github.com/deltachat/deltachat-core-rust/pull/5101)).
- Fix timestamp of chat protection info message for correct message ordering after restoring a backup ([#5088](https://github.com/deltachat/deltachat-core-rust/pull/5088)).
-
-### Refactor
-
- sql: Recreate `config` table with UNIQUE constraint.
- sql: Recreate `keypairs` table to remove unused `addr` and `created` fields and move `is_default` flag to `config` table.
- Send `Secure-Join-Fingerprint` only in `*-request-with-auth`.
-
-### Tests
-
- Test joining non-protected group.
- Test that read receipts don't degrade encryption.
- Test that changing default private key breaks backward verification.
- Test recovery from lost vc-contact-confirm.
- Use `wait_for_incoming_msg_event()` more.
-
-## [1.132.1] - 2023-12-12
-
-### Features / Changes
-
- Add "From:" to protected headers for signed-only messages.
- Sync user actions for ad-hoc groups across devices ([#5065](https://github.com/deltachat/deltachat-core-rust/pull/5065)).
-
-### Fixes
-
- Add padlock to empty part if the whole message is empty.
- Renew IDLE timeout on keepalives and reduce it to 5 minutes.
- connectivity: Return false from `all_work_done()` immediately after connecting (iOS notification fix).
-
-### API-Changes
-
- deltachat-jsonrpc-client: add `Account.{import,export}_self_keys`.
-
-### CI
-
- Update to Rust 1.74.1.
-
-## [1.132.0] - 2023-12-06
-
-### Features / Changes
-
- Increase TCP timeouts from 30 to 60 seconds.
-
-### Fixes
-
- Don't sort message creating a protected group over a protection message ([#4963](https://github.com/deltachat/deltachat-core-rust/pull/4963)).
- Do not lock accounts.toml on iOS.
- Protect groups even if some members are not verified and add `test_securejoin_after_contact_resetup` regression test.
-
-## [1.131.9] - 2023-12-02
-
-### API-Changes
-
- Remove `dc_get_http_response()`, `dc_http_response_get_mimetype()`, `dc_http_response_get_encoding()`, `dc_http_response_get_blob()`, `dc_http_response_get_size()`, `dc_http_response_unref()` and `dc_http_response_t` from cffi.
- Deprecate CFFI APIs `dc_send_reaction()`, `dc_get_msg_reactions()`, `dc_reactions_get_contacts()`, `dc_reactions_get_by_contact_id()`, `dc_reactions_unref` and `dc_reactions_t`.
- Make `Contact.is_verified()` return bool.
-
-### Build system
-
- Switch from fork of iroh to iroh 0.4.2 pre-release.
-
-### Features / Changes
-
- Send `Chat-Verified` headers in 1:1 chats.
- Ratelimit IMAP connections ([#4940](https://github.com/deltachat/deltachat-core-rust/pull/4940)).
- Remove receiver limit on `.xdc` size.
- Don't affect MimeMessage with "From" and secured headers from encrypted unsigned messages.
- Sync `Config::{MdnsEnabled,ShowEmails}` across devices ([#4954](https://github.com/deltachat/deltachat-core-rust/pull/4954)).
- Sync `Config::Displayname` across devices ([#4893](https://github.com/deltachat/deltachat-core-rust/pull/4893)).
- `Chat::rename_ex`: Don't send sync message if usual message is sent.
-
-### Fixes
-
- Lock the database when INSERTing a webxdc update, avoid "Database is locked" errors.
- Use keyring with all private keys when decrypting a message ([#5046](https://github.com/deltachat/deltachat-core-rust/pull/5046)).
-
-### Tests
-
- Make Result-returning tests produce a line number.
- Add `test_utils::sync()`.
- Test inserting lots of webxdc updates.
- Split `test_sync_alter_chat()` into smaller tests.
-
-## [1.131.8] - 2023-11-27
-
-### Features / Changes
-
- webxdc: Add unique IDs to status updates sent outside and deduplicate based on IDs.
-
-### Fixes
-
- Allow IMAP servers not returning UIDNEXT on SELECT and STATUS such as mail.163.com.
- Use the correct securejoin strings used in the UI, remove old TODO ([#5047](https://github.com/deltachat/deltachat-core-rust/pull/5047)).
- Do not emit events about webxdc update events logged into debug log webxdc.
-
-### Tests
-
- Check that `receive_status_update` has forward compatibility and unique webxdc IDs will be ignored by previous Delta Chat versions.
-
-## [1.131.7] - 2023-11-24
-
-### Fixes
-
- Revert "fix: check UIDNEXT with a STATUS command before going IDLE". This attempts to fix mail.163.com which has broken STATUS command.
-
 ## [1.131.6] - 2023-11-21

 ### Fixes
@@ -3665,15 +3263,3 @@ https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed
 [1.131.4]: https://github.com/deltachat/deltachat-core-rust/compare/v1.131.3...v1.131.4
 [1.131.5]: https://github.com/deltachat/deltachat-core-rust/compare/v1.131.4...v1.131.5
 [1.131.6]: https://github.com/deltachat/deltachat-core-rust/compare/v1.131.5...v1.131.6
-[1.131.7]: https://github.com/deltachat/deltachat-core-rust/compare/v1.131.6...v1.131.7
-[1.131.8]: https://github.com/deltachat/deltachat-core-rust/compare/v1.131.7...v1.131.8
-[1.131.9]: https://github.com/deltachat/deltachat-core-rust/compare/v1.131.8...v1.131.9
-[1.132.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.131.9...v1.132.0
-[1.132.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.132.0...v1.132.1
-[1.133.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.132.1...v1.133.0
-[1.133.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.133.0...v1.133.1
-[1.133.2]: https://github.com/deltachat/deltachat-core-rust/compare/v1.133.1...v1.133.2
-[1.134.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.133.2...v1.134.0
-[1.135.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.134.0...v1.135.0
-[1.135.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.135.0...v1.135.1
-[1.136.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.135.1...v1.136.0
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -91,12 +91,6 @@ All errors should be handled in one of these ways:
 - With `.log_err().ok()`.
 - Bubbled up with `?`.

-`backtrace` feature is enabled for `anyhow` crate
-and `debug = 1` option is set in the test profile.
-This allows to run `RUST_BACKTRACE=1 cargo test`
-and get a backtrace with line numbers in resultified tests
-which return `anyhow::Result`.
-
 ### Logging

 For logging, use `info!`, `warn!` and `error!` macros.
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "deltachat"
-version = "1.136.0"
+version = "1.131.6"
 edition = "2021"
 license = "MPL-2.0"
-rust-version = "1.74"
+rust-version = "1.70"

 [profile.dev]
 debug = 0
@@ -11,10 +11,6 @@ panic = 'abort'
 opt-level = 1

 [profile.test]
-# Make anyhow `backtrace` feature useful.
-# With `debug = 0` there are no line numbers in the backtrace
-# produced with RUST_BACKTRACE=1.
-debug = 1
 opt-level = 0

 # Always optimize dependencies.
@@ -30,18 +26,14 @@ opt-level = "z"
 codegen-units = 1
 strip = true

-[patch.crates-io]
-openssl-src = { git = "https://github.com/link2xt/openssl-src-rs.git", branch = "link2xt/copy-symlink" }
-
 [dependencies]
 deltachat_derive = { path = "./deltachat_derive" }
-deltachat-time = { path = "./deltachat-time" }
 format-flowed = { path = "./format-flowed" }
 ratelimit = { path = "./deltachat-ratelimit" }

 anyhow = "1"
 async-channel = "2.0.0"
-async-imap = { version = "0.9.7", default-features = false, features = ["runtime-tokio"] }
+async-imap = { version = "0.9.1", default-features = false, features = ["runtime-tokio"] }
 async-native-tls = { version = "0.5", default-features = false, features = ["runtime-tokio"] }
 async-smtp = { version = "0.9", default-features = false, features = ["runtime-tokio"] }
 async_zip = { version = "0.0.12", default-features = false, features = ["deflate", "fs"] }
@@ -52,15 +44,15 @@ chrono = { version = "0.4", default-features=false, features = ["clock", "std"]
 email = { git = "https://github.com/deltachat/rust-email", branch = "master" }
 encoded-words = { git = "https://github.com/async-email/encoded-words", branch = "master" }
 escaper = "0.1"
-fast-socks5 = "0.9"
-fd-lock = "4"
+fast-socks5 = "0.8"
+fd-lock = "3.0.11"
 futures = "0.3"
-futures-lite = "2.2.0"
+futures-lite = "2.0.0"
 hex = "0.4.0"
 hickory-resolver = "0.24"
 humansize = "2"
-image = { version = "0.24.9", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
-iroh = { version = "0.4.2", default-features = false }
+image = { version = "0.24.7", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
+iroh = { git = "https://github.com/deltachat/iroh", branch = "0.4-update-quic", default-features = false }
 kamadak-exif = "0.5"
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
 libc = "0.2"
@@ -72,27 +64,26 @@ num-traits = "0.2"
 once_cell = "1.18.0"
 percent-encoding = "2.3"
 parking_lot = "0.12"
-pgp = { version = "0.11", default-features = false }
+pgp = { version = "0.10", default-features = false }
 pin-project = "1"
 pretty_env_logger = { version = "0.5", optional = true }
 qrcodegen = "1.7.0"
 quick-xml = "0.31"
-quoted_printable = "0.5"
 rand = "0.8"
-regex = "1.10"
-reqwest = { version = "0.11.24", features = ["json"] }
-rusqlite = { version = "0.31", features = ["sqlcipher"] }
+regex = "1.9"
+reqwest = { version = "0.11.20", features = ["json"] }
+rusqlite = { version = "0.30", features = ["sqlcipher"] }
 rust-hsluv = "0.1"
 sanitize-filename = "0.5"
-serde_json = "1"
+serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 sha-1 = "0.10"
 sha2 = "0.10"
 smallvec = "1"
-strum = "0.26"
-strum_macros = "0.26"
+strum = "0.25"
+strum_macros = "0.25"
 tagger = "4.3.4"
-textwrap = "0.16.1"
+textwrap = "0.16.0"
 thiserror = "1"
 tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }
 tokio-io-timeout = "1.2.0"
@@ -105,14 +96,13 @@ uuid = { version = "1", features = ["serde", "v4"] }

 [dev-dependencies]
 ansi_term = "0.12.0"
-anyhow = { version = "1", features = ["backtrace"] } # Enable `backtrace` feature in tests.
 criterion = { version = "0.5.1", features = ["async_tokio"] }
-futures-lite = "2.2.0"
+futures-lite = "2.0.0"
 log = "0.4"
 pretty_env_logger = "0.5"
 proptest = { version = "1", default-features = false, features = ["std"] }
 tempfile = "3"
-testdir = "0.9.0"
+testdir = "0.8.0"
 tokio = { version = "1", features = ["parking_lot", "rt-multi-thread", "macros"] }
 pretty_assertions = "1.3.0"

@@ -124,7 +114,6 @@ members = [
  "deltachat-rpc-server",
  "deltachat-ratelimit",
  "deltachat-repl",
-  "deltachat-time",
  "format-flowed",
 ]

--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ $ curl https://sh.rustup.rs -sSf | sh
 Compile and run Delta Chat Core command line utility, using `cargo`:

 ```
-$ cargo run -p deltachat-repl -- ~/deltachat-db
+$ RUST_LOG=deltachat_repl=info cargo run -p deltachat-repl -- ~/deltachat-db
 ```
 where ~/deltachat-db is the database file. Delta Chat will create it if it does not exist.

@@ -121,7 +121,7 @@ $ cargo build -p deltachat_ffi --release

 - `DCC_MIME_DEBUG`: if set outgoing and incoming message will be printed 

- `RUST_LOG=async_imap=trace,async_smtp=trace`: enable IMAP and
+- `RUST_LOG=deltachat_repl=info,async_imap=trace,async_smtp=trace`: enable IMAP and
 SMTP tracing in addition to info messages.

 ### Expensive tests
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -9,16 +9,13 @@ For example, to release version 1.116.0 of the core, do the following steps.

 3. Update the changelog: `git cliff --unreleased --tag 1.116.0 --prepend CHANGELOG.md` or `git cliff -u -t 1.116.0 -p CHANGELOG.md`.

-4. add a link to compare previous with current version to the end of CHANGELOG.md:
-  `[1.116.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.115.2...v1.116.0`
+4. Update the version by running `scripts/set_core_version.py 1.116.0`.

-5. Update the version by running `scripts/set_core_version.py 1.116.0`.
-
-6. Commit the changes as `chore(release): prepare for 1.116.0`.
+5. Commit the changes as `chore(release): prepare for 1.116.0`.
   Optionally, use a separate branch like `prep-1.116.0` for this commit and open a PR for review.

-7. Tag the release: `git tag -a v1.116.0`.
+6. Tag the release: `git tag -a v1.116.0`.

-8. Push the release tag: `git push origin v1.116.0`.
+7. Push the release tag: `git push origin v1.116.0`.

-9. Create a GitHub release: `gh release create v1.116.0 -n ''`.
+8. Create a GitHub release: `gh release create v1.116.0 -n ''`.
--- a/assets/welcome-image.jpg
+++ b/assets/welcome-image.jpg
--- a/cliff.toml
+++ b/cliff.toml
@@ -77,17 +77,3 @@ body = """
 """
 # remove the leading and trailing whitespace from the template
 trim = true
-footer = """
-{% for release in releases -%}
-    {% if release.version -%}
-        {% if release.previous.version -%}
-            [{{ release.version | trim_start_matches(pat="v") }}]: \
-                https://github.com/deltachat/deltachat-core-rust\
-                    /compare/{{ release.previous.version }}..{{ release.version }}
-        {% endif -%}
-    {% else -%}
-        [unreleased]: https://github.com/deltachat/deltachat-core-rust\
-            /compare/{{ release.previous.version }}..HEAD
-    {% endif -%}
-{% endfor %}
-"""
--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.136.0"
+version = "1.131.6"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
--- a/deltachat-ffi/DoxygenLayout.xml
+++ b/deltachat-ffi/DoxygenLayout.xml
@@ -9,7 +9,7 @@
      <tab type="hierarchy" visible="no" title="" intro=""/>
      <tab type="classmembers" visible="no" title="" intro=""/>
    </tab>
-    <tab type="topics" visible="yes" title="Constants" intro="Here is a list of constants:"/>
+    <tab type="modules" visible="yes" title="Constants" intro="Here is a list of constants:"/>
    <tab type="pages" visible="yes" title="" intro=""/>
    <tab type="namespaces" visible="yes" title="">
      <tab type="namespacelist" visible="yes" title="" intro=""/>
--- a/deltachat-ffi/deltachat.h
+++ b/deltachat-ffi/deltachat.h
@@ -25,6 +25,7 @@ typedef struct _dc_event     dc_event_t;
 typedef struct _dc_event_emitter dc_event_emitter_t;
 typedef struct _dc_jsonrpc_instance dc_jsonrpc_instance_t;
 typedef struct _dc_backup_provider dc_backup_provider_t;
+typedef struct _dc_http_response dc_http_response_t;

 // Alias for backwards compatibility, use dc_event_emitter_t instead.
 typedef struct _dc_event_emitter dc_accounts_event_emitter_t;
@@ -423,16 +424,19 @@ char*           dc_get_blobdir               (const dc_context_t* context);
 *                    Sending messages to self is needed for a proper multi-account setup,
 *                    however, on the other hand, may lead to unwanted notifications in non-delta clients.
 * - `sentbox_watch`= 1=watch `Sent`-folder for changes,
- *                    0=do not watch the `Sent`-folder (default).
+ *                    0=do not watch the `Sent`-folder (default),
+ *                    changes require restarting IO by calling dc_stop_io() and then dc_start_io().
 * - `mvbox_move`   = 1=detect chat messages,
 *                    move them to the `DeltaChat` folder,
 *                    and watch the `DeltaChat` folder for updates (default),
 *                    0=do not move chat-messages
+ *                    changes require restarting IO by calling dc_stop_io() and then dc_start_io().
 * - `only_fetch_mvbox` = 1=Do not fetch messages from folders other than the
 *                    `DeltaChat` folder. Messages will still be fetched from the
 *                    spam folder and `sendbox_watch` will also still be respected
 *                    if enabled.
 *                    0=watch all folders normally (default)
+ *                    changes require restarting IO by calling dc_stop_io() and then dc_start_io().
 * - `show_emails`  = DC_SHOW_EMAILS_OFF (0)=
 *                    show direct replies to chats only,
 *                    DC_SHOW_EMAILS_ACCEPTED_CONTACTS (1)=
@@ -686,24 +690,6 @@ 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);
-
-
 /**
 * Standalone version of dc_accounts_all_work_done().
 * Only used by the python tests.
@@ -1126,7 +1112,6 @@ uint32_t dc_send_videochat_invitation (dc_context_t* context, uint32_t chat_id);
 * received overrides all previously received reactions. It is
 * possible to remove all reactions by sending an empty string.
 *
- * @deprecated 2023-11-27, use jsonrpc method `send_reaction` instead
 * @memberof dc_context_t
 * @param context The context object.
 * @param msg_id ID of the message you react to.
@@ -1139,7 +1124,6 @@ uint32_t dc_send_reaction (dc_context_t* context, uint32_t msg_id, char *reactio
 /**
 * Get a structure with reactions to the message.
 *
- * @deprecated 2023-11-27, use jsonrpc method `get_message_reactions` instead
 * @memberof dc_context_t
 * @param context The context object.
 * @param msg_id The message ID to get reactions for.
@@ -3166,33 +3150,6 @@ void           dc_accounts_maybe_network        (dc_accounts_t* accounts);
 void           dc_accounts_maybe_network_lost    (dc_accounts_t* accounts);


-/**
- * Perform a background fetch for all accounts in parallel with a timeout.
- * Pauses the scheduler, fetches messages from imap and then resumes the scheduler.
- *
- * dc_accounts_background_fetch() was created for the iOS Background fetch.
- *
- * The `DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE` event is emitted at the end
- * even in case of timeout, unless the function fails and returns 0.
- * Process all events until you get this one and you can safely return to the background
- * without forgetting to create notifications caused by timing race conditions.
- *
- * @memberof dc_accounts_t
- * @param timeout The timeout in seconds
- * @return Return 1 if DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE was emitted and 0 otherwise.
- */
-int            dc_accounts_background_fetch    (dc_accounts_t* accounts, uint64_t timeout);
-
-
-/**
- * Sets device token for Apple Push Notification service.
- * Returns immediately.
- *
- * @memberof dc_accounts_t
- * @param token Hexadecimal device token
- */
-void           dc_accounts_set_push_device_token (dc_accounts_t* accounts, const char *token);
-
 /**
 * Create the event emitter that is used to receive events.
 *
@@ -4439,9 +4396,6 @@ int             dc_msg_is_info                (const dc_msg_t* msg);
 * Currently, the following types are defined:
 * - DC_INFO_PROTECTION_ENABLED (11) - Info-message for "Chat is now protected"
 * - DC_INFO_PROTECTION_DISABLED (12) - Info-message for "Chat is no longer protected"
- * - DC_INFO_INVALID_UNENCRYPTED_MAIL (13) - Info-message for "Provider requires end-to-end encryption which is not setup yet",
- *   the UI should change the corresponding string using #DC_STR_INVALID_UNENCRYPTED_MAIL
- *   and also offer a way to fix the encryption, eg. by a button offering a QR scan
 *
 * Even when you display an icon,
 * you should still display the text of the informational message using dc_msg_get_text()
@@ -4468,7 +4422,6 @@ int             dc_msg_get_info_type          (const dc_msg_t* msg);
 #define         DC_INFO_EPHEMERAL_TIMER_CHANGED   10
 #define         DC_INFO_PROTECTION_ENABLED        11
 #define         DC_INFO_PROTECTION_DISABLED       12
-#define         DC_INFO_INVALID_UNENCRYPTED_MAIL  13
 #define         DC_INFO_WEBXDC_INFO_MESSAGE       32

 /**
@@ -5114,15 +5067,6 @@ int             dc_contact_is_blocked        (const dc_contact_t* contact);
 */
 int             dc_contact_is_verified       (dc_contact_t* contact);

-/**
- * Returns whether contact is a bot.
- *
- * @memberof dc_contact_t
- * @param contact The contact object.
- * @return 0 if the contact is not a bot, 1 otherwise.
- */
-int             dc_contact_is_bot            (dc_contact_t* contact);
-

 /**
 * Return the contact ID that verified a contact.
@@ -5241,6 +5185,72 @@ int             dc_provider_get_status                (const dc_provider_t* prov
 void            dc_provider_unref                     (dc_provider_t* provider);


+/**
+ * Return an HTTP(S) GET response.
+ * This function can be used to download remote content for HTML emails.
+ *
+ * @memberof dc_context_t
+ * @param context The context object to take proxy settings from.
+ * @param url HTTP or HTTPS URL.
+ * @return The response must be released using dc_http_response_unref() after usage.
+ *     NULL is returned on errors.
+ */
+dc_http_response_t*     dc_get_http_response      (const dc_context_t* context, const char* url);
+
+
+/**
+ * @class dc_http_response_t
+ *
+ * An object containing an HTTP(S) GET response.
+ * Created by dc_get_http_response().
+ */
+
+
+/**
+ * Returns HTTP response MIME type as a string, e.g. "text/plain" or "text/html".
+ *
+ * @memberof dc_http_response_t
+ * @param response HTTP response as returned by dc_get_http_response().
+ * @return The string which must be released using dc_str_unref() after usage. May be NULL.
+ */
+char*                   dc_http_response_get_mimetype (const dc_http_response_t* response);
+
+/**
+ * Returns HTTP response encoding, e.g. "utf-8".
+ *
+ * @memberof dc_http_response_t
+ * @param response HTTP response as returned by dc_get_http_response().
+ * @return The string which must be released using dc_str_unref() after usage. May be NULL.
+ */
+char*                   dc_http_response_get_encoding (const dc_http_response_t* response);
+
+/**
+ * Returns HTTP response contents.
+ *
+ * @memberof dc_http_response_t
+ * @param response HTTP response as returned by dc_get_http_response().
+ * @return The blob which must be released using dc_str_unref() after usage. NULL is never returned.
+ */
+uint8_t*                dc_http_response_get_blob     (const dc_http_response_t* response);
+
+/**
+ * Returns HTTP response content size.
+ *
+ * @memberof dc_http_response_t
+ * @param response HTTP response as returned by dc_get_http_response().
+ * @return The blob size.
+ */
+size_t                  dc_http_response_get_size     (const dc_http_response_t* response);
+
+/**
+ * Free an HTTP response object.
+ *
+ * @memberof dc_http_response_t
+ * @param response HTTP response as returned by dc_get_http_response().
+ */
+void                    dc_http_response_unref        (const dc_http_response_t* response);
+
+
 /**
 * @class dc_lot_t
 *
@@ -5340,7 +5350,6 @@ int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);

 /**
 * @class dc_reactions_t
- * @deprecated 2023-11-27, use jsonrpc method `get_message_reactions` instead
 *
 * An object representing all reactions for a single message.
 */
@@ -5348,7 +5357,6 @@ int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);
 /**
 * Returns array of contacts which reacted to the given message.
 *
- * @deprecated 2023-11-27, use jsonrpc method `get_message_reactions` instead
 * @memberof dc_reactions_t
 * @param reactions The object containing message reactions.
 * @return array of contact IDs. Use dc_array_get_cnt() to get array length and
@@ -5360,7 +5368,6 @@ dc_array_t*     dc_reactions_get_contacts(dc_reactions_t* reactions);
 /**
 * Returns a string containing space-separated reactions of a single contact.
 *
- * @deprecated 2023-11-27, use jsonrpc method `get_message_reactions` instead
 * @memberof dc_reactions_t
 * @param reactions The object containing message reactions.
 * @param contact_id ID of the contact.
@@ -5376,7 +5383,6 @@ char*           dc_reactions_get_by_contact_id(dc_reactions_t* reactions, uint32
 *
 * Reactions objects are created by dc_get_msg_reactions().
 *
- * @deprecated 2023-11-27
 * @memberof dc_reactions_t
 * @param reactions The object to free.
 *     If NULL is given, nothing is done.
@@ -6261,18 +6267,6 @@ void dc_event_unref(dc_event_t* event);
 #define DC_EVENT_SELFAVATAR_CHANGED               2110


-/**
- * A multi-device synced config value changed. Maybe the app needs to refresh smth. For uniformity
- * this is emitted on the source device too. The value isn't reported, otherwise it would be logged
- * which might not be good for privacy. You can get the new value with
- * `dc_get_config(context, data2)`.
- *
- * @param data1 0
- * @param data2 (char*) Configuration key.
- */
-#define DC_EVENT_CONFIG_SYNCED                    2111
-
-
 /**
 * webxdc status update received.
 * To get the received status update, use dc_get_webxdc_status_updates() with
@@ -6297,16 +6291,6 @@ void dc_event_unref(dc_event_t* event);

 #define DC_EVENT_WEBXDC_INSTANCE_DELETED          2121

-/**
- * Tells that the Background fetch was completed (or timed out).
- *
- * This event acts as a marker, when you reach this event you can be sure
- * that all events emitted during the background fetch were processed.
- * 
- * This event is only emitted by the account manager
- */
-
-#define DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE  2200

 /**
 * @}
@@ -6637,7 +6621,7 @@ void dc_event_unref(dc_event_t* event);
 /// - %1$s will be replaced by the name of the verified contact
 #define DC_STR_CONTACT_VERIFIED           35

-/// "Cannot establish guaranteed end-to-end encryption with %1$s."
+/// "Cannot verify %1$s."
 ///
 /// Used in status messages.
 /// - %1$s will be replaced by the name of the contact that cannot be verified
@@ -7075,8 +7059,6 @@ void dc_event_unref(dc_event_t* event);
 /// "You added member %1$s."
 ///
 /// Used in status messages.
-///
-/// `%1$s` will be replaced by the added member's name.
 #define DC_STR_ADD_MEMBER_BY_YOU 128

 /// "Member %1$s added by %2$s."
@@ -7298,21 +7280,6 @@ void dc_event_unref(dc_event_t* event);
 /// Used as the first info messages in newly created groups.
 #define DC_STR_NEW_GROUP_SEND_FIRST_MESSAGE 172

-/// "Member %1$s added."
-///
-/// Used as info messages.
-///
-/// `%1$s` will be replaced by the added member's name.
-#define DC_STR_MESSAGE_ADD_MEMBER 173
-
-/// "Your email provider %1$s requires end-to-end encryption which is not setup yet."
-///
-/// Used as info messages when a message cannot be sent because it cannot be encrypted.
-///
-/// `%1$s` will be replaced by the provider's domain.
-#define DC_STR_INVALID_UNENCRYPTED_MAIL 174
-
-
 /**
 * @}
 */
--- a/deltachat-ffi/src/lib.rs
+++ b/deltachat-ffi/src/lib.rs
@@ -26,14 +26,16 @@ use anyhow::Context as _;
 use deltachat::chat::{ChatId, ChatVisibility, MessageListOptions, MuteDuration, ProtectionStatus};
 use deltachat::constants::DC_MSG_ID_LAST_SPECIAL;
 use deltachat::contact::{Contact, ContactId, Origin};
-use deltachat::context::{Context, ContextBuilder};
+use deltachat::context::Context;
 use deltachat::ephemeral::Timer as EphemeralTimer;
 use deltachat::imex::BackupProvider;
 use deltachat::key::preconfigure_keypair;
 use deltachat::message::MsgId;
+use deltachat::net::read_url_blob;
 use deltachat::qr_code_generator::{generate_backup_qr, get_securejoin_qr_svg};
 use deltachat::reaction::{get_msg_reactions, send_reaction, Reactions};
 use deltachat::stock_str::StockMessage;
+use deltachat::stock_str::StockStrings;
 use deltachat::webxdc::StatusUpdateSerial;
 use deltachat::*;
 use deltachat::{accounts::Accounts, log::LogExt};
@@ -103,11 +105,12 @@ pub unsafe extern "C" fn dc_context_new(
    let ctx = if blobdir.is_null() || *blobdir == 0 {
        // generate random ID as this functionality is not yet available on the C-api.
        let id = rand::thread_rng().gen();
-        block_on(
-            ContextBuilder::new(as_path(dbfile).to_path_buf())
-                .with_id(id)
-                .open(),
-        )
+        block_on(Context::new(
+            as_path(dbfile),
+            id,
+            Events::new(),
+            StockStrings::new(),
+        ))
    } else {
        eprintln!("blobdir can not be defined explicitly anymore");
        return ptr::null_mut();
@@ -131,11 +134,12 @@ pub unsafe extern "C" fn dc_context_new_closed(dbfile: *const libc::c_char) -> *
    }

    let id = rand::thread_rng().gen();
-    match block_on(
-        ContextBuilder::new(as_path(dbfile).to_path_buf())
-            .with_id(id)
-            .build(),
-    ) {
+    match block_on(Context::new_closed(
+        as_path(dbfile),
+        id,
+        Events::new(),
+        StockStrings::new(),
+    )) {
        Ok(context) => Box::into_raw(Box::new(context)),
        Err(err) => {
            eprintln!("failed to create context: {err:#}");
@@ -384,7 +388,7 @@ pub unsafe extern "C" fn dc_get_connectivity(context: *const dc_context_t) -> li
        return 0;
    }
    let ctx = &*context;
-    block_on(ctx.get_connectivity()) as u32 as libc::c_int
+    block_on(async move { ctx.get_connectivity().await as u32 as libc::c_int })
 }

 #[no_mangle]
@@ -407,16 +411,6 @@ pub unsafe extern "C" fn dc_get_connectivity_html(
    })
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_get_push_state(context: *const dc_context_t) -> libc::c_int {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_get_push_state()");
-        return 0;
-    }
-    let ctx = &*context;
-    block_on(ctx.push_state()) as libc::c_int
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_all_work_done(context: *mut dc_context_t) -> libc::c_int {
    if context.is_null() {
@@ -563,10 +557,8 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
        EventType::SecurejoinJoinerProgress { .. } => 2061,
        EventType::ConnectivityChanged => 2100,
        EventType::SelfavatarChanged => 2110,
-        EventType::ConfigSynced { .. } => 2111,
        EventType::WebxdcStatusUpdate { .. } => 2120,
        EventType::WebxdcInstanceDeleted { .. } => 2121,
-        EventType::AccountsBackgroundFetchDone => 2200,
    }
 }

@@ -592,10 +584,8 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
        | EventType::Error(_)
        | EventType::ConnectivityChanged
        | EventType::SelfavatarChanged
-        | EventType::ConfigSynced { .. }
        | EventType::IncomingMsgBunch { .. }
-        | EventType::ErrorSelfNotInGroup(_)
-        | EventType::AccountsBackgroundFetchDone => 0,
+        | EventType::ErrorSelfNotInGroup(_) => 0,
        EventType::MsgsChanged { chat_id, .. }
        | EventType::ReactionsChanged { chat_id, .. }
        | EventType::IncomingMsg { chat_id, .. }
@@ -654,9 +644,7 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
        | EventType::ConnectivityChanged
        | EventType::WebxdcInstanceDeleted { .. }
        | EventType::IncomingMsgBunch { .. }
-        | EventType::SelfavatarChanged
-        | EventType::AccountsBackgroundFetchDone
-        | EventType::ConfigSynced { .. } => 0,
+        | EventType::SelfavatarChanged => 0,
        EventType::ChatModified(_) => 0,
        EventType::MsgsChanged { msg_id, .. }
        | EventType::ReactionsChanged { msg_id, .. }
@@ -718,7 +706,6 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
        | EventType::SelfavatarChanged
        | EventType::WebxdcStatusUpdate { .. }
        | EventType::WebxdcInstanceDeleted { .. }
-        | EventType::AccountsBackgroundFetchDone
        | EventType::ChatEphemeralTimerModified { .. } => ptr::null_mut(),
        EventType::ConfigureProgress { comment, .. } => {
            if let Some(comment) = comment {
@@ -736,10 +723,6 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
            .to_c_string()
            .unwrap_or_default()
            .into_raw(),
-        EventType::ConfigSynced { key } => {
-            let data2 = key.to_string().to_c_string().unwrap_or_default();
-            data2.into_raw()
-        }
    }
 }

@@ -4130,26 +4113,10 @@ pub unsafe extern "C" fn dc_contact_is_verified(contact: *mut dc_contact_t) -> l
    let ffi_contact = &*contact;
    let ctx = &*ffi_contact.context;

-    if block_on(ffi_contact.contact.is_verified(ctx))
+    block_on(ffi_contact.contact.is_verified(ctx))
        .context("is_verified failed")
        .log_err(ctx)
-        .unwrap_or_default()
-    {
-        // Return value is essentially a boolean,
-        // but we return 2 for true for backwards compatibility.
-        2
-    } else {
-        0
-    }
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_contact_is_bot(contact: *mut dc_contact_t) -> libc::c_int {
-    if contact.is_null() {
-        eprintln!("ignoring careless call to dc_contact_is_bot()");
-        return 0;
-    }
-    (*contact).contact.is_bot() as libc::c_int
+        .unwrap_or_default() as libc::c_int
 }

 #[no_mangle]
@@ -4623,6 +4590,96 @@ pub unsafe extern "C" fn dc_provider_unref(provider: *mut dc_provider_t) {
    // this may change once we start localizing string.
 }

+// dc_http_response_t
+
+pub type dc_http_response_t = net::HttpResponse;
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_get_http_response(
+    context: *const dc_context_t,
+    url: *const libc::c_char,
+) -> *mut dc_http_response_t {
+    if context.is_null() || url.is_null() {
+        eprintln!("ignoring careless call to dc_get_http_response()");
+        return ptr::null_mut();
+    }
+
+    let context = &*context;
+    let url = to_string_lossy(url);
+    if let Ok(response) = block_on(read_url_blob(context, &url))
+        .context("read_url_blob")
+        .log_err(context)
+    {
+        Box::into_raw(Box::new(response))
+    } else {
+        ptr::null_mut()
+    }
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_http_response_get_mimetype(
+    response: *const dc_http_response_t,
+) -> *mut libc::c_char {
+    if response.is_null() {
+        eprintln!("ignoring careless call to dc_http_response_get_mimetype()");
+        return ptr::null_mut();
+    }
+
+    let response = &*response;
+    response.mimetype.strdup()
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_http_response_get_encoding(
+    response: *const dc_http_response_t,
+) -> *mut libc::c_char {
+    if response.is_null() {
+        eprintln!("ignoring careless call to dc_http_response_get_encoding()");
+        return ptr::null_mut();
+    }
+
+    let response = &*response;
+    response.encoding.strdup()
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_http_response_get_blob(
+    response: *const dc_http_response_t,
+) -> *mut libc::c_char {
+    if response.is_null() {
+        eprintln!("ignoring careless call to dc_http_response_get_blob()");
+        return ptr::null_mut();
+    }
+
+    let response = &*response;
+    let blob_len = response.blob.len();
+    let ptr = libc::malloc(blob_len);
+    libc::memcpy(ptr, response.blob.as_ptr() as *mut libc::c_void, blob_len);
+    ptr as *mut libc::c_char
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_http_response_get_size(
+    response: *const dc_http_response_t,
+) -> libc::size_t {
+    if response.is_null() {
+        eprintln!("ignoring careless call to dc_http_response_get_size()");
+        return 0;
+    }
+
+    let response = &*response;
+    response.blob.len()
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_http_response_unref(response: *mut dc_http_response_t) {
+    if response.is_null() {
+        eprintln!("ignoring careless call to dc_http_response_unref()");
+        return;
+    }
+    drop(Box::from_raw(response));
+}
+
 // -- Accounts

 /// Reader-writer lock wrapper for accounts manager to guarantee thread safety when using
@@ -4909,49 +4966,6 @@ pub unsafe extern "C" fn dc_accounts_maybe_network_lost(accounts: *mut dc_accoun
    block_on(async move { accounts.write().await.maybe_network_lost().await });
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_accounts_background_fetch(
-    accounts: *mut dc_accounts_t,
-    timeout_in_seconds: u64,
-) -> libc::c_int {
-    if accounts.is_null() || timeout_in_seconds <= 2 {
-        eprintln!("ignoring careless call to dc_accounts_background_fetch()");
-        return 0;
-    }
-
-    let accounts = &*accounts;
-    block_on(async move {
-        let accounts = accounts.read().await;
-        accounts
-            .background_fetch(Duration::from_secs(timeout_in_seconds))
-            .await;
-    });
-    1
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_accounts_set_push_device_token(
-    accounts: *mut dc_accounts_t,
-    token: *const libc::c_char,
-) {
-    if accounts.is_null() {
-        eprintln!("ignoring careless call to dc_accounts_set_push_device_token()");
-        return;
-    }
-
-    let accounts = &*accounts;
-    let token = to_string_lossy(token);
-
-    block_on(async move {
-        let mut accounts = accounts.write().await;
-        if let Err(err) = accounts.set_push_device_token(&token).await {
-            accounts.emit_event(EventType::Error(format!(
-                "Failed to set notify token: {err:#}."
-            )));
-        }
-    })
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_accounts_get_event_emitter(
    accounts: *mut dc_accounts_t,
--- a/deltachat-jsonrpc/Cargo.toml
+++ b/deltachat-jsonrpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.136.0"
+version = "1.131.6"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
 default-run = "deltachat-jsonrpc-server"
@@ -17,20 +17,20 @@ deltachat = { path = ".." }
 num-traits = "0.2"
 schemars = "0.8.13"
 serde = { version = "1.0", features = ["derive"] }
-tempfile = "3.10.1"
+tempfile = "3.8.0"
 log = "0.4"
 async-channel = { version = "2.0.0" }
-futures = { version = "0.3.30" }
-serde_json = "1"
+futures = { version = "0.3.28" }
+serde_json = "1.0.105"
 yerpc = { version = "0.5.2", features = ["anyhow_expose", "openrpc"] }
 typescript-type-def = { version = "0.5.8", features = ["json_value"] }
 tokio = { version = "1.33.0" }
 sanitize-filename = "0.5"
-walkdir = "2.5.0"
+walkdir = "2.3.3"
 base64 = "0.21"

 # optional dependencies
-axum = { version = "0.7", optional = true, features = ["ws"] }
+axum = { version = "0.6.20", optional = true, features = ["ws"] }
 env_logger = { version = "0.10.0", optional = true }

 [dev-dependencies]
--- a/deltachat-jsonrpc/src/api.rs
+++ b/deltachat-jsonrpc/src/api.rs
@@ -231,27 +231,13 @@ impl CommandApi {
        Ok(())
    }

-    /// Performs a background fetch for all accounts in parallel with a timeout.
-    ///
-    /// The `AccountsBackgroundFetchDone` event is emitted at the end even in case of timeout.
-    /// Process all events until you get this one and you can safely return to the background
-    /// without forgetting to create notifications caused by timing race conditions.
-    async fn accounts_background_fetch(&self, timeout_in_seconds: f64) -> Result<()> {
-        self.accounts
-            .write()
-            .await
-            .background_fetch(std::time::Duration::from_secs_f64(timeout_in_seconds))
-            .await;
-        Ok(())
-    }
-
    // ---------------------------------------------
    // Methods that work on individual accounts
    // ---------------------------------------------

    /// Starts background tasks for a single account.
    async fn start_io(&self, account_id: u32) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
+        let mut ctx = self.get_context(account_id).await?;
        ctx.start_io().await;
        Ok(())
    }
@@ -325,11 +311,6 @@ impl CommandApi {
        ctx.get_info().await
    }

-    async fn draft_self_report(&self, account_id: u32) -> Result<u32> {
-        let ctx = self.get_context(account_id).await?;
-        Ok(ctx.draft_self_report().await?.to_u32())
-    }
-
    /// Sets the given configuration key.
    async fn set_config(&self, account_id: u32, key: String, value: Option<String>) -> Result<()> {
        let ctx = self.get_context(account_id).await?;
@@ -402,7 +383,7 @@ impl CommandApi {
    /// Configures this account with the currently set parameters.
    /// Setup the credential config before calling this.
    async fn configure(&self, account_id: u32) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
+        let mut ctx = self.get_context(account_id).await?;
        ctx.stop_io().await;
        let result = ctx.configure().await;
        if result.is_err() {
@@ -915,35 +896,19 @@ impl CommandApi {
            .to_u32())
    }

-    /// Add a message to the device-chat.
-    /// Device-messages usually contain update information
-    /// and some hints that are added during the program runs, multi-device etc.
-    /// The device-message may be defined by a label;
-    /// if a message with the same label was added or skipped before,
-    /// the message is not added again, even if the message was deleted in between.
-    /// If needed, the device-chat is created before.
-    ///
-    /// Sends the `MsgsChanged` event on success.
-    ///
-    /// Setting msg to None will prevent the device message with this label from being added in the future.
+    // for now only text messages, because we only used text messages in desktop thusfar
    async fn add_device_message(
        &self,
        account_id: u32,
        label: String,
-        msg: Option<MessageData>,
-    ) -> Result<Option<u32>> {
+        text: String,
+    ) -> Result<u32> {
        let ctx = self.get_context(account_id).await?;
-        if let Some(msg) = msg {
-            let mut message = msg.create_message(&ctx).await?;
-            let message_id =
-                deltachat::chat::add_device_msg(&ctx, Some(&label), Some(&mut message)).await?;
-            if !message_id.is_unset() {
-                return Ok(Some(message_id.to_u32()));
-            }
-        } else {
-            deltachat::chat::add_device_msg(&ctx, Some(&label), None).await?;
-        }
-        Ok(None)
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text(text);
+        let message_id =
+            deltachat::chat::add_device_msg(&ctx, Some(&label), Some(&mut msg)).await?;
+        Ok(message_id.to_u32())
    }

    ///  Mark all messages in a chat as _noticed_.
@@ -1843,7 +1808,38 @@ impl CommandApi {

    async fn send_msg(&self, account_id: u32, chat_id: u32, data: MessageData) -> Result<u32> {
        let ctx = self.get_context(account_id).await?;
-        let mut message = data.create_message(&ctx).await?;
+        let mut message = Message::new(if let Some(viewtype) = data.viewtype {
+            viewtype.into()
+        } else if data.file.is_some() {
+            Viewtype::File
+        } else {
+            Viewtype::Text
+        });
+        message.set_text(data.text.unwrap_or_default());
+        if data.html.is_some() {
+            message.set_html(data.html);
+        }
+        if data.override_sender_name.is_some() {
+            message.set_override_sender_name(data.override_sender_name);
+        }
+        if let Some(file) = data.file {
+            message.set_file(file, None);
+        }
+        if let Some((latitude, longitude)) = data.location {
+            message.set_location(latitude, longitude);
+        }
+        if let Some(id) = data.quoted_message_id {
+            message
+                .set_quote(
+                    &ctx,
+                    Some(
+                        &Message::load_from_db(&ctx, MsgId::new(id))
+                            .await
+                            .context("message to quote could not be loaded")?,
+                    ),
+                )
+                .await?;
+        }
        let msg_id = chat::send_msg(&ctx, ChatId::new(chat_id), &mut message)
            .await?
            .to_u32();
@@ -2125,6 +2121,13 @@ async fn set_config(
            value,
        )
        .await?;
+
+        match key {
+            "sentbox_watch" | "mvbox_move" | "only_fetch_mvbox" => {
+                ctx.restart_io_if_running().await;
+            }
+            _ => {}
+        }
    }
    Ok(())
 }
--- a/deltachat-jsonrpc/src/api/types/chat.rs
+++ b/deltachat-jsonrpc/src/api/types/chat.rs
@@ -85,7 +85,7 @@ impl FullChat {
        let can_send = chat.can_send(context).await?;

        let was_seen_recently = if chat.get_type() == Chattype::Single {
-            match contact_ids.first() {
+            match contact_ids.get(0) {
                Some(contact) => Contact::get_by_id(context, *contact)
                    .await
                    .context("failed to load contact for was_seen_recently")?
--- a/deltachat-jsonrpc/src/api/types/chat_list.rs
+++ b/deltachat-jsonrpc/src/api/types/chat_list.rs
@@ -102,7 +102,7 @@ pub(crate) async fn get_chat_list_item_by_id(
    let self_in_group = chat_contacts.contains(&ContactId::SELF);

    let (dm_chat_contact, was_seen_recently) = if chat.get_type() == Chattype::Single {
-        let contact = chat_contacts.first();
+        let contact = chat_contacts.get(0);
        let was_seen_recently = match contact {
            Some(contact) => Contact::get_by_id(ctx, *contact)
                .await
--- a/deltachat-jsonrpc/src/api/types/contact.rs
+++ b/deltachat-jsonrpc/src/api/types/contact.rs
@@ -1,4 +1,5 @@
 use anyhow::Result;
+use deltachat::contact::VerifiedStatus;
 use deltachat::context::Context;
 use serde::Serialize;
 use typescript_type_def::TypeDef;
@@ -45,9 +46,6 @@ pub struct ContactObject {
    /// the contact's last seen timestamp
    last_seen: i64,
    was_seen_recently: bool,
-
-    /// If the contact is a bot.
-    is_bot: bool,
 }

 impl ContactObject {
@@ -59,7 +57,7 @@ impl ContactObject {
            Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
            None => None,
        };
-        let is_verified = contact.is_verified(context).await?;
+        let is_verified = contact.is_verified(context).await? == VerifiedStatus::BidirectVerified;
        let is_profile_verified = contact.is_profile_verified(context).await?;

        let verifier_id = contact
@@ -83,7 +81,6 @@ impl ContactObject {
            verifier_id,
            last_seen: contact.last_seen(),
            was_seen_recently: contact.was_seen_recently(),
-            is_bot: contact.is_bot(),
        })
    }
 }
--- a/deltachat-jsonrpc/src/api/types/events.rs
+++ b/deltachat-jsonrpc/src/api/types/events.rs
@@ -28,37 +28,55 @@ pub enum EventType {
    ///
    /// This event should *not* be reported to the end-user using a popup or something like
    /// that.
-    Info { msg: String },
+    Info {
+        msg: String,
+    },

    /// Emitted when SMTP connection is established and login was successful.
-    SmtpConnected { msg: String },
+    SmtpConnected {
+        msg: String,
+    },

    /// Emitted when IMAP connection is established and login was successful.
-    ImapConnected { msg: String },
+    ImapConnected {
+        msg: String,
+    },

    /// Emitted when a message was successfully sent to the SMTP server.
-    SmtpMessageSent { msg: String },
+    SmtpMessageSent {
+        msg: String,
+    },

    /// Emitted when an IMAP message has been marked as deleted
-    ImapMessageDeleted { msg: String },
+    ImapMessageDeleted {
+        msg: String,
+    },

    /// Emitted when an IMAP message has been moved
-    ImapMessageMoved { msg: String },
+    ImapMessageMoved {
+        msg: String,
+    },

    /// Emitted before going into IDLE on the Inbox folder.
    ImapInboxIdle,

    /// Emitted when an new file in the $BLOBDIR was created
-    NewBlobFile { file: String },
+    NewBlobFile {
+        file: String,
+    },

    /// Emitted when an file in the $BLOBDIR was deleted
-    DeletedBlobFile { file: String },
+    DeletedBlobFile {
+        file: String,
+    },

    /// The library-user should write a warning string to the log.
    ///
    /// This event should *not* be reported to the end-user using a popup or something like
    /// that.
-    Warning { msg: String },
+    Warning {
+        msg: String,
+    },

    /// The library-user should report an error to the end-user.
    ///
@@ -70,14 +88,18 @@ pub enum EventType {
    /// it might be better to delay showing these events until the function has really
    /// failed (returned false). It should be sufficient to report only the *last* error
    /// in a messasge box then.
-    Error { msg: String },
+    Error {
+        msg: String,
+    },

    /// An action cannot be performed because the user is not in the group.
    /// Reported eg. after a call to
    /// setChatName(), setChatProfileImage(),
    /// addContactToChat(), removeContactFromChat(),
    /// and messages sending functions.
-    ErrorSelfNotInGroup { msg: String },
+    ErrorSelfNotInGroup {
+        msg: String,
+    },

    /// Messages or chats changed.  One or more messages or chats changed for various
    /// reasons in the database:
@@ -88,7 +110,10 @@ pub enum EventType {
    /// `chatId` is set if only a single chat is affected by the changes, otherwise 0.
    /// `msgId` is set if only a single message is affected by the changes, otherwise 0.
    #[serde(rename_all = "camelCase")]
-    MsgsChanged { chat_id: u32, msg_id: u32 },
+    MsgsChanged {
+        chat_id: u32,
+        msg_id: u32,
+    },

    /// Reactions for the message changed.
    #[serde(rename_all = "camelCase")]
@@ -103,7 +128,10 @@ pub enum EventType {
    ///
    /// There is no extra #DC_EVENT_MSGS_CHANGED event send together with this event.
    #[serde(rename_all = "camelCase")]
-    IncomingMsg { chat_id: u32, msg_id: u32 },
+    IncomingMsg {
+        chat_id: u32,
+        msg_id: u32,
+    },

    /// Downloading a bunch of messages just finished. This is an experimental
    /// event to allow the UI to only show one notification per message bunch,
@@ -111,31 +139,47 @@ pub enum EventType {
    ///
    /// msg_ids contains the message ids.
    #[serde(rename_all = "camelCase")]
-    IncomingMsgBunch { msg_ids: Vec<u32> },
+    IncomingMsgBunch {
+        msg_ids: Vec<u32>,
+    },

    /// Messages were seen or noticed.
    /// chat id is always set.
    #[serde(rename_all = "camelCase")]
-    MsgsNoticed { chat_id: u32 },
+    MsgsNoticed {
+        chat_id: u32,
+    },

    /// A single message is sent successfully. State changed from  DC_STATE_OUT_PENDING to
    /// DC_STATE_OUT_DELIVERED, see `Message.state`.
    #[serde(rename_all = "camelCase")]
-    MsgDelivered { chat_id: u32, msg_id: u32 },
+    MsgDelivered {
+        chat_id: u32,
+        msg_id: u32,
+    },

    /// A single message could not be sent. State changed from DC_STATE_OUT_PENDING or DC_STATE_OUT_DELIVERED to
    /// DC_STATE_OUT_FAILED, see `Message.state`.
    #[serde(rename_all = "camelCase")]
-    MsgFailed { chat_id: u32, msg_id: u32 },
+    MsgFailed {
+        chat_id: u32,
+        msg_id: u32,
+    },

    /// A single message is read by the receiver. State changed from DC_STATE_OUT_DELIVERED to
    /// DC_STATE_OUT_MDN_RCVD, see `Message.state`.
    #[serde(rename_all = "camelCase")]
-    MsgRead { chat_id: u32, msg_id: u32 },
+    MsgRead {
+        chat_id: u32,
+        msg_id: u32,
+    },

    /// A single message is deleted.
    #[serde(rename_all = "camelCase")]
-    MsgDeleted { chat_id: u32, msg_id: u32 },
+    MsgDeleted {
+        chat_id: u32,
+        msg_id: u32,
+    },

    /// Chat changed.  The name or the image of a chat group was changed or members were added or removed.
    /// Or the verify state of a chat has changed.
@@ -145,17 +189,24 @@ pub enum EventType {
    /// This event does not include ephemeral timer modification, which
    /// is a separate event.
    #[serde(rename_all = "camelCase")]
-    ChatModified { chat_id: u32 },
+    ChatModified {
+        chat_id: u32,
+    },

    /// Chat ephemeral timer changed.
    #[serde(rename_all = "camelCase")]
-    ChatEphemeralTimerModified { chat_id: u32, timer: u32 },
+    ChatEphemeralTimerModified {
+        chat_id: u32,
+        timer: u32,
+    },

    /// Contact(s) created, renamed, blocked or deleted.
    ///
    /// @param data1 (int) If set, this is the contact_id of an added contact that should be selected.
    #[serde(rename_all = "camelCase")]
-    ContactsChanged { contact_id: Option<u32> },
+    ContactsChanged {
+        contact_id: Option<u32>,
+    },

    /// Location of one or more contact has changed.
    ///
@@ -163,7 +214,9 @@ pub enum EventType {
    ///     If the locations of several contacts have been changed,
    ///     this parameter is set to `None`.
    #[serde(rename_all = "camelCase")]
-    LocationChanged { contact_id: Option<u32> },
+    LocationChanged {
+        contact_id: Option<u32>,
+    },

    /// Inform about the configuration progress started by configure().
    ConfigureProgress {
@@ -181,7 +234,9 @@ pub enum EventType {
    /// @param data1 (usize) 0=error, 1-999=progress in permille, 1000=success and done
    /// @param data2 0
    #[serde(rename_all = "camelCase")]
-    ImexProgress { progress: usize },
+    ImexProgress {
+        progress: usize,
+    },

    /// A file has been exported. A file has been written by imex().
    /// This event may be sent multiple times by a single call to imex().
@@ -191,7 +246,9 @@ pub enum EventType {
    ///
    /// @param data2 0
    #[serde(rename_all = "camelCase")]
-    ImexFileWritten { path: String },
+    ImexFileWritten {
+        path: String,
+    },

    /// Progress information of a secure-join handshake from the view of the inviter
    /// (Alice, the person who shows the QR code).
@@ -206,7 +263,10 @@ pub enum EventType {
    ///     800=vg-member-added-received received, shown as "bob@addr securely joined GROUP", only sent for the verified-group-protocol.
    ///     1000=Protocol finished for this contact.
    #[serde(rename_all = "camelCase")]
-    SecurejoinInviterProgress { contact_id: u32, progress: usize },
+    SecurejoinInviterProgress {
+        contact_id: u32,
+        progress: usize,
+    },

    /// Progress information of a secure-join handshake from the view of the joiner
    /// (Bob, the person who scans the QR code).
@@ -217,7 +277,10 @@ pub enum EventType {
    ///     400=vg-/vc-request-with-auth sent, typically shown as "alice@addr verified, introducing myself."
    ///     (Bob has verified alice and waits until Alice does the same for him)
    #[serde(rename_all = "camelCase")]
-    SecurejoinJoinerProgress { contact_id: u32, progress: usize },
+    SecurejoinJoinerProgress {
+        contact_id: u32,
+        progress: usize,
+    },

    /// The connectivity to the server changed.
    /// This means that you should refresh the connectivity view
@@ -225,17 +288,8 @@ pub enum EventType {
    /// getConnectivityHtml() for details.
    ConnectivityChanged,

-    /// Deprecated by `ConfigSynced`.
    SelfavatarChanged,

-    /// A multi-device synced config value changed. Maybe the app needs to refresh smth. For
-    /// uniformity this is emitted on the source device too. The value isn't here, otherwise it
-    /// would be logged which might not be good for privacy.
-    ConfigSynced {
-        /// Configuration key.
-        key: String,
-    },
-
    #[serde(rename_all = "camelCase")]
    WebxdcStatusUpdate {
        msg_id: u32,
@@ -244,14 +298,9 @@ pub enum EventType {

    /// Inform that a message containing a webxdc instance has been deleted
    #[serde(rename_all = "camelCase")]
-    WebxdcInstanceDeleted { msg_id: u32 },
-
-    /// Tells that the Background fetch was completed (or timed out).
-    /// This event acts as a marker, when you reach this event you can be sure
-    /// that all events emitted during the background fetch were processed.
-    ///
-    /// This event is only emitted by the account manager
-    AccountsBackgroundFetchDone,
+    WebxdcInstanceDeleted {
+        msg_id: u32,
+    },
 }

 impl From<CoreEventType> for EventType {
@@ -347,9 +396,6 @@ impl From<CoreEventType> for EventType {
            },
            CoreEventType::ConnectivityChanged => ConnectivityChanged,
            CoreEventType::SelfavatarChanged => SelfavatarChanged,
-            CoreEventType::ConfigSynced { key } => ConfigSynced {
-                key: key.to_string(),
-            },
            CoreEventType::WebxdcStatusUpdate {
                msg_id,
                status_update_serial,
@@ -360,7 +406,6 @@ impl From<CoreEventType> for EventType {
            CoreEventType::WebxdcInstanceDeleted { msg_id } => WebxdcInstanceDeleted {
                msg_id: msg_id.to_u32(),
            },
-            CoreEventType::AccountsBackgroundFetchDone => AccountsBackgroundFetchDone,
        }
    }
 }
--- a/deltachat-jsonrpc/src/api/types/message.rs
+++ b/deltachat-jsonrpc/src/api/types/message.rs
@@ -34,6 +34,10 @@ pub struct MessageObject {
    quote: Option<MessageQuote>,
    parent_id: Option<u32>,

+    /// Contents of `Message-ID` header.
+    /// Possibly a fake unique string if incoming message did not have a `Message-ID` header.
+    message_id: String,
+
    text: String,
    has_location: bool,
    has_html: bool,
@@ -174,6 +178,8 @@ impl MessageObject {
            Some(reactions.into())
        };

+        let message_id = message.rfc724_mid().to_string();
+
        Ok(MessageObject {
            id: msg_id.to_u32(),
            chat_id: message.get_chat_id().to_u32(),
@@ -233,6 +239,8 @@ impl MessageObject {
            download_state,

            reactions,
+
+            message_id,
        })
    }
 }
@@ -345,7 +353,6 @@ pub enum SystemMessageType {
    SecurejoinMessage,
    LocationStreamingEnabled,
    LocationOnly,
-    InvalidUnencryptedMail,

    /// Chat ephemeral message timer is changed.
    EphemeralTimerChanged,
@@ -386,7 +393,6 @@ impl From<deltachat::mimeparser::SystemMessage> for SystemMessageType {
            SystemMessage::MultiDeviceSync => SystemMessageType::MultiDeviceSync,
            SystemMessage::WebxdcStatusUpdate => SystemMessageType::WebxdcStatusUpdate,
            SystemMessage::WebxdcInfoMessage => SystemMessageType::WebxdcInfoMessage,
-            SystemMessage::InvalidUnencryptedMail => SystemMessageType::InvalidUnencryptedMail,
        }
    }
 }
@@ -548,44 +554,6 @@ pub struct MessageData {
    pub quoted_message_id: Option<u32>,
 }

-impl MessageData {
-    pub(crate) async fn create_message(self, context: &Context) -> Result<Message> {
-        let mut message = Message::new(if let Some(viewtype) = self.viewtype {
-            viewtype.into()
-        } else if self.file.is_some() {
-            Viewtype::File
-        } else {
-            Viewtype::Text
-        });
-        message.set_text(self.text.unwrap_or_default());
-        if self.html.is_some() {
-            message.set_html(self.html);
-        }
-        if self.override_sender_name.is_some() {
-            message.set_override_sender_name(self.override_sender_name);
-        }
-        if let Some(file) = self.file {
-            message.set_file(file, None);
-        }
-        if let Some((latitude, longitude)) = self.location {
-            message.set_location(latitude, longitude);
-        }
-        if let Some(id) = self.quoted_message_id {
-            message
-                .set_quote(
-                    context,
-                    Some(
-                        &Message::load_from_db(context, MsgId::new(id))
-                            .await
-                            .context("message to quote could not be loaded")?,
-                    ),
-                )
-                .await?;
-        }
-        Ok(message)
-    }
-}
-
 #[derive(Serialize, TypeDef, schemars::JsonSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct MessageReadReceipt {
--- a/deltachat-jsonrpc/src/webserver.rs
+++ b/deltachat-jsonrpc/src/webserver.rs
@@ -33,8 +33,10 @@ async fn main() -> Result<(), std::io::Error> {

    let addr = SocketAddr::from(([127, 0, 0, 1], port));
    log::info!("JSON-RPC WebSocket server listening on {}", addr);
-    let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
-    axum::serve(listener, app).await.unwrap();
+    axum::Server::bind(&addr)
+        .serve(app.into_make_service())
+        .await
+        .unwrap();

    Ok(())
 }
--- a/deltachat-jsonrpc/typescript/package.json
+++ b/deltachat-jsonrpc/typescript/package.json
@@ -53,5 +53,5 @@
  },
  "type": "module",
  "types": "dist/deltachat.d.ts",
-  "version": "1.136.0"
+  "version": "1.131.6"
 }
--- a/deltachat-repl/Cargo.toml
+++ b/deltachat-repl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-repl"
-version = "1.136.0"
+version = "1.131.6"
 license = "MPL-2.0"
 edition = "2021"

@@ -9,10 +9,10 @@ ansi_term = "0.12.1"
 anyhow = "1"
 deltachat = { path = "..", features = ["internals"]}
 dirs = "5"
-log = "0.4.21"
+log = "0.4.20"
 pretty_env_logger = "0.5"
-rusqlite = "0.31"
-rustyline = "13"
+rusqlite = "0.30"
+rustyline = "12"
 tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }

 [features]
--- a/deltachat-repl/src/cmdline.rs
+++ b/deltachat-repl/src/cmdline.rs
@@ -284,8 +284,13 @@ async fn log_contactlist(context: &Context, contacts: &[ContactId]) -> Result<()
        let contact = Contact::get_by_id(context, *contact_id).await?;
        let name = contact.get_display_name();
        let addr = contact.get_addr();
-        let verified_str = if contact.is_verified(context).await? {
-            " √"
+        let verified_state = contact.is_verified(context).await?;
+        let verified_str = if VerifiedStatus::Unverified != verified_state {
+            if verified_state == VerifiedStatus::BidirectVerified {
+                " √√"
+            } else {
+                " √"
+            }
        } else {
            ""
        };
--- a/deltachat-repl/src/main.rs
+++ b/deltachat-repl/src/main.rs
@@ -9,6 +9,7 @@ extern crate deltachat;

 use std::borrow::Cow::{self, Borrowed, Owned};
 use std::io::{self, Write};
+use std::path::Path;
 use std::process::Command;

 use ansi_term::Color;
@@ -19,7 +20,8 @@ use deltachat::context::*;
 use deltachat::oauth2::*;
 use deltachat::qr_code_generator::get_securejoin_qr_svg;
 use deltachat::securejoin::*;
-use deltachat::EventType;
+use deltachat::stock_str::StockStrings;
+use deltachat::{EventType, Events};
 use log::{error, info, warn};
 use rustyline::completion::{Completer, FilenameCompleter, Pair};
 use rustyline::error::ReadlineError;
@@ -297,8 +299,8 @@ impl Highlighter for DcHelper {
        self.highlighter.highlight(line, pos)
    }

-    fn highlight_char(&self, line: &str, pos: usize, forced: bool) -> bool {
-        self.highlighter.highlight_char(line, pos, forced)
+    fn highlight_char(&self, line: &str, pos: usize) -> bool {
+        self.highlighter.highlight_char(line, pos)
    }
 }

@@ -310,10 +312,7 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
        println!("Error: Bad arguments, expected [db-name].");
        bail!("No db-name specified");
    }
-    let context = ContextBuilder::new(args[1].clone().into())
-        .with_id(1)
-        .open()
-        .await?;
+    let context = Context::new(Path::new(&args[1]), 0, Events::new(), StockStrings::new()).await?;

    let events = context.get_event_emitter();
    tokio::task::spawn(async move {
@@ -402,7 +401,7 @@ enum ExitResult {

 async fn handle_cmd(
    line: &str,
-    ctx: Context,
+    mut ctx: Context,
    selected_chat: &mut ChatId,
 ) -> Result<ExitResult, Error> {
    let mut args = line.splitn(2, ' ');
@@ -482,10 +481,7 @@ async fn handle_cmd(

 #[tokio::main]
 async fn main() -> Result<(), Error> {
-    pretty_env_logger::formatted_timed_builder()
-        .parse_default_env()
-        .filter_module("deltachat_repl", log::LevelFilter::Info)
-        .init();
+    let _ = pretty_env_logger::try_init();

    let args = std::env::args().collect();
    start(args).await?;
--- a/deltachat-rpc-client/src/deltachat_rpc_client/init.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/init.py
@@ -1,5 +1,4 @@
 """Delta Chat JSON-RPC high-level API"""
-
 from ._utils import AttrDict, run_bot_cli, run_client_cli
 from .account import Account
 from .chat import Chat
--- a/deltachat-rpc-client/src/deltachat_rpc_client/account.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/account.py
@@ -300,13 +300,3 @@ class Account:
    def import_backup(self, path, passphrase: str = "") -> None:
        """Import backup."""
        self._rpc.import_backup(self.id, str(path), passphrase)
-
-    def export_self_keys(self, path) -> None:
-        """Export keys."""
-        passphrase = ""  # Setting passphrase is currently not supported.
-        self._rpc.export_self_keys(self.id, str(path), passphrase)
-
-    def import_self_keys(self, path) -> None:
-        """Import keys."""
-        passphrase = ""  # Importing passphrase-protected keys is currently not supported.
-        self._rpc.import_self_keys(self.id, str(path), passphrase)
--- a/deltachat-rpc-client/src/deltachat_rpc_client/client.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/client.py
@@ -1,5 +1,4 @@
 """Event loop implementations offering high level event handling/hooking."""
-
 import logging
 from typing import (
    TYPE_CHECKING,
--- a/deltachat-rpc-client/src/deltachat_rpc_client/events.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/events.py
@@ -1,5 +1,4 @@
 """High-level classes for event processing and filtering."""
-
 import re
 from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING, Callable, Iterable, Iterator, Optional, Set, Tuple, Union
--- a/deltachat-rpc-client/tests/test_securejoin.py
+++ b/deltachat-rpc-client/tests/test_securejoin.py
@@ -1,10 +1,9 @@
 import logging

-import pytest
 from deltachat_rpc_client import Chat, SpecialContactId


-def test_qr_setup_contact(acfactory, tmp_path) -> None:
+def test_qr_setup_contact(acfactory) -> None:
    alice, bob = acfactory.get_online_accounts(2)

    qr_code, _svg = alice.get_qr_code()
@@ -24,26 +23,13 @@ def test_qr_setup_contact(acfactory, tmp_path) -> None:
    bob_contact_alice_snapshot = bob_contact_alice.get_snapshot()
    assert bob_contact_alice_snapshot.is_verified

-    # Test that if Bob changes the key, backwards verification is lost.
-    logging.info("Bob 2 is created")
-    bob2 = acfactory.new_configured_account()
-    bob2.export_self_keys(tmp_path)

-    logging.info("Bob imports a key")
-    bob.import_self_keys(tmp_path / "private-key-default.asc")
-
-    assert bob.get_config("key_id") == "2"
-    bob_contact_alice_snapshot = bob_contact_alice.get_snapshot()
-    assert not bob_contact_alice_snapshot.is_verified
-
-
-@pytest.mark.parametrize("protect", [True, False])
-def test_qr_securejoin(acfactory, protect):
+def test_qr_securejoin(acfactory):
    alice, bob = acfactory.get_online_accounts(2)

    logging.info("Alice creates a verified group")
-    alice_chat = alice.create_group("Verified group", protect=protect)
-    assert alice_chat.get_basic_snapshot().is_protected == protect
+    alice_chat = alice.create_group("Verified group", protect=True)
+    assert alice_chat.get_basic_snapshot().is_protected

    logging.info("Bob joins verified group")
    qr_code, _svg = alice_chat.get_qr_code()
@@ -67,7 +53,7 @@ def test_qr_securejoin(acfactory, protect):

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

    # Test that Bob verified Alice's profile.
    bob_contact_alice = bob.get_contact_by_addr(alice.get_config("addr"))
@@ -164,21 +150,6 @@ def test_qr_readreceipt(acfactory) -> None:
    assert not bob.get_chat_by_contact(bob_contact_charlie)


-def test_setup_contact_resetup(acfactory) -> None:
-    """Tests that setup contact works after Alice resets the device and changes the key."""
-    alice, bob = acfactory.get_online_accounts(2)
-
-    qr_code, _svg = alice.get_qr_code()
-    bob.secure_join(qr_code)
-    bob.wait_for_securejoin_joiner_success()
-
-    alice = acfactory.resetup_account(alice)
-
-    qr_code, _svg = alice.get_qr_code()
-    bob.secure_join(qr_code)
-    bob.wait_for_securejoin_joiner_success()
-
-
 def test_verified_group_recovery(acfactory) -> None:
    """Tests verified group recovery by reverifying a member and sending a message in a group."""
    ac1, ac2, ac3 = acfactory.get_online_accounts(3)
@@ -190,7 +161,7 @@ def test_verified_group_recovery(acfactory) -> None:
    logging.info("ac2 joins verified group")
    qr_code, _svg = chat.get_qr_code()
    ac2.secure_join(qr_code)
-    ac2.wait_for_securejoin_joiner_success()
+    ac1.wait_for_securejoin_inviter_success()

    # ac1 has ac2 directly verified.
    ac1_contact_ac2 = ac1.get_contact_by_addr(ac2.get_config("addr"))
@@ -198,8 +169,7 @@ def test_verified_group_recovery(acfactory) -> None:

    logging.info("ac3 joins verified group")
    ac3_chat = ac3.secure_join(qr_code)
-    ac3.wait_for_securejoin_joiner_success()
-    ac3.wait_for_incoming_msg_event()  # Member added
+    ac1.wait_for_securejoin_inviter_success()

    logging.info("ac2 logs in on a new device")
    ac2 = acfactory.resetup_account(ac2)
@@ -207,7 +177,8 @@ def test_verified_group_recovery(acfactory) -> None:
    logging.info("ac2 reverifies with ac3")
    qr_code, _svg = ac3.get_qr_code()
    ac2.secure_join(qr_code)
-    ac2.wait_for_securejoin_joiner_success()
+
+    ac3.wait_for_securejoin_inviter_success()

    logging.info("ac3 sends a message to the group")
    assert len(ac3_chat.get_contacts()) == 3
@@ -254,7 +225,7 @@ def test_verified_group_member_added_recovery(acfactory) -> None:
    logging.info("ac2 joins verified group")
    qr_code, _svg = chat.get_qr_code()
    ac2.secure_join(qr_code)
-    ac2.wait_for_securejoin_joiner_success()
+    ac1.wait_for_securejoin_inviter_success()

    # ac1 has ac2 directly verified.
    ac1_contact_ac2 = ac1.get_contact_by_addr(ac2.get_config("addr"))
@@ -262,8 +233,7 @@ def test_verified_group_member_added_recovery(acfactory) -> None:

    logging.info("ac3 joins verified group")
    ac3_chat = ac3.secure_join(qr_code)
-    ac3.wait_for_securejoin_joiner_success()
-    ac3.wait_for_incoming_msg_event()  # Member added
+    ac1.wait_for_securejoin_inviter_success()

    logging.info("ac2 logs in on a new device")
    ac2 = acfactory.resetup_account(ac2)
@@ -271,7 +241,8 @@ def test_verified_group_member_added_recovery(acfactory) -> None:
    logging.info("ac2 reverifies with ac3")
    qr_code, _svg = ac3.get_qr_code()
    ac2.secure_join(qr_code)
-    ac2.wait_for_securejoin_joiner_success()
+
+    ac3.wait_for_securejoin_inviter_success()

    logging.info("ac3 sends a message to the group")
    assert len(ac3_chat.get_contacts()) == 3
@@ -458,124 +429,3 @@ def test_aeap_flow_verified(acfactory):
    assert ac1new.get_config("addr") in [
        contact.get_snapshot().address for contact in msg_in_2_snapshot.chat.get_contacts()
    ]
-
-
-def test_gossip_verification(acfactory) -> None:
-    alice, bob, carol = acfactory.get_online_accounts(3)
-
-    # Bob verifies Alice.
-    qr_code, _svg = alice.get_qr_code()
-    bob.secure_join(qr_code)
-    bob.wait_for_securejoin_joiner_success()
-
-    # Bob verifies Carol.
-    qr_code, _svg = carol.get_qr_code()
-    bob.secure_join(qr_code)
-    bob.wait_for_securejoin_joiner_success()
-
-    bob_contact_alice = bob.create_contact(alice.get_config("addr"), "Alice")
-    bob_contact_carol = bob.create_contact(carol.get_config("addr"), "Carol")
-    carol_contact_alice = carol.create_contact(alice.get_config("addr"), "Alice")
-
-    logging.info("Bob creates an Autocrypt group")
-    bob_group_chat = bob.create_group("Autocrypt Group")
-    assert not bob_group_chat.get_basic_snapshot().is_protected
-    bob_group_chat.add_contact(bob_contact_alice)
-    bob_group_chat.add_contact(bob_contact_carol)
-    bob_group_chat.send_message(text="Hello Autocrypt group")
-
-    snapshot = carol.get_message_by_id(carol.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "Hello Autocrypt group"
-    assert snapshot.show_padlock
-
-    # Autocrypt group does not propagate verification.
-    carol_contact_alice_snapshot = carol_contact_alice.get_snapshot()
-    assert not carol_contact_alice_snapshot.is_verified
-
-    logging.info("Bob creates a Securejoin group")
-    bob_group_chat = bob.create_group("Securejoin Group", protect=True)
-    assert bob_group_chat.get_basic_snapshot().is_protected
-    bob_group_chat.add_contact(bob_contact_alice)
-    bob_group_chat.add_contact(bob_contact_carol)
-    bob_group_chat.send_message(text="Hello Securejoin group")
-
-    snapshot = carol.get_message_by_id(carol.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "Hello Securejoin group"
-    assert snapshot.show_padlock
-
-    # Securejoin propagates verification.
-    carol_contact_alice_snapshot = carol_contact_alice.get_snapshot()
-    assert carol_contact_alice_snapshot.is_verified
-
-
-def test_securejoin_after_contact_resetup(acfactory) -> None:
-    """
-    Regression test for a bug that prevented joining verified group with a QR code
-    if the group is already created and contains
-    a contact with inconsistent (Autocrypt and verified keys exist but don't match) key state.
-    """
-    ac1, ac2, ac3 = acfactory.get_online_accounts(3)
-
-    # ac3 creates protected group with ac1.
-    ac3_chat = ac3.create_group("Verified group", protect=True)
-
-    # ac1 joins ac3 group.
-    ac3_qr_code, _svg = ac3_chat.get_qr_code()
-    ac1.secure_join(ac3_qr_code)
-    ac1.wait_for_securejoin_joiner_success()
-
-    # ac1 waits for member added message and creates a QR code.
-    snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    ac1_qr_code, _svg = snapshot.chat.get_qr_code()
-
-    # ac2 verifies ac1
-    qr_code, _svg = ac1.get_qr_code()
-    ac2.secure_join(qr_code)
-    ac2.wait_for_securejoin_joiner_success()
-
-    # ac1 is verified for ac2.
-    ac2_contact_ac1 = ac2.create_contact(ac1.get_config("addr"), "")
-    assert ac2_contact_ac1.get_snapshot().is_verified
-
-    # ac1 resetups the account.
-    ac1 = acfactory.resetup_account(ac1)
-
-    # ac1 sends a message to ac2.
-    ac1_contact_ac2 = ac1.create_contact(ac2.get_config("addr"), "")
-    ac1_chat_ac2 = ac1_contact_ac2.create_chat()
-    ac1_chat_ac2.send_text("Hello!")
-
-    # ac2 receives a message.
-    snapshot = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "Hello!"
-
-    # ac1 is no longer verified for ac2 as new Autocrypt key is not the same as old verified key.
-    assert not ac2_contact_ac1.get_snapshot().is_verified
-
-    # ac1 goes offline.
-    ac1.remove()
-
-    # Scanning a QR code results in creating an unprotected group with an inviter.
-    # In this case inviter is ac1 which has an inconsistent key state.
-    # Normally inviter becomes verified as a result of Securejoin protocol
-    # and then the group chat becomes verified when "Member added" is received,
-    # but in this case ac1 is offline and this Securejoin process will never finish.
-    logging.info("ac2 scans ac1 QR code, this is not expected to finish")
-    ac2.secure_join(ac1_qr_code)
-
-    logging.info("ac2 scans ac3 QR code")
-    ac2.secure_join(ac3_qr_code)
-
-    logging.info("ac2 waits for joiner success")
-    ac2.wait_for_securejoin_joiner_success()
-
-    # Wait for member added.
-    logging.info("ac2 waits for member added message")
-    snapshot = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.is_info
-    ac2_chat = snapshot.chat
-    assert ac2_chat.get_basic_snapshot().is_protected
-    assert len(ac2_chat.get_contacts()) == 3
-
-    # ac1 is still "not verified" for ac2 due to inconsistent state.
-    assert not ac2_contact_ac1.get_snapshot().is_verified
--- a/deltachat-rpc-client/tests/test_something.py
+++ b/deltachat-rpc-client/tests/test_something.py
@@ -140,9 +140,12 @@ def test_chat(acfactory) -> None:
    alice_chat_bob = alice_contact_bob.create_chat()
    alice_chat_bob.send_text("Hello!")

-    event = bob.wait_for_incoming_msg_event()
-    chat_id = event.chat_id
-    msg_id = event.msg_id
+    while True:
+        event = bob.wait_for_event()
+        if event.kind == EventType.INCOMING_MSG:
+            chat_id = event.chat_id
+            msg_id = event.msg_id
+            break
    message = bob.get_message_by_id(msg_id)
    snapshot = message.get_snapshot()
    assert snapshot.chat_id == chat_id
@@ -221,9 +224,12 @@ def test_message(acfactory) -> None:
    alice_chat_bob = alice_contact_bob.create_chat()
    alice_chat_bob.send_text("Hello!")

-    event = bob.wait_for_incoming_msg_event()
-    chat_id = event.chat_id
-    msg_id = event.msg_id
+    while True:
+        event = bob.wait_for_event()
+        if event.kind == EventType.INCOMING_MSG:
+            chat_id = event.chat_id
+            msg_id = event.msg_id
+            break

    message = bob.get_message_by_id(msg_id)
    snapshot = message.get_snapshot()
@@ -325,7 +331,7 @@ def test_wait_next_messages(acfactory) -> None:
        next_messages_task = executor.submit(bot.wait_next_messages)

        bot_addr = bot.get_config("addr")
-        alice_contact_bot = alice.create_contact(bot_addr, "Bot")
+        alice_contact_bot = alice.create_contact(bot_addr, "Bob")
        alice_chat_bot = alice_contact_bot.create_chat()
        alice_chat_bot.send_text("Hello!")

@@ -335,7 +341,7 @@ def test_wait_next_messages(acfactory) -> None:
        assert snapshot.text == "Hello!"


-def test_import_export_backup(acfactory, tmp_path) -> None:
+def test_import_export(acfactory, tmp_path) -> None:
    alice = acfactory.new_configured_account()
    alice.export_backup(tmp_path)

@@ -346,31 +352,6 @@ def test_import_export_backup(acfactory, tmp_path) -> None:
    assert alice2.manager.get_system_info()


-def test_import_export_keys(acfactory, tmp_path) -> None:
-    alice, bob = acfactory.get_online_accounts(2)
-
-    bob_addr = bob.get_config("addr")
-    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
-    alice_chat_bob = alice_contact_bob.create_chat()
-    alice_chat_bob.send_text("Hello Bob!")
-
-    snapshot = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "Hello Bob!"
-
-    # Alice resetups account, but keeps the key.
-    alice_keys_path = tmp_path / "alice_keys"
-    alice_keys_path.mkdir()
-    alice.export_self_keys(alice_keys_path)
-    alice = acfactory.resetup_account(alice)
-    alice.import_self_keys(alice_keys_path)
-
-    snapshot.chat.accept()
-    snapshot.chat.send_text("Hello Alice!")
-    snapshot = alice.get_message_by_id(alice.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "Hello Alice!"
-    assert snapshot.show_padlock
-
-
 def test_openrpc_command_line() -> None:
    """Test that "deltachat-rpc-server --openrpc" command returns an OpenRPC specification."""
    out = subprocess.run(["deltachat-rpc-server", "--openrpc"], capture_output=True, check=True).stdout
@@ -396,46 +377,3 @@ def test_provider_info(rpc) -> None:
    rpc.set_config(account_id, "socks5_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)
-
-    bob_addr = bob.get_config("addr")
-
-    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
-
-    # Bob creates chat manually so chat with Alice is accepted.
-    alice_chat_bob = alice_contact_bob.create_chat()
-
-    # Alice sends a message to Bob.
-    alice_chat_bob.send_text("Hello Bob!")
-    event = bob.wait_for_incoming_msg_event()
-    msg_id = event.msg_id
-    message = bob.get_message_by_id(msg_id)
-    snapshot = message.get_snapshot()
-
-    # Bob sends a message to Alice.
-    bob_chat_alice = snapshot.chat
-    bob_chat_alice.accept()
-    bob_chat_alice.send_text("Hello Alice!")
-    event = alice.wait_for_incoming_msg_event()
-    msg_id = event.msg_id
-    message = alice.get_message_by_id(msg_id)
-    snapshot = message.get_snapshot()
-    assert snapshot.show_padlock
-
-    # Alice reads Bob's message.
-    message.mark_seen()
-    while True:
-        event = bob.wait_for_event()
-        if event.kind == EventType.MSG_READ:
-            break
-
-    # Bob sends a message to Alice, it should also be encrypted.
-    bob_chat_alice.send_text("Hi Alice!")
-    event = alice.wait_for_incoming_msg_event()
-    msg_id = event.msg_id
-    message = alice.get_message_by_id(msg_id)
-    snapshot = message.get_snapshot()
-    assert snapshot.show_padlock
--- a/deltachat-rpc-client/tests/test_webxdc.py
+++ b/deltachat-rpc-client/tests/test_webxdc.py
@@ -43,15 +43,3 @@ def test_webxdc(acfactory) -> None:
    assert status_updates == [
        {"payload": "Second update", "serial": 2, "max_serial": 2},
    ]
-
-
-def test_webxdc_insert_lots_of_updates(acfactory) -> None:
-    alice, bob = acfactory.get_online_accounts(2)
-
-    bob_addr = bob.get_config("addr")
-    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
-    alice_chat_bob = alice_contact_bob.create_chat()
-    message = alice_chat_bob.send_message(text="Let's play chess!", file="../test-data/webxdc/chess.xdc")
-
-    for i in range(2000):
-        message.send_webxdc_status_update({"payload": str(i)}, "description")
--- a/deltachat-rpc-server/Cargo.toml
+++ b/deltachat-rpc-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.136.0"
+version = "1.131.6"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"
@@ -15,9 +15,9 @@ deltachat = { path = "..", default-features = false }

 anyhow = "1"
 env_logger = { version = "0.10.0" }
-futures-lite = "2.2.0"
+futures-lite = "2.0.0"
 log = "0.4"
-serde_json = "1"
+serde_json = "1.0.105"
 serde = { version = "1.0", features = ["derive"] }
 tokio = { version = "1.33.0", features = ["io-std"] }
 tokio-util = "0.7.9"
--- a/deltachat-time/Cargo.toml
+++ b/deltachat-time/Cargo.toml
@@ -1,8 +0,0 @@
-[package]
-name = "deltachat-time"
-version = "1.0.0"
-description = "Time-related tools"
-edition = "2021"
-license = "MPL-2.0"
-
-[dependencies]
--- a/deltachat-time/src/lib.rs
+++ b/deltachat-time/src/lib.rs
@@ -1,35 +0,0 @@
-#![allow(missing_docs)]
-
-use std::sync::RwLock;
-use std::time::{Duration, SystemTime};
-
-static SYSTEM_TIME_SHIFT: RwLock<Duration> = RwLock::new(Duration::new(0, 0));
-
-/// Fake struct for mocking `SystemTime::now()` for test purposes. You still need to use
-/// `SystemTime` as a struct representing a system time.
-pub struct SystemTimeTools();
-
-impl SystemTimeTools {
-    pub const UNIX_EPOCH: SystemTime = SystemTime::UNIX_EPOCH;
-
-    pub fn now() -> SystemTime {
-        return SystemTime::now() + *SYSTEM_TIME_SHIFT.read().unwrap();
-    }
-
-    /// Simulates a system clock forward adjustment by `duration`.
-    pub fn shift(duration: Duration) {
-        *SYSTEM_TIME_SHIFT.write().unwrap() += duration;
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn it_works() {
-        SystemTimeTools::shift(Duration::from_secs(60));
-        let t = SystemTimeTools::now();
-        assert!(t > SystemTime::now());
-    }
-}
--- a/deny.toml
+++ b/deny.toml
@@ -1,20 +1,8 @@
 [advisories]
+unmaintained = "allow"
 ignore = [
    "RUSTSEC-2020-0071",
    "RUSTSEC-2022-0093",
-
-    # Timing attack on RSA.
-    # Delta Chat does not use RSA for new keys
-    # and this requires precise measurement of the decryption time by the attacker.
-    # There is no fix at the time of writing this (2023-11-28).
-    # <https://rustsec.org/advisories/RUSTSEC-2023-0071>
-    "RUSTSEC-2023-0071",
-
-    # Unmaintained ansi_term
-    "RUSTSEC-2021-0139",
-
-    # Unmaintained encoding
-    "RUSTSEC-2021-0153",
 ]

 [bans]
@@ -39,11 +27,6 @@ skip = [
     { name = "ed25519", version = "1.5.3" },
     { name = "event-listener", version = "2.5.3" },
     { name = "getrandom", version = "<0.2" },
-     { name = "h2", version = "0.3.22" },
-     { name = "http-body", version = "0.4.5" },
-     { name = "http", version = "0.2.11" },
-     { name = "hyper", version = "0.14.27" },
-     { name = "idna", version = "0.4.0" },
     { name = "pem-rfc7468", version = "0.6.0" },
     { name = "pkcs8", version = "0.9.0" },
     { name = "quick-error", version = "<2.0" },
@@ -57,24 +40,19 @@ skip = [
     { name = "sec1", version = "0.3.0" },
     { name = "sha2", version = "<0.10" },
     { name = "signature", version = "1.6.4" },
+     { name = "socket2", version = "0.4.9" },
     { name = "spin", version = "<0.9.6" },
     { name = "spki", version = "0.6.0" },
     { name = "syn", version = "1.0.109" },
     { name = "time", version = "<0.3" },
-     { name = "toml_edit", version = "0.21.1" },
     { name = "untrusted", version = "0.7.1" },
     { name = "wasi", version = "<0.11" },
-     { name = "windows_aarch64_gnullvm", version = "<0.52" },
-     { name = "windows_aarch64_msvc", version = "<0.52" },
-     { name = "windows_i686_gnu", version = "<0.52" },
-     { name = "windows_i686_msvc", version = "<0.52" },
-     { name = "windows-sys", version = "<0.52" },
-     { name = "windows-targets", version = "<0.52" },
+     { name = "windows_aarch64_msvc", version = "<0.48" },
+     { name = "windows_i686_gnu", version = "<0.48" },
+     { name = "windows_i686_msvc", version = "<0.48" },
     { name = "windows", version = "0.32.0" },
-     { name = "windows_x86_64_gnullvm", version = "<0.52" },
-     { name = "windows_x86_64_gnu", version = "<0.52" },
-     { name = "windows_x86_64_msvc", version = "<0.52" },
-     { name = "winnow", version = "0.5.40" },
+     { name = "windows_x86_64_gnu", version = "<0.48" },
+     { name = "windows_x86_64_msvc", version = "<0.48" },
 ]


--- a/flake.lock
+++ b/flake.lock
@@ -1,163 +0,0 @@
-{
-  "nodes": {
-    "fenix": {
-      "inputs": {
-        "nixpkgs": "nixpkgs",
-        "rust-analyzer-src": "rust-analyzer-src"
-      },
-      "locked": {
-        "lastModified": 1707891749,
-        "narHash": "sha256-SeikNYElHgv8uVMbiA9/pU3Cce7ssIsiM8CnEiwd1Nc=",
-        "owner": "nix-community",
-        "repo": "fenix",
-        "rev": "3115aab064ef38cccd792c45429af8df43d6d277",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "fenix",
-        "type": "github"
-      }
-    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1705309234,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "naersk": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1698420672,
-        "narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=",
-        "owner": "nix-community",
-        "repo": "naersk",
-        "rev": "aeb58d5e8faead8980a807c840232697982d47b9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "naersk",
-        "type": "github"
-      }
-    },
-    "nix-filter": {
-      "locked": {
-        "lastModified": 1705332318,
-        "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=",
-        "owner": "numtide",
-        "repo": "nix-filter",
-        "rev": "3449dc925982ad46246cfc36469baf66e1b64f17",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "nix-filter",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1707689078,
-        "narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1707743206,
-        "narHash": "sha256-AehgH64b28yKobC/DAWYZWkJBxL/vP83vkY+ag2Hhy4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2d627a2a704708673e56346fcb13d25344b8eaf3",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1707689078,
-        "narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "fenix": "fenix",
-        "flake-utils": "flake-utils",
-        "naersk": "naersk",
-        "nix-filter": "nix-filter",
-        "nixpkgs": "nixpkgs_3"
-      }
-    },
-    "rust-analyzer-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1707849817,
-        "narHash": "sha256-If6T0MDErp3/z7DBlpG4bV46IPP+7BWSlgTI88cmbw0=",
-        "owner": "rust-lang",
-        "repo": "rust-analyzer",
-        "rev": "a02a219773629686bd8ff123ca1aa995fa50d976",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rust-lang",
-        "ref": "nightly",
-        "repo": "rust-analyzer",
-        "type": "github"
-      }
-    },
-    "systems": {
-      "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",
-  "version": 7
-}
--- a/flake.nix
+++ b/flake.nix
@@ -1,331 +0,0 @@
-{
-  description = "Delta Chat core";
-  inputs = {
-    fenix.url = "github:nix-community/fenix";
-    flake-utils.url = "github:numtide/flake-utils";
-    naersk.url = "github:nix-community/naersk";
-    nix-filter.url = "github:numtide/nix-filter";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-  };
-  outputs = { self, nixpkgs, flake-utils, nix-filter, naersk, fenix }:
-    flake-utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = nixpkgs.legacyPackages.${system};
-        fenixPkgs = fenix.packages.${system};
-        naersk' = pkgs.callPackage naersk { };
-        manifest = (pkgs.lib.importTOML ./Cargo.toml).package;
-        cargoLock = {
-          lockFile = ./Cargo.lock;
-          outputHashes = {
-            "email-0.0.20" = "sha256-rV4Uzqt2Qdrfi5Ti1r+Si1c2iW1kKyWLwOgLkQ5JGGw=";
-            "encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk=";
-            "lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk=";
-          };
-        };
-        mkRustPackage = packageName:
-          naersk'.buildPackage {
-            pname = packageName;
-            cargoBuildOptions = x: x ++ [ "--package" packageName ];
-            version = manifest.version;
-            src = pkgs.lib.cleanSource ./.;
-            nativeBuildInputs = [
-              pkgs.perl # Needed to build vendored OpenSSL.
-            ];
-            auditable = false; # Avoid cargo-auditable failures.
-            doCheck = false; # Disable test as it requires network access.
-          };
-        pkgsWin64 = pkgs.pkgsCross.mingwW64;
-        mkWin64RustPackage = packageName:
-          let
-            rustTarget = "x86_64-pc-windows-gnu";
-          in
-          let
-            toolchainWin = fenixPkgs.combine [
-              fenixPkgs.stable.rustc
-              fenixPkgs.stable.cargo
-              fenixPkgs.targets.${rustTarget}.stable.rust-std
-            ];
-            naerskWin = pkgs.callPackage naersk {
-              cargo = toolchainWin;
-              rustc = toolchainWin;
-            };
-          in
-          naerskWin.buildPackage rec {
-            pname = packageName;
-            cargoBuildOptions = x: x ++ [ "--package" packageName ];
-            version = manifest.version;
-            strictDeps = true;
-            src = pkgs.lib.cleanSource ./.;
-            nativeBuildInputs = [
-              pkgs.perl # Needed to build vendored OpenSSL.
-            ];
-            depsBuildBuild = [
-              pkgsWin64.stdenv.cc
-              pkgsWin64.windows.pthreads
-            ];
-            auditable = false; # Avoid cargo-auditable failures.
-            doCheck = false; # Disable test as it requires network access.
-
-            CARGO_BUILD_TARGET = rustTarget;
-            TARGET_CC = "${pkgsWin64.stdenv.cc}/bin/${pkgsWin64.stdenv.cc.targetPrefix}cc";
-            CARGO_BUILD_RUSTFLAGS = [
-              "-C"
-              "linker=${TARGET_CC}"
-            ];
-
-            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
-            rustTarget = "i686-pc-windows-gnu";
-          in
-          let
-            toolchainWin = fenixPkgs.combine [
-              fenixPkgs.stable.rustc
-              fenixPkgs.stable.cargo
-              fenixPkgs.targets.${rustTarget}.stable.rust-std
-            ];
-            naerskWin = pkgs.callPackage naersk {
-              cargo = toolchainWin;
-              rustc = toolchainWin;
-            };
-
-            # Get rid of MCF Gthread library.
-            # See <https://github.com/NixOS/nixpkgs/issues/156343>
-            # and <https://discourse.nixos.org/t/statically-linked-mingw-binaries/38395>
-            # for details.
-            #
-            # Use DWARF-2 instead of SJLJ for exception handling.
-            winCC = pkgsWin32.buildPackages.wrapCC (
-              (pkgsWin32.buildPackages.gcc-unwrapped.override
-                ({
-                  threadsCross = {
-                    model = "win32";
-                    package = null;
-                  };
-                })).overrideAttrs (oldAttr: rec{
-                configureFlags = oldAttr.configureFlags ++ [
-                  "--disable-sjlj-exceptions --with-dwarf2"
-                ];
-              })
-            );
-            winStdenv = pkgsWin32.buildPackages.overrideCC pkgsWin32.stdenv winCC;
-          in
-          naerskWin.buildPackage rec {
-            pname = packageName;
-            cargoBuildOptions = x: x ++ [ "--package" packageName ];
-            version = manifest.version;
-            strictDeps = true;
-            src = pkgs.lib.cleanSource ./.;
-            nativeBuildInputs = [
-              pkgs.perl # Needed to build vendored OpenSSL.
-            ];
-            depsBuildBuild = [
-              winCC
-              pkgsWin32.windows.pthreads
-            ];
-            auditable = false; # Avoid cargo-auditable failures.
-            doCheck = false; # Disable test as it requires network access.
-
-            CARGO_BUILD_TARGET = rustTarget;
-            TARGET_CC = "${winCC}/bin/${winCC.targetPrefix}cc";
-            CARGO_BUILD_RUSTFLAGS = [
-              "-C"
-              "linker=${TARGET_CC}"
-            ];
-
-            CC = "${winCC}/bin/${winCC.targetPrefix}cc";
-            LD = "${winCC}/bin/${winCC.targetPrefix}cc";
-          };
-
-        mkCrossRustPackage = rustTarget: crossTarget: packageName:
-          let
-            pkgsCross = import nixpkgs {
-              system = system;
-              crossSystem.config = crossTarget;
-            };
-          in
-          let
-            toolchain = fenixPkgs.combine [
-              fenixPkgs.stable.rustc
-              fenixPkgs.stable.cargo
-              fenixPkgs.targets.${rustTarget}.stable.rust-std
-            ];
-            naersk-lib = pkgs.callPackage naersk {
-              cargo = toolchain;
-              rustc = toolchain;
-            };
-          in
-          naersk-lib.buildPackage rec {
-            pname = packageName;
-            cargoBuildOptions = x: x ++ [ "--package" packageName ];
-            version = manifest.version;
-            strictDeps = true;
-            src = pkgs.lib.cleanSource ./.;
-            auditable = false; # Avoid cargo-auditable failures.
-            doCheck = false; # Disable test as it requires network access.
-
-            nativeBuildInputs = [
-              pkgs.perl # Needed to build vendored OpenSSL.
-            ];
-            CARGO_BUILD_TARGET = rustTarget;
-            TARGET_CC = "${pkgsCross.stdenv.cc}/bin/${pkgsCross.stdenv.cc.targetPrefix}cc";
-            CARGO_BUILD_RUSTFLAGS = [
-              "-C"
-              "linker=${TARGET_CC}"
-            ];
-
-            CC = "${pkgsCross.stdenv.cc}/bin/${pkgsCross.stdenv.cc.targetPrefix}cc";
-            LD = "${pkgsCross.stdenv.cc}/bin/${pkgsCross.stdenv.cc.targetPrefix}cc";
-          };
-
-        mk-aarch64-RustPackage = mkCrossRustPackage "aarch64-unknown-linux-musl" "aarch64-unknown-linux-musl";
-        mk-i686-RustPackage = mkCrossRustPackage "i686-unknown-linux-musl" "i686-unknown-linux-musl";
-        mk-x86_64-RustPackage = mkCrossRustPackage "x86_64-unknown-linux-musl" "x86_64-unknown-linux-musl";
-        mk-armv7l-RustPackage = mkCrossRustPackage "armv7-unknown-linux-musleabihf" "armv7l-unknown-linux-musleabihf";
-        mk-armv6l-RustPackage = mkCrossRustPackage "arm-unknown-linux-musleabihf" "armv6l-unknown-linux-musleabihf";
-      in
-      {
-        formatter = pkgs.nixpkgs-fmt;
-
-        packages = rec {
-          # Run with `nix run .#deltachat-repl foo.db`.
-          deltachat-repl = mkRustPackage "deltachat-repl";
-          deltachat-rpc-server = mkRustPackage "deltachat-rpc-server";
-
-          deltachat-repl-win64 = mkWin64RustPackage "deltachat-repl";
-          deltachat-rpc-server-win64 = mkWin64RustPackage "deltachat-rpc-server";
-
-          deltachat-repl-win32 = mkWin32RustPackage "deltachat-repl";
-          deltachat-rpc-server-win32 = mkWin32RustPackage "deltachat-rpc-server";
-
-          deltachat-repl-aarch64-linux = mk-aarch64-RustPackage "deltachat-repl";
-          deltachat-rpc-server-aarch64-linux = mk-aarch64-RustPackage "deltachat-rpc-server";
-
-          deltachat-repl-i686-linux = mk-i686-RustPackage "deltachat-repl";
-          deltachat-rpc-server-i686-linux = mk-i686-RustPackage "deltachat-rpc-server";
-
-          deltachat-repl-x86_64-linux = mk-x86_64-RustPackage "deltachat-repl";
-          deltachat-rpc-server-x86_64-linux = mk-x86_64-RustPackage "deltachat-rpc-server";
-
-          deltachat-repl-armv7l-linux = mk-armv7l-RustPackage "deltachat-repl";
-          deltachat-rpc-server-armv7l-linux = mk-armv7l-RustPackage "deltachat-rpc-server";
-
-          deltachat-repl-armv6l-linux = mk-armv6l-RustPackage "deltachat-repl";
-          deltachat-rpc-server-armv6l-linux = mk-armv6l-RustPackage "deltachat-rpc-server";
-
-          # Run `nix build .#docs` to get C docs generated in `./result/`.
-          docs =
-            pkgs.stdenv.mkDerivation {
-              pname = "docs";
-              version = manifest.version;
-              src = pkgs.lib.cleanSource ./.;
-              nativeBuildInputs = [ pkgs.doxygen ];
-              buildPhase = ''scripts/run-doxygen.sh'';
-              installPhase = ''mkdir -p $out; cp -av deltachat-ffi/html deltachat-ffi/xml $out'';
-            };
-
-          libdeltachat =
-            pkgs.stdenv.mkDerivation rec {
-              pname = "libdeltachat";
-              version = manifest.version;
-              src = nix-filter.lib {
-                root = ./.;
-
-                # Include only necessary files
-                # to avoid rebuilds e.g. when README.md or flake.nix changes.
-                include = [
-                  ./benches
-                  ./assets
-                  ./Cargo.lock
-                  ./Cargo.toml
-                  ./CMakeLists.txt
-                  ./CONTRIBUTING.md
-                  ./deltachat_derive
-                  ./deltachat-ffi
-                  ./deltachat-jsonrpc
-                  ./deltachat-ratelimit
-                  ./deltachat-repl
-                  ./deltachat-rpc-client
-                  ./deltachat-time
-                  ./deltachat-rpc-server
-                  ./format-flowed
-                  ./release-date.in
-                  ./src
-                ];
-                exclude = [
-                  (nix-filter.lib.matchExt "nix")
-                  "flake.lock"
-                ];
-              };
-              cargoDeps = pkgs.rustPlatform.importCargoLock cargoLock;
-
-              nativeBuildInputs = [
-                pkgs.perl # Needed to build vendored OpenSSL.
-                pkgs.cmake
-                pkgs.rustPlatform.cargoSetupHook
-                pkgs.cargo
-              ];
-
-              postInstall = ''
-                substituteInPlace $out/include/deltachat.h \
-                  --replace __FILE__ '"${placeholder "out"}/include/deltachat.h"'
-              '';
-            };
-
-          deltachat-rpc-client =
-            pkgs.python3Packages.buildPythonPackage rec {
-              pname = "deltachat-rpc-client";
-              version = manifest.version;
-              src = pkgs.lib.cleanSource ./deltachat-rpc-client;
-              format = "pyproject";
-              propagatedBuildInputs = [
-                pkgs.python3Packages.setuptools
-                pkgs.python3Packages.setuptools_scm
-              ];
-            };
-
-          deltachat-python =
-            pkgs.python3Packages.buildPythonPackage rec {
-              pname = "deltachat-python";
-              version = manifest.version;
-              src = pkgs.lib.cleanSource ./python;
-              format = "pyproject";
-              buildInputs = [
-                libdeltachat
-              ];
-              nativeBuildInputs = [
-                pkgs.pkg-config
-              ];
-              propagatedBuildInputs = [
-                pkgs.python3Packages.setuptools
-                pkgs.python3Packages.setuptools_scm
-                pkgs.python3Packages.pkgconfig
-                pkgs.python3Packages.cffi
-                pkgs.python3Packages.imap-tools
-                pkgs.python3Packages.pluggy
-                pkgs.python3Packages.requests
-              ];
-            };
-          python-docs =
-            pkgs.stdenv.mkDerivation {
-              pname = "docs";
-              version = manifest.version;
-              src = pkgs.lib.cleanSource ./.;
-              buildInputs = [
-                deltachat-python
-                deltachat-rpc-client
-                pkgs.python3Packages.breathe
-                pkgs.python3Packages.sphinx_rtd_theme
-              ];
-              nativeBuildInputs = [ pkgs.sphinx ];
-              buildPhase = ''sphinx-build -b html -a python/doc/ dist/html'';
-              installPhase = ''mkdir -p $out; cp -av dist/html $out'';
-            };
-        };
-      }
-    );
-}
--- a/fuzz/Cargo.lock
+++ b/fuzz/Cargo.lock
--- a/node/constants.js
+++ b/node/constants.js
@@ -29,11 +29,9 @@ module.exports = {
  DC_DOWNLOAD_FAILURE: 20,
  DC_DOWNLOAD_IN_PROGRESS: 1000,
  DC_DOWNLOAD_UNDECIPHERABLE: 30,
-  DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE: 2200,
  DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED: 2021,
  DC_EVENT_CHAT_MODIFIED: 2020,
  DC_EVENT_CONFIGURE_PROGRESS: 2041,
-  DC_EVENT_CONFIG_SYNCED: 2111,
  DC_EVENT_CONNECTIVITY_CHANGED: 2100,
  DC_EVENT_CONTACTS_CHANGED: 2030,
  DC_EVENT_DELETED_BLOB_FILE: 151,
@@ -81,7 +79,6 @@ module.exports = {
  DC_INFO_EPHEMERAL_TIMER_CHANGED: 10,
  DC_INFO_GROUP_IMAGE_CHANGED: 3,
  DC_INFO_GROUP_NAME_CHANGED: 2,
-  DC_INFO_INVALID_UNENCRYPTED_MAIL: 13,
  DC_INFO_LOCATIONSTREAMING_ENABLED: 8,
  DC_INFO_LOCATION_ONLY: 9,
  DC_INFO_MEMBER_ADDED_TO_GROUP: 4,
@@ -228,13 +225,11 @@ module.exports = {
  DC_STR_GROUP_NAME_CHANGED_BY_YOU: 124,
  DC_STR_IMAGE: 9,
  DC_STR_INCOMING_MESSAGES: 103,
-  DC_STR_INVALID_UNENCRYPTED_MAIL: 174,
  DC_STR_LAST_MSG_SENT_SUCCESSFULLY: 111,
  DC_STR_LOCATION: 66,
  DC_STR_LOCATION_ENABLED_BY_OTHER: 137,
  DC_STR_LOCATION_ENABLED_BY_YOU: 136,
  DC_STR_MESSAGES: 114,
-  DC_STR_MESSAGE_ADD_MEMBER: 173,
  DC_STR_MSGACTIONBYME: 63,
  DC_STR_MSGACTIONBYUSER: 62,
  DC_STR_MSGADDMEMBER: 17,
--- a/node/events.js
+++ b/node/events.js
@@ -34,8 +34,6 @@ module.exports = {
  2061: 'DC_EVENT_SECUREJOIN_JOINER_PROGRESS',
  2100: 'DC_EVENT_CONNECTIVITY_CHANGED',
  2110: 'DC_EVENT_SELFAVATAR_CHANGED',
-  2111: 'DC_EVENT_CONFIG_SYNCED',
  2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE',
-  2121: 'DC_EVENT_WEBXDC_INSTANCE_DELETED',
-  2200: 'DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE'
+  2121: 'DC_EVENT_WEBXDC_INSTANCE_DELETED'
 }
--- a/node/lib/constants.ts
+++ b/node/lib/constants.ts
@@ -29,11 +29,9 @@ export enum C {
  DC_DOWNLOAD_FAILURE = 20,
  DC_DOWNLOAD_IN_PROGRESS = 1000,
  DC_DOWNLOAD_UNDECIPHERABLE = 30,
-  DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE = 2200,
  DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED = 2021,
  DC_EVENT_CHAT_MODIFIED = 2020,
  DC_EVENT_CONFIGURE_PROGRESS = 2041,
-  DC_EVENT_CONFIG_SYNCED = 2111,
  DC_EVENT_CONNECTIVITY_CHANGED = 2100,
  DC_EVENT_CONTACTS_CHANGED = 2030,
  DC_EVENT_DELETED_BLOB_FILE = 151,
@@ -81,7 +79,6 @@ export enum C {
  DC_INFO_EPHEMERAL_TIMER_CHANGED = 10,
  DC_INFO_GROUP_IMAGE_CHANGED = 3,
  DC_INFO_GROUP_NAME_CHANGED = 2,
-  DC_INFO_INVALID_UNENCRYPTED_MAIL = 13,
  DC_INFO_LOCATIONSTREAMING_ENABLED = 8,
  DC_INFO_LOCATION_ONLY = 9,
  DC_INFO_MEMBER_ADDED_TO_GROUP = 4,
@@ -228,13 +225,11 @@ export enum C {
  DC_STR_GROUP_NAME_CHANGED_BY_YOU = 124,
  DC_STR_IMAGE = 9,
  DC_STR_INCOMING_MESSAGES = 103,
-  DC_STR_INVALID_UNENCRYPTED_MAIL = 174,
  DC_STR_LAST_MSG_SENT_SUCCESSFULLY = 111,
  DC_STR_LOCATION = 66,
  DC_STR_LOCATION_ENABLED_BY_OTHER = 137,
  DC_STR_LOCATION_ENABLED_BY_YOU = 136,
  DC_STR_MESSAGES = 114,
-  DC_STR_MESSAGE_ADD_MEMBER = 173,
  DC_STR_MSGACTIONBYME = 63,
  DC_STR_MSGACTIONBYUSER = 62,
  DC_STR_MSGADDMEMBER = 17,
@@ -324,8 +319,6 @@ export const EventId2EventName: { [key: number]: string } = {
  2061: 'DC_EVENT_SECUREJOIN_JOINER_PROGRESS',
  2100: 'DC_EVENT_CONNECTIVITY_CHANGED',
  2110: 'DC_EVENT_SELFAVATAR_CHANGED',
-  2111: 'DC_EVENT_CONFIG_SYNCED',
  2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE',
  2121: 'DC_EVENT_WEBXDC_INSTANCE_DELETED',
-  2200: 'DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE',
 }
--- a/node/lib/deltachat.ts
+++ b/node/lib/deltachat.ts
@@ -178,7 +178,7 @@ export class AccountManager extends EventEmitter {
  static newTemporary() {
    let directory = null
    while (true) {
-      const randomString = Math.random().toString(36).substring(2, 5)
+      const randomString = Math.random().toString(36).substr(2, 5)
      directory = join(tmpdir(), 'deltachat-' + randomString)
      if (!existsSync(directory)) break
    }
--- a/node/test/test.mjs
+++ b/node/test/test.mjs
@@ -1,17 +1,13 @@
 // @ts-check
-import { DeltaChat } from '../dist/index.js'
+import DeltaChat from '../dist'

 import { deepStrictEqual, strictEqual } from 'assert'
 import chai, { expect } from 'chai'
 import chaiAsPromised from 'chai-as-promised'
-import { EventId2EventName, C } from '../dist/constants.js'
+import { EventId2EventName, C } from '../dist/constants'
 import { join } from 'path'
 import { statSync } from 'fs'
-import { Context } from '../dist/context.js'
-import {fileURLToPath} from 'url';
-
-const __dirname = fileURLToPath(new URL('.', import.meta.url));
-
+import { Context } from '../dist/context'
 chai.use(chaiAsPromised)
 chai.config.truncateThreshold = 0 // Do not truncate assertion errors.

@@ -239,7 +235,7 @@ describe('Basic offline Tests', function () {
      'delete_device_after',
      'delete_server_after',
      'deltachat_core_version',
-      'displayname',
+      'display_name',
      'download_limit',
      'e2ee_enabled',
      'entered_account_settings',
@@ -250,7 +246,6 @@ describe('Basic offline Tests', function () {
      'journal_mode',
      'key_gen_type',
      'last_housekeeping',
-      'last_cant_decrypt_outgoing_msgs',
      'level',
      'mdns_enabled',
      'media_quality',
--- a/package.json
+++ b/package.json
@@ -8,8 +8,9 @@
  "devDependencies": {
    "@types/debug": "^4.1.7",
    "@types/node": "^20.8.10",
-    "chai": "~4.3.10",
+    "chai": "^4.2.0",
    "chai-as-promised": "^7.1.1",
+    "esm": "^3.2.25",
    "mocha": "^8.2.1",
    "node-gyp": "^10.0.0",
    "prebuildify": "^5.0.1",
@@ -52,8 +53,8 @@
    "prebuildify": "cd node && prebuildify -t 18.0.0 --napi --strip --postinstall \"node scripts/postinstall.js --prebuild\"",
    "test": "npm run test:lint && npm run test:mocha",
    "test:lint": "npm run lint",
-    "test:mocha": "mocha node/test/test.mjs --growl --reporter=spec --bail --exit"
+    "test:mocha": "mocha -r esm node/test/test.js --growl --reporter=spec --bail --exit"
  },
  "types": "node/dist/index.d.ts",
-  "version": "1.136.0"
+  "version": "1.131.6"
 }
--- a/python/src/deltachat/account.py
+++ b/python/src/deltachat/account.py
@@ -1,5 +1,6 @@
 """Account class implementation."""

+
 import os
 from array import array
 from contextlib import contextmanager
@@ -375,6 +376,22 @@ class Account:
        dc_array = ffi.gc(lib.dc_get_fresh_msgs(self._dc_context), lib.dc_array_unref)
        return (x for x in iter_array(dc_array, lambda x: Message.from_db(self, x)) if x is not None)

+    def _wait_next_message_ids(self) -> List[int]:
+        """Return IDs of all next messages from all chats."""
+        dc_array = ffi.gc(lib.dc_wait_next_msgs(self._dc_context), lib.dc_array_unref)
+        return [lib.dc_array_get_id(dc_array, i) for i in range(lib.dc_array_get_cnt(dc_array))]
+
+    def wait_next_incoming_message(self) -> Message:
+        """Waits until the next incoming message
+        with ID higher than given is received and returns it."""
+        while True:
+            message_ids = self._wait_next_message_ids()
+            for msg_id in message_ids:
+                message = Message.from_db(self, msg_id)
+                if message and not message.is_from_self() and not message.is_from_device():
+                    self.set_config("last_msg_id", str(msg_id))
+                    return message
+
    def create_chat(self, obj) -> Chat:
        """Create a 1:1 chat with Account, Contact or e-mail address."""
        return self.create_contact(obj).create_chat()
@@ -461,16 +478,6 @@ class Account:
        msg_ids = [msg.id for msg in messages]
        lib.dc_forward_msgs(self._dc_context, msg_ids, len(msg_ids), chat.id)

-    def resend_messages(self, messages: List[Message]) -> None:
-        """Resend list of messages.
-
-        :param messages: list of :class:`deltachat.message.Message` object.
-        :returns: None
-        """
-        msg_ids = [msg.id for msg in messages]
-        if lib.dc_resend_msgs(self._dc_context, msg_ids, len(msg_ids)) != 1:
-            raise ValueError(f"could not resend messages {msg_ids}")
-
    def delete_messages(self, messages: List[Message]) -> None:
        """delete messages (local and remote).

--- a/python/src/deltachat/events.py
+++ b/python/src/deltachat/events.py
@@ -182,12 +182,6 @@ class FFIEventTracker:
                print(f"** SECUREJOINT-INVITER PROGRESS {target}", self.account)
                break

-    def wait_securejoin_joiner_progress(self, target):
-        while True:
-            event = self.get_matching("DC_EVENT_SECUREJOIN_JOINER_PROGRESS")
-            if event.data2 >= target:
-                break
-
    def wait_idle_inbox_ready(self):
        """Has to be called after start_io() to wait for fetch_existing_msgs to run
        so that new messages are not mistaken for old ones:
--- a/python/src/deltachat/testplugin.py
+++ b/python/src/deltachat/testplugin.py
@@ -115,7 +115,7 @@ def pytest_configure(config):
    deltachat.register_global_plugin(la)


-def pytest_report_header(config):
+def pytest_report_header(config, startdir):
    info = get_core_info()
    summary = [
        "Deltachat core={} sqlite={} journal_mode={}".format(
@@ -590,20 +590,6 @@ class ACFactory:
        ac2.create_chat(ac1)
        return ac1.create_chat(ac2)

-    def get_protected_chat(self, ac1: Account, ac2: Account):
-        chat = ac1.create_group_chat("Protected Group", verified=True)
-        qr = chat.get_join_qr()
-        ac2.qr_join_chat(qr)
-        ac2._evtracker.wait_securejoin_joiner_progress(1000)
-        ev = ac2._evtracker.get_matching("DC_EVENT_MSGS_CHANGED")
-        msg = ac2.get_message_by_id(ev.data2)
-        assert msg is not None
-        assert msg.text == "Messages are guaranteed to be end-to-end encrypted from now on."
-        msg = ac2._evtracker.wait_next_incoming_message()
-        assert msg is not None
-        assert "Member Me " in msg.text and " added by " in msg.text
-        return chat
-
    def introduce_each_other(self, accounts, sending=True):
        to_wait = []
        for i, acc in enumerate(accounts):
--- a/python/tests/test_1_online.py
+++ b/python/tests/test_1_online.py
@@ -44,21 +44,21 @@ def test_configure_generate_key(acfactory, lp):
    lp.sec("ac1: send unencrypted message to ac2")
    chat.send_text("message1")
    lp.sec("ac2: waiting for message from ac1")
-    msg_in = ac2._evtracker.wait_next_incoming_message()
+    msg_in = ac2.wait_next_incoming_message()
    assert msg_in.text == "message1"
    assert not msg_in.is_encrypted()

    lp.sec("ac2: send encrypted message to ac1")
    msg_in.chat.send_text("message2")
    lp.sec("ac1: waiting for message from ac2")
-    msg2_in = ac1._evtracker.wait_next_incoming_message()
+    msg2_in = ac1.wait_next_incoming_message()
    assert msg2_in.text == "message2"
    assert msg2_in.is_encrypted()

    lp.sec("ac1: send encrypted message to ac2")
    msg2_in.chat.send_text("message3")
    lp.sec("ac2: waiting for message from ac1")
-    msg3_in = ac2._evtracker.wait_next_incoming_message()
+    msg3_in = ac2.wait_next_incoming_message()
    assert msg3_in.text == "message3"
    assert msg3_in.is_encrypted()

@@ -382,21 +382,6 @@ def test_webxdc_download_on_demand(acfactory, data, lp):
    assert msgs_changed_event.data2 == 0


-def test_enable_mvbox_move(acfactory, lp):
-    (ac1,) = acfactory.get_online_accounts(1)
-
-    lp.sec("ac2: start without mvbox thread")
-    ac2 = acfactory.new_online_configuring_account(mvbox_move=False)
-    acfactory.bring_accounts_online()
-
-    lp.sec("ac2: configuring mvbox")
-    ac2.set_config("mvbox_move", "1")
-
-    lp.sec("ac1: send message and wait for ac2 to receive it")
-    acfactory.get_accepted_chat(ac1, ac2).send_text("message1")
-    assert ac2._evtracker.wait_next_incoming_message().text == "message1"
-
-
 def test_mvbox_sentbox_threads(acfactory, lp):
    lp.sec("ac1: start with mvbox thread")
    ac1 = acfactory.new_online_configuring_account(mvbox_move=True, sentbox_watch=True)
@@ -513,26 +498,6 @@ def test_forward_messages(acfactory, lp):
    assert not chat3.get_messages()


-def test_forward_encrypted_to_unencrypted(acfactory, lp):
-    ac1, ac2, ac3 = acfactory.get_online_accounts(3)
-    chat = acfactory.get_protected_chat(ac1, ac2)
-
-    lp.sec("ac1: send encrypted message to ac2")
-    txt = "This should be encrypted"
-    chat.send_text(txt)
-    msg = ac2._evtracker.wait_next_incoming_message()
-    assert msg.text == txt
-    assert msg.is_encrypted()
-
-    lp.sec("ac2: forward message to ac3 unencrypted")
-    unencrypted_chat = ac2.create_chat(ac3)
-    msg_id = msg.id
-    msg2 = unencrypted_chat.send_msg(msg)
-    assert msg2 == msg
-    assert msg.id != msg_id
-    assert not msg.is_encrypted()
-
-
 def test_forward_own_message(acfactory, lp):
    ac1, ac2 = acfactory.get_online_accounts(2)
    chat = acfactory.get_accepted_chat(ac1, ac2)
@@ -558,27 +523,6 @@ def test_forward_own_message(acfactory, lp):
    assert msg_in.is_forwarded()


-def test_resend_message(acfactory, lp):
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    chat1 = ac1.create_chat(ac2)
-
-    lp.sec("ac1: send message to ac2")
-    chat1.send_text("message")
-
-    lp.sec("ac2: receive message")
-    msg_in = ac2._evtracker.wait_next_incoming_message()
-    assert msg_in.text == "message"
-    chat2 = msg_in.chat
-    chat2_msg_cnt = len(chat2.get_messages())
-
-    lp.sec("ac1: resend message")
-    ac1.resend_messages([msg_in])
-
-    lp.sec("ac2: check that message is deleted")
-    ac2._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_DELETED")
-    assert len(chat2.get_messages()) == chat2_msg_cnt
-
-
 def test_long_group_name(acfactory, lp):
    """See bug https://github.com/deltachat/deltachat-core-rust/issues/3650 "Space added before long
    group names after MIME serialization/deserialization".
@@ -1587,11 +1531,10 @@ def test_reactions_for_a_reordering_move(acfactory, lp):


 def test_import_export_online_all(acfactory, tmp_path, data, lp):
-    (ac1, some1) = acfactory.get_online_accounts(2)
+    (ac1,) = acfactory.get_online_accounts(1)

    lp.sec("create some chat content")
-    some1_addr = some1.get_config("addr")
-    chat1 = ac1.create_contact(some1_addr, name="some1").create_chat()
+    chat1 = ac1.create_contact("some1@example.org", name="some1").create_chat()
    chat1.send_text("msg1")
    assert len(ac1.get_contacts(query="some1")) == 1

@@ -1608,7 +1551,7 @@ def test_import_export_online_all(acfactory, tmp_path, data, lp):
        contacts = ac.get_contacts(query="some1")
        assert len(contacts) == 1
        contact2 = contacts[0]
-        assert contact2.addr == some1_addr
+        assert contact2.addr == "some1@example.org"
        chat2 = contact2.create_chat()
        messages = chat2.get_messages()
        assert len(messages) == 3
@@ -2036,32 +1979,6 @@ def test_connectivity(acfactory, lp):
    ac1._evtracker.wait_for_connectivity(dc.const.DC_CONNECTIVITY_NOT_CONNECTED)


-def test_all_work_done(acfactory, lp):
-    """
-    Tests that calling start_io() immediately followed by maybe_network()
-    and then waiting for all_work_done() reliably fetches the messages
-    delivered while account was offline.
-    In other words, connectivity should not change to a state
-    where all_work_done() returns true until IMAP connection goes idle.
-    """
-    ac1, ac2 = acfactory.get_online_accounts(2)
-
-    ac1.stop_io()
-    ac1._evtracker.wait_for_connectivity(dc.const.DC_CONNECTIVITY_NOT_CONNECTED)
-
-    ac1.direct_imap.select_config_folder("inbox")
-    with ac1.direct_imap.idle() as idle1:
-        ac2.create_chat(ac1).send_text("Hi")
-        idle1.wait_for_new_message()
-
-    ac1.start_io()
-    ac1.maybe_network()
-    ac1._evtracker.wait_for_all_work_done()
-    msgs = ac1.create_chat(ac2).get_messages()
-    assert len(msgs) == 1
-    assert msgs[0].text == "Hi"
-
-
 def test_fetch_deleted_msg(acfactory, lp):
    """This is a regression test: Messages with \\Deleted flag were downloaded again and again,
    hundreds of times, because uid_next was not updated.
--- a/python/tests/test_3_offline.py
+++ b/python/tests/test_3_offline.py
@@ -52,8 +52,8 @@ class TestOfflineAccountBasic:
    def test_wrong_db(self, tmp_path):
        p = tmp_path / "hello.db"
        p.write_text("123")
-        with pytest.raises(ValueError):
-            _account = Account(str(p))
+        account = Account(str(p))
+        assert not account.is_open()

    def test_os_name(self, tmp_path):
        p = tmp_path / "hello.db"
--- a/python/tests/test_4_lowlevel.py
+++ b/python/tests/test_4_lowlevel.py
@@ -156,8 +156,6 @@ def test_markseen_invalid_message_ids(acfactory):
    chat = contact1.create_chat()
    chat.send_text("one message")
    ac1._evtracker.get_matching("DC_EVENT_MSGS_CHANGED")
-    # Skip configuration-related warnings, but not errors.
-    ac1._evtracker.ensure_event_not_queued("DC_EVENT_ERROR")
    msg_ids = [9]
    lib.dc_markseen_msgs(ac1._dc_context, msg_ids, len(msg_ids))
    ac1._evtracker.ensure_event_not_queued("DC_EVENT_WARNING|DC_EVENT_ERROR")
--- a/release-date.in
+++ b/release-date.in
@@ -1 +1 @@
-2024-03-04
+2023-11-21
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -35,8 +35,12 @@ and an own build machine.

 - `run_all.sh` builds Python wheels

+- `zig-rpc-server.sh` compiles binaries of `deltachat-rpc-server` using Zig toolchain statically linked against musl libc.
+
 - `android-rpc-server.sh` compiles binaries of `deltachat-rpc-server` using Android NDK.

+- `build-python-docs.sh` builds Python documentation into `dist/html/`.
+
 ## Triggering runs on the build machine locally (fast!)

 There is experimental support for triggering a remote Python or Rust test run 
--- a/scripts/build-python-docs.sh
+++ b/scripts/build-python-docs.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+export DCC_RS_TARGET=debug
+export DCC_RS_DEV="$PWD"
+cargo build -p deltachat_ffi --features jsonrpc
+
+python3 -m venv venv
+venv/bin/pip install ./python
+venv/bin/pip install ./deltachat-rpc-client
+venv/bin/pip install sphinx breathe sphinx_rtd_theme
+venv/bin/pip install ./deltachat-rpc-client
+venv/bin/sphinx-build -b html -a python/doc/ dist/html
--- a/scripts/concourse/docs_wheels.yml
+++ b/scripts/concourse/docs_wheels.yml
@@ -15,6 +15,55 @@ resources:
      tag_filter: "v*"

 jobs:
+  - name: doxygen
+    plan:
+      - get: deltachat-core-rust
+        trigger: true
+
+      # Build Doxygen documentation
+      - task: build-doxygen
+        config:
+          inputs:
+            - name: deltachat-core-rust
+          outputs:
+            - name: c-docs
+          image_resource:
+            source:
+              repository: alpine
+            type: registry-image
+          platform: linux
+          run:
+            path: sh
+            args:
+              - -ec
+              - |
+                apk add --no-cache doxygen git
+                cd deltachat-core-rust
+                scripts/run-doxygen.sh
+                cd ..
+                cp -av deltachat-core-rust/deltachat-ffi/html deltachat-core-rust/deltachat-ffi/xml c-docs/
+
+      - task: upload-c-docs
+        config:
+          inputs:
+            - name: c-docs
+          image_resource:
+            type: registry-image
+            source:
+              repository: alpine
+          platform: linux
+          run:
+            path: sh
+            args:
+              - -ec
+              - |
+                apk add --no-cache rsync openssh-client
+                mkdir -p ~/.ssh
+                chmod 700 ~/.ssh
+                echo "(("c.delta.chat".private_key))" > ~/.ssh/id_ed25519
+                chmod 600 ~/.ssh/id_ed25519
+                rsync -e "ssh -o StrictHostKeyChecking=no" -avz --delete c-docs/html/ delta@c.delta.chat:build-c/master
+
  - name: python-x86_64
    plan:
      - get: deltachat-core-rust
--- a/scripts/coredeps/install-rust.sh
+++ b/scripts/coredeps/install-rust.sh
@@ -7,7 +7,7 @@ set -euo pipefail
 #
 # Avoid using rustup here as it depends on reading /proc/self/exe and
 # has problems running under QEMU.
-RUST_VERSION=1.76.0
+RUST_VERSION=1.72.0

 ARCH="$(uname -m)"
 test -f "/lib/libc.musl-$ARCH.so.1" && LIBC=musl || LIBC=gnu
--- a/scripts/create-provider-data-rs.py
+++ b/scripts/create-provider-data-rs.py
@@ -220,9 +220,9 @@ if __name__ == "__main__":

    process_dir(Path(sys.argv[1]))

-    out_all += "pub(crate) static PROVIDER_DATA: [(&str, &Provider); " + str(len(domains_set)) + "] = [\n";
+    out_all += "pub(crate) static PROVIDER_DATA: Lazy<HashMap<&'static str, &'static Provider>> = Lazy::new(|| HashMap::from([\n"
    out_all += out_domains
-    out_all += "];\n\n"
+    out_all += "]));\n\n"

    out_all += "pub(crate) static PROVIDER_IDS: Lazy<HashMap<&'static str, &'static Provider>> = Lazy::new(|| HashMap::from([\n"
    out_all += out_ids
--- a/scripts/set_core_version.py
+++ b/scripts/set_core_version.py
@@ -102,7 +102,7 @@ def main():
                found = True
        if not found:
            raise SystemExit(
-                f"CHANGELOG.md contains no entry for version: {newversion}"
+                f"{changelog_name} contains no entry for version: {newversion}"
            )

    for toml_filename in toml_list:
--- a/scripts/update-provider-database.sh
+++ b/scripts/update-provider-database.sh
@@ -6,7 +6,7 @@ set -euo pipefail
 export TZ=UTC

 # Provider database revision.
-REV=2f3db24107e4802c2df0aa0a40f0e144006c0a9b
+REV=18f714cf73d0bdfb8b013fa344494ab80c92b477

 CORE_ROOT="$PWD"
 TMP="$(mktemp -d)"
--- a/scripts/wheel-rpc-server.py
+++ b/scripts/wheel-rpc-server.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
-"""Build Python wheels for deltachat-rpc-server."""
+"""Build Python wheels for deltachat-rpc-server.
+Run scripts/zig-rpc-server.sh first."""
 from pathlib import Path
 from wheel.wheelfile import WheelFile
 import tomllib
@@ -156,13 +157,8 @@ def main():
    )
    build_wheel(
        version,
-        "dist/deltachat-rpc-server-armv7l-linux",
-        "py3-none-linux_armv7l.manylinux_2_17_armv7l.manylinux2014_armv7l.musllinux_1_1_armv7l",
-    )
-    build_wheel(
-        version,
-        "dist/deltachat-rpc-server-armv6l-linux",
-        "py3-none-linux_armv6l",
+        "dist/deltachat-rpc-server-armv7-linux",
+        "py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.musllinux_1_1_armv7l",
    )
    build_wheel(
        version,
--- a/scripts/zig-cc
+++ b/scripts/zig-cc
@@ -0,0 +1,57 @@
+#!/usr/bin/env python
+# /// pyproject
+# [run]
+# dependencies = [
+#   "ziglang==0.11.0"
+# ]
+# ///
+import os
+import subprocess
+import sys
+
+
+def flag_filter(flag: str) -> bool:
+    # Workaround for <https://github.com/sfackler/rust-openssl/issues/2043>.
+    if flag == "-latomic":
+        return False
+
+    if flag == "-lc":
+        return False
+    if flag == "-Wl,-melf_i386":
+        return False
+    if "self-contained" in flag and "crt" in flag:
+        return False
+    return True
+
+
+def main():
+    args = [flag for flag in sys.argv[1:] if flag_filter(flag)]
+    zig_target = os.environ["ZIG_TARGET"]
+    zig_cpu = os.environ.get("ZIG_CPU")
+    if zig_cpu:
+        zig_cpu_args = ["-mcpu=" + zig_cpu]
+        args = [x for x in args if not x.startswith("-march")]
+    else:
+        zig_cpu_args = []
+
+    # Disable atomics and use locks instead in OpenSSL.
+    # Zig toolchains do not provide atomics.
+    # This is a workaround for <https://github.com/deltachat/deltachat-core-rust/issues/4799>
+    args += ["-DBROKEN_CLANG_ATOMICS"]
+
+    subprocess.run(
+        [
+            sys.executable,
+            "-m",
+            "ziglang",
+            "cc",
+            "-target",
+            zig_target,
+            *zig_cpu_args,
+            *args,
+        ],
+        check=True,
+    )
+
+
+main()
--- a/scripts/zig-rpc-server.sh
+++ b/scripts/zig-rpc-server.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# Build statically linked deltachat-rpc-server using zig.
+
+set -x
+set -e
+
+unset RUSTFLAGS
+
+# Pin Rust version to avoid uncontrolled changes in the compiler and linker flags.
+export RUSTUP_TOOLCHAIN=1.72.0
+
+rustup target add i686-unknown-linux-musl
+CC="$PWD/scripts/zig-cc" \
+TARGET_CC="$PWD/scripts/zig-cc" \
+CARGO_TARGET_I686_UNKNOWN_LINUX_MUSL_LINKER="$PWD/scripts/zig-cc" \
+LD="$PWD/scripts/zig-cc" \
+ZIG_TARGET="x86-linux-musl" \
+cargo build --release --target i686-unknown-linux-musl -p deltachat-rpc-server --features vendored
+
+rustup target add armv7-unknown-linux-musleabihf
+CC="$PWD/scripts/zig-cc" \
+TARGET_CC="$PWD/scripts/zig-cc" \
+CARGO_TARGET_ARMV7_UNKNOWN_LINUX_MUSLEABIHF_LINKER="$PWD/scripts/zig-cc" \
+LD="$PWD/scripts/zig-cc" \
+ZIG_TARGET="arm-linux-musleabihf" \
+ZIG_CPU="generic+v7a+vfp3-d32+thumb2-neon" \
+cargo build --release --target armv7-unknown-linux-musleabihf -p deltachat-rpc-server --features vendored
+
+rustup target add x86_64-unknown-linux-musl
+CC="$PWD/scripts/zig-cc" \
+TARGET_CC="$PWD/scripts/zig-cc" \
+CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER="$PWD/scripts/zig-cc" \
+LD="$PWD/scripts/zig-cc" \
+ZIG_TARGET="x86_64-linux-musl" \
+cargo build --release --target x86_64-unknown-linux-musl -p deltachat-rpc-server --features vendored
+
+rustup target add aarch64-unknown-linux-musl
+CC="$PWD/scripts/zig-cc" \
+TARGET_CC="$PWD/scripts/zig-cc" \
+CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER="$PWD/scripts/zig-cc" \
+LD="$PWD/scripts/zig-cc" \
+ZIG_TARGET="aarch64-linux-musl" \
+cargo build --release --target aarch64-unknown-linux-musl -p deltachat-rpc-server --features vendored
+
+mkdir -p dist
+cp target/x86_64-unknown-linux-musl/release/deltachat-rpc-server dist/deltachat-rpc-server-x86_64-linux
+cp target/i686-unknown-linux-musl/release/deltachat-rpc-server dist/deltachat-rpc-server-i686-linux
+cp target/aarch64-unknown-linux-musl/release/deltachat-rpc-server dist/deltachat-rpc-server-aarch64-linux
+cp target/armv7-unknown-linux-musleabihf/release/deltachat-rpc-server dist/deltachat-rpc-server-armv7-linux
--- a/spec.md
+++ b/spec.md
@@ -119,9 +119,8 @@ All group members form the member list.
 To allow different groups with the same members,
 groups are identified by a group-id.
 The group-id MUST be created only from the characters
-`0`-`9`, `A`-`Z`, `a`-`z` `_` and `-`,
-MUST have a length of at least 11 characters
-and no more than 32 characters.
+`0`-`9`, `A`-`Z`, `a`-`z` `_` and `-`
+and MUST have a length of at least 11 characters.

 Groups MUST have a group-name.
 The group-name is any non-zero-length UTF-8 string.
--- a/src/accounts.rs
+++ b/src/accounts.rs
@@ -5,21 +5,16 @@ use std::future::Future;
 use std::path::{Path, PathBuf};

 use anyhow::{ensure, Context as _, Result};
-use futures::future::join_all;
 use serde::{Deserialize, Serialize};
 use tokio::fs;
 use tokio::io::AsyncWriteExt;
+use tokio::sync::oneshot;
 use tokio::task::JoinHandle;
+use tokio::time::{sleep, Duration};
 use uuid::Uuid;

-#[cfg(not(target_os = "ios"))]
-use tokio::sync::oneshot;
-#[cfg(not(target_os = "ios"))]
-use tokio::time::{sleep, Duration};
-
-use crate::context::{Context, ContextBuilder};
+use crate::context::Context;
 use crate::events::{Event, EventEmitter, EventType, Events};
-use crate::push::PushSubscriber;
 use crate::stock_str::StockStrings;

 /// Account manager, that can handle multiple accounts in a single place.
@@ -38,9 +33,6 @@ pub struct Accounts {
    /// This way changing a translation for one context automatically
    /// changes it for all other contexts.
    pub(crate) stockstrings: StockStrings,
-
-    /// Push notification subscriber shared between accounts.
-    push_subscriber: PushSubscriber,
 }

 impl Accounts {
@@ -77,9 +69,8 @@ impl Accounts {
            .context("failed to load accounts config")?;
        let events = Events::new();
        let stockstrings = StockStrings::new();
-        let push_subscriber = PushSubscriber::new();
        let accounts = config
-            .load_accounts(&events, &stockstrings, push_subscriber.clone(), &dir)
+            .load_accounts(&events, &stockstrings, &dir)
            .await
            .context("failed to load accounts")?;

@@ -89,7 +80,6 @@ impl Accounts {
            accounts,
            events,
            stockstrings,
-            push_subscriber,
        })
    }

@@ -126,17 +116,13 @@ impl Accounts {
        let account_config = self.config.new_account().await?;
        let dbfile = account_config.dbfile(&self.dir);

-        let ctx = ContextBuilder::new(dbfile)
-            .with_id(account_config.id)
-            .with_events(self.events.clone())
-            .with_stock_strings(self.stockstrings.clone())
-            .with_push_subscriber(self.push_subscriber.clone())
-            .build()
-            .await?;
-        // Try to open without a passphrase,
-        // but do not return an error if account is passphare-protected.
-        ctx.open("".to_string()).await?;
-
+        let ctx = Context::new(
+            &dbfile,
+            account_config.id,
+            self.events.clone(),
+            self.stockstrings.clone(),
+        )
+        .await?;
        self.accounts.insert(account_config.id, ctx);

        Ok(account_config.id)
@@ -145,15 +131,14 @@ impl Accounts {
    /// Adds a new closed account.
    pub async fn add_closed_account(&mut self) -> Result<u32> {
        let account_config = self.config.new_account().await?;
-        let dbfile = account_config.dbfile(&self.dir);

-        let ctx = ContextBuilder::new(dbfile)
-            .with_id(account_config.id)
-            .with_events(self.events.clone())
-            .with_stock_strings(self.stockstrings.clone())
-            .with_push_subscriber(self.push_subscriber.clone())
-            .build()
-            .await?;
+        let ctx = Context::new_closed(
+            &account_config.dbfile(&self.dir),
+            account_config.id,
+            self.events.clone(),
+            self.stockstrings.clone(),
+        )
+        .await?;
        self.accounts.insert(account_config.id, ctx);

        Ok(account_config.id)
@@ -303,42 +288,6 @@ impl Accounts {
        }
    }

-    /// Performs a background fetch for all accounts in parallel.
-    ///
-    /// This is an auxiliary function and not part of public API.
-    /// Use [Accounts::background_fetch] instead.
-    async fn background_fetch_without_timeout(&self) {
-        async fn background_fetch_and_log_error(account: Context) {
-            if let Err(error) = account.background_fetch().await {
-                warn!(account, "{error:#}");
-            }
-        }
-
-        join_all(
-            self.accounts
-                .values()
-                .cloned()
-                .map(background_fetch_and_log_error),
-        )
-        .await;
-    }
-
-    /// Performs a background fetch for all accounts in parallel with a timeout.
-    ///
-    /// The `AccountsBackgroundFetchDone` event is emitted at the end,
-    /// process all events until you get this one and you can safely return to the background
-    /// without forgetting to create notifications caused by timing race conditions.
-    pub async fn background_fetch(&self, timeout: std::time::Duration) {
-        if let Err(_err) =
-            tokio::time::timeout(timeout, self.background_fetch_without_timeout()).await
-        {
-            self.emit_event(EventType::Warning(
-                "Background fetch timed out.".to_string(),
-            ));
-        }
-        self.emit_event(EventType::AccountsBackgroundFetchDone);
-    }
-
    /// Emits a single event.
    pub fn emit_event(&self, event: EventType) {
        self.events.emit(Event { id: 0, typ: event })
@@ -348,19 +297,12 @@ impl Accounts {
    pub fn get_event_emitter(&self) -> EventEmitter {
        self.events.get_emitter()
    }
-
-    /// Sets notification token for Apple Push Notification service.
-    pub async fn set_push_device_token(&mut self, token: &str) -> Result<()> {
-        self.push_subscriber.set_device_token(token).await;
-        Ok(())
-    }
 }

 /// Configuration file name.
 const CONFIG_NAME: &str = "accounts.toml";

 /// Lockfile name.
-#[cfg(not(target_os = "ios"))]
 const LOCKFILE_NAME: &str = "accounts.lock";

 /// Database file name.
@@ -396,16 +338,22 @@ impl Drop for Config {
 }

 impl Config {
-    #[cfg(target_os = "ios")]
-    async fn create_lock_task(_dir: PathBuf) -> Result<Option<JoinHandle<anyhow::Result<()>>>> {
-        // Do not lock accounts.toml on iOS.
-        // This results in 0xdead10cc crashes on suspend.
-        // iOS itself ensures that multiple instances of Delta Chat are not running.
-        Ok(None)
-    }
-
-    #[cfg(not(target_os = "ios"))]
-    async fn create_lock_task(dir: PathBuf) -> Result<Option<JoinHandle<anyhow::Result<()>>>> {
+    /// Creates a new Config for `file`, but doesn't open/sync it.
+    async fn new_nosync(file: PathBuf, lock: bool) -> Result<Self> {
+        let dir = file.parent().context("Cannot get config file directory")?;
+        let inner = InnerConfig {
+            accounts: Vec::new(),
+            selected_account: 0,
+            next_id: 1,
+        };
+        if !lock {
+            let cfg = Self {
+                file,
+                inner,
+                lock_task: None,
+            };
+            return Ok(cfg);
+        }
        let lockfile = dir.join(LOCKFILE_NAME);
        let mut lock = fd_lock::RwLock::new(fs::File::create(lockfile).await?);
        let (locked_tx, locked_rx) = oneshot::channel();
@@ -436,32 +384,12 @@ impl Config {
            rx.await?;
            Ok(())
        });
-        locked_rx.await?;
-        Ok(Some(lock_task))
-    }
-
-    /// Creates a new Config for `file`, but doesn't open/sync it.
-    async fn new_nosync(file: PathBuf, lock: bool) -> Result<Self> {
-        let dir = file.parent().context("Cannot get config file directory")?;
-        let inner = InnerConfig {
-            accounts: Vec::new(),
-            selected_account: 0,
-            next_id: 1,
-        };
-        if !lock {
-            let cfg = Self {
-                file,
-                inner,
-                lock_task: None,
-            };
-            return Ok(cfg);
-        }
-        let lock_task = Self::create_lock_task(dir.to_path_buf()).await?;
        let cfg = Self {
            file,
            inner,
-            lock_task,
+            lock_task: Some(lock_task),
        };
+        locked_rx.await?;
        Ok(cfg)
    }

@@ -478,13 +406,11 @@ impl Config {
    /// Takes a mutable reference because the saved file is a part of the `Config` state. This
    /// protects from parallel calls resulting to a wrong file contents.
    async fn sync(&mut self) -> Result<()> {
-        #[cfg(not(target_os = "ios"))]
        ensure!(!self
            .lock_task
            .as_ref()
            .context("Config is read-only")?
            .is_finished());
-
        let tmp_path = self.file.with_extension("toml.tmp");
        let mut file = fs::File::create(&tmp_path)
            .await
@@ -539,24 +465,24 @@ impl Config {
        &self,
        events: &Events,
        stockstrings: &StockStrings,
-        push_subscriber: PushSubscriber,
        dir: &Path,
    ) -> Result<BTreeMap<u32, Context>> {
        let mut accounts = BTreeMap::new();

        for account_config in &self.inner.accounts {
-            let dbfile = account_config.dbfile(dir);
-            let ctx = ContextBuilder::new(dbfile.clone())
-                .with_id(account_config.id)
-                .with_events(events.clone())
-                .with_stock_strings(stockstrings.clone())
-                .with_push_subscriber(push_subscriber.clone())
-                .build()
-                .await
-                .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?;
+            let ctx = Context::new(
+                &account_config.dbfile(dir),
+                account_config.id,
+                events.clone(),
+                stockstrings.clone(),
+            )
+            .await
+            .with_context(|| {
+                format!(
+                    "failed to create context from file {:?}",
+                    account_config.dbfile(dir)
+                )
+            })?;

            accounts.insert(account_config.id, ctx);
        }
@@ -600,12 +526,8 @@ impl Config {
            }
            if self.inner.selected_account == id {
                // reset selected account
-                self.inner.selected_account = self
-                    .inner
-                    .accounts
-                    .first()
-                    .map(|e| e.id)
-                    .unwrap_or_default();
+                self.inner.selected_account =
+                    self.inner.accounts.get(0).map(|e| e.id).unwrap_or_default();
            }
        }

--- a/src/authres.rs
+++ b/src/authres.rs
@@ -216,7 +216,7 @@ async fn update_authservid_candidates(
    if old_ids != new_ids {
        let new_config = new_ids.into_iter().collect::<Vec<_>>().join(" ");
        context
-            .set_config_internal(Config::AuthservIdCandidates, Some(&new_config))
+            .set_config(Config::AuthservIdCandidates, Some(&new_config))
            .await?;
        // Updating the authservid candidates may mean that we now consider
        // emails as "failed" which "passed" previously, so we need to
--- a/src/blob.rs
+++ b/src/blob.rs
@@ -8,7 +8,6 @@ use std::iter::FusedIterator;
 use std::path::{Path, PathBuf};

 use anyhow::{format_err, Context as _, Result};
-use base64::Engine as _;
 use futures::StreamExt;
 use image::{DynamicImage, GenericImageView, ImageFormat, ImageOutputFormat};
 use num_traits::FromPrimitive;
@@ -313,30 +312,6 @@ impl<'a> BlobObject<'a> {
        true
    }

-    /// Returns path to the stored Base64-decoded blob.
-    ///
-    /// If `data` represents an image of known format, this adds the corresponding extension to
-    /// `suggested_file_stem`.
-    pub(crate) async fn store_from_base64(
-        context: &Context,
-        data: &str,
-        suggested_file_stem: &str,
-    ) -> Result<String> {
-        let buf = base64::engine::general_purpose::STANDARD.decode(data)?;
-        let ext = if let Ok(format) = image::guess_format(&buf) {
-            if let Some(ext) = format.extensions_str().first() {
-                format!(".{ext}")
-            } else {
-                String::new()
-            }
-        } else {
-            String::new()
-        };
-        let blob =
-            BlobObject::create(context, &format!("{suggested_file_stem}{ext}"), &buf).await?;
-        Ok(blob.as_name().to_string())
-    }
-
    pub async fn recode_to_avatar_size(&mut self, context: &Context) -> Result<()> {
        let blob_abs = self.to_abs_path();

--- a/src/chat.rs
+++ b/src/chat.rs
--- a/src/config.rs
+++ b/src/config.rs
@@ -5,22 +5,17 @@ use std::path::Path;
 use std::str::FromStr;

 use anyhow::{ensure, Context as _, Result};
-use base64::Engine as _;
-use serde::{Deserialize, Serialize};
 use strum::{EnumProperty, IntoEnumIterator};
 use strum_macros::{AsRefStr, Display, EnumIter, EnumProperty, EnumString};
-use tokio::fs;

 use crate::blob::BlobObject;
-use crate::constants::{self, DC_VERSION_STR};
+use crate::constants::DC_VERSION_STR;
 use crate::contact::addr_cmp;
 use crate::context::Context;
 use crate::events::EventType;
-use crate::log::LogExt;
 use crate::mimefactory::RECOMMENDED_FILE_SIZE;
 use crate::provider::{get_provider_by_id, Provider};
-use crate::sync::{self, Sync::*, SyncData};
-use crate::tools::{get_abs_path, improve_single_line_input};
+use crate::tools::{get_abs_path, improve_single_line_input, EmailAddress};

 /// The available configuration keys.
 #[derive(
@@ -36,8 +31,6 @@ use crate::tools::{get_abs_path, improve_single_line_input};
    EnumProperty,
    PartialOrd,
    Ord,
-    Serialize,
-    Deserialize,
 )]
 #[strum(serialize_all = "snake_case")]
 pub enum Config {
@@ -293,9 +286,6 @@ pub enum Config {
    /// Timestamp of the last time housekeeping was run
    LastHousekeeping,

-    /// Timestamp of the last `CantDecryptOutgoingMsgs` notification.
-    LastCantDecryptOutgoingMsgs,
-
    /// To how many seconds to debounce scan_all_folders. Used mainly in tests, to disable debouncing completely.
    #[strum(props(default = "60"))]
    ScanAllFoldersDebounceSecs,
@@ -348,48 +338,6 @@ pub enum Config {
    /// until `chat_id.accept()` is called.
    #[strum(props(default = "0"))]
    VerifiedOneOnOneChats,
-
-    /// Row ID of the key in the `keypairs` table
-    /// used for signatures, encryption to self and included in `Autocrypt` header.
-    KeyId,
-
-    /// This key is sent to the self_reporting bot so that the bot can recognize the user
-    /// without storing the email address
-    SelfReportingId,
-}
-
-impl Config {
-    /// Whether the config option is synced across devices.
-    ///
-    /// This must be checked on both sides so that if there are different client versions, the
-    /// synchronisation of a particular option is either done or not done in both directions.
-    /// Moreover, receivers of a config value need to check if a key can be synced because if it is
-    /// a file path, it could otherwise lead to exfiltration of files from a receiver's
-    /// device if we assume an attacker to have control of a device in a multi-device setting or if
-    /// multiple users are sharing an account. Another example is `Self::SyncMsgs` itself which
-    /// mustn't be controlled by other devices.
-    pub(crate) fn is_synced(&self) -> bool {
-        // We don't restart IO from the synchronisation code, so this is to be on the safe side.
-        if self.needs_io_restart() {
-            return false;
-        }
-        matches!(
-            self,
-            Self::Displayname
-                | Self::MdnsEnabled
-                | Self::ShowEmails
-                | Self::Selfavatar
-                | Self::Selfstatus,
-        )
-    }
-
-    /// Whether the config option needs an IO scheduler restart to take effect.
-    pub(crate) fn needs_io_restart(&self) -> bool {
-        matches!(
-            self,
-            Config::MvboxMove | Config::OnlyFetchMvbox | Config::SentboxWatch
-        )
-    }
 }

 impl Context {
@@ -509,25 +457,40 @@ impl Context {
        }
    }

-    /// Executes [`SyncData::Config`] item sent by other device.
-    pub(crate) async fn sync_config(&self, key: &Config, value: &str) -> Result<()> {
-        let config_value;
-        let value = match key {
-            Config::Selfavatar if value.is_empty() => None,
-            Config::Selfavatar => {
-                config_value = BlobObject::store_from_base64(self, value, "avatar").await?;
-                Some(config_value.as_str())
-            }
-            _ => Some(value),
-        };
-        match key.is_synced() {
-            true => self.set_config_ex(Nosync, *key, value).await,
-            false => Ok(()),
-        }
-    }
-
-    fn check_config(key: Config, value: Option<&str>) -> Result<()> {
+    /// Set the given config key.
+    /// If `None` is passed as a value the value is cleared and set to the default if there is one.
+    pub async fn set_config(&self, key: Config, value: Option<&str>) -> Result<()> {
        match key {
+            Config::Selfavatar => {
+                self.sql
+                    .execute("UPDATE contacts SET selfavatar_sent=0;", ())
+                    .await?;
+                match value {
+                    Some(value) => {
+                        let mut blob = BlobObject::new_from_path(self, value.as_ref()).await?;
+                        blob.recode_to_avatar_size(self).await?;
+                        self.sql
+                            .set_raw_config(key.as_ref(), Some(blob.as_name()))
+                            .await?;
+                    }
+                    None => {
+                        self.sql.set_raw_config(key.as_ref(), None).await?;
+                    }
+                }
+                self.emit_event(EventType::SelfavatarChanged);
+            }
+            Config::DeleteDeviceAfter => {
+                let ret = self.sql.set_raw_config(key.as_ref(), value).await;
+                // Interrupt ephemeral loop to delete old messages immediately.
+                self.scheduler.interrupt_ephemeral_task().await;
+                ret?
+            }
+            Config::Displayname => {
+                let value = value.map(improve_single_line_input);
+                self.sql
+                    .set_raw_config(key.as_ref(), value.as_deref())
+                    .await?;
+            }
            Config::Socks5Enabled
            | Config::BccSelf
            | Config::E2eeEnabled
@@ -548,79 +511,6 @@ impl Context {
                    matches!(value, None | Some("0") | Some("1")),
                    "Boolean value must be either 0 or 1"
                );
-            }
-            _ => (),
-        }
-        Ok(())
-    }
-
-    /// Set the given config key and make it effective.
-    /// This may restart the IO scheduler. If `None` is passed as a value the value is cleared and
-    /// set to the default if there is one.
-    pub async fn set_config(&self, key: Config, value: Option<&str>) -> Result<()> {
-        Self::check_config(key, value)?;
-
-        let _pause = match key.needs_io_restart() {
-            true => self.scheduler.pause(self.clone()).await?,
-            _ => Default::default(),
-        };
-        self.set_config_internal(key, value).await?;
-        Ok(())
-    }
-
-    pub(crate) async fn set_config_internal(&self, key: Config, value: Option<&str>) -> Result<()> {
-        self.set_config_ex(Sync, key, value).await
-    }
-
-    pub(crate) async fn set_config_ex(
-        &self,
-        sync: sync::Sync,
-        key: Config,
-        mut value: Option<&str>,
-    ) -> Result<()> {
-        Self::check_config(key, value)?;
-        let sync = sync == Sync && key.is_synced();
-        let better_value;
-
-        match key {
-            Config::Selfavatar => {
-                self.sql
-                    .execute("UPDATE contacts SET selfavatar_sent=0;", ())
-                    .await?;
-                match value {
-                    Some(path) => {
-                        let mut blob = BlobObject::new_from_path(self, path.as_ref()).await?;
-                        blob.recode_to_avatar_size(self).await?;
-                        self.sql
-                            .set_raw_config(key.as_ref(), Some(blob.as_name()))
-                            .await?;
-                        if sync {
-                            let buf = fs::read(blob.to_abs_path()).await?;
-                            better_value = base64::engine::general_purpose::STANDARD.encode(buf);
-                            value = Some(&better_value);
-                        }
-                    }
-                    None => {
-                        self.sql.set_raw_config(key.as_ref(), None).await?;
-                        if sync {
-                            better_value = String::new();
-                            value = Some(&better_value);
-                        }
-                    }
-                }
-                self.emit_event(EventType::SelfavatarChanged);
-            }
-            Config::DeleteDeviceAfter => {
-                let ret = self.sql.set_raw_config(key.as_ref(), value).await;
-                // Interrupt ephemeral loop to delete old messages immediately.
-                self.scheduler.interrupt_ephemeral_task().await;
-                ret?
-            }
-            Config::Displayname => {
-                if let Some(v) = value {
-                    better_value = improve_single_line_input(v);
-                    value = Some(&better_value);
-                }
                self.sql.set_raw_config(key.as_ref(), value).await?;
            }
            Config::Addr => {
@@ -628,35 +518,10 @@ impl Context {
                    .set_raw_config(key.as_ref(), value.map(|s| s.to_lowercase()).as_deref())
                    .await?;
            }
-            Config::MvboxMove => {
-                self.sql.set_raw_config(key.as_ref(), value).await?;
-                self.sql
-                    .set_raw_config(constants::DC_FOLDERS_CONFIGURED_KEY, None)
-                    .await?;
-            }
            _ => {
                self.sql.set_raw_config(key.as_ref(), value).await?;
            }
        }
-        if key.is_synced() {
-            self.emit_event(EventType::ConfigSynced { key });
-        }
-        if !sync {
-            return Ok(());
-        }
-        let Some(val) = value else {
-            return Ok(());
-        };
-        let val = val.to_string();
-        if self
-            .add_sync_item(SyncData::Config { key, val })
-            .await
-            .log_err(self)
-            .is_err()
-        {
-            return Ok(());
-        }
-        self.send_sync_msg().await.log_err(self).ok();
        Ok(())
    }

@@ -668,7 +533,8 @@ impl Context {

    /// Set the given config to a boolean value.
    pub async fn set_config_bool(&self, key: Config, value: bool) -> Result<()> {
-        self.set_config(key, from_bool(value)).await?;
+        self.set_config(key, if value { Some("1") } else { Some("0") })
+            .await?;
        Ok(())
    }

@@ -688,11 +554,6 @@ impl Context {
    }
 }

-/// Returns a value for use in `Context::set_config_*()` for the given `bool`.
-pub(crate) fn from_bool(val: bool) -> Option<&'static str> {
-    Some(if val { "1" } else { "0" })
-}
-
 // Separate impl block for self address handling
 impl Context {
    /// Determine whether the specified addr maps to the/a self addr.
@@ -715,19 +576,32 @@ impl Context {
    ///
    /// This should only be used by test code and during configure.
    pub(crate) async fn set_primary_self_addr(&self, primary_new: &str) -> Result<()> {
+        let old_addr = self.get_config(Config::ConfiguredAddr).await?;
+
        // add old primary address (if exists) to secondary addresses
        let mut secondary_addrs = self.get_all_self_addrs().await?;
        // never store a primary address also as a secondary
        secondary_addrs.retain(|a| !addr_cmp(a, primary_new));
-        self.set_config_internal(
+        self.set_config(
            Config::SecondaryAddrs,
            Some(secondary_addrs.join(" ").as_str()),
        )
        .await?;

-        self.set_config_internal(Config::ConfiguredAddr, Some(primary_new))
+        self.set_config(Config::ConfiguredAddr, Some(primary_new))
            .await?;

+        if let Some(old_addr) = old_addr {
+            let old_addr = EmailAddress::new(&old_addr)?;
+            let old_keypair = crate::key::load_keypair(self, &old_addr).await?;
+
+            if let Some(mut old_keypair) = old_keypair {
+                old_keypair.addr = EmailAddress::new(primary_new)?;
+                crate::key::store_self_keypair(self, &old_keypair, crate::key::KeyPairUse::Default)
+                    .await?;
+            }
+        }
+
        Ok(())
    }

@@ -779,7 +653,7 @@ mod tests {

    use super::*;
    use crate::constants;
-    use crate::test_utils::{sync, TestContext, TestContextManager};
+    use crate::test_utils::TestContext;

    #[test]
    fn test_to_string() {
@@ -923,201 +797,4 @@ mod tests {

        Ok(())
    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_sync() -> Result<()> {
-        let alice0 = TestContext::new_alice().await;
-        let alice1 = TestContext::new_alice().await;
-        for a in [&alice0, &alice1] {
-            a.set_config_bool(Config::SyncMsgs, true).await?;
-        }
-
-        let mdns_enabled = alice0.get_config_bool(Config::MdnsEnabled).await?;
-        // Alice1 has a different config value.
-        alice1
-            .set_config_bool(Config::MdnsEnabled, !mdns_enabled)
-            .await?;
-        // This changes nothing, but still sends a sync message.
-        alice0
-            .set_config_bool(Config::MdnsEnabled, mdns_enabled)
-            .await?;
-        sync(&alice0, &alice1).await;
-        assert_eq!(
-            alice1.get_config_bool(Config::MdnsEnabled).await?,
-            mdns_enabled
-        );
-
-        // Reset to default. Test that it's not synced because defaults may differ across client
-        // versions.
-        alice0.set_config(Config::MdnsEnabled, None).await?;
-        assert_eq!(alice0.get_config_bool(Config::MdnsEnabled).await?, true);
-        alice0.set_config_bool(Config::MdnsEnabled, false).await?;
-        sync(&alice0, &alice1).await;
-        assert_eq!(alice1.get_config_bool(Config::MdnsEnabled).await?, false);
-
-        let show_emails = alice0.get_config_bool(Config::ShowEmails).await?;
-        alice0
-            .set_config_bool(Config::ShowEmails, !show_emails)
-            .await?;
-        sync(&alice0, &alice1).await;
-        assert_eq!(
-            alice1.get_config_bool(Config::ShowEmails).await?,
-            !show_emails
-        );
-
-        // `Config::SyncMsgs` mustn't be synced.
-        alice0.set_config_bool(Config::SyncMsgs, false).await?;
-        alice0.set_config_bool(Config::SyncMsgs, true).await?;
-        alice0.set_config_bool(Config::MdnsEnabled, true).await?;
-        sync(&alice0, &alice1).await;
-        assert!(alice1.get_config_bool(Config::MdnsEnabled).await?);
-
-        // Usual sync scenario.
-        async fn test_config_str(
-            alice0: &TestContext,
-            alice1: &TestContext,
-            key: Config,
-            val: &str,
-        ) -> Result<()> {
-            alice0.set_config(key, Some(val)).await?;
-            sync(alice0, alice1).await;
-            assert_eq!(alice1.get_config(key).await?, Some(val.to_string()));
-            Ok(())
-        }
-        test_config_str(&alice0, &alice1, Config::Displayname, "Alice Sync").await?;
-        test_config_str(&alice0, &alice1, Config::Selfstatus, "My status").await?;
-
-        assert!(alice0.get_config(Config::Selfavatar).await?.is_none());
-        let file = alice0.dir.path().join("avatar.png");
-        let bytes = include_bytes!("../test-data/image/avatar64x64.png");
-        tokio::fs::write(&file, bytes).await?;
-        alice0
-            .set_config(Config::Selfavatar, Some(file.to_str().unwrap()))
-            .await?;
-        sync(&alice0, &alice1).await;
-        assert!(alice1
-            .get_config(Config::Selfavatar)
-            .await?
-            .filter(|path| path.ends_with(".png"))
-            .is_some());
-        alice0.set_config(Config::Selfavatar, None).await?;
-        sync(&alice0, &alice1).await;
-        assert!(alice1.get_config(Config::Selfavatar).await?.is_none());
-
-        Ok(())
-    }
-
-    /// Sync message mustn't be sent if self-{status,avatar} is changed by a self-sent message.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_no_sync_on_self_sent_msg() -> Result<()> {
-        let mut tcm = TestContextManager::new();
-        let alice0 = &tcm.alice().await;
-        let alice1 = &tcm.alice().await;
-        for a in [alice0, alice1] {
-            a.set_config_bool(Config::SyncMsgs, true).await?;
-        }
-
-        let status = "Synced via usual message";
-        alice0.set_config(Config::Selfstatus, Some(status)).await?;
-        alice0.pop_sent_msg().await; // Sync message
-        let status1 = "Synced via sync message";
-        alice1.set_config(Config::Selfstatus, Some(status1)).await?;
-        tcm.send_recv(alice0, alice1, "hi Alice!").await;
-        assert_eq!(
-            alice1.get_config(Config::Selfstatus).await?,
-            Some(status.to_string())
-        );
-        sync(alice1, alice0).await;
-        assert_eq!(
-            alice0.get_config(Config::Selfstatus).await?,
-            Some(status1.to_string())
-        );
-
-        // Need a chat with another contact to send self-avatar.
-        let bob = &tcm.bob().await;
-        let a0b_chat_id = tcm.send_recv_accept(bob, alice0, "hi").await.chat_id;
-        let file = alice0.dir.path().join("avatar.png");
-        let bytes = include_bytes!("../test-data/image/avatar64x64.png");
-        tokio::fs::write(&file, bytes).await?;
-        alice0
-            .set_config(Config::Selfavatar, Some(file.to_str().unwrap()))
-            .await?;
-        alice0.pop_sent_msg().await; // Sync message
-        let file = alice1.dir.path().join("avatar.jpg");
-        let bytes = include_bytes!("../test-data/image/avatar1000x1000.jpg");
-        tokio::fs::write(&file, bytes).await?;
-        alice1
-            .set_config(Config::Selfavatar, Some(file.to_str().unwrap()))
-            .await?;
-        let sent_msg = alice0.send_text(a0b_chat_id, "hi").await;
-        alice1.recv_msg(&sent_msg).await;
-        assert!(alice1
-            .get_config(Config::Selfavatar)
-            .await?
-            .filter(|path| path.ends_with(".png"))
-            .is_some());
-        sync(alice1, alice0).await;
-        assert!(alice0
-            .get_config(Config::Selfavatar)
-            .await?
-            .filter(|path| path.ends_with(".jpg"))
-            .is_some());
-
-        Ok(())
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_event_config_synced() -> Result<()> {
-        let alice0 = TestContext::new_alice().await;
-        let alice1 = TestContext::new_alice().await;
-        for a in [&alice0, &alice1] {
-            a.set_config_bool(Config::SyncMsgs, true).await?;
-        }
-
-        alice0
-            .set_config(Config::Displayname, Some("Alice Sync"))
-            .await?;
-        alice0
-            .evtracker
-            .get_matching(|e| {
-                matches!(
-                    e,
-                    EventType::ConfigSynced {
-                        key: Config::Displayname
-                    }
-                )
-            })
-            .await;
-        sync(&alice0, &alice1).await;
-        assert_eq!(
-            alice1.get_config(Config::Displayname).await?,
-            Some("Alice Sync".to_string())
-        );
-        alice1
-            .evtracker
-            .get_matching(|e| {
-                matches!(
-                    e,
-                    EventType::ConfigSynced {
-                        key: Config::Displayname
-                    }
-                )
-            })
-            .await;
-
-        alice0.set_config(Config::Displayname, None).await?;
-        alice0
-            .evtracker
-            .get_matching(|e| {
-                matches!(
-                    e,
-                    EventType::ConfigSynced {
-                        key: Config::Displayname
-                    }
-                )
-            })
-            .await;
-
-        Ok(())
-    }
 }
--- a/src/configure.rs
+++ b/src/configure.rs
@@ -22,10 +22,10 @@ use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
 use server_params::{expand_param_vector, ServerParams};
 use tokio::task;

-use crate::config::{self, Config};
+use crate::config::Config;
 use crate::contact::addr_cmp;
 use crate::context::Context;
-use crate::imap::{session::Session as ImapSession, Imap};
+use crate::imap::Imap;
 use crate::log::LogExt;
 use crate::login_param::{CertificateChecks, LoginParam, ServerLoginParam};
 use crate::message::{Message, Viewtype};
@@ -34,7 +34,6 @@ use crate::provider::{Protocol, Socket, UsernamePattern};
 use crate::smtp::Smtp;
 use crate::socks::Socks5Config;
 use crate::stock_str;
-use crate::sync::Sync::*;
 use crate::tools::{time, EmailAddress};
 use crate::{chat, e2ee, provider};

@@ -112,13 +111,12 @@ impl Context {
        let mut param = LoginParam::load_candidate_params(self).await?;
        let old_addr = self.get_config(Config::ConfiguredAddr).await?;
        let success = configure(self, &mut param).await;
-        self.set_config_internal(Config::NotifyAboutWrongPw, None)
-            .await?;
+        self.set_config(Config::NotifyAboutWrongPw, None).await?;

        on_configure_completed(self, param, old_addr).await?;

        success?;
-        self.set_config_internal(Config::NotifyAboutWrongPw, Some("1"))
+        self.set_config(Config::NotifyAboutWrongPw, Some("1"))
            .await?;
        Ok(())
    }
@@ -134,9 +132,7 @@ async fn on_configure_completed(
            for def in config_defaults {
                if !context.config_exists(def.key).await? {
                    info!(context, "apply config_defaults {}={}", def.key, def.value);
-                    context
-                        .set_config_ex(Nosync, def.key, Some(def.value))
-                        .await?;
+                    context.set_config(def.key, Some(def.value)).await?;
                } else {
                    info!(
                        context,
@@ -395,7 +391,7 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {

    // Configure IMAP

-    let mut imap: Option<(Imap, ImapSession)> = None;
+    let mut imap: Option<Imap> = None;
    let imap_servers: Vec<&ServerParams> = servers
        .iter()
        .filter(|params| params.protocol == Protocol::Imap)
@@ -433,7 +429,7 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
            600 + (800 - 600) * (1 + imap_server_index) / imap_servers_count
        );
    }
-    let (mut imap, mut imap_session) = match imap {
+    let mut imap = match imap {
        Some(imap) => imap,
        None => bail!(nicer_configuration_error(ctx, errors).await),
    };
@@ -454,11 +450,9 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {

    let create_mvbox = ctx.should_watch_mvbox().await?;

-    imap.configure_folders(ctx, &mut imap_session, create_mvbox)
-        .await?;
+    imap.configure_folders(ctx, create_mvbox).await?;

-    imap_session
-        .select_with_uidvalidity(ctx, "INBOX")
+    imap.select_with_uidvalidity(ctx, "INBOX")
        .await
        .context("could not read INBOX status")?;

@@ -476,7 +470,7 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {

    // the trailing underscore is correct
    param.save_as_configured_params(ctx).await?;
-    ctx.set_config_internal(Config::ConfiguredTimestamp, Some(&time().to_string()))
+    ctx.set_config(Config::ConfiguredTimestamp, Some(&time().to_string()))
        .await?;

    progress!(ctx, 920);
@@ -484,7 +478,7 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
    e2ee::ensure_secret_key_exists(ctx).await?;
    info!(ctx, "key generation completed");

-    ctx.set_config_internal(Config::FetchedExistingMsgs, config::from_bool(false))
+    ctx.set_config_bool(Config::FetchedExistingMsgs, false)
        .await?;
    ctx.scheduler.interrupt_inbox().await;

@@ -578,7 +572,7 @@ async fn try_imap_one_param(
    socks5_config: &Option<Socks5Config>,
    addr: &str,
    provider_strict_tls: bool,
-) -> Result<(Imap, ImapSession), ConfigurationError> {
+) -> Result<Imap, ConfigurationError> {
    let inf = format!(
        "imap: {}@{}:{} security={} certificate_checks={} oauth2={} socks5_config={}",
        param.user,
@@ -616,9 +610,9 @@ async fn try_imap_one_param(
                msg: format!("{err:#}"),
            })
        }
-        Ok(session) => {
+        Ok(()) => {
            info!(context, "success: {}", inf);
-            Ok((imap, session))
+            Ok(imap)
        }
    }
 }
--- a/src/configure/auto_mozilla.rs
+++ b/src/configure/auto_mozilla.rs
@@ -1,7 +1,6 @@
 //! # Thunderbird's Autoconfiguration implementation
 //!
-//! RFC draft: <https://www.ietf.org/archive/id/draft-bucksch-autoconfig-00.html>
-//! Archived original documentation: <https://web.archive.org/web/20210624004729/https://developer.mozilla.org/en-US/docs/Mozilla/Thunderbird/Autoconfiguration>
+//! Documentation: <https://web.archive.org/web/20210624004729/https://developer.mozilla.org/en-US/docs/Mozilla/Thunderbird/Autoconfiguration>
 use std::io::BufRead;
 use std::str::FromStr;

--- a/src/configure/server_params.rs
+++ b/src/configure/server_params.rs
@@ -137,11 +137,20 @@ impl ServerParams {
    }

    fn expand_strict_tls(self) -> Vec<ServerParams> {
-        vec![Self {
-            // Strict if not set by the user or provider database.
-            strict_tls: Some(self.strict_tls.unwrap_or(true)),
-            ..self
-        }]
+        if self.strict_tls.is_none() {
+            vec![
+                Self {
+                    strict_tls: Some(true), // Strict.
+                    ..self.clone()
+                },
+                Self {
+                    strict_tls: None, // Automatic.
+                    ..self
+                },
+            ]
+        } else {
+            vec![self]
+        }
    }
 }

@@ -153,10 +162,31 @@ pub(crate) fn expand_param_vector(
    domain: &str,
 ) -> Vec<ServerParams> {
    v.into_iter()
+        .map(|params| {
+            if params.socket == Socket::Plain {
+                ServerParams {
+                    // Avoid expanding plaintext configuration into configuration with and without
+                    // `strict_tls` if `strict_tls` is set to `None` as `strict_tls` is not used for
+                    // plaintext connections. Always setting it to "enabled", just in case.
+                    strict_tls: Some(true),
+                    ..params
+                }
+            } else {
+                params
+            }
+        })
        // The order of expansion is important.
        //
        // Ports are expanded the last, so they are changed the first.  Username is only changed if
        // default value (address with domain) didn't work for all available hosts and ports.
+        //
+        // Strict TLS must be expanded first, so we try all configurations with strict TLS first
+        // and only then try again without strict TLS. Otherwise we may lock to wrong hostname
+        // without strict TLS when another hostname with strict TLS is available.  For example, if
+        // both smtp.example.net and mail.example.net are running an SMTP server, but both use a
+        // certificate that is only valid for mail.example.net, we want to skip smtp.example.net
+        // and use mail.example.net with strict TLS instead of using smtp.example.net without
+        // strict TLS.
        .flat_map(|params| params.expand_strict_tls().into_iter())
        .flat_map(|params| params.expand_usernames(addr).into_iter())
        .flat_map(|params| params.expand_hostnames(domain).into_iter())
@@ -227,6 +257,22 @@ mod tests {
                    username: "foobar".to_string(),
                    strict_tls: Some(true)
                },
+                ServerParams {
+                    protocol: Protocol::Smtp,
+                    hostname: "example.net".to_string(),
+                    port: 123,
+                    socket: Socket::Ssl,
+                    username: "foobar".to_string(),
+                    strict_tls: None,
+                },
+                ServerParams {
+                    protocol: Protocol::Smtp,
+                    hostname: "example.net".to_string(),
+                    port: 123,
+                    socket: Socket::Starttls,
+                    username: "foobar".to_string(),
+                    strict_tls: None
+                }
            ],
        );

@@ -238,7 +284,7 @@ mod tests {
                port: 123,
                socket: Socket::Plain,
                username: "foobar".to_string(),
-                strict_tls: Some(true),
+                strict_tls: None,
            }],
            "foobar@example.net",
            "example.net",
--- a/src/constants.rs
+++ b/src/constants.rs
@@ -206,19 +206,9 @@ pub(crate) const WORSE_AVATAR_SIZE: u32 = 128;
 pub const BALANCED_IMAGE_SIZE: u32 = 1280;
 pub const WORSE_IMAGE_SIZE: u32 = 640;

-// Key for the folder configuration version (see below).
-pub(crate) const DC_FOLDERS_CONFIGURED_KEY: &str = "folders_configured";
 // this value can be increased if the folder configuration is changed and must be redone on next program start
 pub(crate) const DC_FOLDERS_CONFIGURED_VERSION: i32 = 4;

-// If more recipients are needed in SMTP's `RCPT TO:` header, the recipient list is split into
-// chunks. This does not affect MIME's `To:` header. Can be overwritten by setting
-// `max_smtp_rcpt_to` in the provider db.
-pub(crate) const DEFAULT_MAX_SMTP_RCPT_TO: usize = 50;
-
-/// How far the last quota check needs to be in the past to be checked by the background function (in seconds).
-pub(crate) const DC_BACKGROUND_FETCH_QUOTA_CHECK_RATELIMIT: u64 = 12 * 60 * 60; // 12 hours
-
 #[cfg(test)]
 mod tests {
    use num_traits::FromPrimitive;
--- a/src/contact.rs
+++ b/src/contact.rs
@@ -6,7 +6,7 @@ use std::convert::{TryFrom, TryInto};
 use std::fmt;
 use std::ops::Deref;
 use std::path::{Path, PathBuf};
-use std::time::UNIX_EPOCH;
+use std::time::{SystemTime, UNIX_EPOCH};

 use anyhow::{bail, ensure, Context as _, Result};
 use async_channel::{self as channel, Receiver, Sender};
@@ -26,17 +26,16 @@ use crate::constants::{Blocked, Chattype, DC_GCL_ADD_SELF, DC_GCL_VERIFIED_ONLY}
 use crate::context::Context;
 use crate::events::EventType;
 use crate::key::{load_self_public_key, DcKey};
-use crate::log::LogExt;
 use crate::login_param::LoginParam;
 use crate::message::MessageState;
 use crate::mimeparser::AvatarAction;
 use crate::param::{Param, Params};
-use crate::peerstate::Peerstate;
+use crate::peerstate::{Peerstate, PeerstateVerifiedStatus};
 use crate::sql::{self, params_iter};
-use crate::sync::{self, Sync::*};
+use crate::sync::{self, Sync::*, SyncData};
 use crate::tools::{
    duration_to_str, get_abs_path, improve_single_line_input, strip_rtlo_characters, time,
-    EmailAddress, SystemTime,
+    EmailAddress,
 };
 use crate::{chat, stock_str};

@@ -349,6 +348,24 @@ pub(crate) enum Modifier {
    Created,
 }

+/// Verification status of the contact.
+#[derive(Debug, PartialEq, Eq, Clone, Copy, FromPrimitive)]
+#[repr(u8)]
+pub enum VerifiedStatus {
+    /// Contact is not verified.
+    Unverified = 0,
+    /// SELF has verified the fingerprint of a contact. Currently unused.
+    Verified = 1,
+    /// SELF and contact have verified their fingerprints in both directions; in the UI typically checkmarks are shown.
+    BidirectVerified = 2,
+}
+
+impl Default for VerifiedStatus {
+    fn default() -> Self {
+        Self::Unverified
+    }
+}
+
 impl Contact {
    /// Loads a single contact object from the database.
    ///
@@ -477,15 +494,6 @@ impl Contact {
    ///
    /// May result in a `#DC_EVENT_CONTACTS_CHANGED` event.
    pub async fn create(context: &Context, name: &str, addr: &str) -> Result<ContactId> {
-        Self::create_ex(context, Sync, name, addr).await
-    }
-
-    pub(crate) async fn create_ex(
-        context: &Context,
-        sync: sync::Sync,
-        name: &str,
-        addr: &str,
-    ) -> Result<ContactId> {
        let name = improve_single_line_input(name);

        let (name, addr) = sanitize_name_and_addr(&name, addr);
@@ -506,16 +514,6 @@ impl Contact {
            set_blocked(context, Nosync, contact_id, false).await?;
        }

-        if sync.into() {
-            chat::sync(
-                context,
-                chat::SyncId::ContactAddr(addr.to_string()),
-                chat::SyncAction::Rename(name.to_string()),
-            )
-            .await
-            .log_err(context)
-            .ok();
-        }
        Ok(contact_id)
    }

@@ -792,7 +790,7 @@ impl Contact {

                sth_modified = Modifier::Created;
                row_id = u32::try_from(transaction.last_insert_rowid())?;
-                info!(context, "Added contact id={row_id} addr={addr}.");
+                info!(context, "added contact id={} addr={}", row_id, &addr);
            }
            Ok(row_id)
        }).await?;
@@ -1057,9 +1055,11 @@ impl Contact {
            let loginparam = LoginParam::load_configured_params(context).await?;
            let peerstate = Peerstate::from_addr(context, &contact.addr).await?;

-            if let Some(peerstate) =
-                peerstate.filter(|peerstate| peerstate.peek_key(false).is_some())
-            {
+            if let Some(peerstate) = peerstate.filter(|peerstate| {
+                peerstate
+                    .peek_key(PeerstateVerifiedStatus::Unverified)
+                    .is_some()
+            }) {
                let stock_message = match peerstate.prefer_encrypt {
                    EncryptPreference::Mutual => stock_str::e2e_preferred(context).await,
                    EncryptPreference::NoPreference => stock_str::e2e_available(context).await,
@@ -1074,11 +1074,11 @@ impl Contact {
                    .fingerprint()
                    .to_string();
                let fingerprint_other_verified = peerstate
-                    .peek_key(true)
+                    .peek_key(PeerstateVerifiedStatus::BidirectVerified)
                    .map(|k| k.fingerprint().to_string())
                    .unwrap_or_default();
                let fingerprint_other_unverified = peerstate
-                    .peek_key(false)
+                    .peek_key(PeerstateVerifiedStatus::Unverified)
                    .map(|k| k.fingerprint().to_string())
                    .unwrap_or_default();
                if loginparam.addr < peerstate.addr {
@@ -1281,37 +1281,20 @@ impl Contact {
    /// otherwise use is_chat_protected().
    /// Use [Self::get_verifier_id] to display the verifier contact
    /// in the info section of the contact profile.
-    pub async fn is_verified(&self, context: &Context) -> Result<bool> {
+    pub async fn is_verified(&self, context: &Context) -> Result<VerifiedStatus> {
        // We're always sort of secured-verified as we could verify the key on this device any time with the key
        // on this device
        if self.id == ContactId::SELF {
-            return Ok(true);
+            return Ok(VerifiedStatus::BidirectVerified);
        }

-        let Some(peerstate) = Peerstate::from_addr(context, &self.addr).await? else {
-            return Ok(false);
-        };
-
-        let forward_verified = peerstate.is_using_verified_key();
-        let backward_verified = peerstate.is_backward_verified(context).await?;
-        Ok(forward_verified && backward_verified)
-    }
-
-    /// Returns true if we have a verified key for the contact
-    /// and it is the same as Autocrypt key.
-    /// This is enough to send messages to the contact in verified chat
-    /// and verify received messages, but not enough to display green checkmark
-    /// or add the contact to verified groups.
-    pub async fn is_forward_verified(&self, context: &Context) -> Result<bool> {
-        if self.id == ContactId::SELF {
-            return Ok(true);
+        if let Some(peerstate) = Peerstate::from_addr(context, &self.addr).await? {
+            if peerstate.is_using_verified_key() {
+                return Ok(VerifiedStatus::BidirectVerified);
+            }
        }

-        let Some(peerstate) = Peerstate::from_addr(context, &self.addr).await? else {
-            return Ok(false);
-        };
-
-        Ok(peerstate.is_using_verified_key())
+        Ok(VerifiedStatus::Unverified)
    }

    /// Returns the `ContactId` that verified the contact.
@@ -1366,7 +1349,7 @@ impl Contact {
            Ok(chat_id.is_protected(context).await? == ProtectionStatus::Protected)
        } else {
            // 1:1 chat does not exist.
-            Ok(self.is_verified(context).await?)
+            Ok(self.is_verified(context).await? == VerifiedStatus::BidirectVerified)
        }
    }

@@ -1517,14 +1500,13 @@ WHERE type=? AND id IN (
                true => chat::SyncAction::Block,
                false => chat::SyncAction::Unblock,
            };
-            chat::sync(
-                context,
-                chat::SyncId::ContactAddr(contact.addr.clone()),
-                action,
-            )
-            .await
-            .log_err(context)
-            .ok();
+            context
+                .add_sync_item(SyncData::AlterChat {
+                    id: chat::SyncId::ContactAddr(contact.addr.clone()),
+                    action,
+                })
+                .await?;
+            context.send_sync_msg().await?;
        }
    }

@@ -1537,7 +1519,7 @@ WHERE type=? AND id IN (
 /// as profile images can be set only by receiving messages, this should be always the case, however.
 ///
 /// For contact SELF, the image is not saved in the contact-database but as Config::Selfavatar;
-/// this typically happens if we see message with our own profile image.
+/// this typically happens if we see message with our own profile image, sent from another device.
 pub(crate) async fn set_profile_image(
    context: &Context,
    contact_id: ContactId,
@@ -1550,7 +1532,7 @@ pub(crate) async fn set_profile_image(
            if contact_id == ContactId::SELF {
                if was_encrypted {
                    context
-                        .set_config_ex(Nosync, Config::Selfavatar, Some(profile_image))
+                        .set_config(Config::Selfavatar, Some(profile_image))
                        .await?;
                } else {
                    info!(context, "Do not use unencrypted selfavatar.");
@@ -1563,9 +1545,7 @@ pub(crate) async fn set_profile_image(
        AvatarAction::Delete => {
            if contact_id == ContactId::SELF {
                if was_encrypted {
-                    context
-                        .set_config_ex(Nosync, Config::Selfavatar, None)
-                        .await?;
+                    context.set_config(Config::Selfavatar, None).await?;
                } else {
                    info!(context, "Do not use unencrypted selfavatar deletion.");
                }
@@ -1597,7 +1577,7 @@ pub(crate) async fn set_status(
    if contact_id == ContactId::SELF {
        if encrypted && has_chat_version {
            context
-                .set_config_ex(Nosync, Config::Selfstatus, Some(&status))
+                .set_config(Config::Selfstatus, Some(&status))
                .await?;
        }
    } else {
@@ -1732,12 +1712,6 @@ impl RecentlySeenLoop {
    async fn run(context: Context, interrupt: Receiver<RecentlySeenInterrupt>) {
        type MyHeapElem = (Reverse<i64>, ContactId);

-        let now = SystemTime::now();
-        let now_ts = now
-            .duration_since(SystemTime::UNIX_EPOCH)
-            .unwrap_or_default()
-            .as_secs() as i64;
-
        // Priority contains all recently seen sorted by the timestamp
        // when they become not recently seen.
        //
@@ -1748,7 +1722,7 @@ impl RecentlySeenLoop {
            .query_map(
                "SELECT id, last_seen FROM contacts
                 WHERE last_seen > ?",
-                (now_ts - SEEN_RECENTLY_SECONDS,),
+                (time() - SEEN_RECENTLY_SECONDS,),
                |row| {
                    let contact_id: ContactId = row.get("id")?;
                    let last_seen: i64 = row.get("last_seen")?;
@@ -1763,6 +1737,8 @@ impl RecentlySeenLoop {
            .unwrap_or_default();

        loop {
+            let now = SystemTime::now();
+
            let (until, contact_id) =
                if let Some((Reverse(timestamp), contact_id)) = unseen_queue.peek() {
                    (
@@ -1929,12 +1905,12 @@ mod tests {
        // Search by name.
        let contacts = Contact::get_all(&context.ctx, 0, Some("bob")).await?;
        assert_eq!(contacts.len(), 1);
-        assert_eq!(contacts.first(), Some(&id));
+        assert_eq!(contacts.get(0), Some(&id));

        // Search by address.
        let contacts = Contact::get_all(&context.ctx, 0, Some("user")).await?;
        assert_eq!(contacts.len(), 1);
-        assert_eq!(contacts.first(), Some(&id));
+        assert_eq!(contacts.get(0), Some(&id));

        let contacts = Contact::get_all(&context.ctx, 0, Some("alice")).await?;
        assert_eq!(contacts.len(), 0);
@@ -1961,7 +1937,7 @@ mod tests {
        // Search by display name (same as manually set name).
        let contacts = Contact::get_all(&context.ctx, 0, Some("someone")).await?;
        assert_eq!(contacts.len(), 1);
-        assert_eq!(contacts.first(), Some(&id));
+        assert_eq!(contacts.get(0), Some(&id));

        Ok(())
    }
@@ -2833,33 +2809,4 @@ Hi."#;

        Ok(())
    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_sync_create() -> Result<()> {
-        let alice0 = &TestContext::new_alice().await;
-        let alice1 = &TestContext::new_alice().await;
-        for a in [alice0, alice1] {
-            a.set_config_bool(Config::SyncMsgs, true).await?;
-        }
-
-        Contact::create(alice0, "Bob", "bob@example.net").await?;
-        test_utils::sync(alice0, alice1).await;
-        let a1b_contact_id =
-            Contact::lookup_id_by_addr(alice1, "bob@example.net", Origin::ManuallyCreated)
-                .await?
-                .unwrap();
-        let a1b_contact = Contact::get_by_id(alice1, a1b_contact_id).await?;
-        assert_eq!(a1b_contact.name, "Bob");
-
-        Contact::create(alice0, "Bob Renamed", "bob@example.net").await?;
-        test_utils::sync(alice0, alice1).await;
-        let id = Contact::lookup_id_by_addr(alice1, "bob@example.net", Origin::ManuallyCreated)
-            .await?
-            .unwrap();
-        assert_eq!(id, a1b_contact_id);
-        let a1b_contact = Contact::get_by_id(alice1, a1b_contact_id).await?;
-        assert_eq!(a1b_contact.name, "Bob Renamed");
-
-        Ok(())
-    }
 }
--- a/src/context.rs
+++ b/src/context.rs
@@ -6,37 +6,28 @@ use std::ops::Deref;
 use std::path::{Path, PathBuf};
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
-use std::time::Duration;
+use std::time::{Duration, Instant, SystemTime};

 use anyhow::{bail, ensure, Context as _, Result};
 use async_channel::{self as channel, Receiver, Sender};
-use pgp::SignedPublicKey;
 use ratelimit::Ratelimit;
 use tokio::sync::{Mutex, Notify, RwLock};

-use crate::aheader::EncryptPreference;
-use crate::chat::{get_chat_cnt, ChatId, ProtectionStatus};
+use crate::chat::{get_chat_cnt, ChatId};
 use crate::config::Config;
-use crate::constants::{
-    self, DC_BACKGROUND_FETCH_QUOTA_CHECK_RATELIMIT, DC_CHAT_ID_TRASH, DC_VERSION_STR,
-};
-use crate::contact::{Contact, ContactId};
+use crate::constants::DC_VERSION_STR;
+use crate::contact::Contact;
 use crate::debug_logging::DebugLogging;
-use crate::download::DownloadState;
 use crate::events::{Event, EventEmitter, EventType, Events};
-use crate::imap::{FolderMeaning, Imap, ServerMetadata};
-use crate::key::{load_self_public_key, load_self_secret_key, DcKey as _};
+use crate::key::{load_self_public_key, DcKey as _};
 use crate::login_param::LoginParam;
-use crate::message::{self, Message, MessageState, MsgId, Viewtype};
-use crate::param::{Param, Params};
-use crate::peerstate::Peerstate;
-use crate::push::PushSubscriber;
+use crate::message::{self, MessageState, MsgId};
 use crate::quota::QuotaInfo;
-use crate::scheduler::{convert_folder_meaning, SchedulerState};
+use crate::scheduler::SchedulerState;
 use crate::sql::Sql;
 use crate::stock_str::StockStrings;
 use crate::timesmearing::SmearedTimestamp;
-use crate::tools::{self, create_id, duration_to_str, time, time_elapsed};
+use crate::tools::{duration_to_str, time};

 /// Builder for the [`Context`].
 ///
@@ -87,8 +78,6 @@ pub struct ContextBuilder {
    events: Events,
    stock_strings: StockStrings,
    password: Option<String>,
-
-    push_subscriber: Option<PushSubscriber>,
 }

 impl ContextBuilder {
@@ -104,7 +93,6 @@ impl ContextBuilder {
            events: Events::new(),
            stock_strings: StockStrings::new(),
            password: None,
-            push_subscriber: None,
        }
    }

@@ -159,32 +147,11 @@ impl ContextBuilder {
        self
    }

-    /// Sets push subscriber.
-    pub(crate) fn with_push_subscriber(mut self, push_subscriber: PushSubscriber) -> Self {
-        self.push_subscriber = Some(push_subscriber);
-        self
-    }
-
-    /// Builds the [`Context`] without opening it.
-    pub async fn build(self) -> Result<Context> {
-        let push_subscriber = self.push_subscriber.unwrap_or_default();
-        let context = Context::new_closed(
-            &self.dbfile,
-            self.id,
-            self.events,
-            self.stock_strings,
-            push_subscriber,
-        )
-        .await?;
-        Ok(context)
-    }
-
-    /// Builds the [`Context`] and opens it.
-    ///
-    /// Returns error if context cannot be opened with the given passphrase.
+    /// Opens the [`Context`].
    pub async fn open(self) -> Result<Context> {
-        let password = self.password.clone().unwrap_or_default();
-        let context = self.build().await?;
+        let context =
+            Context::new_closed(&self.dbfile, self.id, self.events, self.stock_strings).await?;
+        let password = self.password.unwrap_or_default();
        match context.open(password).await? {
            true => Ok(context),
            false => bail!("database could not be decrypted, incorrect or missing password"),
@@ -257,10 +224,7 @@ pub struct InnerContext {
    /// <https://datatracker.ietf.org/doc/html/rfc2971>
    pub(crate) server_id: RwLock<Option<HashMap<String, String>>>,

-    /// IMAP METADATA.
-    pub(crate) metadata: RwLock<Option<ServerMetadata>>,
-
-    pub(crate) last_full_folder_scan: Mutex<Option<tools::Time>>,
+    pub(crate) last_full_folder_scan: Mutex<Option<Instant>>,

    /// ID for this `Context` in the current process.
    ///
@@ -268,7 +232,7 @@ pub struct InnerContext {
    /// be identified by this ID.
    pub(crate) id: u32,

-    creation_time: tools::Time,
+    creation_time: SystemTime,

    /// The text of the last error logged and emitted as an event.
    /// If the ui wants to display an error after a failure,
@@ -280,13 +244,6 @@ pub struct InnerContext {
    /// Standard RwLock instead of [`tokio::sync::RwLock`] is used
    /// because the lock is used from synchronous [`Context::emit_event`].
    pub(crate) debug_logging: std::sync::RwLock<Option<DebugLogging>>,
-
-    /// Push subscriber to store device token
-    /// and register for heartbeat notifications.
-    pub(crate) push_subscriber: PushSubscriber,
-
-    /// True if account has subscribed to push notifications via IMAP.
-    pub(crate) push_subscribed: AtomicBool,
 }

 /// The state of ongoing process.
@@ -296,7 +253,7 @@ enum RunningState {
    Running { cancel_sender: Sender<()> },

    /// Cancel signal has been sent, waiting for ongoing process to be freed.
-    ShallStop { request: tools::Time },
+    ShallStop { request: Instant },

    /// There is no ongoing process, a new one can be allocated.
    Stopped,
@@ -332,8 +289,7 @@ impl Context {
        events: Events,
        stock_strings: StockStrings,
    ) -> Result<Context> {
-        let context =
-            Self::new_closed(dbfile, id, events, stock_strings, Default::default()).await?;
+        let context = Self::new_closed(dbfile, id, events, stock_strings).await?;

        // Open the database if is not encrypted.
        if context.check_passphrase("".to_string()).await? {
@@ -348,7 +304,6 @@ impl Context {
        id: u32,
        events: Events,
        stockstrings: StockStrings,
-        push_subscriber: PushSubscriber,
    ) -> Result<Context> {
        let mut blob_fname = OsString::new();
        blob_fname.push(dbfile.file_name().unwrap_or_default());
@@ -357,14 +312,7 @@ impl Context {
        if !blobdir.exists() {
            tokio::fs::create_dir_all(&blobdir).await?;
        }
-        let context = Context::with_blobdir(
-            dbfile.into(),
-            blobdir,
-            id,
-            events,
-            stockstrings,
-            push_subscriber,
-        )?;
+        let context = Context::with_blobdir(dbfile.into(), blobdir, id, events, stockstrings)?;
        Ok(context)
    }

@@ -407,7 +355,6 @@ impl Context {
        id: u32,
        events: Events,
        stockstrings: StockStrings,
-        push_subscriber: PushSubscriber,
    ) -> Result<Context> {
        ensure!(
            blobdir.is_dir(),
@@ -437,13 +384,10 @@ impl Context {
            resync_request: AtomicBool::new(false),
            new_msgs_notify,
            server_id: RwLock::new(None),
-            metadata: RwLock::new(None),
-            creation_time: tools::Time::now(),
+            creation_time: std::time::SystemTime::now(),
            last_full_folder_scan: Mutex::new(None),
            last_error: std::sync::RwLock::new("".to_string()),
            debug_logging: std::sync::RwLock::new(None),
-            push_subscriber,
-            push_subscribed: AtomicBool::new(false),
        };

        let ctx = Context {
@@ -454,7 +398,7 @@ impl Context {
    }

    /// Starts the IO scheduler.
-    pub async fn start_io(&self) {
+    pub async fn start_io(&mut self) {
        if !self.is_configured().await.unwrap_or_default() {
            warn!(self, "can not start io on a context that is not configured");
            return;
@@ -492,58 +436,6 @@ impl Context {
        self.scheduler.maybe_network().await;
    }

-    /// Does a background fetch
-    /// pauses the scheduler and does one imap fetch, then unpauses and returns
-    pub async fn background_fetch(&self) -> Result<()> {
-        if !(self.is_configured().await?) {
-            return Ok(());
-        }
-
-        let address = self.get_primary_self_addr().await?;
-        let time_start = tools::Time::now();
-        info!(self, "background_fetch started fetching {address}");
-
-        let _pause_guard = self.scheduler.pause(self.clone()).await?;
-
-        // connection
-        let mut connection = Imap::new_configured(self, channel::bounded(1).1).await?;
-        let mut session = connection.prepare(self).await?;
-
-        // fetch imap folders
-        for folder_meaning in [FolderMeaning::Inbox, FolderMeaning::Mvbox] {
-            let (_, watch_folder) = convert_folder_meaning(self, folder_meaning).await?;
-            connection
-                .fetch_move_delete(self, &mut session, &watch_folder, folder_meaning)
-                .await?;
-        }
-
-        // update quota (to send warning if full) - but only check it once in a while
-        let quota_needs_update = {
-            let quota = self.quota.read().await;
-            quota
-                .as_ref()
-                .filter(|quota| {
-                    time_elapsed(&quota.modified)
-                        > Duration::from_secs(DC_BACKGROUND_FETCH_QUOTA_CHECK_RATELIMIT)
-                })
-                .is_none()
-        };
-
-        if quota_needs_update {
-            if let Err(err) = self.update_recent_quota(&mut session).await {
-                warn!(self, "Failed to update quota: {err:#}.");
-            }
-        }
-
-        info!(
-            self,
-            "background_fetch done for {address} took {:?}",
-            time_elapsed(&time_start),
-        );
-
-        Ok(())
-    }
-
    pub(crate) async fn schedule_resync(&self) -> Result<()> {
        self.resync_request.store(true, Ordering::Relaxed);
        self.scheduler.interrupt_inbox().await;
@@ -640,7 +532,7 @@ impl Context {
    pub(crate) async fn free_ongoing(&self) {
        let mut s = self.running_state.write().await;
        if let RunningState::ShallStop { request } = *s {
-            info!(self, "Ongoing stopped in {:?}", time_elapsed(&request));
+            info!(self, "Ongoing stopped in {:?}", request.elapsed());
        }
        *s = RunningState::Stopped;
    }
@@ -655,7 +547,7 @@ impl Context {
                }
                info!(self, "Signaling the ongoing process to stop ASAP.",);
                *s = RunningState::ShallStop {
-                    request: tools::Time::now(),
+                    request: Instant::now(),
                };
            }
            RunningState::ShallStop { .. } | RunningState::Stopped => {
@@ -721,7 +613,7 @@ impl Context {
        let only_fetch_mvbox = self.get_config_int(Config::OnlyFetchMvbox).await?;
        let folders_configured = self
            .sql
-            .get_raw_config_int(constants::DC_FOLDERS_CONFIGURED_KEY)
+            .get_raw_config_int("folders_configured")
            .await?
            .unwrap_or_default();

@@ -761,7 +653,7 @@ impl Context {
        );
        res.insert("journal_mode", journal_mode);
        res.insert("blobdir", self.get_blobdir().display().to_string());
-        res.insert("displayname", displayname.unwrap_or_else(|| unset.into()));
+        res.insert("display_name", displayname.unwrap_or_else(|| unset.into()));
        res.insert(
            "selfavatar",
            self.get_config(Config::Selfavatar)
@@ -777,16 +669,6 @@ impl Context {
            res.insert("imap_server_id", format!("{server_id:?}"));
        }

-        if let Some(metadata) = &*self.metadata.read().await {
-            if let Some(comment) = &metadata.comment {
-                res.insert("imap_server_comment", format!("{comment:?}"));
-            }
-
-            if let Some(admin) = &metadata.admin {
-                res.insert("imap_server_admin", format!("{admin:?}"));
-            }
-        }
-
        res.insert("secondary_addrs", secondary_addrs);
        res.insert(
            "fetch_existing_msgs",
@@ -813,10 +695,7 @@ impl Context {
        res.insert("sentbox_watch", sentbox_watch.to_string());
        res.insert("mvbox_move", mvbox_move.to_string());
        res.insert("only_fetch_mvbox", only_fetch_mvbox.to_string());
-        res.insert(
-            constants::DC_FOLDERS_CONFIGURED_KEY,
-            folders_configured.to_string(),
-        );
+        res.insert("folders_configured", folders_configured.to_string());
        res.insert("configured_inbox_folder", configured_inbox_folder);
        res.insert("configured_sentbox_folder", configured_sentbox_folder);
        res.insert("configured_mvbox_folder", configured_mvbox_folder);
@@ -867,12 +746,6 @@ impl Context {
                .await?
                .to_string(),
        );
-        res.insert(
-            "last_cant_decrypt_outgoing_msgs",
-            self.get_config_int(Config::LastCantDecryptOutgoingMsgs)
-                .await?
-                .to_string(),
-        );
        res.insert(
            "scan_all_folders_debounce_secs",
            self.get_config_int(Config::ScanAllFoldersDebounceSecs)
@@ -916,177 +789,12 @@ impl Context {
                .to_string(),
        );

-        let elapsed = time_elapsed(&self.creation_time);
-        res.insert("uptime", duration_to_str(elapsed));
+        let elapsed = self.creation_time.elapsed();
+        res.insert("uptime", duration_to_str(elapsed.unwrap_or_default()));

        Ok(res)
    }

-    async fn get_self_report(&self) -> Result<String> {
-        #[derive(Default)]
-        struct ChatNumbers {
-            protected: u32,
-            protection_broken: u32,
-            opportunistic_dc: u32,
-            opportunistic_mua: u32,
-            unencrypted_dc: u32,
-            unencrypted_mua: u32,
-        }
-
-        let mut res = String::new();
-        res += &format!("core_version {}\n", get_version_str());
-
-        let num_msgs: u32 = self
-            .sql
-            .query_get_value(
-                "SELECT COUNT(*) FROM msgs WHERE hidden=0 AND chat_id!=?",
-                (DC_CHAT_ID_TRASH,),
-            )
-            .await?
-            .unwrap_or_default();
-        res += &format!("num_msgs {}\n", num_msgs);
-
-        let num_chats: u32 = self
-            .sql
-            .query_get_value("SELECT COUNT(*) FROM chats WHERE id>9 AND blocked!=1", ())
-            .await?
-            .unwrap_or_default();
-        res += &format!("num_chats {}\n", num_chats);
-
-        let db_size = tokio::fs::metadata(&self.sql.dbfile).await?.len();
-        res += &format!("db_size_bytes {}\n", db_size);
-
-        let secret_key = &load_self_secret_key(self).await?.primary_key;
-        let key_created = secret_key.created_at().timestamp();
-        res += &format!("key_created {}\n", key_created);
-
-        // how many of the chats active in the last months are:
-        // - protected
-        // - protection-broken
-        // - opportunistic-encrypted and the contact uses Delta Chat
-        // - opportunistic-encrypted and the contact uses a classical MUA
-        // - unencrypted and the contact uses Delta Chat
-        // - unencrypted and the contact uses a classical MUA
-        let three_months_ago = time().saturating_sub(3600 * 24 * 30 * 3);
-        let chats = self
-            .sql
-            .query_map(
-                "SELECT c.protected, m.param, m.msgrmsg
-                    FROM chats c
-                    JOIN msgs m
-                        ON c.id=m.chat_id
-                        AND m.id=(
-                                SELECT id
-                                FROM msgs
-                                WHERE chat_id=c.id
-                                AND hidden=0
-                                AND download_state=?
-                                AND to_id!=?
-                                ORDER BY timestamp DESC, id DESC LIMIT 1)
-                    WHERE c.id>9
-                    AND (c.blocked=0 OR c.blocked=2)
-                    AND IFNULL(m.timestamp,c.created_timestamp) > ?
-                    GROUP BY c.id",
-                (DownloadState::Done, ContactId::INFO, three_months_ago),
-                |row| {
-                    let protected: ProtectionStatus = row.get(0)?;
-                    let message_param: Params =
-                        row.get::<_, String>(1)?.parse().unwrap_or_default();
-                    let is_dc_message: bool = row.get(2)?;
-                    Ok((protected, message_param, is_dc_message))
-                },
-                |rows| {
-                    let mut chats = ChatNumbers::default();
-                    for row in rows {
-                        let (protected, message_param, is_dc_message) = row?;
-                        let encrypted = message_param
-                            .get_bool(Param::GuaranteeE2ee)
-                            .unwrap_or(false);
-
-                        if protected == ProtectionStatus::Protected {
-                            chats.protected += 1;
-                        } else if protected == ProtectionStatus::ProtectionBroken {
-                            chats.protection_broken += 1;
-                        } else if encrypted {
-                            if is_dc_message {
-                                chats.opportunistic_dc += 1;
-                            } else {
-                                chats.opportunistic_mua += 1;
-                            }
-                        } else if is_dc_message {
-                            chats.unencrypted_dc += 1;
-                        } else {
-                            chats.unencrypted_mua += 1;
-                        }
-                    }
-                    Ok(chats)
-                },
-            )
-            .await?;
-        res += &format!("chats_protected {}\n", chats.protected);
-        res += &format!("chats_protection_broken {}\n", chats.protection_broken);
-        res += &format!("chats_opportunistic_dc {}\n", chats.opportunistic_dc);
-        res += &format!("chats_opportunistic_mua {}\n", chats.opportunistic_mua);
-        res += &format!("chats_unencrypted_dc {}\n", chats.unencrypted_dc);
-        res += &format!("chats_unencrypted_mua {}\n", chats.unencrypted_mua);
-
-        let self_reporting_id = match self.get_config(Config::SelfReportingId).await? {
-            Some(id) => id,
-            None => {
-                let id = create_id();
-                self.set_config(Config::SelfReportingId, Some(&id)).await?;
-                id
-            }
-        };
-        res += &format!("self_reporting_id {}", self_reporting_id);
-
-        Ok(res)
-    }
-
-    /// Drafts a message with statistics about the usage of Delta Chat.
-    /// The user can inspect the message if they want, and then hit "Send".
-    ///
-    /// On the other end, a bot will receive the message and make it available
-    /// to Delta Chat's developers.
-    pub async fn draft_self_report(&self) -> Result<ChatId> {
-        const SELF_REPORTING_BOT: &str = "self_reporting@testrun.org";
-
-        let contact_id = Contact::create(self, "Statistics bot", SELF_REPORTING_BOT).await?;
-        let chat_id = ChatId::create_for_contact(self, contact_id).await?;
-
-        // We're including the bot's public key in Delta Chat
-        // so that the first message to the bot can directly be encrypted:
-        let public_key = SignedPublicKey::from_base64(
-            "xjMEZbfBlBYJKwYBBAHaRw8BAQdABpLWS2PUIGGo4pslVt4R8sylP5wZihmhf1DTDr3oCM\
-	        PNHDxzZWxmX3JlcG9ydGluZ0B0ZXN0cnVuLm9yZz7CiwQQFggAMwIZAQUCZbfBlAIbAwQLCQgHBhUI\
-	        CQoLAgMWAgEWIQTS2i16sHeYTckGn284K3M5Z4oohAAKCRA4K3M5Z4oohD8dAQCQV7CoH6UP4PD+Nq\
-	        I4kW5tbbqdh2AnDROg60qotmLExAEAxDfd3QHAK9f8b9qQUbLmHIztCLxhEuVbWPBEYeVW0gvOOARl\
-	        t8GUEgorBgEEAZdVAQUBAQdAMBUhYoAAcI625vGZqnM5maPX4sGJ7qvJxPAFILPy6AcDAQgHwngEGB\
-	        YIACAFAmW3wZQCGwwWIQTS2i16sHeYTckGn284K3M5Z4oohAAKCRA4K3M5Z4oohPwCAQCvzk1ObIkj\
-	        2GqsuIfaULlgdnfdZY8LNary425CEfHZDQD5AblXVrlMO1frdlc/Vo9z3pEeCrfYdD7ITD3/OeVoiQ\
-	        4=",
-        )?;
-        let mut peerstate = Peerstate::from_public_key(
-            SELF_REPORTING_BOT,
-            0,
-            EncryptPreference::Mutual,
-            &public_key,
-        );
-        let fingerprint = public_key.fingerprint();
-        peerstate.set_verified(public_key, fingerprint, "".to_string())?;
-        peerstate.save_to_db(&self.sql).await?;
-        chat_id
-            .set_protection(self, ProtectionStatus::Protected, time(), Some(contact_id))
-            .await?;
-
-        let mut msg = Message::new(Viewtype::Text);
-        msg.text = self.get_self_report().await?;
-
-        chat_id.set_draft(self, Some(&mut msg)).await?;
-
-        Ok(chat_id)
-    }
-
    /// Get a list of fresh, unmuted messages in unblocked chats.
    ///
    /// The list starts with the most recent message
@@ -1357,10 +1065,9 @@ mod tests {
    use crate::constants::Chattype;
    use crate::contact::ContactId;
    use crate::message::{Message, Viewtype};
-    use crate::mimeparser::SystemMessage;
    use crate::receive_imf::receive_imf;
-    use crate::test_utils::{get_chat_msg, TestContext};
-    use crate::tools::{create_outgoing_rfc724_mid, SystemTime};
+    use crate::test_utils::TestContext;
+    use crate::tools::create_outgoing_rfc724_mid;

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_wrong_db() -> Result<()> {
@@ -1395,7 +1102,7 @@ mod tests {
             \n\
             hello\n",
            contact.get_addr(),
-            create_outgoing_rfc724_mid(contact.get_addr())
+            create_outgoing_rfc724_mid(None, contact.get_addr())
        );
        println!("{msg}");
        receive_imf(t, msg.as_bytes(), false).await.unwrap();
@@ -1545,14 +1252,7 @@ mod tests {
        let tmp = tempfile::tempdir().unwrap();
        let dbfile = tmp.path().join("db.sqlite");
        let blobdir = PathBuf::new();
-        let res = Context::with_blobdir(
-            dbfile,
-            blobdir,
-            1,
-            Events::new(),
-            StockStrings::new(),
-            Default::default(),
-        );
+        let res = Context::with_blobdir(dbfile, blobdir, 1, Events::new(), StockStrings::new());
        assert!(res.is_err());
    }

@@ -1561,14 +1261,7 @@ mod tests {
        let tmp = tempfile::tempdir().unwrap();
        let dbfile = tmp.path().join("db.sqlite");
        let blobdir = tmp.path().join("blobs");
-        let res = Context::with_blobdir(
-            dbfile,
-            blobdir,
-            1,
-            Events::new(),
-            StockStrings::new(),
-            Default::default(),
-        );
+        let res = Context::with_blobdir(dbfile, blobdir, 1, Events::new(), StockStrings::new());
        assert!(res.is_err());
    }

@@ -1612,7 +1305,6 @@ mod tests {
            "mail_security",
            "notify_about_wrong_pw",
            "save_mime_headers",
-            "self_reporting_id",
            "selfstatus",
            "send_server",
            "send_user",
@@ -1626,7 +1318,6 @@ mod tests {
            "socks5_port",
            "socks5_user",
            "socks5_password",
-            "key_id",
        ];
        let t = TestContext::new().await;
        let info = t.get_info().await.unwrap();
@@ -1678,7 +1369,7 @@ mod tests {
        assert_eq!(res.len(), 2);

        // Message added later is returned first.
-        assert_eq!(res.first(), Some(&msg2.id));
+        assert_eq!(res.get(0), Some(&msg2.id));
        assert_eq!(res.get(1), Some(&msg1.id));

        // Global search with longer text does not find any message.
@@ -1791,18 +1482,16 @@ mod tests {
        let dir = tempdir()?;
        let dbfile = dir.path().join("db.sqlite");

-        let context = ContextBuilder::new(dbfile.clone())
-            .with_id(1)
-            .build()
+        let id = 1;
+        let context = Context::new_closed(&dbfile, id, Events::new(), StockStrings::new())
            .await
            .context("failed to create context")?;
        assert_eq!(context.open("foo".to_string()).await?, true);
        assert_eq!(context.is_open().await, true);
        drop(context);

-        let context = ContextBuilder::new(dbfile)
-            .with_id(2)
-            .build()
+        let id = 2;
+        let context = Context::new(&dbfile, id, Events::new(), StockStrings::new())
            .await
            .context("failed to create context")?;
        assert_eq!(context.is_open().await, false);
@@ -1818,9 +1507,8 @@ mod tests {
        let dir = tempdir()?;
        let dbfile = dir.path().join("db.sqlite");

-        let context = ContextBuilder::new(dbfile)
-            .with_id(1)
-            .build()
+        let id = 1;
+        let context = Context::new_closed(&dbfile, id, Events::new(), StockStrings::new())
            .await
            .context("failed to create context")?;
        assert_eq!(context.open("foo".to_string()).await?, true);
@@ -1898,7 +1586,7 @@ mod tests {

        let bob_next_msg_ids = bob.get_next_msgs().await?;
        assert_eq!(bob_next_msg_ids.len(), 1);
-        assert_eq!(bob_next_msg_ids.first(), Some(&received_msg.id));
+        assert_eq!(bob_next_msg_ids.get(0), Some(&received_msg.id));

        bob.set_config_u32(Config::LastMsgId, received_msg.id.to_u32())
            .await?;
@@ -1907,7 +1595,7 @@ mod tests {
        // Next messages include self-sent messages.
        let alice_next_msg_ids = alice.get_next_msgs().await?;
        assert_eq!(alice_next_msg_ids.len(), 1);
-        assert_eq!(alice_next_msg_ids.first(), Some(&sent_msg.sender_msg_id));
+        assert_eq!(alice_next_msg_ids.get(0), Some(&sent_msg.sender_msg_id));

        alice
            .set_config_u32(Config::LastMsgId, sent_msg.sender_msg_id.to_u32())
@@ -1916,24 +1604,4 @@ mod tests {

        Ok(())
    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_draft_self_report() -> Result<()> {
-        let alice = TestContext::new_alice().await;
-
-        let chat_id = alice.draft_self_report().await?;
-        let msg = get_chat_msg(&alice, chat_id, 0, 1).await;
-        assert_eq!(msg.get_info_type(), SystemMessage::ChatProtectionEnabled);
-
-        let chat = Chat::load_from_db(&alice, chat_id).await?;
-        assert!(chat.is_protected());
-
-        let mut draft = chat_id.get_draft(&alice).await?.unwrap();
-        assert!(draft.text.starts_with("core_version"));
-
-        // Test that sending into the protected chat works:
-        let _sent = alice.send_msg(chat_id, &mut draft).await;
-
-        Ok(())
-    }
 }
--- a/src/debug_logging.rs
+++ b/src/debug_logging.rs
@@ -54,7 +54,7 @@ pub async fn debug_logging_loop(context: &Context, events: Receiver<DebugEventLo
        match context
            .write_status_update_inner(
                &msg_id,
-                &StatusUpdateItem {
+                StatusUpdateItem {
                    payload: json!({
                        "event": event,
                        "time": time,
@@ -62,7 +62,6 @@ pub async fn debug_logging_loop(context: &Context, events: Receiver<DebugEventLo
                    info: None,
                    summary: None,
                    document: None,
-                    uid: None,
                },
            )
            .await
@@ -71,17 +70,10 @@ pub async fn debug_logging_loop(context: &Context, events: Receiver<DebugEventLo
                eprintln!("Can't log event to webxdc status update: {err:#}");
            }
            Ok(serial) => {
-                if let Some(serial) = serial {
-                    if !matches!(event, EventType::WebxdcStatusUpdate { .. }) {
-                        context.emit_event(EventType::WebxdcStatusUpdate {
-                            msg_id,
-                            status_update_serial: serial,
-                        });
-                    }
-                } else {
-                    // This should not happen as the update has no `uid`.
-                    error!(context, "Debug logging update is not created.");
-                };
+                context.emit_event(EventType::WebxdcStatusUpdate {
+                    msg_id,
+                    status_update_serial: serial,
+                });
            }
        }
    }
--- a/src/decrypt.rs
+++ b/src/decrypt.rs
@@ -12,7 +12,7 @@ use crate::authres::{self, DkimResults};
 use crate::contact::addr_cmp;
 use crate::context::Context;
 use crate::headerdef::{HeaderDef, HeaderDefMap};
-use crate::key::{self, DcKey, Fingerprint, SignedPublicKey, SignedSecretKey};
+use crate::key::{DcKey, Fingerprint, SignedPublicKey, SignedSecretKey};
 use crate::peerstate::Peerstate;
 use crate::pgp;

@@ -23,14 +23,32 @@ use crate::pgp;
 ///
 /// If the message is wrongly signed, HashSet will be empty.
 pub fn try_decrypt(
+    context: &Context,
    mail: &ParsedMail<'_>,
    private_keyring: &[SignedSecretKey],
    public_keyring_for_validate: &[SignedPublicKey],
 ) -> Result<Option<(Vec<u8>, HashSet<Fingerprint>)>> {
-    let encrypted_data_part = match get_autocrypt_mime(mail)
-        .or_else(|| get_mixed_up_mime(mail))
-        .or_else(|| get_attachment_mime(mail))
-    {
+    let encrypted_data_part = match {
+        let mime = get_autocrypt_mime(mail);
+        if mime.is_some() {
+            info!(context, "Detected Autocrypt-mime message.");
+        }
+        mime
+    }
+    .or_else(|| {
+        let mime = get_mixed_up_mime(mail);
+        if mime.is_some() {
+            info!(context, "Detected mixed-up mime message.");
+        }
+        mime
+    })
+    .or_else(|| {
+        let mime = get_attachment_mime(mail);
+        if mime.is_some() {
+            info!(context, "Detected attached Autocrypt-mime message.");
+        }
+        mime
+    }) {
        None => return Ok(None),
        Some(res) => res,
    };
@@ -264,22 +282,16 @@ pub(crate) fn validate_detached_signature<'a, 'b>(
    }
 }

-/// Returns public keyring for `peerstate`.
-pub(crate) async fn keyring_from_peerstate(
-    context: &Context,
-    peerstate: Option<&Peerstate>,
-) -> Result<Vec<SignedPublicKey>> {
+pub(crate) fn keyring_from_peerstate(peerstate: Option<&Peerstate>) -> Vec<SignedPublicKey> {
    let mut public_keyring_for_validate = Vec::new();
    if let Some(peerstate) = peerstate {
        if let Some(key) = &peerstate.public_key {
            public_keyring_for_validate.push(key.clone());
        } else if let Some(key) = &peerstate.gossip_key {
            public_keyring_for_validate.push(key.clone());
-        } else if context.is_self_addr(&peerstate.addr).await? {
-            public_keyring_for_validate = key::load_self_public_keyring(context).await?;
        }
    }
-    Ok(public_keyring_for_validate)
+    public_keyring_for_validate
 }

 /// Applies Autocrypt header to Autocrypt peer state and saves it into the database.
@@ -298,7 +310,6 @@ pub(crate) async fn get_autocrypt_peerstate(
    message_time: i64,
    allow_change: bool,
 ) -> Result<Option<Peerstate>> {
-    let allow_change = allow_change && !context.is_self_addr(from).await?;
    let mut peerstate;

    // Apply Autocrypt header
--- a/src/dehtml.rs
+++ b/src/dehtml.rs
@@ -181,12 +181,7 @@ fn dehtml_text_cb(event: &BytesText, dehtml: &mut Dehtml) {
    if dehtml.get_add_text() == AddText::YesPreserveLineEnds
        || dehtml.get_add_text() == AddText::YesRemoveLineEnds
    {
-        let event = event as &[_];
-        let event_str = std::str::from_utf8(event).unwrap_or_default();
-        let mut last_added = escaper::decode_html_buf_sloppy(event).unwrap_or_default();
-        if event_str.starts_with(&last_added) {
-            last_added = event_str.to_string();
-        }
+        let last_added = escaper::decode_html_buf_sloppy(event as &[_]).unwrap_or_default();

        if dehtml.get_add_text() == AddText::YesRemoveLineEnds {
            // Replace all line ends with spaces.
@@ -532,6 +527,6 @@ mod tests {
    fn test_spaces() {
        let input = include_str!("../test-data/spaces.html");
        let txt = dehtml(input).unwrap();
-        assert_eq!(txt.text, "Welcome back to Strolling!\n\nHey there,\n\nWelcome back! Use this link to securely sign in to your Strolling account:\n\nSign in to Strolling\n\nFor your security, the link will expire in 24 hours time.\n\nSee you soon!\n\nYou can also copy & paste this URL into your browser:\n\nhttps://strolling.rosano.ca/members/?token=XXX&action=signin&r=https%3A%2F%2Fstrolling.rosano.ca%2F\n\nIf you did not make this request, you can safely ignore this email.\n\nThis message was sent from [strolling.rosano.ca](https://strolling.rosano.ca/) to [alice@example.org](mailto:alice@example.org)");
+        assert_eq!(txt.text, "Welcome back to Strolling!\n\nHey there,\n\nWelcome back! Use this link to securely sign in to your Strolling account:\n\nSign in to Strolling\n\nFor your security, the link will expire in 24 hours time.\n\nSee you soon!\n\nYou can also copy\n\nhttps://strolling.rosano.ca/members/?token=XXX\n\nIf you did not make this request, you can safely ignore this email.\n\nThis message was sent from [strolling.rosano.ca](https://strolling.rosano.ca/) to [alice@example.org](mailto:alice@example.org)");
    }
 }
--- a/src/download.rs
+++ b/src/download.rs
@@ -3,13 +3,13 @@
 use std::cmp::max;
 use std::collections::BTreeMap;

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

 use crate::config::Config;
 use crate::context::Context;
-use crate::imap::session::Session;
+use crate::imap::{Imap, ImapActionResult};
 use crate::message::{Message, MsgId, Viewtype};
 use crate::mimeparser::{MimeMessage, Part};
 use crate::tools::time;
@@ -129,44 +129,50 @@ impl Message {
 /// Actually download a message partially downloaded before.
 ///
 /// Most messages are downloaded automatically on fetch instead.
-pub(crate) async fn download_msg(
-    context: &Context,
-    msg_id: MsgId,
-    session: &mut Session,
-) -> Result<()> {
+pub(crate) async fn download_msg(context: &Context, msg_id: MsgId, imap: &mut Imap) -> Result<()> {
+    imap.prepare(context).await?;
+
    let msg = Message::load_from_db(context, msg_id).await?;
    let row = context
        .sql
        .query_row_optional(
-            "SELECT uid, folder, uidvalidity FROM imap WHERE rfc724_mid=? AND target!=''",
+            "SELECT uid, folder FROM imap WHERE rfc724_mid=? AND target!=''",
            (&msg.rfc724_mid,),
            |row| {
                let server_uid: u32 = row.get(0)?;
                let server_folder: String = row.get(1)?;
-                let uidvalidity: u32 = row.get(2)?;
-                Ok((server_uid, server_folder, uidvalidity))
+                Ok((server_uid, server_folder))
            },
        )
        .await?;

-    let Some((server_uid, server_folder, uidvalidity)) = row else {
+    if let Some((server_uid, server_folder)) = row {
+        match imap
+            .fetch_single_msg(context, &server_folder, server_uid, msg.rfc724_mid.clone())
+            .await
+        {
+            ImapActionResult::RetryLater | ImapActionResult::Failed => {
+                msg.id
+                    .update_download_state(context, DownloadState::Failure)
+                    .await?;
+                Err(anyhow!("Call download_full() again to try over."))
+            }
+            ImapActionResult::Success => {
+                // update_download_state() not needed as receive_imf() already
+                // set the state and emitted the event.
+                Ok(())
+            }
+        }
+    } else {
        // No IMAP record found, we don't know the UID and folder.
-        return Err(anyhow!("Call download_full() again to try over."));
-    };
-
-    session
-        .fetch_single_msg(
-            context,
-            &server_folder,
-            uidvalidity,
-            server_uid,
-            msg.rfc724_mid.clone(),
-        )
-        .await?;
-    Ok(())
+        msg.id
+            .update_download_state(context, DownloadState::Failure)
+            .await?;
+        Err(anyhow!("Call download_full() again to try over."))
+    }
 }

-impl Session {
+impl Imap {
    /// Download a single message and pipe it to receive_imf().
    ///
    /// receive_imf() is not directly aware that this is a result of a call to download_msg(),
@@ -175,36 +181,33 @@ impl Session {
        &mut self,
        context: &Context,
        folder: &str,
-        uidvalidity: u32,
        uid: u32,
        rfc724_mid: String,
-    ) -> Result<()> {
-        if uid == 0 {
-            bail!("Attempt to fetch UID 0");
+    ) -> ImapActionResult {
+        if let Some(imapresult) = self
+            .prepare_imap_operation_on_msg(context, folder, uid)
+            .await
+        {
+            return imapresult;
        }

-        self.select_folder(context, Some(folder)).await?;
-
        // we are connected, and the folder is selected
        info!(context, "Downloading message {}/{} fully...", folder, uid);

        let mut uid_message_ids: BTreeMap<u32, String> = BTreeMap::new();
        uid_message_ids.insert(uid, rfc724_mid);
-        let (last_uid, _received) = self
-            .fetch_many_msgs(
-                context,
-                folder,
-                uidvalidity,
-                vec![uid],
-                &uid_message_ids,
-                false,
-                false,
-            )
-            .await?;
+        let (last_uid, _received) = match self
+            .fetch_many_msgs(context, folder, vec![uid], &uid_message_ids, false, false)
+            .await
+        {
+            Ok(res) => res,
+            Err(_) => return ImapActionResult::Failed,
+        };
        if last_uid.is_none() {
-            bail!("Failed to fetch UID {uid}");
+            ImapActionResult::Failed
+        } else {
+            ImapActionResult::Success
        }
-        Ok(())
    }
 }

@@ -254,7 +257,7 @@ mod tests {
    use crate::chat::{get_chat_msgs, send_msg};
    use crate::ephemeral::Timer;
    use crate::message::Viewtype;
-    use crate::receive_imf::receive_imf_from_inbox;
+    use crate::receive_imf::receive_imf_inner;
    use crate::test_utils::TestContext;

    #[test]
@@ -335,7 +338,7 @@ mod tests {
             Date: Sun, 22 Mar 2020 22:37:57 +0000\
             Content-Type: text/plain";

-        receive_imf_from_inbox(
+        receive_imf_inner(
            &t,
            "Mr.12345678901@example.com",
            header.as_bytes(),
@@ -351,7 +354,7 @@ mod tests {
            .get_text()
            .contains(&stock_str::partial_download_msg_body(&t, 100000).await));

-        receive_imf_from_inbox(
+        receive_imf_inner(
            &t,
            "Mr.12345678901@example.com",
            format!("{header}\n\n100k text...").as_bytes(),
@@ -380,7 +383,7 @@ mod tests {
            .await?;

        // download message from bob partially, this must not change the ephemeral timer
-        receive_imf_from_inbox(
+        receive_imf_inner(
            &t,
            "first@example.org",
            b"From: Bob <bob@example.org>\n\
@@ -423,7 +426,7 @@ mod tests {
        let sent2_rfc724_mid = sent2.load_from_db().await.rfc724_mid;

        // not downloading the status update results in an placeholder
-        receive_imf_from_inbox(
+        receive_imf_inner(
            &bob,
            &sent2_rfc724_mid,
            sent2.payload().as_bytes(),
@@ -439,7 +442,7 @@ mod tests {

        // downloading the status update afterwards expands to nothing and moves the placeholder to trash-chat
        // (usually status updates are too small for not being downloaded directly)
-        receive_imf_from_inbox(
+        receive_imf_inner(
            &bob,
            &sent2_rfc724_mid,
            sent2.payload().as_bytes(),
@@ -490,7 +493,7 @@ mod tests {
            ";

        // not downloading the mdn results in an placeholder
-        receive_imf_from_inbox(
+        receive_imf_inner(
            &bob,
            "bar@example.org",
            raw,
@@ -506,7 +509,7 @@ mod tests {

        // downloading the mdn afterwards expands to nothing and deletes the placeholder directly
        // (usually mdn are too small for not being downloaded directly)
-        receive_imf_from_inbox(&bob, "bar@example.org", raw, false, None, false).await?;
+        receive_imf_inner(&bob, "bar@example.org", raw, false, None, false).await?;
        assert_eq!(get_chat_msgs(&bob, chat_id).await?.len(), 0);
        assert!(Message::load_from_db(&bob, msg.id)
            .await?
--- a/src/e2ee.rs
+++ b/src/e2ee.rs
@@ -7,7 +7,7 @@ use crate::aheader::{Aheader, EncryptPreference};
 use crate::config::Config;
 use crate::context::Context;
 use crate::key::{load_self_public_key, load_self_secret_key, SignedPublicKey};
-use crate::peerstate::Peerstate;
+use crate::peerstate::{Peerstate, PeerstateVerifiedStatus};
 use crate::pgp;

 #[derive(Debug)]
@@ -52,7 +52,7 @@ impl EncryptHelper {
        &self,
        context: &Context,
        e2ee_guaranteed: bool,
-        peerstates: &[(Option<Peerstate>, String)],
+        peerstates: &[(Option<Peerstate>, &str)],
    ) -> Result<bool> {
        let mut prefer_encrypt_count = if self.prefer_encrypt == EncryptPreference::Mutual {
            1
@@ -62,19 +62,21 @@ impl EncryptHelper {
        for (peerstate, addr) in peerstates {
            match peerstate {
                Some(peerstate) => {
-                    let prefer_encrypt = peerstate.prefer_encrypt;
-                    info!(context, "Peerstate for {addr:?} is {prefer_encrypt}.");
+                    info!(
+                        context,
+                        "peerstate for {:?} is {}", addr, peerstate.prefer_encrypt
+                    );
                    match peerstate.prefer_encrypt {
                        EncryptPreference::NoPreference | EncryptPreference::Reset => {}
                        EncryptPreference::Mutual => prefer_encrypt_count += 1,
                    };
                }
                None => {
-                    let msg = format!("Peerstate for {addr:?} missing, cannot encrypt");
+                    let msg = format!("peerstate for {addr:?} missing, cannot encrypt");
                    if e2ee_guaranteed {
-                        return Err(format_err!("{msg}"));
+                        return Err(format_err!("{}", msg));
                    } else {
-                        info!(context, "{msg}.");
+                        info!(context, "{}", msg);
                        return Ok(false);
                    }
                }
@@ -92,10 +94,9 @@ impl EncryptHelper {
    pub async fn encrypt(
        self,
        context: &Context,
-        verified: bool,
+        min_verified: PeerstateVerifiedStatus,
        mail_to_encrypt: lettre_email::PartBuilder,
-        peerstates: Vec<(Option<Peerstate>, String)>,
-        compress: bool,
+        peerstates: Vec<(Option<Peerstate>, &str)>,
    ) -> Result<String> {
        let mut keyring: Vec<SignedPublicKey> = Vec::new();

@@ -106,7 +107,7 @@ impl EncryptHelper {
            .filter_map(|(state, addr)| state.clone().map(|s| (s, addr)))
        {
            let key = peerstate
-                .take_key(verified)
+                .take_key(min_verified)
                .with_context(|| format!("proper enc-key for {addr} missing, cannot encrypt"))?;
            keyring.push(key);
            verifier_addresses.push(addr);
@@ -117,8 +118,8 @@ impl EncryptHelper {

        // Encrypt to secondary verified keys
        // if we also encrypt to the introducer ("verifier") of the key.
-        if verified {
-            for (peerstate, _addr) in &peerstates {
+        if min_verified == PeerstateVerifiedStatus::BidirectVerified {
+            for (peerstate, _addr) in peerstates {
                if let Some(peerstate) = peerstate {
                    if let (Some(key), Some(verifier)) = (
                        peerstate.secondary_verified_key.as_ref(),
@@ -136,7 +137,7 @@ impl EncryptHelper {

        let raw_message = mail_to_encrypt.build().as_string().into_bytes();

-        let ctext = pgp::pk_encrypt(&raw_message, keyring, Some(sign_key), compress).await?;
+        let ctext = pgp::pk_encrypt(&raw_message, keyring, Some(sign_key)).await?;

        Ok(ctext)
    }
@@ -170,10 +171,11 @@ pub async fn ensure_secret_key_exists(context: &Context) -> Result<()> {
 #[cfg(test)]
 mod tests {
    use super::*;
+    use crate::chat;
    use crate::key::DcKey;
    use crate::message::{Message, Viewtype};
    use crate::param::Param;
-    use crate::test_utils::{bob_keypair, TestContext, TestContextManager};
+    use crate::test_utils::{bob_keypair, TestContext};

    mod ensure_secret_key_exists {
        use super::*;
@@ -217,35 +219,37 @@ Sent with my Delta Chat Messenger: https://delta.chat";

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_encrypted_no_autocrypt() -> anyhow::Result<()> {
-        let mut tcm = TestContextManager::new();
-        let alice = tcm.alice().await;
-        let bob = tcm.bob().await;
+        let alice = TestContext::new_alice().await;
+        let bob = TestContext::new_bob().await;

        let chat_alice = alice.create_chat(&bob).await.id;
        let chat_bob = bob.create_chat(&alice).await.id;

        // Alice sends unencrypted message to Bob
        let mut msg = Message::new(Viewtype::Text);
-        let sent = alice.send_msg(chat_alice, &mut msg).await;
+        chat::prepare_msg(&alice.ctx, chat_alice, &mut msg).await?;
+        chat::send_msg(&alice.ctx, chat_alice, &mut msg).await?;
+        let sent = alice.pop_sent_msg().await;

        // Bob receives unencrypted message from Alice
-        let msg = bob.recv_msg(&sent).await;
-        assert!(!msg.get_showpadlock());
+        let msg = bob.parse_msg(&sent).await;
+        assert!(!msg.was_encrypted());

+        // Parsing a message is enough to update peerstate
        let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.org")
            .await?
            .expect("no peerstate found in the database");
        assert_eq!(peerstate_alice.prefer_encrypt, EncryptPreference::Mutual);

-        // Bob sends empty encrypted message to Alice
+        // Bob sends encrypted message to Alice
        let mut msg = Message::new(Viewtype::Text);
-        let sent = bob.send_msg(chat_bob, &mut msg).await;
+        chat::prepare_msg(&bob.ctx, chat_bob, &mut msg).await?;
+        chat::send_msg(&bob.ctx, chat_bob, &mut msg).await?;
+        let sent = bob.pop_sent_msg().await;

-        // Alice receives an empty encrypted message from Bob.
-        // This is also a regression test for previously existing bug
-        // that resulted in no padlock on encrypted empty messages.
-        let msg = alice.recv_msg(&sent).await;
-        assert!(msg.get_showpadlock());
+        // Alice receives encrypted message from Bob
+        let msg = alice.parse_msg(&sent).await;
+        assert!(msg.was_encrypted());

        let peerstate_bob = Peerstate::from_addr(&alice.ctx, "bob@example.net")
            .await?
@@ -257,10 +261,12 @@ Sent with my Delta Chat Messenger: https://delta.chat";
        // Alice sends encrypted message without Autocrypt header.
        let mut msg = Message::new(Viewtype::Text);
        msg.param.set_int(Param::SkipAutocrypt, 1);
-        let sent = alice.send_msg(chat_alice, &mut msg).await;
+        chat::prepare_msg(&alice.ctx, chat_alice, &mut msg).await?;
+        chat::send_msg(&alice.ctx, chat_alice, &mut msg).await?;
+        let sent = alice.pop_sent_msg().await;

-        let msg = bob.recv_msg(&sent).await;
-        assert!(msg.get_showpadlock());
+        let msg = bob.parse_msg(&sent).await;
+        assert!(msg.was_encrypted());
        let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.org")
            .await?
            .expect("no peerstate found in the database");
@@ -269,10 +275,12 @@ Sent with my Delta Chat Messenger: https://delta.chat";
        // Alice sends plaintext message with Autocrypt header.
        let mut msg = Message::new(Viewtype::Text);
        msg.force_plaintext();
-        let sent = alice.send_msg(chat_alice, &mut msg).await;
+        chat::prepare_msg(&alice.ctx, chat_alice, &mut msg).await?;
+        chat::send_msg(&alice.ctx, chat_alice, &mut msg).await?;
+        let sent = alice.pop_sent_msg().await;

-        let msg = bob.recv_msg(&sent).await;
-        assert!(!msg.get_showpadlock());
+        let msg = bob.parse_msg(&sent).await;
+        assert!(!msg.was_encrypted());
        let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.org")
            .await?
            .expect("no peerstate found in the database");
@@ -282,10 +290,12 @@ Sent with my Delta Chat Messenger: https://delta.chat";
        let mut msg = Message::new(Viewtype::Text);
        msg.force_plaintext();
        msg.param.set_int(Param::SkipAutocrypt, 1);
-        let sent = alice.send_msg(chat_alice, &mut msg).await;
+        chat::prepare_msg(&alice.ctx, chat_alice, &mut msg).await?;
+        chat::send_msg(&alice.ctx, chat_alice, &mut msg).await?;
+        let sent = alice.pop_sent_msg().await;

-        let msg = bob.recv_msg(&sent).await;
-        assert!(!msg.get_showpadlock());
+        let msg = bob.parse_msg(&sent).await;
+        assert!(!msg.was_encrypted());
        let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.org")
            .await?
            .expect("no peerstate found in the database");
@@ -294,7 +304,7 @@ Sent with my Delta Chat Messenger: https://delta.chat";
        Ok(())
    }

-    fn new_peerstates(prefer_encrypt: EncryptPreference) -> Vec<(Option<Peerstate>, String)> {
+    fn new_peerstates(prefer_encrypt: EncryptPreference) -> Vec<(Option<Peerstate>, &'static str)> {
        let addr = "bob@foo.bar";
        let pub_key = bob_keypair().public;
        let peerstate = Peerstate {
@@ -313,10 +323,9 @@ Sent with my Delta Chat Messenger: https://delta.chat";
            secondary_verified_key: None,
            secondary_verified_key_fingerprint: None,
            secondary_verifier: None,
-            backward_verified_key_id: None,
            fingerprint_changed: false,
        };
-        vec![(Some(peerstate), addr.to_string())]
+        vec![(Some(peerstate), addr)]
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -341,7 +350,7 @@ Sent with my Delta Chat Messenger: https://delta.chat";
        assert!(encrypt_helper.should_encrypt(&t, false, &ps).unwrap());

        // test with missing peerstate
-        let ps = vec![(None, "bob@foo.bar".to_string())];
+        let ps = vec![(None, "bob@foo.bar")];
        assert!(encrypt_helper.should_encrypt(&t, true, &ps).is_err());
        assert!(!encrypt_helper.should_encrypt(&t, false, &ps).unwrap());
    }
--- a/src/ephemeral.rs
+++ b/src/ephemeral.rs
@@ -67,7 +67,7 @@ use std::collections::BTreeSet;
 use std::convert::{TryFrom, TryInto};
 use std::num::ParseIntError;
 use std::str::FromStr;
-use std::time::{Duration, UNIX_EPOCH};
+use std::time::{Duration, SystemTime, UNIX_EPOCH};

 use anyhow::{ensure, Result};
 use async_channel::Receiver;
@@ -85,7 +85,7 @@ use crate::message::{Message, MessageState, MsgId, Viewtype};
 use crate::mimeparser::SystemMessage;
 use crate::sql::{self, params_iter};
 use crate::stock_str;
-use crate::tools::{duration_to_str, time, SystemTime};
+use crate::tools::{duration_to_str, time};

 /// Ephemeral timer value.
 #[derive(Debug, PartialEq, Eq, Copy, Clone, Serialize, Deserialize)]
@@ -590,11 +590,7 @@ pub(crate) async fn delete_expired_imap_messages(context: &Context) -> Result<()
        match context.get_config_delete_server_after().await? {
            None => (0, 0),
            Some(delete_server_after) => (
-                match delete_server_after {
-                    // Guarantee immediate deletion.
-                    0 => i64::MAX,
-                    _ => now - delete_server_after,
-                },
+                now - delete_server_after,
                now - max(delete_server_after, MIN_DELETE_SERVER_AFTER),
            ),
        };
@@ -1131,7 +1127,6 @@ mod tests {
            (1030, now - 19 * HOUR, 0),
            (2000, now - 18 * HOUR, now - HOUR),
            (2020, now - 17 * HOUR, now + HOUR),
-            (3000, now + HOUR, 0),
        ] {
            let message_id = id.to_string();
            t.sql
@@ -1217,10 +1212,6 @@ mod tests {
            0
        );

-        t.set_config(Config::DeleteServerAfter, Some("1")).await?;
-        delete_expired_imap_messages(&t).await?;
-        test_marked_for_deletion(&t, 3000).await?;
-
        Ok(())
    }

--- a/src/events/payload.rs
+++ b/src/events/payload.rs
@@ -4,7 +4,6 @@ use serde::{Deserialize, Serialize};
 use std::path::PathBuf;

 use crate::chat::ChatId;
-use crate::config::Config;
 use crate::contact::ContactId;
 use crate::ephemeral::Timer as EphemeralTimer;
 use crate::message::MsgId;
@@ -262,17 +261,8 @@ pub enum EventType {
    ConnectivityChanged,

    /// The user's avatar changed.
-    /// Deprecated by `ConfigSynced`.
    SelfavatarChanged,

-    /// A multi-device synced config value changed. Maybe the app needs to refresh smth. For
-    /// uniformity this is emitted on the source device too. The value isn't here, otherwise it
-    /// would be logged which might not be good for privacy.
-    ConfigSynced {
-        /// Configuration key.
-        key: Config,
-    },
-
    /// Webxdc status update received.
    WebxdcStatusUpdate {
        /// Message ID.
@@ -287,11 +277,4 @@ pub enum EventType {
        /// ID of the deleted message.
        msg_id: MsgId,
    },
-
-    /// Tells that the Background fetch was completed (or timed out).
-    /// This event acts as a marker, when you reach this event you can be sure
-    /// that all events emitted during the background fetch were processed.
-    ///
-    /// This event is only emitted by the account manager
-    AccountsBackgroundFetchDone,
 }
--- a/src/headerdef.rs
+++ b/src/headerdef.rs
@@ -2,7 +2,7 @@

 use mailparse::{MailHeader, MailHeaderMap};

-#[derive(Debug, Display, Clone, PartialEq, Eq, IntoStaticStr)]
+#[derive(Debug, Display, Clone, PartialEq, Eq, EnumVariantNames, IntoStaticStr)]
 #[strum(serialize_all = "kebab_case")]
 #[allow(missing_docs)]
 pub enum HeaderDef {
@@ -38,9 +38,6 @@ pub enum HeaderDef {
    /// Mailing list ID defined in [RFC 2919](https://tools.ietf.org/html/rfc2919).
    ListId,
    ListPost,
-
-    /// List-Help header defined in [RFC 2369](https://datatracker.ietf.org/doc/html/rfc2369).
-    ListHelp,
    References,

    /// In-Reply-To header containing Message-ID of the parent message.
@@ -74,11 +71,6 @@ pub enum HeaderDef {
    Autocrypt,
    AutocryptSetupMessage,
    SecureJoin,
-
-    /// Deprecated header containing Group-ID in `vg-request-with-auth` message.
-    ///
-    /// It is not used by Alice as Alice knows the group corresponding to the AUTH token.
-    /// Bob still sends it for backwards compatibility.
    SecureJoinGroup,
    SecureJoinFingerprint,
    SecureJoinInvitenumber,
--- a/src/imap.rs
+++ b/src/imap.rs
--- a/src/imap/capabilities.rs
+++ b/src/imap/capabilities.rs
@@ -21,17 +21,6 @@ pub(crate) struct Capabilities {
    /// <https://tools.ietf.org/html/rfc7162>
    pub can_condstore: bool,

-    /// True if the server has METADATA capability as defined in
-    /// <https://tools.ietf.org/html/rfc5464>
-    pub can_metadata: bool,
-
-    /// True if the server supports XDELTAPUSH capability.
-    /// This capability means setting /private/devicetoken IMAP METADATA
-    /// on the INBOX results in new mail notifications
-    /// via notifications.delta.chat service.
-    /// This is supported by <https://github.com/deltachat/chatmail>
-    pub can_push: bool,
-
    /// Server ID if the server supports ID capability.
    pub server_id: Option<HashMap<String, String>>,
 }
--- a/src/imap/client.rs
+++ b/src/imap/client.rs
@@ -17,8 +17,8 @@ use crate::net::tls::wrap_tls;
 use crate::socks::Socks5Config;
 use fast_socks5::client::Socks5Stream;

-/// IMAP connection, write and read timeout.
-pub(crate) const IMAP_TIMEOUT: Duration = Duration::from_secs(60);
+/// IMAP write and read timeout.
+pub(crate) const IMAP_TIMEOUT: Duration = Duration::from_secs(30);

 #[derive(Debug)]
 pub(crate) struct Client {
@@ -59,8 +59,6 @@ async fn determine_capabilities(
        can_move: caps.has_str("MOVE"),
        can_check_quota: caps.has_str("QUOTA"),
        can_condstore: caps.has_str("CONDSTORE"),
-        can_metadata: caps.has_str("METADATA"),
-        can_push: caps.has_str("XDELTAPUSH"),
        server_id,
    };
    Ok(capabilities)
--- a/src/imap/idle.rs
+++ b/src/imap/idle.rs
@@ -1,24 +1,18 @@
-use std::time::Duration;
+use std::time::{Duration, SystemTime};

 use anyhow::{bail, Context as _, Result};
 use async_channel::Receiver;
 use async_imap::extensions::idle::IdleResponse;
 use futures_lite::FutureExt;
-use tokio::time::timeout;

 use super::session::Session;
 use super::Imap;
+use crate::config::Config;
 use crate::context::Context;
-use crate::imap::{client::IMAP_TIMEOUT, FolderMeaning};
-use crate::tools::{self, time_elapsed};
+use crate::imap::{client::IMAP_TIMEOUT, get_uid_next, FolderMeaning};
+use crate::log::LogExt;

-/// Timeout after which IDLE is finished
-/// if there are no responses from the server.
-///
-/// If `* OK Still here` keepalives are sent more frequently
-/// than this duration, timeout should never be triggered.
-/// For example, Dovecot sends keepalives every 2 minutes by default.
-const IDLE_TIMEOUT: Duration = Duration::from_secs(5 * 60);
+const IDLE_TIMEOUT: Duration = Duration::from_secs(23 * 60);

 impl Session {
    pub async fn idle(
@@ -35,6 +29,29 @@ impl Session {
            return Ok(self);
        }

+        // Despite checking for unsolicited EXISTS above,
+        // we may have missed EXISTS if the message was
+        // received when the folder was not selected.
+        let status = self
+            .status(folder, "(UIDNEXT)")
+            .await
+            .with_context(|| format!("STATUS (UIDNEXT) error for {folder:?}"))?;
+        if let Some(uid_next) = status.uid_next {
+            let expected_uid_next = get_uid_next(context, folder)
+                .await
+                .with_context(|| format!("failed to get old UID NEXT for folder {folder}"))?;
+            if uid_next > expected_uid_next {
+                info!(
+                    context,
+                    "Skipping IDLE on {folder:?} because UIDNEXT {uid_next}>{expected_uid_next} indicates there are new messages."
+                );
+                return Ok(self);
+            }
+        } else {
+            warn!(context, "STATUS {folder} (UIDNEXT) did not return UIDNEXT");
+            // Go to IDLE anyway if STATUS is broken.
+        }
+
        if let Ok(()) = idle_interrupt_receiver.try_recv() {
            info!(context, "skip idle, got interrupt");
            return Ok(self);
@@ -97,38 +114,97 @@ impl Session {
 }

 impl Imap {
-    /// Idle using polling.
    pub(crate) async fn fake_idle(
        &mut self,
        context: &Context,
-        session: &mut Session,
-        watch_folder: String,
+        watch_folder: Option<String>,
        folder_meaning: FolderMeaning,
-    ) -> Result<()> {
-        let fake_idle_start_time = tools::Time::now();
+    ) {
+        // Idle using polling. This is also needed if we're not yet configured -
+        // in this case, we're waiting for a configure job (and an interrupt).

+        let fake_idle_start_time = SystemTime::now();
+
+        // Do not poll, just wait for an interrupt when no folder is passed in.
+        let watch_folder = if let Some(watch_folder) = watch_folder {
+            watch_folder
+        } else {
+            info!(context, "IMAP-fake-IDLE: no folder, waiting for interrupt");
+            self.idle_interrupt_receiver.recv().await.ok();
+            return;
+        };
        info!(context, "IMAP-fake-IDLEing folder={:?}", watch_folder);

-        // Loop until we are interrupted or until we fetch something.
+        const TIMEOUT_INIT_MS: u64 = 60_000;
+        let mut timeout_ms: u64 = TIMEOUT_INIT_MS;
+        enum Event {
+            Tick,
+            Interrupt,
+        }
+        // loop until we are interrupted or if we fetched something
        loop {
-            match timeout(Duration::from_secs(60), self.idle_interrupt_receiver.recv()).await {
-                Err(_) => {
-                    // Let's see if fetching messages results
+            use futures::future::FutureExt;
+            use rand::Rng;
+
+            let mut interval = tokio::time::interval(Duration::from_millis(timeout_ms));
+            timeout_ms = timeout_ms
+                .saturating_add(rand::thread_rng().gen_range((timeout_ms / 2)..=timeout_ms));
+            interval.tick().await; // The first tick completes immediately.
+            match interval
+                .tick()
+                .map(|_| Event::Tick)
+                .race(
+                    self.idle_interrupt_receiver
+                        .recv()
+                        .map(|_| Event::Interrupt),
+                )
+                .await
+            {
+                Event::Tick => {
+                    // try to connect with proper login params
+                    // (setup_handle_if_needed might not know about them if we
+                    // never successfully connected)
+                    if let Err(err) = self.prepare(context).await {
+                        warn!(context, "fake_idle: could not connect: {}", err);
+                        continue;
+                    }
+                    if let Some(session) = &self.session {
+                        if session.can_idle()
+                            && !context
+                                .get_config_bool(Config::DisableIdle)
+                                .await
+                                .context("Failed to get disable_idle config")
+                                .log_err(context)
+                                .unwrap_or_default()
+                        {
+                            // we only fake-idled because network was gone during IDLE, probably
+                            break;
+                        }
+                    }
+                    info!(context, "fake_idle is connected");
+                    // we are connected, let's see if fetching messages results
                    // in anything.  If so, we behave as if IDLE had data but
                    // will have already fetched the messages so perform_*_fetch
                    // will not find any new.
-                    let res = self
-                        .fetch_new_messages(context, session, &watch_folder, folder_meaning, false)
-                        .await?;
-
-                    info!(context, "fetch_new_messages returned {:?}", res);
-
-                    if res {
-                        break;
+                    match self
+                        .fetch_new_messages(context, &watch_folder, folder_meaning, false)
+                        .await
+                    {
+                        Ok(res) => {
+                            info!(context, "fetch_new_messages returned {:?}", res);
+                            timeout_ms = TIMEOUT_INIT_MS;
+                            if res {
+                                break;
+                            }
+                        }
+                        Err(err) => {
+                            error!(context, "could not fetch from folder: {:#}", err);
+                            self.trigger_reconnect(context);
+                        }
                    }
                }
-                Ok(_) => {
-                    info!(context, "Fake IDLE interrupted.");
+                Event::Interrupt => {
+                    info!(context, "Fake IDLE interrupted");
                    break;
                }
            }
@@ -137,8 +213,11 @@ impl Imap {
        info!(
            context,
            "IMAP-fake-IDLE done after {:.4}s",
-            time_elapsed(&fake_idle_start_time).as_millis() as f64 / 1000.,
+            SystemTime::now()
+                .duration_since(fake_idle_start_time)
+                .unwrap_or_default()
+                .as_millis() as f64
+                / 1000.,
        );
-        Ok(())
    }
 }
--- a/src/imap/scan_folders.rs
+++ b/src/imap/scan_folders.rs
@@ -1,25 +1,21 @@
-use std::collections::BTreeMap;
+use std::{collections::BTreeMap, time::Instant};

 use anyhow::{Context as _, Result};
+use futures::stream::StreamExt;

 use super::{get_folder_meaning_by_attrs, get_folder_meaning_by_name};
 use crate::config::Config;
-use crate::imap::{session::Session, Imap};
+use crate::imap::Imap;
 use crate::log::LogExt;
-use crate::tools::{self, time_elapsed};
 use crate::{context::Context, imap::FolderMeaning};

 impl Imap {
    /// Returns true if folders were scanned, false if scanning was postponed.
-    pub(crate) async fn scan_folders(
-        &mut self,
-        context: &Context,
-        session: &mut Session,
-    ) -> Result<bool> {
+    pub(crate) async fn scan_folders(&mut self, context: &Context) -> Result<bool> {
        // First of all, debounce to once per minute:
        let mut last_scan = context.last_full_folder_scan.lock().await;
        if let Some(last_scan) = *last_scan {
-            let elapsed_secs = time_elapsed(&last_scan).as_secs();
+            let elapsed_secs = last_scan.elapsed().as_secs();
            let debounce_secs = context
                .get_config_u64(Config::ScanAllFoldersDebounceSecs)
                .await?;
@@ -30,7 +26,8 @@ impl Imap {
        }
        info!(context, "Starting full folder scan");

-        let folders = session.list_folders().await?;
+        self.prepare(context).await?;
+        let folders = self.list_folders(context).await?;
        let watched_folders = get_watched_folders(context).await?;

        let mut folder_configs = BTreeMap::new();
@@ -66,16 +63,18 @@ impl Imap {
                && folder_meaning != FolderMeaning::Drafts
                && folder_meaning != FolderMeaning::Trash
            {
+                let session = self.session.as_mut().context("no session")?;
                // Drain leftover unsolicited EXISTS messages
                session.server_sent_unsolicited_exists(context)?;

                loop {
-                    self.fetch_move_delete(context, session, folder.name(), folder_meaning)
+                    self.fetch_move_delete(context, folder.name(), folder_meaning)
                        .await
                        .context("Can't fetch new msgs in scanned folder")
                        .log_err(context)
                        .ok();

+                    let session = self.session.as_mut().context("no session")?;
                    // If the server sent an unsocicited EXISTS during the fetch, we need to fetch again
                    if !session.server_sent_unsolicited_exists(context)? {
                        break;
@@ -90,13 +89,31 @@ impl Imap {
            Config::ConfiguredTrashFolder,
        ] {
            context
-                .set_config_internal(conf, folder_configs.get(&conf).map(|s| s.as_str()))
+                .set_config(conf, folder_configs.get(&conf).map(|s| s.as_str()))
                .await?;
        }

-        last_scan.replace(tools::Time::now());
+        last_scan.replace(Instant::now());
        Ok(true)
    }
+
+    /// Returns the names of all folders on the IMAP server.
+    pub async fn list_folders(
+        self: &mut Imap,
+        context: &Context,
+    ) -> Result<Vec<async_imap::types::Name>> {
+        let session = self.session.as_mut();
+        let session = session.context("No IMAP connection")?;
+        let list = session
+            .list(Some(""), Some("*"))
+            .await?
+            .filter_map(|f| async {
+                f.context("list_folders() can't get folder")
+                    .log_err(context)
+                    .ok()
+            });
+        Ok(list.collect().await)
+    }
 }

 pub(crate) async fn get_watched_folder_configs(context: &Context) -> Result<Vec<Config>> {
--- a/src/imap/select_folder.rs
+++ b/src/imap/select_folder.rs
@@ -3,7 +3,6 @@
 use anyhow::Context as _;

 use super::session::Session as ImapSession;
-use super::{get_uid_next, get_uidvalidity, set_modseq, set_uid_next, set_uidvalidity};
 use crate::context::Context;

 type Result<T> = std::result::Result<T, Error>;
@@ -52,7 +51,7 @@ impl ImapSession {
    /// Selects a folder, possibly updating uid_validity and, if needed,
    /// expunging the folder to remove delete-marked messages.
    /// Returns whether a new folder was selected.
-    pub(crate) async fn select_folder(
+    pub(super) async fn select_folder(
        &mut self,
        context: &Context,
        folder: Option<&str>,
@@ -113,150 +112,20 @@ impl ImapSession {
            Err(err) => match err {
                Error::NoFolder(..) => {
                    info!(context, "Failed to select folder {} because it does not exist, trying to create it.", folder);
-                    let create_res = self.create(folder).await;
-                    if let Err(ref err) = create_res {
-                        info!(context, "Couldn't select folder, then create() failed: {err:#}.");
-                        // Need to recheck, could have been created in parallel.
-                    }
-                    let select_res = self.select_folder(context, Some(folder)).await.with_context(|| format!("failed to select newely created folder {folder}"));
-                    if select_res.is_err() {
-                        create_res?;
-                    }
-                    select_res
+                    self.create(folder).await.with_context(|| {
+                        format!("Couldn't select folder ('{err}'), then create() failed")
+                    })?;
+
+                    Ok(self.select_folder(context, Some(folder)).await.with_context(|| format!("failed to select newely created folder {folder}"))?)
                }
                _ => Err(err).with_context(|| format!("failed to select folder {folder} with error other than NO, not trying to create it")),
            },
        }
    }
-
-    /// Selects a folder and takes care of UIDVALIDITY changes.
-    ///
-    /// When selecting a folder for the first time, sets the uid_next to the current
-    /// mailbox.uid_next so that no old emails are fetched.
-    ///
-    /// Returns Result<new_emails> (i.e. whether new emails arrived),
-    /// if in doubt, returns new_emails=true so emails are fetched.
-    pub(crate) async fn select_with_uidvalidity(
-        &mut self,
-        context: &Context,
-        folder: &str,
-    ) -> Result<bool> {
-        let newly_selected = self
-            .select_or_create_folder(context, folder)
-            .await
-            .with_context(|| format!("failed to select or create folder {folder}"))?;
-        let mailbox = self
-            .selected_mailbox
-            .as_mut()
-            .with_context(|| format!("No mailbox selected, folder: {folder}"))?;
-
-        let old_uid_validity = get_uidvalidity(context, folder)
-            .await
-            .with_context(|| format!("failed to get old UID validity for folder {folder}"))?;
-        let old_uid_next = get_uid_next(context, folder)
-            .await
-            .with_context(|| format!("failed to get old UID NEXT for folder {folder}"))?;
-
-        let new_uid_validity = mailbox
-            .uid_validity
-            .with_context(|| format!("No UIDVALIDITY for folder {folder}"))?;
-        let new_uid_next = if let Some(uid_next) = mailbox.uid_next {
-            Some(uid_next)
-        } else {
-            warn!(
-                context,
-                "SELECT response for IMAP folder {folder:?} has no UIDNEXT, fall back to STATUS command."
-            );
-
-            // RFC 3501 says STATUS command SHOULD NOT be used
-            // on the currently selected mailbox because the same
-            // information can be obtained by other means,
-            // such as reading SELECT response.
-            //
-            // However, it also says that UIDNEXT is REQUIRED
-            // in the SELECT response and if we are here,
-            // it is actually not returned.
-            //
-            // In particular, Winmail Pro Mail Server 5.1.0616
-            // never returns UIDNEXT in SELECT response,
-            // but responds to "STATUS INBOX (UIDNEXT)" command.
-            let status = self
-                .inner
-                .status(folder, "(UIDNEXT)")
-                .await
-                .with_context(|| format!("STATUS (UIDNEXT) error for {folder:?}"))?;
-
-            if status.uid_next.is_none() {
-                // This happens with mail.163.com as of 2023-11-26.
-                // It does not return UIDNEXT on SELECT and returns invalid
-                // `* STATUS "INBOX" ()` response on explicit request for UIDNEXT.
-                warn!(context, "STATUS {folder} (UIDNEXT) did not return UIDNEXT.");
-            }
-            status.uid_next
-        };
-        mailbox.uid_next = new_uid_next;
-
-        if new_uid_validity == old_uid_validity {
-            let new_emails = if newly_selected == NewlySelected::No {
-                // The folder was not newly selected i.e. no SELECT command was run. This means that mailbox.uid_next
-                // was not updated and may contain an incorrect value. So, just return true so that
-                // the caller tries to fetch new messages (we could of course run a SELECT command now, but trying to fetch
-                // new messages is only one command, just as a SELECT command)
-                true
-            } else if let Some(new_uid_next) = new_uid_next {
-                if new_uid_next < old_uid_next {
-                    warn!(
-                        context,
-                        "The server illegally decreased the uid_next of folder {folder:?} from {old_uid_next} to {new_uid_next} without changing validity ({new_uid_validity}), resyncing UIDs...",
-                    );
-                    set_uid_next(context, folder, new_uid_next).await?;
-                    context.schedule_resync().await?;
-                }
-                new_uid_next != old_uid_next // If UIDNEXT changed, there are new emails
-            } else {
-                // We have no UIDNEXT and if in doubt, return true.
-                true
-            };
-
-            return Ok(new_emails);
-        }
-
-        // UIDVALIDITY is modified, reset highest seen MODSEQ.
-        set_modseq(context, folder, 0).await?;
-
-        // ==============  uid_validity has changed or is being set the first time.  ==============
-
-        let new_uid_next = new_uid_next.unwrap_or_default();
-        set_uid_next(context, folder, new_uid_next).await?;
-        set_uidvalidity(context, folder, new_uid_validity).await?;
-
-        // Collect garbage entries in `imap` table.
-        context
-            .sql
-            .execute(
-                "DELETE FROM imap WHERE folder=? AND uidvalidity!=?",
-                (&folder, new_uid_validity),
-            )
-            .await?;
-
-        if old_uid_validity != 0 || old_uid_next != 0 {
-            context.schedule_resync().await?;
-        }
-        info!(
-            context,
-            "uid/validity change folder {}: new {}/{} previous {}/{}.",
-            folder,
-            new_uid_next,
-            new_uid_validity,
-            old_uid_next,
-            old_uid_validity,
-        );
-        Ok(false)
-    }
 }

 #[derive(PartialEq, Debug, Copy, Clone, Eq)]
-pub(crate) enum NewlySelected {
+pub(super) enum NewlySelected {
    /// The folder was newly selected during this call to select_folder().
    Yes,
    /// No SELECT command was run because the folder already was selected
--- a/src/imap/session.rs
+++ b/src/imap/session.rs
@@ -1,32 +1,11 @@
-use std::cmp;
-use std::collections::BTreeMap;
 use std::ops::{Deref, DerefMut};

-use anyhow::{Context as _, Result};
 use async_imap::types::Mailbox;
 use async_imap::Session as ImapSession;
-use futures::TryStreamExt;

-use crate::constants::DC_FETCH_EXISTING_MSGS_COUNT;
 use crate::imap::capabilities::Capabilities;
 use crate::net::session::SessionStream;

-/// Prefetch:
-/// - Message-ID to check if we already have the message.
-/// - In-Reply-To and References to check if message is a reply to chat message.
-/// - Chat-Version to check if a message is a chat message
-/// - Autocrypt-Setup-Message to check if a message is an autocrypt setup message,
-///   not necessarily sent by Delta Chat.
-const PREFETCH_FLAGS: &str = "(UID INTERNALDATE RFC822.SIZE BODY.PEEK[HEADER.FIELDS (\
-                              MESSAGE-ID \
-                              DATE \
-                              X-MICROSOFT-ORIGINAL-MESSAGE-ID \
-                              FROM \
-                              IN-REPLY-TO REFERENCES \
-                              CHAT-VERSION \
-                              AUTOCRYPT-SETUP-MESSAGE\
-                              )])";
-
 #[derive(Debug)]
 pub(crate) struct Session {
    pub(super) inner: ImapSession<Box<dyn SessionStream>>,
@@ -85,79 +64,4 @@ impl Session {
    pub fn can_condstore(&self) -> bool {
        self.capabilities.can_condstore
    }
-
-    pub fn can_metadata(&self) -> bool {
-        self.capabilities.can_metadata
-    }
-
-    pub fn can_push(&self) -> bool {
-        self.capabilities.can_push
-    }
-
-    /// Returns the names of all folders on the IMAP server.
-    pub async fn list_folders(&mut self) -> Result<Vec<async_imap::types::Name>> {
-        let list = self.list(Some(""), Some("*")).await?.try_collect().await?;
-        Ok(list)
-    }
-
-    /// Prefetch all messages greater than or equal to `uid_next`. Returns a list of fetch results
-    /// in the order of ascending delivery time to the server (INTERNALDATE).
-    pub(crate) async fn prefetch(
-        &mut self,
-        uid_next: u32,
-    ) -> Result<Vec<(u32, async_imap::types::Fetch)>> {
-        // fetch messages with larger UID than the last one seen
-        let set = format!("{uid_next}:*");
-        let mut list = self
-            .uid_fetch(set, PREFETCH_FLAGS)
-            .await
-            .context("IMAP could not fetch")?;
-
-        let mut msgs = BTreeMap::new();
-        while let Some(msg) = list.try_next().await? {
-            if let Some(msg_uid) = msg.uid {
-                // If the mailbox is not empty, results always include
-                // at least one UID, even if last_seen_uid+1 is past
-                // the last UID in the mailbox.  It happens because
-                // uid:* is interpreted the same way as *:uid.
-                // See <https://tools.ietf.org/html/rfc3501#page-61> for
-                // standard reference. Therefore, sometimes we receive
-                // already seen messages and have to filter them out.
-                if msg_uid >= uid_next {
-                    msgs.insert((msg.internal_date(), msg_uid), msg);
-                }
-            }
-        }
-
-        Ok(msgs.into_iter().map(|((_, uid), msg)| (uid, msg)).collect())
-    }
-
-    /// Like prefetch(), but not for new messages but existing ones (the DC_FETCH_EXISTING_MSGS_COUNT newest messages)
-    pub(crate) async fn prefetch_existing_msgs(
-        &mut self,
-    ) -> Result<Vec<(u32, async_imap::types::Fetch)>> {
-        let exists: i64 = {
-            let mailbox = self.selected_mailbox.as_ref().context("no mailbox")?;
-            mailbox.exists.into()
-        };
-
-        // Fetch last DC_FETCH_EXISTING_MSGS_COUNT (100) messages.
-        // Sequence numbers are sequential. If there are 1000 messages in the inbox,
-        // we can fetch the sequence numbers 900-1000 and get the last 100 messages.
-        let first = cmp::max(1, exists - DC_FETCH_EXISTING_MSGS_COUNT + 1);
-        let set = format!("{first}:{exists}");
-        let mut list = self
-            .fetch(&set, PREFETCH_FLAGS)
-            .await
-            .context("IMAP Could not fetch")?;
-
-        let mut msgs = BTreeMap::new();
-        while let Some(msg) = list.try_next().await? {
-            if let Some(msg_uid) = msg.uid {
-                msgs.insert((msg.internal_date(), msg_uid), msg);
-            }
-        }
-
-        Ok(msgs.into_iter().map(|((_, uid), msg)| (uid, msg)).collect())
-    }
 }
--- a/src/imex.rs
+++ b/src/imex.rs
@@ -375,25 +375,17 @@ async fn imex_inner(
    path: &Path,
    passphrase: Option<String>,
 ) -> Result<()> {
-    info!(
-        context,
-        "{} path: {}",
-        match what {
-            ImexMode::ExportSelfKeys | ImexMode::ExportBackup => "Export",
-            ImexMode::ImportSelfKeys | ImexMode::ImportBackup => "Import",
-        },
-        path.display()
-    );
+    info!(context, "Import/export dir: {}", path.display());
    ensure!(context.sql.is_open().await, "Database not opened.");
    context.emit_event(EventType::ImexProgress(10));

    if what == ImexMode::ExportBackup || what == ImexMode::ExportSelfKeys {
        // before we export anything, make sure the private key exists
-        e2ee::ensure_secret_key_exists(context)
-            .await
-            .context("Cannot create private key or private key not available")?;
-
-        create_folder(context, &path).await?;
+        if e2ee::ensure_secret_key_exists(context).await.is_err() {
+            bail!("Cannot create private key or private key not available.");
+        } else {
+            create_folder(context, &path).await?;
+        }
    }

    match what {
@@ -534,7 +526,7 @@ async fn export_backup(context: &Context, dir: &Path, passphrase: String) -> Res
    let _d1 = DeleteOnDrop(temp_db_path.clone());
    let _d2 = DeleteOnDrop(temp_path.clone());

-    export_database(context, &temp_db_path, passphrase, now)
+    export_database(context, &temp_db_path, passphrase)
        .await
        .context("could not export database")?;

@@ -678,7 +670,7 @@ async fn export_self_keys(context: &Context, dir: &Path) -> Result<()> {
    let keys = context
        .sql
        .query_map(
-            "SELECT id, public_key, private_key, id=(SELECT value FROM config WHERE keyname='key_id') FROM keypairs;",
+            "SELECT id, public_key, private_key, is_default FROM keypairs;",
            (),
            |row| {
                let id = row.get(0)?;
@@ -770,27 +762,19 @@ where
 /// overwritten.
 ///
 /// This also verifies that IO is not running during the export.
-async fn export_database(
-    context: &Context,
-    dest: &Path,
-    passphrase: String,
-    timestamp: i64,
-) -> Result<()> {
+async fn export_database(context: &Context, dest: &Path, passphrase: String) -> Result<()> {
    ensure!(
        !context.scheduler.is_running().await,
        "cannot export backup, IO is running"
    );
-    let timestamp = timestamp.try_into().context("32-bit UNIX time overflow")?;
+    let now = time().try_into().context("32-bit UNIX time overflow")?;

    // TODO: Maybe introduce camino crate for UTF-8 paths where we need them.
    let dest = dest
        .to_str()
        .with_context(|| format!("path {} is not valid unicode", dest.display()))?;

-    context
-        .sql
-        .set_raw_config_int("backup_time", timestamp)
-        .await?;
+    context.sql.set_raw_config_int("backup_time", now).await?;
    sql::housekeeping(context).await.log_err(context).ok();
    context
        .sql
@@ -824,10 +808,9 @@ mod tests {
    use tokio::task;

    use super::*;
-    use crate::key;
    use crate::pgp::{split_armored_data, HEADER_AUTOCRYPT, HEADER_SETUPCODE};
    use crate::stock_str::StockMessage;
-    use crate::test_utils::{alice_keypair, TestContext, TestContextManager};
+    use crate::test_utils::{alice_keypair, TestContext};

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_render_setup_file() {
@@ -937,37 +920,6 @@ mod tests {
        }
    }

-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_import_second_key() -> Result<()> {
-        let alice = &TestContext::new_alice().await;
-        let chat = alice.create_chat(alice).await;
-        let sent = alice.send_text(chat.id, "Encrypted with old key").await;
-        let export_dir = tempfile::tempdir().unwrap();
-
-        let alice = &TestContext::new().await;
-        alice.configure_addr("alice@example.org").await;
-        imex(alice, ImexMode::ExportSelfKeys, export_dir.path(), None).await?;
-
-        let alice = &TestContext::new_alice().await;
-        let old_key = key::load_self_secret_key(alice).await?;
-
-        imex(alice, ImexMode::ImportSelfKeys, export_dir.path(), None).await?;
-
-        let new_key = key::load_self_secret_key(alice).await?;
-        assert_ne!(new_key, old_key);
-        assert_eq!(
-            key::load_self_secret_keyring(alice).await?,
-            vec![new_key, old_key]
-        );
-
-        let msg = alice.recv_msg(&sent).await;
-        assert!(msg.get_showpadlock());
-        assert_eq!(msg.chat_id, alice.get_self_chat().await.id);
-        assert_eq!(msg.get_text(), "Encrypted with old key");
-
-        Ok(())
-    }
-
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_export_and_import_backup() -> Result<()> {
        for set_verified_oneonone_chats in [true, false] {
@@ -1095,10 +1047,6 @@ mod tests {
    const S_EM_SETUPCODE: &str = "1742-0185-6197-1303-7016-8412-3581-4441-0597";
    const S_EM_SETUPFILE: &str = include_str!("../test-data/message/stress.txt");

-    // Autocrypt Setup Message payload "encrypted" with plaintext algorithm.
-    const S_PLAINTEXT_SETUPFILE: &str =
-        include_str!("../test-data/message/plaintext-autocrypt-setup.txt");
-
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_split_and_decrypt() {
        let buf_1 = S_EM_SETUPFILE.as_bytes().to_vec();
@@ -1122,23 +1070,6 @@ mod tests {
        assert!(headers.get(HEADER_SETUPCODE).is_none());
    }

-    /// Tests that Autocrypt Setup Message encrypted with "plaintext" algorithm cannot be
-    /// decrypted.
-    ///
-    /// According to <https://datatracker.ietf.org/doc/html/rfc4880#section-13.4>
-    /// "Implementations MUST NOT use plaintext in Symmetrically Encrypted Data packets".
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_decrypt_plaintext_autocrypt_setup_message() {
-        let setup_file = S_PLAINTEXT_SETUPFILE.to_string();
-        let incorrect_setupcode = "0000-0000-0000-0000-0000-0000-0000-0000-0000";
-        assert!(decrypt_setup_file(
-            incorrect_setupcode,
-            std::io::Cursor::new(setup_file.as_bytes()),
-        )
-        .await
-        .is_err());
-    }
-
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_key_transfer() -> Result<()> {
        let alice = TestContext::new_alice().await;
@@ -1154,7 +1085,6 @@ mod tests {
        alice2.configure_addr("alice@example.org").await;
        alice2.recv_msg(&sent).await;
        let msg = alice2.get_last_msg().await;
-        assert!(msg.is_setupmessage());

        // Send a message that cannot be decrypted because the keys are
        // not synchronized yet.
@@ -1172,25 +1102,4 @@ mod tests {

        Ok(())
    }
-
-    /// Tests that Autocrypt Setup Messages is only clickable if it is self-sent.
-    /// This prevents Bob from tricking Alice into changing the key
-    /// by sending her an Autocrypt Setup Message as long as Alice's server
-    /// does not allow to forge the `From:` header.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_key_transfer_non_self_sent() -> Result<()> {
-        let mut tcm = TestContextManager::new();
-        let alice = tcm.alice().await;
-        let bob = tcm.bob().await;
-
-        let _setup_code = initiate_key_transfer(&alice).await?;
-
-        // Get Autocrypt Setup Message.
-        let sent = alice.pop_sent_msg().await;
-
-        let rcvd = bob.recv_msg(&sent).await;
-        assert!(!rcvd.is_setupmessage());
-
-        Ok(())
-    }
 }
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 -03-04
 -11-21