move pthreads to buildInputs

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ permissions: {}
 
 env:
   RUSTFLAGS: -Dwarnings
-  RUST_VERSION: 1.92.0
+  RUST_VERSION: 1.91.0
 
   # Minimum Supported Rust Version
   MSRV: 1.88.0
@@ -29,9 +29,8 @@ jobs:
   lint_rust:
     name: Lint Rust
     runs-on: ubuntu-latest
-    timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
@@ -53,9 +52,8 @@ jobs:
   cargo_deny:
     name: cargo deny
     runs-on: ubuntu-latest
-    timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
@@ -68,9 +66,8 @@ jobs:
   provider_database:
     name: Check provider database
     runs-on: ubuntu-latest
-    timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
@@ -82,11 +79,10 @@ jobs:
   docs:
     name: Rust doc comments
     runs-on: ubuntu-latest
-    timeout-minutes: 60
     env:
       RUSTDOCFLAGS: -Dwarnings
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
@@ -111,7 +107,6 @@ jobs:
           - os: ubuntu-latest
             rust: minimum
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
     steps:
       - run:
           echo "RUSTUP_TOOLCHAIN=$MSRV" >> $GITHUB_ENV
@@ -122,7 +117,7 @@ jobs:
         shell: bash
         if: matrix.rust == 'latest'
 
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
@@ -160,9 +155,8 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
@@ -186,9 +180,8 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
@@ -209,9 +202,8 @@ jobs:
   python_lint:
     name: Python lint
     runs-on: ubuntu-latest
-    timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
@@ -227,38 +219,6 @@ jobs:
         working-directory: deltachat-rpc-client
         run: tox -e lint
 
-  # mypy does not work with PyPy since mypy 1.19
-  # as it introduced native `librt` dependency
-  # that uses CPython internals.
-  # We only run mypy with CPython because of this.
-  cffi_python_mypy:
-    name: CFFI Python mypy
-    needs: ["c_library", "python_lint"]
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          show-progress: false
-          persist-credentials: false
-
-      - name: Download libdeltachat.a
-        uses: actions/download-artifact@v6
-        with:
-          name: ubuntu-latest-libdeltachat.a
-          path: target/debug
-
-      - name: Install tox
-        run: pip install tox
-
-      - name: Run mypy
-        env:
-          DCC_RS_TARGET: debug
-          DCC_RS_DEV: ${{ github.workspace }}
-        working-directory: python
-        run: tox -e mypy
-
-
   cffi_python_tests:
     name: CFFI Python tests
     needs: ["c_library", "python_lint"]
@@ -278,16 +238,15 @@ jobs:
           - os: macos-latest
             python: pypy3.10
 
-          # Minimum Supported Python Version = 3.10
+          # Minimum Supported Python Version = 3.8
           # This is the minimum version for which manylinux Python wheels are
           # built. Test it with minimum supported Rust version.
           - os: ubuntu-latest
-            python: "3.10"
+            python: 3.8
 
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
@@ -312,7 +271,7 @@ jobs:
           DCC_RS_TARGET: debug
           DCC_RS_DEV: ${{ github.workspace }}
         working-directory: python
-        run: tox -e doc,py
+        run: tox -e mypy,doc,py
 
   rpc_python_tests:
     name: JSON-RPC Python tests
@@ -334,14 +293,13 @@ jobs:
           - os: macos-latest
             python: pypy3.10
 
-          # Minimum Supported Python Version = 3.10
+          # Minimum Supported Python Version = 3.8
           - os: ubuntu-latest
-            python: "3.10"
+            python: 3.8
 
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false

.github/workflows/deltachat-rpc-server.yml

@@ -30,11 +30,11 @@ jobs:
         arch: [aarch64, armv7l, armv6l, i686, x86_64]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
-      - uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
+      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
 
       - name: Build deltachat-rpc-server binaries
         run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-linux
@@ -46,30 +46,6 @@ jobs:
           path: result/bin/deltachat-rpc-server
           if-no-files-found: error
 
-  build_linux_wheel:
-    name: Linux wheel
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: [aarch64, armv7l, armv6l, i686, x86_64]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          show-progress: false
-          persist-credentials: false
-      - uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
-
-      - name: Build deltachat-rpc-server wheels
-        run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-linux-wheel
-
-      - name: Upload wheel
-        uses: actions/upload-artifact@v5
-        with:
-          name: deltachat-rpc-server-${{ matrix.arch }}-linux-wheel
-          path: result/*.whl
-          if-no-files-found: error
-
   build_windows:
     name: Windows
     strategy:
@@ -78,11 +54,11 @@ jobs:
         arch: [win32, win64]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
-      - uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
+      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
 
       - name: Build deltachat-rpc-server binaries
         run: nix build .#deltachat-rpc-server-${{ matrix.arch }}
@@ -94,30 +70,6 @@ jobs:
           path: result/bin/deltachat-rpc-server.exe
           if-no-files-found: error
 
-  build_windows_wheel:
-    name: Windows wheel
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: [win32, win64]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          show-progress: false
-          persist-credentials: false
-      - uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
-
-      - name: Build deltachat-rpc-server wheels
-        run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-wheel
-
-      - name: Upload wheel
-        uses: actions/upload-artifact@v5
-        with:
-          name: deltachat-rpc-server-${{ matrix.arch }}-wheel
-          path: result/*.whl
-          if-no-files-found: error
-
   build_macos:
     name: macOS
     strategy:
@@ -127,7 +79,7 @@ jobs:
 
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
@@ -153,11 +105,11 @@ jobs:
         arch: [arm64-v8a, armeabi-v7a]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
-      - uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
+      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
 
       - name: Build deltachat-rpc-server binaries
         run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-android
@@ -169,33 +121,9 @@ jobs:
           path: result/bin/deltachat-rpc-server
           if-no-files-found: error
 
-  build_android_wheel:
-    name: Android wheel
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: [arm64-v8a, armeabi-v7a]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          show-progress: false
-          persist-credentials: false
-      - uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
-
-      - name: Build deltachat-rpc-server wheels
-        run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-android-wheel
-
-      - name: Upload wheel
-        uses: actions/upload-artifact@v5
-        with:
-          name: deltachat-rpc-server-${{ matrix.arch }}-android-wheel
-          path: result/*.whl
-          if-no-files-found: error
-
   publish:
     name: Build wheels and upload binaries to the release
-    needs: ["build_linux", "build_linux_wheel", "build_windows", "build_windows_wheel", "build_macos", "build_android", "build_android_wheel"]
+    needs: ["build_linux", "build_windows", "build_macos"]
     environment:
       name: pypi
       url: https://pypi.org/p/deltachat-rpc-server
@@ -204,11 +132,11 @@ jobs:
       contents: write
     runs-on: "ubuntu-latest"
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
-      - uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
+      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
 
       - name: Download Linux aarch64 binary
         uses: actions/download-artifact@v6
@@ -216,84 +144,42 @@ jobs:
           name: deltachat-rpc-server-aarch64-linux
           path: deltachat-rpc-server-aarch64-linux.d
 
-      - name: Download Linux aarch64 wheel
-        uses: actions/download-artifact@v6
-        with:
-          name: deltachat-rpc-server-aarch64-linux-wheel
-          path: deltachat-rpc-server-aarch64-linux-wheel.d
-
       - name: Download Linux armv7l binary
         uses: actions/download-artifact@v6
         with:
           name: deltachat-rpc-server-armv7l-linux
           path: deltachat-rpc-server-armv7l-linux.d
 
-      - name: Download Linux armv7l wheel
-        uses: actions/download-artifact@v6
-        with:
-          name: deltachat-rpc-server-armv7l-linux-wheel
-          path: deltachat-rpc-server-armv7l-linux-wheel.d
-
       - name: Download Linux armv6l binary
         uses: actions/download-artifact@v6
         with:
           name: deltachat-rpc-server-armv6l-linux
           path: deltachat-rpc-server-armv6l-linux.d
 
-      - name: Download Linux armv6l wheel
-        uses: actions/download-artifact@v6
-        with:
-          name: deltachat-rpc-server-armv6l-linux-wheel
-          path: deltachat-rpc-server-armv6l-linux-wheel.d
-
       - name: Download Linux i686 binary
         uses: actions/download-artifact@v6
         with:
           name: deltachat-rpc-server-i686-linux
           path: deltachat-rpc-server-i686-linux.d
 
-      - name: Download Linux i686 wheel
-        uses: actions/download-artifact@v6
-        with:
-          name: deltachat-rpc-server-i686-linux-wheel
-          path: deltachat-rpc-server-i686-linux-wheel.d
-
       - name: Download Linux x86_64 binary
         uses: actions/download-artifact@v6
         with:
           name: deltachat-rpc-server-x86_64-linux
           path: deltachat-rpc-server-x86_64-linux.d
 
-      - name: Download Linux x86_64 wheel
-        uses: actions/download-artifact@v6
-        with:
-          name: deltachat-rpc-server-x86_64-linux-wheel
-          path: deltachat-rpc-server-x86_64-linux-wheel.d
-
       - name: Download Win32 binary
         uses: actions/download-artifact@v6
         with:
           name: deltachat-rpc-server-win32
           path: deltachat-rpc-server-win32.d
 
-      - name: Download Win32 wheel
-        uses: actions/download-artifact@v6
-        with:
-          name: deltachat-rpc-server-win32-wheel
-          path: deltachat-rpc-server-win32-wheel.d
-
       - name: Download Win64 binary
         uses: actions/download-artifact@v6
         with:
           name: deltachat-rpc-server-win64
           path: deltachat-rpc-server-win64.d
 
-      - name: Download Win64 wheel
-        uses: actions/download-artifact@v6
-        with:
-          name: deltachat-rpc-server-win64-wheel
-          path: deltachat-rpc-server-win64-wheel.d
-
       - name: Download macOS binary for x86_64
         uses: actions/download-artifact@v6
         with:
@@ -312,24 +198,12 @@ jobs:
           name: deltachat-rpc-server-arm64-v8a-android
           path: deltachat-rpc-server-arm64-v8a-android.d
 
-      - name: Download Android wheel for arm64-v8a
-        uses: actions/download-artifact@v6
-        with:
-          name: deltachat-rpc-server-arm64-v8a-android-wheel
-          path: deltachat-rpc-server-arm64-v8a-android-wheel.d
-
       - name: Download Android binary for armeabi-v7a
         uses: actions/download-artifact@v6
         with:
           name: deltachat-rpc-server-armeabi-v7a-android
           path: deltachat-rpc-server-armeabi-v7a-android.d
 
-      - name: Download Android wheel for armeabi-v7a
-        uses: actions/download-artifact@v6
-        with:
-          name: deltachat-rpc-server-armeabi-v7a-android-wheel
-          path: deltachat-rpc-server-armeabi-v7a-android-wheel.d
-
       - name: Create bin/ directory
         run: |
           mkdir -p bin
@@ -348,21 +222,38 @@ jobs:
       - name: List binaries
         run: ls -l bin/
 
+      # Python 3.11 is needed for tomllib used in scripts/wheel-rpc-server.py
+      - name: Install python 3.12
+        uses: actions/setup-python@v6
+        with:
+          python-version: 3.12
+
       - name: Install wheel
         run: pip install wheel
 
-      - name: Build deltachat-rpc-server Python wheels
+      - name: Build deltachat-rpc-server Python wheels and source package
         run: |
           mkdir -p dist
-          mv deltachat-rpc-server-aarch64-linux-wheel.d/*.whl dist/
-          mv deltachat-rpc-server-armv7l-linux-wheel.d/*.whl dist/
-          mv deltachat-rpc-server-armv6l-linux-wheel.d/*.whl dist/
-          mv deltachat-rpc-server-i686-linux-wheel.d/*.whl dist/
-          mv deltachat-rpc-server-x86_64-linux-wheel.d/*.whl dist/
-          mv deltachat-rpc-server-win64-wheel.d/*.whl dist/
-          mv deltachat-rpc-server-win32-wheel.d/*.whl dist/
-          mv deltachat-rpc-server-arm64-v8a-android-wheel.d/*.whl dist/
-          mv deltachat-rpc-server-armeabi-v7a-android-wheel.d/*.whl dist/
+          nix build .#deltachat-rpc-server-x86_64-linux-wheel
+          cp result/*.whl dist/
+          nix build .#deltachat-rpc-server-armv7l-linux-wheel
+          cp result/*.whl dist/
+          nix build .#deltachat-rpc-server-armv6l-linux-wheel
+          cp result/*.whl dist/
+          nix build .#deltachat-rpc-server-aarch64-linux-wheel
+          cp result/*.whl dist/
+          nix build .#deltachat-rpc-server-i686-linux-wheel
+          cp result/*.whl dist/
+          nix build .#deltachat-rpc-server-win64-wheel
+          cp result/*.whl dist/
+          nix build .#deltachat-rpc-server-win32-wheel
+          cp result/*.whl dist/
+          nix build .#deltachat-rpc-server-arm64-v8a-android-wheel
+          cp result/*.whl dist/
+          nix build .#deltachat-rpc-server-armeabi-v7a-android-wheel
+          cp result/*.whl dist/
+          nix build .#deltachat-rpc-server-source
+          cp result/*.tar.gz dist/
           python3 scripts/wheel-rpc-server.py x86_64-darwin bin/deltachat-rpc-server-x86_64-macos
           python3 scripts/wheel-rpc-server.py aarch64-darwin bin/deltachat-rpc-server-aarch64-macos
           mv *.whl dist/
@@ -380,7 +271,7 @@ jobs:
             --repo ${{ github.repository }} \
             bin/* dist/*
 
-      - name: Publish deltachat-rpc-server to PyPI
+      - name: Publish deltachat-rpc-client to PyPI
         if: github.event_name == 'release'
         uses: pypa/gh-action-pypi-publish@release/v1
 
@@ -388,16 +279,13 @@ jobs:
     name: Build & Publish npm prebuilds and deltachat-rpc-server
     needs: ["build_linux", "build_windows", "build_macos"]
     runs-on: "ubuntu-latest"
-    environment:
-      name: npm-stdio-rpc-server
-      url: https://www.npmjs.com/package/@deltachat/stdio-rpc-server
     permissions:
       id-token: write
 
       # Needed to publish the binaries to the release.
       contents: write
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
@@ -518,14 +406,11 @@ jobs:
           node-version: 20
           registry-url: "https://registry.npmjs.org"
 
-      # Ensure npm 11.5.1 or later is installed.
-      # It is needed for <https://docs.npmjs.com/trusted-publishers>
-      - name: Update npm
-        run: npm install -g npm@latest
-
       - name: Publish npm packets for prebuilds and `@deltachat/stdio-rpc-server`
         if: github.event_name == 'release'
         working-directory: deltachat-rpc-server/npm-package
         run: |
           ls -lah platform_package
           for platform in *.tgz; do npm publish --provenance "$platform" --access public; done
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/jsonrpc-client-npm-package.yml

@@ -10,14 +10,11 @@ jobs:
   pack-module:
     name: "Publish @deltachat/jsonrpc-client"
     runs-on: ubuntu-latest
-    environment:
-      name: npm-jsonrpc-client
-      url: https://www.npmjs.com/package/@deltachat/jsonrpc-client
     permissions:
       id-token: write
       contents: read
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
@@ -27,11 +24,6 @@ jobs:
           node-version: 20
           registry-url: "https://registry.npmjs.org"
 
-      # Ensure npm 11.5.1 or later is installed.
-      # It is needed for <https://docs.npmjs.com/trusted-publishers>
-      - name: Update npm
-        run: npm install -g npm@latest
-
       - name: Install dependencies without running scripts
         working-directory: deltachat-jsonrpc/typescript
         run: npm install --ignore-scripts
@@ -45,3 +37,5 @@ jobs:
       - name: Publish
         working-directory: deltachat-jsonrpc/typescript
         run: npm publish --provenance deltachat-jsonrpc-client-* --access public
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/jsonrpc.yml

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

.github/workflows/nix.yml

@@ -21,11 +21,11 @@ jobs:
     name: check flake formatting
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
-      - uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
+      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
       - run: nix fmt flake.nix -- --check
 
   build:
@@ -80,11 +80,11 @@ jobs:
           #- deltachat-rpc-server-x86_64-android
           #- deltachat-rpc-server-x86-android
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
-      - uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
+      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
       - run: nix build .#${{ matrix.installable }}
 
   build-macos:
@@ -101,9 +101,9 @@ jobs:
           # because of <https://github.com/NixOS/nixpkgs/issues/413910>.
           # - deltachat-rpc-server-aarch64-darwin
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
-      - uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
+      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
       - run: nix build .#${{ matrix.installable }}

.github/workflows/publish-deltachat-rpc-client-pypi.yml

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

.github/workflows/repl.yml

@@ -14,11 +14,11 @@ jobs:
     name: Build REPL example
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
-      - uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
+      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
       - name: Build
         run: nix build .#deltachat-repl-win64
       - name: Upload binary

.github/workflows/upload-docs.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
@@ -31,12 +31,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
           fetch-depth: 0 # Fetch history to calculate VCS version number.
-      - uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
+      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
       - name: Build Python documentation
         run: nix build .#python-docs
       - name: Upload to py.delta.chat
@@ -50,12 +50,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
           fetch-depth: 0 # Fetch history to calculate VCS version number.
-      - uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
+      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
       - name: Build C documentation
         run: nix build .#docs
       - name: Upload to c.delta.chat
@@ -72,7 +72,7 @@ jobs:
         working-directory: ./deltachat-jsonrpc/typescript
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false

.github/workflows/upload-ffi-docs.yml

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

.github/workflows/zizmor-scan.yml

@@ -14,12 +14,12 @@ jobs:
       security-events: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
         with:
           persist-credentials: false
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244
+        uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41
 
       - name: Run zizmor
         run: uvx zizmor --format sarif . > results.sarif

CHANGELOG.md

@@ -1,261 +1,5 @@
 # Changelog
 
-## [2.35.0] - 2025-12-16
-
-### API-Changes
-
-- Add blob dir size to storage info ([#7605](https://github.com/chatmail/core/pull/7605)).
-
-### Features / Changes
-
-- Use `turn.delta.chat` as fallback TURN server ([#7382](https://github.com/chatmail/core/pull/7382)).
-- Add ip addresses of known public chatmail relays from https://chatmail.at/relays to DNS cache ([#7607](https://github.com/chatmail/core/pull/7607)).
-- Improve error messages on adding relays.
-- Add transport addresses to IMAP URLs in message info.
-- `lookup_host_with_cache()`: Don't return empty address list ([#7596](https://github.com/chatmail/core/pull/7596)).
-
-### Fixes
-
-- `get_chat_msgs_ex()`: Don't match on "S=" (Cmd) in param payload.
-- Remove `SecurejoinWait` info message when received Alice's key ([#7585](https://github.com/chatmail/core/pull/7585)).
-- Do not set normalized name for existing chats and contacts in a migration.
-- Remove now redundant "used_account_settings" and "entered_account_settings" from `Context.get_info()` ([#7587](https://github.com/chatmail/core/pull/7587)).
-- Don't use fallback servers if got TURN servers from IMAP METADATA.
-- Use fallback ICE servers if server can't IMAP METADATA ([#7382](https://github.com/chatmail/core/pull/7382)).
-- Add explicit limit for adding relays (5 at the moment) ([#7611](https://github.com/chatmail/core/pull/7611)).
-- Take `transport_id` into account when using `imap` table.
-
-### CI
-
-- Update Rust to 1.92.0.
-
-### Miscellaneous Tasks
-
-- Apply Rust 1.92.0 clippy suggestions.
-
-### Other
-
-- Log entered login params and actual used params on configuration failure ([#7610](https://github.com/chatmail/core/pull/7610)).
-
-## [2.34.0] - 2025-12-11
-
-### API-Changes
-
-- rpc-client: Accept `Account` for `Chat.{add,remove}_contact()`.
-- rpc-client: Add `Chat.num_contacts()`.
-- Forwarding messages to another profile ([#7491](https://github.com/chatmail/core/pull/7491)).
-
-### Features / Changes
-
-- Double ringing time to 120 seconds.
-- Better logging for failing securejoin messages ([#7593](https://github.com/chatmail/core/pull/7593)).
-- Add multi-transport information to `Context.get_info` ([#7583](https://github.com/chatmail/core/pull/7583))
-
-### Fixes
-
-- Multi-transport: all transports were shown as "inbox" in connectivity view, now they are shown by their hostname ([#7582](https://github.com/chatmail/core/pull/7582)).
-- Multi-transport: Synchronize primary transport immediately after changing it.
-- Use u64 instead of usize to calculate storage usage.
-- Use u64 to represent the number of bytes in backup files.
-- Use u64 to count the number of bytes sent/received over the network.
-- Use logging macros instead of emitting event directly, so that it is also logged by tracing ([#7459](https://github.com/chatmail/core/pull/7459)).
-- Let securejoin succeed even if the chat was deleted in the meantime ([#7594](https://github.com/chatmail/core/pull/7594)).
-
-### Miscellaneous Tasks
-
-- Add RUSTSEC-2025-0134 exception to deny.toml.
-
-### Refactor
-
-- Use u16 instead of usize to represent progress bar.
-- Remove EncryptHelper.prefer_encrypt.
-- Add params when forwarding message instead of removing unneeded ones.
-
-### Tests
-
-- Port test_synchronize_member_list_on_group_rejoin to JSON-RPC.
-- Test setting up second device between core versions.
-
-## [2.33.0] - 2025-12-05
-
-### Features / Changes
-
-- Case-insensitive search for non-ASCII chat and contact names ([#7477](https://github.com/chatmail/core/pull/7477)).
-
-### Fixes
-
-- Recognize all transport addresses as own addresses.
-
-## [2.32.0] - 2025-12-04
-
-Version bump to trigger publishing of npm prebuilds
-that failed to be published for 2.31.0 due to not configured "trusted publishers".
-
-### Features / Changes
-
-- Lookup_or_create_adhoc_group(): Add context to SQL errors ([#7554](https://github.com/chatmail/core/pull/7554)).
-
-## [2.31.0] - 2025-12-04
-
-### CI
-
-- Update npm before publishing packages.
-
-### Features / Changes
-
-- Use v2 SEIPD when sending messages to self.
-
-## [2.30.0] - 2025-12-04
-
-### Features / Changes
-
-- Disable SNI for STARTTLS ([#7499](https://github.com/chatmail/core/pull/7499)).
-- Introduce cross-core testing along with improvements to test frameworking.
-- Synchronize transports via sync messages.
-
-### Fixes
-
-- Fix shutdown shortly after call.
-
-### API-Changes
-
-- Add `TransportsModified` event (for tests).
-
-### CI
-
-- Use "trusted publishing" for NPM packages.
-
-### Miscellaneous Tasks
-
-- deps: Bump actions/checkout from 5 to 6.
-- cargo: Bump syn from 2.0.110 to 2.0.111.
-- deps: Bump astral-sh/setup-uv from 7.1.3 to 7.1.4.
-- cargo: Bump sdp from 0.8.0 to 0.10.0.
-- Remove two outdated todo comments ([#7550](https://github.com/chatmail/core/pull/7550)).
-
-## [2.29.0] - 2025-12-01
-
-### API-Changes
-
-- deltachat-rpc-client: Add Message.exists().
-
-### Features / Changes
-
-- [**breaking**] Increase backup version from 3 to 4.
-- Hide `To` header in encrypted messages.
-- `deltachat_rpc_client.Rpc` accepts `rpc_server_path` for using a particular deltachat-rpc-server ([#7493](https://github.com/chatmail/core/pull/7493)).
-- Don't send `Chat-Group-Avatar` header in unencrypted groups.
-- Don't update `self-{avatar,status}` from received messages ([#7002](https://github.com/chatmail/core/pull/7002)).
-
-### Fixes
-
-- `CREATE INDEX imap_only_rfc724_mid ON imap(rfc724_mid)` ([#7490](https://github.com/chatmail/core/pull/7490)).
-- Use the same webxdc ratelimit for all email servers.
-- Handle the case when account does not exist in `get_existing_msg_ids()`.
-- Don't send self-avatar in unencrypted messages ([#7136](https://github.com/chatmail/core/pull/7136)).
-- Do not configure folders during transport configuration.
-- Upload sync messages only with the primary transport.
-- Do not use deprecated ConfiguredProvider in get_configured_provider.
-
-### Build system
-
-- Make scripts for remote testing usable.
-- Increase minimum supported Python version to 3.10.
-- Use SPDX license expression in Python package metadata.
-
-### CI
-
-- Set timeout-minutes for all jobs in ci.yaml workflow.
-- Do not install Python manually to bulid RPC server wheels.
-- Do not build fake RPC server source packages.
-- Build Python wheels in separate jobs.
-
-### Refactor
-
-- [**breaking**] Remove some unneeded stock strings ([#7496](https://github.com/chatmail/core/pull/7496)).
-- Strike events in rpc-client request handling, get result from queue.
-- Use ConfiguredProvider config directly when loading legacy settings.
-- Remove update_icons and disable_server_delete migrations.
-- Use `SYMMETRIC_KEY_ALGORITHM` constant in `symm_encrypt_message()`.
-- Make signing key non-optional for `pk_encrypt`.
-
-### Tests
-
-- `test_remove_member_bcc`: Test unencrypted group as it was initially.
-
-### Miscellaneous Tasks
-
-- deps: Bump cachix/install-nix-action from 31.8.1 to 31.8.4.
-- cargo: Bump hyper from 1.7.0 to 1.8.1.
-- cargo: Bump human-panic from 2.0.3 to 2.0.4.
-- cargo: Bump hyper-util from 0.1.17 to 0.1.18.
-- cargo: Bump rusqlite from 0.36.0 to 0.37.0.
-- cargo: Bump tokio-util from 0.7.16 to 0.7.17.
-- cargo: Bump toml from 0.9.7 to 0.9.8.
-- cargo: Bump proptest from 1.8.0 to 1.9.0.
-- cargo: Bump parking_lot from 0.12.4 to 0.12.5.
-- cargo: Bump syn from 2.0.106 to 2.0.110.
-- cargo: Bump quick-xml from 0.38.3 to 0.38.4.
-- cargo: Bump rustls-pki-types from 1.12.0 to 1.13.0.
-- cargo: Bump nu-ansi-term from 0.50.1 to 0.50.3.
-- cargo: Bump sanitize-filename from 0.5.0 to 0.6.0.
-- cargo: Bump quote from 1.0.41 to 1.0.42.
-- cargo: Bump libc from 0.2.176 to 0.2.177.
-- cargo: Bump bytes from 1.10.1 to 1.11.0.
-- cargo: Bump image from 0.25.8 to 0.25.9.
-- cargo: Bump rand from 0.9.0 to 0.9.2 ([#7501](https://github.com/chatmail/core/pull/7501)).
-- cargo: Bump tokio from 1.45.1 to 1.48.0.
-
-## [2.28.0] - 2025-11-23
-
-### API-Changes
-
-- New API `get_existing_msg_ids()` to check if the messages with given IDs exist.
-- Add API to get storage usage information. (JSON-RPC method: `get_storage_usage_report_string`) ([#7486](https://github.com/chatmail/core/pull/7486)).
-
-### Features / Changes
-
-- Experimentaly allow adding second transport.
-  There is no synchronization yet, so UIs should not allow the user to change the address manually and only expose the ability to add transports if `bcc_self` is disabled.
-- Default `bcc_self` to 0 for all new accounts.
-- Rephrase "Establishing end-to-end encryption" -> "Establishing connection".
-- Stock string for joining a channel ([#7480](https://github.com/chatmail/core/pull/7480)).
-
-### Fixes
-
-- Limit the range of `Date` to up to 6 days in the past.
-- `ContactId::set_name_ex()`: Emit ContactsChanged when transaction is completed.
-- Set SQLite busy timeout to 1 minute on iOS.
-- Sort system messages to the bottom of the chat.
-- Assign outgoing self-sent unencrypted messages to ad-hoc groups with only SELF ([#7409](https://github.com/chatmail/core/pull/7409)).
-- Add missing stock strings.
-- Look up or create ad-hoc group if there are duplicate addresses in "To".
-
-### Documentation
-
-- Add missing RFC 9788, link 'Header Protection for Cryptographically Protected Email' as other RFC.
-- Remove unsupported RFC 3503 (`$MDNSent` flag) from the list of standards.
-- Mark database encryption support as deprecated ([#7403](https://github.com/chatmail/core/pull/7403)).
-
-### Build system
-
-- Increase Minimum Supported Rust Version to 1.88.0.
-- Update rPGP from 0.17.0 to 0.18.0.
-- nix: Update `fenix` and use it for all Rust builds.
-
-### CI
-
-- Do not use --encoding option for rst-lint.
-
-### Refactor
-
-- Use `HashMap::extract_if()` stabilized in Rust 1.88.0.
-- Remove some easy to remove unwrap() calls.
-
-### Tests
-
-- Contact shalln't be verified by another having unknown verifier.
-
 ## [2.27.0] - 2025-11-16
 
 ### API-Changes
@@ -7441,11 +7185,3 @@ https://github.com/chatmail/core/pulls?q=is%3Apr+is%3Aclosed
 [2.25.0]: https://github.com/chatmail/core/compare/v2.24.0..v2.25.0
 [2.26.0]: https://github.com/chatmail/core/compare/v2.25.0..v2.26.0
 [2.27.0]: https://github.com/chatmail/core/compare/v2.26.0..v2.27.0
-[2.28.0]: https://github.com/chatmail/core/compare/v2.27.0..v2.28.0
-[2.29.0]: https://github.com/chatmail/core/compare/v2.28.0..v2.29.0
-[2.30.0]: https://github.com/chatmail/core/compare/v2.29.0..v2.30.0
-[2.31.0]: https://github.com/chatmail/core/compare/v2.30.0..v2.31.0
-[2.32.0]: https://github.com/chatmail/core/compare/v2.31.0..v2.32.0
-[2.33.0]: https://github.com/chatmail/core/compare/v2.32.0..v2.33.0
-[2.34.0]: https://github.com/chatmail/core/compare/v2.33.0..v2.34.0
-[2.35.0]: https://github.com/chatmail/core/compare/v2.34.0..v2.35.0

CONTRIBUTING.md

@@ -1,4 +1,4 @@
-# Contributing to chatmail core
+# Contributing to Delta Chat
 
 ## Bug reports
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "2.35.0"
+version = "2.27.0"
 edition = "2024"
 license = "MPL-2.0"
 rust-version = "1.88"
@@ -78,7 +78,7 @@ num-derive = "0.4"
 num-traits = { workspace = true }
 parking_lot = "0.12.4"
 percent-encoding = "2.3"
-pgp = { version = "0.18.0", default-features = false }
+pgp = { version = "0.17.0", default-features = false }
 pin-project = "1"
 qrcodegen = "1.7.0"
 quick-xml = { version = "0.38", features = ["escape-html"] }
@@ -88,7 +88,7 @@ regex = { workspace = true }
 rusqlite = { workspace = true, features = ["sqlcipher"] }
 rustls-pki-types = "1.12.0"
 sanitize-filename = { workspace = true }
-sdp = "0.10.0"
+sdp = "0.8.0"
 serde_json = { workspace = true }
 serde_urlencoded = "0.7.1"
 serde = { workspace = true, features = ["derive"] }
@@ -111,7 +111,6 @@ toml = "0.9"
 tracing = "0.1.41"
 url = "2"
 uuid = { version = "1", features = ["serde", "v4"] }
-walkdir = "2.5.0"
 webpki-roots = "0.26.8"
 
 [dev-dependencies]
@@ -195,14 +194,14 @@ nu-ansi-term = "0.50"
 num-traits = "0.2"
 rand = "0.9"
 regex = "1.10"
-rusqlite = "0.37"
-sanitize-filename = "0.6"
+rusqlite = "0.36"
+sanitize-filename = "0.5"
 serde = "1.0"
 serde_json = "1"
 tempfile = "3.23.0"
 thiserror = "2"
 tokio = "1"
-tokio-util = "0.7.17"
+tokio-util = "0.7.16"
 tracing-subscriber = "0.3"
 yerpc = "0.6.4"
 

STYLE.md

@@ -16,8 +16,7 @@ id INTEGER PRIMARY KEY AUTOINCREMENT,
 text TEXT DEFAULT '' NOT NULL -- message text
 ) STRICT",
     )
-    .await
-    .context("CREATE TABLE messages")?;
+    .await?;
 ```
 
 Do not use macros like [`concat!`](https://doc.rust-lang.org/std/macro.concat.html)
@@ -30,8 +29,7 @@ id INTEGER PRIMARY KEY AUTOINCREMENT, \
 text TEXT DEFAULT '' NOT NULL \
 ) STRICT",
     )
-    .await
-    .context("CREATE TABLE messages")?;
+    .await?;
 ```
 Escaping newlines
 is prone to errors like this if space before backslash is missing:
@@ -65,9 +63,6 @@ an older version. Also don't change the column type, consider adding a new colum
 instead. Finally, never change column semantics, this is especially dangerous because the `STRICT`
 keyword doesn't help here.
 
-Consider adding context to `anyhow` errors for SQL statements using `.context()` so that it's
-possible to understand from logs which statement failed. See [Errors](#errors) for more info.
-
 ## Errors
 
 Delta Chat core mostly uses [`anyhow`](https://docs.rs/anyhow/) errors.

benches/decrypting.rs

@@ -38,7 +38,7 @@ use deltachat::{
     internals_for_benches::key_from_asc,
     internals_for_benches::parse_and_get_text,
     internals_for_benches::store_self_keypair,
-    pgp::{KeyPair, SeipdVersion, decrypt, pk_encrypt, symm_encrypt_message},
+    pgp::{KeyPair, decrypt, pk_encrypt, symm_encrypt_message},
     stock_str::StockStrings,
 };
 use rand::{Rng, rng};
@@ -108,10 +108,9 @@ fn criterion_benchmark(c: &mut Criterion) {
             pk_encrypt(
                 plain.clone(),
                 vec![black_box(key_pair.public.clone())],
-                key_pair.secret.clone(),
+                Some(key_pair.secret.clone()),
                 true,
                 true,
-                SeipdVersion::V2,
             )
             .await
             .unwrap()

deltachat-ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "2.35.0"
+version = "2.27.0"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"

deltachat-ffi/deltachat.h

@@ -247,7 +247,7 @@ typedef struct _dc_event_emitter dc_accounts_event_emitter_t;
 // create/open/config/information
 
 /**
- * Create a new context object and try to open it. If
+ * Create a new context object and try to open it without passphrase. If
  * database is encrypted, the result is the same as using
  * dc_context_new_closed() and the database should be opened with
  * dc_context_open() before using.
@@ -283,13 +283,8 @@ dc_context_t*   dc_context_new_closed        (const char* dbfile);
 
 
 /**
- * Opens the database with the given passphrase.
- * NB: Nonempty passphrase (db encryption) is deprecated 2025-11:
- * - Db encryption does nothing with blobs, so fs/disk encryption is recommended.
- * - Isolation from other apps is needed anyway.
- *
- * This can only be used on closed context, such as
- * created by dc_context_new_closed(). If the database
+ * Opens the database with the given passphrase. This can only be used on
+ * closed context, such as created by dc_context_new_closed(). If the database
  * is new, this operation sets the database passphrase. For existing databases
  * the passphrase should be the one used to encrypt the database the first
  * time.
@@ -306,8 +301,6 @@ int             dc_context_open              (dc_context_t *context, const char*
 
 /**
  * Changes the passphrase on the open database.
- * Deprecated 2025-11, see `dc_context_open()` for reasoning.
- *
  * Existing database must already be encrypted and the passphrase cannot be NULL or empty.
  * It is impossible to encrypt unencrypted database with this method and vice versa.
  *
@@ -7215,6 +7208,11 @@ void dc_event_unref(dc_event_t* event);
 /// Used as device message text.
 #define DC_STR_SELF_DELETED_MSG_BODY      91
 
+/// "'Delete messages from server' turned off as now all folders are affected."
+///
+/// Used as device message text.
+#define DC_STR_SERVER_TURNED_OFF          92
+
 /// "Message deletion timer is set to %1$s minutes."
 ///
 /// Used in status messages.
@@ -7411,6 +7409,19 @@ void dc_event_unref(dc_event_t* event);
 /// @deprecated 2025-06-05
 #define DC_STR_AEAP_ADDR_CHANGED          122
 
+/// "You changed your email address from %1$s to %2$s.
+/// If you now send a message to a group, contacts there will automatically
+/// replace the old with your new address.\n\n It's highly advised to set up 
+/// your old email provider to forward all emails to your new email address. 
+/// Otherwise you might miss messages of contacts who did not get your new 
+/// address yet." + the link to the AEAP blog post
+/// 
+/// As soon as there is a post about AEAP, the UIs should add it:
+/// set_stock_translation(123, getString(aeap_explanation) + "\n\n" + AEAP_BLOG_LINK)
+///
+/// Used in a device message that explains AEAP.
+#define DC_STR_AEAP_EXPLANATION_AND_LINK  123
+
 /// "You changed group name from \"%1$s\" to \"%2$s\"."
 ///
 /// `%1$s` will be replaced by the old group name.
@@ -7659,6 +7670,12 @@ void dc_event_unref(dc_event_t* event);
 /// Used in info messages.
 #define DC_STR_CHAT_PROTECTION_ENABLED 170
 
+/// "%1$s sent a message from another device."
+///
+/// Used in info messages.
+/// @deprecated 2025-07
+#define DC_STR_CHAT_PROTECTION_DISABLED 171
+
 /// "Others will only see this group after you sent a first message."
 ///
 /// Used as the first info messages in newly created groups.
@@ -7695,12 +7712,7 @@ void dc_event_unref(dc_event_t* event);
 /// Used in summaries.
 #define DC_STR_REACTED_BY 177
 
-/// "Member %1$s removed."
-///
-/// `%1$s` will be replaced by name of the removed contact.
-#define DC_STR_REMOVE_MEMBER 178
-
-/// "Establishing connection, please wait…"
+/// "Establishing guaranteed end-to-end encryption, please wait…"
 ///
 /// Used as info message.
 #define DC_STR_SECUREJOIN_WAIT 190
@@ -7744,22 +7756,7 @@ void dc_event_unref(dc_event_t* event);
 /// Subtitle for channel join qrcode svg image generated by the core.
 ///
 /// `%1$s` will be replaced with the channel name.
-#define DC_STR_SECURE_JOIN_CHANNEL_QR_DESC 201
-
-/// "You joined the channel."
-#define DC_STR_MSG_YOU_JOINED_CHANNEL 202
-
-/// "%1$s invited you to join this channel. Waiting for the device of %2$s to reply…"
-///
-/// Added as an info-message directly after scanning a QR code for joining a broadcast channel.
-///
-/// `%1$s` and `%2$s` will both be replaced by the name of the inviter.
-#define DC_STR_SECURE_JOIN_CHANNEL_STARTED 203
-
-/// "The attachment contains anonymous usage statistics, which help us improve Delta Chat. Thank you!"
-///
-/// Used as the message body for statistics sent out.
-#define DC_STR_STATS_MSG_BODY 210
+#define DC_STR_SECURE_JOIN_CHANNEL_QR_DESC  201
 
 /// "Proxy Enabled"
 ///

deltachat-ffi/src/lib.rs

@@ -559,7 +559,6 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
         EventType::IncomingCallAccepted { .. } => 2560,
         EventType::OutgoingCallAccepted { .. } => 2570,
         EventType::CallEnded { .. } => 2580,
-        EventType::TransportsModified => 2600,
         #[allow(unreachable_patterns)]
         #[cfg(test)]
         _ => unreachable!("This is just to silence a rust_analyzer false-positive"),
@@ -594,8 +593,7 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
         | EventType::AccountsBackgroundFetchDone
         | EventType::ChatlistChanged
         | EventType::AccountsChanged
-        | EventType::AccountsItemChanged
-        | EventType::TransportsModified => 0,
+        | EventType::AccountsItemChanged => 0,
         EventType::IncomingReaction { contact_id, .. }
         | EventType::IncomingWebxdcNotify { contact_id, .. } => contact_id.to_u32() as libc::c_int,
         EventType::MsgsChanged { chat_id, .. }
@@ -683,8 +681,7 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
         | EventType::IncomingCallAccepted { .. }
         | EventType::OutgoingCallAccepted { .. }
         | EventType::CallEnded { .. }
-        | EventType::EventChannelOverflow { .. }
-        | EventType::TransportsModified => 0,
+        | EventType::EventChannelOverflow { .. } => 0,
         EventType::MsgsChanged { msg_id, .. }
         | EventType::ReactionsChanged { msg_id, .. }
         | EventType::IncomingReaction { msg_id, .. }
@@ -783,8 +780,7 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
         | EventType::AccountsChanged
         | EventType::AccountsItemChanged
         | EventType::IncomingCallAccepted { .. }
-        | EventType::WebxdcRealtimeAdvertisementReceived { .. }
-        | EventType::TransportsModified => ptr::null_mut(),
+        | EventType::WebxdcRealtimeAdvertisementReceived { .. } => ptr::null_mut(),
         EventType::IncomingCall {
             place_call_info, ..
         } => {

deltachat-jsonrpc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "2.35.0"
+version = "2.27.0"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
 license = "MPL-2.0"
@@ -19,6 +19,7 @@ yerpc = { workspace = true, features = ["anyhow_expose", "openrpc"] }
 typescript-type-def = { version = "0.5.13", features = ["json_value"] }
 tokio = { workspace = true }
 sanitize-filename = { workspace = true }
+walkdir = "2.5.0"
 base64 = { workspace = true }
 
 [dev-dependencies]

deltachat-jsonrpc/src/api.rs

@@ -10,9 +10,8 @@ pub use deltachat::accounts::Accounts;
 use deltachat::blob::BlobObject;
 use deltachat::calls::ice_servers;
 use deltachat::chat::{
-    self, add_contact_to_chat, forward_msgs, forward_msgs_2ctx, get_chat_media, get_chat_msgs,
-    get_chat_msgs_ex, marknoticed_chat, remove_contact_from_chat, Chat, ChatId, ChatItem,
-    MessageListOptions,
+    self, add_contact_to_chat, forward_msgs, get_chat_media, get_chat_msgs, get_chat_msgs_ex,
+    marknoticed_chat, remove_contact_from_chat, Chat, ChatId, ChatItem, MessageListOptions,
 };
 use deltachat::chatlist::Chatlist;
 use deltachat::config::Config;
@@ -22,9 +21,9 @@ use deltachat::context::get_info;
 use deltachat::ephemeral::Timer;
 use deltachat::imex;
 use deltachat::location;
+use deltachat::message::get_msg_read_receipts;
 use deltachat::message::{
-    self, delete_msgs_ex, get_existing_msg_ids, get_msg_read_receipts, markseen_msgs, Message,
-    MessageState, MsgId, Viewtype,
+    self, delete_msgs_ex, markseen_msgs, Message, MessageState, MsgId, Viewtype,
 };
 use deltachat::peer_channels::{
     leave_webxdc_realtime, send_webxdc_realtime_advertisement, send_webxdc_realtime_data,
@@ -35,13 +34,13 @@ use deltachat::qr_code_generator::{generate_backup_qr, get_securejoin_qr_svg};
 use deltachat::reaction::{get_msg_reactions, send_reaction};
 use deltachat::securejoin;
 use deltachat::stock_str::StockMessage;
-use deltachat::storage_usage::{get_blobdir_storage_usage, get_storage_usage};
 use deltachat::webxdc::StatusUpdateSerial;
 use deltachat::EventEmitter;
 use sanitize_filename::is_sanitized;
 use tokio::fs;
 use tokio::sync::{watch, Mutex, RwLock};
 use types::login_param::EnteredLoginParam;
+use walkdir::WalkDir;
 use yerpc::rpc;
 
 pub mod types;
@@ -121,14 +120,14 @@ impl CommandApi {
         }
     }
 
-    async fn get_context_opt(&self, id: u32) -> Option<deltachat::context::Context> {
-        self.accounts.read().await.get_account(id)
-    }
-
     async fn get_context(&self, id: u32) -> Result<deltachat::context::Context> {
-        self.get_context_opt(id)
+        let sc = self
+            .accounts
+            .read()
             .await
-            .ok_or_else(|| anyhow!("account with id {id} not found"))
+            .get_account(id)
+            .ok_or_else(|| anyhow!("account with id {id} not found"))?;
+        Ok(sc)
     }
 
     async fn with_state<F, T>(&self, id: u32, with_state: F) -> T
@@ -329,7 +328,13 @@ impl CommandApi {
     async fn get_account_file_size(&self, account_id: u32) -> Result<u64> {
         let ctx = self.get_context(account_id).await?;
         let dbfile = ctx.get_dbfile().metadata()?.len();
-        let total_size = get_blobdir_storage_usage(&ctx);
+        let total_size = WalkDir::new(ctx.get_blobdir())
+            .max_depth(2)
+            .into_iter()
+            .filter_map(|entry| entry.ok())
+            .filter_map(|entry| entry.metadata().ok())
+            .filter(|metadata| metadata.is_file())
+            .fold(0, |acc, m| acc + m.len());
 
         Ok(dbfile + total_size)
     }
@@ -361,13 +366,6 @@ impl CommandApi {
         ctx.get_info().await
     }
 
-    /// Get storage usage report as formatted string
-    async fn get_storage_usage_report_string(&self, account_id: u32) -> Result<String> {
-        let ctx = self.get_context(account_id).await?;
-        let storage_usage = get_storage_usage(&ctx).await?;
-        Ok(storage_usage.to_string())
-    }
-
     /// Get the blob dir.
     async fn get_blob_dir(&self, account_id: u32) -> Result<Option<String>> {
         let ctx = self.get_context(account_id).await?;
@@ -1297,24 +1295,6 @@ impl CommandApi {
             .collect())
     }
 
-    /// Checks if the messages with given IDs exist.
-    ///
-    /// Returns IDs of existing messages.
-    async fn get_existing_msg_ids(&self, account_id: u32, msg_ids: Vec<u32>) -> Result<Vec<u32>> {
-        if let Some(context) = self.get_context_opt(account_id).await {
-            let msg_ids: Vec<MsgId> = msg_ids.into_iter().map(MsgId::new).collect();
-            let existing_msg_ids = get_existing_msg_ids(&context, &msg_ids).await?;
-            Ok(existing_msg_ids
-                .into_iter()
-                .map(|msg_id| msg_id.to_u32())
-                .collect())
-        } else {
-            // Account does not exist, so messages do not exist either,
-            // but this is not an error.
-            Ok(Vec::new())
-        }
-    }
-
     async fn get_message_list_items(
         &self,
         account_id: u32,
@@ -2202,27 +2182,6 @@ impl CommandApi {
         forward_msgs(&ctx, &message_ids, ChatId::new(chat_id)).await
     }
 
-    /// Forward messages to a chat in another account.
-    /// See [`Self::forward_messages`] for more info.
-    async fn forward_messages_to_account(
-        &self,
-        src_account_id: u32,
-        src_message_ids: Vec<u32>,
-        dst_account_id: u32,
-        dst_chat_id: u32,
-    ) -> Result<()> {
-        let src_ctx = self.get_context(src_account_id).await?;
-        let dst_ctx = self.get_context(dst_account_id).await?;
-        let src_message_ids: Vec<MsgId> = src_message_ids.into_iter().map(MsgId::new).collect();
-        forward_msgs_2ctx(
-            &src_ctx,
-            &src_message_ids,
-            &dst_ctx,
-            ChatId::new(dst_chat_id),
-        )
-        .await
-    }
-
     /// Resend messages and make information available for newly added chat members.
     /// Resending sends out the original message, however, recipients and webxdc-status may differ.
     /// Clients that already have the original message can still ignore the resent message as

deltachat-jsonrpc/src/api/types/account.rs

@@ -15,7 +15,7 @@ pub enum Account {
         display_name: Option<String>,
         addr: Option<String>,
         // size: u32,
-        profile_image: Option<String>,
+        profile_image: Option<String>, // TODO: This needs to be converted to work with blob http server.
         color: String,
         /// Optional tag as "Work", "Family".
         /// Meant to help profile owner to differ between profiles with similar names.

deltachat-jsonrpc/src/api/types/chat.rs

@@ -69,7 +69,7 @@ pub struct FullChat {
     // but that would be an extra DB query.
     self_in_group: bool,
     is_muted: bool,
-    ephemeral_timer: u32,
+    ephemeral_timer: u32, //TODO look if there are more important properties in newer core versions
     can_send: bool,
     was_seen_recently: bool,
     mailing_list_address: Option<String>,

deltachat-jsonrpc/src/api/types/events.rs

@@ -271,7 +271,7 @@ pub enum EventType {
         /// Progress.
         ///
         /// 0=error, 1-999=progress in permille, 1000=success and done
-        progress: u16,
+        progress: usize,
 
         /// Progress comment or error, something to display to the user.
         comment: Option<String>,
@@ -282,7 +282,7 @@ pub enum EventType {
     #[serde(rename_all = "camelCase")]
     ImexProgress {
         /// 0=error, 1-999=progress in permille, 1000=success and done
-        progress: u16,
+        progress: usize,
     },
 
     /// A file has been exported. A file has been written by imex().
@@ -313,7 +313,7 @@ pub enum EventType {
         chat_id: u32,
 
         /// Progress, always 1000.
-        progress: u16,
+        progress: usize,
     },
 
     /// Progress information of a secure-join handshake from the view of the joiner
@@ -329,7 +329,7 @@ pub enum EventType {
         /// 400=vg-/vc-request-with-auth sent, typically shown as "alice@addr verified, introducing myself."
         /// (Bob has verified alice and waits until Alice does the same for him)
         /// 1000=vg-member-added/vc-contact-confirm received
-        progress: u16,
+        progress: usize,
     },
 
     /// The connectivity to the server changed.
@@ -460,15 +460,6 @@ pub enum EventType {
         /// ID of the chat which the message belongs to.
         chat_id: u32,
     },
-
-    /// One or more transports has changed.
-    ///
-    /// This event is used for tests to detect when transport
-    /// synchronization messages arrives.
-    /// UIs don't need to use it, it is unlikely
-    /// that user modifies transports on multiple
-    /// devices simultaneously.
-    TransportsModified,
 }
 
 impl From<CoreEventType> for EventType {
@@ -651,8 +642,6 @@ impl From<CoreEventType> for EventType {
                 msg_id: msg_id.to_u32(),
                 chat_id: chat_id.to_u32(),
             },
-            CoreEventType::TransportsModified => TransportsModified,
-
             #[allow(unreachable_patterns)]
             #[cfg(test)]
             _ => unreachable!("This is just to silence a rust_analyzer false-positive"),

deltachat-jsonrpc/typescript/package.json

@@ -54,5 +54,5 @@
   },
   "type": "module",
   "types": "dist/deltachat.d.ts",
-  "version": "2.35.0"
+  "version": "2.27.0"
 }

deltachat-jsonrpc/typescript/test/online.ts

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

deltachat-repl/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-repl"
-version = "2.35.0"
+version = "2.27.0"
 license = "MPL-2.0"
 edition = "2021"
 repository = "https://github.com/chatmail/core"

deltachat-repl/src/main.rs

@@ -430,12 +430,12 @@ async fn handle_cmd(
         }
         "oauth2" => {
             if let Some(addr) = ctx.get_config(config::Config::Addr).await? {
-                if let Some(oauth2_url) =
-                    get_oauth2_url(&ctx, &addr, "chat.delta:/com.b44t.messenger").await?
-                {
-                    println!("Open the following url, set mail_pw to the generated token and server_flags to 2:\n{oauth2_url}");
-                } else {
+                let oauth2_url =
+                    get_oauth2_url(&ctx, &addr, "chat.delta:/com.b44t.messenger").await?;
+                if oauth2_url.is_none() {
                     println!("OAuth2 not available for {}.", &addr);
+                } else {
+                    println!("Open the following url, set mail_pw to the generated token and server_flags to 2:\n{}", oauth2_url.unwrap());
                 }
             } else {
                 println!("oauth2: set addr first.");

deltachat-rpc-client/README.md

@@ -30,15 +30,6 @@ $ pip install .
 
 Additional arguments to `tox` are passed to pytest, e.g. `tox -- -s` does not capture test output.
 
-
-## Activating current checkout of deltachat-rpc-client and -server for development 
-
-Go to root repository directory and run: 
-```
-$ scripts/make-rpc-testenv.sh 
-$ source venv/bin/activate 
-```
-
 ## Using in REPL
 
 Setup a development environment:

deltachat-rpc-client/pyproject.toml

@@ -1,18 +1,20 @@
 [build-system]
-requires = ["setuptools>=77"]
+requires = ["setuptools>=45"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "deltachat-rpc-client"
-version = "2.35.0"
-license = "MPL-2.0"
+version = "2.27.0"
 description = "Python client for Delta Chat core JSON-RPC interface"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
+    "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
     "Operating System :: POSIX :: Linux",
     "Operating System :: MacOS :: MacOS X",
     "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -22,7 +24,7 @@ classifiers = [
     "Topic :: Communications :: Email"
 ]
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.8"
 
 [tool.setuptools.package-data]
 deltachat_rpc_client = [

deltachat-rpc-client/src/deltachat_rpc_client/account.py

@@ -130,10 +130,6 @@ class Account:
         """Add a new transport using a QR code."""
         yield self._rpc.add_transport_from_qr.future(self.id, qr)
 
-    def delete_transport(self, addr: str):
-        """Delete a transport."""
-        self._rpc.delete_transport(self.id, addr)
-
     @futuremethod
     def list_transports(self):
         """Return the list of all email accounts that are used as a transport in the current profile."""

deltachat-rpc-client/src/deltachat_rpc_client/chat.py

@@ -219,12 +219,10 @@ class Chat:
         """Mark all messages in this chat as noticed."""
         self._rpc.marknoticed_chat(self.account.id, self.id)
 
-    def add_contact(self, *contact: Union[int, str, Contact, "Account"]) -> None:
+    def add_contact(self, *contact: Union[int, str, Contact]) -> None:
         """Add contacts to this group."""
-        from .account import Account
-
         for cnt in contact:
-            if isinstance(cnt, (str, Account)):
+            if isinstance(cnt, str):
                 contact_id = self.account.create_contact(cnt).id
             elif not isinstance(cnt, int):
                 contact_id = cnt.id
@@ -232,12 +230,10 @@ class Chat:
                 contact_id = cnt
             self._rpc.add_contact_to_chat(self.account.id, self.id, contact_id)
 
-    def remove_contact(self, *contact: Union[int, str, Contact, "Account"]) -> None:
+    def remove_contact(self, *contact: Union[int, str, Contact]) -> None:
         """Remove members from this group."""
-        from .account import Account
-
         for cnt in contact:
-            if isinstance(cnt, (str, Account)):
+            if isinstance(cnt, str):
                 contact_id = self.account.create_contact(cnt).id
             elif not isinstance(cnt, int):
                 contact_id = cnt.id
@@ -253,10 +249,6 @@ class Chat:
         contacts = self._rpc.get_chat_contacts(self.account.id, self.id)
         return [Contact(self.account, contact_id) for contact_id in contacts]
 
-    def num_contacts(self) -> int:
-        """Return number of contacts in this chat."""
-        return len(self.get_contacts())
-
     def get_past_contacts(self) -> list[Contact]:
         """Get past contacts for this chat."""
         past_contacts = self._rpc.get_past_chat_contacts(self.account.id, self.id)

deltachat-rpc-client/src/deltachat_rpc_client/const.py

@@ -80,7 +80,6 @@ class EventType(str, Enum):
     CONFIG_SYNCED = "ConfigSynced"
     WEBXDC_REALTIME_DATA = "WebxdcRealtimeData"
     WEBXDC_REALTIME_ADVERTISEMENT_RECEIVED = "WebxdcRealtimeAdvertisementReceived"
-    TRANSPORTS_MODIFIED = "TransportsModified"
 
 
 class ChatId(IntEnum):

deltachat-rpc-client/src/deltachat_rpc_client/message.py

@@ -60,10 +60,6 @@ class Message:
         """Mark the message as seen."""
         self._rpc.markseen_msgs(self.account.id, [self.id])
 
-    def exists(self) -> bool:
-        """Return True if the message exists."""
-        return bool(self._rpc.get_existing_msg_ids(self.account.id, [self.id]))
-
     def continue_autocrypt_key_transfer(self, setup_code: str) -> None:
         """Continue the Autocrypt Setup Message key transfer.
 

deltachat-rpc-client/src/deltachat_rpc_client/pytestplugin.py

@@ -3,14 +3,9 @@
 from __future__ import annotations
 
 import os
-import pathlib
-import platform
 import random
-import subprocess
-import sys
 from typing import AsyncGenerator, Optional
 
-import execnet
 import py
 import pytest
 
@@ -25,18 +20,6 @@ Currently this is "End-to-end encryption available".
 """
 
 
-def pytest_report_header():
-    for base in os.get_exec_path():
-        fn = pathlib.Path(base).joinpath(base, "deltachat-rpc-server")
-        if fn.exists():
-            proc = subprocess.Popen([str(fn), "--version"], stderr=subprocess.PIPE)
-            proc.wait()
-            version = proc.stderr.read().decode().strip()
-            return f"deltachat-rpc-server: {fn} [{version}]"
-
-    return None
-
-
 class ACFactory:
     """Test account factory."""
 
@@ -57,17 +40,12 @@ class ACFactory:
         username = "ci-" + "".join(random.choice("2345789acdefghjkmnpqrstuvwxyz") for i in range(6))
         return f"{username}@{domain}", f"{username}${username}"
 
-    def get_account_qr(self):
-        """Return "dcaccount:" QR code for testing chatmail relay."""
-        domain = os.getenv("CHATMAIL_DOMAIN")
-        return f"dcaccount:{domain}"
-
     @futuremethod
     def new_configured_account(self):
         """Create a new configured account."""
         account = self.get_unconfigured_account()
-        qr = self.get_account_qr()
-        yield account.add_transport_from_qr.future(qr)
+        domain = os.getenv("CHATMAIL_DOMAIN")
+        yield account.add_transport_from_qr.future(f"dcaccount:{domain}")
 
         assert account.is_configured()
         return account
@@ -99,7 +77,6 @@ class ACFactory:
         ac_clone = self.get_unconfigured_account()
         for transport in transports:
             ac_clone.add_or_update_transport(transport)
-        ac_clone.bring_online()
         return ac_clone
 
     def get_accepted_chat(self, ac1: Account, ac2: Account) -> Chat:
@@ -214,134 +191,3 @@ def log():
             print("  " + msg)
 
     return Printer()
-
-
-#
-# support for testing against different deltachat-rpc-server/clients
-# installed into a temporary virtualenv and connected via 'execnet' channels
-#
-
-
-def find_path(venv, name):
-    is_windows = platform.system() == "Windows"
-    bin = venv / ("bin" if not is_windows else "Scripts")
-
-    tryadd = [""]
-    if is_windows:
-        tryadd += os.environ["PATHEXT"].split(os.pathsep)
-    for ext in tryadd:
-        p = bin.joinpath(name + ext)
-        if p.exists():
-            return str(p)
-
-    return None
-
-
-@pytest.fixture(scope="session")
-def get_core_python_env(tmp_path_factory):
-    """Return a factory to create virtualenv environments with rpc server/client packages
-    installed.
-
-    The factory takes a version and returns a (python_path, rpc_server_path) tuple
-    of the respective binaries in the virtualenv.
-    """
-
-    envs = {}
-
-    def get_versioned_venv(core_version):
-        venv = envs.get(core_version)
-        if not venv:
-            venv = tmp_path_factory.mktemp(f"temp-{core_version}")
-            subprocess.check_call([sys.executable, "-m", "venv", venv])
-
-            python = find_path(venv, "python")
-            pkgs = [f"deltachat-rpc-server=={core_version}", f"deltachat-rpc-client=={core_version}", "pytest"]
-            subprocess.check_call([python, "-m", "pip", "install"] + pkgs)
-
-            envs[core_version] = venv
-        python = find_path(venv, "python")
-        rpc_server_path = find_path(venv, "deltachat-rpc-server")
-        print(f"python={python}\nrpc_server={rpc_server_path}")
-        return python, rpc_server_path
-
-    return get_versioned_venv
-
-
-@pytest.fixture
-def alice_and_remote_bob(tmp_path, acfactory, get_core_python_env):
-    """return local Alice account, a contact to bob, and a remote 'eval' function for bob.
-
-    The 'eval' function allows to remote-execute arbitrary expressions
-    that can use the `bob` online account, and the `bob_contact_alice`.
-    """
-
-    def factory(core_version):
-        python, rpc_server_path = get_core_python_env(core_version)
-        gw = execnet.makegateway(f"popen//python={python}")
-
-        accounts_dir = str(tmp_path.joinpath("account1_venv1"))
-        channel = gw.remote_exec(remote_bob_loop)
-        cm = os.environ.get("CHATMAIL_DOMAIN")
-
-        # trigger getting an online account on bob's side
-        channel.send((accounts_dir, str(rpc_server_path), cm))
-
-        # meanwhile get a local alice account
-        alice = acfactory.get_online_account()
-        channel.send(alice.self_contact.make_vcard())
-
-        # wait for bob to have started
-        sysinfo = channel.receive()
-        assert sysinfo == f"v{core_version}"
-        bob_vcard = channel.receive()
-        [alice_contact_bob] = alice.import_vcard(bob_vcard)
-
-        def eval(eval_str):
-            channel.send(eval_str)
-            return channel.receive()
-
-        return alice, alice_contact_bob, eval
-
-    return factory
-
-
-def remote_bob_loop(channel):
-    # This function executes with versioned
-    # deltachat-rpc-client/server packages
-    # installed into the virtualenv.
-    #
-    # The "channel" argument is a send/receive pipe
-    # to the process that runs the corresponding remote_exec(remote_bob_loop)
-
-    import os
-
-    from deltachat_rpc_client import DeltaChat, Rpc
-    from deltachat_rpc_client.pytestplugin import ACFactory
-
-    accounts_dir, rpc_server_path, chatmail_domain = channel.receive()
-    os.environ["CHATMAIL_DOMAIN"] = chatmail_domain
-
-    # older core versions don't support specifying rpc_server_path
-    # so we can't just pass `rpc_server_path` argument to Rpc constructor
-    basepath = os.path.dirname(rpc_server_path)
-    os.environ["PATH"] = os.pathsep.join([basepath, os.environ["PATH"]])
-    rpc = Rpc(accounts_dir=accounts_dir)
-
-    with rpc:
-        dc = DeltaChat(rpc)
-        channel.send(dc.rpc.get_system_info()["deltachat_core_version"])
-        acfactory = ACFactory(dc)
-        bob = acfactory.get_online_account()
-        alice_vcard = channel.receive()
-        [alice_contact] = bob.import_vcard(alice_vcard)
-        ns = {"bob": bob, "bob_contact_alice": alice_contact}
-        channel.send(bob.self_contact.make_vcard())
-
-        while 1:
-            eval_str = channel.receive()
-            res = eval(eval_str, ns)
-            try:
-                channel.send(res)
-            except Exception:
-                # some unserializable result
-                channel.send(None)

deltachat-rpc-client/src/deltachat_rpc_client/rpc.py

@@ -9,7 +9,7 @@ import os
 import subprocess
 import sys
 from queue import Empty, Queue
-from threading import Thread
+from threading import Event, Thread
 from typing import Any, Iterator, Optional
 
 
@@ -17,6 +17,25 @@ class JsonRpcError(Exception):
     """JSON-RPC error."""
 
 
+class RpcFuture:
+    """RPC future waiting for RPC call result."""
+
+    def __init__(self, rpc: "Rpc", request_id: int, event: Event):
+        self.rpc = rpc
+        self.request_id = request_id
+        self.event = event
+
+    def __call__(self):
+        """Wait for the future to return the result."""
+        self.event.wait()
+        response = self.rpc.request_results.pop(self.request_id)
+        if "error" in response:
+            raise JsonRpcError(response["error"])
+        if "result" in response:
+            return response["result"]
+        return None
+
+
 class RpcMethod:
     """RPC method."""
 
@@ -38,26 +57,20 @@ class RpcMethod:
             "params": args,
             "id": request_id,
         }
-        self.rpc.request_results[request_id] = queue = Queue()
+        event = Event()
+        self.rpc.request_events[request_id] = event
         self.rpc.request_queue.put(request)
 
-        def rpc_future():
-            """Wait for the request to receive a result."""
-            response = queue.get()
-            if "error" in response:
-                raise JsonRpcError(response["error"])
-            return response.get("result", None)
-
-        return rpc_future
+        return RpcFuture(self.rpc, request_id, event)
 
 
 class Rpc:
     """RPC client."""
 
-    def __init__(self, accounts_dir: Optional[str] = None, rpc_server_path="deltachat-rpc-server", **kwargs):
+    def __init__(self, accounts_dir: Optional[str] = None, **kwargs):
         """Initialize RPC client.
 
-        The 'kwargs' arguments will be passed to subprocess.Popen().
+        The given arguments will be passed to subprocess.Popen().
         """
         if accounts_dir:
             kwargs["env"] = {
@@ -66,12 +79,13 @@ class Rpc:
             }
 
         self._kwargs = kwargs
-        self.rpc_server_path = rpc_server_path
         self.process: subprocess.Popen
         self.id_iterator: Iterator[int]
         self.event_queues: dict[int, Queue]
-        # Map from request ID to a Queue which provides a single result
-        self.request_results: dict[int, Queue]
+        # Map from request ID to `threading.Event`.
+        self.request_events: dict[int, Event]
+        # Map from request ID to the result.
+        self.request_results: dict[int, Any]
         self.request_queue: Queue[Any]
         self.closing: bool
         self.reader_thread: Thread
@@ -80,18 +94,27 @@ class Rpc:
 
     def start(self) -> None:
         """Start RPC server subprocess."""
-        popen_kwargs = {"stdin": subprocess.PIPE, "stdout": subprocess.PIPE}
         if sys.version_info >= (3, 11):
-            # Prevent subprocess from capturing SIGINT.
-            popen_kwargs["process_group"] = 0
+            self.process = subprocess.Popen(
+                "deltachat-rpc-server",
+                stdin=subprocess.PIPE,
+                stdout=subprocess.PIPE,
+                # Prevent subprocess from capturing SIGINT.
+                process_group=0,
+                **self._kwargs,
+            )
         else:
-            # `process_group` is not supported before Python 3.11.
-            popen_kwargs["preexec_fn"] = os.setpgrp  # noqa: PLW1509
-
-        popen_kwargs.update(self._kwargs)
-        self.process = subprocess.Popen(self.rpc_server_path, **popen_kwargs)
+            self.process = subprocess.Popen(
+                "deltachat-rpc-server",
+                stdin=subprocess.PIPE,
+                stdout=subprocess.PIPE,
+                # `process_group` is not supported before Python 3.11.
+                preexec_fn=os.setpgrp,  # noqa: PLW1509
+                **self._kwargs,
+            )
         self.id_iterator = itertools.count(start=1)
         self.event_queues = {}
+        self.request_events = {}
         self.request_results = {}
         self.request_queue = Queue()
         self.closing = False
@@ -126,7 +149,9 @@ class Rpc:
                 response = json.loads(line)
                 if "id" in response:
                     response_id = response["id"]
-                    self.request_results.pop(response_id).put(response)
+                    event = self.request_events.pop(response_id)
+                    self.request_results[response_id] = response
+                    event.set()
                 else:
                     logging.warning("Got a response without ID: %s", response)
         except Exception:

deltachat-rpc-client/tests/test_cross_core.py

@@ -1,57 +0,0 @@
-import subprocess
-
-import pytest
-
-from deltachat_rpc_client import DeltaChat, Rpc
-
-
-def test_install_venv_and_use_other_core(tmp_path, get_core_python_env):
-    python, rpc_server_path = get_core_python_env("2.24.0")
-    subprocess.check_call([python, "-m", "pip", "install", "deltachat-rpc-server==2.24.0"])
-    rpc = Rpc(accounts_dir=tmp_path.joinpath("accounts"), rpc_server_path=rpc_server_path)
-
-    with rpc:
-        dc = DeltaChat(rpc)
-        assert dc.rpc.get_system_info()["deltachat_core_version"] == "v2.24.0"
-
-
-@pytest.mark.parametrize("version", ["2.24.0"])
-def test_qr_setup_contact(alice_and_remote_bob, version) -> None:
-    """Test other-core Bob profile can do securejoin with Alice on current core."""
-    alice, alice_contact_bob, remote_eval = alice_and_remote_bob(version)
-
-    qr_code = alice.get_qr_code()
-    remote_eval(f"bob.secure_join({qr_code!r})")
-    alice.wait_for_securejoin_inviter_success()
-
-    # Test that Alice verified Bob's profile.
-    alice_contact_bob_snapshot = alice_contact_bob.get_snapshot()
-    assert alice_contact_bob_snapshot.is_verified
-
-    remote_eval("bob.wait_for_securejoin_joiner_success()")
-
-    # Test that Bob verified Alice's profile.
-    assert remote_eval("bob_contact_alice.get_snapshot().is_verified")
-
-
-def test_send_and_receive_message(alice_and_remote_bob) -> None:
-    """Test other-core Bob profile can send a message to Alice on current core."""
-    alice, alice_contact_bob, remote_eval = alice_and_remote_bob("2.20.0")
-
-    remote_eval("bob_contact_alice.create_chat().send_text('hello')")
-
-    msg = alice.wait_for_incoming_msg()
-    assert msg.get_snapshot().text == "hello"
-
-
-def test_second_device(acfactory, alice_and_remote_bob) -> None:
-    """Test setting up current version as a second device for old version."""
-    _alice, alice_contact_bob, remote_eval = alice_and_remote_bob("2.20.0")
-
-    remote_eval("locals().setdefault('future', bob._rpc.provide_backup.future(bob.id))")
-    qr = remote_eval("bob._rpc.get_backup_qr(bob.id)")
-    new_account = acfactory.get_unconfigured_account()
-    new_account._rpc.get_backup(new_account.id, qr)
-    remote_eval("locals()['future']()")
-
-    assert new_account.get_config("addr") == remote_eval("bob.get_config('addr')")

deltachat-rpc-client/tests/test_folders.py

@@ -143,7 +143,7 @@ def test_delete_deltachat_folder(acfactory, direct_imap):
     # Wait until new folder is created and UIDVALIDITY is updated.
     while True:
         event = ac1.wait_for_event()
-        if event.kind == EventType.INFO and "transport 1: UID validity for folder DeltaChat changed from " in event.msg:
+        if event.kind == EventType.INFO and "uid/validity change folder DeltaChat" in event.msg:
             break
 
     ac2 = acfactory.get_online_account()

deltachat-rpc-client/tests/test_multitransport.py

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

deltachat-rpc-client/tests/test_securejoin.py

@@ -158,29 +158,29 @@ def test_qr_securejoin_broadcast(acfactory, all_devices_online):
         chat = get_broadcast(ac)
         chat_msgs = chat.get_messages()
 
-        encrypted_msg = chat_msgs.pop(0).get_snapshot()
+        if please_wait_info_msg:
+            first_msg = chat_msgs.pop(0).get_snapshot()
+            assert first_msg.text == "Establishing guaranteed end-to-end encryption, please wait…"
+            assert first_msg.is_info
+
+        encrypted_msg = chat_msgs[0].get_snapshot()
         assert encrypted_msg.text == "Messages are end-to-end encrypted."
         assert encrypted_msg.is_info
 
-        if please_wait_info_msg:
-            first_msg = chat_msgs.pop(0).get_snapshot()
-            assert "invited you to join this channel" in first_msg.text
-            assert first_msg.is_info
-
-        member_added_msg = chat_msgs.pop(0).get_snapshot()
+        member_added_msg = chat_msgs[1].get_snapshot()
         if inviter_side:
             assert member_added_msg.text == f"Member {contact_snapshot.display_name} added."
         else:
             assert member_added_msg.text == "You joined the channel."
         assert member_added_msg.is_info
 
-        hello_msg = chat_msgs.pop(0).get_snapshot()
+        hello_msg = chat_msgs[2].get_snapshot()
         assert hello_msg.text == "Hello everyone!"
         assert not hello_msg.is_info
         assert hello_msg.show_padlock
         assert hello_msg.error is None
 
-        assert len(chat_msgs) == 0
+        assert len(chat_msgs) == 3
 
         chat_snapshot = chat.get_full_snapshot()
         assert chat_snapshot.is_encrypted

deltachat-rpc-client/tests/test_something.py

@@ -90,9 +90,12 @@ def test_lowercase_address(acfactory) -> None:
     assert account.get_config("configured_addr") == addr
     assert account.list_transports()[0]["addr"] == addr
 
-    param = account.get_info()["used_transport_settings"]
-    assert addr in param
-    assert addr_upper not in param
+    for param in [
+        account.get_info()["used_account_settings"],
+        account.get_info()["entered_account_settings"],
+    ]:
+        assert addr in param
+        assert addr_upper not in param
 
 
 def test_configure_ip(acfactory) -> None:
@@ -464,7 +467,7 @@ def test_bot(acfactory) -> None:
 
 
 def test_wait_next_messages(acfactory) -> None:
-    alice = acfactory.get_online_account()
+    alice = acfactory.new_configured_account()
 
     # Create a bot account so it does not receive device messages in the beginning.
     addr, password = acfactory.get_credentials()
@@ -472,7 +475,6 @@ def test_wait_next_messages(acfactory) -> None:
     bot.set_config("bot", "1")
     bot.add_or_update_transport({"addr": addr, "password": password})
     assert bot.is_configured()
-    bot.bring_online()
 
     # There are no old messages and the call returns immediately.
     assert not bot.wait_next_messages()
@@ -658,6 +660,8 @@ def test_download_limit_chat_assignment(acfactory, tmp_path, n_accounts):
         contact = alice.create_contact(account)
         alice_group.add_contact(contact)
 
+    if n_accounts == 2:
+        bob_chat_alice = bob.create_chat(alice)
     bob.set_config("download_limit", str(download_limit))
 
     alice_group.send_text("hi")
@@ -673,7 +677,15 @@ def test_download_limit_chat_assignment(acfactory, tmp_path, n_accounts):
         alice_group.send_file(str(path))
         snapshot = bob.wait_for_incoming_msg().get_snapshot()
         assert snapshot.download_state == DownloadState.AVAILABLE
-        assert snapshot.chat == bob_group
+        if n_accounts > 2:
+            assert snapshot.chat == bob_group
+        else:
+            # Group contains only Alice and Bob,
+            # so partially downloaded messages are
+            # hard to distinguish from private replies to group messages.
+            #
+            # Message may be a private reply, so we assign it to 1:1 chat with Alice.
+            assert snapshot.chat == bob_chat_alice
 
 
 def test_markseen_contact_request(acfactory):
@@ -730,7 +742,7 @@ def test_configured_imap_certificate_checks(acfactory):
     alice = acfactory.new_configured_account()
 
     # Certificate checks should be configured (not None)
-    assert "cert_strict" in alice.get_info().used_transport_settings
+    assert "cert_strict" in alice.get_info().used_account_settings
 
     # "cert_old_automatic" is the value old Delta Chat core versions used
     # to mean user entered "imap_certificate_checks=0" (Automatic)
@@ -743,7 +755,7 @@ def test_configured_imap_certificate_checks(acfactory):
     #
     # Core 1.142.4, 1.142.5 and 1.142.6 saved this value due to bug.
     # This test is a regression test to prevent this happening again.
-    assert "cert_old_automatic" not in alice.get_info().used_transport_settings
+    assert "cert_old_automatic" not in alice.get_info().used_account_settings
 
 
 def test_no_old_msg_is_fresh(acfactory):
@@ -855,15 +867,15 @@ def test_leave_broadcast(acfactory, all_devices_online):
         contact_snapshot = contact.get_snapshot()
         chat_msgs = chat.get_messages()
 
+        if please_wait_info_msg:
+            first_msg = chat_msgs.pop(0).get_snapshot()
+            assert first_msg.text == "Establishing guaranteed end-to-end encryption, please wait…"
+            assert first_msg.is_info
+
         encrypted_msg = chat_msgs.pop(0).get_snapshot()
         assert encrypted_msg.text == "Messages are end-to-end encrypted."
         assert encrypted_msg.is_info
 
-        if please_wait_info_msg:
-            first_msg = chat_msgs.pop(0).get_snapshot()
-            assert "invited you to join this channel" in first_msg.text
-            assert first_msg.is_info
-
         member_added_msg = chat_msgs.pop(0).get_snapshot()
         if inviter_side:
             assert member_added_msg.text == f"Member {contact_snapshot.display_name} added."
@@ -990,66 +1002,3 @@ def test_background_fetch(acfactory, dc):
         snapshot = messages[-1].get_snapshot()
         if snapshot.text == "Hello again!":
             break
-
-
-def test_message_exists(acfactory):
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    chat = ac1.create_chat(ac2)
-    message1 = chat.send_text("Hello!")
-    message2 = chat.send_text("Hello again!")
-    assert message1.exists()
-    assert message2.exists()
-
-    ac1.delete_messages([message1])
-    assert not message1.exists()
-    assert message2.exists()
-
-    # There is no error when checking if
-    # the message exists for deleted account.
-    ac1.remove()
-    assert not message1.exists()
-    assert not message2.exists()
-
-
-def test_synchronize_member_list_on_group_rejoin(acfactory, log):
-    """
-    Test that user recreates group member list when it joins the group again.
-    ac1 creates a group with two other accounts: ac2 and ac3
-    Then it removes ac2, removes ac3 and adds ac2 back.
-    ac2 did not see that ac3 is removed, so it should rebuild member list from scratch.
-    """
-    log.section("setting up accounts, accepted with each other")
-    ac1, ac2, ac3 = accounts = acfactory.get_online_accounts(3)
-
-    log.section("ac1: creating group chat with 2 other members")
-    chat = ac1.create_group("title1")
-    chat.add_contact(ac2)
-    chat.add_contact(ac3)
-
-    log.section("ac1: send message to new group chat")
-    msg = chat.send_text("hello")
-    assert chat.num_contacts() == 3
-
-    log.section("checking that the chat arrived correctly")
-    for ac in accounts[1:]:
-        msg = ac.wait_for_incoming_msg().get_snapshot()
-        assert msg.text == "hello"
-        assert msg.chat.num_contacts() == 3
-        msg.chat.accept()
-
-    log.section("ac1: removing ac2")
-    chat.remove_contact(ac2)
-
-    log.section("ac2: wait for a message about removal from the chat")
-    ac2.wait_for_incoming_msg()
-    log.section("ac1: removing ac3")
-    chat.remove_contact(ac3)
-
-    log.section("ac1: adding ac2 back")
-    chat.add_contact(ac2)
-
-    log.section("ac2: check that ac3 is removed")
-    msg = ac2.wait_for_incoming_msg()
-
-    assert chat.num_contacts() == 2
-    assert msg.get_snapshot().chat.num_contacts() == 2

deltachat-rpc-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "2.35.0"
+version = "2.27.0"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"

deltachat-rpc-server/npm-package/package.json

@@ -15,5 +15,5 @@
   },
   "type": "module",
   "types": "index.d.ts",
-  "version": "2.35.0"
+  "version": "2.27.0"
 }

deny.toml

@@ -12,11 +12,6 @@ ignore = [
 
     # Unmaintained paste
     "RUSTSEC-2024-0436",
-
-    # Unmaintained rustls-pemfile
-    # It is a transitive dependency of iroh 0.35.0,
-    # this should be fixed by upgrading to iroh 1.0 once it is released.
-    "RUSTSEC-2025-0134"
 ]
 
 [bans]
@@ -43,7 +38,6 @@ skip = [
      { name = "rand", version = "0.8.5" },
      { name = "rustix", version = "0.38.44" },
      { name = "serdect", version = "0.2.0" },
-     { name = "socket2", version = "0.5.9" },
      { name = "spin", version = "0.9.8" },
      { name = "strum_macros", version = "0.26.2" },
      { name = "strum", version = "0.26.2" },
@@ -68,6 +62,7 @@ skip = [
      { name = "windows_x86_64_gnu" },
      { name = "windows_x86_64_gnullvm" },
      { name = "windows_x86_64_msvc" },
+     { name = "zerocopy", version = "0.7.32" },
 ]
 
 

flake.lock

@@ -47,11 +47,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1763361733,
-        "narHash": "sha256-ka7dpwH3HIXCyD2wl5F7cPLeRbqZoY2ullALsvxdPt8=",
+        "lastModified": 1763275509,
+        "narHash": "sha256-DBlu2+xPvGBaNn4RbNaw7r62lzBrf/tOKLgMYlEYhvg=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "6c8d48e3b0ae371b19ac1485744687b788e80193",
+        "rev": "947fdabcc3a51cec1e38641a11d4cb655fe252e7",
         "type": "github"
       },
       "original": {
@@ -175,11 +175,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1747179050,
-        "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
+        "lastModified": 1763283776,
+        "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
+        "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a",
         "type": "github"
       },
       "original": {

flake.nix

@@ -1,5 +1,5 @@
 {
-  description = "Chatmail core";
+  description = "Delta Chat core";
   inputs = {
     fenix.url = "github:nix-community/fenix";
     flake-utils.url = "github:numtide/flake-utils";
@@ -14,15 +14,7 @@
         pkgs = nixpkgs.legacyPackages.${system};
         inherit (pkgs.stdenv) isDarwin;
         fenixPkgs = fenix.packages.${system};
-        fenixToolchain = fenixPkgs.combine [
-          fenixPkgs.stable.rustc
-          fenixPkgs.stable.cargo
-          fenixPkgs.stable.rust-std
-        ];
-        naersk' = pkgs.callPackage naersk {
-          cargo = fenixToolchain;
-          rustc = fenixToolchain;
-        };
+        naersk' = pkgs.callPackage naersk { };
         manifest = (pkgs.lib.importTOML ./Cargo.toml).package;
         androidSdk = android.sdk.${system} (sdkPkgs:
           builtins.attrValues {
@@ -128,12 +120,14 @@
             version = manifest.version;
             strictDeps = true;
             src = pkgs.lib.cleanSource ./.;
+            buildInputs = [
+              pkgsWin64.windows.pthreads
+            ];
             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.
@@ -191,12 +185,14 @@
             version = manifest.version;
             strictDeps = true;
             src = pkgs.lib.cleanSource ./.;
+            buildInputs = [
+              pkgsWin32.windows.pthreads
+            ];
             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.
@@ -478,12 +474,6 @@
               };
 
             libdeltachat =
-              let
-                rustPlatform = (pkgs.makeRustPlatform {
-                  cargo = fenixToolchain;
-                  rustc = fenixToolchain;
-                });
-              in
               pkgs.stdenv.mkDerivation {
                 pname = "libdeltachat";
                 version = manifest.version;
@@ -493,9 +483,8 @@
                 nativeBuildInputs = [
                   pkgs.perl # Needed to build vendored OpenSSL.
                   pkgs.cmake
-                  rustPlatform.cargoSetupHook
-                  fenixPkgs.stable.rustc
-                  fenixPkgs.stable.cargo
+                  pkgs.rustPlatform.cargoSetupHook
+                  pkgs.cargo
                 ];
 
                 postInstall = ''

python/examples/test_examples.py

@@ -14,7 +14,6 @@ def datadir():
     return None
 
 
-@pytest.mark.skip("The test is flaky in CI and crashes the interpreter as of 2025-11-12")
 def test_echo_quit_plugin(acfactory, lp):
     lp.sec("creating one echo_and_quit bot")
     botproc = acfactory.run_bot_process(echo_and_quit)

python/pyproject.toml

@@ -1,20 +1,20 @@
 [build-system]
-requires = ["setuptools>=77", "wheel", "cffi>=1.0.0", "pkgconfig"]
+requires = ["setuptools>=45", "wheel", "cffi>=1.0.0", "pkgconfig"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "deltachat"
-version = "2.35.0"
-license = "MPL-2.0"
+version = "2.27.0"
 description = "Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat"
 readme = "README.rst"
-requires-python = ">=3.10"
+requires-python = ">=3.8"
 authors = [
     { name = "holger krekel, Floris Bruynooghe, Bjoern Petersen and contributors" },
 ]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
+    "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
     "Programming Language :: Python :: 3",
     "Topic :: Communications :: Chat",
     "Topic :: Communications :: Email",
@@ -23,6 +23,7 @@ classifiers = [
 dependencies = [
     "cffi>=1.0.0",
     "imap-tools",
+    "importlib_metadata;python_version<'3.8'",
     "pluggy",
     "requests",
 ]

python/tests/test_0_complex_or_slow.py

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

python/tests/test_1_online.py

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

python/tox.ini

@@ -46,7 +46,7 @@ deps =
 commands =
     ruff format --diff setup.py src/deltachat examples/ tests/
     ruff check src/deltachat tests/ examples/
-    rst-lint README.rst
+    rst-lint --encoding 'utf-8' README.rst
 
 [testenv:mypy]
 deps =

release-date.in

@@ -1 +1 @@
-2025-12-16
+2025-11-16

scripts/README.md

@@ -26,10 +26,10 @@ and an own build machine.
    i.e. `deltachat-rpc-client` and `deltachat-rpc-server`.
 
 - `remote_tests_python.sh` rsyncs to a build machine and runs
-  JSON-RPC Python tests remotely on the build machine. 
+  `run-python-test.sh` remotely on the build machine. 
 
 - `remote_tests_rust.sh` rsyncs to the build machine and runs
-  Rust tests remotely on the build machine. 
+  `run-rust-test.sh` remotely on the build machine. 
 
 - `run-doxygen.sh` generates C-docs which are then uploaded to https://c.delta.chat/
 

scripts/coredeps/install-rust.sh

@@ -7,7 +7,7 @@ set -euo pipefail
 #
 # Avoid using rustup here as it depends on reading /proc/self/exe and
 # has problems running under QEMU.
-RUST_VERSION=1.92.0
+RUST_VERSION=1.91.0
 
 ARCH="$(uname -m)"
 test -f "/lib/libc.musl-$ARCH.so.1" && LIBC=musl || LIBC=gnu

scripts/remote_tests_python.sh

@@ -1,32 +1,45 @@
-#!/usr/bin/env bash
-set -euo pipefail
+#!/bin/bash 
 
-set -x
-if ! test -v SSHTARGET; then
-	echo >&2 SSHTARGET is not set
-	exit 1
-fi
-BUILDDIR=ci_builds/chatmailcore
+BUILD_ID=${1:?specify build ID}
+
+SSHTARGET=${SSHTARGET-ci@b1.delta.chat}
+BUILDDIR=ci_builds/$BUILD_ID
 
 echo "--- Copying files to $SSHTARGET:$BUILDDIR"
 
-rsync -az --delete --mkpath --files-from=<(git ls-files) ./ "$SSHTARGET:$BUILDDIR"
+set -xe
+
+ssh -oBatchMode=yes -oStrictHostKeyChecking=no  $SSHTARGET mkdir -p "$BUILDDIR"
+git ls-files >.rsynclist 
+# we seem to need .git for setuptools_scm versioning 
+find .git >>.rsynclist
+rsync --delete --files-from=.rsynclist -az ./ "$SSHTARGET:$BUILDDIR"
+
+set +x
 
 echo "--- Running Python tests remotely"
 
-ssh -oBatchMode=yes -- "$SSHTARGET" <<_HERE
+ssh $SSHTARGET <<_HERE
     set +x -e
 
     # make sure all processes exit when ssh dies
     shopt -s huponexit
 
-    export RUSTC_WRAPPER=\`command -v sccache\`
+    export RUSTC_WRAPPER=\`which sccache\`
     cd $BUILDDIR
+    export TARGET=release
     export CHATMAIL_DOMAIN=$CHATMAIL_DOMAIN
 
-    scripts/make-rpc-testenv.sh
-    . venv/bin/activate
+    #we rely on tox/virtualenv being available in the host
+    #rm -rf virtualenv venv
+    #virtualenv -q -p python3.7 venv 
+    #source venv/bin/activate
+    #pip install -q tox virtualenv
 
-    cd deltachat-rpc-client
-    pytest -n6 $@
+    set -x
+    which python
+    source \$HOME/venv/bin/activate
+    which python
+
+    bash scripts/run-python-test.sh 
 _HERE

scripts/remote_tests_rust.sh

@@ -1,25 +1,29 @@
-#!/usr/bin/env bash
-set -euo pipefail
+#!/bin/bash 
 
-if ! test -v SSHTARGET; then
-        echo >&2 SSHTARGET is not set
-        exit 1
-fi
-BUILDDIR=ci_builds/chatmailcore
+BUILD_ID=${1:?specify build ID}
+
+SSHTARGET=${SSHTARGET-ci@b1.delta.chat}
+BUILDDIR=ci_builds/$BUILD_ID
+
+set -e
 
 echo "--- Copying files to $SSHTARGET:$BUILDDIR"
 
-rsync -az --delete --mkpath --files-from=<(git ls-files) ./ "$SSHTARGET:$BUILDDIR"
+ssh -oBatchMode=yes -oStrictHostKeyChecking=no $SSHTARGET mkdir -p "$BUILDDIR"
+git ls-files >.rsynclist
+rsync --delete --files-from=.rsynclist -az ./ "$SSHTARGET:$BUILDDIR"
 
 echo "--- Running Rust tests remotely"
 
-ssh -oBatchMode=yes -- "$SSHTARGET" <<_HERE
+ssh $SSHTARGET <<_HERE
     set +x -e
     # make sure all processes exit when ssh dies
     shopt -s huponexit
-    export RUSTC_WRAPPER=\`command -v sccache\`
+    export RUSTC_WRAPPER=\`which sccache\`
     cd $BUILDDIR
+    export TARGET=x86_64-unknown-linux-gnu
+    export RUSTC_WRAPPER=sccache
 
-    cargo nextest run
+    bash scripts/run-rust-test.sh
 _HERE
 

scripts/run_all.sh

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

src/accounts.rs

@@ -377,11 +377,6 @@ impl Accounts {
                 "Starting background fetch for {n_accounts} accounts."
             )),
         });
-        ::tracing::event!(
-            ::tracing::Level::INFO,
-            account_id = 0,
-            "Starting background fetch for {n_accounts} accounts."
-        );
         let mut set = JoinSet::new();
         for account in accounts {
             set.spawn(async move {
@@ -397,11 +392,6 @@ impl Accounts {
                 "Finished background fetch for {n_accounts} accounts."
             )),
         });
-        ::tracing::event!(
-            ::tracing::Level::INFO,
-            account_id = 0,
-            "Finished background fetch for {n_accounts} accounts."
-        );
     }
 
     /// Auxiliary function for [Accounts::background_fetch].
@@ -439,11 +429,6 @@ impl Accounts {
                 id: 0,
                 typ: EventType::Warning("Background fetch timed out.".to_string()),
             });
-            ::tracing::event!(
-                ::tracing::Level::WARN,
-                account_id = 0,
-                "Background fetch timed out."
-            );
         }
         events.emit(Event {
             id: 0,

src/blob/blob_tests.rs

@@ -173,8 +173,11 @@ async fn test_selfavatar_outside_blobdir() {
         .unwrap();
     let avatar_blob = t.get_config(Config::Selfavatar).await.unwrap().unwrap();
     let avatar_path = Path::new(&avatar_blob);
+    assert!(
+        avatar_blob.ends_with("7dde69e06b5ae6c27520a436bbfd65b.jpg"),
+        "The avatar filename should be its hash, put instead it's {avatar_blob}"
+    );
     let scaled_avatar_size = file_size(avatar_path).await;
-    info!(&t, "Scaled avatar size: {scaled_avatar_size}.");
     assert!(scaled_avatar_size < avatar_bytes.len() as u64);
 
     check_image_size(avatar_src, 1000, 1000);
@@ -184,11 +187,6 @@ async fn test_selfavatar_outside_blobdir() {
         constants::BALANCED_AVATAR_SIZE,
     );
 
-    assert!(
-        avatar_blob.ends_with("2a048b6fcd86448032b854ea1ad7608.jpg"),
-        "The avatar filename should be its hash, but instead it's {avatar_blob}"
-    );
-
     let mut blob = BlobObject::create_and_deduplicate(&t, avatar_path, avatar_path).unwrap();
     let viewtype = &mut Viewtype::Image;
     let strict_limits = true;

src/calls.rs

@@ -6,15 +6,15 @@ use crate::chat::ChatIdBlocked;
 use crate::chat::{Chat, ChatId, send_msg};
 use crate::constants::{Blocked, Chattype};
 use crate::contact::ContactId;
-use crate::context::{Context, WeakContext};
+use crate::context::Context;
 use crate::events::EventType;
 use crate::headerdef::HeaderDef;
 use crate::log::warn;
-use crate::message::{Message, MsgId, Viewtype};
+use crate::message::{self, Message, MsgId, Viewtype};
 use crate::mimeparser::{MimeMessage, SystemMessage};
 use crate::net::dns::lookup_host_with_cache;
 use crate::param::Param;
-use crate::tools::{normalize_text, time};
+use crate::tools::time;
 use anyhow::{Context as _, Result, ensure};
 use sdp::SessionDescription;
 use serde::Serialize;
@@ -33,7 +33,7 @@ use tokio::time::sleep;
 ///
 /// For the caller, this means they should also not wait longer,
 /// as the callee won't start the call afterwards.
-const RINGING_SECONDS: i64 = 120;
+const RINGING_SECONDS: i64 = 60;
 
 // For persisting parameters in the call, we use Param::Arg*
 
@@ -86,7 +86,7 @@ impl CallInfo {
             .sql
             .execute(
                 "UPDATE msgs SET txt=?, txt_normalized=? WHERE id=?",
-                (text, normalize_text(text), self.msg.id),
+                (text, message::normalize_text(text), self.msg.id),
             )
             .await?;
         Ok(())
@@ -199,9 +199,8 @@ impl Context {
         call.id = send_msg(self, chat_id, &mut call).await?;
 
         let wait = RINGING_SECONDS;
-        let context = self.get_weak_context();
         task::spawn(Context::emit_end_call_if_unaccepted(
-            context,
+            self.clone(),
             wait.try_into()?,
             call.id,
         ));
@@ -292,12 +291,11 @@ impl Context {
     }
 
     async fn emit_end_call_if_unaccepted(
-        context: WeakContext,
+        context: Context,
         wait: u64,
         call_id: MsgId,
     ) -> Result<()> {
         sleep(Duration::from_secs(wait)).await;
-        let context = context.upgrade()?;
         let Some(mut call) = context.load_call_by_id(call_id).await? else {
             warn!(
                 context,
@@ -370,9 +368,8 @@ impl Context {
                         }
                     }
                     let wait = call.remaining_ring_seconds();
-                    let context = self.get_weak_context();
                     task::spawn(Context::emit_end_call_if_unaccepted(
-                        context,
+                        self.clone(),
                         wait.try_into()?,
                         call.msg.id,
                     ));
@@ -663,7 +660,9 @@ pub(crate) async fn create_fallback_ice_servers(context: &Context) -> Result<Str
     // because of bandwidth costs:
     // <https://github.com/jselbie/stunserver/issues/50>
 
+    // We use nine.testrun.org for a default STUN server.
     let hostname = "nine.testrun.org";
+
     // Do not use cache because there is no TLS.
     let load_cache = false;
     let urls: Vec<String> = lookup_host_with_cache(context, hostname, STUN_PORT, "", load_cache)
@@ -671,27 +670,14 @@ pub(crate) async fn create_fallback_ice_servers(context: &Context) -> Result<Str
         .into_iter()
         .map(|addr| format!("stun:{addr}"))
         .collect();
-    let stun_server = IceServer {
+
+    let ice_server = IceServer {
         urls,
         username: None,
         credential: None,
     };
 
-    let hostname = "turn.delta.chat";
-    // Do not use cache because there is no TLS.
-    let load_cache = false;
-    let urls: Vec<String> = lookup_host_with_cache(context, hostname, STUN_PORT, "", load_cache)
-        .await?
-        .into_iter()
-        .map(|addr| format!("turn:{addr}"))
-        .collect();
-    let turn_server = IceServer {
-        urls,
-        username: Some("public".to_string()),
-        credential: Some("o4tR7yG4rG2slhXqRUf9zgmHz".to_string()),
-    };
-
-    let json = serde_json::to_string(&[stun_server, turn_server])?;
+    let json = serde_json::to_string(&[ice_server])?;
     Ok(json)
 }
 

src/chat.rs

@@ -45,7 +45,7 @@ use crate::sync::{self, Sync::*, SyncData};
 use crate::tools::{
     IsNoneOrEmpty, SystemTime, buf_compress, create_broadcast_secret, create_id,
     create_outgoing_rfc724_mid, create_smeared_timestamp, create_smeared_timestamps, get_abs_path,
-    gm2local_offset, normalize_text, smeared_time, time, truncate_msg_text,
+    gm2local_offset, smeared_time, time, truncate_msg_text,
 };
 use crate::webxdc::StatusUpdateSerial;
 use crate::{chatlist_events, imap};
@@ -286,11 +286,10 @@ impl ChatId {
         let timestamp = cmp::min(timestamp, smeared_time(context));
         let row_id =
             context.sql.insert(
-                "INSERT INTO chats (type, name, name_normalized, grpid, blocked, created_timestamp, protected, param) VALUES(?, ?, ?, ?, ?, ?, 0, ?)",
+                "INSERT INTO chats (type, name, grpid, blocked, created_timestamp, protected, param) VALUES(?, ?, ?, ?, ?, 0, ?);",
                 (
                     chattype,
                     &grpname,
-                    normalize_text(&grpname),
                     grpid,
                     create_blocked,
                     timestamp,
@@ -302,7 +301,7 @@ impl ChatId {
         let chat = Chat::load_from_db(context, chat_id).await?;
 
         if chat.is_encrypted(context).await? {
-            chat_id.add_e2ee_notice(context, timestamp).await?;
+            chat_id.add_encrypted_msg(context, timestamp).await?;
         }
 
         info!(
@@ -463,15 +462,19 @@ impl ChatId {
     }
 
     /// Adds message "Messages are end-to-end encrypted".
-    pub(crate) async fn add_e2ee_notice(self, context: &Context, timestamp: i64) -> Result<()> {
+    pub(crate) async fn add_encrypted_msg(
+        self,
+        context: &Context,
+        timestamp_sort: i64,
+    ) -> Result<()> {
         let text = stock_str::messages_e2e_encrypted(context).await;
         add_info_msg_with_cmd(
             context,
             self,
             &text,
             SystemMessage::ChatE2ee,
-            Some(timestamp),
-            timestamp,
+            timestamp_sort,
+            None,
             None,
             None,
             None,
@@ -783,7 +786,7 @@ impl ChatId {
                                     time(),
                                     msg.viewtype,
                                     &msg.text,
-                                    normalize_text(&msg.text),
+                                    message::normalize_text(&msg.text),
                                     msg.param.to_string(),
                                     msg.in_reply_to.as_deref().unwrap_or_default(),
                                     msg.id,
@@ -824,7 +827,7 @@ impl ChatId {
                         msg.viewtype,
                         MessageState::OutDraft,
                         &msg.text,
-                        normalize_text(&msg.text),
+                        message::normalize_text(&msg.text),
                         msg.param.to_string(),
                         1,
                         msg.in_reply_to.as_deref().unwrap_or_default(),
@@ -1920,7 +1923,7 @@ impl Chat {
                         msg.viewtype,
                         msg.state,
                         msg_text,
-                        normalize_text(&msg_text),
+                        message::normalize_text(&msg_text),
                         &msg.subject,
                         msg.param.to_string(),
                         msg.hidden,
@@ -1971,7 +1974,7 @@ impl Chat {
                         msg.viewtype,
                         msg.state,
                         msg_text,
-                        normalize_text(&msg_text),
+                        message::normalize_text(&msg_text),
                         &msg.subject,
                         msg.param.to_string(),
                         msg.hidden,
@@ -2275,8 +2278,8 @@ async fn update_special_chat_name(
         context
             .sql
             .execute(
-                "UPDATE chats SET name=?, name_normalized=? WHERE id=? AND name!=?",
-                (&name, normalize_text(&name), chat_id, &name),
+                "UPDATE chats SET name=? WHERE id=? AND name!=?",
+                (&name, chat_id, &name),
             )
             .await?;
     }
@@ -2389,12 +2392,11 @@ impl ChatIdBlocked {
             .transaction(move |transaction| {
                 transaction.execute(
                     "INSERT INTO chats
-                     (type, name, name_normalized, param, blocked, created_timestamp)
-                     VALUES(?, ?, ?, ?, ?, ?)",
+                     (type, name, param, blocked, created_timestamp)
+                     VALUES(?, ?, ?, ?, ?)",
                     (
                         Chattype::Single,
-                        &chat_name,
-                        normalize_text(&chat_name),
+                        chat_name,
                         params.to_string(),
                         create_blocked as u8,
                         smeared_time,
@@ -2423,7 +2425,7 @@ impl ChatIdBlocked {
             && !chat.param.exists(Param::Devicetalk)
             && !chat.param.exists(Param::Selftalk)
         {
-            chat_id.add_e2ee_notice(context, smeared_time).await?;
+            chat_id.add_encrypted_msg(context, smeared_time).await?;
         }
 
         Ok(Self {
@@ -2946,7 +2948,7 @@ pub(crate) async fn save_text_edit_to_db(
             "UPDATE msgs SET txt=?, txt_normalized=?, param=? WHERE id=?",
             (
                 new_text,
-                normalize_text(new_text),
+                message::normalize_text(new_text),
                 original_msg.param.to_string(),
                 original_msg.id,
             ),
@@ -3090,7 +3092,7 @@ pub async fn get_chat_msgs_ex(
               WHERE m.chat_id=?
                 AND m.hidden=0
                 AND (
-                    m.param GLOB '*\nS=*' OR param GLOB 'S=*'
+                    m.param GLOB \"*S=*\"
                     OR m.from_id == ?
                     OR m.to_id == ?
                 );",
@@ -3435,15 +3437,9 @@ pub(crate) async fn create_group_ex(
         .sql
         .insert(
             "INSERT INTO chats
-        (type, name, name_normalized, grpid, param, created_timestamp)
-        VALUES(?, ?, ?, ?, \'U=1\', ?)",
-            (
-                Chattype::Group,
-                &chat_name,
-                normalize_text(&chat_name),
-                &grpid,
-                timestamp,
-            ),
+        (type, name, grpid, param, created_timestamp)
+        VALUES(?, ?, ?, \'U=1\', ?);",
+            (Chattype::Group, &chat_name, &grpid, timestamp),
         )
         .await?;
 
@@ -3456,7 +3452,7 @@ pub(crate) async fn create_group_ex(
 
     if !grpid.is_empty() {
         // Add "Messages are end-to-end encrypted." message.
-        chat_id.add_e2ee_notice(context, timestamp).await?;
+        chat_id.add_encrypted_msg(context, timestamp).await?;
     }
 
     if !context.get_config_bool(Config::Bot).await?
@@ -3469,7 +3465,7 @@ pub(crate) async fn create_group_ex(
             // Add "Messages in this chat use classic email and are not encrypted." message.
             stock_str::chat_unencrypted_explanation(context).await
         };
-        add_info_msg(context, chat_id, &text).await?;
+        add_info_msg(context, chat_id, &text, create_smeared_timestamp(context)).await?;
     }
     if let (true, true) = (sync.into(), !grpid.is_empty()) {
         let id = SyncId::Grpid(grpid);
@@ -3527,15 +3523,9 @@ pub(crate) async fn create_out_broadcast_ex(
 
         t.execute(
             "INSERT INTO chats
-            (type, name, name_normalized, grpid, created_timestamp)
-            VALUES(?, ?, ?, ?, ?)",
-            (
-                Chattype::OutBroadcast,
-                &chat_name,
-                normalize_text(&chat_name),
-                &grpid,
-                timestamp,
-            ),
+            (type, name, grpid, created_timestamp)
+            VALUES(?, ?, ?, ?);",
+            (Chattype::OutBroadcast, &chat_name, &grpid, timestamp),
         )?;
         let chat_id = ChatId::new(t.last_insert_rowid().try_into()?);
 
@@ -3543,7 +3533,7 @@ pub(crate) async fn create_out_broadcast_ex(
         Ok(chat_id)
     };
     let chat_id = context.sql.transaction(trans_fn).await?;
-    chat_id.add_e2ee_notice(context, timestamp).await?;
+    chat_id.add_encrypted_msg(context, timestamp).await?;
 
     context.emit_msgs_changed_without_ids();
     chatlist_events::emit_chatlist_changed(context);
@@ -3744,16 +3734,10 @@ pub(crate) async fn add_contact_to_chat_ex(
         chat.typ != Chattype::OutBroadcast || contact_id != ContactId::SELF,
         "Cannot add SELF to broadcast channel."
     );
-    match chat.is_encrypted(context).await? {
-        true => ensure!(
-            contact.is_key_contact(),
-            "Only key-contacts can be added to encrypted chats"
-        ),
-        false => ensure!(
-            !contact.is_key_contact(),
-            "Only address-contacts can be added to unencrypted chats"
-        ),
-    }
+    ensure!(
+        chat.is_encrypted(context).await? == contact.is_key_contact(),
+        "Only key-contacts can be added to encrypted chats"
+    );
 
     if !chat.is_self_in_chat(context).await? {
         context.emit_event(EventType::ErrorSelfNotInGroup(
@@ -4108,8 +4092,8 @@ async fn rename_ex(
             context
                 .sql
                 .execute(
-                    "UPDATE chats SET name=?, name_normalized=? WHERE id=?",
-                    (&new_name, normalize_text(&new_name), chat_id),
+                    "UPDATE chats SET name=? WHERE id=?;",
+                    (new_name.to_string(), chat_id),
                 )
                 .await?;
             if chat.is_promoted()
@@ -4203,16 +4187,6 @@ pub async fn set_chat_profile_image(
 
 /// Forwards multiple messages to a chat.
 pub async fn forward_msgs(context: &Context, msg_ids: &[MsgId], chat_id: ChatId) -> Result<()> {
-    forward_msgs_2ctx(context, msg_ids, context, chat_id).await
-}
-
-/// Forwards multiple messages to a chat in another context.
-pub async fn forward_msgs_2ctx(
-    ctx_src: &Context,
-    msg_ids: &[MsgId],
-    ctx_dst: &Context,
-    chat_id: ChatId,
-) -> Result<()> {
     ensure!(!msg_ids.is_empty(), "empty msgs_ids: nothing to forward");
     ensure!(!chat_id.is_special(), "can not forward to special chat");
 
@@ -4220,16 +4194,16 @@ pub async fn forward_msgs_2ctx(
     let mut curr_timestamp: i64;
 
     chat_id
-        .unarchive_if_not_muted(ctx_dst, MessageState::Undefined)
+        .unarchive_if_not_muted(context, MessageState::Undefined)
         .await?;
-    let mut chat = Chat::load_from_db(ctx_dst, chat_id).await?;
-    if let Some(reason) = chat.why_cant_send(ctx_dst).await? {
+    let mut chat = Chat::load_from_db(context, chat_id).await?;
+    if let Some(reason) = chat.why_cant_send(context).await? {
         bail!("cannot send to {chat_id}: {reason}");
     }
-    curr_timestamp = create_smeared_timestamps(ctx_dst, msg_ids.len());
+    curr_timestamp = create_smeared_timestamps(context, msg_ids.len());
     let mut msgs = Vec::with_capacity(msg_ids.len());
     for id in msg_ids {
-        let ts: i64 = ctx_src
+        let ts: i64 = context
             .sql
             .query_get_value("SELECT timestamp FROM msgs WHERE id=?", (id,))
             .await?
@@ -4239,14 +4213,11 @@ pub async fn forward_msgs_2ctx(
     msgs.sort_unstable();
     for (_, id) in msgs {
         let src_msg_id: MsgId = id;
-        let mut msg = Message::load_from_db(ctx_src, src_msg_id).await?;
+        let mut msg = Message::load_from_db(context, src_msg_id).await?;
         if msg.state == MessageState::OutDraft {
             bail!("cannot forward drafts.");
         }
 
-        let mut param = msg.param;
-        msg.param = Params::new();
-
         if msg.get_viewtype() != Viewtype::Sticker {
             msg.param
                 .set_int(Param::Forwarded, src_msg_id.to_u32() as i32);
@@ -4256,16 +4227,17 @@ pub async fn forward_msgs_2ctx(
             msg.viewtype = Viewtype::Text;
         }
 
-        let param = &mut param;
-        msg.param.steal(param, Param::File);
-        msg.param.steal(param, Param::Filename);
-        msg.param.steal(param, Param::Width);
-        msg.param.steal(param, Param::Height);
-        msg.param.steal(param, Param::Duration);
-        msg.param.steal(param, Param::MimeType);
-        msg.param.steal(param, Param::ProtectQuote);
-        msg.param.steal(param, Param::Quote);
-        msg.param.steal(param, Param::Summary1);
+        msg.param.remove(Param::GuaranteeE2ee);
+        msg.param.remove(Param::ForcePlaintext);
+        msg.param.remove(Param::Cmd);
+        msg.param.remove(Param::OverrideSenderDisplayname);
+        msg.param.remove(Param::WebxdcDocument);
+        msg.param.remove(Param::WebxdcDocumentTimestamp);
+        msg.param.remove(Param::WebxdcSummary);
+        msg.param.remove(Param::WebxdcSummaryTimestamp);
+        msg.param.remove(Param::IsEdited);
+        msg.param.remove(Param::WebrtcRoom);
+        msg.param.remove(Param::WebrtcAccepted);
         msg.in_reply_to = None;
 
         // do not leak data as group names; a default subject is generated by mimefactory
@@ -4274,16 +4246,16 @@ pub async fn forward_msgs_2ctx(
         msg.state = MessageState::OutPending;
         msg.rfc724_mid = create_outgoing_rfc724_mid();
         msg.timestamp_sort = curr_timestamp;
-        chat.prepare_msg_raw(ctx_dst, &mut msg, None).await?;
+        chat.prepare_msg_raw(context, &mut msg, None).await?;
 
         curr_timestamp += 1;
-        if !create_send_msg_jobs(ctx_dst, &mut msg).await?.is_empty() {
-            ctx_dst.scheduler.interrupt_smtp().await;
+        if !create_send_msg_jobs(context, &mut msg).await?.is_empty() {
+            context.scheduler.interrupt_smtp().await;
         }
         created_msgs.push(msg.id);
     }
     for msg_id in created_msgs {
-        ctx_dst.emit_msgs_changed(chat_id, msg_id);
+        context.emit_msgs_changed(chat_id, msg_id);
     }
     Ok(())
 }
@@ -4555,7 +4527,7 @@ pub async fn add_device_msg_with_importance(
                     msg.viewtype,
                     state,
                     &msg.text,
-                    normalize_text(&msg.text),
+                    message::normalize_text(&msg.text),
                     msg.param.to_string(),
                     rfc724_mid,
                 ),
@@ -4644,11 +4616,9 @@ pub(crate) async fn add_info_msg_with_cmd(
     chat_id: ChatId,
     text: &str,
     cmd: SystemMessage,
-    // Timestamp where in the chat the message will be sorted.
-    // If this is None, the message will be sorted to the bottom.
-    timestamp_sort: Option<i64>,
-    // Timestamp to show to the user
-    timestamp_sent_rcvd: i64,
+    timestamp_sort: i64,
+    // Timestamp to show to the user (if this is None, `timestamp_sort` will be shown to the user)
+    timestamp_sent_rcvd: Option<i64>,
     parent: Option<&Message>,
     from_id: Option<ContactId>,
     added_removed_id: Option<ContactId>,
@@ -4664,22 +4634,6 @@ pub(crate) async fn add_info_msg_with_cmd(
         param.set(Param::ContactAddedRemoved, contact_id.to_u32().to_string());
     }
 
-    let timestamp_sort = if let Some(ts) = timestamp_sort {
-        ts
-    } else {
-        let sort_to_bottom = true;
-        let (received, incoming) = (false, false);
-        chat_id
-            .calc_sort_timestamp(
-                context,
-                smeared_time(context),
-                sort_to_bottom,
-                received,
-                incoming,
-            )
-            .await?
-    };
-
     let row_id =
     context.sql.insert(
         "INSERT INTO msgs (chat_id,from_id,to_id,timestamp,timestamp_sent,timestamp_rcvd,type,state,txt,txt_normalized,rfc724_mid,ephemeral_timer,param,mime_in_reply_to)
@@ -4689,12 +4643,12 @@ pub(crate) async fn add_info_msg_with_cmd(
             from_id.unwrap_or(ContactId::INFO),
             ContactId::INFO,
             timestamp_sort,
-            timestamp_sent_rcvd,
-            timestamp_sent_rcvd,
+            timestamp_sent_rcvd.unwrap_or(0),
+            timestamp_sent_rcvd.unwrap_or(0),
             Viewtype::Text,
             MessageState::InNoticed,
             text,
-            normalize_text(text),
+            message::normalize_text(text),
             rfc724_mid,
             ephemeral_timer,
             param.to_string(),
@@ -4710,14 +4664,19 @@ pub(crate) async fn add_info_msg_with_cmd(
 }
 
 /// Adds info message with a given text and `timestamp` to the chat.
-pub(crate) async fn add_info_msg(context: &Context, chat_id: ChatId, text: &str) -> Result<MsgId> {
+pub(crate) async fn add_info_msg(
+    context: &Context,
+    chat_id: ChatId,
+    text: &str,
+    timestamp: i64,
+) -> Result<MsgId> {
     add_info_msg_with_cmd(
         context,
         chat_id,
         text,
         SystemMessage::Unknown,
+        timestamp,
         None,
-        time(),
         None,
         None,
         None,
@@ -4736,7 +4695,7 @@ pub(crate) async fn update_msg_text_and_timestamp(
         .sql
         .execute(
             "UPDATE msgs SET txt=?, txt_normalized=?, timestamp=? WHERE id=?;",
-            (text, normalize_text(text), timestamp, msg_id),
+            (text, message::normalize_text(text), timestamp, msg_id),
         )
         .await?;
     context.emit_msgs_changed(chat_id, msg_id);

src/chat/chat_tests.rs

@@ -815,6 +815,15 @@ async fn test_self_talk() -> Result<()> {
     assert!(msg.get_showpadlock());
 
     let sent_msg = t.pop_sent_msg().await;
+    let payload = sent_msg.payload();
+    // Make sure the `To` field contains the address and not
+    // "undisclosed recipients".
+    // Otherwise Delta Chat core <1.153.0 assigns the message
+    // to the trash chat.
+    assert_eq!(
+        payload.match_indices("To: <alice@example.org>\r\n").count(),
+        1
+    );
 
     let t2 = TestContext::new_alice().await;
     t2.recv_msg(&sent_msg).await;
@@ -1229,7 +1238,7 @@ async fn test_unarchive_if_muted() -> Result<()> {
     chat_id.set_visibility(&t, ChatVisibility::Archived).await?;
     set_muted(&t, chat_id, MuteDuration::Forever).await?;
     send_text_msg(&t, chat_id, "out".to_string()).await?;
-    add_info_msg(&t, chat_id, "info").await?;
+    add_info_msg(&t, chat_id, "info", time()).await?;
     assert_eq!(get_archived_cnt(&t).await?, 1);
 
     // finally, unarchive on sending to not muted chat
@@ -1628,7 +1637,7 @@ async fn test_set_mute_duration() {
 async fn test_add_info_msg() -> Result<()> {
     let t = TestContext::new().await;
     let chat_id = create_group(&t, "foo").await?;
-    add_info_msg(&t, chat_id, "foo info").await?;
+    add_info_msg(&t, chat_id, "foo info", time()).await?;
 
     let msg = t.get_last_msg_in(chat_id).await;
     assert_eq!(msg.get_chat_id(), chat_id);
@@ -1650,11 +1659,11 @@ async fn test_add_info_msg_with_cmd() -> Result<()> {
         chat_id,
         "foo bar info",
         SystemMessage::EphemeralTimerChanged,
-        None,
         time(),
         None,
         None,
         None,
+        None,
     )
     .await?;
 
@@ -3312,7 +3321,10 @@ async fn test_leave_broadcast_multidevice() -> Result<()> {
 
     let leave_msg = bob0.pop_sent_msg().await;
     let parsed = MimeMessage::from_bytes(bob1, leave_msg.payload().as_bytes(), None).await?;
-    assert_eq!(parsed.parts[0].msg, "I left the group.");
+    assert_eq!(
+        parsed.parts[0].msg,
+        stock_str::msg_group_left_remote(bob0).await
+    );
 
     let rcvd = bob1.recv_msg(&leave_msg).await;
 
@@ -4495,7 +4507,7 @@ async fn test_info_not_referenced() -> Result<()> {
 
     let bob_received_message = tcm.send_recv_accept(alice, bob, "Hi!").await;
     let bob_chat_id = bob_received_message.chat_id;
-    add_info_msg(bob, bob_chat_id, "Some info").await?;
+    add_info_msg(bob, bob_chat_id, "Some info", create_smeared_timestamp(bob)).await?;
 
     // Bob sends a message.
     // This message should reference Alice's "Hi!" message and not the info message.
@@ -5240,44 +5252,6 @@ async fn test_send_delete_request_no_encryption() -> Result<()> {
     Ok(())
 }
 
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_forward_msgs_2ctx() -> Result<()> {
-    let mut tcm = TestContextManager::new();
-    let alice = &tcm.alice().await;
-    let bob = &tcm.bob().await;
-
-    let alice_chat = alice.create_chat(bob).await;
-    let alice_sent = alice.send_text(alice_chat.id, "hi").await;
-    let bob_alice_msg = bob.recv_msg(&alice_sent).await;
-    let bob_chat_id = bob_alice_msg.chat_id;
-    bob_chat_id.accept(bob).await?;
-
-    let bob_text = "Hi, did you know we're using the same device so i have access to your profile?";
-    let bob_sent = bob.send_text(bob_chat_id, bob_text).await;
-    alice.recv_msg(&bob_sent).await;
-    let alice_chat_len = alice_chat.id.get_msg_cnt(alice).await?;
-
-    forward_msgs_2ctx(
-        bob,
-        &[bob_alice_msg.id, bob_sent.sender_msg_id],
-        alice,
-        alice_chat.id,
-    )
-    .await?;
-    assert_eq!(alice_chat.id.get_msg_cnt(alice).await?, alice_chat_len + 2);
-    let msg = alice.get_last_msg().await;
-    assert!(msg.is_forwarded());
-    assert_eq!(msg.text, bob_text);
-    assert_eq!(msg.from_id, ContactId::SELF);
-
-    let sent = alice.pop_sent_msg().await;
-    let msg = bob.recv_msg(&sent).await;
-    assert!(msg.is_forwarded());
-    assert_eq!(msg.text, bob_text);
-    assert_eq!(msg.from_id, bob_alice_msg.from_id);
-    Ok(())
-}
-
 /// Tests that in multi-device setup
 /// second device learns the key of a contact
 /// via Autocrypt-Gossip in 1:1 chats.

src/chatlist.rs

@@ -185,7 +185,7 @@ impl Chatlist {
                 warn!(context, "Cannot update special chat names: {err:#}.")
             }
 
-            let str_like_cmd = format!("%{}%", query.to_lowercase());
+            let str_like_cmd = format!("%{query}%");
             context
                 .sql
                 .query_map_vec(
@@ -201,7 +201,7 @@ impl Chatlist {
                                   ORDER BY timestamp DESC, id DESC LIMIT 1)
                  WHERE c.id>9 AND c.id!=?2
                    AND c.blocked!=1
-                   AND IFNULL(c.name_normalized,c.name) LIKE ?3
+                   AND c.name LIKE ?3
                    AND (NOT ?4 OR EXISTS (SELECT 1 FROM msgs m WHERE m.chat_id = c.id AND m.state == ?5 AND hidden=0))
                  GROUP BY c.id
                  ORDER BY IFNULL(m.timestamp,c.created_timestamp) DESC, m.id DESC;",
@@ -472,7 +472,7 @@ mod tests {
     use crate::chat::save_msgs;
     use crate::chat::{
         add_contact_to_chat, create_group, get_chat_contacts, remove_contact_from_chat,
-        send_text_msg, set_chat_name,
+        send_text_msg,
     };
     use crate::receive_imf::receive_imf;
     use crate::stock_str::StockMessage;
@@ -482,7 +482,7 @@ mod tests {
     use std::time::Duration;
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_try_load() -> Result<()> {
+    async fn test_try_load() {
         let mut tcm = TestContextManager::new();
         let bob = &tcm.bob().await;
         let chat_id1 = create_group(bob, "a chat").await.unwrap();
@@ -552,15 +552,6 @@ mod tests {
             .await
             .unwrap();
         assert_eq!(chats.len(), 1);
-
-        let chat_id = create_group(bob, "Δ-chat").await.unwrap();
-        let chats = Chatlist::try_load(bob, 0, Some("δ"), None).await?;
-        assert_eq!(chats.len(), 1);
-        assert_eq!(chats.ids[0].0, chat_id);
-        set_chat_name(bob, chat_id, "abcδe").await?;
-        let chats = Chatlist::try_load(bob, 0, Some("Δ"), None).await?;
-        assert_eq!(chats.len(), 1);
-        Ok(())
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]

src/config.rs

@@ -13,14 +13,15 @@ use strum_macros::{AsRefStr, Display, EnumIter, EnumString};
 use tokio::fs;
 
 use crate::blob::BlobObject;
+use crate::configure::EnteredLoginParam;
 use crate::context::Context;
 use crate::events::EventType;
 use crate::log::LogExt;
 use crate::mimefactory::RECOMMENDED_FILE_SIZE;
-use crate::provider::Provider;
+use crate::provider::{Provider, get_provider_by_id};
 use crate::sync::{self, Sync::*, SyncData};
 use crate::tools::get_abs_path;
-use crate::transport::{ConfiguredLoginParam, add_pseudo_transport, send_sync_transports};
+use crate::transport::ConfiguredLoginParam;
 use crate::{constants, stats};
 
 /// The available configuration keys.
@@ -203,7 +204,7 @@ pub enum Config {
     /// `ProviderOptions::delete_to_trash`.
     DeleteToTrash,
 
-    /// The primary email address.
+    /// The primary email address. Also see `SecondaryAddrs`.
     ConfiguredAddr,
 
     /// List of configured IMAP servers as a JSON array.
@@ -305,6 +306,10 @@ pub enum Config {
     /// Meant to help profile owner to differ between profiles with similar names.
     PrivateTag,
 
+    /// All secondary self addresses separated by spaces
+    /// (`addr1@example.org addr2@example.org addr3@example.org`)
+    SecondaryAddrs,
+
     /// Read-only core version string.
     #[strum(serialize = "sys.version")]
     SysVersion,
@@ -472,10 +477,7 @@ impl Config {
 
     /// Whether the config option needs an IO scheduler restart to take effect.
     pub(crate) fn needs_io_restart(&self) -> bool {
-        matches!(
-            self,
-            Config::MvboxMove | Config::OnlyFetchMvbox | Config::ConfiguredAddr
-        )
+        matches!(self, Config::MvboxMove | Config::OnlyFetchMvbox)
     }
 }
 
@@ -641,14 +643,15 @@ impl Context {
         Ok(val)
     }
 
-    /// Gets the configured provider.
+    /// Gets the configured provider, as saved in the `configured_provider` value.
     ///
-    /// The provider is determined by the current primary transport.
+    /// The provider is determined by `get_provider_info()` during configuration and then saved
+    /// to the db in `param.save_to_database()`, together with all the other `configured_*` values.
     pub async fn get_configured_provider(&self) -> Result<Option<&'static Provider>> {
-        let provider = ConfiguredLoginParam::load(self)
-            .await?
-            .and_then(|(_transport_id, param)| param.provider);
-        Ok(provider)
+        if let Some(cfg) = self.get_config(Config::ConfiguredProvider).await? {
+            return Ok(get_provider_by_id(&cfg));
+        }
+        Ok(None)
     }
 
     /// Gets configured "delete_device_after" value.
@@ -710,16 +713,6 @@ impl Context {
     pub async fn set_config(&self, key: Config, value: Option<&str>) -> Result<()> {
         Self::check_config(key, value)?;
 
-        let n_transports = self.count_transports().await?;
-        if n_transports > 1
-            && matches!(
-                key,
-                Config::MvboxMove | Config::OnlyFetchMvbox | Config::ShowEmails
-            )
-        {
-            bail!("Cannot reconfigure {key} when multiple transports are configured");
-        }
-
         let _pause = match key.needs_io_restart() {
             true => self.scheduler.pause(self).await?,
             _ => Default::default(),
@@ -805,51 +798,19 @@ impl Context {
                     .await?;
             }
             Config::ConfiguredAddr => {
-                let Some(addr) = value else {
-                    bail!("Cannot unset configured_addr");
-                };
-
-                if !self.is_configured().await? {
+                if self.is_configured().await? {
+                    bail!("Cannot change ConfiguredAddr");
+                }
+                if let Some(addr) = value {
                     info!(
                         self,
                         "Creating a pseudo configured account which will not be able to send or receive messages. Only meant for tests!"
                     );
-                    add_pseudo_transport(self, addr).await?;
-                    self.sql
-                        .set_raw_config(Config::ConfiguredAddr.as_ref(), Some(addr))
-                        .await?;
-                } else {
-                    self.sql
-                        .transaction(|transaction| {
-                            if transaction.query_row(
-                                "SELECT COUNT(*) FROM transports WHERE addr=?",
-                                (addr,),
-                                |row| {
-                                    let res: i64 = row.get(0)?;
-                                    Ok(res)
-                                },
-                            )? == 0
-                            {
-                                bail!("Address does not belong to any transport.");
-                            }
-                            transaction.execute(
-                                "UPDATE config SET value=? WHERE keyname='configured_addr'",
-                                (addr,),
-                            )?;
-
-                            // Clean up SMTP and IMAP APPEND queue.
-                            //
-                            // The messages in the queue have a different
-                            // From address so we cannot send them over
-                            // the new SMTP transport.
-                            transaction.execute("DELETE FROM smtp", ())?;
-                            transaction.execute("DELETE FROM imap_send", ())?;
-
-                            Ok(())
-                        })
-                        .await?;
-                    send_sync_transports(self).await?;
-                    self.sql.uncache_raw_config("configured_addr").await;
+                    ConfiguredLoginParam::from_json(&format!(
+                        r#"{{"addr":"{addr}","imap":[],"imap_user":"","imap_password":"","smtp":[],"smtp_user":"","smtp_password":"","certificate_checks":"Automatic","oauth2":false}}"#
+                    ))?
+                    .save_to_transports_table(self, &EnteredLoginParam::default())
+                    .await?;
                 }
             }
             _ => {
@@ -946,6 +907,16 @@ impl Context {
     pub(crate) async fn set_primary_self_addr(&self, primary_new: &str) -> Result<()> {
         self.quota.write().await.take();
 
+        // add old primary address (if exists) to secondary addresses
+        let mut secondary_addrs = self.get_all_self_addrs().await?;
+        // never store a primary address also as a secondary
+        secondary_addrs.retain(|a| !addr_cmp(a, primary_new));
+        self.set_config_internal(
+            Config::SecondaryAddrs,
+            Some(secondary_addrs.join(" ").as_str()),
+        )
+        .await?;
+
         self.sql
             .set_raw_config(Config::ConfiguredAddr.as_ref(), Some(primary_new))
             .await?;
@@ -963,10 +934,14 @@ impl Context {
 
     /// Returns all secondary self addresses.
     pub(crate) async fn get_secondary_self_addrs(&self) -> Result<Vec<String>> {
-        self.sql.query_map_vec("SELECT addr FROM transports WHERE addr NOT IN (SELECT value FROM config WHERE keyname='configured_addr')", (), |row| {
-            let addr: String = row.get(0)?;
-            Ok(addr)
-        }).await
+        let secondary_addrs = self
+            .get_config(Config::SecondaryAddrs)
+            .await?
+            .unwrap_or_default();
+        Ok(secondary_addrs
+            .split_ascii_whitespace()
+            .map(|s| s.to_string())
+            .collect())
     }
 
     /// Returns the primary self address.

src/config/config_tests.rs

@@ -94,6 +94,59 @@ async fn test_set_config_bool() -> Result<()> {
     Ok(())
 }
 
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_self_addrs() -> Result<()> {
+    let alice = TestContext::new_alice().await;
+
+    assert!(alice.is_self_addr("alice@example.org").await?);
+    assert_eq!(alice.get_all_self_addrs().await?, vec!["alice@example.org"]);
+    assert!(!alice.is_self_addr("alice@alice.com").await?);
+
+    // Test adding the same primary address
+    alice.set_primary_self_addr("alice@example.org").await?;
+    alice.set_primary_self_addr("Alice@Example.Org").await?;
+    assert_eq!(alice.get_all_self_addrs().await?, vec!["Alice@Example.Org"]);
+
+    // Test adding a new (primary) self address
+    // The address is trimmed during configure by `LoginParam::from_database()`,
+    // so `set_primary_self_addr()` doesn't have to trim it.
+    alice.set_primary_self_addr("Alice@alice.com").await?;
+    assert!(alice.is_self_addr("aliCe@example.org").await?);
+    assert!(alice.is_self_addr("alice@alice.com").await?);
+    assert_eq!(
+        alice.get_all_self_addrs().await?,
+        vec!["Alice@alice.com", "Alice@Example.Org"]
+    );
+
+    // Check that the entry is not duplicated
+    alice.set_primary_self_addr("alice@alice.com").await?;
+    alice.set_primary_self_addr("alice@alice.com").await?;
+    assert_eq!(
+        alice.get_all_self_addrs().await?,
+        vec!["alice@alice.com", "Alice@Example.Org"]
+    );
+
+    // Test switching back
+    alice.set_primary_self_addr("alice@example.org").await?;
+    assert_eq!(
+        alice.get_all_self_addrs().await?,
+        vec!["alice@example.org", "alice@alice.com"]
+    );
+
+    // Test setting a new primary self address, the previous self address
+    // should be kept as a secondary self address
+    alice.set_primary_self_addr("alice@alice.xyz").await?;
+    assert_eq!(
+        alice.get_all_self_addrs().await?,
+        vec!["alice@alice.xyz", "alice@example.org", "alice@alice.com"]
+    );
+    assert!(alice.is_self_addr("alice@example.org").await?);
+    assert!(alice.is_self_addr("alice@alice.com").await?);
+    assert!(alice.is_self_addr("Alice@alice.xyz").await?);
+
+    Ok(())
+}
+
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_mdns_default_behaviour() -> Result<()> {
     let t = &TestContext::new_alice().await;
@@ -225,6 +278,7 @@ async fn test_sync() -> Result<()> {
     Ok(())
 }
 
+/// Sync message mustn't be sent if self-{status,avatar} is changed by a self-sent message.
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_no_sync_on_self_sent_msg() -> Result<()> {
     let mut tcm = TestContextManager::new();
@@ -234,7 +288,7 @@ async fn test_no_sync_on_self_sent_msg() -> Result<()> {
         a.set_config_bool(Config::SyncMsgs, true).await?;
     }
 
-    let status = "Sent via usual message";
+    let status = "Synced via usual message";
     alice0.set_config(Config::Selfstatus, Some(status)).await?;
     alice0.send_sync_msg().await?;
     alice0.pop_sent_sync_msg().await;
@@ -243,7 +297,7 @@ async fn test_no_sync_on_self_sent_msg() -> Result<()> {
     tcm.send_recv(alice0, alice1, "hi Alice!").await;
     assert_eq!(
         alice1.get_config(Config::Selfstatus).await?,
-        Some(status1.to_string())
+        Some(status.to_string())
     );
     sync(alice1, alice0).await;
     assert_eq!(
@@ -274,7 +328,7 @@ async fn test_no_sync_on_self_sent_msg() -> Result<()> {
         alice1
             .get_config(Config::Selfavatar)
             .await?
-            .filter(|path| path.ends_with(".jpg"))
+            .filter(|path| path.ends_with(".png"))
             .is_some()
     );
     sync(alice1, alice0).await;

src/configure.rs

@@ -27,7 +27,7 @@ use crate::config::{self, Config};
 use crate::constants::NON_ALPHANUMERIC_WITHOUT_DOT;
 use crate::context::Context;
 use crate::imap::Imap;
-use crate::log::warn;
+use crate::log::{LogExt, warn};
 use crate::login_param::EnteredCertificateChecks;
 pub use crate::login_param::EnteredLoginParam;
 use crate::message::Message;
@@ -40,14 +40,11 @@ use crate::sync::Sync::*;
 use crate::tools::time;
 use crate::transport::{
     ConfiguredCertificateChecks, ConfiguredLoginParam, ConfiguredServerLoginParam,
-    ConnectionCandidate, send_sync_transports,
+    ConnectionCandidate,
 };
 use crate::{EventType, stock_str};
 use crate::{chat, provider};
-
-/// Maximum number of relays
-/// see <https://github.com/chatmail/core/issues/7608>
-pub(crate) const MAX_TRANSPORT_RELAYS: usize = 5;
+use deltachat_contact_tools::addr_cmp;
 
 macro_rules! progress {
     ($context:tt, $progress:expr, $comment:expr) => {
@@ -133,6 +130,12 @@ impl Context {
             "cannot configure, database not opened."
         );
         param.addr = addr_normalize(&param.addr);
+        let old_addr = self.get_config(Config::ConfiguredAddr).await?;
+        if self.is_configured().await? && !addr_cmp(&old_addr.unwrap_or_default(), &param.addr) {
+            let error_msg = "Changing your email address is not supported right now. Check back in a few months!";
+            progress!(self, 0, Some(error_msg.to_string()));
+            bail!(error_msg);
+        }
         let cancel_channel = self.alloc_ongoing().await?;
 
         let res = self
@@ -201,125 +204,23 @@ impl Context {
         Ok(transports)
     }
 
-    /// Returns the number of configured transports.
-    pub async fn count_transports(&self) -> Result<usize> {
-        self.sql.count("SELECT COUNT(*) FROM transports", ()).await
-    }
-
     /// Removes the transport with the specified email address
     /// (i.e. [EnteredLoginParam::addr]).
-    pub async fn delete_transport(&self, addr: &str) -> Result<()> {
-        let now = time();
-        self.sql
-            .transaction(|transaction| {
-                let primary_addr = transaction.query_row(
-                    "SELECT value FROM config WHERE keyname='configured_addr'",
-                    (),
-                    |row| {
-                        let addr: String = row.get(0)?;
-                        Ok(addr)
-                    },
-                )?;
-
-                if primary_addr == addr {
-                    bail!("Cannot delete primary transport");
-                }
-                let (transport_id, add_timestamp) = transaction.query_row(
-                    "DELETE FROM transports WHERE addr=? RETURNING id, add_timestamp",
-                    (addr,),
-                    |row| {
-                        let id: u32 = row.get(0)?;
-                        let add_timestamp: i64 = row.get(1)?;
-                        Ok((id, add_timestamp))
-                    },
-                )?;
-                transaction.execute("DELETE FROM imap WHERE transport_id=?", (transport_id,))?;
-                transaction.execute(
-                    "DELETE FROM imap_sync WHERE transport_id=?",
-                    (transport_id,),
-                )?;
-
-                // Removal timestamp should not be lower than addition timestamp
-                // to be accepted by other devices when synced.
-                let remove_timestamp = std::cmp::max(now, add_timestamp);
-
-                transaction.execute(
-                    "INSERT INTO removed_transports (addr, remove_timestamp)
-                     VALUES (?, ?)
-                     ON CONFLICT (addr)
-                     DO UPDATE SET remove_timestamp = excluded.remove_timestamp",
-                    (addr, remove_timestamp),
-                )?;
-
-                Ok(())
-            })
-            .await?;
-        send_sync_transports(self).await?;
-
-        Ok(())
+    #[expect(clippy::unused_async)]
+    pub async fn delete_transport(&self, _addr: &str) -> Result<()> {
+        bail!(
+            "Adding and removing additional transports is not supported yet. Check back in a few months!"
+        )
     }
 
     async fn inner_configure(&self, param: &EnteredLoginParam) -> Result<()> {
         info!(self, "Configure ...");
 
         let old_addr = self.get_config(Config::ConfiguredAddr).await?;
-        if old_addr.is_some()
-            && !self
-                .sql
-                .exists(
-                    "SELECT COUNT(*) FROM transports WHERE addr=?",
-                    (&param.addr,),
-                )
-                .await?
-        {
-            if self.get_config(Config::MvboxMove).await?.as_deref() != Some("0") {
-                bail!(
-                    "To use additional relays, disable the legacy option \"Settings / Advanced / Move automatically to DeltaChat Folder\"."
-                );
-            }
-            if self.get_config(Config::OnlyFetchMvbox).await?.as_deref() != Some("0") {
-                bail!(
-                    "To use additional relays, disable the legacy option \"Settings / Advanced / Only Fetch from DeltaChat Folder\"."
-                );
-            }
-            if self.get_config(Config::ShowEmails).await?.as_deref() != Some("2") {
-                bail!(
-                    "To use additional relays, set the legacy option \"Settings / Advanced / Show Classic Emails\" to \"All\"."
-                );
-            }
-
-            if self
-                .sql
-                .count("SELECT COUNT(*) FROM transports", ())
-                .await?
-                >= MAX_TRANSPORT_RELAYS
-            {
-                bail!(
-                    "You have reached the maximum number of relays ({}).",
-                    MAX_TRANSPORT_RELAYS
-                )
-            }
-        }
-
-        let provider = match configure(self, param).await {
-            Err(error) => {
-                // Log entered and actual params
-                let configured_param = get_configured_param(self, param).await;
-                warn!(
-                    self,
-                    "configure failed: Entered params: {}. Used params: {}. Error: {error}.",
-                    param.to_string(),
-                    configured_param
-                        .map(|param| param.to_string())
-                        .unwrap_or("error".to_owned())
-                );
-                return Err(error);
-            }
-            Ok(provider) => provider,
-        };
+        let provider = configure(self, param).await?;
         self.set_config_internal(Config::NotifyAboutWrongPw, Some("1"))
             .await?;
-        on_configure_completed(self, provider).await?;
+        on_configure_completed(self, provider, old_addr).await?;
         Ok(())
     }
 }
@@ -327,6 +228,7 @@ impl Context {
 async fn on_configure_completed(
     context: &Context,
     provider: Option<&'static Provider>,
+    old_addr: Option<String>,
 ) -> Result<()> {
     if let Some(provider) = provider {
         if let Some(config_defaults) = provider.config_defaults {
@@ -356,6 +258,20 @@ async fn on_configure_completed(
         }
     }
 
+    if let Some(new_addr) = context.get_config(Config::ConfiguredAddr).await?
+        && let Some(old_addr) = old_addr
+        && !addr_cmp(&new_addr, &old_addr)
+    {
+        let mut msg = Message::new_text(
+            stock_str::aeap_explanation_and_link(context, &old_addr, &new_addr).await,
+        );
+        chat::add_device_msg(context, None, Some(&mut msg))
+            .await
+            .context("Cannot add AEAP explanation")
+            .log_err(context)
+            .ok();
+    }
+
     Ok(())
 }
 
@@ -587,40 +503,71 @@ async fn configure(ctx: &Context, param: &EnteredLoginParam) -> Result<Option<&'
 
     // Configure IMAP
 
-    let transport_id = 0;
     let (_s, r) = async_channel::bounded(1);
-    let mut imap = Imap::new(ctx, transport_id, configured_param.clone(), r).await?;
+    let mut imap = Imap::new(
+        configured_param.imap.clone(),
+        configured_param.imap_password.clone(),
+        proxy_config,
+        &configured_param.addr,
+        strict_tls,
+        configured_param.oauth2,
+        r,
+    );
     let configuring = true;
-    if let Err(err) = imap.connect(ctx, configuring).await {
-        bail!(
+    let mut imap_session = match imap.connect(ctx, configuring).await {
+        Ok(session) => session,
+        Err(err) => bail!(
             "{}",
             nicer_configuration_error(ctx, format!("{err:#}")).await
-        );
+        ),
     };
 
     progress!(ctx, 850);
 
     // Wait for SMTP configuration
-    smtp_config_task.await??;
+    smtp_config_task.await.unwrap()?;
 
     progress!(ctx, 900);
 
-    let is_configured = ctx.is_configured().await?;
-    if !is_configured {
-        ctx.sql.set_raw_config("mvbox_move", Some("0")).await?;
-        ctx.sql.set_raw_config("only_fetch_mvbox", None).await?;
+    let is_chatmail = match ctx.get_config_bool(Config::FixIsChatmail).await? {
+        false => {
+            let is_chatmail = imap_session.is_chatmail();
+            ctx.set_config(
+                Config::IsChatmail,
+                Some(match is_chatmail {
+                    false => "0",
+                    true => "1",
+                }),
+            )
+            .await?;
+            is_chatmail
+        }
+        true => ctx.get_config_bool(Config::IsChatmail).await?,
+    };
+    if is_chatmail {
+        ctx.set_config(Config::MvboxMove, Some("0")).await?;
+        ctx.set_config(Config::OnlyFetchMvbox, None).await?;
+        ctx.set_config(Config::ShowEmails, None).await?;
     }
 
+    let create_mvbox = !is_chatmail;
+    imap.configure_folders(ctx, &mut imap_session, create_mvbox)
+        .await?;
+
+    let create = true;
+    imap_session
+        .select_with_uidvalidity(ctx, "INBOX", create)
+        .await
+        .context("could not read INBOX status")?;
+
     drop(imap);
 
     progress!(ctx, 910);
 
     let provider = configured_param.provider;
     configured_param
-        .clone()
-        .save_to_transports_table(ctx, param, time())
+        .save_to_transports_table(ctx, param)
         .await?;
-    send_sync_transports(ctx).await?;
 
     ctx.set_config_internal(Config::ConfiguredTimestamp, Some(&time().to_string()))
         .await?;

src/contact.rs

@@ -36,7 +36,7 @@ use crate::message::MessageState;
 use crate::mimeparser::AvatarAction;
 use crate::param::{Param, Params};
 use crate::sync::{self, Sync::*};
-use crate::tools::{SystemTime, duration_to_str, get_abs_path, normalize_text, time, to_lowercase};
+use crate::tools::{SystemTime, duration_to_str, get_abs_path, time, to_lowercase};
 use crate::{chat, chatlist_events, ensure_and_debug_assert_ne, stock_str};
 
 /// Time during which a contact is considered as seen recently.
@@ -115,23 +115,9 @@ impl ContactId {
         let row = context
             .sql
             .transaction(|transaction| {
-                let authname;
-                let name_or_authname = if !name.is_empty() {
-                    name
-                } else {
-                    authname = transaction.query_row(
-                        "SELECT authname FROM contacts WHERE id=?",
-                        (self,),
-                        |row| {
-                            let authname: String = row.get(0)?;
-                            Ok(authname)
-                        },
-                    )?;
-                    &authname
-                };
                 let is_changed = transaction.execute(
-                    "UPDATE contacts SET name=?1, name_normalized=?2 WHERE id=?3 AND name!=?1",
-                    (name, normalize_text(name_or_authname), self),
+                    "UPDATE contacts SET name=?1 WHERE id=?2 AND name!=?1",
+                    (name, self),
                 )? > 0;
                 if is_changed {
                     update_chat_names(context, transaction, self)?;
@@ -144,15 +130,13 @@ impl ContactId {
                             Ok((addr, fingerprint))
                         },
                     )?;
+                    context.emit_event(EventType::ContactsChanged(Some(self)));
                     Ok(Some((addr, fingerprint)))
                 } else {
                     Ok(None)
                 }
             })
             .await?;
-        if row.is_some() {
-            context.emit_event(EventType::ContactsChanged(Some(self)));
-        }
 
         if sync.into()
             && let Some((addr, fingerprint)) = row
@@ -397,16 +381,20 @@ async fn import_vcard_contact(context: &Context, contact: &VcardContact) -> Resu
         },
         None => None,
     };
-    if let Some(path) = path
-        && let Err(e) = set_profile_image(context, id, &AvatarAction::Change(path)).await
-    {
-        warn!(
-            context,
-            "import_vcard_contact: Could not set avatar for {}: {e:#}.", contact.addr
-        );
+    if let Some(path) = path {
+        // Currently this value doesn't matter as we don't import the contact of self.
+        let was_encrypted = false;
+        if let Err(e) =
+            set_profile_image(context, id, &AvatarAction::Change(path), was_encrypted).await
+        {
+            warn!(
+                context,
+                "import_vcard_contact: Could not set avatar for {}: {e:#}.", contact.addr
+            );
+        }
     }
     if let Some(biography) = &contact.biography
-        && let Err(e) = set_status(context, id, biography.to_owned()).await
+        && let Err(e) = set_status(context, id, biography.to_owned(), false, false).await
     {
         warn!(
             context,
@@ -981,22 +969,11 @@ impl Contact {
                         } else {
                             row_name
                         };
-                        let new_authname = if update_authname {
-                            name.to_string()
-                        } else {
-                            row_authname
-                        };
 
                         transaction.execute(
-                            "UPDATE contacts SET name=?, name_normalized=?, addr=?, origin=?, authname=? WHERE id=?",
+                            "UPDATE contacts SET name=?, addr=?, origin=?, authname=? WHERE id=?;",
                             (
-                                &new_name,
-                                normalize_text(
-                                    if !new_name.is_empty() {
-                                        &new_name
-                                    } else {
-                                        &new_authname
-                                    }),
+                                new_name,
                                 if update_addr {
                                     addr.to_string()
                                 } else {
@@ -1007,7 +984,11 @@ impl Contact {
                                 } else {
                                     row_origin
                                 },
-                                &new_authname,
+                                if update_authname {
+                                    name.to_string()
+                                } else {
+                                    row_authname
+                                },
                                 row_id,
                             ),
                         )?;
@@ -1019,18 +1000,18 @@ impl Contact {
                         sth_modified = Modifier::Modified;
                     }
                 } else {
+                    let update_name = manual;
+                    let update_authname = !manual;
+
                     transaction.execute(
-                        "
-INSERT INTO contacts (name, name_normalized, addr, fingerprint, origin, authname)
-VALUES (?, ?, ?, ?, ?, ?)
-                        ",
+                        "INSERT INTO contacts (name, addr, fingerprint, origin, authname)
+                         VALUES (?, ?, ?, ?, ?);",
                         (
-                            if manual { &name } else { "" },
-                            normalize_text(&name),
+                            if update_name { &name } else { "" },
                             &addr,
                             fingerprint,
                             origin,
-                            if manual { "" } else { &name },
+                            if update_authname { &name } else { "" },
                         ),
                     )?;
 
@@ -1133,19 +1114,17 @@ VALUES (?, ?, ?, ?, ?, ?)
             Origin::IncomingReplyTo
         };
         if query.is_some() {
-            let s3str_like_cmd = format!("%{}%", query.unwrap_or("").to_lowercase());
+            let s3str_like_cmd = format!("%{}%", query.unwrap_or(""));
             context
                 .sql
                 .query_map(
-                    "
-SELECT c.id, c.addr FROM contacts c
-WHERE c.id>?
-    AND (c.fingerprint='')=?
-    AND c.origin>=?
-    AND c.blocked=0
-    AND (IFNULL(c.name_normalized,IIF(c.name='',c.authname,c.name)) LIKE ? OR c.addr LIKE ?)
-ORDER BY c.last_seen DESC, c.id DESC
-                    ",
+                    "SELECT c.id, c.addr FROM contacts c
+                 WHERE c.id>?
+                 AND (c.fingerprint='')=?
+                 AND c.origin>=? \
+                 AND c.blocked=0 \
+                 AND (iif(c.name='',c.authname,c.name) LIKE ? OR c.addr LIKE ?) \
+                 ORDER BY c.last_seen DESC, c.id DESC;",
                     (
                         ContactId::LAST_SPECIAL,
                         flag_address,
@@ -1272,18 +1251,8 @@ ORDER BY c.last_seen DESC, c.id DESC
                     };
                     // Always do an update in case the blocking is reset or name is changed.
                     transaction.execute(
-                        "
-UPDATE contacts
-SET name=?, name_normalized=IIF(?1='',name_normalized,?), origin=?, blocked=1, fingerprint=?
-WHERE addr=?
-                        ",
-                        (
-                            &name,
-                            normalize_text(&name),
-                            Origin::MailinglistAddress,
-                            fingerprint,
-                            &grpid,
-                        ),
+                        "UPDATE contacts SET name=?, origin=?, blocked=1, fingerprint=? WHERE addr=?",
+                        (&name, Origin::MailinglistAddress, fingerprint, &grpid),
                     )?;
                 }
                 Ok(())
@@ -1538,6 +1507,18 @@ WHERE addr=?
         &self.addr
     }
 
+    /// Get authorized name or address.
+    ///
+    /// This string is suitable for sending over email
+    /// as it does not leak the locally set name.
+    pub(crate) fn get_authname_or_addr(&self) -> String {
+        if !self.authname.is_empty() {
+            (&self.authname).into()
+        } else {
+            (&self.addr).into()
+        }
+    }
+
     /// Get a summary of name and address.
     ///
     /// The returned string is either "Name (email@domain.com)" or just
@@ -1758,8 +1739,8 @@ fn update_chat_names(
         };
 
         let count = transaction.execute(
-            "UPDATE chats SET name=?1, name_normalized=?2 WHERE id=?3 AND name!=?1",
-            (&chat_name, normalize_text(&chat_name), chat_id),
+            "UPDATE chats SET name=?1 WHERE id=?2 AND name!=?1",
+            (chat_name, chat_id),
         )?;
 
         if count > 0 {
@@ -1853,19 +1834,25 @@ WHERE type=? AND id IN (
 /// The given profile image is expected to be already in the blob directory
 /// as profile images can be set only by receiving messages, this should be always the case, however.
 ///
-/// For contact SELF, the image is not saved in the contact-database but as Config::Selfavatar.
+/// For contact SELF, the image is not saved in the contact-database but as Config::Selfavatar;
+/// this typically happens if we see message with our own profile image.
 pub(crate) async fn set_profile_image(
     context: &Context,
     contact_id: ContactId,
     profile_image: &AvatarAction,
+    was_encrypted: bool,
 ) -> Result<()> {
     let mut contact = Contact::get_by_id(context, contact_id).await?;
     let changed = match profile_image {
         AvatarAction::Change(profile_image) => {
             if contact_id == ContactId::SELF {
-                context
-                    .set_config_ex(Nosync, Config::Selfavatar, Some(profile_image))
-                    .await?;
+                if was_encrypted {
+                    context
+                        .set_config_ex(Nosync, Config::Selfavatar, Some(profile_image))
+                        .await?;
+                } else {
+                    info!(context, "Do not use unencrypted selfavatar.");
+                }
             } else {
                 contact.param.set(Param::ProfileImage, profile_image);
             }
@@ -1873,9 +1860,13 @@ pub(crate) async fn set_profile_image(
         }
         AvatarAction::Delete => {
             if contact_id == ContactId::SELF {
-                context
-                    .set_config_ex(Nosync, Config::Selfavatar, None)
-                    .await?;
+                if was_encrypted {
+                    context
+                        .set_config_ex(Nosync, Config::Selfavatar, None)
+                        .await?;
+                } else {
+                    info!(context, "Do not use unencrypted selfavatar deletion.");
+                }
             } else {
                 contact.param.remove(Param::ProfileImage);
             }
@@ -1892,16 +1883,22 @@ pub(crate) async fn set_profile_image(
 
 /// Sets contact status.
 ///
-/// For contact SELF, the status is not saved in the contact table, but as Config::Selfstatus.
+/// For contact SELF, the status is not saved in the contact table, but as Config::Selfstatus.  This
+/// is only done if message is sent from Delta Chat and it is encrypted, to synchronize signature
+/// between Delta Chat devices.
 pub(crate) async fn set_status(
     context: &Context,
     contact_id: ContactId,
     status: String,
+    encrypted: bool,
+    has_chat_version: bool,
 ) -> Result<()> {
     if contact_id == ContactId::SELF {
-        context
-            .set_config_ex(Nosync, Config::Selfstatus, Some(&status))
-            .await?;
+        if encrypted && has_chat_version {
+            context
+                .set_config_ex(Nosync, Config::Selfstatus, Some(&status))
+                .await?;
+        }
     } else {
         let mut contact = Contact::get_by_id(context, contact_id).await?;
 

src/contact/contact_tests.rs

@@ -4,7 +4,7 @@ use super::*;
 use crate::chat::{Chat, get_chat_contacts, send_text_msg};
 use crate::chatlist::Chatlist;
 use crate::receive_imf::receive_imf;
-use crate::test_utils::{self, TestContext, TestContextManager, TimeShiftFalsePositiveNote, sync};
+use crate::test_utils::{self, TestContext, TestContextManager, TimeShiftFalsePositiveNote};
 
 #[test]
 fn test_contact_id_values() {
@@ -60,16 +60,16 @@ async fn test_get_contacts() -> Result<()> {
     let context = tcm.bob().await;
     let alice = tcm.alice().await;
     alice
-        .set_config(Config::Displayname, Some("MyNameIsΔ"))
+        .set_config(Config::Displayname, Some("MyName"))
         .await?;
 
     // Alice is not in the contacts yet.
     let contacts = Contact::get_all(&context.ctx, 0, Some("Alice")).await?;
     assert_eq!(contacts.len(), 0);
-    let contacts = Contact::get_all(&context.ctx, 0, Some("MyNameIsΔ")).await?;
+    let contacts = Contact::get_all(&context.ctx, 0, Some("MyName")).await?;
     assert_eq!(contacts.len(), 0);
 
-    let claire_id = Contact::create(&context, "Δ-someone", "claire@example.org").await?;
+    let claire_id = Contact::create(&context, "someone", "claire@example.org").await?;
     let dave_id = Contact::create(&context, "", "dave@example.org").await?;
 
     let id = context.add_or_lookup_contact_id(&alice).await;
@@ -77,8 +77,8 @@ async fn test_get_contacts() -> Result<()> {
 
     let contact = Contact::get_by_id(&context, id).await.unwrap();
     assert_eq!(contact.get_name(), "");
-    assert_eq!(contact.get_authname(), "MyNameIsΔ");
-    assert_eq!(contact.get_display_name(), "MyNameIsΔ");
+    assert_eq!(contact.get_authname(), "MyName");
+    assert_eq!(contact.get_display_name(), "MyName");
 
     // Search by name.
     let contacts = Contact::get_all(&context, 0, Some("myname")).await?;
@@ -93,12 +93,12 @@ async fn test_get_contacts() -> Result<()> {
     let contacts = Contact::get_all(&context, 0, Some("Foobar")).await?;
     assert_eq!(contacts.len(), 0);
 
-    // Set Alice name manually.
-    id.set_name(&context, "Δ-someone").await?;
+    // Set Alice name to "someone" manually.
+    id.set_name(&context, "someone").await?;
     let contact = Contact::get_by_id(&context.ctx, id).await.unwrap();
-    assert_eq!(contact.get_name(), "Δ-someone");
-    assert_eq!(contact.get_authname(), "MyNameIsΔ");
-    assert_eq!(contact.get_display_name(), "Δ-someone");
+    assert_eq!(contact.get_name(), "someone");
+    assert_eq!(contact.get_authname(), "MyName");
+    assert_eq!(contact.get_display_name(), "someone");
 
     // Not searchable by authname, because it is not displayed.
     let contacts = Contact::get_all(&context, 0, Some("MyName")).await?;
@@ -108,9 +108,7 @@ async fn test_get_contacts() -> Result<()> {
         info!(&context, "add_self={add_self}");
 
         // Search key-contacts by display name (same as manually set name).
-        let contacts = Contact::get_all(&context.ctx, add_self, Some("Δ-someone")).await?;
-        assert_eq!(contacts, vec![id]);
-        let contacts = Contact::get_all(&context.ctx, add_self, Some("δ-someon")).await?;
+        let contacts = Contact::get_all(&context.ctx, add_self, Some("someone")).await?;
         assert_eq!(contacts, vec![id]);
 
         // Get all key-contacts.
@@ -122,7 +120,7 @@ async fn test_get_contacts() -> Result<()> {
     }
 
     // Search address-contacts by display name.
-    let contacts = Contact::get_all(&context, constants::DC_GCL_ADDRESS, Some("Δ-someone")).await?;
+    let contacts = Contact::get_all(&context, constants::DC_GCL_ADDRESS, Some("someone")).await?;
     assert_eq!(contacts, vec![claire_id]);
 
     // Get all address-contacts. Newer contacts go first.
@@ -136,16 +134,6 @@ async fn test_get_contacts() -> Result<()> {
     .await?;
     assert_eq!(contacts, vec![dave_id, claire_id, ContactId::SELF]);
 
-    // Reset the user-provided name for Alice.
-    id.set_name(&context, "").await?;
-    let contact = Contact::get_by_id(&context.ctx, id).await.unwrap();
-    assert_eq!(contact.get_name(), "");
-    assert_eq!(contact.get_authname(), "MyNameIsΔ");
-    assert_eq!(contact.get_display_name(), "MyNameIsΔ");
-    let contacts = Contact::get_all(&context, 0, Some("MyName")).await?;
-    assert_eq!(contacts.len(), 1);
-    let contacts = Contact::get_all(&context, 0, Some("δ")).await?;
-    assert_eq!(contacts.len(), 1);
     Ok(())
 }
 
@@ -862,7 +850,8 @@ CCCB 5AA9 F6E1 141C 9431
     Ok(())
 }
 
-/// Tests that self-status is not synchronized from outgoing messages.
+/// Tests that status is synchronized when sending encrypted BCC-self messages and not
+/// synchronized when the message is not encrypted.
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_synchronize_status() -> Result<()> {
     let mut tcm = TestContextManager::new();
@@ -881,12 +870,21 @@ async fn test_synchronize_status() -> Result<()> {
         .await?;
     let chat = alice1.create_email_chat(bob).await;
 
-    // Alice sends an unencrypted message to Bob from the first device.
+    // Alice sends a message to Bob from the first device.
     send_text_msg(alice1, chat.id, "Hello".to_string()).await?;
     let sent_msg = alice1.pop_sent_msg().await;
 
+    // Message is not encrypted.
+    let message = sent_msg.load_from_db().await;
+    assert!(!message.get_showpadlock());
+
     // Alice's second devices receives a copy of outgoing message.
     alice2.recv_msg(&sent_msg).await;
+
+    // Bob receives message.
+    bob.recv_msg(&sent_msg).await;
+
+    // Message was not encrypted, so status is not copied.
     assert_eq!(alice2.get_config(Config::Selfstatus).await?, default_status);
 
     // Alice sends encrypted message.
@@ -894,9 +892,17 @@ async fn test_synchronize_status() -> Result<()> {
     send_text_msg(alice1, chat.id, "Hello".to_string()).await?;
     let sent_msg = alice1.pop_sent_msg().await;
 
+    // Second message is encrypted.
+    let message = sent_msg.load_from_db().await;
+    assert!(message.get_showpadlock());
+
     // Alice's second devices receives a copy of second outgoing message.
     alice2.recv_msg(&sent_msg).await;
-    assert_eq!(alice2.get_config(Config::Selfstatus).await?, default_status);
+
+    assert_eq!(
+        alice2.get_config(Config::Selfstatus).await?,
+        Some("New status".to_string())
+    );
 
     Ok(())
 }
@@ -909,9 +915,9 @@ async fn test_selfavatar_changed_event() -> Result<()> {
     // Alice has two devices.
     let alice1 = &tcm.alice().await;
     let alice2 = &tcm.alice().await;
-    for a in [alice1, alice2] {
-        a.set_config_bool(Config::SyncMsgs, true).await?;
-    }
+
+    // Bob has one device.
+    let bob = &tcm.bob().await;
 
     assert_eq!(alice1.get_config(Config::Selfavatar).await?, None);
 
@@ -927,7 +933,17 @@ async fn test_selfavatar_changed_event() -> Result<()> {
         .get_matching(|e| matches!(e, EventType::SelfavatarChanged))
         .await;
 
-    sync(alice1, alice2).await;
+    // Alice sends a message.
+    let alice1_chat_id = alice1.create_chat(bob).await.id;
+    send_text_msg(alice1, alice1_chat_id, "Hello".to_string()).await?;
+    let sent_msg = alice1.pop_sent_msg().await;
+
+    // The message is encrypted.
+    let message = sent_msg.load_from_db().await;
+    assert!(message.get_showpadlock());
+
+    // Alice's second device receives a copy of the outgoing message.
+    alice2.recv_msg(&sent_msg).await;
 
     // Alice's second device applies the selfavatar.
     assert!(alice2.get_config(Config::Selfavatar).await?.is_some());

src/context.rs

@@ -5,7 +5,7 @@ use std::ffi::OsString;
 use std::ops::Deref;
 use std::path::{Path, PathBuf};
 use std::sync::atomic::AtomicBool;
-use std::sync::{Arc, OnceLock, Weak};
+use std::sync::{Arc, OnceLock};
 use std::time::Duration;
 
 use anyhow::{Context as _, Result, bail, ensure};
@@ -23,6 +23,7 @@ use crate::imap::{FolderMeaning, Imap, ServerMetadata};
 use crate::key::self_fingerprint;
 use crate::log::warn;
 use crate::logged_debug_assert;
+use crate::login_param::EnteredLoginParam;
 use crate::message::{self, MessageState, MsgId};
 use crate::net::tls::TlsSessionStore;
 use crate::peer_channels::Iroh;
@@ -45,7 +46,7 @@ use crate::{chatlist_events, stats};
 ///
 /// # Examples
 ///
-/// Creating a new database:
+/// Creating a new unencrypted database:
 ///
 /// ```
 /// # let rt = tokio::runtime::Runtime::new().unwrap();
@@ -60,6 +61,24 @@ use crate::{chatlist_events, stats};
 /// drop(context);
 /// # });
 /// ```
+///
+/// To use an encrypted database provide a password.  If the database does not yet exist it
+/// will be created:
+///
+/// ```
+/// # let rt = tokio::runtime::Runtime::new().unwrap();
+/// # rt.block_on(async move {
+/// use deltachat::context::ContextBuilder;
+///
+/// let dir = tempfile::tempdir().unwrap();
+/// let context = ContextBuilder::new(dir.path().join("db"))
+///      .with_password("secret".into())
+///      .open()
+///      .await
+///      .unwrap();
+/// drop(context);
+/// # });
+/// ```
 #[derive(Clone, Debug)]
 pub struct ContextBuilder {
     dbfile: PathBuf,
@@ -131,13 +150,9 @@ impl ContextBuilder {
     }
 
     /// Sets the password to unlock the database.
-    /// Deprecated 2025-11:
-    /// - Db encryption does nothing with blobs, so fs/disk encryption is recommended.
-    /// - Isolation from other apps is needed anyway.
     ///
     /// If an encrypted database is used it must be opened with a password.  Setting a
     /// password on a new database will enable encryption.
-    #[deprecated(since = "TBD")]
     pub fn with_password(mut self, password: String) -> Self {
         self.password = Some(password);
         self
@@ -165,7 +180,7 @@ impl ContextBuilder {
 
     /// Builds the [`Context`] and opens it.
     ///
-    /// Returns error if context cannot be opened.
+    /// Returns error if context cannot be opened with the given passphrase.
     pub async fn open(self) -> Result<Context> {
         let password = self.password.clone().unwrap_or_default();
         let context = self.build().await?;
@@ -200,25 +215,6 @@ impl Deref for Context {
     }
 }
 
-/// A weak reference to a [`Context`]
-///
-/// Can be used to obtain a [`Context`]. An existing weak reference does not prevent the corresponding [`Context`] from being dropped.
-#[derive(Clone, Debug)]
-pub(crate) struct WeakContext {
-    inner: Weak<InnerContext>,
-}
-
-impl WeakContext {
-    /// Returns the [`Context`] if it is still available.
-    pub(crate) fn upgrade(&self) -> Result<Context> {
-        let inner = self
-            .inner
-            .upgrade()
-            .ok_or_else(|| anyhow::anyhow!("Inner struct has been dropped"))?;
-        Ok(Context { inner })
-    }
-}
-
 /// Actual context, expensive to clone.
 #[derive(Debug)]
 pub struct InnerContext {
@@ -403,20 +399,10 @@ impl Context {
         Ok(context)
     }
 
-    /// Returns a weak reference to this [`Context`].
-    pub(crate) fn get_weak_context(&self) -> WeakContext {
-        WeakContext {
-            inner: Arc::downgrade(&self.inner),
-        }
-    }
-
     /// Opens the database with the given passphrase.
-    /// NB: Db encryption is deprecated, so `passphrase` should be empty normally. See
-    /// [`ContextBuilder::with_password()`] for reasoning.
     ///
     /// Returns true if passphrase is correct, false is passphrase is not correct. Fails on other
     /// errors.
-    #[deprecated(since = "TBD")]
     pub async fn open(&self, passphrase: String) -> Result<bool> {
         if self.sql.check_passphrase(passphrase.clone()).await? {
             self.sql.open(self, passphrase).await?;
@@ -427,7 +413,6 @@ impl Context {
     }
 
     /// Changes encrypted database passphrase.
-    /// Deprecated 2025-11, see [`ContextBuilder::with_password()`] for reasoning.
     pub async fn change_passphrase(&self, passphrase: String) -> Result<()> {
         self.sql.change_passphrase(passphrase).await?;
         Ok(())
@@ -478,7 +463,7 @@ impl Context {
             translated_stockstrings: stockstrings,
             events,
             scheduler: SchedulerState::new(),
-            ratelimit: RwLock::new(Ratelimit::new(Duration::new(3, 0), 3.0)), // Allow at least 1 message every second + a burst of 3.
+            ratelimit: RwLock::new(Ratelimit::new(Duration::new(60, 0), 6.0)), // Allow at least 1 message every 10 seconds + a burst of 6.
             quota: RwLock::new(None),
             new_msgs_notify,
             server_id: RwLock::new(None),
@@ -510,6 +495,12 @@ impl Context {
             return;
         }
 
+        if self.is_chatmail().await.unwrap_or_default() {
+            let mut lock = self.ratelimit.write().await;
+            // Allow at least 1 message every second + a burst of 3.
+            *lock = Ratelimit::new(Duration::new(3, 0), 3.0);
+        }
+
         // The next line is mainly for iOS:
         // iOS starts a separate process for receiving notifications and if the user concurrently
         // starts the app, the UI process opens the database but waits with calling start_io()
@@ -815,17 +806,11 @@ impl Context {
 
     /// Returns information about the context as key-value pairs.
     pub async fn get_info(&self) -> Result<BTreeMap<&'static str, String>> {
-        let secondary_addrs = self.get_secondary_self_addrs().await?.join(", ");
-        let all_transports: Vec<String> = ConfiguredLoginParam::load_all(self)
+        let l = EnteredLoginParam::load(self).await?;
+        let l2 = ConfiguredLoginParam::load(self)
             .await?
-            .into_iter()
-            .map(|(transport_id, param)| format!("{transport_id}: {param}"))
-            .collect();
-        let all_transports = if all_transports.is_empty() {
-            "Not configured".to_string()
-        } else {
-            all_transports.join(",")
-        };
+            .map_or_else(|| "Not configured".to_string(), |param| param.to_string());
+        let secondary_addrs = self.get_secondary_self_addrs().await?.join(", ");
         let chats = get_chat_cnt(self).await?;
         let unblocked_msgs = message::get_unblocked_msg_cnt(self).await;
         let request_msgs = message::get_request_msg_cnt(self).await;
@@ -904,7 +889,8 @@ impl Context {
                 .unwrap_or_else(|| "<unset>".to_string()),
         );
         res.insert("proxy_enabled", proxy_enabled.to_string());
-        res.insert("used_transport_settings", all_transports);
+        res.insert("entered_account_settings", l.to_string());
+        res.insert("used_account_settings", l2);
 
         if let Some(server_id) = &*self.server_id.read().await {
             res.insert("imap_server_id", format!("{server_id:?}"));

src/download.rs

@@ -153,15 +153,11 @@ pub(crate) async fn download_msg(
         return Ok(());
     };
 
-    let transport_id = session.transport_id();
     let row = context
         .sql
         .query_row_optional(
-            "SELECT uid, folder FROM imap
-             WHERE rfc724_mid=?
-             AND transport_id=?
-             AND target!=''",
-            (&msg.rfc724_mid, transport_id),
+            "SELECT uid, folder FROM imap WHERE rfc724_mid=? AND target!=''",
+            (&msg.rfc724_mid,),
             |row| {
                 let server_uid: u32 = row.get(0)?;
                 let server_folder: String = row.get(1)?;

src/e2ee.rs

@@ -8,27 +8,33 @@ use mail_builder::mime::MimePart;
 use crate::aheader::{Aheader, EncryptPreference};
 use crate::context::Context;
 use crate::key::{SignedPublicKey, load_self_public_key, load_self_secret_key};
-use crate::pgp::{self, SeipdVersion};
+use crate::pgp;
 
 #[derive(Debug)]
 pub struct EncryptHelper {
+    pub prefer_encrypt: EncryptPreference,
     pub addr: String,
     pub public_key: SignedPublicKey,
 }
 
 impl EncryptHelper {
     pub async fn new(context: &Context) -> Result<EncryptHelper> {
+        let prefer_encrypt = EncryptPreference::Mutual;
         let addr = context.get_primary_self_addr().await?;
         let public_key = load_self_public_key(context).await?;
 
-        Ok(EncryptHelper { addr, public_key })
+        Ok(EncryptHelper {
+            prefer_encrypt,
+            addr,
+            public_key,
+        })
     }
 
     pub fn get_aheader(&self) -> Aheader {
         Aheader {
             addr: self.addr.clone(),
             public_key: self.public_key.clone(),
-            prefer_encrypt: EncryptPreference::Mutual,
+            prefer_encrypt: self.prefer_encrypt,
             verified: false,
         }
     }
@@ -41,7 +47,6 @@ impl EncryptHelper {
         mail_to_encrypt: MimePart<'static>,
         compress: bool,
         anonymous_recipients: bool,
-        seipd_version: SeipdVersion,
     ) -> Result<String> {
         let sign_key = load_self_secret_key(context).await?;
 
@@ -52,10 +57,9 @@ impl EncryptHelper {
         let ctext = pgp::pk_encrypt(
             raw_message,
             keyring,
-            sign_key,
+            Some(sign_key),
             compress,
             anonymous_recipients,
-            seipd_version,
         )
         .await?;
 

src/ephemeral/ephemeral_tests.rs

@@ -451,8 +451,6 @@ async fn test_delete_expired_imap_messages() -> Result<()> {
     let t = TestContext::new_alice().await;
     const HOUR: i64 = 60 * 60;
     let now = time();
-    let transport_id = 1;
-    let uidvalidity = 12345;
     for (id, timestamp, ephemeral_timestamp) in &[
         (900, now - 2 * HOUR, 0),
         (1000, now - 23 * HOUR - MIN_DELETE_SERVER_AFTER, 0),
@@ -472,8 +470,8 @@ async fn test_delete_expired_imap_messages() -> Result<()> {
                .await?;
         t.sql
             .execute(
-                "INSERT INTO imap (transport_id, rfc724_mid, folder, uid, target, uidvalidity) VALUES (?, ?,'INBOX',?, 'INBOX', ?);",
-                (transport_id, &message_id, id, uidvalidity),
+                "INSERT INTO imap (rfc724_mid, folder, uid, target) VALUES (?,'INBOX',?, 'INBOX');",
+                (&message_id, id),
             )
             .await?;
     }

src/events/chatlist_events.rs

@@ -30,10 +30,9 @@ pub(crate) async fn emit_chatlist_item_changed_for_contact_chat(
     match ChatId::lookup_by_contact(context, contact_id).await {
         Ok(Some(chat_id)) => self::emit_chatlist_item_changed(context, chat_id),
         Ok(None) => {}
-        Err(error) => error!(
-            context,
+        Err(error) => context.emit_event(EventType::Error(format!(
             "failed to find chat id for contact for chatlist event: {error:?}"
-        ),
+        ))),
     }
 }
 

src/events/payload.rs

@@ -243,7 +243,7 @@ pub enum EventType {
         /// Progress.
         ///
         /// 0=error, 1-999=progress in permille, 1000=success and done
-        progress: u16,
+        progress: usize,
 
         /// Progress comment or error, something to display to the user.
         comment: Option<String>,
@@ -253,7 +253,7 @@ pub enum EventType {
     ///
     /// @param data1 (usize) 0=error, 1-999=progress in permille, 1000=success and done
     /// @param data2 0
-    ImexProgress(u16),
+    ImexProgress(usize),
 
     /// A file has been exported. A file has been written by imex().
     /// This event may be sent multiple times by a single call to imex().
@@ -280,7 +280,7 @@ pub enum EventType {
         chat_type: Chattype,
 
         /// Progress, always 1000.
-        progress: u16,
+        progress: usize,
     },
 
     /// Progress information of a secure-join handshake from the view of the joiner
@@ -295,7 +295,7 @@ pub enum EventType {
         /// 400=vg-/vc-request-with-auth sent, typically shown as "alice@addr verified, introducing myself."
         /// (Bob has verified alice and waits until Alice does the same for him)
         /// 1000=vg-member-added/vc-contact-confirm received
-        progress: u16,
+        progress: usize,
     },
 
     /// The connectivity to the server changed.
@@ -417,15 +417,6 @@ pub enum EventType {
         chat_id: ChatId,
     },
 
-    /// One or more transports has changed.
-    ///
-    /// This event is used for tests to detect when transport
-    /// synchronization messages arrives.
-    /// UIs don't need to use it, it is unlikely
-    /// that user modifies transports on multiple
-    /// devices simultaneously.
-    TransportsModified,
-
     /// Event for using in tests, e.g. as a fence between normally generated events.
     #[cfg(test)]
     Test,

src/imap.rs

@@ -71,15 +71,10 @@ const BODY_PARTIAL: &str = "(FLAGS RFC822.SIZE BODY.PEEK[HEADER])";
 
 #[derive(Debug)]
 pub(crate) struct Imap {
-    /// ID of the transport configuration in the `transports` table.
-    ///
-    /// This ID is used to namespace records in the `imap` table.
-    transport_id: u32,
-
     pub(crate) idle_interrupt_receiver: Receiver<()>,
 
     /// Email address.
-    pub(crate) addr: String,
+    addr: String,
 
     /// Login parameters.
     lp: Vec<ConfiguredServerLoginParam>,
@@ -123,7 +118,7 @@ struct OAuth2 {
     access_token: String,
 }
 
-#[derive(Debug, Default)]
+#[derive(Debug)]
 pub(crate) struct ServerMetadata {
     /// IMAP METADATA `/shared/comment` as defined in
     /// <https://www.rfc-editor.org/rfc/rfc5464#section-6.2.1>.
@@ -254,21 +249,19 @@ impl<T: Iterator<Item = (i64, u32, String)>> Iterator for UidGrouper<T> {
 
 impl Imap {
     /// Creates new disconnected IMAP client using the specific login parameters.
-    pub async fn new(
-        context: &Context,
-        transport_id: u32,
-        param: ConfiguredLoginParam,
+    ///
+    /// `addr` is used to renew token if OAuth2 authentication is used.
+    pub fn new(
+        lp: Vec<ConfiguredServerLoginParam>,
+        password: String,
+        proxy_config: Option<ProxyConfig>,
+        addr: &str,
+        strict_tls: bool,
+        oauth2: bool,
         idle_interrupt_receiver: Receiver<()>,
-    ) -> Result<Self> {
-        let lp = param.imap.clone();
-        let password = param.imap_password.clone();
-        let proxy_config = ProxyConfig::load(context).await?;
-        let addr = &param.addr;
-        let strict_tls = param.strict_tls(proxy_config.is_some());
-        let oauth2 = param.oauth2;
+    ) -> Self {
         let (resync_request_sender, resync_request_receiver) = async_channel::bounded(1);
-        Ok(Imap {
-            transport_id,
+        Imap {
             idle_interrupt_receiver,
             addr: addr.to_string(),
             lp,
@@ -284,7 +277,7 @@ impl Imap {
             ratelimit: Ratelimit::new(Duration::new(120, 0), 2.0),
             resync_request_sender,
             resync_request_receiver,
-        })
+        }
     }
 
     /// Creates new disconnected IMAP client using configured parameters.
@@ -292,10 +285,20 @@ impl Imap {
         context: &Context,
         idle_interrupt_receiver: Receiver<()>,
     ) -> Result<Self> {
-        let (transport_id, param) = ConfiguredLoginParam::load(context)
+        let param = ConfiguredLoginParam::load(context)
             .await?
             .context("Not configured")?;
-        let imap = Self::new(context, transport_id, param, idle_interrupt_receiver).await?;
+        let proxy_config = ProxyConfig::load(context).await?;
+        let strict_tls = param.strict_tls(proxy_config.is_some());
+        let imap = Self::new(
+            param.imap.clone(),
+            param.imap_password.clone(),
+            proxy_config,
+            &param.addr,
+            strict_tls,
+            param.oauth2,
+            idle_interrupt_receiver,
+        );
         Ok(imap)
     }
 
@@ -409,19 +412,9 @@ impl Imap {
                             })
                             .await
                             .context("Failed to enable IMAP compression")?;
-                        Session::new(
-                            compressed_session,
-                            capabilities,
-                            resync_request_sender,
-                            self.transport_id,
-                        )
+                        Session::new(compressed_session, capabilities, resync_request_sender)
                     } else {
-                        Session::new(
-                            session,
-                            capabilities,
-                            resync_request_sender,
-                            self.transport_id,
-                        )
+                        Session::new(session, capabilities, resync_request_sender)
                     };
 
                     // Store server ID in the context to display in account info.
@@ -600,9 +593,8 @@ impl Imap {
         folder: &str,
         folder_meaning: FolderMeaning,
     ) -> Result<(usize, bool)> {
-        let transport_id = self.transport_id;
-        let uid_validity = get_uidvalidity(context, transport_id, folder).await?;
-        let old_uid_next = get_uid_next(context, transport_id, folder).await?;
+        let uid_validity = get_uidvalidity(context, folder).await?;
+        let old_uid_next = get_uid_next(context, folder).await?;
         info!(
             context,
             "fetch_new_msg_batch({folder}): UIDVALIDITY={uid_validity}, UIDNEXT={old_uid_next}."
@@ -670,19 +662,12 @@ impl Imap {
             context
                 .sql
                 .execute(
-                    "INSERT INTO imap (transport_id, rfc724_mid, folder, uid, uidvalidity, target)
-                       VALUES         (?,            ?,          ?,      ?,   ?,           ?)
-                       ON CONFLICT(transport_id, folder, uid, uidvalidity)
+                    "INSERT INTO imap (rfc724_mid, folder, uid, uidvalidity, target)
+                       VALUES         (?1,         ?2,     ?3,  ?4,          ?5)
+                       ON CONFLICT(folder, uid, uidvalidity)
                        DO UPDATE SET rfc724_mid=excluded.rfc724_mid,
                                      target=excluded.target",
-                    (
-                        self.transport_id,
-                        &message_id,
-                        &folder,
-                        uid,
-                        uid_validity,
-                        target,
-                    ),
+                    (&message_id, &folder, uid, uid_validity, target),
                 )
                 .await?;
 
@@ -793,7 +778,7 @@ impl Imap {
             prefetch_uid_next < mailbox_uid_next
         };
         if new_uid_next > old_uid_next {
-            set_uid_next(context, self.transport_id, folder, new_uid_next).await?;
+            set_uid_next(context, folder, new_uid_next).await?;
         }
 
         info!(context, "{} mails read from \"{}\".", read_cnt, folder);
@@ -873,7 +858,6 @@ impl Session {
         let folder_exists = self
             .select_with_uidvalidity(context, folder, create)
             .await?;
-        let transport_id = self.transport_id();
         if folder_exists {
             let mut list = self
                 .uid_fetch("1:*", RFC724MID_UID)
@@ -906,7 +890,7 @@ impl Session {
                 msgs.len(),
             );
 
-            uid_validity = get_uidvalidity(context, transport_id, folder).await?;
+            uid_validity = get_uidvalidity(context, folder).await?;
         } else {
             warn!(context, "resync_folder_uids: No folder {folder}.");
             uid_validity = 0;
@@ -916,17 +900,17 @@ impl Session {
         context
             .sql
             .transaction(move |transaction| {
-                transaction.execute("DELETE FROM imap WHERE transport_id=? AND folder=?", (transport_id, folder,))?;
+                transaction.execute("DELETE FROM imap WHERE folder=?", (folder,))?;
                 for (uid, (rfc724_mid, target)) in &msgs {
                     // This may detect previously undetected moved
                     // messages, so we update server_folder too.
                     transaction.execute(
-                        "INSERT INTO imap (transport_id, rfc724_mid, folder, uid, uidvalidity, target)
-                         VALUES           (?,            ?,          ?,      ?,   ?,           ?)
-                         ON CONFLICT(transport_id, folder, uid, uidvalidity)
+                        "INSERT INTO imap (rfc724_mid, folder, uid, uidvalidity, target)
+                         VALUES           (?1,         ?2,     ?3,  ?4,          ?5)
+                         ON CONFLICT(folder, uid, uidvalidity)
                          DO UPDATE SET rfc724_mid=excluded.rfc724_mid,
                                        target=excluded.target",
-                        (transport_id, rfc724_mid, folder, uid, uid_validity, target),
+                        (rfc724_mid, folder, uid, uid_validity, target),
                     )?;
                 }
                 Ok(())
@@ -1054,16 +1038,14 @@ impl Session {
     ///
     /// This is the only place where messages are moved or deleted on the IMAP server.
     async fn move_delete_messages(&mut self, context: &Context, folder: &str) -> Result<()> {
-        let transport_id = self.transport_id();
         let rows = context
             .sql
             .query_map_vec(
                 "SELECT id, uid, target FROM imap
-                 WHERE folder = ?
-                 AND transport_id = ?
-                 AND target != folder
-                 ORDER BY target, uid",
-                (folder, transport_id),
+        WHERE folder = ?
+        AND target != folder
+        ORDER BY target, uid",
+                (folder,),
                 |row| {
                     let rowid: i64 = row.get(0)?;
                     let uid: u32 = row.get(1)?;
@@ -1250,12 +1232,11 @@ impl Session {
             return Ok(());
         }
 
-        let transport_id = self.transport_id();
         let mut updated_chat_ids = BTreeSet::new();
-        let uid_validity = get_uidvalidity(context, transport_id, folder)
+        let uid_validity = get_uidvalidity(context, folder)
             .await
             .with_context(|| format!("failed to get UID validity for folder {folder}"))?;
-        let mut highest_modseq = get_modseq(context, transport_id, folder)
+        let mut highest_modseq = get_modseq(context, folder)
             .await
             .with_context(|| format!("failed to get MODSEQ for folder {folder}"))?;
         let mut list = self
@@ -1279,10 +1260,10 @@ impl Session {
             };
             let is_seen = fetch.flags().any(|flag| flag == Flag::Seen);
             if is_seen
-                && let Some(chat_id) = mark_seen_by_uid(context, transport_id, folder, uid_validity, uid)
+                && let Some(chat_id) = mark_seen_by_uid(context, folder, uid_validity, uid)
                     .await
                     .with_context(|| {
-                        format!("Transport {transport_id}: Failed to update seen status for msg {folder}/{uid}")
+                        format!("failed to update seen status for msg {folder}/{uid}")
                     })?
             {
                 updated_chat_ids.insert(chat_id);
@@ -1306,7 +1287,7 @@ impl Session {
             self.new_mail = true;
         }
 
-        set_modseq(context, transport_id, folder, highest_modseq)
+        set_modseq(context, folder, highest_modseq)
             .await
             .with_context(|| format!("failed to set MODSEQ for folder {folder}"))?;
         if !updated_chat_ids.is_empty() {
@@ -1548,17 +1529,17 @@ impl Session {
         Ok(())
     }
 
-    /// Retrieves server metadata if it is supported, otherwise uses fallback one.
+    /// Retrieves server metadata if it is supported.
     ///
     /// We get [`/shared/comment`](https://www.rfc-editor.org/rfc/rfc5464#section-6.2.1)
     /// and [`/shared/admin`](https://www.rfc-editor.org/rfc/rfc5464#section-6.2.2)
     /// metadata.
-    pub(crate) async fn update_metadata(&mut self, context: &Context) -> Result<()> {
-        let mut lock = context.metadata.write().await;
-
+    pub(crate) async fn fetch_metadata(&mut self, context: &Context) -> Result<()> {
         if !self.can_metadata() {
-            *lock = Some(Default::default());
+            return Ok(());
         }
+
+        let mut lock = context.metadata.write().await;
         if let Some(ref mut old_metadata) = *lock {
             let now = time();
 
@@ -1567,33 +1548,31 @@ impl Session {
                 return Ok(());
             }
 
+            info!(context, "ICE servers expired, requesting new credentials.");
+            let mailbox = "";
+            let options = "";
+            let metadata = self
+                .get_metadata(mailbox, options, "(/shared/vendor/deltachat/turn)")
+                .await?;
             let mut got_turn_server = false;
-            if self.can_metadata() {
-                info!(context, "ICE servers expired, requesting new credentials.");
-                let mailbox = "";
-                let options = "";
-                let metadata = self
-                    .get_metadata(mailbox, options, "(/shared/vendor/deltachat/turn)")
-                    .await?;
-                for m in metadata {
-                    if m.entry == "/shared/vendor/deltachat/turn"
-                        && let Some(value) = m.value
-                    {
-                        match create_ice_servers_from_metadata(context, &value).await {
-                            Ok((parsed_timestamp, parsed_ice_servers)) => {
-                                old_metadata.ice_servers_expiration_timestamp = parsed_timestamp;
-                                old_metadata.ice_servers = parsed_ice_servers;
-                                got_turn_server = true;
-                            }
-                            Err(err) => {
-                                warn!(context, "Failed to parse TURN server metadata: {err:#}.");
-                            }
+            for m in metadata {
+                if m.entry == "/shared/vendor/deltachat/turn"
+                    && let Some(value) = m.value
+                {
+                    match create_ice_servers_from_metadata(context, &value).await {
+                        Ok((parsed_timestamp, parsed_ice_servers)) => {
+                            old_metadata.ice_servers_expiration_timestamp = parsed_timestamp;
+                            old_metadata.ice_servers = parsed_ice_servers;
+                            got_turn_server = false;
+                        }
+                        Err(err) => {
+                            warn!(context, "Failed to parse TURN server metadata: {err:#}.");
                         }
                     }
                 }
             }
+
             if !got_turn_server {
-                info!(context, "Will use fallback ICE servers.");
                 // Set expiration timestamp 7 days in the future so we don't request it again.
                 old_metadata.ice_servers_expiration_timestamp = time() + 3600 * 24 * 7;
                 old_metadata.ice_servers = create_fallback_ice_servers(context).await?;
@@ -2361,7 +2340,6 @@ pub(crate) async fn prefetch_should_download(
 /// Returns updated chat ID if any message was marked as seen.
 async fn mark_seen_by_uid(
     context: &Context,
-    transport_id: u32,
     folder: &str,
     uid_validity: u32,
     uid: u32,
@@ -2372,13 +2350,12 @@ async fn mark_seen_by_uid(
             "SELECT id, chat_id FROM msgs
                  WHERE id > 9 AND rfc724_mid IN (
                    SELECT rfc724_mid FROM imap
-                   WHERE transport_id=?
-                   AND folder=?
-                   AND uidvalidity=?
-                   AND uid=?
+                   WHERE folder=?1
+                   AND uidvalidity=?2
+                   AND uid=?3
                    LIMIT 1
                  )",
-            (transport_id, &folder, uid_validity, uid),
+            (&folder, uid_validity, uid),
             |row| {
                 let msg_id: MsgId = row.get(0)?;
                 let chat_id: ChatId = row.get(1)?;
@@ -2440,18 +2417,13 @@ pub(crate) async fn markseen_on_imap_table(context: &Context, message_id: &str)
 /// uid_next is the next unique identifier value from the last time we fetched a folder
 /// See <https://tools.ietf.org/html/rfc3501#section-2.3.1.1>
 /// This function is used to update our uid_next after fetching messages.
-pub(crate) async fn set_uid_next(
-    context: &Context,
-    transport_id: u32,
-    folder: &str,
-    uid_next: u32,
-) -> Result<()> {
+pub(crate) async fn set_uid_next(context: &Context, folder: &str, uid_next: u32) -> Result<()> {
     context
         .sql
         .execute(
-            "INSERT INTO imap_sync (transport_id, folder, uid_next) VALUES (?, ?,?)
-                ON CONFLICT(transport_id, folder) DO UPDATE SET uid_next=excluded.uid_next",
-            (transport_id, folder, uid_next),
+            "INSERT INTO imap_sync (folder, uid_next) VALUES (?,?)
+                ON CONFLICT(folder) DO UPDATE SET uid_next=excluded.uid_next",
+            (folder, uid_next),
         )
         .await?;
     Ok(())
@@ -2462,69 +2434,57 @@ pub(crate) async fn set_uid_next(
 /// This method returns the uid_next from the last time we fetched messages.
 /// We can compare this to the current uid_next to find out whether there are new messages
 /// and fetch from this value on to get all new messages.
-async fn get_uid_next(context: &Context, transport_id: u32, folder: &str) -> Result<u32> {
+async fn get_uid_next(context: &Context, folder: &str) -> Result<u32> {
     Ok(context
         .sql
-        .query_get_value(
-            "SELECT uid_next FROM imap_sync WHERE transport_id=? AND folder=?",
-            (transport_id, folder),
-        )
+        .query_get_value("SELECT uid_next FROM imap_sync WHERE folder=?;", (folder,))
         .await?
         .unwrap_or(0))
 }
 
 pub(crate) async fn set_uidvalidity(
     context: &Context,
-    transport_id: u32,
     folder: &str,
     uidvalidity: u32,
 ) -> Result<()> {
     context
         .sql
         .execute(
-            "INSERT INTO imap_sync (transport_id, folder, uidvalidity) VALUES (?,?,?)
-                ON CONFLICT(transport_id, folder) DO UPDATE SET uidvalidity=excluded.uidvalidity",
-            (transport_id, folder, uidvalidity),
+            "INSERT INTO imap_sync (folder, uidvalidity) VALUES (?,?)
+                ON CONFLICT(folder) DO UPDATE SET uidvalidity=excluded.uidvalidity",
+            (folder, uidvalidity),
         )
         .await?;
     Ok(())
 }
 
-async fn get_uidvalidity(context: &Context, transport_id: u32, folder: &str) -> Result<u32> {
+async fn get_uidvalidity(context: &Context, folder: &str) -> Result<u32> {
     Ok(context
         .sql
         .query_get_value(
-            "SELECT uidvalidity FROM imap_sync WHERE transport_id=? AND folder=?",
-            (transport_id, folder),
+            "SELECT uidvalidity FROM imap_sync WHERE folder=?;",
+            (folder,),
         )
         .await?
         .unwrap_or(0))
 }
 
-pub(crate) async fn set_modseq(
-    context: &Context,
-    transport_id: u32,
-    folder: &str,
-    modseq: u64,
-) -> Result<()> {
+pub(crate) async fn set_modseq(context: &Context, folder: &str, modseq: u64) -> Result<()> {
     context
         .sql
         .execute(
-            "INSERT INTO imap_sync (transport_id, folder, modseq) VALUES (?,?,?)
-                ON CONFLICT(transport_id, folder) DO UPDATE SET modseq=excluded.modseq",
-            (transport_id, folder, modseq),
+            "INSERT INTO imap_sync (folder, modseq) VALUES (?,?)
+                ON CONFLICT(folder) DO UPDATE SET modseq=excluded.modseq",
+            (folder, modseq),
         )
         .await?;
     Ok(())
 }
 
-async fn get_modseq(context: &Context, transport_id: u32, folder: &str) -> Result<u64> {
+async fn get_modseq(context: &Context, folder: &str) -> Result<u64> {
     Ok(context
         .sql
-        .query_get_value(
-            "SELECT modseq FROM imap_sync WHERE transport_id=? AND folder=?",
-            (transport_id, folder),
-        )
+        .query_get_value("SELECT modseq FROM imap_sync WHERE folder=?;", (folder,))
         .await?
         .unwrap_or(0))
 }

src/imap/client.rs

@@ -207,7 +207,6 @@ impl Client {
         hostname: &str,
         strict_tls: bool,
     ) -> Result<Self> {
-        let use_sni = true;
         let tcp_stream = connect_tcp_inner(addr).await?;
         let account_id = context.get_id();
         let events = context.events.clone();
@@ -216,7 +215,6 @@ impl Client {
             strict_tls,
             hostname,
             addr.port(),
-            use_sni,
             alpn(addr.port()),
             logging_stream,
             &context.tls_session_store,
@@ -253,7 +251,6 @@ impl Client {
         host: &str,
         strict_tls: bool,
     ) -> Result<Self> {
-        let use_sni = false;
         let tcp_stream = connect_tcp_inner(addr).await?;
 
         let account_id = context.get_id();
@@ -278,7 +275,6 @@ impl Client {
             strict_tls,
             host,
             addr.port(),
-            use_sni,
             "",
             tcp_stream,
             &context.tls_session_store,
@@ -298,7 +294,6 @@ impl Client {
         strict_tls: bool,
         proxy_config: ProxyConfig,
     ) -> Result<Self> {
-        let use_sni = true;
         let proxy_stream = proxy_config
             .connect(context, domain, port, strict_tls)
             .await?;
@@ -306,7 +301,6 @@ impl Client {
             strict_tls,
             domain,
             port,
-            use_sni,
             alpn(port),
             proxy_stream,
             &context.tls_session_store,
@@ -346,7 +340,6 @@ impl Client {
         proxy_config: ProxyConfig,
         strict_tls: bool,
     ) -> Result<Self> {
-        let use_sni = false;
         let proxy_stream = proxy_config
             .connect(context, hostname, port, strict_tls)
             .await?;
@@ -369,7 +362,6 @@ impl Client {
             strict_tls,
             hostname,
             port,
-            use_sni,
             "",
             proxy_stream,
             &context.tls_session_store,

src/imap/imap_tests.rs

@@ -1,6 +1,5 @@
 use super::*;
 use crate::test_utils::TestContext;
-use crate::transport::add_pseudo_transport;
 
 #[test]
 fn test_get_folder_meaning_by_name() {
@@ -12,23 +11,17 @@ fn test_get_folder_meaning_by_name() {
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_set_uid_next_validity() {
     let t = TestContext::new_alice().await;
-    assert_eq!(get_uid_next(&t.ctx, 1, "Inbox").await.unwrap(), 0);
-    assert_eq!(get_uidvalidity(&t.ctx, 1, "Inbox").await.unwrap(), 0);
+    assert_eq!(get_uid_next(&t.ctx, "Inbox").await.unwrap(), 0);
+    assert_eq!(get_uidvalidity(&t.ctx, "Inbox").await.unwrap(), 0);
 
-    set_uidvalidity(&t.ctx, 1, "Inbox", 7).await.unwrap();
-    assert_eq!(get_uidvalidity(&t.ctx, 1, "Inbox").await.unwrap(), 7);
-    assert_eq!(get_uid_next(&t.ctx, 1, "Inbox").await.unwrap(), 0);
+    set_uidvalidity(&t.ctx, "Inbox", 7).await.unwrap();
+    assert_eq!(get_uidvalidity(&t.ctx, "Inbox").await.unwrap(), 7);
+    assert_eq!(get_uid_next(&t.ctx, "Inbox").await.unwrap(), 0);
 
-    // For another transport there is still no UIDVALIDITY set.
-    assert_eq!(get_uidvalidity(&t.ctx, 2, "Inbox").await.unwrap(), 0);
-
-    set_uid_next(&t.ctx, 1, "Inbox", 5).await.unwrap();
-    set_uidvalidity(&t.ctx, 1, "Inbox", 6).await.unwrap();
-    assert_eq!(get_uid_next(&t.ctx, 1, "Inbox").await.unwrap(), 5);
-    assert_eq!(get_uidvalidity(&t.ctx, 1, "Inbox").await.unwrap(), 6);
-
-    assert_eq!(get_uid_next(&t.ctx, 2, "Inbox").await.unwrap(), 0);
-    assert_eq!(get_uidvalidity(&t.ctx, 2, "Inbox").await.unwrap(), 0);
+    set_uid_next(&t.ctx, "Inbox", 5).await.unwrap();
+    set_uidvalidity(&t.ctx, "Inbox", 6).await.unwrap();
+    assert_eq!(get_uid_next(&t.ctx, "Inbox").await.unwrap(), 5);
+    assert_eq!(get_uidvalidity(&t.ctx, "Inbox").await.unwrap(), 6);
 }
 
 #[test]
@@ -272,14 +265,12 @@ async fn test_get_imap_search_command() -> Result<()> {
         r#"FROM "alice@example.org""#
     );
 
-    add_pseudo_transport(&t, "alice@another.com").await?;
     t.ctx.set_primary_self_addr("alice@another.com").await?;
     assert_eq!(
         get_imap_self_sent_search_command(&t.ctx).await?,
         r#"OR (FROM "alice@another.com") (FROM "alice@example.org")"#
     );
 
-    add_pseudo_transport(&t, "alice@third.com").await?;
     t.ctx.set_primary_self_addr("alice@third.com").await?;
     assert_eq!(
         get_imap_self_sent_search_command(&t.ctx).await?,

src/imap/select_folder.rs

@@ -5,7 +5,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;
-use crate::ensure_and_debug_assert;
 use crate::log::warn;
 
 type Result<T> = std::result::Result<T, Error>;
@@ -130,7 +129,7 @@ impl ImapSession {
         context: &Context,
         folder: &str,
         create: bool,
-    ) -> anyhow::Result<bool> {
+    ) -> Result<bool> {
         let newly_selected = if create {
             self.select_or_create_folder(context, folder)
                 .await
@@ -147,24 +146,15 @@ impl ImapSession {
                 },
             }
         };
-        let transport_id = self.transport_id();
-
-        // Folders should not be selected when transport_id is not assigned yet
-        // because we cannot save UID validity then.
-        ensure_and_debug_assert!(
-            transport_id > 0,
-            "Cannot select folder when transport ID is unknown"
-        );
-
         let mailbox = self
             .selected_mailbox
             .as_mut()
             .with_context(|| format!("No mailbox selected, folder: {folder:?}"))?;
 
-        let old_uid_validity = get_uidvalidity(context, transport_id, 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, transport_id, folder)
+        let old_uid_next = get_uid_next(context, folder)
             .await
             .with_context(|| format!("Failed to get old UID NEXT for folder {folder:?}"))?;
 
@@ -215,7 +205,7 @@ impl ImapSession {
                             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, transport_id, folder, new_uid_next).await?;
+                        set_uid_next(context, folder, new_uid_next).await?;
                         self.resync_request_sender.try_send(()).ok();
                     }
 
@@ -234,21 +224,21 @@ impl ImapSession {
         }
 
         // UIDVALIDITY is modified, reset highest seen MODSEQ.
-        set_modseq(context, transport_id, folder, 0).await?;
+        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, transport_id, folder, new_uid_next).await?;
-        set_uidvalidity(context, transport_id, folder, new_uid_validity).await?;
+        set_uid_next(context, folder, new_uid_next).await?;
+        set_uidvalidity(context, folder, new_uid_validity).await?;
         self.new_mail = true;
 
         // Collect garbage entries in `imap` table.
         context
             .sql
             .execute(
-                "DELETE FROM imap WHERE transport_id=? AND folder=? AND uidvalidity!=?",
-                (transport_id, &folder, new_uid_validity),
+                "DELETE FROM imap WHERE folder=? AND uidvalidity!=?",
+                (&folder, new_uid_validity),
             )
             .await?;
 
@@ -257,7 +247,12 @@ impl ImapSession {
         }
         info!(
             context,
-            "transport {transport_id}: UID validity for folder {folder} changed from {old_uid_validity}/{old_uid_next} to {new_uid_validity}/{new_uid_next}.",
+            "uid/validity change folder {}: new {}/{} previous {}/{}.",
+            folder,
+            new_uid_next,
+            new_uid_validity,
+            old_uid_next,
+            old_uid_validity,
         );
         Ok(true)
     }

src/imap/session.rs

@@ -30,8 +30,6 @@ const PREFETCH_FLAGS: &str = "(UID INTERNALDATE RFC822.SIZE BODY.PEEK[HEADER.FIE
 
 #[derive(Debug)]
 pub(crate) struct Session {
-    transport_id: u32,
-
     pub(super) inner: ImapSession<Box<dyn SessionStream>>,
 
     pub capabilities: Capabilities,
@@ -73,10 +71,8 @@ impl Session {
         inner: ImapSession<Box<dyn SessionStream>>,
         capabilities: Capabilities,
         resync_request_sender: async_channel::Sender<()>,
-        transport_id: u32,
     ) -> Self {
         Self {
-            transport_id,
             inner,
             capabilities,
             selected_folder: None,
@@ -88,11 +84,6 @@ impl Session {
         }
     }
 
-    /// Returns ID of the transport for which this session was created.
-    pub(crate) fn transport_id(&self) -> u32 {
-        self.transport_id
-    }
-
     pub fn can_idle(&self) -> bool {
         self.capabilities.can_idle
     }

src/imex.rs

@@ -25,8 +25,7 @@ use crate::pgp;
 use crate::qr::DCBACKUP_VERSION;
 use crate::sql;
 use crate::tools::{
-    TempPathGuard, create_folder, delete_file, get_filesuffix_lc, read_file, time, usize_to_u64,
-    write_file,
+    TempPathGuard, create_folder, delete_file, get_filesuffix_lc, read_file, time, write_file,
 };
 
 mod key_transfer;
@@ -264,14 +263,14 @@ struct ProgressReader<R> {
     inner: R,
 
     /// Number of bytes successfully read from the internal reader.
-    read: u64,
+    read: usize,
 
     /// Total size of the backup .tar file expected to be read from the reader.
     /// Used to calculate the progress.
-    file_size: u64,
+    file_size: usize,
 
     /// Last progress emitted to avoid emitting the same progress value twice.
-    last_progress: u16,
+    last_progress: usize,
 
     /// Context for emitting progress events.
     context: Context,
@@ -282,7 +281,7 @@ impl<R> ProgressReader<R> {
         Self {
             inner: r,
             read: 0,
-            file_size,
+            file_size: file_size as usize,
             last_progress: 1,
             context,
         }
@@ -302,11 +301,9 @@ where
         let before = buf.filled().len();
         let res = this.inner.poll_read(cx, buf);
         if let std::task::Poll::Ready(Ok(())) = res {
-            *this.read = this
-                .read
-                .saturating_add(usize_to_u64(buf.filled().len() - before));
+            *this.read = this.read.saturating_add(buf.filled().len() - before);
 
-            let progress = std::cmp::min(1000 * *this.read / *this.file_size, 999) as u16;
+            let progress = std::cmp::min(1000 * *this.read / *this.file_size, 999);
             if progress > *this.last_progress {
                 this.context.emit_event(EventType::ImexProgress(progress));
                 *this.last_progress = progress;
@@ -493,14 +490,14 @@ struct ProgressWriter<W> {
     inner: W,
 
     /// Number of bytes successfully written into the internal writer.
-    written: u64,
+    written: usize,
 
     /// Total size of the backup .tar file expected to be written into the writer.
     /// Used to calculate the progress.
-    file_size: u64,
+    file_size: usize,
 
     /// Last progress emitted to avoid emitting the same progress value twice.
-    last_progress: u16,
+    last_progress: usize,
 
     /// Context for emitting progress events.
     context: Context,
@@ -511,7 +508,7 @@ impl<W> ProgressWriter<W> {
         Self {
             inner: w,
             written: 0,
-            file_size,
+            file_size: file_size as usize,
             last_progress: 1,
             context,
         }
@@ -530,9 +527,9 @@ where
         let this = self.project();
         let res = this.inner.poll_write(cx, buf);
         if let std::task::Poll::Ready(Ok(written)) = res {
-            *this.written = this.written.saturating_add(usize_to_u64(written));
+            *this.written = this.written.saturating_add(written);
 
-            let progress = std::cmp::min(1000 * *this.written / *this.file_size, 999) as u16;
+            let progress = std::cmp::min(1000 * *this.written / *this.file_size, 999);
             if progress > *this.last_progress {
                 this.context.emit_event(EventType::ImexProgress(progress));
                 *this.last_progress = progress;

src/lib.rs

@@ -89,7 +89,6 @@ pub mod securejoin;
 mod simplify;
 mod smtp;
 pub mod stock_str;
-pub mod storage_usage;
 mod sync;
 mod timesmearing;
 mod token;

src/location.rs

@@ -294,7 +294,7 @@ pub async fn send_locations_to_chat(
             .unwrap_or_default();
     } else if 0 == seconds && is_sending_locations_before {
         let stock_str = stock_str::msg_location_disabled(context).await;
-        chat::add_info_msg(context, chat_id, &stock_str).await?;
+        chat::add_info_msg(context, chat_id, &stock_str, now).await?;
     }
     context.emit_event(EventType::ChatModified(chat_id));
     chatlist_events::emit_chatlist_item_changed(context, chat_id);
@@ -849,7 +849,7 @@ async fn maybe_send_locations(context: &Context) -> Result<Option<u64>> {
                 .context("failed to disable location streaming")?;
 
             let stock_str = stock_str::msg_location_disabled(context).await;
-            chat::add_info_msg(context, chat_id, &stock_str).await?;
+            chat::add_info_msg(context, chat_id, &stock_str, now).await?;
             context.emit_event(EventType::ChatModified(chat_id));
             chatlist_events::emit_chatlist_item_changed(context, chat_id);
         }

src/log/stream.rs

@@ -15,17 +15,16 @@ use pin_project::pin_project;
 
 use crate::events::{Event, EventType, Events};
 use crate::net::session::SessionStream;
-use crate::tools::usize_to_u64;
 
 use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
 
 #[derive(Debug)]
 struct Metrics {
     /// Total number of bytes read.
-    pub total_read: u64,
+    pub total_read: usize,
 
     /// Total number of bytes written.
-    pub total_written: u64,
+    pub total_written: usize,
 }
 
 impl Metrics {
@@ -92,11 +91,6 @@ impl<S: SessionStream> AsyncRead for LoggingStream<S> {
                 "Read error on stream {peer_addr:?} after reading {} and writing {} bytes: {err}.",
                 this.metrics.total_read, this.metrics.total_written
             );
-            tracing::event!(
-                ::tracing::Level::WARN,
-                account_id = *this.account_id,
-                log_message
-            );
             this.events.emit(Event {
                 id: *this.account_id,
                 typ: EventType::Warning(log_message),
@@ -104,7 +98,7 @@ impl<S: SessionStream> AsyncRead for LoggingStream<S> {
         }
 
         let n = old_remaining - buf.remaining();
-        this.metrics.total_read = this.metrics.total_read.saturating_add(usize_to_u64(n));
+        this.metrics.total_read = this.metrics.total_read.saturating_add(n);
 
         res
     }
@@ -119,7 +113,7 @@ impl<S: SessionStream> AsyncWrite for LoggingStream<S> {
         let this = self.project();
         let res = this.inner.poll_write(cx, buf);
         if let Poll::Ready(Ok(n)) = res {
-            this.metrics.total_written = this.metrics.total_written.saturating_add(usize_to_u64(n));
+            this.metrics.total_written = this.metrics.total_written.saturating_add(n);
         }
         res
     }
@@ -146,7 +140,7 @@ impl<S: SessionStream> AsyncWrite for LoggingStream<S> {
         let this = self.project();
         let res = this.inner.poll_write_vectored(cx, bufs);
         if let Poll::Ready(Ok(n)) = res {
-            this.metrics.total_written = this.metrics.total_written.saturating_add(usize_to_u64(n));
+            this.metrics.total_written = this.metrics.total_written.saturating_add(n);
         }
         res
     }

src/message.rs

@@ -171,17 +171,12 @@ impl MsgId {
         context
             .sql
             .query_map_vec(
-                "SELECT transports.addr, imap.folder, imap.uid
-                 FROM imap
-                 LEFT JOIN transports
-                 ON transports.id = imap.transport_id
-                 WHERE imap.rfc724_mid=?",
+                "SELECT folder, uid FROM imap WHERE rfc724_mid=?",
                 (rfc724_mid,),
                 |row| {
-                    let addr: String = row.get(0)?;
-                    let folder: String = row.get(1)?;
-                    let uid: u32 = row.get(2)?;
-                    Ok(format!("<{addr}/{folder}/;UID={uid}>"))
+                    let folder: String = row.get("folder")?;
+                    let uid: u32 = row.get("uid")?;
+                    Ok(format!("</{folder}/;UID={uid}>"))
                 },
             )
             .await
@@ -1873,33 +1868,6 @@ pub async fn markseen_msgs(context: &Context, msg_ids: Vec<MsgId>) -> Result<()>
     Ok(())
 }
 
-/// Checks if the messages with given IDs exist.
-///
-/// Returns IDs of existing messages.
-pub async fn get_existing_msg_ids(context: &Context, ids: &[MsgId]) -> Result<Vec<MsgId>> {
-    let query_only = true;
-    let res = context
-        .sql
-        .transaction_ex(query_only, |transaction| {
-            let mut res: Vec<MsgId> = Vec::new();
-            for id in ids {
-                if transaction.query_one(
-                    "SELECT COUNT(*) > 0 FROM msgs WHERE id=? AND chat_id!=3",
-                    (id,),
-                    |row| {
-                        let exists: bool = row.get(0)?;
-                        Ok(exists)
-                    },
-                )? {
-                    res.push(*id);
-                }
-            }
-            Ok(res)
-        })
-        .await?;
-    Ok(res)
-}
-
 pub(crate) async fn update_msg_state(
     context: &Context,
     msg_id: MsgId,
@@ -2253,5 +2221,14 @@ impl Viewtype {
     }
 }
 
+/// Returns text for storing in the `msgs.txt_normalized` column (to make case-insensitive search
+/// possible for non-ASCII messages).
+pub(crate) fn normalize_text(text: &str) -> Option<String> {
+    if text.is_ascii() {
+        return None;
+    };
+    Some(text.to_lowercase()).filter(|t| t != text)
+}
+
 #[cfg(test)]
 mod message_tests;

src/message/message_tests.rs

@@ -764,27 +764,3 @@ async fn test_load_unknown_viewtype() -> Result<()> {
     assert_eq!(bob_msg.get_viewtype(), Viewtype::Unknown);
     Ok(())
 }
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_get_existing_msg_ids() -> Result<()> {
-    let mut tcm = TestContextManager::new();
-    let alice = &tcm.alice().await;
-    let bob = &tcm.bob().await;
-
-    let msg1_id = tcm.send_recv(alice, bob, "Hello 1!").await.id;
-    let msg2_id = tcm.send_recv(alice, bob, "Hello 2!").await.id;
-    let msg3_id = tcm.send_recv(alice, bob, "Hello 3!").await.id;
-    let msg4_id = tcm.send_recv(alice, bob, "Hello 4!").await.id;
-
-    assert_eq!(
-        get_existing_msg_ids(bob, &[msg1_id, msg2_id, msg3_id, msg4_id]).await?,
-        vec![msg1_id, msg2_id, msg3_id, msg4_id]
-    );
-    delete_msgs(bob, &[msg1_id, msg3_id]).await?;
-    assert_eq!(
-        get_existing_msg_ids(bob, &[msg1_id, msg2_id, msg3_id, msg4_id]).await?,
-        vec![msg2_id, msg4_id]
-    );
-
-    Ok(())
-}

src/mimefactory.rs

@@ -9,7 +9,7 @@ use data_encoding::BASE32_NOPAD;
 use deltachat_contact_tools::sanitize_bidi_characters;
 use iroh_gossip::proto::TopicId;
 use mail_builder::headers::HeaderType;
-use mail_builder::headers::address::Address;
+use mail_builder::headers::address::{Address, EmailAddress};
 use mail_builder::mime::MimePart;
 use tokio::fs;
 
@@ -32,7 +32,6 @@ use crate::message::{Message, MsgId, Viewtype};
 use crate::mimeparser::{SystemMessage, is_hidden};
 use crate::param::Param;
 use crate::peer_channels::{create_iroh_header, get_iroh_topic_for_msg};
-use crate::pgp::SeipdVersion;
 use crate::simplify::escape_message_footer_marks;
 use crate::stock_str;
 use crate::tools::{
@@ -465,11 +464,7 @@ impl MimeFactory {
                 .unwrap_or_default(),
             false => "".to_string(),
         };
-        // We don't display avatars for address-contacts, so sending avatars w/o encryption is not
-        // useful and causes e.g. Outlook to reject a message with a big header, see
-        // https://support.delta.chat/t/invalid-mime-content-single-text-value-size-32822-exceeded-allowed-maximum-32768-for-the-chat-user-avatar-header/4067.
-        let attach_selfavatar =
-            Self::should_attach_selfavatar(context, &msg).await && encryption_pubkeys.is_some();
+        let attach_selfavatar = Self::should_attach_selfavatar(context, &msg).await;
 
         ensure_and_debug_assert!(
             member_timestamps.is_empty()
@@ -998,7 +993,24 @@ impl MimeFactory {
             } else if header_name == "to" {
                 protected_headers.push(header.clone());
                 if is_encrypted {
-                    unprotected_headers.push(("To", hidden_recipients().into()));
+                    let mut to_without_names = to
+                        .clone()
+                        .into_iter()
+                        .filter_map(|header| match header {
+                            Address::Address(mb) => Some(Address::Address(EmailAddress {
+                                name: None,
+                                email: mb.email,
+                            })),
+                            _ => None,
+                        })
+                        .collect::<Vec<_>>();
+                    if to_without_names.is_empty() {
+                        to_without_names.push(hidden_recipients());
+                    }
+                    unprotected_headers.push((
+                        original_header_name,
+                        Address::new_list(to_without_names).into(),
+                    ));
                 } else {
                     unprotected_headers.push(header.clone());
                 }
@@ -1024,15 +1036,7 @@ impl MimeFactory {
                 //
                 // and the explanation page says
                 // "The time information deviates too much from the actual time".
-                //
-                // We also limit the range to 6 days (518400 seconds)
-                // because with a larger range we got
-                // error "500 Date header far in the past/future"
-                // which apparently originates from Symantec Messaging Gateway
-                // and means the message has a Date that is more
-                // than 7 days in the past:
-                // <https://github.com/chatmail/core/issues/7466>
-                let timestamp_offset = rand::random_range(0..518400);
+                let timestamp_offset = rand::random_range(0..1000000);
                 let protected_timestamp = self.timestamp.saturating_sub(timestamp_offset);
                 let unprotected_date =
                     chrono::DateTime::<chrono::Utc>::from_timestamp(protected_timestamp, 0)
@@ -1227,7 +1231,7 @@ impl MimeFactory {
                         // created before we had symmetric encryption,
                         // we show an error message.
                         let text = BROADCAST_INCOMPATIBILITY_MSG;
-                        chat::add_info_msg(context, chat.id, text).await?;
+                        chat::add_info_msg(context, chat.id, text, time()).await?;
                         bail!(text);
                     }
                     secret
@@ -1259,17 +1263,6 @@ impl MimeFactory {
             } else {
                 // Asymmetric encryption
 
-                let seipd_version = if encryption_pubkeys.is_empty() {
-                    // If message is sent only to self,
-                    // use v2 SEIPD.
-                    SeipdVersion::V2
-                } else {
-                    // If message is sent to others,
-                    // they may not support v2 SEIPD yet,
-                    // so use v1 SEIPD.
-                    SeipdVersion::V1
-                };
-
                 // Encrypt to self unconditionally,
                 // even for a single-device setup.
                 let mut encryption_keyring = vec![encrypt_helper.public_key.clone()];
@@ -1283,7 +1276,6 @@ impl MimeFactory {
                         message,
                         compress,
                         anonymous_recipients,
-                        seipd_version,
                     )
                     .await?
             };
@@ -1538,9 +1530,10 @@ impl MimeFactory {
                             .await?
                             .unwrap_or_default()
                     {
-                        placeholdertext = Some("I left the group.".to_string());
+                        placeholdertext = Some(stock_str::msg_group_left_remote(context).await);
                     } else {
-                        placeholdertext = Some(format!("I removed member {email_to_remove}."));
+                        placeholdertext =
+                            Some(stock_str::msg_del_member_remote(context, email_to_remove).await);
                     };
 
                     if !email_to_remove.is_empty() {
@@ -1563,7 +1556,8 @@ impl MimeFactory {
                     let email_to_add = msg.param.get(Param::Arg).unwrap_or_default();
                     let fingerprint_to_add = msg.param.get(Param::Arg4).unwrap_or_default();
 
-                    placeholdertext = Some(format!("I added member {email_to_add}."));
+                    placeholdertext =
+                        Some(stock_str::msg_add_member_remote(context, email_to_add).await);
 
                     if !email_to_add.is_empty() {
                         headers.push((
@@ -1599,7 +1593,7 @@ impl MimeFactory {
                         "Chat-Content",
                         mail_builder::headers::text::Text::new("group-avatar-changed").into(),
                     ));
-                    if grpimage.is_none() && is_encrypted {
+                    if grpimage.is_none() {
                         headers.push((
                             "Chat-Group-Avatar",
                             mail_builder::headers::raw::Raw::new("0").into(),
@@ -1726,9 +1720,7 @@ impl MimeFactory {
             _ => {}
         }
 
-        if let Some(grpimage) = grpimage
-            && is_encrypted
-        {
+        if let Some(grpimage) = grpimage {
             info!(context, "setting group image '{}'", grpimage);
             let avatar = build_avatar_file(context, grpimage)
                 .await

src/mimefactory/mimefactory_tests.rs

@@ -6,8 +6,7 @@ use std::time::Duration;
 
 use super::*;
 use crate::chat::{
-    self, ChatId, add_contact_to_chat, create_group, create_group_unencrypted,
-    remove_contact_from_chat, send_text_msg,
+    self, ChatId, add_contact_to_chat, create_group, remove_contact_from_chat, send_text_msg,
 };
 use crate::chatlist::Chatlist;
 use crate::constants;
@@ -352,7 +351,7 @@ async fn test_subject_in_group() -> Result<()> {
     let mut tcm = TestContextManager::new();
     let t = tcm.alice().await;
     let bob = tcm.bob().await;
-    let group_id = create_group(&t, "groupname").await.unwrap();
+    let group_id = chat::create_group(&t, "groupname").await.unwrap();
     let bob_contact_id = t.add_or_lookup_contact_id(&bob).await;
     chat::add_contact_to_chat(&t, group_id, bob_contact_id).await?;
 
@@ -593,6 +592,26 @@ async fn test_selfavatar_unencrypted() -> anyhow::Result<()> {
     assert_eq!(outer.match_indices("Autocrypt:").count(), 1);
     assert_eq!(outer.match_indices("Chat-User-Avatar:").count(), 0);
 
+    assert_eq!(inner.match_indices("text/plain").count(), 1);
+    assert_eq!(inner.match_indices("Message-ID:").count(), 1);
+    assert_eq!(inner.match_indices("Chat-User-Avatar:").count(), 1);
+    assert_eq!(inner.match_indices("Subject:").count(), 0);
+
+    assert_eq!(body.match_indices("this is the text!").count(), 1);
+
+    // if another message is sent, that one must not contain the avatar
+    let sent_msg = t.send_msg(chat.id, &mut msg).await;
+    let mut payload = sent_msg.payload().splitn(3, "\r\n\r\n");
+    let outer = payload.next().unwrap();
+    let inner = payload.next().unwrap();
+    let body = payload.next().unwrap();
+
+    assert_eq!(outer.match_indices("multipart/mixed").count(), 1);
+    assert_eq!(outer.match_indices("Message-ID:").count(), 1);
+    assert_eq!(outer.match_indices("Subject:").count(), 1);
+    assert_eq!(outer.match_indices("Autocrypt:").count(), 1);
+    assert_eq!(outer.match_indices("Chat-User-Avatar:").count(), 0);
+
     assert_eq!(inner.match_indices("text/plain").count(), 1);
     assert_eq!(inner.match_indices("Message-ID:").count(), 1);
     assert_eq!(inner.match_indices("Chat-User-Avatar:").count(), 0);
@@ -651,7 +670,7 @@ async fn test_selfavatar_unencrypted_signed() {
     assert_eq!(part.match_indices("text/plain").count(), 1);
     assert_eq!(part.match_indices("From:").count(), 0);
     assert_eq!(part.match_indices("Message-ID:").count(), 1);
-    assert_eq!(part.match_indices("Chat-User-Avatar:").count(), 0);
+    assert_eq!(part.match_indices("Chat-User-Avatar:").count(), 1);
     assert_eq!(part.match_indices("Subject:").count(), 0);
 
     let body = payload.next().unwrap();
@@ -665,6 +684,58 @@ async fn test_selfavatar_unencrypted_signed() {
         .unwrap();
     let alice_contact = Contact::get_by_id(&bob.ctx, alice_id).await.unwrap();
     assert_eq!(alice_contact.is_key_contact(), false);
+    assert!(
+        alice_contact
+            .get_profile_image(&bob.ctx)
+            .await
+            .unwrap()
+            .is_some()
+    );
+
+    // if another message is sent, that one must not contain the avatar
+    let mut msg = Message::new_text("this is the text!".to_string());
+    let sent_msg = t.send_msg(chat.id, &mut msg).await;
+    let mut payload = sent_msg.payload().splitn(4, "\r\n\r\n");
+
+    let part = payload.next().unwrap();
+    assert_eq!(part.match_indices("multipart/signed").count(), 1);
+    assert_eq!(part.match_indices("From:").count(), 1);
+    assert_eq!(part.match_indices("Message-ID:").count(), 1);
+    assert_eq!(part.match_indices("Subject:").count(), 1);
+    assert_eq!(part.match_indices("Autocrypt:").count(), 1);
+    assert_eq!(part.match_indices("Chat-User-Avatar:").count(), 0);
+
+    let part = payload.next().unwrap();
+    assert_eq!(
+        part.match_indices("multipart/mixed; protected-headers=\"v1\"")
+            .count(),
+        1
+    );
+    assert_eq!(part.match_indices("From:").count(), 1);
+    assert_eq!(part.match_indices("Message-ID:").count(), 0);
+    assert_eq!(part.match_indices("Subject:").count(), 1);
+    assert_eq!(part.match_indices("Autocrypt:").count(), 1);
+    assert_eq!(part.match_indices("Chat-User-Avatar:").count(), 0);
+
+    let part = payload.next().unwrap();
+    assert_eq!(part.match_indices("text/plain").count(), 1);
+    assert_eq!(body.match_indices("From:").count(), 0);
+    assert_eq!(part.match_indices("Message-ID:").count(), 1);
+    assert_eq!(part.match_indices("Chat-User-Avatar:").count(), 0);
+    assert_eq!(part.match_indices("Subject:").count(), 0);
+
+    let body = payload.next().unwrap();
+    assert_eq!(body.match_indices("this is the text!").count(), 1);
+
+    bob.recv_msg(&sent_msg).await;
+    let alice_contact = Contact::get_by_id(&bob.ctx, alice_id).await.unwrap();
+    assert!(
+        alice_contact
+            .get_profile_image(&bob.ctx)
+            .await
+            .unwrap()
+            .is_some()
+    );
 }
 
 /// Test that removed member address does not go into the `To:` field.
@@ -672,20 +743,17 @@ async fn test_selfavatar_unencrypted_signed() {
 async fn test_remove_member_bcc() -> Result<()> {
     let mut tcm = TestContextManager::new();
 
-    // Alice creates a group with Bob and Charlie and then removes Charlie.
-
+    // Alice creates a group with Bob and Claire and then removes Bob.
     let alice = &tcm.alice().await;
     let bob = &tcm.bob().await;
     let charlie = &tcm.charlie().await;
 
-    let alice_addr = alice.get_config(Config::Addr).await?.unwrap();
-    let bob_addr = bob.get_config(Config::Addr).await?.unwrap();
-    let charlie_addr = charlie.get_config(Config::Addr).await?.unwrap();
+    let bob_id = alice.add_or_lookup_contact_id(bob).await;
+    let charlie_id = alice.add_or_lookup_contact_id(charlie).await;
+    let charlie_contact = Contact::get_by_id(alice, charlie_id).await?;
+    let charlie_addr = charlie_contact.get_addr();
 
-    let bob_id = alice.add_or_lookup_address_contact_id(bob).await;
-    let charlie_id = alice.add_or_lookup_address_contact_id(charlie).await;
-
-    let alice_chat_id = create_group_unencrypted(alice, "foo").await?;
+    let alice_chat_id = create_group(alice, "foo").await?;
     add_contact_to_chat(alice, alice_chat_id, bob_id).await?;
     add_contact_to_chat(alice, alice_chat_id, charlie_id).await?;
     send_text_msg(alice, alice_chat_id, "Creating a group".to_string()).await?;
@@ -702,9 +770,8 @@ async fn test_remove_member_bcc() -> Result<()> {
     for to_addr in to.iter() {
         match to_addr {
             mailparse::MailAddr::Single(info) => {
-                // Addresses should be of existing members and not Charlie.
+                // Addresses should be of existing members (Alice and Bob) and not Charlie.
                 assert_ne!(info.addr, charlie_addr);
-                assert!(info.addr == alice_addr || info.addr == bob_addr);
             }
             mailparse::MailAddr::Group(_) => {
                 panic!("Group addresses are not expected here");

src/mimeparser.rs

@@ -273,11 +273,12 @@ impl MimeMessage {
             &mut chat_disposition_notification_to,
             &mail,
         );
-        headers_removed.extend(
-            headers
-                .extract_if(|k, _v| is_hidden(k))
-                .map(|(k, _v)| k.to_string()),
-        );
+        headers.retain(|k, _| {
+            !is_hidden(k) || {
+                headers_removed.insert(k.to_string());
+                false
+            }
+        });
 
         // Parse hidden headers.
         let mimetype = mail.ctype.mimetype.parse::<Mime>()?;
@@ -679,9 +680,8 @@ impl MimeMessage {
     fn parse_system_message_headers(&mut self, context: &Context) {
         if self.get_header(HeaderDef::AutocryptSetupMessage).is_some() && !self.incoming {
             self.parts.retain(|part| {
-                part.mimetype
-                    .as_ref()
-                    .is_none_or(|mimetype| mimetype.as_ref() == MIME_AC_SETUP_FILE)
+                part.mimetype.is_none()
+                    || part.mimetype.as_ref().unwrap().as_ref() == MIME_AC_SETUP_FILE
             });
 
             if self.parts.len() == 1 {
@@ -1680,11 +1680,12 @@ impl MimeMessage {
         // See <https://www.rfc-editor.org/rfc/rfc9788.html>.
         let has_header_protection = part.ctype.params.contains_key("hp");
 
-        headers_removed.extend(
-            headers
-                .extract_if(|k, _v| has_header_protection || is_protected(k))
-                .map(|(k, _v)| k.to_string()),
-        );
+        headers.retain(|k, _| {
+            !(has_header_protection || is_protected(k)) || {
+                headers_removed.insert(k.to_string());
+                false
+            }
+        });
         for field in fields {
             // lowercasing all headers is technically not correct, but makes things work better
             let key = field.get_key().to_lowercase();

src/net.rs

@@ -131,13 +131,11 @@ pub(crate) async fn connect_tls_inner(
     alpn: &str,
     tls_session_store: &TlsSessionStore,
 ) -> Result<impl SessionStream + 'static> {
-    let use_sni = true;
     let tcp_stream = connect_tcp_inner(addr).await?;
     let tls_stream = wrap_tls(
         strict_tls,
         host,
         addr.port(),
-        use_sni,
         alpn,
         tcp_stream,
         tls_session_store,

src/net/dns.rs

@@ -40,7 +40,7 @@
 //! used for successful connection timestamp of
 //! retrieving them from in-memory cache is used.
 
-use anyhow::{Context as _, Result, ensure};
+use anyhow::{Context as _, Result};
 use std::collections::HashMap;
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
 use std::str::FromStr;
@@ -229,6 +229,64 @@ pub(crate) async fn update_connect_timestamp(
 /// Preloaded DNS results that can be used in case of DNS server failures.
 static DNS_PRELOAD: LazyLock<HashMap<&'static str, Vec<IpAddr>>> = LazyLock::new(|| {
     HashMap::from([
+        (
+            "mail.sangham.net",
+            vec![
+                IpAddr::V4(Ipv4Addr::new(159, 69, 186, 85)),
+                IpAddr::V6(Ipv6Addr::new(0x2a01, 0x4f8, 0xc17, 0x798c, 0, 0, 0, 1)),
+            ],
+        ),
+        (
+            "nine.testrun.org",
+            vec![
+                IpAddr::V4(Ipv4Addr::new(116, 202, 233, 236)),
+                IpAddr::V4(Ipv4Addr::new(128, 140, 126, 197)),
+                IpAddr::V4(Ipv4Addr::new(49, 12, 116, 128)),
+                IpAddr::V6(Ipv6Addr::new(0x2a01, 0x4f8, 0x241, 0x4ce8, 0, 0, 0, 2)),
+            ],
+        ),
+        (
+            "disroot.org",
+            vec![IpAddr::V4(Ipv4Addr::new(178, 21, 23, 139))],
+        ),
+        (
+            "imap.gmail.com",
+            vec![
+                IpAddr::V4(Ipv4Addr::new(142, 250, 110, 108)),
+                IpAddr::V4(Ipv4Addr::new(142, 250, 110, 109)),
+                IpAddr::V4(Ipv4Addr::new(66, 102, 1, 108)),
+                IpAddr::V4(Ipv4Addr::new(66, 102, 1, 109)),
+                IpAddr::V6(Ipv6Addr::new(0x2a00, 0x1450, 0x400c, 0xc1f, 0, 0, 0, 0x6c)),
+                IpAddr::V6(Ipv6Addr::new(0x2a00, 0x1450, 0x400c, 0xc1f, 0, 0, 0, 0x6d)),
+            ],
+        ),
+        (
+            "smtp.gmail.com",
+            vec![
+                IpAddr::V4(Ipv4Addr::new(142, 250, 110, 109)),
+                IpAddr::V6(Ipv6Addr::new(0x2a00, 0x1450, 0x4013, 0xc04, 0, 0, 0, 0x6c)),
+            ],
+        ),
+        (
+            "mail.autistici.org",
+            vec![
+                IpAddr::V4(Ipv4Addr::new(198, 167, 222, 108)),
+                IpAddr::V4(Ipv4Addr::new(82, 94, 249, 234)),
+                IpAddr::V4(Ipv4Addr::new(93, 190, 126, 19)),
+            ],
+        ),
+        (
+            "smtp.autistici.org",
+            vec![
+                IpAddr::V4(Ipv4Addr::new(198, 167, 222, 108)),
+                IpAddr::V4(Ipv4Addr::new(82, 94, 249, 234)),
+                IpAddr::V4(Ipv4Addr::new(93, 190, 126, 19)),
+            ],
+        ),
+        (
+            "daleth.cafe",
+            vec![IpAddr::V4(Ipv4Addr::new(37, 27, 6, 204))],
+        ),
         (
             "imap.163.com",
             vec![IpAddr::V4(Ipv4Addr::new(111, 124, 203, 45))],
@@ -237,21 +295,6 @@ static DNS_PRELOAD: LazyLock<HashMap<&'static str, Vec<IpAddr>>> = LazyLock::new
             "smtp.163.com",
             vec![IpAddr::V4(Ipv4Addr::new(103, 129, 252, 45))],
         ),
-        (
-            "newyear.aktivix.org",
-            vec![IpAddr::V4(Ipv4Addr::new(209, 51, 180, 245))],
-        ),
-        (
-            "smtp.aliyun.com",
-            vec![IpAddr::V4(Ipv4Addr::new(47, 246, 136, 232))],
-        ),
-        (
-            "imap.aliyun.com",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(59, 82, 43, 123)),
-                IpAddr::V4(Ipv4Addr::new(59, 82, 9, 176)),
-            ],
-        ),
         (
             "imap.aol.com",
             vec![
@@ -259,67 +302,17 @@ static DNS_PRELOAD: LazyLock<HashMap<&'static str, Vec<IpAddr>>> = LazyLock::new
                 IpAddr::V4(Ipv4Addr::new(87, 248, 98, 69)),
             ],
         ),
-        (
-            "imap.arcor.de",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(178, 15, 69, 210)),
-                IpAddr::V4(Ipv4Addr::new(151, 189, 176, 206)),
-            ],
-        ),
         (
             "smtp.aol.com",
             vec![IpAddr::V4(Ipv4Addr::new(87, 248, 97, 31))],
         ),
         (
             "mail.arcor.de",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(151, 189, 176, 206)),
-                IpAddr::V4(Ipv4Addr::new(178, 15, 69, 206)),
-            ],
+            vec![IpAddr::V4(Ipv4Addr::new(2, 207, 150, 234))],
         ),
         (
-            "mail.autistici.org",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(93, 190, 126, 19)),
-                IpAddr::V4(Ipv4Addr::new(185, 218, 207, 228)),
-                IpAddr::V4(Ipv4Addr::new(198, 167, 222, 108)),
-            ],
-        ),
-        (
-            "smtp.autistici.org",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(82, 94, 249, 234)),
-                IpAddr::V4(Ipv4Addr::new(93, 190, 126, 19)),
-                IpAddr::V4(Ipv4Addr::new(198, 167, 222, 108)),
-            ],
-        ),
-        (
-            "imaps.bluewin.ch",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(16, 62, 253, 42)),
-                IpAddr::V4(Ipv4Addr::new(16, 63, 141, 244)),
-                IpAddr::V4(Ipv4Addr::new(16, 63, 146, 183)),
-            ],
-        ),
-        (
-            "smtpauths.bluewin.ch",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(16, 62, 176, 232)),
-                IpAddr::V4(Ipv4Addr::new(16, 62, 15, 25)),
-                IpAddr::V4(Ipv4Addr::new(16, 63, 183, 216)),
-            ],
-        ),
-        (
-            "mail.buzon.uy",
-            vec![IpAddr::V4(Ipv4Addr::new(200, 40, 115, 74))],
-        ),
-        (
-            "daleth.cafe",
-            vec![IpAddr::V4(Ipv4Addr::new(37, 27, 6, 204))],
-        ),
-        (
-            "disroot.org",
-            vec![IpAddr::V4(Ipv4Addr::new(178, 21, 23, 139))],
+            "imap.arcor.de",
+            vec![IpAddr::V4(Ipv4Addr::new(2, 207, 150, 230))],
         ),
         (
             "imap.fastmail.com",
@@ -335,39 +328,6 @@ static DNS_PRELOAD: LazyLock<HashMap<&'static str, Vec<IpAddr>>> = LazyLock::new
                 IpAddr::V4(Ipv4Addr::new(103, 168, 172, 60)),
             ],
         ),
-        (
-            "imap.gmail.com",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(142, 250, 110, 108)),
-                IpAddr::V4(Ipv4Addr::new(142, 250, 110, 109)),
-                IpAddr::V4(Ipv4Addr::new(66, 102, 1, 108)),
-                IpAddr::V4(Ipv4Addr::new(66, 102, 1, 109)),
-                IpAddr::V6(Ipv6Addr::new(0x2a00, 0x1450, 0x400c, 0xc1f, 0, 0, 0, 0x6c)),
-                IpAddr::V6(Ipv6Addr::new(0x2a00, 0x1450, 0x400c, 0xc1f, 0, 0, 0, 0x6d)),
-            ],
-        ),
-        (
-            "mail.ecloud.global",
-            vec![IpAddr::V4(Ipv4Addr::new(95, 217, 246, 96))],
-        ),
-        (
-            "mail.ende.in.net",
-            vec![IpAddr::V4(Ipv4Addr::new(95, 217, 5, 72))],
-        ),
-        (
-            "smtp.gmail.com",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(142, 250, 110, 109)),
-                IpAddr::V6(Ipv6Addr::new(0x2a00, 0x1450, 0x4013, 0xc04, 0, 0, 0, 0x6c)),
-            ],
-        ),
-        (
-            "mail.gmx.net",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(212, 227, 17, 190)),
-                IpAddr::V4(Ipv4Addr::new(212, 227, 17, 168)),
-            ],
-        ),
         (
             "imap.gmx.net",
             vec![
@@ -375,13 +335,6 @@ static DNS_PRELOAD: LazyLock<HashMap<&'static str, Vec<IpAddr>>> = LazyLock::new
                 IpAddr::V4(Ipv4Addr::new(212, 227, 17, 186)),
             ],
         ),
-        (
-            "mail.sangham.net",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(159, 69, 186, 85)),
-                IpAddr::V6(Ipv6Addr::new(0x2a01, 0x4f8, 0xc17, 0x798c, 0, 0, 0, 1)),
-            ],
-        ),
         (
             "imap.mail.de",
             vec![IpAddr::V4(Ipv4Addr::new(62, 201, 172, 16))],
@@ -396,7 +349,7 @@ static DNS_PRELOAD: LazyLock<HashMap<&'static str, Vec<IpAddr>>> = LazyLock::new
         ),
         (
             "imap.naver.com",
-            vec![IpAddr::V4(Ipv4Addr::new(125, 209, 233, 34))],
+            vec![IpAddr::V4(Ipv4Addr::new(125, 209, 238, 153))],
         ),
         (
             "imap.ouvaton.coop",
@@ -406,57 +359,6 @@ static DNS_PRELOAD: LazyLock<HashMap<&'static str, Vec<IpAddr>>> = LazyLock::new
             "imap.purelymail.com",
             vec![IpAddr::V4(Ipv4Addr::new(18, 204, 123, 63))],
         ),
-        (
-            "mail.systemausfall.org",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(51, 75, 71, 249)),
-                IpAddr::V4(Ipv4Addr::new(80, 153, 252, 42)),
-            ],
-        ),
-        (
-            "mail.systemli.org",
-            vec![IpAddr::V4(Ipv4Addr::new(93, 190, 126, 36))],
-        ),
-        ("testrun.org", vec![IpAddr::V4(Ipv4Addr::new(5, 1, 76, 52))]),
-        (
-            "nine.testrun.org",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(128, 140, 126, 197)),
-                IpAddr::V4(Ipv4Addr::new(116, 202, 233, 236)),
-                IpAddr::V4(Ipv4Addr::new(216, 144, 228, 100)),
-                IpAddr::V6(Ipv6Addr::new(0x2a01, 0x4f8, 0x241, 0x4ce8, 0, 0, 0, 2)),
-                IpAddr::V6(Ipv6Addr::new(
-                    0x2001, 0x41d0, 0x701, 0x1100, 0, 0, 0, 0x8ab1,
-                )),
-            ],
-        ),
-        (
-            "secureimap.t-online.de",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(194, 25, 134, 114)),
-                IpAddr::V4(Ipv4Addr::new(194, 25, 134, 115)),
-                IpAddr::V4(Ipv4Addr::new(194, 25, 134, 50)),
-                IpAddr::V4(Ipv4Addr::new(194, 25, 134, 51)),
-            ],
-        ),
-        (
-            "securesmtp.t-online.de",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(194, 25, 134, 46)),
-                IpAddr::V4(Ipv4Addr::new(194, 25, 134, 110)),
-            ],
-        ),
-        (
-            "mail.riseup.net",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(198, 252, 153, 171)),
-                IpAddr::V4(Ipv4Addr::new(198, 252, 153, 170)),
-            ],
-        ),
-        (
-            "pimap.schulon.org",
-            vec![IpAddr::V4(Ipv4Addr::new(194, 77, 246, 20))],
-        ),
         (
             "imap.tiscali.it",
             vec![IpAddr::V4(Ipv4Addr::new(213, 205, 33, 10))],
@@ -465,14 +367,6 @@ static DNS_PRELOAD: LazyLock<HashMap<&'static str, Vec<IpAddr>>> = LazyLock::new
             "smtp.tiscali.it",
             vec![IpAddr::V4(Ipv4Addr::new(213, 205, 33, 13))],
         ),
-        (
-            "imap.ukr.net",
-            vec![IpAddr::V4(Ipv4Addr::new(212, 42, 75, 240))],
-        ),
-        (
-            "smtp.ukr.net",
-            vec![IpAddr::V4(Ipv4Addr::new(212, 42, 75, 250))],
-        ),
         (
             "imap.web.de",
             vec![
@@ -486,9 +380,33 @@ static DNS_PRELOAD: LazyLock<HashMap<&'static str, Vec<IpAddr>>> = LazyLock::new
         ),
         (
             "imap.zoho.eu",
+            vec![IpAddr::V4(Ipv4Addr::new(185, 230, 214, 25))],
+        ),
+        (
+            "imaps.bluewin.ch",
             vec![
-                IpAddr::V4(Ipv4Addr::new(185, 230, 214, 25)),
-                IpAddr::V4(Ipv4Addr::new(185, 230, 214, 206)),
+                IpAddr::V4(Ipv4Addr::new(16, 62, 253, 42)),
+                IpAddr::V4(Ipv4Addr::new(16, 63, 141, 244)),
+                IpAddr::V4(Ipv4Addr::new(16, 63, 146, 183)),
+            ],
+        ),
+        (
+            "mail.buzon.uy",
+            vec![IpAddr::V4(Ipv4Addr::new(185, 101, 93, 79))],
+        ),
+        (
+            "mail.ecloud.global",
+            vec![IpAddr::V4(Ipv4Addr::new(95, 217, 246, 96))],
+        ),
+        (
+            "mail.ende.in.net",
+            vec![IpAddr::V4(Ipv4Addr::new(95, 217, 5, 72))],
+        ),
+        (
+            "mail.gmx.net",
+            vec![
+                IpAddr::V4(Ipv4Addr::new(212, 227, 17, 168)),
+                IpAddr::V4(Ipv4Addr::new(212, 227, 17, 190)),
             ],
         ),
         (
@@ -506,17 +424,45 @@ static DNS_PRELOAD: LazyLock<HashMap<&'static str, Vec<IpAddr>>> = LazyLock::new
             "mail.nubo.coop",
             vec![IpAddr::V4(Ipv4Addr::new(79, 99, 201, 10))],
         ),
+        (
+            "mail.riseup.net",
+            vec![
+                IpAddr::V4(Ipv4Addr::new(198, 252, 153, 70)),
+                IpAddr::V4(Ipv4Addr::new(198, 252, 153, 71)),
+            ],
+        ),
+        (
+            "mail.systemausfall.org",
+            vec![
+                IpAddr::V4(Ipv4Addr::new(51, 75, 71, 249)),
+                IpAddr::V4(Ipv4Addr::new(80, 153, 252, 42)),
+            ],
+        ),
+        (
+            "mail.systemli.org",
+            vec![IpAddr::V4(Ipv4Addr::new(93, 190, 126, 36))],
+        ),
+        (
+            "mehl.cloud",
+            vec![IpAddr::V4(Ipv4Addr::new(95, 217, 223, 172))],
+        ),
         (
             "mx.freenet.de",
             vec![
-                IpAddr::V4(Ipv4Addr::new(194, 97, 208, 36)),
-                IpAddr::V4(Ipv4Addr::new(194, 97, 208, 34)),
-                IpAddr::V4(Ipv4Addr::new(194, 97, 208, 35)),
-                IpAddr::V4(Ipv4Addr::new(194, 97, 208, 39)),
-                IpAddr::V4(Ipv4Addr::new(194, 97, 208, 37)),
-                IpAddr::V4(Ipv4Addr::new(194, 97, 208, 38)),
+                IpAddr::V4(Ipv4Addr::new(195, 4, 92, 210)),
+                IpAddr::V4(Ipv4Addr::new(195, 4, 92, 211)),
+                IpAddr::V4(Ipv4Addr::new(195, 4, 92, 212)),
+                IpAddr::V4(Ipv4Addr::new(195, 4, 92, 213)),
             ],
         ),
+        (
+            "newyear.aktivix.org",
+            vec![IpAddr::V4(Ipv4Addr::new(162, 247, 75, 192))],
+        ),
+        (
+            "pimap.schulon.org",
+            vec![IpAddr::V4(Ipv4Addr::new(194, 77, 246, 20))],
+        ),
         (
             "posteo.de",
             vec![
@@ -528,6 +474,26 @@ static DNS_PRELOAD: LazyLock<HashMap<&'static str, Vec<IpAddr>>> = LazyLock::new
             "psmtp.schulon.org",
             vec![IpAddr::V4(Ipv4Addr::new(194, 77, 246, 20))],
         ),
+        (
+            "secureimap.t-online.de",
+            vec![
+                IpAddr::V4(Ipv4Addr::new(194, 25, 134, 114)),
+                IpAddr::V4(Ipv4Addr::new(194, 25, 134, 115)),
+                IpAddr::V4(Ipv4Addr::new(194, 25, 134, 50)),
+                IpAddr::V4(Ipv4Addr::new(194, 25, 134, 51)),
+            ],
+        ),
+        (
+            "securesmtp.t-online.de",
+            vec![
+                IpAddr::V4(Ipv4Addr::new(194, 25, 134, 110)),
+                IpAddr::V4(Ipv4Addr::new(194, 25, 134, 46)),
+            ],
+        ),
+        (
+            "smtp.aliyun.com",
+            vec![IpAddr::V4(Ipv4Addr::new(47, 246, 136, 232))],
+        ),
         (
             "smtp.mail.de",
             vec![IpAddr::V4(Ipv4Addr::new(62, 201, 172, 21))],
@@ -535,8 +501,8 @@ static DNS_PRELOAD: LazyLock<HashMap<&'static str, Vec<IpAddr>>> = LazyLock::new
         (
             "smtp.mail.ru",
             vec![
-                IpAddr::V4(Ipv4Addr::new(94, 100, 180, 160)),
                 IpAddr::V4(Ipv4Addr::new(217, 69, 139, 160)),
+                IpAddr::V4(Ipv4Addr::new(94, 100, 180, 160)),
             ],
         ),
         (
@@ -554,20 +520,6 @@ static DNS_PRELOAD: LazyLock<HashMap<&'static str, Vec<IpAddr>>> = LazyLock::new
             "imap.mailo.com",
             vec![IpAddr::V4(Ipv4Addr::new(213, 182, 54, 20))],
         ),
-        (
-            "imap.migadu.com",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(51, 210, 3, 23)),
-                IpAddr::V4(Ipv4Addr::new(51, 210, 3, 20)),
-            ],
-        ),
-        (
-            "smtp.migadu.com",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(37, 59, 57, 117)),
-                IpAddr::V4(Ipv4Addr::new(51, 255, 82, 75)),
-            ],
-        ),
         (
             "smtp.mailo.com",
             vec![IpAddr::V4(Ipv4Addr::new(213, 182, 54, 20))],
@@ -586,48 +538,30 @@ static DNS_PRELOAD: LazyLock<HashMap<&'static str, Vec<IpAddr>>> = LazyLock::new
         ),
         (
             "imap.qq.com",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(43, 163, 178, 76)),
-                IpAddr::V4(Ipv4Addr::new(43, 129, 255, 54)),
-            ],
+            vec![IpAddr::V4(Ipv4Addr::new(43, 129, 255, 54))],
         ),
         (
             "smtp.qq.com",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(43, 129, 255, 54)),
-                IpAddr::V4(Ipv4Addr::new(43, 163, 178, 76)),
-            ],
+            vec![IpAddr::V4(Ipv4Addr::new(43, 129, 255, 54))],
         ),
         (
             "imap.rambler.ru",
             vec![
-                IpAddr::V4(Ipv4Addr::new(81, 19, 77, 168)),
                 IpAddr::V4(Ipv4Addr::new(81, 19, 77, 169)),
-                IpAddr::V4(Ipv4Addr::new(81, 19, 77, 170)),
                 IpAddr::V4(Ipv4Addr::new(81, 19, 77, 171)),
+                IpAddr::V4(Ipv4Addr::new(81, 19, 77, 168)),
+                IpAddr::V4(Ipv4Addr::new(81, 19, 77, 170)),
             ],
         ),
         (
             "smtp.rambler.ru",
             vec![
-                IpAddr::V4(Ipv4Addr::new(81, 19, 77, 164)),
                 IpAddr::V4(Ipv4Addr::new(81, 19, 77, 165)),
-                IpAddr::V4(Ipv4Addr::new(81, 19, 77, 166)),
                 IpAddr::V4(Ipv4Addr::new(81, 19, 77, 167)),
+                IpAddr::V4(Ipv4Addr::new(81, 19, 77, 166)),
+                IpAddr::V4(Ipv4Addr::new(81, 19, 77, 164)),
             ],
         ),
-        (
-            "stinpriza.net",
-            vec![IpAddr::V4(Ipv4Addr::new(5, 9, 122, 184))],
-        ),
-        (
-            "webbox222.server-home.org",
-            vec![IpAddr::V4(Ipv4Addr::new(91, 203, 111, 88))],
-        ),
-        (
-            "undernet.uy",
-            vec![IpAddr::V4(Ipv4Addr::new(200, 40, 115, 74))],
-        ),
         (
             "imap.vivaldi.net",
             vec![IpAddr::V4(Ipv4Addr::new(31, 209, 137, 15))],
@@ -638,23 +572,17 @@ static DNS_PRELOAD: LazyLock<HashMap<&'static str, Vec<IpAddr>>> = LazyLock::new
         ),
         (
             "imap.vodafonemail.de",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(178, 15, 69, 210)),
-                IpAddr::V4(Ipv4Addr::new(151, 189, 176, 206)),
-            ],
+            vec![IpAddr::V4(Ipv4Addr::new(2, 207, 150, 230))],
         ),
         (
             "smtp.vodafonemail.de",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(151, 189, 176, 206)),
-                IpAddr::V4(Ipv4Addr::new(178, 15, 69, 206)),
-            ],
+            vec![IpAddr::V4(Ipv4Addr::new(2, 207, 150, 234))],
         ),
         (
             "smtp.web.de",
             vec![
-                IpAddr::V4(Ipv4Addr::new(213, 165, 67, 124)),
                 IpAddr::V4(Ipv4Addr::new(213, 165, 67, 108)),
+                IpAddr::V4(Ipv4Addr::new(213, 165, 67, 124)),
             ],
         ),
         (
@@ -671,76 +599,23 @@ static DNS_PRELOAD: LazyLock<HashMap<&'static str, Vec<IpAddr>>> = LazyLock::new
         ),
         (
             "smtp.zoho.eu",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(185, 230, 212, 164)),
-                IpAddr::V4(Ipv4Addr::new(185, 230, 214, 164)),
-            ],
-        ),
-        // Known public chatmail relays from https://chatmail.at/relays
-        (
-            "mehl.cloud",
-            vec![IpAddr::V4(Ipv4Addr::new(95, 217, 223, 172))],
+            vec![IpAddr::V4(Ipv4Addr::new(185, 230, 212, 164))],
         ),
         (
-            "mailchat.pl",
-            vec![IpAddr::V4(Ipv4Addr::new(46, 62, 144, 137))],
+            "smtpauths.bluewin.ch",
+            vec![IpAddr::V4(Ipv4Addr::new(195, 186, 120, 54))],
         ),
         (
-            "chatmail.woodpeckersnest.space",
-            vec![IpAddr::V4(Ipv4Addr::new(85, 215, 162, 146))],
+            "stinpriza.net",
+            vec![IpAddr::V4(Ipv4Addr::new(5, 9, 122, 184))],
         ),
         (
-            "chatmail.culturanerd.it",
-            vec![IpAddr::V4(Ipv4Addr::new(82, 165, 94, 165))],
+            "undernet.uy",
+            vec![IpAddr::V4(Ipv4Addr::new(167, 62, 254, 153))],
         ),
         (
-            "chatmail.hackea.org",
-            vec![IpAddr::V4(Ipv4Addr::new(82, 165, 11, 85))],
-        ),
-        (
-            "chika.aangat.lahat.computer",
-            vec![IpAddr::V4(Ipv4Addr::new(71, 19, 150, 113))],
-        ),
-        (
-            "tarpit.fun",
-            vec![IpAddr::V4(Ipv4Addr::new(152, 53, 86, 246))],
-        ),
-        (
-            "d.gaufr.es",
-            vec![IpAddr::V4(Ipv4Addr::new(51, 77, 140, 91))],
-        ),
-        (
-            "chtml.ca",
-            vec![IpAddr::V4(Ipv4Addr::new(51, 222, 156, 177))],
-        ),
-        (
-            "chatmail.au",
-            vec![IpAddr::V4(Ipv4Addr::new(45, 124, 54, 79))],
-        ),
-        (
-            "sombras.chat",
-            vec![IpAddr::V4(Ipv4Addr::new(82, 25, 70, 154))],
-        ),
-        (
-            "e2ee.wang",
-            vec![IpAddr::V4(Ipv4Addr::new(139, 84, 233, 161))],
-        ),
-        (
-            "chat.privittytech.com",
-            vec![IpAddr::V4(Ipv4Addr::new(35, 154, 144, 0))],
-        ),
-        ("e2ee.im", vec![IpAddr::V4(Ipv4Addr::new(45, 137, 99, 57))]),
-        (
-            "chatmail.email",
-            vec![IpAddr::V4(Ipv4Addr::new(57, 128, 220, 120))],
-        ),
-        (
-            "danneskjold.de",
-            vec![IpAddr::V4(Ipv4Addr::new(46, 62, 216, 132))],
-        ),
-        (
-            "darkrun.dev",
-            vec![IpAddr::V4(Ipv4Addr::new(72, 11, 149, 146))],
+            "webbox222.server-home.org",
+            vec![IpAddr::V4(Ipv4Addr::new(91, 203, 111, 88))],
         ),
     ])
 });
@@ -850,7 +725,7 @@ pub(crate) async fn lookup_host_with_cache(
         }
     };
 
-    let addrs = if load_cache {
+    if load_cache {
         let mut cache = lookup_cache(context, hostname, port, alpn, now).await?;
         if let Some(ips) = DNS_PRELOAD.get(hostname) {
             for ip in ips {
@@ -861,15 +736,10 @@ pub(crate) async fn lookup_host_with_cache(
             }
         }
 
-        merge_with_cache(resolved_addrs, cache)
+        Ok(merge_with_cache(resolved_addrs, cache))
     } else {
-        resolved_addrs
-    };
-    ensure!(
-        !addrs.is_empty(),
-        "Could not find DNS resolutions for {hostname}:{port}. Check server hostname and your network"
-    );
-    Ok(addrs)
+        Ok(resolved_addrs)
+    }
 }
 
 /// Merges results received from DNS with cached results.

src/net/http.rs

@@ -74,33 +74,19 @@ where
         }
         "https" => {
             let port = parsed_url.port_u16().unwrap_or(443);
-            let (use_sni, load_cache) = (true, true);
+            let load_cache = true;
 
             if let Some(proxy_config) = proxy_config_opt {
                 let proxy_stream = proxy_config
                     .connect(context, host, port, load_cache)
                     .await?;
-                let tls_stream = wrap_rustls(
-                    host,
-                    port,
-                    use_sni,
-                    "",
-                    proxy_stream,
-                    &context.tls_session_store,
-                )
-                .await?;
+                let tls_stream =
+                    wrap_rustls(host, port, "", proxy_stream, &context.tls_session_store).await?;
                 Box::new(tls_stream)
             } else {
                 let tcp_stream = crate::net::connect_tcp(context, host, port, load_cache).await?;
-                let tls_stream = wrap_rustls(
-                    host,
-                    port,
-                    use_sni,
-                    "",
-                    tcp_stream,
-                    &context.tls_session_store,
-                )
-                .await?;
+                let tls_stream =
+                    wrap_rustls(host, port, "", tcp_stream, &context.tls_session_store).await?;
                 Box::new(tls_stream)
             }
         }

src/net/proxy.rs

@@ -429,11 +429,9 @@ impl ProxyConfig {
                     load_cache,
                 )
                 .await?;
-                let use_sni = true;
                 let tls_stream = wrap_rustls(
                     &https_config.host,
                     https_config.port,
-                    use_sni,
                     "",
                     tcp_stream,
                     &context.tls_session_store,

src/net/tls.rs

@@ -13,14 +13,12 @@ pub async fn wrap_tls<'a>(
     strict_tls: bool,
     hostname: &str,
     port: u16,
-    use_sni: bool,
     alpn: &str,
     stream: impl SessionStream + 'static,
     tls_session_store: &TlsSessionStore,
 ) -> Result<impl SessionStream + 'a> {
     if strict_tls {
-        let tls_stream =
-            wrap_rustls(hostname, port, use_sni, alpn, stream, tls_session_store).await?;
+        let tls_stream = wrap_rustls(hostname, port, alpn, stream, tls_session_store).await?;
         let boxed_stream: Box<dyn SessionStream> = Box::new(tls_stream);
         Ok(boxed_stream)
     } else {
@@ -34,7 +32,6 @@ pub async fn wrap_tls<'a>(
         };
         let tls = async_native_tls::TlsConnector::new()
             .min_protocol_version(Some(async_native_tls::Protocol::Tlsv12))
-            .use_sni(use_sni)
             .request_alpns(&alpns)
             .danger_accept_invalid_hostnames(true)
             .danger_accept_invalid_certs(true);
@@ -93,7 +90,6 @@ impl TlsSessionStore {
 pub async fn wrap_rustls<'a>(
     hostname: &str,
     port: u16,
-    use_sni: bool,
     alpn: &str,
     stream: impl SessionStream + 'a,
     tls_session_store: &TlsSessionStore,
@@ -121,7 +117,6 @@ pub async fn wrap_rustls<'a>(
     let resumption = tokio_rustls::rustls::client::Resumption::store(resumption_store)
         .tls12_resumption(tokio_rustls::rustls::client::Tls12Resumption::Disabled);
     config.resumption = resumption;
-    config.enable_sni = use_sni;
 
     let tls = tokio_rustls::TlsConnector::from(Arc::new(config));
     let name = rustls_pki_types::ServerName::try_from(hostname)?.to_owned();

src/param.rs

@@ -433,14 +433,6 @@ impl Params {
         self.set(key, format!("{value}"));
         self
     }
-
-    pub fn steal(&mut self, src: &mut Self, key: Param) -> &mut Self {
-        let val = src.inner.remove(&key);
-        if let Some(val) = val {
-            self.inner.insert(key, val);
-        }
-        self
-    }
 }
 
 #[cfg(test)]

src/pgp.rs

@@ -160,29 +160,14 @@ fn select_pk_for_encryption(key: &SignedPublicKey) -> Option<&SignedPublicSubKey
         .find(|subkey| subkey.is_encryption_key())
 }
 
-/// Version of SEIPD packet to use.
-///
-/// See
-/// <https://www.rfc-editor.org/rfc/rfc9580#name-avoiding-ciphertext-malleab>
-/// for the discussion on when v2 SEIPD should be used.
-#[derive(Debug)]
-pub enum SeipdVersion {
-    /// Use v1 SEIPD, for compatibility.
-    V1,
-
-    /// Use v2 SEIPD when we know that v2 SEIPD is supported.
-    V2,
-}
-
 /// Encrypts `plain` text using `public_keys_for_encryption`
 /// and signs it using `private_key_for_signing`.
 pub async fn pk_encrypt(
     plain: Vec<u8>,
     public_keys_for_encryption: Vec<SignedPublicKey>,
-    private_key_for_signing: SignedSecretKey,
+    private_key_for_signing: Option<SignedSecretKey>,
     compress: bool,
     anonymous_recipients: bool,
-    seipd_version: SeipdVersion,
 ) -> Result<String> {
     Handle::current()
         .spawn_blocking(move || {
@@ -193,49 +178,23 @@ pub async fn pk_encrypt(
                 .filter_map(select_pk_for_encryption);
 
             let msg = MessageBuilder::from_bytes("", plain);
-            let encoded_msg = match seipd_version {
-                SeipdVersion::V1 => {
-                    let mut msg = msg.seipd_v1(&mut rng, SYMMETRIC_KEY_ALGORITHM);
-
-                    for pkey in pkeys {
-                        if anonymous_recipients {
-                            msg.encrypt_to_key_anonymous(&mut rng, &pkey)?;
-                        } else {
-                            msg.encrypt_to_key(&mut rng, &pkey)?;
-                        }
-                    }
-
-                    msg.sign(&*private_key_for_signing, Password::empty(), HASH_ALGORITHM);
-                    if compress {
-                        msg.compression(CompressionAlgorithm::ZLIB);
-                    }
-
-                    msg.to_armored_string(&mut rng, Default::default())?
+            let mut msg = msg.seipd_v1(&mut rng, SYMMETRIC_KEY_ALGORITHM);
+            for pkey in pkeys {
+                if anonymous_recipients {
+                    msg.encrypt_to_key_anonymous(&mut rng, &pkey)?;
+                } else {
+                    msg.encrypt_to_key(&mut rng, &pkey)?;
                 }
-                SeipdVersion::V2 => {
-                    let mut msg = msg.seipd_v2(
-                        &mut rng,
-                        SYMMETRIC_KEY_ALGORITHM,
-                        AeadAlgorithm::Ocb,
-                        ChunkSize::C8KiB,
-                    );
+            }
 
-                    for pkey in pkeys {
-                        if anonymous_recipients {
-                            msg.encrypt_to_key_anonymous(&mut rng, &pkey)?;
-                        } else {
-                            msg.encrypt_to_key(&mut rng, &pkey)?;
-                        }
-                    }
-
-                    msg.sign(&*private_key_for_signing, Password::empty(), HASH_ALGORITHM);
-                    if compress {
-                        msg.compression(CompressionAlgorithm::ZLIB);
-                    }
-
-                    msg.to_armored_string(&mut rng, Default::default())?
+            if let Some(ref skey) = private_key_for_signing {
+                msg.sign(&**skey, Password::empty(), HASH_ALGORITHM);
+                if compress {
+                    msg.compression(CompressionAlgorithm::ZLIB);
                 }
-            };
+            }
+
+            let encoded_msg = msg.to_armored_string(&mut rng, Default::default())?;
 
             Ok(encoded_msg)
         })
@@ -447,7 +406,7 @@ pub async fn symm_encrypt_message(
         };
         let mut msg = msg.seipd_v2(
             &mut rng,
-            SYMMETRIC_KEY_ALGORITHM,
+            SymmetricKeyAlgorithm::AES128,
             AeadAlgorithm::Ocb,
             ChunkSize::C8KiB,
         );
@@ -575,6 +534,7 @@ mod tests {
     static KEYS: LazyLock<TestKeys> = LazyLock::new(TestKeys::new);
 
     static CTEXT_SIGNED: OnceCell<String> = OnceCell::const_new();
+    static CTEXT_UNSIGNED: OnceCell<String> = OnceCell::const_new();
 
     /// A ciphertext encrypted to Alice & Bob, signed by Alice.
     async fn ctext_signed() -> &'static String {
@@ -587,10 +547,30 @@ mod tests {
                 pk_encrypt(
                     CLEARTEXT.to_vec(),
                     keyring,
-                    KEYS.alice_secret.clone(),
+                    Some(KEYS.alice_secret.clone()),
+                    compress,
+                    anonymous_recipients,
+                )
+                .await
+                .unwrap()
+            })
+            .await
+    }
+
+    /// A ciphertext encrypted to Alice & Bob, not signed.
+    async fn ctext_unsigned() -> &'static String {
+        let anonymous_recipients = true;
+        CTEXT_UNSIGNED
+            .get_or_init(|| async {
+                let keyring = vec![KEYS.alice_public.clone(), KEYS.bob_public.clone()];
+                let compress = true;
+
+                pk_encrypt(
+                    CLEARTEXT.to_vec(),
+                    keyring,
+                    None,
                     compress,
                     anonymous_recipients,
-                    SeipdVersion::V2,
                 )
                 .await
                 .unwrap()
@@ -608,6 +588,16 @@ mod tests {
         );
     }
 
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_encrypt_unsigned() {
+        assert!(!ctext_unsigned().await.is_empty());
+        assert!(
+            ctext_unsigned()
+                .await
+                .starts_with("-----BEGIN PGP MESSAGE-----")
+        );
+    }
+
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_decrypt_singed() {
         // Check decrypting as Alice
@@ -662,9 +652,9 @@ mod tests {
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_decrypt_unsigned() {
         let decrypt_keyring = vec![KEYS.bob_secret.clone()];
-        let ctext_unsigned = include_bytes!("../test-data/message/ctext_unsigned.asc");
         let (_msg, valid_signatures, content) =
-            pk_decrypt_and_validate(ctext_unsigned, &decrypt_keyring, &[]).unwrap();
+            pk_decrypt_and_validate(ctext_unsigned().await.as_bytes(), &decrypt_keyring, &[])
+                .unwrap();
         assert_eq!(content, CLEARTEXT);
         assert_eq!(valid_signatures.len(), 0);
     }
@@ -754,15 +744,7 @@ mod tests {
         let pk_for_encryption = load_self_public_key(alice).await?;
 
         // Encrypt a message, but only to self, not to Bob:
-        let ctext = pk_encrypt(
-            plain,
-            vec![pk_for_encryption],
-            KEYS.alice_secret.clone(),
-            true,
-            true,
-            SeipdVersion::V2,
-        )
-        .await?;
+        let ctext = pk_encrypt(plain, vec![pk_for_encryption], None, true, true).await?;
 
         // Trying to decrypt it should fail with an OK error message:
         let bob_private_keyring = crate::key::load_self_secret_keyring(bob).await?;

src/qr.rs

@@ -16,6 +16,7 @@ use serde::Deserialize;
 use crate::config::Config;
 use crate::contact::{Contact, ContactId, Origin};
 use crate::context::Context;
+use crate::events::EventType;
 use crate::key::Fingerprint;
 use crate::login_param::{EnteredCertificateChecks, EnteredLoginParam, EnteredServerLoginParam};
 use crate::net::http::post_empty;
@@ -41,7 +42,7 @@ pub(crate) const DCBACKUP_SCHEME_PREFIX: &str = "DCBACKUP";
 
 /// Version written to Backups and Backup-QR-Codes.
 /// Imports will fail when they have a larger version.
-pub(crate) const DCBACKUP_VERSION: i32 = 4;
+pub(crate) const DCBACKUP_VERSION: i32 = 3;
 
 /// Scanned QR code.
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -823,10 +824,9 @@ pub(crate) async fn login_param_from_account_qr(
         match serde_json::from_str::<CreateAccountErrorResponse>(&response_text) {
             Ok(error) => Err(anyhow!(error.reason)),
             Err(parse_error) => {
-                error!(
-                    context,
+                context.emit_event(EventType::Error(format!(
                     "Cannot create account, server response could not be parsed:\n{parse_error:#}\nraw response:\n{response_text}"
-                );
+                )));
                 bail!("Cannot create account, unexpected server response:\n{response_text:?}")
             }
         }

src/reaction.rs

@@ -991,6 +991,42 @@ Content-Disposition: reaction\n\
         Ok(())
     }
 
+    /// Regression test for reaction resetting self-status.
+    ///
+    /// Reactions do not contain the status,
+    /// but should not result in self-status being reset on other devices.
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_reaction_status_multidevice() -> Result<()> {
+        let mut tcm = TestContextManager::new();
+        let alice1 = tcm.alice().await;
+        let alice2 = tcm.alice().await;
+
+        alice1
+            .set_config(Config::Selfstatus, Some("New status"))
+            .await?;
+
+        let alice2_msg = tcm.send_recv(&alice1, &alice2, "Hi!").await;
+        assert_eq!(
+            alice2.get_config(Config::Selfstatus).await?.as_deref(),
+            Some("New status")
+        );
+
+        // Alice reacts to own message from second device,
+        // first device receives rection.
+        {
+            send_reaction(&alice2, alice2_msg.id, "👍").await?;
+            let msg = alice2.pop_sent_msg().await;
+            alice1.recv_msg_hidden(&msg).await;
+        }
+
+        // Check that the status is still the same.
+        assert_eq!(
+            alice1.get_config(Config::Selfstatus).await?.as_deref(),
+            Some("New status")
+        );
+        Ok(())
+    }
+
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_send_reaction_multidevice() -> Result<()> {
         let mut tcm = TestContextManager::new();

src/receive_imf.rs

@@ -1,6 +1,6 @@
 //! Internet Message Format reception pipeline.
 
-use std::collections::{BTreeMap, BTreeSet, HashSet};
+use std::collections::{BTreeMap, HashSet};
 use std::iter;
 use std::sync::LazyLock;
 
@@ -43,9 +43,7 @@ use crate::simplify;
 use crate::stats::STATISTICS_BOT_EMAIL;
 use crate::stock_str;
 use crate::sync::Sync::*;
-use crate::tools::{
-    self, buf_compress, normalize_text, remove_subject_prefix, validate_broadcast_secret,
-};
+use crate::tools::{self, buf_compress, remove_subject_prefix, validate_broadcast_secret};
 use crate::{chatlist_events, ensure_and_debug_assert, ensure_and_debug_assert_eq, location};
 
 /// This is the struct that is returned after receiving one email (aka MIME message).
@@ -677,22 +675,12 @@ pub(crate) async fn receive_imf_inner(
         let res = if mime_parser.incoming {
             handle_securejoin_handshake(context, &mut mime_parser, from_id)
                 .await
-                .with_context(|| {
-                    format!(
-                        "Error in Secure-Join '{}' message handling",
-                        mime_parser.get_header(HeaderDef::SecureJoin).unwrap_or("")
-                    )
-                })?
+                .context("error in Secure-Join message handling")?
         } else if let Some(to_id) = to_ids.first().copied().flatten() {
             // handshake may mark contacts as verified and must be processed before chats are created
             observe_securejoin_on_other_device(context, &mime_parser, to_id)
                 .await
-                .with_context(|| {
-                    format!(
-                        "Error in Secure-Join '{}' watching",
-                        mime_parser.get_header(HeaderDef::SecureJoin).unwrap_or("")
-                    )
-                })?
+                .context("error in Secure-Join watching")?
         } else {
             securejoin::HandshakeMessage::Propagate
         };
@@ -839,41 +827,6 @@ pub(crate) async fn receive_imf_inner(
     if let Some(ref sync_items) = mime_parser.sync_items {
         if from_id == ContactId::SELF {
             if mime_parser.was_encrypted() {
-                // Receiving encrypted message from self updates primary transport.
-                let from_addr = &mime_parser.from.addr;
-
-                let transport_changed = context
-                    .sql
-                    .transaction(|transaction| {
-                        let transport_exists = transaction.query_row(
-                            "SELECT COUNT(*) FROM transports WHERE addr=?",
-                            (from_addr,),
-                            |row| {
-                                let count: i64 = row.get(0)?;
-                                Ok(count > 0)
-                            },
-                        )?;
-
-                        let transport_changed = if transport_exists {
-                            transaction.execute(
-                                "UPDATE config SET value=? WHERE keyname='configured_addr'",
-                                (from_addr,),
-                            )? > 0
-                        } else {
-                            warn!(
-                                context,
-                                "Received sync message from unknown address {from_addr:?}."
-                            );
-                            false
-                        };
-                        Ok(transport_changed)
-                    })
-                    .await?;
-                if transport_changed {
-                    info!(context, "Primary transport changed to {from_addr:?}.");
-                    context.sql.uncache_raw_config("configured_addr").await;
-                }
-
                 context
                     .execute_sync_items(sync_items, mime_parser.timestamp_sent)
                     .await;
@@ -932,11 +885,13 @@ pub(crate) async fn receive_imf_inner(
     }
 
     if let Some(avatar_action) = &mime_parser.user_avatar
-        && !matches!(from_id, ContactId::UNDEFINED | ContactId::SELF)
+        && from_id != ContactId::UNDEFINED
         && context
             .update_contacts_timestamp(from_id, Param::AvatarTimestamp, mime_parser.timestamp_sent)
             .await?
-        && let Err(err) = contact::set_profile_image(context, from_id, avatar_action).await
+        && let Err(err) =
+            contact::set_profile_image(context, from_id, avatar_action, mime_parser.was_encrypted())
+                .await
     {
         warn!(context, "receive_imf cannot update profile image: {err:#}.");
     };
@@ -944,11 +899,18 @@ pub(crate) async fn receive_imf_inner(
     // Ignore footers from mailinglists as they are often created or modified by the mailinglist software.
     if let Some(footer) = &mime_parser.footer
         && !mime_parser.is_mailinglist_message()
-        && !matches!(from_id, ContactId::UNDEFINED | ContactId::SELF)
+        && from_id != ContactId::UNDEFINED
         && context
             .update_contacts_timestamp(from_id, Param::StatusTimestamp, mime_parser.timestamp_sent)
             .await?
-        && let Err(err) = contact::set_status(context, from_id, footer.to_string()).await
+        && let Err(err) = contact::set_status(
+            context,
+            from_id,
+            footer.to_string(),
+            mime_parser.was_encrypted(),
+            mime_parser.has_chat_version(),
+        )
+        .await
     {
         warn!(context, "Cannot update contact status: {err:#}.");
     }
@@ -1225,19 +1187,19 @@ async fn decide_chat_assignment(
     let mut num_recipients = 0;
     let mut has_self_addr = false;
     for recipient in &mime_parser.recipients {
-        has_self_addr |= context.is_self_addr(&recipient.addr).await?;
         if addr_cmp(&recipient.addr, &mime_parser.from.addr) {
             continue;
         }
+
+        if context.is_self_addr(&recipient.addr).await? {
+            has_self_addr = true;
+        }
+
         num_recipients += 1;
     }
     if from_id != ContactId::SELF && !has_self_addr {
         num_recipients += 1;
     }
-    let can_be_11_chat = num_recipients <= 1
-        && (from_id != ContactId::SELF
-            || !(mime_parser.recipients.is_empty() || has_self_addr)
-            || mime_parser.was_encrypted());
 
     let chat_assignment = if should_trash {
         ChatAssignment::Trash
@@ -1281,14 +1243,14 @@ async fn decide_chat_assignment(
             }
         } else if mime_parser.get_header(HeaderDef::ChatGroupName).is_some() {
             ChatAssignment::AdHocGroup
-        } else if can_be_11_chat {
+        } else if num_recipients <= 1 {
             ChatAssignment::OneOneChat
         } else {
             ChatAssignment::AdHocGroup
         }
     } else if mime_parser.get_header(HeaderDef::ChatGroupName).is_some() {
         ChatAssignment::AdHocGroup
-    } else if can_be_11_chat {
+    } else if num_recipients <= 1 {
         ChatAssignment::OneOneChat
     } else {
         ChatAssignment::AdHocGroup
@@ -1815,16 +1777,11 @@ async fn add_parts(
                     "Updated ephemeral timer to {ephemeral_timer:?} for chat {chat_id}."
                 );
                 if mime_parser.is_system_message != SystemMessage::EphemeralTimerChanged {
-                    chat::add_info_msg_with_cmd(
+                    chat::add_info_msg(
                         context,
                         chat_id,
                         &stock_ephemeral_timer_changed(context, ephemeral_timer, from_id).await,
-                        SystemMessage::Unknown,
-                        Some(sort_timestamp),
-                        mime_parser.timestamp_sent,
-                        None,
-                        None,
-                        None,
+                        sort_timestamp,
                     )
                     .await?;
                 }
@@ -1932,8 +1889,8 @@ async fn add_parts(
             chat_id,
             &group_changes_msg,
             cmd,
-            Some(sort_timestamp),
-            mime_parser.timestamp_sent,
+            sort_timestamp,
+            None,
             None,
             None,
             added_removed_id,
@@ -2106,7 +2063,7 @@ RETURNING id
                     if trash { MessageState::Undefined } else { state },
                     if trash { MessengerMessage::No } else { is_dc_message },
                     if trash || hidden { "" } else { msg },
-                    if trash || hidden { None } else { normalize_text(msg) },
+                    if trash || hidden { None } else { message::normalize_text(msg) },
                     if trash || hidden { "" } else { &subject },
                     if trash {
                         "".to_string()
@@ -2509,8 +2466,11 @@ async fn lookup_or_create_adhoc_group(
                 .unwrap_or_else(|| "👥📧".to_string())
         });
     let to_ids: Vec<ContactId> = to_ids.iter().filter_map(|x| *x).collect();
-    let mut contact_ids = BTreeSet::<ContactId>::from_iter(to_ids.iter().copied());
-    contact_ids.insert(from_id);
+    let mut contact_ids = Vec::with_capacity(to_ids.len() + 1);
+    contact_ids.extend(&to_ids);
+    if !contact_ids.contains(&from_id) {
+        contact_ids.push(from_id);
+    }
     let trans_fn = |t: &mut rusqlite::Transaction| {
         t.pragma_update(None, "query_only", "0")?;
         t.execute(
@@ -2518,11 +2478,10 @@ async fn lookup_or_create_adhoc_group(
                 id INTEGER PRIMARY KEY
             ) STRICT",
             (),
-        )
-        .context("CREATE TEMP TABLE temp.contacts")?;
+        )?;
         let mut stmt = t.prepare("INSERT INTO temp.contacts(id) VALUES (?)")?;
         for &id in &contact_ids {
-            stmt.execute((id,)).context("INSERT INTO temp.contacts")?;
+            stmt.execute((id,))?;
         }
         let val = t
             .query_row(
@@ -2544,10 +2503,8 @@ async fn lookup_or_create_adhoc_group(
                     Ok((id, blocked))
                 },
             )
-            .optional()
-            .context("Select chat with matching name and members")?;
-        t.execute("DROP TABLE temp.contacts", ())
-            .context("DROP TABLE temp.contacts")?;
+            .optional()?;
+        t.execute("DROP TABLE temp.contacts", ())?;
         Ok(val)
     };
     let query_only = true;
@@ -3103,10 +3060,7 @@ async fn apply_chat_name_and_avatar_changes(
             info!(context, "Updating grpname for chat {}.", chat.id);
             context
                 .sql
-                .execute(
-                    "UPDATE chats SET name=?, name_normalized=? WHERE id=?",
-                    (grpname, normalize_text(grpname), chat.id),
-                )
+                .execute("UPDATE chats SET name=? WHERE id=?;", (grpname, chat.id))
                 .await?;
             *send_event_chat_modified = true;
         }
@@ -3395,10 +3349,7 @@ async fn apply_mailinglist_changes(
         info!(context, "Updating listname for chat {chat_id}.");
         context
             .sql
-            .execute(
-                "UPDATE chats SET name=?, name_normalized=? WHERE id=?",
-                (&new_name, normalize_text(&new_name), chat_id),
-            )
+            .execute("UPDATE chats SET name=? WHERE id=?;", (new_name, chat_id))
             .await?;
         context.emit_event(EventType::ChatModified(chat_id));
     }
@@ -3645,6 +3596,13 @@ async fn create_adhoc_group(
         );
         return Ok(Some((DC_CHAT_ID_TRASH, Blocked::Not)));
     }
+    if member_ids.len() < 2 {
+        info!(
+            context,
+            "Not creating ad hoc group with less than 2 members."
+        );
+        return Ok(None);
+    }
 
     let new_chat_id: ChatId = ChatId::create_multiuser_record(
         context,

src/receive_imf/receive_imf_tests.rs

@@ -1964,53 +1964,28 @@ Message content",
     assert_ne!(msg.chat_id, t.get_self_chat().await.id);
 }
 
-/// Tests that an outgoing self-sent unencrypted message doesn't go to the self-chat, but to a
-/// proper unencrypted chat instead.
+/// Tests that message with hidden recipients is assigned to Saved Messages chat.
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_unencrypted_doesnt_goto_self_chat() -> Result<()> {
-    let mut tcm = TestContextManager::new();
-    let t = &tcm.alice().await;
-    let mut chat_id = None;
+async fn test_hidden_recipients_self_chat() {
+    let t = TestContext::new_alice().await;
 
-    for (i, to) in [
-        "<alice@example.org>",
-        "<alice@example.org>",
-        "alice@example.org, alice@example.org",
-        "hidden-recipients:;",
-    ]
-    .iter()
-    .enumerate()
-    {
-        receive_imf(
-            t,
-            format!(
-                "Subject: s
+    receive_imf(
+        &t,
+        b"Subject: s
 Chat-Version: 1.0
-Message-ID: <foobar{i}@localhost>
-To: {to}
+Message-ID: <foobar@localhost>
+To: hidden-recipients:;
 From: <alice@example.org>
 
-Your server is hacked. Have a nice day!"
-            )
-            .as_bytes(),
-            false,
-        )
-        .await?;
+Message content",
+        false,
+    )
+    .await
+    .unwrap();
 
-        let msg = t.get_last_msg().await;
-        assert_ne!(msg.chat_id, t.get_self_chat().await.id);
-        assert_eq!(msg.from_id, ContactId::SELF);
-        assert_eq!(msg.to_id, ContactId::SELF);
-        if let Some(chat_id) = chat_id {
-            assert_eq!(msg.chat_id, chat_id);
-        } else {
-            chat_id = Some(msg.chat_id);
-            let chat = Chat::load_from_db(t, msg.chat_id).await?;
-            assert_eq!(chat.typ, Chattype::Group);
-            assert!(!chat.is_encrypted(t).await?);
-        }
-    }
-    Ok(())
+    let msg = t.get_last_msg().await;
+    assert_eq!(msg.chat_id, t.get_self_chat().await.id);
+    assert_eq!(msg.to_id, ContactId::SELF);
 }
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -5011,7 +4986,7 @@ async fn test_make_n_send_vcard() -> Result<()> {
     Ok(())
 }
 
-/// Tests that an ad-hoc group is created if the message
+/// Tests that group is not created if the message
 /// has no recipients even if it has unencrypted Chat-Group-ID.
 ///
 /// Chat-Group-ID in unencrypted messages should be ignored.
@@ -5030,12 +5005,8 @@ Hello!"
         .as_bytes();
     let received = receive_imf(t, raw, false).await?.unwrap();
     let msg = Message::load_from_db(t, *received.msg_ids.last().unwrap()).await?;
-    assert_eq!(msg.from_id, ContactId::SELF);
-    assert_eq!(msg.to_id, ContactId::SELF);
     let chat = Chat::load_from_db(t, msg.chat_id).await?;
-    assert_eq!(chat.typ, Chattype::Group);
-    assert!(!chat.is_encrypted(t).await?);
-    assert!(chat.grpid.is_empty());
+    assert_eq!(chat.typ, Chattype::Single);
 
     // Check that the weird group name is sanitzied correctly:
     let mail = mailparse::parse_mail(raw).unwrap();
@@ -5046,7 +5017,7 @@ Hello!"
             .get_value_raw(),
         "Group\n name\u{202B}".as_bytes()
     );
-    assert_eq!(chat.name, "Group name");
+    assert_eq!(chat.name, "Saved messages");
 
     Ok(())
 }
@@ -5183,58 +5154,6 @@ async fn test_dont_reverify_by_self_on_outgoing_msg() -> Result<()> {
     Ok(())
 }
 
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_dont_verify_by_verified_by_unknown() -> Result<()> {
-    let mut tcm = TestContextManager::new();
-    let a0 = &tcm.alice().await;
-    let a1 = &tcm.alice().await;
-    let bob = &tcm.bob().await;
-    let fiona = &tcm.fiona().await;
-
-    let bob_chat_id = chat::create_group(bob, "Group").await?;
-    bob.set_chat_protected(bob_chat_id).await;
-    let qr = get_securejoin_qr(bob, Some(bob_chat_id)).await?;
-    tcm.exec_securejoin_qr(a0, bob, &qr).await;
-
-    let qr = get_securejoin_qr(bob, None).await?;
-    tcm.exec_securejoin_qr(fiona, bob, &qr).await;
-
-    // Bob verifies Fiona for Alice#0.
-    let bob_fiona_id = bob.add_or_lookup_contact_id(fiona).await;
-    add_contact_to_chat(bob, bob_chat_id, bob_fiona_id).await?;
-    let sent_msg = bob.pop_sent_msg().await;
-    a0.recv_msg(&sent_msg).await;
-    fiona.recv_msg(&sent_msg).await;
-    let a0_bob = a0.add_or_lookup_contact(bob).await;
-    let a0_fiona = a0.add_or_lookup_contact(fiona).await;
-    assert_eq!(a0_fiona.get_verifier_id(a0).await?, Some(Some(a0_bob.id)));
-
-    let chat_id = a0.create_group_with_members("", &[fiona]).await;
-    a0.set_chat_protected(chat_id).await;
-    a1.recv_msg(&a0.send_text(chat_id, "Hi").await).await;
-    let a1_fiona = a1.add_or_lookup_contact(fiona).await;
-    assert_eq!(a1_fiona.get_verifier_id(a1).await?, Some(None));
-
-    let some_time_to_regossip = Duration::from_secs(20 * 24 * 3600);
-    SystemTime::shift(some_time_to_regossip);
-    let fiona_chat_id = fiona.get_last_msg().await.chat_id;
-    fiona.set_chat_protected(fiona_chat_id).await;
-    a1.recv_msg(&fiona.send_text(fiona_chat_id, "Hi").await)
-        .await;
-    let a1_bob = a1.add_or_lookup_contact(bob).await;
-    // There was a bug that Bob is verified by Fiona on Alice's other device.
-    assert_eq!(a1_bob.get_verifier_id(a1).await?, Some(None));
-
-    SystemTime::shift(some_time_to_regossip);
-    tcm.execute_securejoin(a1, fiona).await;
-    a1.recv_msg(&fiona.send_text(fiona_chat_id, "Hi").await)
-        .await;
-    // But now Bob's verifier id must be updated because Fiona is verified by a known verifier
-    // (moreover, directly), so Alice has reverse verification chains on her devices.
-    assert_eq!(a1_bob.get_verifier_id(a1).await?, Some(Some(a1_fiona.id)));
-    Ok(())
-}
-
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_sanitize_filename_in_received() -> Result<()> {
     let alice = &TestContext::new_alice().await;

src/scheduler.rs

@@ -1,4 +1,5 @@
 use std::cmp;
+use std::iter::{self, once};
 use std::num::NonZeroUsize;
 
 use anyhow::{Context as _, Error, Result, bail};
@@ -25,7 +26,6 @@ use crate::smtp::{Smtp, send_smtp_messages};
 use crate::sql;
 use crate::stats::maybe_send_stats;
 use crate::tools::{self, duration_to_str, maybe_add_time_based_warnings, time, time_elapsed};
-use crate::transport::ConfiguredLoginParam;
 use crate::{constants, stats};
 
 pub(crate) mod connectivity;
@@ -145,14 +145,14 @@ impl SchedulerState {
                 InnerSchedulerState::Started(_) => {
                     let new_state = InnerSchedulerState::Paused {
                         started: true,
-                        pause_guards_count: NonZeroUsize::MIN,
+                        pause_guards_count: NonZeroUsize::new(1).unwrap(),
                     };
                     Self::do_stop(&mut inner, context, new_state).await;
                 }
                 InnerSchedulerState::Stopped => {
                     *inner = InnerSchedulerState::Paused {
                         started: false,
-                        pause_guards_count: NonZeroUsize::MIN,
+                        pause_guards_count: NonZeroUsize::new(1).unwrap(),
                     };
                 }
                 InnerSchedulerState::Paused {
@@ -183,7 +183,7 @@ impl SchedulerState {
                     ref started,
                     ref mut pause_guards_count,
                 } => {
-                    if *pause_guards_count == NonZeroUsize::MIN {
+                    if *pause_guards_count == NonZeroUsize::new(1).unwrap() {
                         match *started {
                             true => SchedulerState::do_start(&mut inner, &context).await,
                             false => *inner = InnerSchedulerState::Stopped,
@@ -212,25 +212,21 @@ impl SchedulerState {
     /// Indicate that the network likely has come back.
     pub(crate) async fn maybe_network(&self) {
         let inner = self.inner.read().await;
-        let (inboxes, oboxes) = match *inner {
+        let (inbox, oboxes) = match *inner {
             InnerSchedulerState::Started(ref scheduler) => {
                 scheduler.maybe_network();
-                let inboxes = scheduler
-                    .inboxes
-                    .iter()
-                    .map(|b| b.conn_state.state.connectivity.clone())
-                    .collect::<Vec<_>>();
+                let inbox = scheduler.inbox.conn_state.state.connectivity.clone();
                 let oboxes = scheduler
                     .oboxes
                     .iter()
                     .map(|b| b.conn_state.state.connectivity.clone())
                     .collect::<Vec<_>>();
-                (inboxes, oboxes)
+                (inbox, oboxes)
             }
             _ => return,
         };
         drop(inner);
-        connectivity::idle_interrupted(inboxes, oboxes);
+        connectivity::idle_interrupted(inbox, oboxes);
     }
 
     /// Indicate that the network likely is lost.
@@ -325,8 +321,6 @@ impl Drop for IoPausedGuard {
 
 #[derive(Debug)]
 struct SchedBox {
-    /// Hostname of used chatmail/email relay
-    host: String,
     meaning: FolderMeaning,
     conn_state: ImapConnectionState,
 
@@ -337,8 +331,7 @@ struct SchedBox {
 /// Job and connection scheduler.
 #[derive(Debug)]
 pub(crate) struct Scheduler {
-    /// Inboxes, one per transport.
-    inboxes: Vec<SchedBox>,
+    inbox: SchedBox,
     /// Optional boxes -- mvbox.
     oboxes: Vec<SchedBox>,
     smtp: SmtpConnectionState,
@@ -538,9 +531,9 @@ async fn inbox_fetch_idle(ctx: &Context, imap: &mut Imap, mut session: Session)
         .await
         .context("Failed to download messages")?;
     session
-        .update_metadata(ctx)
+        .fetch_metadata(ctx)
         .await
-        .context("update_metadata")?;
+        .context("Failed to fetch metadata")?;
     session
         .register_token(ctx)
         .await
@@ -580,19 +573,12 @@ async fn fetch_idle(
                 mvbox.as_deref().unwrap_or(&watch_folder)
             }
         };
-        if ctx
-            .get_config(Config::ConfiguredAddr)
-            .await?
-            .unwrap_or_default()
-            == connection.addr
-        {
-            session
-                .send_sync_msgs(ctx, syncbox)
-                .await
-                .context("fetch_idle: send_sync_msgs")
-                .log_err(ctx)
-                .ok();
-        }
+        session
+            .send_sync_msgs(ctx, syncbox)
+            .await
+            .context("fetch_idle: send_sync_msgs")
+            .log_err(ctx)
+            .ok();
 
         session
             .store_seen_flags_on_imap(ctx)
@@ -871,48 +857,34 @@ impl Scheduler {
         let (ephemeral_interrupt_send, ephemeral_interrupt_recv) = channel::bounded(1);
         let (location_interrupt_send, location_interrupt_recv) = channel::bounded(1);
 
-        let mut inboxes = Vec::new();
         let mut oboxes = Vec::new();
         let mut start_recvs = Vec::new();
 
-        for (transport_id, configured_login_param) in ConfiguredLoginParam::load_all(ctx).await? {
-            let (conn_state, inbox_handlers) =
-                ImapConnectionState::new(ctx, transport_id, configured_login_param.clone()).await?;
-            let (inbox_start_send, inbox_start_recv) = oneshot::channel();
-            let handle = {
-                let ctx = ctx.clone();
-                task::spawn(inbox_loop(ctx, inbox_start_send, inbox_handlers))
-            };
-            let host = configured_login_param
-                .addr
-                .split("@")
-                .last()
-                .context("address has no host")?
-                .to_owned();
-            let inbox = SchedBox {
-                host: host.clone(),
-                meaning: FolderMeaning::Inbox,
+        let (conn_state, inbox_handlers) = ImapConnectionState::new(ctx).await?;
+        let (inbox_start_send, inbox_start_recv) = oneshot::channel();
+        let handle = {
+            let ctx = ctx.clone();
+            task::spawn(inbox_loop(ctx, inbox_start_send, inbox_handlers))
+        };
+        let inbox = SchedBox {
+            meaning: FolderMeaning::Inbox,
+            conn_state,
+            handle,
+        };
+        start_recvs.push(inbox_start_recv);
+
+        if ctx.should_watch_mvbox().await? {
+            let (conn_state, handlers) = ImapConnectionState::new(ctx).await?;
+            let (start_send, start_recv) = oneshot::channel();
+            let ctx = ctx.clone();
+            let meaning = FolderMeaning::Mvbox;
+            let handle = task::spawn(simple_imap_loop(ctx, start_send, handlers, meaning));
+            oboxes.push(SchedBox {
+                meaning,
                 conn_state,
                 handle,
-            };
-            inboxes.push(inbox);
-            start_recvs.push(inbox_start_recv);
-
-            if ctx.should_watch_mvbox().await? {
-                let (conn_state, handlers) =
-                    ImapConnectionState::new(ctx, transport_id, configured_login_param).await?;
-                let (start_send, start_recv) = oneshot::channel();
-                let ctx = ctx.clone();
-                let meaning = FolderMeaning::Mvbox;
-                let handle = task::spawn(simple_imap_loop(ctx, start_send, handlers, meaning));
-                oboxes.push(SchedBox {
-                    host,
-                    meaning,
-                    conn_state,
-                    handle,
-                });
-                start_recvs.push(start_recv);
-            }
+            });
+            start_recvs.push(start_recv);
         }
 
         let smtp_handle = {
@@ -938,7 +910,7 @@ impl Scheduler {
         let recently_seen_loop = RecentlySeenLoop::new(ctx.clone());
 
         let res = Self {
-            inboxes,
+            inbox,
             oboxes,
             smtp,
             smtp_handle,
@@ -958,8 +930,8 @@ impl Scheduler {
         Ok(res)
     }
 
-    fn boxes(&self) -> impl Iterator<Item = &SchedBox> {
-        self.inboxes.iter().chain(self.oboxes.iter())
+    fn boxes(&self) -> iter::Chain<iter::Once<&SchedBox>, std::slice::Iter<'_, SchedBox>> {
+        once(&self.inbox).chain(self.oboxes.iter())
     }
 
     fn maybe_network(&self) {
@@ -977,9 +949,7 @@ impl Scheduler {
     }
 
     fn interrupt_inbox(&self) {
-        for b in &self.inboxes {
-            b.conn_state.interrupt();
-        }
+        self.inbox.conn_state.interrupt();
     }
 
     fn interrupt_oboxes(&self) {
@@ -1019,7 +989,7 @@ impl Scheduler {
         let timeout_duration = std::time::Duration::from_secs(30);
 
         let tracker = TaskTracker::new();
-        for b in self.inboxes.into_iter().chain(self.oboxes.into_iter()) {
+        for b in once(self.inbox).chain(self.oboxes) {
             let context = context.clone();
             tracker.spawn(async move {
                 tokio::time::timeout(timeout_duration, b.handle)
@@ -1125,17 +1095,12 @@ pub(crate) struct ImapConnectionState {
 
 impl ImapConnectionState {
     /// Construct a new connection.
-    async fn new(
-        context: &Context,
-        transport_id: u32,
-        login_param: ConfiguredLoginParam,
-    ) -> Result<(Self, ImapConnectionHandlers)> {
+    async fn new(context: &Context) -> Result<(Self, ImapConnectionHandlers)> {
         let stop_token = CancellationToken::new();
         let (idle_interrupt_sender, idle_interrupt_receiver) = channel::bounded(1);
 
         let handlers = ImapConnectionHandlers {
-            connection: Imap::new(context, transport_id, login_param, idle_interrupt_receiver)
-                .await?,
+            connection: Imap::new_configured(context, idle_interrupt_receiver).await?,
             stop_token: stop_token.clone(),
         };