cache virtualevns with core versions

.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
@@ -40,7 +39,7 @@ jobs:
       - run: rustup override set $RUST_VERSION
         shell: bash
       - name: Cache rust cargo artifacts
-        uses: swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5
+        uses: swatinem/rust-cache@v2
       - name: Run rustfmt
         run: cargo fmt --all -- --check
       - name: Run clippy
@@ -53,13 +52,12 @@ jobs:
   cargo_deny:
     name: cargo deny
     runs-on: ubuntu-latest
-    timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
-      - uses: EmbarkStudios/cargo-deny-action@76cd80eb775d7bbbd2d80292136d74d39e1b4918
+      - uses: EmbarkStudios/cargo-deny-action@v2
         with:
           arguments: --all-features --workspace
           command: check
@@ -68,9 +66,8 @@ jobs:
   provider_database:
     name: Check provider database
     runs-on: ubuntu-latest
-    timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
@@ -82,16 +79,15 @@ jobs:
   docs:
     name: Rust doc comments
     runs-on: ubuntu-latest
-    timeout-minutes: 60
     env:
       RUSTDOCFLAGS: -Dwarnings
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
       - name: Cache rust cargo artifacts
-        uses: swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5
+        uses: swatinem/rust-cache@v2
       - name: Rustdoc
         run: cargo doc --document-private-items --no-deps
 
@@ -111,7 +107,6 @@ jobs:
           - os: ubuntu-latest
             rust: minimum
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
     steps:
       - run:
           echo "RUSTUP_TOOLCHAIN=$MSRV" >> $GITHUB_ENV
@@ -122,7 +117,7 @@ jobs:
         shell: bash
         if: matrix.rust == 'latest'
 
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
@@ -134,10 +129,10 @@ jobs:
         shell: bash
 
       - name: Cache rust cargo artifacts
-        uses: swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5
+        uses: swatinem/rust-cache@v2
 
       - name: Install nextest
-        uses: taiki-e/install-action@69e777b377e4ec209ddad9426ae3e0c1008b0ef3
+        uses: taiki-e/install-action@v2
         with:
           tool: nextest
 
@@ -160,21 +155,20 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
 
       - name: Cache rust cargo artifacts
-        uses: swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5
+        uses: swatinem/rust-cache@v2
 
       - name: Build C library
         run: cargo build -p deltachat_ffi
 
       - name: Upload C library
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
         with:
           name: ${{ matrix.os }}-libdeltachat.a
           path: target/debug/libdeltachat.a
@@ -186,21 +180,20 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
 
       - name: Cache rust cargo artifacts
-        uses: swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5
+        uses: swatinem/rust-cache@v2
 
       - name: Build deltachat-rpc-server
         run: cargo build -p deltachat-rpc-server
 
       - name: Upload deltachat-rpc-server
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
         with:
           name: ${{ matrix.os }}-deltachat-rpc-server
           path: ${{ matrix.os == 'windows-latest' && 'target/debug/deltachat-rpc-server.exe' || 'target/debug/deltachat-rpc-server' }}
@@ -209,9 +202,8 @@ jobs:
   python_lint:
     name: Python lint
     runs-on: ubuntu-latest
-    timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
@@ -227,38 +219,6 @@ jobs:
         working-directory: deltachat-rpc-client
         run: tox -e lint
 
-  # mypy does not work with PyPy since mypy 1.19
-  # as it introduced native `librt` dependency
-  # that uses CPython internals.
-  # We only run mypy with CPython because of this.
-  cffi_python_mypy:
-    name: CFFI Python mypy
-    needs: ["c_library", "python_lint"]
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          show-progress: false
-          persist-credentials: false
-
-      - name: Download libdeltachat.a
-        uses: actions/download-artifact@v7
-        with:
-          name: ubuntu-latest-libdeltachat.a
-          path: target/debug
-
-      - name: Install tox
-        run: pip install tox
-
-      - name: Run mypy
-        env:
-          DCC_RS_TARGET: debug
-          DCC_RS_DEV: ${{ github.workspace }}
-        working-directory: python
-        run: tox -e mypy
-
-
   cffi_python_tests:
     name: CFFI Python tests
     needs: ["c_library", "python_lint"]
@@ -278,22 +238,21 @@ jobs:
           - os: macos-latest
             python: pypy3.10
 
-          # Minimum Supported Python Version = 3.10
+          # Minimum Supported Python Version = 3.8
           # This is the minimum version for which manylinux Python wheels are
           # built. Test it with minimum supported Rust version.
           - os: ubuntu-latest
-            python: "3.10"
+            python: 3.8
 
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
 
       - name: Download libdeltachat.a
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
         with:
           name: ${{ matrix.os }}-libdeltachat.a
           path: target/debug
@@ -312,7 +271,7 @@ jobs:
           DCC_RS_TARGET: debug
           DCC_RS_DEV: ${{ github.workspace }}
         working-directory: python
-        run: tox -e doc,py
+        run: tox -e mypy,doc,py
 
   rpc_python_tests:
     name: JSON-RPC Python tests
@@ -334,14 +293,13 @@ jobs:
           - os: macos-latest
             python: pypy3.10
 
-          # Minimum Supported Python Version = 3.10
+          # Minimum Supported Python Version = 3.8
           - os: ubuntu-latest
-            python: "3.10"
+            python: 3.8
 
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
@@ -355,7 +313,7 @@ jobs:
         run: pip install tox
 
       - name: Download deltachat-rpc-server
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
         with:
           name: ${{ matrix.os }}-deltachat-rpc-server
           path: target/debug

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

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

.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
@@ -25,7 +25,7 @@ jobs:
         with:
           node-version: 18.x
       - name: Add Rust cache
-        uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5
+        uses: Swatinem/rust-cache@v2
       - name: npm install
         working-directory: deltachat-jsonrpc/typescript
         run: npm install

.github/workflows/nix.yml

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

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

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
@@ -23,7 +23,7 @@ jobs:
         working-directory: deltachat-rpc-client
         run: python3 -m build
       - name: Store the distribution packages
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
         with:
           name: python-package-distributions
           path: deltachat-rpc-client/dist/
@@ -42,9 +42,9 @@ jobs:
 
     steps:
       - name: Download all the dists
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
         with:
           name: python-package-distributions
           path: dist/
       - name: Publish deltachat-rpc-client to PyPI
-        uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e
+        uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/repl.yml

@@ -14,15 +14,15 @@ jobs:
     name: Build REPL example
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
-      - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
+      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
       - name: Build
         run: nix build .#deltachat-repl-win64
       - name: Upload binary
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
         with:
           name: repl.exe
           path: "result/bin/deltachat-repl.exe"

.github/workflows/upload-docs.yml

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

.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@681c641aba71e4a1c380be3ab5e12ad51f415867
+        uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3
 
       - name: Run zizmor
         run: uvx zizmor --format sarif . > results.sarif

CHANGELOG.md

@@ -1,268 +1,5 @@
 # Changelog
 
-## [2.36.0] - 2026-01-03
-
-### CI
-
-- Pin GitHub Action references.
-
-### API-Changes
-
-- Add transports event to FFI.
-
-### Features / Changes
-
-- Add core version to `receive_imf` failure message.
-- Connectivity view: quota for all transports ([#7630](https://github.com/chatmail/core/pull/7630)).
-- Send sync messages over SMTP and do not move them to mvbox.
-
-### Fixes
-
-- When accepting group, add members with `Origin::IncomingTo` and sort them down in the contact list (7592).
-- Update fallback welcome message.
-- `inner_configure`: Check Config::OnlyFetchMvbox before MvboxMove for multi-transport ([#7637](https://github.com/chatmail/core/pull/7637)).
-- Reset options not available for chatmail on chatmail profiles.
-- Don't send webxdc notification for `notify: "*"` when chat is muted ([#7658](https://github.com/chatmail/core/pull/7658)).
-
-### Documentation
-
-- `delete_chat()`: don't lie that messages aren't deleted from server.
-- Remove references to removed `sentbox_watch` config.
-- Update documentation for `TransportsModified` event.
-
-### Tests
-
-- Contact list after accepting group with unknown contacts ([#7592](https://github.com/chatmail/core/pull/7592)).
-- Port test_import_export_online_all to JSON-RPC ([#7411](https://github.com/chatmail/core/pull/7411)).
-
-### Refactor
-
-- Turn `DC_VERSION_STR` into `&str`.
-- ffi: Remove one pointer indirection for `dc_accounts_t`.
-
-### Miscellaneous Tasks
-
-- deps: Bump actions/download-artifact from 6 to 7.
-- deps: Bump actions/upload-artifact from 5 to 6.
-- deps: Bump astral-sh/setup-uv from 7.1.4 to 7.1.6.
-- deps: Bump cachix/install-nix-action from 31.8.4 to 31.9.0.
-- cargo: Bump serde_json from 1.0.145 to 1.0.147.
-- cargo: Bump uuid from 1.18.1 to 1.19.0.
-- cargo: Bump toml from 0.9.8 to 0.9.10+spec-1.1.0.
-- cargo: Bump tempfile from 3.23.0 to 3.24.0.
-- cargo: Bump libc from 0.2.177 to 0.2.178.
-- cargo: Bump tracing from 0.1.41 to 0.1.44.
-- cargo: Bump hyper-util from 0.1.18 to 0.1.19.
-- cargo: Bump log from 0.4.28 to 0.4.29.
-- cargo: Bump rustls-pki-types from 1.13.0 to 1.13.2.
-- cargo: Bump criterion from 0.7.0 to 0.8.1.
-
-## [2.35.0] - 2025-12-16
-
-### API-Changes
-
-- Add blob dir size to storage info ([#7605](https://github.com/chatmail/core/pull/7605)).
-
-### Features / Changes
-
-- Use `turn.delta.chat` as fallback TURN server ([#7382](https://github.com/chatmail/core/pull/7382)).
-- Add ip addresses of known public chatmail relays from https://chatmail.at/relays to DNS cache ([#7607](https://github.com/chatmail/core/pull/7607)).
-- Improve error messages on adding relays.
-- Add transport addresses to IMAP URLs in message info.
-- `lookup_host_with_cache()`: Don't return empty address list ([#7596](https://github.com/chatmail/core/pull/7596)).
-
-### Fixes
-
-- `get_chat_msgs_ex()`: Don't match on "S=" (Cmd) in param payload.
-- Remove `SecurejoinWait` info message when received Alice's key ([#7585](https://github.com/chatmail/core/pull/7585)).
-- Do not set normalized name for existing chats and contacts in a migration.
-- Remove now redundant "used_account_settings" and "entered_account_settings" from `Context.get_info()` ([#7587](https://github.com/chatmail/core/pull/7587)).
-- Don't use fallback servers if got TURN servers from IMAP METADATA.
-- Use fallback ICE servers if server can't IMAP METADATA ([#7382](https://github.com/chatmail/core/pull/7382)).
-- Add explicit limit for adding relays (5 at the moment) ([#7611](https://github.com/chatmail/core/pull/7611)).
-- Take `transport_id` into account when using `imap` table.
-
-### CI
-
-- Update Rust to 1.92.0.
-
-### Miscellaneous Tasks
-
-- Apply Rust 1.92.0 clippy suggestions.
-
-### Other
-
-- Log entered login params and actual used params on configuration failure ([#7610](https://github.com/chatmail/core/pull/7610)).
-
-## [2.34.0] - 2025-12-11
-
-### API-Changes
-
-- rpc-client: Accept `Account` for `Chat.{add,remove}_contact()`.
-- rpc-client: Add `Chat.num_contacts()`.
-- Forwarding messages to another profile ([#7491](https://github.com/chatmail/core/pull/7491)).
-
-### Features / Changes
-
-- Double ringing time to 120 seconds.
-- Better logging for failing securejoin messages ([#7593](https://github.com/chatmail/core/pull/7593)).
-- Add multi-transport information to `Context.get_info` ([#7583](https://github.com/chatmail/core/pull/7583))
-
-### Fixes
-
-- Multi-transport: all transports were shown as "inbox" in connectivity view, now they are shown by their hostname ([#7582](https://github.com/chatmail/core/pull/7582)).
-- Multi-transport: Synchronize primary transport immediately after changing it.
-- Use u64 instead of usize to calculate storage usage.
-- Use u64 to represent the number of bytes in backup files.
-- Use u64 to count the number of bytes sent/received over the network.
-- Use logging macros instead of emitting event directly, so that it is also logged by tracing ([#7459](https://github.com/chatmail/core/pull/7459)).
-- Let securejoin succeed even if the chat was deleted in the meantime ([#7594](https://github.com/chatmail/core/pull/7594)).
-
-### Miscellaneous Tasks
-
-- Add RUSTSEC-2025-0134 exception to deny.toml.
-
-### Refactor
-
-- Use u16 instead of usize to represent progress bar.
-- Remove EncryptHelper.prefer_encrypt.
-- Add params when forwarding message instead of removing unneeded ones.
-
-### Tests
-
-- Port test_synchronize_member_list_on_group_rejoin to JSON-RPC.
-- Test setting up second device between core versions.
-
-## [2.33.0] - 2025-12-05
-
-### Features / Changes
-
-- Case-insensitive search for non-ASCII chat and contact names ([#7477](https://github.com/chatmail/core/pull/7477)).
-
-### Fixes
-
-- Recognize all transport addresses as own addresses.
-
-## [2.32.0] - 2025-12-04
-
-Version bump to trigger publishing of npm prebuilds
-that failed to be published for 2.31.0 due to not configured "trusted publishers".
-
-### Features / Changes
-
-- Lookup_or_create_adhoc_group(): Add context to SQL errors ([#7554](https://github.com/chatmail/core/pull/7554)).
-
-## [2.31.0] - 2025-12-04
-
-### CI
-
-- Update npm before publishing packages.
-
-### Features / Changes
-
-- Use v2 SEIPD when sending messages to self.
-
-## [2.30.0] - 2025-12-04
-
-### Features / Changes
-
-- Disable SNI for STARTTLS ([#7499](https://github.com/chatmail/core/pull/7499)).
-- Introduce cross-core testing along with improvements to test frameworking.
-- Synchronize transports via sync messages.
-
-### Fixes
-
-- Fix shutdown shortly after call.
-
-### API-Changes
-
-- Add `TransportsModified` event (for tests).
-
-### CI
-
-- Use "trusted publishing" for NPM packages.
-
-### Miscellaneous Tasks
-
-- deps: Bump actions/checkout from 5 to 6.
-- cargo: Bump syn from 2.0.110 to 2.0.111.
-- deps: Bump astral-sh/setup-uv from 7.1.3 to 7.1.4.
-- cargo: Bump sdp from 0.8.0 to 0.10.0.
-- Remove two outdated todo comments ([#7550](https://github.com/chatmail/core/pull/7550)).
-
-## [2.29.0] - 2025-12-01
-
-### API-Changes
-
-- deltachat-rpc-client: Add Message.exists().
-
-### Features / Changes
-
-- [**breaking**] Increase backup version from 3 to 4.
-- Hide `To` header in encrypted messages.
-- `deltachat_rpc_client.Rpc` accepts `rpc_server_path` for using a particular deltachat-rpc-server ([#7493](https://github.com/chatmail/core/pull/7493)).
-- Don't send `Chat-Group-Avatar` header in unencrypted groups.
-- Don't update `self-{avatar,status}` from received messages ([#7002](https://github.com/chatmail/core/pull/7002)).
-
-### Fixes
-
-- `CREATE INDEX imap_only_rfc724_mid ON imap(rfc724_mid)` ([#7490](https://github.com/chatmail/core/pull/7490)).
-- Use the same webxdc ratelimit for all email servers.
-- Handle the case when account does not exist in `get_existing_msg_ids()`.
-- Don't send self-avatar in unencrypted messages ([#7136](https://github.com/chatmail/core/pull/7136)).
-- Do not configure folders during transport configuration.
-- Upload sync messages only with the primary transport.
-- Do not use deprecated ConfiguredProvider in get_configured_provider.
-
-### Build system
-
-- Make scripts for remote testing usable.
-- Increase minimum supported Python version to 3.10.
-- Use SPDX license expression in Python package metadata.
-
-### CI
-
-- Set timeout-minutes for all jobs in ci.yaml workflow.
-- Do not install Python manually to bulid RPC server wheels.
-- Do not build fake RPC server source packages.
-- Build Python wheels in separate jobs.
-
-### Refactor
-
-- [**breaking**] Remove some unneeded stock strings ([#7496](https://github.com/chatmail/core/pull/7496)).
-- Strike events in rpc-client request handling, get result from queue.
-- Use ConfiguredProvider config directly when loading legacy settings.
-- Remove update_icons and disable_server_delete migrations.
-- Use `SYMMETRIC_KEY_ALGORITHM` constant in `symm_encrypt_message()`.
-- Make signing key non-optional for `pk_encrypt`.
-
-### Tests
-
-- `test_remove_member_bcc`: Test unencrypted group as it was initially.
-
-### Miscellaneous Tasks
-
-- deps: Bump cachix/install-nix-action from 31.8.1 to 31.8.4.
-- cargo: Bump hyper from 1.7.0 to 1.8.1.
-- cargo: Bump human-panic from 2.0.3 to 2.0.4.
-- cargo: Bump hyper-util from 0.1.17 to 0.1.18.
-- cargo: Bump rusqlite from 0.36.0 to 0.37.0.
-- cargo: Bump tokio-util from 0.7.16 to 0.7.17.
-- cargo: Bump toml from 0.9.7 to 0.9.8.
-- cargo: Bump proptest from 1.8.0 to 1.9.0.
-- cargo: Bump parking_lot from 0.12.4 to 0.12.5.
-- cargo: Bump syn from 2.0.106 to 2.0.110.
-- cargo: Bump quick-xml from 0.38.3 to 0.38.4.
-- cargo: Bump rustls-pki-types from 1.12.0 to 1.13.0.
-- cargo: Bump nu-ansi-term from 0.50.1 to 0.50.3.
-- cargo: Bump sanitize-filename from 0.5.0 to 0.6.0.
-- cargo: Bump quote from 1.0.41 to 1.0.42.
-- cargo: Bump libc from 0.2.176 to 0.2.177.
-- cargo: Bump bytes from 1.10.1 to 1.11.0.
-- cargo: Bump image from 0.25.8 to 0.25.9.
-- cargo: Bump rand from 0.9.0 to 0.9.2 ([#7501](https://github.com/chatmail/core/pull/7501)).
-- cargo: Bump tokio from 1.45.1 to 1.48.0.
-
 ## [2.28.0] - 2025-11-23
 
 ### API-Changes
@@ -7499,11 +7236,3 @@ https://github.com/chatmail/core/pulls?q=is%3Apr+is%3Aclosed
 [2.26.0]: https://github.com/chatmail/core/compare/v2.25.0..v2.26.0
 [2.27.0]: https://github.com/chatmail/core/compare/v2.26.0..v2.27.0
 [2.28.0]: https://github.com/chatmail/core/compare/v2.27.0..v2.28.0
-[2.29.0]: https://github.com/chatmail/core/compare/v2.28.0..v2.29.0
-[2.30.0]: https://github.com/chatmail/core/compare/v2.29.0..v2.30.0
-[2.31.0]: https://github.com/chatmail/core/compare/v2.30.0..v2.31.0
-[2.32.0]: https://github.com/chatmail/core/compare/v2.31.0..v2.32.0
-[2.33.0]: https://github.com/chatmail/core/compare/v2.32.0..v2.33.0
-[2.34.0]: https://github.com/chatmail/core/compare/v2.33.0..v2.34.0
-[2.35.0]: https://github.com/chatmail/core/compare/v2.34.0..v2.35.0
-[2.36.0]: https://github.com/chatmail/core/compare/v2.35.0..v2.36.0

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "2.36.0"
+version = "2.28.0"
 edition = "2024"
 license = "MPL-2.0"
 rust-version = "1.88"
@@ -88,7 +88,7 @@ regex = { workspace = true }
 rusqlite = { workspace = true, features = ["sqlcipher"] }
 rustls-pki-types = "1.12.0"
 sanitize-filename = { workspace = true }
-sdp = "0.10.0"
+sdp = "0.8.0"
 serde_json = { workspace = true }
 serde_urlencoded = "0.7.1"
 serde = { workspace = true, features = ["derive"] }
@@ -111,12 +111,11 @@ toml = "0.9"
 tracing = "0.1.41"
 url = "2"
 uuid = { version = "1", features = ["serde", "v4"] }
-walkdir = "2.5.0"
 webpki-roots = "0.26.8"
 
 [dev-dependencies]
 anyhow = { workspace = true, features = ["backtrace"] } # Enable `backtrace` feature in tests.
-criterion = { version = "0.8.1", features = ["async_tokio"] }
+criterion = { version = "0.7.0", features = ["async_tokio"] }
 futures-lite = { workspace = true }
 log = { workspace = true }
 nu-ansi-term = { workspace = true }
@@ -195,14 +194,14 @@ nu-ansi-term = "0.50"
 num-traits = "0.2"
 rand = "0.9"
 regex = "1.10"
-rusqlite = "0.37"
-sanitize-filename = "0.6"
+rusqlite = "0.36"
+sanitize-filename = "0.5"
 serde = "1.0"
 serde_json = "1"
-tempfile = "3.24.0"
+tempfile = "3.23.0"
 thiserror = "2"
 tokio = "1"
-tokio-util = "0.7.17"
+tokio-util = "0.7.16"
 tracing-subscriber = "0.3"
 yerpc = "0.6.4"
 

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.36.0"
+version = "2.28.0"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"

deltachat-ffi/deltachat.h

@@ -429,13 +429,16 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  *                    1=send a copy of outgoing messages to self (default).
  *                    Sending messages to self is needed for a proper multi-account setup,
  *                    however, on the other hand, may lead to unwanted notifications in non-delta clients.
+ * - `sentbox_watch`= 1=watch `Sent`-folder for changes,
+ *                    0=do not watch the `Sent`-folder (default).
  * - `mvbox_move`   = 1=detect chat messages,
  *                    move them to the `DeltaChat` folder,
  *                    and watch the `DeltaChat` folder for updates (default),
  *                    0=do not move chat-messages
  * - `only_fetch_mvbox` = 1=Do not fetch messages from folders other than the
  *                    `DeltaChat` folder. Messages will still be fetched from the
- *                    spam folder.
+ *                    spam folder and `sendbox_watch` will also still be respected
+ *                    if enabled.
  *                    0=watch all folders normally (default)
  * - `show_emails`  = DC_SHOW_EMAILS_OFF (0)=
  *                    show direct replies to chats only,
@@ -1235,11 +1238,9 @@ uint32_t        dc_init_webxdc_integration    (dc_context_t* context, uint32_t c
  *     This needs to be a one-to-one chat.
  * @param place_call_info any data that other devices receive
  *     in #DC_EVENT_INCOMING_CALL.
- * @param has_video_initially Whether the call has video.
- *     This allows the recipient's client to adjust UX.
  * @return ID of the system message announcing the call.
  */
-uint32_t        dc_place_outgoing_call       (dc_context_t* context, uint32_t chat_id, const char* place_call_info, int has_video_initially);
+uint32_t        dc_place_outgoing_call       (dc_context_t* context, uint32_t chat_id, const char* place_call_info);
 
 
 /**
@@ -1610,10 +1611,10 @@ void            dc_set_chat_visibility       (dc_context_t* context, uint32_t ch
  *
  * Messages are deleted from the device and the chat database entry is deleted.
  * After that, the event #DC_EVENT_MSGS_CHANGED is posted.
- * Messages are deleted from the server in background.
  *
  * Things that are _not_ done implicitly:
  *
+ * - Messages are **not deleted from the server**.
  * - The chat or the contact is **not blocked**, so new messages from the user/the group may appear
  *   and the user may create the chat again.
  * - **Groups are not left** - this would
@@ -6701,16 +6702,6 @@ void dc_event_unref(dc_event_t* event);
  */
 #define DC_EVENT_CALL_ENDED                               2580
 
-/**
- * Transport relay added/deleted or default has changed.
- * UI should update the list.
- *
- * The event is emitted when the transports are modified on another device
- * using the JSON-RPC calls `add_or_update_transport`, `add_transport_from_qr`, `delete_transport`
- * or `set_config(configured_addr)`.
- */
-#define DC_EVENT_TRANSPORTS_MODIFIED           2600
-
 
 /**
  * @}
@@ -7224,6 +7215,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.
@@ -7313,6 +7309,12 @@ void dc_event_unref(dc_event_t* event);
 /// Used as a headline in the connectivity view.
 #define DC_STR_OUTGOING_MESSAGES          104
 
+/// "Storage on %1$s"
+///
+/// Used as a headline in the connectivity view.
+///
+/// `%1$s` will be replaced by the domain of the configured e-mail address.
+#define DC_STR_STORAGE_ON_DOMAIN          105
 
 /// @deprecated Deprecated 2022-04-16, this string is no longer needed.
 #define DC_STR_ONE_MOMENT                 106
@@ -7414,6 +7416,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.
@@ -7662,6 +7677,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.

deltachat-ffi/src/lib.rs

@@ -15,6 +15,7 @@ use std::collections::BTreeMap;
 use std::convert::TryFrom;
 use std::fmt::Write;
 use std::future::Future;
+use std::ops::Deref;
 use std::ptr;
 use std::str::FromStr;
 use std::sync::{Arc, LazyLock};
@@ -558,7 +559,6 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
         EventType::IncomingCallAccepted { .. } => 2560,
         EventType::OutgoingCallAccepted { .. } => 2570,
         EventType::CallEnded { .. } => 2580,
-        EventType::TransportsModified => 2600,
         #[allow(unreachable_patterns)]
         #[cfg(test)]
         _ => unreachable!("This is just to silence a rust_analyzer false-positive"),
@@ -593,8 +593,7 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
         | EventType::AccountsBackgroundFetchDone
         | EventType::ChatlistChanged
         | EventType::AccountsChanged
-        | EventType::AccountsItemChanged
-        | EventType::TransportsModified => 0,
+        | EventType::AccountsItemChanged => 0,
         EventType::IncomingReaction { contact_id, .. }
         | EventType::IncomingWebxdcNotify { contact_id, .. } => contact_id.to_u32() as libc::c_int,
         EventType::MsgsChanged { chat_id, .. }
@@ -682,8 +681,7 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
         | EventType::IncomingCallAccepted { .. }
         | EventType::OutgoingCallAccepted { .. }
         | EventType::CallEnded { .. }
-        | EventType::EventChannelOverflow { .. }
-        | EventType::TransportsModified => 0,
+        | EventType::EventChannelOverflow { .. } => 0,
         EventType::MsgsChanged { msg_id, .. }
         | EventType::ReactionsChanged { msg_id, .. }
         | EventType::IncomingReaction { msg_id, .. }
@@ -782,8 +780,7 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
         | EventType::AccountsChanged
         | EventType::AccountsItemChanged
         | EventType::IncomingCallAccepted { .. }
-        | EventType::WebxdcRealtimeAdvertisementReceived { .. }
-        | EventType::TransportsModified => ptr::null_mut(),
+        | EventType::WebxdcRealtimeAdvertisementReceived { .. } => ptr::null_mut(),
         EventType::IncomingCall {
             place_call_info, ..
         } => {
@@ -1181,7 +1178,6 @@ pub unsafe extern "C" fn dc_place_outgoing_call(
     context: *mut dc_context_t,
     chat_id: u32,
     place_call_info: *const libc::c_char,
-    has_video_initially: bool,
 ) -> u32 {
     if context.is_null() || chat_id == 0 {
         eprintln!("ignoring careless call to dc_place_outgoing_call()");
@@ -1191,7 +1187,7 @@ pub unsafe extern "C" fn dc_place_outgoing_call(
     let chat_id = ChatId::new(chat_id);
     let place_call_info = to_string_lossy(place_call_info);
 
-    block_on(ctx.place_outgoing_call(chat_id, place_call_info, has_video_initially))
+    block_on(ctx.place_outgoing_call(chat_id, place_call_info))
         .context("Failed to place call")
         .log_err(ctx)
         .map(|msg_id| msg_id.to_u32())
@@ -4739,13 +4735,33 @@ pub unsafe extern "C" fn dc_provider_unref(provider: *mut dc_provider_t) {
 
 /// Reader-writer lock wrapper for accounts manager to guarantee thread safety when using
 /// `dc_accounts_t` in multiple threads at once.
-pub type dc_accounts_t = RwLock<Accounts>;
+pub struct AccountsWrapper {
+    inner: Arc<RwLock<Accounts>>,
+}
+
+impl Deref for AccountsWrapper {
+    type Target = Arc<RwLock<Accounts>>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.inner
+    }
+}
+
+impl AccountsWrapper {
+    fn new(accounts: Accounts) -> Self {
+        let inner = Arc::new(RwLock::new(accounts));
+        Self { inner }
+    }
+}
+
+/// Struct representing a list of deltachat accounts.
+pub type dc_accounts_t = AccountsWrapper;
 
 #[no_mangle]
 pub unsafe extern "C" fn dc_accounts_new(
     dir: *const libc::c_char,
     writable: libc::c_int,
-) -> *const dc_accounts_t {
+) -> *mut dc_accounts_t {
     setup_panic!();
 
     if dir.is_null() {
@@ -4756,7 +4772,7 @@ pub unsafe extern "C" fn dc_accounts_new(
     let accs = block_on(Accounts::new(as_path(dir).into(), writable != 0));
 
     match accs {
-        Ok(accs) => Arc::into_raw(Arc::new(RwLock::new(accs))),
+        Ok(accs) => Box::into_raw(Box::new(AccountsWrapper::new(accs))),
         Err(err) => {
             // We are using Anyhow's .context() and to show the inner error, too, we need the {:#}:
             eprintln!("failed to create accounts: {err:#}");
@@ -4769,17 +4785,17 @@ pub unsafe extern "C" fn dc_accounts_new(
 ///
 /// This function releases the memory of the `dc_accounts_t` structure.
 #[no_mangle]
-pub unsafe extern "C" fn dc_accounts_unref(accounts: *const dc_accounts_t) {
+pub unsafe extern "C" fn dc_accounts_unref(accounts: *mut dc_accounts_t) {
     if accounts.is_null() {
         eprintln!("ignoring careless call to dc_accounts_unref()");
         return;
     }
-    drop(Arc::from_raw(accounts));
+    let _ = Box::from_raw(accounts);
 }
 
 #[no_mangle]
 pub unsafe extern "C" fn dc_accounts_get_account(
-    accounts: *const dc_accounts_t,
+    accounts: *mut dc_accounts_t,
     id: u32,
 ) -> *mut dc_context_t {
     if accounts.is_null() {
@@ -4796,7 +4812,7 @@ pub unsafe extern "C" fn dc_accounts_get_account(
 
 #[no_mangle]
 pub unsafe extern "C" fn dc_accounts_get_selected_account(
-    accounts: *const dc_accounts_t,
+    accounts: *mut dc_accounts_t,
 ) -> *mut dc_context_t {
     if accounts.is_null() {
         eprintln!("ignoring careless call to dc_accounts_get_selected_account()");
@@ -4812,7 +4828,7 @@ pub unsafe extern "C" fn dc_accounts_get_selected_account(
 
 #[no_mangle]
 pub unsafe extern "C" fn dc_accounts_select_account(
-    accounts: *const dc_accounts_t,
+    accounts: *mut dc_accounts_t,
     id: u32,
 ) -> libc::c_int {
     if accounts.is_null() {
@@ -4836,13 +4852,13 @@ pub unsafe extern "C" fn dc_accounts_select_account(
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn dc_accounts_add_account(accounts: *const dc_accounts_t) -> u32 {
+pub unsafe extern "C" fn dc_accounts_add_account(accounts: *mut dc_accounts_t) -> u32 {
     if accounts.is_null() {
         eprintln!("ignoring careless call to dc_accounts_add_account()");
         return 0;
     }
 
-    let accounts = &*accounts;
+    let accounts = &mut *accounts;
 
     block_on(async move {
         let mut accounts = accounts.write().await;
@@ -4857,13 +4873,13 @@ pub unsafe extern "C" fn dc_accounts_add_account(accounts: *const dc_accounts_t)
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn dc_accounts_add_closed_account(accounts: *const dc_accounts_t) -> u32 {
+pub unsafe extern "C" fn dc_accounts_add_closed_account(accounts: *mut dc_accounts_t) -> u32 {
     if accounts.is_null() {
         eprintln!("ignoring careless call to dc_accounts_add_closed_account()");
         return 0;
     }
 
-    let accounts = &*accounts;
+    let accounts = &mut *accounts;
 
     block_on(async move {
         let mut accounts = accounts.write().await;
@@ -4879,7 +4895,7 @@ pub unsafe extern "C" fn dc_accounts_add_closed_account(accounts: *const dc_acco
 
 #[no_mangle]
 pub unsafe extern "C" fn dc_accounts_remove_account(
-    accounts: *const dc_accounts_t,
+    accounts: *mut dc_accounts_t,
     id: u32,
 ) -> libc::c_int {
     if accounts.is_null() {
@@ -4887,7 +4903,7 @@ pub unsafe extern "C" fn dc_accounts_remove_account(
         return 0;
     }
 
-    let accounts = &*accounts;
+    let accounts = &mut *accounts;
 
     block_on(async move {
         let mut accounts = accounts.write().await;
@@ -4905,7 +4921,7 @@ pub unsafe extern "C" fn dc_accounts_remove_account(
 
 #[no_mangle]
 pub unsafe extern "C" fn dc_accounts_migrate_account(
-    accounts: *const dc_accounts_t,
+    accounts: *mut dc_accounts_t,
     dbfile: *const libc::c_char,
 ) -> u32 {
     if accounts.is_null() || dbfile.is_null() {
@@ -4913,7 +4929,7 @@ pub unsafe extern "C" fn dc_accounts_migrate_account(
         return 0;
     }
 
-    let accounts = &*accounts;
+    let accounts = &mut *accounts;
     let dbfile = to_string_lossy(dbfile);
 
     block_on(async move {
@@ -4934,7 +4950,7 @@ pub unsafe extern "C" fn dc_accounts_migrate_account(
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn dc_accounts_get_all(accounts: *const dc_accounts_t) -> *mut dc_array_t {
+pub unsafe extern "C" fn dc_accounts_get_all(accounts: *mut dc_accounts_t) -> *mut dc_array_t {
     if accounts.is_null() {
         eprintln!("ignoring careless call to dc_accounts_get_all()");
         return ptr::null_mut();
@@ -4948,18 +4964,18 @@ pub unsafe extern "C" fn dc_accounts_get_all(accounts: *const dc_accounts_t) ->
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn dc_accounts_start_io(accounts: *const dc_accounts_t) {
+pub unsafe extern "C" fn dc_accounts_start_io(accounts: *mut dc_accounts_t) {
     if accounts.is_null() {
         eprintln!("ignoring careless call to dc_accounts_start_io()");
         return;
     }
 
-    let accounts = &*accounts;
+    let accounts = &mut *accounts;
     block_on(async move { accounts.write().await.start_io().await });
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn dc_accounts_stop_io(accounts: *const dc_accounts_t) {
+pub unsafe extern "C" fn dc_accounts_stop_io(accounts: *mut dc_accounts_t) {
     if accounts.is_null() {
         eprintln!("ignoring careless call to dc_accounts_stop_io()");
         return;
@@ -4970,7 +4986,7 @@ pub unsafe extern "C" fn dc_accounts_stop_io(accounts: *const dc_accounts_t) {
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn dc_accounts_maybe_network(accounts: *const dc_accounts_t) {
+pub unsafe extern "C" fn dc_accounts_maybe_network(accounts: *mut dc_accounts_t) {
     if accounts.is_null() {
         eprintln!("ignoring careless call to dc_accounts_maybe_network()");
         return;
@@ -4981,7 +4997,7 @@ pub unsafe extern "C" fn dc_accounts_maybe_network(accounts: *const dc_accounts_
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn dc_accounts_maybe_network_lost(accounts: *const dc_accounts_t) {
+pub unsafe extern "C" fn dc_accounts_maybe_network_lost(accounts: *mut dc_accounts_t) {
     if accounts.is_null() {
         eprintln!("ignoring careless call to dc_accounts_maybe_network_lost()");
         return;
@@ -4993,7 +5009,7 @@ pub unsafe extern "C" fn dc_accounts_maybe_network_lost(accounts: *const dc_acco
 
 #[no_mangle]
 pub unsafe extern "C" fn dc_accounts_background_fetch(
-    accounts: *const dc_accounts_t,
+    accounts: *mut dc_accounts_t,
     timeout_in_seconds: u64,
 ) -> libc::c_int {
     if accounts.is_null() || timeout_in_seconds <= 2 {
@@ -5012,7 +5028,7 @@ pub unsafe extern "C" fn dc_accounts_background_fetch(
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn dc_accounts_stop_background_fetch(accounts: *const dc_accounts_t) {
+pub unsafe extern "C" fn dc_accounts_stop_background_fetch(accounts: *mut dc_accounts_t) {
     if accounts.is_null() {
         eprintln!("ignoring careless call to dc_accounts_stop_background_fetch()");
         return;
@@ -5024,7 +5040,7 @@ pub unsafe extern "C" fn dc_accounts_stop_background_fetch(accounts: *const dc_a
 
 #[no_mangle]
 pub unsafe extern "C" fn dc_accounts_set_push_device_token(
-    accounts: *const dc_accounts_t,
+    accounts: *mut dc_accounts_t,
     token: *const libc::c_char,
 ) {
     if accounts.is_null() {
@@ -5047,7 +5063,7 @@ pub unsafe extern "C" fn dc_accounts_set_push_device_token(
 
 #[no_mangle]
 pub unsafe extern "C" fn dc_accounts_get_event_emitter(
-    accounts: *const dc_accounts_t,
+    accounts: *mut dc_accounts_t,
 ) -> *mut dc_event_emitter_t {
     if accounts.is_null() {
         eprintln!("ignoring careless call to dc_accounts_get_event_emitter()");
@@ -5067,16 +5083,16 @@ pub struct dc_jsonrpc_instance_t {
 
 #[no_mangle]
 pub unsafe extern "C" fn dc_jsonrpc_init(
-    account_manager: *const dc_accounts_t,
+    account_manager: *mut dc_accounts_t,
 ) -> *mut dc_jsonrpc_instance_t {
     if account_manager.is_null() {
         eprintln!("ignoring careless call to dc_jsonrpc_init()");
         return ptr::null_mut();
     }
 
-    let account_manager = Arc::from_raw(account_manager);
+    let account_manager = &*account_manager;
     let cmd_api = block_on(deltachat_jsonrpc::api::CommandApi::from_arc(
-        account_manager.clone(),
+        account_manager.inner.clone(),
     ));
 
     let (request_handle, receiver) = RpcClient::new();

deltachat-jsonrpc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "2.36.0"
+version = "2.28.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,12 +10,11 @@ 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::{get_all_ui_config_keys, Config};
+use deltachat::config::Config;
 use deltachat::constants::DC_MSG_ID_DAYMARKER;
 use deltachat::contact::{may_be_valid_addr, Contact, ContactId, Origin};
 use deltachat::context::get_info;
@@ -35,13 +34,14 @@ 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::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 +121,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 +329,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)
     }
@@ -452,12 +458,6 @@ impl CommandApi {
         Ok(result)
     }
 
-    /// Returns all `ui.*` config keys that were set by the UI.
-    async fn get_all_ui_config_keys(&self, account_id: u32) -> Result<Vec<String>> {
-        let ctx = self.get_context(account_id).await?;
-        get_all_ui_config_keys(&ctx).await
-    }
-
     async fn set_stock_strings(&self, strings: HashMap<u32, String>) -> Result<()> {
         let accounts = self.accounts.read().await;
         for (stock_id, stock_message) in strings {
@@ -801,11 +801,11 @@ impl CommandApi {
     /// Delete a chat.
     ///
     /// Messages are deleted from the device and the chat database entry is deleted.
-    /// After that, a `MsgsChanged` event is emitted.
-    /// Messages are deleted from the server in background.
+    /// After that, the event #DC_EVENT_MSGS_CHANGED is posted.
     ///
     /// Things that are _not done_ implicitly:
     ///
+    /// - Messages are **not deleted from the server**.
     /// - The chat or the contact is **not blocked**, so new messages from the user/the group may appear as a contact request
     ///   and the user may create the chat again.
     /// - **Groups are not left** - this would
@@ -1307,18 +1307,13 @@ impl CommandApi {
     ///
     /// 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())
-        }
+        let context = self.get_context(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())
     }
 
     async fn get_message_list_items(
@@ -2141,11 +2136,10 @@ impl CommandApi {
         account_id: u32,
         chat_id: u32,
         place_call_info: String,
-        has_video_initially: bool,
     ) -> Result<u32> {
         let ctx = self.get_context(account_id).await?;
         let msg_id = ctx
-            .place_outgoing_call(ChatId::new(chat_id), place_call_info, has_video_initially)
+            .place_outgoing_call(ChatId::new(chat_id), place_call_info)
             .await?;
         Ok(msg_id.to_u32())
     }
@@ -2209,27 +2203,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/calls.rs

@@ -1,6 +1,6 @@
 use anyhow::{Context as _, Result};
 
-use deltachat::calls::{call_state, CallState};
+use deltachat::calls::{call_state, sdp_has_video, CallState};
 use deltachat::context::Context;
 use deltachat::message::MsgId;
 use serde::Serialize;
@@ -15,8 +15,8 @@ pub struct JsonrpcCallInfo {
     /// even if incoming call event was missed.
     pub sdp_offer: String,
 
-    /// True if the call is started as a video call.
-    pub has_video_initially: bool,
+    /// True if SDP offer has a video.
+    pub has_video: bool,
 
     /// Call state.
     ///
@@ -30,12 +30,12 @@ impl JsonrpcCallInfo {
             format!("Attempting to get call state of non-call message {msg_id}")
         })?;
         let sdp_offer = call_info.place_call_info.clone();
-        let has_video_initially = call_info.has_video_initially();
+        let has_video = sdp_has_video(&sdp_offer).unwrap_or_default();
         let state = JsonrpcCallState::from_msg_id(context, msg_id).await?;
 
         Ok(JsonrpcCallInfo {
             sdp_offer,
-            has_video_initially,
+            has_video,
             state,
         })
     }

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.
-    ///
-    /// UI should update the list.
-    ///
-    /// This event is emitted when transport
-    /// synchronization messages arrives,
-    /// but not when the UI modifies the transport list by itself.
-    TransportsModified,
 }
 
 impl From<CoreEventType> for EventType {
@@ -651,8 +642,6 @@ impl From<CoreEventType> for EventType {
                 msg_id: msg_id.to_u32(),
                 chat_id: chat_id.to_u32(),
             },
-            CoreEventType::TransportsModified => TransportsModified,
-
             #[allow(unreachable_patterns)]
             #[cfg(test)]
             _ => unreachable!("This is just to silence a rust_analyzer false-positive"),

deltachat-jsonrpc/typescript/package.json

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

deltachat-repl/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-repl"
-version = "2.36.0"
+version = "2.28.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.36.0"
-license = "MPL-2.0"
+version = "2.28.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/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)
@@ -303,7 +295,7 @@ class Chat:
             f.flush()
             self._rpc.send_msg(self.account.id, self.id, {"viewtype": ViewType.VCARD, "file": f.name})
 
-    def place_outgoing_call(self, place_call_info: str, has_video_initially: bool) -> Message:
+    def place_outgoing_call(self, place_call_info: str) -> Message:
         """Starts an outgoing call."""
-        msg_id = self._rpc.place_outgoing_call(self.account.id, self.id, place_call_info, has_video_initially)
+        msg_id = self._rpc.place_outgoing_call(self.account.id, self.id, place_call_info)
         return Message(self.account, msg_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,8 +3,6 @@
 from __future__ import annotations
 
 import os
-import pathlib
-import platform
 import random
 import subprocess
 import sys
@@ -25,18 +23,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."""
 
@@ -222,49 +208,25 @@ def log():
 #
 
 
-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):
+    def get_core_python(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])
+        if venv:
+            return venv
+        venv = tmp_path_factory.mktemp(f"temp-{core_version}")
+        python = sys.executable
+        subprocess.check_call([python, "-m", "venv", venv])
+        pip = venv.joinpath("bin", "pip")
+        pkgs = [f"deltachat-rpc-server=={core_version}", f"deltachat-rpc-client=={core_version}"]
+        subprocess.check_call([pip, "install", "pytest"] + pkgs)
 
-            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
+        return venv
 
-            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
+    return get_core_python
 
 
 @pytest.fixture
@@ -276,7 +238,8 @@ def alice_and_remote_bob(tmp_path, acfactory, get_core_python_env):
     """
 
     def factory(core_version):
-        python, rpc_server_path = get_core_python_env(core_version)
+        venv = get_core_python_env(core_version)
+        python = venv.joinpath("bin", "python")
         gw = execnet.makegateway(f"popen//python={python}")
 
         accounts_dir = str(tmp_path.joinpath("account1_venv1"))
@@ -284,7 +247,7 @@ def alice_and_remote_bob(tmp_path, acfactory, get_core_python_env):
         cm = os.environ.get("CHATMAIL_DOMAIN")
 
         # trigger getting an online account on bob's side
-        channel.send((accounts_dir, str(rpc_server_path), cm))
+        channel.send((accounts_dir, str(venv.joinpath("bin", "deltachat-rpc-server")), cm))
 
         # meanwhile get a local alice account
         alice = acfactory.get_online_account()
@@ -306,27 +269,18 @@ def alice_and_remote_bob(tmp_path, acfactory, get_core_python_env):
 
 
 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
+    import pathlib
 
     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
+    bin_path = str(pathlib.Path(rpc_server_path).parent)
+    os.environ["PATH"] = bin_path + ":" + os.environ["PATH"]
 
-    # 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"])

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

@@ -57,7 +57,7 @@ class Rpc:
     def __init__(self, accounts_dir: Optional[str] = None, rpc_server_path="deltachat-rpc-server", **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"] = {

deltachat-rpc-client/tests/test_calls.py

@@ -10,7 +10,7 @@ def test_calls(acfactory) -> None:
     alice_contact_bob = alice.create_contact(bob, "Bob")
     alice_chat_bob = alice_contact_bob.create_chat()
     bob.create_chat(alice)  # Accept the chat so incoming call causes a notification.
-    outgoing_call_message = alice_chat_bob.place_outgoing_call(place_call_info, True)
+    outgoing_call_message = alice_chat_bob.place_outgoing_call(place_call_info)
     assert outgoing_call_message.get_call_info().state.kind == "Alerting"
 
     incoming_call_event = bob.wait_for_event(EventType.INCOMING_CALL)
@@ -71,7 +71,7 @@ a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid\r
     bob.create_chat(alice)  # Accept the chat so incoming call causes a notification.
     alice_contact_bob = alice.create_contact(bob, "Bob")
     alice_chat_bob = alice_contact_bob.create_chat()
-    alice_chat_bob.place_outgoing_call(place_call_info, True)
+    alice_chat_bob.place_outgoing_call(place_call_info)
 
     incoming_call_event = bob.wait_for_event(EventType.INCOMING_CALL)
     assert incoming_call_event.place_call_info == place_call_info
@@ -92,7 +92,7 @@ def test_no_contact_request_call(acfactory) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
     alice_chat_bob = alice.create_chat(bob)
-    alice_chat_bob.place_outgoing_call("offer", True)
+    alice_chat_bob.place_outgoing_call("offer")
     alice_chat_bob.send_text("Hello!")
 
     # Notification for "Hello!" message should arrive

deltachat-rpc-client/tests/test_cross_core.py

@@ -1,23 +1,8 @@
-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"])
+@pytest.mark.parametrize("version", ["2.20.0", "2.10.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()
@@ -35,23 +20,9 @@ def test_qr_setup_contact(alice_and_remote_bob, version) -> None:
 
 
 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_multitransport.py

@@ -1,6 +1,5 @@
 import pytest
 
-from deltachat_rpc_client import EventType
 from deltachat_rpc_client.rpc import JsonRpcError
 
 
@@ -157,122 +156,3 @@ def test_reconfigure_transport(acfactory) -> None:
     # 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_rpc_virtual.py

@@ -0,0 +1,16 @@
+import subprocess
+import sys
+
+from deltachat_rpc_client import DeltaChat, Rpc
+
+
+def test_install_venv_and_use_other_core(tmp_path):
+    venv = tmp_path.joinpath("venv1")
+    python = sys.executable
+    subprocess.check_call([python, "-m", "venv", venv])
+    subprocess.check_call([venv / "bin" / "pip", "install", "deltachat-rpc-server==2.20.0"])
+    rpc = Rpc(accounts_dir=tmp_path.joinpath("accounts"), rpc_server_path=venv.joinpath("bin", "deltachat-rpc-server"))
+
+    with rpc:
+        dc = DeltaChat(rpc)
+        assert dc.rpc.get_system_info()["deltachat_core_version"] == "v2.20.0"

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:
@@ -340,11 +343,9 @@ def test_receive_imf_failure(acfactory) -> None:
     msg_id = event.msg_id
     message = bob.get_message_by_id(msg_id)
     snapshot = message.get_snapshot()
-    version = bob.get_info()["deltachat_core_version"]
     assert (
         snapshot.text == "❌ Failed to receive a message:"
         " Condition failed: `!context.get_config_bool(Config::FailOnReceivingFullMsg).await?`."
-        f" Core version {version}."
         " Please report this bug to delta@merlinux.eu or https://support.delta.chat/."
     )
 
@@ -507,103 +508,6 @@ def test_import_export_backup(acfactory, tmp_path) -> None:
     assert alice2.manager.get_system_info()
 
 
-def test_import_export_online_all(acfactory, tmp_path, data, log) -> None:
-    (ac1, some1) = acfactory.get_online_accounts(2)
-
-    log.section("create some chat content")
-    some1_addr = some1.get_config("addr")
-    chat1 = ac1.create_contact(some1).create_chat()
-    chat1.send_text("msg1")
-    assert len(ac1.get_contacts()) == 1
-
-    original_image_path = data.get_path("image/avatar64x64.png")
-    chat1.send_file(str(original_image_path))
-
-    # Add another 100KB file that ensures that the progress is smooth enough
-    path = tmp_path / "attachment.txt"
-    with path.open("w") as file:
-        file.truncate(100000)
-    chat1.send_file(str(path))
-
-    def assert_account_is_proper(ac):
-        contacts = ac.get_contacts()
-        assert len(contacts) == 1
-        contact2 = contacts[0]
-        assert contact2.get_snapshot().address == some1_addr
-        chat2 = contact2.create_chat()
-        messages = chat2.get_messages()
-        assert len(messages) == 3 + E2EE_INFO_MSGS
-        assert messages[0 + E2EE_INFO_MSGS].get_snapshot().text == "msg1"
-        snapshot = messages[1 + E2EE_INFO_MSGS].get_snapshot()
-        assert snapshot.file_mime == "image/png"
-        assert os.stat(snapshot.file).st_size == os.stat(original_image_path).st_size
-        ac.set_config("displayname", "new displayname")
-        assert ac.get_config("displayname") == "new displayname"
-
-    assert_account_is_proper(ac1)
-
-    backupdir = tmp_path / "backup"
-    backupdir.mkdir()
-
-    log.section(f"export all to {backupdir}")
-    ac1.stop_io()
-    ac1.export_backup(backupdir)
-    progress = 0
-    files_written = []
-    while True:
-        event = ac1.wait_for_event()
-        if event.kind == EventType.IMEX_PROGRESS:
-            assert event.progress > 0  # Progress 0 indicates error.
-            assert event.progress < progress + 250
-            progress = event.progress
-            if progress == 1000:
-                break
-        elif event.kind == EventType.IMEX_FILE_WRITTEN:
-            files_written.append(event.path)
-        else:
-            logging.info(event)
-    assert len(files_written) == 1
-    assert os.path.exists(files_written[0])
-    ac1.start_io()
-
-    log.section("get fresh empty account")
-    ac2 = acfactory.get_unconfigured_account()
-
-    log.section("import backup and check it's proper")
-    ac2.import_backup(files_written[0])
-    progress = 0
-    while True:
-        event = ac2.wait_for_event()
-        if event.kind == EventType.IMEX_PROGRESS:
-            assert event.progress > 0  # Progress 0 indicates error.
-            assert event.progress < progress + 250
-            progress = event.progress
-            if progress == 1000:
-                break
-        else:
-            logging.info(event)
-    assert_account_is_proper(ac1)
-    assert_account_is_proper(ac2)
-
-    log.section(f"Second-time export all to {backupdir}")
-    ac1.stop_io()
-    ac1.export_backup(backupdir)
-    while True:
-        event = ac1.wait_for_event()
-        if event.kind == EventType.IMEX_PROGRESS:
-            assert event.progress > 0
-            if event.progress == 1000:
-                break
-        elif event.kind == EventType.IMEX_FILE_WRITTEN:
-            files_written.append(event.path)
-        else:
-            logging.info(event)
-    assert len(files_written) == 2
-    assert os.path.exists(files_written[1])
-    assert files_written[1] != files_written[0]
-    assert len(list(backupdir.glob("*.tar"))) == 2
-
-
 def test_import_export_keys(acfactory, tmp_path) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
@@ -757,6 +661,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")
@@ -772,7 +678,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):
@@ -829,7 +743,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)
@@ -842,7 +756,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):
@@ -1089,66 +1003,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.36.0"
+version = "2.28.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.36.0"
+  "version": "2.28.0"
 }

deltachat-rpc-server/src/main.rs

@@ -43,7 +43,7 @@ async fn main_impl() -> Result<()> {
             if let Some(arg) = args.next() {
                 return Err(anyhow!("Unrecognized argument {arg:?}"));
             }
-            eprintln!("{DC_VERSION_STR}");
+            eprintln!("{}", &*DC_VERSION_STR);
             return Ok(());
         } else if first_arg.to_str() == Some("--openrpc") {
             if let Some(arg) = args.next() {

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" },
 ]
 
 

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.36.0"
-license = "MPL-2.0"
+version = "2.28.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

@@ -9,6 +9,7 @@ from imap_tools import AND
 
 import deltachat as dc
 from deltachat import account_hookimpl, Message
+from deltachat.tracker import ImexTracker
 from deltachat.testplugin import E2EE_INFO_MSGS
 
 
@@ -268,23 +269,22 @@ def test_enable_mvbox_move(acfactory, lp):
     assert ac2._evtracker.wait_next_incoming_message().text == "message1"
 
 
-def test_dont_move_sync_msgs(acfactory):
+def test_move_sync_msgs(acfactory):
     ac1 = acfactory.new_online_configuring_account(bcc_self=True, sync_msgs=True, fix_is_chatmail=True)
     acfactory.bring_accounts_online()
 
-    ac1.direct_imap.select_folder("Inbox")
+    ac1.direct_imap.select_folder("DeltaChat")
     # Sync messages may also be sent during the configuration.
-    inbox_msg_cnt = len(ac1.direct_imap.get_all_messages())
+    mvbox_msg_cnt = len(ac1.direct_imap.get_all_messages())
 
     ac1.set_config("displayname", "Alice")
     ac1._evtracker.get_matching("DC_EVENT_MSG_DELIVERED")
     ac1.set_config("displayname", "Bob")
     ac1._evtracker.get_matching("DC_EVENT_MSG_DELIVERED")
     ac1.direct_imap.select_folder("Inbox")
-    assert len(ac1.direct_imap.get_all_messages()) == inbox_msg_cnt + 2
-
-    ac1.direct_imap.select_folder("DeltaChat")
     assert len(ac1.direct_imap.get_all_messages()) == 0
+    ac1.direct_imap.select_folder("DeltaChat")
+    assert len(ac1.direct_imap.get_all_messages()) == mvbox_msg_cnt + 2
 
 
 def test_forward_messages(acfactory, lp):
@@ -826,6 +826,86 @@ def test_send_and_receive_image(acfactory, lp, data):
     assert m == msg_in
 
 
+def test_import_export_online_all(acfactory, tmp_path, data, lp):
+    (ac1, some1) = acfactory.get_online_accounts(2)
+
+    lp.sec("create some chat content")
+    some1_addr = some1.get_config("addr")
+    chat1 = ac1.create_contact(some1).create_chat()
+    chat1.send_text("msg1")
+    assert len(ac1.get_contacts()) == 1
+
+    original_image_path = data.get_path("d.png")
+    chat1.send_image(original_image_path)
+
+    # Add another 100KB file that ensures that the progress is smooth enough
+    path = tmp_path / "attachment.txt"
+    with path.open("w") as file:
+        file.truncate(100000)
+    chat1.send_file(str(path))
+
+    def assert_account_is_proper(ac):
+        contacts = ac.get_contacts()
+        assert len(contacts) == 1
+        contact2 = contacts[0]
+        assert contact2.addr == some1_addr
+        chat2 = contact2.create_chat()
+        messages = chat2.get_messages()
+        assert len(messages) == 3 + E2EE_INFO_MSGS
+        assert messages[0 + E2EE_INFO_MSGS].text == "msg1"
+        assert messages[1 + E2EE_INFO_MSGS].filemime == "image/png"
+        assert os.stat(messages[1 + E2EE_INFO_MSGS].filename).st_size == os.stat(original_image_path).st_size
+        ac.set_config("displayname", "new displayname")
+        assert ac.get_config("displayname") == "new displayname"
+
+    assert_account_is_proper(ac1)
+
+    backupdir = tmp_path / "backup"
+    backupdir.mkdir()
+
+    lp.sec(f"export all to {backupdir}")
+    with ac1.temp_plugin(ImexTracker()) as imex_tracker:
+        ac1.stop_io()
+        ac1.imex(str(backupdir), dc.const.DC_IMEX_EXPORT_BACKUP)
+
+        # check progress events for export
+        assert imex_tracker.wait_progress(1, progress_upper_limit=249)
+        assert imex_tracker.wait_progress(250, progress_upper_limit=499)
+        assert imex_tracker.wait_progress(500, progress_upper_limit=749)
+        assert imex_tracker.wait_progress(750, progress_upper_limit=999)
+
+        paths = imex_tracker.wait_finish()
+        assert len(paths) == 1
+        path = paths[0]
+        assert os.path.exists(path)
+        ac1.start_io()
+
+    lp.sec("get fresh empty account")
+    ac2 = acfactory.get_unconfigured_account()
+
+    lp.sec("get latest backup file")
+    path2 = ac2.get_latest_backupfile(str(backupdir))
+    assert path2 == path
+
+    lp.sec("import backup and check it's proper")
+    with ac2.temp_plugin(ImexTracker()) as imex_tracker:
+        ac2.import_all(path)
+
+        # check progress events for import
+        assert imex_tracker.wait_progress(1, progress_upper_limit=249)
+        assert imex_tracker.wait_progress(1000)
+
+    assert_account_is_proper(ac1)
+    assert_account_is_proper(ac2)
+
+    lp.sec(f"Second-time export all to {backupdir}")
+    ac1.stop_io()
+    path2 = ac1.export_all(str(backupdir))
+    assert os.path.exists(path2)
+    assert path2 != path
+    assert ac2.get_latest_backupfile(str(backupdir)) == path2
+
+
 def test_qr_email_capitalization(acfactory, lp):
     """Regression test for a bug
     that resulted in failure to propagate verification
@@ -1215,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):

release-date.in

@@ -1 +1 @@
-2026-01-03
+2025-11-23

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(())
@@ -123,11 +123,6 @@ impl CallInfo {
         self.msg.param.exists(CALL_ACCEPTED_TIMESTAMP)
     }
 
-    /// Returns true if the call is started as a video call.
-    pub fn has_video_initially(&self) -> bool {
-        self.msg.param.get_bool(Param::CallHasVideoInitially).unwrap_or(false)
-    }
-
     /// Returns true if the call is missed
     /// because the caller canceled it
     /// explicitly before ringing stopped.
@@ -187,7 +182,6 @@ impl Context {
         &self,
         chat_id: ChatId,
         place_call_info: String,
-        has_video_initially: bool,
     ) -> Result<MsgId> {
         let chat = Chat::load_from_db(self, chat_id).await?;
         ensure!(
@@ -202,13 +196,11 @@ impl Context {
             ..Default::default()
         };
         call.param.set(Param::WebrtcRoom, &place_call_info);
-        call.param.set_int(Param::CallHasVideoInitially, has_video_initially as i32);
         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,
         ));
@@ -299,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,
@@ -348,6 +339,13 @@ impl Context {
                 } else {
                     call.update_text(self, "Incoming call").await?;
                     self.emit_msgs_changed(call.msg.chat_id, call_id); // ringing calls are not additionally notified
+                    let has_video = match sdp_has_video(&call.place_call_info) {
+                        Ok(has_video) => has_video,
+                        Err(err) => {
+                            warn!(self, "Failed to determine if SDP offer has video: {err:#}.");
+                            false
+                        }
+                    };
                     if let Some(chat_id_blocked) =
                         ChatIdBlocked::lookup_by_contact(self, from_id).await?
                     {
@@ -357,7 +355,7 @@ impl Context {
                                     msg_id: call.msg.id,
                                     chat_id: call.msg.chat_id,
                                     place_call_info: call.place_call_info.to_string(),
-                                    has_video: call.has_video_initially(),
+                                    has_video,
                                 });
                             }
                             Blocked::Yes | Blocked::Request => {
@@ -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,
                     ));
@@ -496,6 +493,19 @@ impl Context {
     }
 }
 
+/// Returns true if SDP offer has a video.
+pub fn sdp_has_video(sdp: &str) -> Result<bool> {
+    let mut cursor = Cursor::new(sdp);
+    let session_description =
+        SessionDescription::unmarshal(&mut cursor).context("Failed to parse SDP")?;
+    for media_description in &session_description.media_descriptions {
+        if media_description.media_name.media == "video" {
+            return Ok(true);
+        }
+    }
+    Ok(false)
+}
+
 /// State of the call for display in the message bubble.
 #[derive(Debug, PartialEq, Eq)]
 pub enum CallState {
@@ -650,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)
@@ -658,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/calls/calls_tests.rs

@@ -52,7 +52,7 @@ async fn setup_call() -> Result<CallSetup> {
     bob2.create_chat(&alice).await;
 
     let test_msg_id = alice
-        .place_outgoing_call(alice_chat.id, PLACE_INFO.to_string(), true)
+        .place_outgoing_call(alice_chat.id, PLACE_INFO.to_string())
         .await?;
     let sent1 = alice.pop_sent_msg().await;
     assert_eq!(sent1.sender_msg_id, test_msg_id);
@@ -68,7 +68,6 @@ async fn setup_call() -> Result<CallSetup> {
         assert!(!info.is_incoming());
         assert!(!info.is_accepted());
         assert_eq!(info.place_call_info, PLACE_INFO);
-        assert_eq!(info.has_video_initially(), true);
         assert_text(t, m.id, "Outgoing call").await?;
         assert_eq!(call_state(t, m.id).await?, CallState::Alerting);
     }
@@ -90,7 +89,6 @@ async fn setup_call() -> Result<CallSetup> {
         assert!(info.is_incoming());
         assert!(!info.is_accepted());
         assert_eq!(info.place_call_info, PLACE_INFO);
-        assert_eq!(info.has_video_initially(), true);
         assert_text(t, m.id, "Incoming call").await?;
         assert_eq!(call_state(t, m.id).await?, CallState::Alerting);
     }
@@ -527,6 +525,13 @@ async fn test_update_call_text() -> Result<()> {
     Ok(())
 }
 
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_sdp_has_video() {
+    assert!(sdp_has_video("foobar").is_err());
+    assert_eq!(sdp_has_video(PLACE_INFO).unwrap(), false);
+    assert_eq!(sdp_has_video(PLACE_INFO_VIDEO).unwrap(), true);
+}
+
 /// Tests that calls are forwarded as text messages.
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_forward_call() -> Result<()> {
@@ -537,7 +542,7 @@ async fn test_forward_call() -> Result<()> {
 
     let alice_bob_chat = alice.create_chat(bob).await;
     let alice_msg_id = alice
-        .place_outgoing_call(alice_bob_chat.id, PLACE_INFO.to_string(), true)
+        .place_outgoing_call(alice_bob_chat.id, PLACE_INFO.to_string())
         .await
         .context("Failed to place a call")?;
     let alice_call = Message::load_from_db(alice, alice_msg_id).await?;

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,
@@ -432,18 +431,14 @@ impl ChatId {
 
         match chat.typ {
             Chattype::Single | Chattype::Group | Chattype::OutBroadcast | Chattype::InBroadcast => {
+                // User has "created a chat" with all these contacts.
+                //
                 // Previously accepting a chat literally created a chat because unaccepted chats
                 // went to "contact requests" list rather than normal chatlist.
-                // But for groups we use lower origin because users don't always check all members
-                // before accepting a chat and may not want to have the group members mixed with
-                // existing contacts. `IncomingTo` fits here by its definition.
-                let origin = match chat.typ {
-                    Chattype::Group => Origin::IncomingTo,
-                    _ => Origin::CreateChat,
-                };
                 for contact_id in get_chat_contacts(context, self).await? {
                     if contact_id != ContactId::SELF {
-                        ContactId::scaleup_origin(context, &[contact_id], origin).await?;
+                        ContactId::scaleup_origin(context, &[contact_id], Origin::CreateChat)
+                            .await?;
                     }
                 }
             }
@@ -600,10 +595,6 @@ impl ChatId {
     }
 
     /// Deletes a chat.
-    ///
-    /// Messages are deleted from the device and the chat database entry is deleted.
-    /// After that, a `MsgsChanged` event is emitted.
-    /// Messages are deleted from the server in background.
     pub async fn delete(self, context: &Context) -> Result<()> {
         self.delete_ex(context, Sync).await
     }
@@ -662,7 +653,7 @@ impl ChatId {
         context
             .set_config_internal(Config::LastHousekeeping, None)
             .await?;
-        context.scheduler.interrupt_smtp().await;
+        context.scheduler.interrupt_inbox().await;
 
         Ok(())
     }
@@ -791,7 +782,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,
@@ -832,7 +823,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(),
@@ -1928,7 +1919,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,
@@ -1979,7 +1970,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,
@@ -2115,7 +2106,7 @@ pub(crate) async fn sync(context: &Context, id: SyncId, action: SyncAction) -> R
     context
         .add_sync_item(SyncData::AlterChat { id, action })
         .await?;
-    context.scheduler.interrupt_smtp().await;
+    context.scheduler.interrupt_inbox().await;
     Ok(())
 }
 
@@ -2283,8 +2274,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?;
     }
@@ -2397,12 +2388,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,
@@ -2736,7 +2726,7 @@ async fn prepare_send_msg(
     Ok(row_ids)
 }
 
-/// Constructs jobs for sending a message and inserts them into the `smtp` table.
+/// Constructs jobs for sending a message and inserts them into the appropriate table.
 ///
 /// Updates the message `GuaranteeE2ee` parameter and persists it
 /// in the database depending on whether the message
@@ -2860,27 +2850,30 @@ pub(crate) async fn create_send_msg_jobs(context: &Context, msg: &mut Message) -
     let chunk_size = context.get_max_smtp_rcpt_to().await?;
     let trans_fn = |t: &mut rusqlite::Transaction| {
         let mut row_ids = Vec::<i64>::new();
-
         if let Some(sync_ids) = rendered_msg.sync_ids_to_delete {
             t.execute(
                 &format!("DELETE FROM multi_device_sync WHERE id IN ({sync_ids})"),
                 (),
             )?;
-        }
-
-        for recipients_chunk in recipients.chunks(chunk_size) {
-            let recipients_chunk = recipients_chunk.join(" ");
-            let row_id = t.execute(
-                "INSERT INTO smtp (rfc724_mid, recipients, mime, msg_id) \
-                VALUES            (?1,         ?2,         ?3,   ?4)",
-                (
-                    &rendered_msg.rfc724_mid,
-                    recipients_chunk,
-                    &rendered_msg.message,
-                    msg.id,
-                ),
+            t.execute(
+                "INSERT INTO imap_send (mime, msg_id) VALUES (?, ?)",
+                (&rendered_msg.message, msg.id),
             )?;
-            row_ids.push(row_id.try_into()?);
+        } else {
+            for recipients_chunk in recipients.chunks(chunk_size) {
+                let recipients_chunk = recipients_chunk.join(" ");
+                let row_id = t.execute(
+                    "INSERT INTO smtp (rfc724_mid, recipients, mime, msg_id) \
+                    VALUES            (?1,         ?2,         ?3,   ?4)",
+                    (
+                        &rendered_msg.rfc724_mid,
+                        recipients_chunk,
+                        &rendered_msg.message,
+                        msg.id,
+                    ),
+                )?;
+                row_ids.push(row_id.try_into()?);
+            }
         }
         Ok(row_ids)
     };
@@ -2951,7 +2944,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,
             ),
@@ -3095,7 +3088,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 == ?
                 );",
@@ -3440,15 +3433,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?;
 
@@ -3532,15 +3519,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()?);
 
@@ -3749,16 +3730,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(
@@ -3842,7 +3817,7 @@ pub(crate) async fn add_contact_to_chat_ex(
                 .log_err(context)
                 .is_ok()
         {
-            context.scheduler.interrupt_smtp().await;
+            context.scheduler.interrupt_inbox().await;
         }
     }
     context.emit_event(EventType::ChatModified(chat_id));
@@ -4113,8 +4088,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()
@@ -4208,16 +4183,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");
 
@@ -4225,16 +4190,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?
@@ -4244,14 +4209,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);
@@ -4261,16 +4223,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
@@ -4279,16 +4242,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(())
 }
@@ -4316,7 +4279,7 @@ pub async fn save_msgs(context: &Context, msg_ids: &[MsgId]) -> Result<()> {
             })
             .await?;
     }
-    context.scheduler.interrupt_smtp().await;
+    context.scheduler.interrupt_inbox().await;
     Ok(())
 }
 
@@ -4560,7 +4523,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,
                 ),
@@ -4699,7 +4662,7 @@ pub(crate) async fn add_info_msg_with_cmd(
             Viewtype::Text,
             MessageState::InNoticed,
             text,
-            normalize_text(text),
+            message::normalize_text(text),
             rfc724_mid,
             ephemeral_timer,
             param.to_string(),
@@ -4741,7 +4704,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;
@@ -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;
 
@@ -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,
@@ -504,7 +509,7 @@ impl Context {
                         .into_owned()
                 })
             }
-            Config::SysVersion => Some(constants::DC_VERSION_STR.to_string()),
+            Config::SysVersion => Some((*constants::DC_VERSION_STR).clone()),
             Config::SysMsgsizeMaxRecommended => Some(format!("{RECOMMENDED_FILE_SIZE}")),
             Config::SysConfigKeys => Some(get_config_keys_string()),
             _ => self.sql.get_raw_config(key.as_ref()).await?,
@@ -605,6 +610,12 @@ impl Context {
             && !self.get_config_bool(Config::Bot).await?)
     }
 
+    /// Returns whether sync messages should be uploaded to the mvbox.
+    pub(crate) async fn should_move_sync_msgs(&self) -> Result<bool> {
+        Ok(self.get_config_bool(Config::MvboxMove).await?
+            || !self.get_config_bool(Config::IsChatmail).await?)
+    }
+
     /// Returns whether MDNs should be requested.
     pub(crate) async fn should_request_mdns(&self) -> Result<bool> {
         match self.get_config_bool_opt(Config::MdnsEnabled).await? {
@@ -635,14 +646,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.
@@ -808,43 +820,42 @@ impl Context {
                         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?;
                 }
+                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?;
+                self.sql.uncache_raw_config("configured_addr").await;
             }
             _ => {
                 self.sql.set_raw_config(key.as_ref(), value).await?;
@@ -874,7 +885,7 @@ impl Context {
         {
             return Ok(());
         }
-        self.scheduler.interrupt_smtp().await;
+        self.scheduler.interrupt_inbox().await;
         Ok(())
     }
 
@@ -938,7 +949,17 @@ impl Context {
     /// This should only be used by test code and during configure.
     #[cfg(test)] // AEAP is disabled, but there are still tests for it
     pub(crate) async fn set_primary_self_addr(&self, primary_new: &str) -> Result<()> {
-        self.quota.write().await.clear();
+        self.quota.write().await.take();
+
+        // add old primary address (if exists) to secondary addresses
+        let mut secondary_addrs = self.get_all_self_addrs().await?;
+        // never store a primary address also as a secondary
+        secondary_addrs.retain(|a| !addr_cmp(a, primary_new));
+        self.set_config_internal(
+            Config::SecondaryAddrs,
+            Some(secondary_addrs.join(" ").as_str()),
+        )
+        .await?;
 
         self.sql
             .set_raw_config(Config::ConfiguredAddr.as_ref(), Some(primary_new))
@@ -957,10 +978,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.
@@ -983,18 +1008,5 @@ fn get_config_keys_string() -> String {
     format!(" {keys} ")
 }
 
-/// Returns all `ui.*` config keys that were set by the UI.
-pub async fn get_all_ui_config_keys(context: &Context) -> Result<Vec<String>> {
-    let ui_keys = context
-        .sql
-        .query_map_vec(
-            "SELECT keyname FROM config WHERE keyname GLOB 'ui.*' ORDER BY config.id",
-            (),
-            |row| Ok(row.get::<_, String>(0)?),
-        )
-        .await?;
-    Ok(ui_keys)
-}
-
 #[cfg(test)]
 mod config_tests;

src/config/config_tests.rs

@@ -81,37 +81,6 @@ async fn test_ui_config() -> Result<()> {
     Ok(())
 }
 
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_get_all_ui_config_keys() -> Result<()> {
-    let t = TestContext::new().await;
-
-    t.set_ui_config("ui.android.screen_security", Some("safe"))
-        .await?;
-    t.set_ui_config("ui.lastchatid", Some("231")).await?;
-    t.set_ui_config(
-        "ui.desktop.webxdcBounds.528490",
-        Some(r#"{"x":954,"y":356,"width":378,"height":671}"#),
-    )
-    .await?;
-    t.set_ui_config(
-        "ui.desktop.webxdcBounds.556543",
-        Some(r#"{"x":954,"y":356,"width":378,"height":671}"#),
-    )
-    .await?;
-
-    assert_eq!(
-        get_all_ui_config_keys(&t).await?,
-        vec![
-            "ui.android.screen_security",
-            "ui.lastchatid",
-            "ui.desktop.webxdcBounds.528490",
-            "ui.desktop.webxdcBounds.556543"
-        ]
-    );
-
-    Ok(())
-}
-
 /// Regression test for https://github.com/deltachat/deltachat-core-rust/issues/3012
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_set_config_bool() -> Result<()> {
@@ -125,6 +94,59 @@ async fn test_set_config_bool() -> Result<()> {
     Ok(())
 }
 
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_self_addrs() -> Result<()> {
+    let alice = TestContext::new_alice().await;
+
+    assert!(alice.is_self_addr("alice@example.org").await?);
+    assert_eq!(alice.get_all_self_addrs().await?, vec!["alice@example.org"]);
+    assert!(!alice.is_self_addr("alice@alice.com").await?);
+
+    // Test adding the same primary address
+    alice.set_primary_self_addr("alice@example.org").await?;
+    alice.set_primary_self_addr("Alice@Example.Org").await?;
+    assert_eq!(alice.get_all_self_addrs().await?, vec!["Alice@Example.Org"]);
+
+    // Test adding a new (primary) self address
+    // The address is trimmed during configure by `LoginParam::from_database()`,
+    // so `set_primary_self_addr()` doesn't have to trim it.
+    alice.set_primary_self_addr("Alice@alice.com").await?;
+    assert!(alice.is_self_addr("aliCe@example.org").await?);
+    assert!(alice.is_self_addr("alice@alice.com").await?);
+    assert_eq!(
+        alice.get_all_self_addrs().await?,
+        vec!["Alice@alice.com", "Alice@Example.Org"]
+    );
+
+    // Check that the entry is not duplicated
+    alice.set_primary_self_addr("alice@alice.com").await?;
+    alice.set_primary_self_addr("alice@alice.com").await?;
+    assert_eq!(
+        alice.get_all_self_addrs().await?,
+        vec!["alice@alice.com", "Alice@Example.Org"]
+    );
+
+    // Test switching back
+    alice.set_primary_self_addr("alice@example.org").await?;
+    assert_eq!(
+        alice.get_all_self_addrs().await?,
+        vec!["alice@example.org", "alice@alice.com"]
+    );
+
+    // Test setting a new primary self address, the previous self address
+    // should be kept as a secondary self address
+    alice.set_primary_self_addr("alice@alice.xyz").await?;
+    assert_eq!(
+        alice.get_all_self_addrs().await?,
+        vec!["alice@alice.xyz", "alice@example.org", "alice@alice.com"]
+    );
+    assert!(alice.is_self_addr("alice@example.org").await?);
+    assert!(alice.is_self_addr("alice@alice.com").await?);
+    assert!(alice.is_self_addr("Alice@alice.xyz").await?);
+
+    Ok(())
+}
+
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_mdns_default_behaviour() -> Result<()> {
     let t = &TestContext::new_alice().await;
@@ -256,6 +278,7 @@ async fn test_sync() -> Result<()> {
     Ok(())
 }
 
+/// Sync message mustn't be sent if self-{status,avatar} is changed by a self-sent message.
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_no_sync_on_self_sent_msg() -> Result<()> {
     let mut tcm = TestContextManager::new();
@@ -265,16 +288,16 @@ async fn test_no_sync_on_self_sent_msg() -> Result<()> {
         a.set_config_bool(Config::SyncMsgs, true).await?;
     }
 
-    let status = "Sent via usual message";
+    let status = "Synced via usual message";
     alice0.set_config(Config::Selfstatus, Some(status)).await?;
     alice0.send_sync_msg().await?;
-    alice0.pop_sent_msg().await;
+    alice0.pop_sent_sync_msg().await;
     let status1 = "Synced via sync message";
     alice1.set_config(Config::Selfstatus, Some(status1)).await?;
     tcm.send_recv(alice0, alice1, "hi Alice!").await;
     assert_eq!(
         alice1.get_config(Config::Selfstatus).await?,
-        Some(status1.to_string())
+        Some(status.to_string())
     );
     sync(alice1, alice0).await;
     assert_eq!(
@@ -292,7 +315,7 @@ async fn test_no_sync_on_self_sent_msg() -> Result<()> {
         .set_config(Config::Selfavatar, Some(file.to_str().unwrap()))
         .await?;
     alice0.send_sync_msg().await?;
-    alice0.pop_sent_msg().await;
+    alice0.pop_sent_sync_msg().await;
     let file = alice1.dir.path().join("avatar.jpg");
     let bytes = include_bytes!("../../test-data/image/avatar1000x1000.jpg");
     tokio::fs::write(&file, bytes).await?;
@@ -305,7 +328,7 @@ async fn test_no_sync_on_self_sent_msg() -> Result<()> {
         alice1
             .get_config(Config::Selfavatar)
             .await?
-            .filter(|path| path.ends_with(".jpg"))
+            .filter(|path| path.ends_with(".png"))
             .is_some()
     );
     sync(alice1, alice0).await;

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) => {
@@ -209,9 +206,7 @@ impl Context {
     /// Removes the transport with the specified email address
     /// (i.e. [EnteredLoginParam::addr]).
     pub async fn delete_transport(&self, addr: &str) -> Result<()> {
-        let now = time();
-        let removed_transport_id = self
-            .sql
+        self.sql
             .transaction(|transaction| {
                 let primary_addr = transaction.query_row(
                     "SELECT value FROM config WHERE keyname='configured_addr'",
@@ -225,13 +220,12 @@ impl Context {
                 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",
+                let transport_id = transaction.query_row(
+                    "DELETE FROM transports WHERE addr=? RETURNING id",
                     (addr,),
                     |row| {
                         let id: u32 = row.get(0)?;
-                        let add_timestamp: i64 = row.get(1)?;
-                        Ok((id, add_timestamp))
+                        Ok(id)
                     },
                 )?;
                 transaction.execute("DELETE FROM imap WHERE transport_id=?", (transport_id,))?;
@@ -240,24 +234,9 @@ impl Context {
                     (transport_id,),
                 )?;
 
-                // Removal timestamp should not be lower than addition timestamp
-                // to be accepted by other devices when synced.
-                let remove_timestamp = std::cmp::max(now, add_timestamp);
-
-                transaction.execute(
-                    "INSERT INTO removed_transports (addr, remove_timestamp)
-                     VALUES (?, ?)
-                     ON CONFLICT (addr)
-                     DO UPDATE SET remove_timestamp = excluded.remove_timestamp",
-                    (addr, remove_timestamp),
-                )?;
-
-                Ok(transport_id)
+                Ok(())
             })
             .await?;
-        send_sync_transports(self).await?;
-        self.quota.write().await.remove(&removed_transport_id);
-
         Ok(())
     }
 
@@ -274,56 +253,21 @@ impl Context {
                 )
                 .await?
         {
-            // Should be checked before `MvboxMove` because the latter makes no sense in presense of
-            // `OnlyFetchMvbox` and even grayed out in the UIs in this case.
-            if self.get_config(Config::OnlyFetchMvbox).await?.as_deref() != Some("0") {
-                bail!(
-                    "To use additional relays, disable the legacy option \"Settings / Advanced / Only Fetch from DeltaChat Folder\"."
-                );
-            }
             if self.get_config(Config::MvboxMove).await?.as_deref() != Some("0") {
-                bail!(
-                    "To use additional relays, disable the legacy option \"Settings / Advanced / Move automatically to DeltaChat Folder\"."
-                );
+                bail!("Cannot use multi-transport with mvbox_move enabled.");
+            }
+            if self.get_config(Config::OnlyFetchMvbox).await?.as_deref() != Some("0") {
+                bail!("Cannot use multi-transport with only_fetch_mvbox enabled.");
             }
             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
-                )
+                bail!("Cannot use multi-transport with disabled fetching of classic emails.");
             }
         }
 
-        let provider = match configure(self, param).await {
-            Err(error) => {
-                // Log entered and actual params
-                let configured_param = get_configured_param(self, param).await;
-                warn!(
-                    self,
-                    "configure failed: Entered params: {}. Used params: {}. Error: {error}.",
-                    param.to_string(),
-                    configured_param
-                        .map(|param| param.to_string())
-                        .unwrap_or("error".to_owned())
-                );
-                return Err(error);
-            }
-            Ok(provider) => provider,
-        };
+        let provider = configure(self, param).await?;
         self.set_config_internal(Config::NotifyAboutWrongPw, Some("1"))
             .await?;
-        on_configure_completed(self, provider).await?;
+        on_configure_completed(self, provider, old_addr).await?;
         Ok(())
     }
 }
@@ -331,6 +275,7 @@ impl Context {
 async fn on_configure_completed(
     context: &Context,
     provider: Option<&'static Provider>,
+    old_addr: Option<String>,
 ) -> Result<()> {
     if let Some(provider) = provider {
         if let Some(config_defaults) = provider.config_defaults {
@@ -360,6 +305,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(())
 }
 
@@ -595,11 +554,12 @@ async fn configure(ctx: &Context, param: &EnteredLoginParam) -> Result<Option<&'
     let (_s, r) = async_channel::bounded(1);
     let mut imap = Imap::new(ctx, transport_id, configured_param.clone(), r).await?;
     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);
@@ -609,22 +569,23 @@ async fn configure(ctx: &Context, param: &EnteredLoginParam) -> Result<Option<&'
 
     progress!(ctx, 900);
 
-    let is_configured = ctx.is_configured().await?;
-    if !is_configured {
+    if !ctx.is_configured().await? {
         ctx.sql.set_raw_config("mvbox_move", Some("0")).await?;
         ctx.sql.set_raw_config("only_fetch_mvbox", None).await?;
     }
 
+    let create_mvbox = false;
+    imap.configure_folders(ctx, &mut imap_session, create_mvbox)
+        .await?;
+
     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/constants.rs

@@ -2,13 +2,16 @@
 
 #![allow(missing_docs)]
 
+use std::sync::LazyLock;
+
 use deltachat_derive::{FromSql, ToSql};
 use percent_encoding::{AsciiSet, NON_ALPHANUMERIC};
 use serde::{Deserialize, Serialize};
 
 use crate::chat::ChatId;
 
-pub static DC_VERSION_STR: &str = env!("CARGO_PKG_VERSION");
+pub static DC_VERSION_STR: LazyLock<String> =
+    LazyLock::new(|| env!("CARGO_PKG_VERSION").to_string());
 
 /// Set of characters to percent-encode in email addresses and names.
 pub(crate) const NON_ALPHANUMERIC_WITHOUT_DOT: &AsciiSet = &NON_ALPHANUMERIC.remove(b'.');

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)?;
@@ -397,16 +383,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 +971,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 +986,11 @@ impl Contact {
                                 } else {
                                     row_origin
                                 },
-                                &new_authname,
+                                if update_authname {
+                                    name.to_string()
+                                } else {
+                                    row_authname
+                                },
                                 row_id,
                             ),
                         )?;
@@ -1019,18 +1002,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,26 +1116,23 @@ 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.origin>=? DESC, c.last_seen DESC, c.id DESC
-                    ",
+                    "SELECT c.id, c.addr FROM contacts c
+                 WHERE c.id>?
+                 AND (c.fingerprint='')=?
+                 AND c.origin>=? \
+                 AND c.blocked=0 \
+                 AND (iif(c.name='',c.authname,c.name) LIKE ? OR c.addr LIKE ?) \
+                 ORDER BY c.last_seen DESC, c.id DESC;",
                     (
                         ContactId::LAST_SPECIAL,
                         flag_address,
                         minimal_origin,
                         &s3str_like_cmd,
                         &s3str_like_cmd,
-                        Origin::CreateChat,
                     ),
                     |row| {
                         let id: ContactId = row.get(0)?;
@@ -1202,13 +1182,8 @@ ORDER BY c.origin>=? DESC, c.last_seen DESC, c.id DESC
                  AND (fingerprint='')=?
                  AND origin>=?
                  AND blocked=0
-                 ORDER BY origin>=? DESC, last_seen DESC, id DESC",
-                    (
-                        ContactId::LAST_SPECIAL,
-                        flag_address,
-                        minimal_origin,
-                        Origin::CreateChat,
-                    ),
+                 ORDER BY last_seen DESC, id DESC;",
+                    (ContactId::LAST_SPECIAL, flag_address, minimal_origin),
                     |row| {
                         let id: ContactId = row.get(0)?;
                         let addr: String = row.get(1)?;
@@ -1278,18 +1253,8 @@ ORDER BY c.origin>=? DESC, c.last_seen DESC, c.id DESC
                     };
                     // Always do an update in case the blocking is reset or name is changed.
                     transaction.execute(
-                        "
-UPDATE contacts
-SET name=?, name_normalized=IIF(?1='',name_normalized,?), origin=?, blocked=1, fingerprint=?
-WHERE addr=?
-                        ",
-                        (
-                            &name,
-                            normalize_text(&name),
-                            Origin::MailinglistAddress,
-                            fingerprint,
-                            &grpid,
-                        ),
+                        "UPDATE contacts SET name=?, origin=?, blocked=1, fingerprint=? WHERE addr=?",
+                        (&name, Origin::MailinglistAddress, fingerprint, &grpid),
                     )?;
                 }
                 Ok(())
@@ -1544,6 +1509,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
@@ -1764,8 +1741,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 {
@@ -1859,19 +1836,25 @@ WHERE type=? AND id IN (
 /// The given profile image is expected to be already in the blob directory
 /// as profile images can be set only by receiving messages, this should be always the case, however.
 ///
-/// For contact SELF, the image is not saved in the contact-database but as Config::Selfavatar.
+/// For contact SELF, the image is not saved in the contact-database but as Config::Selfavatar;
+/// this typically happens if we see message with our own profile image.
 pub(crate) async fn set_profile_image(
     context: &Context,
     contact_id: ContactId,
     profile_image: &AvatarAction,
+    was_encrypted: bool,
 ) -> Result<()> {
     let mut contact = Contact::get_by_id(context, contact_id).await?;
     let changed = match profile_image {
         AvatarAction::Change(profile_image) => {
             if contact_id == ContactId::SELF {
-                context
-                    .set_config_ex(Nosync, Config::Selfavatar, Some(profile_image))
-                    .await?;
+                if was_encrypted {
+                    context
+                        .set_config_ex(Nosync, Config::Selfavatar, Some(profile_image))
+                        .await?;
+                } else {
+                    info!(context, "Do not use unencrypted selfavatar.");
+                }
             } else {
                 contact.param.set(Param::ProfileImage, profile_image);
             }
@@ -1879,9 +1862,13 @@ pub(crate) async fn set_profile_image(
         }
         AvatarAction::Delete => {
             if contact_id == ContactId::SELF {
-                context
-                    .set_config_ex(Nosync, Config::Selfavatar, None)
-                    .await?;
+                if was_encrypted {
+                    context
+                        .set_config_ex(Nosync, Config::Selfavatar, None)
+                        .await?;
+                } else {
+                    info!(context, "Do not use unencrypted selfavatar deletion.");
+                }
             } else {
                 contact.param.remove(Param::ProfileImage);
             }
@@ -1898,16 +1885,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;
@@ -200,25 +201,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 {
@@ -243,9 +225,9 @@ pub struct InnerContext {
     pub(crate) scheduler: SchedulerState,
     pub(crate) ratelimit: RwLock<Ratelimit>,
 
-    /// Recently loaded quota information for each trasnport, if any.
-    /// If quota was never tried to load, then the transport doesn't have an entry in the BTreeMap.
-    pub(crate) quota: RwLock<BTreeMap<u32, QuotaInfo>>,
+    /// Recently loaded quota information, if any.
+    /// Set to `None` if quota was never tried to load.
+    pub(crate) quota: RwLock<Option<QuotaInfo>>,
 
     /// Notify about new messages.
     ///
@@ -351,7 +333,7 @@ pub fn get_info() -> BTreeMap<&'static str, String> {
     #[cfg(not(debug_assertions))]
     res.insert("debug_assertions", "Off".to_string());
 
-    res.insert("deltachat_core_version", format!("v{DC_VERSION_STR}"));
+    res.insert("deltachat_core_version", format!("v{}", &*DC_VERSION_STR));
     res.insert("sqlite_version", rusqlite::version().to_string());
     res.insert("arch", (std::mem::size_of::<usize>() * 8).to_string());
     res.insert("num_cpus", num_cpus::get().to_string());
@@ -403,13 +385,6 @@ 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.
@@ -478,8 +453,8 @@ impl Context {
             translated_stockstrings: stockstrings,
             events,
             scheduler: SchedulerState::new(),
-            ratelimit: RwLock::new(Ratelimit::new(Duration::new(3, 0), 3.0)), // Allow at least 1 message every second + a burst of 3.
-            quota: RwLock::new(BTreeMap::new()),
+            ratelimit: RwLock::new(Ratelimit::new(Duration::new(60, 0), 6.0)), // Allow at least 1 message every 10 seconds + a burst of 6.
+            quota: RwLock::new(None),
             new_msgs_notify,
             server_id: RwLock::new(None),
             metadata: RwLock::new(None),
@@ -510,6 +485,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()
@@ -614,13 +595,8 @@ impl Context {
             }
 
             // Update quota (to send warning if full) - but only check it once in a while.
-            // note: For now this only checks quota of primary transport,
-            // because background check only checks primary transport at the moment
             if self
-                .quota_needs_update(
-                    session.transport_id(),
-                    DC_BACKGROUND_FETCH_QUOTA_CHECK_RATELIMIT,
-                )
+                .quota_needs_update(DC_BACKGROUND_FETCH_QUOTA_CHECK_RATELIMIT)
                 .await
                 && let Err(err) = self.update_recent_quota(&mut session).await
             {
@@ -820,17 +796,12 @@ impl Context {
 
     /// Returns information about the context as key-value pairs.
     pub async fn get_info(&self) -> Result<BTreeMap<&'static str, String>> {
+        let l = EnteredLoginParam::load(self).await?;
+        let l2 = ConfiguredLoginParam::load(self).await?.map_or_else(
+            || "Not configured".to_string(),
+            |(_transport_id, param)| param.to_string(),
+        );
         let secondary_addrs = self.get_secondary_self_addrs().await?.join(", ");
-        let all_transports: Vec<String> = ConfiguredLoginParam::load_all(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(",")
-        };
         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;
@@ -909,7 +880,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:?}"));
@@ -1339,5 +1311,10 @@ impl Context {
     }
 }
 
+/// Returns core version as a string.
+pub fn get_version_str() -> &'static str {
+    &DC_VERSION_STR
+}
+
 #[cfg(test)]
 mod context_tests;

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/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.
-    ///
-    /// UI should update the list.
-    ///
-    /// This event is emitted when transport
-    /// synchronization messages arrives,
-    /// but not when the UI modifies the transport list by itself.
-    TransportsModified,
-
     /// Event for using in tests, e.g. as a fence between normally generated events.
     #[cfg(test)]
     Test,

src/headerdef.rs

@@ -91,7 +91,6 @@ pub enum HeaderDef {
     ChatDispositionNotificationTo,
     ChatWebrtcRoom,
     ChatWebrtcAccepted,
-    ChatWebrtcHasVideoInitially,
 
     /// This message deletes the messages listed in the value by rfc724_mid.
     ChatDelete,

src/imap.rs

@@ -27,7 +27,7 @@ use crate::calls::{create_fallback_ice_servers, create_ice_servers_from_metadata
 use crate::chat::{self, ChatId, ChatIdBlocked, add_device_msg};
 use crate::chatlist_events;
 use crate::config::Config;
-use crate::constants::{self, Blocked, Chattype, DC_VERSION_STR, ShowEmails};
+use crate::constants::{self, Blocked, Chattype, ShowEmails};
 use crate::contact::{Contact, ContactId, Modifier, Origin};
 use crate::context::Context;
 use crate::events::EventType;
@@ -79,7 +79,7 @@ pub(crate) struct Imap {
     pub(crate) idle_interrupt_receiver: Receiver<()>,
 
     /// Email address.
-    pub(crate) addr: String,
+    addr: String,
 
     /// Login parameters.
     lp: Vec<ConfiguredServerLoginParam>,
@@ -123,7 +123,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>.
@@ -916,7 +916,7 @@ 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.
@@ -1054,16 +1054,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)?;
@@ -1110,6 +1108,52 @@ impl Session {
         Ok(())
     }
 
+    /// Uploads sync messages from the `imap_send` table with `\Seen` flag set.
+    pub(crate) async fn send_sync_msgs(&mut self, context: &Context, folder: &str) -> Result<()> {
+        context.send_sync_msg().await?;
+        while let Some((id, mime, msg_id, attempts)) = context
+            .sql
+            .query_row_optional(
+                "SELECT id, mime, msg_id, attempts FROM imap_send ORDER BY id LIMIT 1",
+                (),
+                |row| {
+                    let id: i64 = row.get(0)?;
+                    let mime: String = row.get(1)?;
+                    let msg_id: MsgId = row.get(2)?;
+                    let attempts: i64 = row.get(3)?;
+                    Ok((id, mime, msg_id, attempts))
+                },
+            )
+            .await
+            .context("Failed to SELECT from imap_send")?
+        {
+            let res = self
+                .append(folder, Some("(\\Seen)"), None, mime)
+                .await
+                .with_context(|| format!("IMAP APPEND to {folder} failed for {msg_id}"))
+                .log_err(context);
+            if res.is_ok() {
+                msg_id.set_delivered(context).await?;
+            }
+            const MAX_ATTEMPTS: i64 = 2;
+            if res.is_ok() || attempts >= MAX_ATTEMPTS - 1 {
+                context
+                    .sql
+                    .execute("DELETE FROM imap_send WHERE id=?", (id,))
+                    .await
+                    .context("Failed to delete from imap_send")?;
+            } else {
+                context
+                    .sql
+                    .execute("UPDATE imap_send SET attempts=attempts+1 WHERE id=?", (id,))
+                    .await
+                    .context("Failed to update imap_send.attempts")?;
+                res?;
+            }
+        }
+        Ok(())
+    }
+
     /// Stores pending `\Seen` flags for messages in `imap_markseen` table.
     pub(crate) async fn store_seen_flags_on_imap(&mut self, context: &Context) -> Result<()> {
         let rows = context
@@ -1233,10 +1277,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);
@@ -1456,7 +1500,7 @@ impl Session {
                         warn!(context, "receive_imf error: {err:#}.");
 
                         let text = format!(
-                            "❌ Failed to receive a message: {err:#}. Core version v{DC_VERSION_STR}. Please report this bug to delta@merlinux.eu or https://support.delta.chat/.",
+                            "❌ Failed to receive a message: {err:#}. Please report this bug to delta@merlinux.eu or https://support.delta.chat/."
                         );
                         let mut msg = Message::new_text(text);
                         add_device_msg(context, None, Some(&mut msg)).await?;
@@ -1502,17 +1546,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();
 
@@ -1521,33 +1565,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?;
@@ -2067,6 +2109,17 @@ async fn needs_move_to_mvbox(
     headers: &[mailparse::MailHeader<'_>],
 ) -> Result<bool> {
     let has_chat_version = headers.get_header_value(HeaderDef::ChatVersion).is_some();
+    if !context.get_config_bool(Config::IsChatmail).await?
+        && has_chat_version
+        && headers
+            .get_header_value(HeaderDef::AutoSubmitted)
+            .filter(|val| val.eq_ignore_ascii_case("auto-generated"))
+            .is_some()
+        && let Some(from) = mimeparser::get_from(headers)
+        && context.is_self_addr(&from.addr).await?
+    {
+        return Ok(true);
+    }
     if !context.get_config_bool(Config::MvboxMove).await? {
         return Ok(false);
     }
@@ -2304,7 +2357,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,
@@ -2315,13 +2367,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)?;

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() {
@@ -272,14 +271,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/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/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
@@ -1717,7 +1712,6 @@ pub async fn delete_msgs_ex(
                 msgs: deleted_rfc724_mid,
             })
             .await?;
-        context.scheduler.interrupt_smtp().await;
     }
 
     for &msg_id in msg_ids {
@@ -2254,5 +2248,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/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());
                 }
@@ -1259,17 +1271,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 +1284,6 @@ impl MimeFactory {
                         message,
                         compress,
                         anonymous_recipients,
-                        seipd_version,
                     )
                     .await?
             };
@@ -1538,9 +1538,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 +1564,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 +1601,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 +1728,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
@@ -1765,12 +1765,6 @@ impl MimeFactory {
                 mail_builder::headers::raw::Raw::new(b_encode(answer)).into(),
             ));
         }
-        if let Some(has_video) = msg.param.get(Param::CallHasVideoInitially) {
-            headers.push((
-                "Chat-Webrtc-Has-Video-Initially",
-                mail_builder::headers::raw::Raw::new(b_encode(has_video)).into(),
-            ))
-        }
 
         if msg.viewtype == Viewtype::Voice
             || msg.viewtype == Viewtype::Audio

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

@@ -738,9 +738,6 @@ impl MimeMessage {
         let accepted = self
             .get_header(HeaderDef::ChatWebrtcAccepted)
             .map(|s| s.to_string());
-        let has_video = self
-            .get_header(HeaderDef::ChatWebrtcHasVideoInitially)
-            .map(|s| s.to_string());
         if let Some(part) = self.parts.first_mut() {
             if let Some(room) = room {
                 if content == "call" {
@@ -750,9 +747,6 @@ impl MimeMessage {
             } else if let Some(accepted) = accepted {
                 part.param.set(Param::WebrtcAccepted, accepted);
             }
-            if let Some(has_video) = has_video {
-                part.param.set(Param::CallHasVideoInitially, has_video);
-            }
         }
     }
 

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;
@@ -506,6 +506,10 @@ static DNS_PRELOAD: LazyLock<HashMap<&'static str, Vec<IpAddr>>> = LazyLock::new
             "mail.nubo.coop",
             vec![IpAddr::V4(Ipv4Addr::new(79, 99, 201, 10))],
         ),
+        (
+            "mehl.cloud",
+            vec![IpAddr::V4(Ipv4Addr::new(95, 217, 223, 172))],
+        ),
         (
             "mx.freenet.de",
             vec![
@@ -676,72 +680,6 @@ static DNS_PRELOAD: LazyLock<HashMap<&'static str, Vec<IpAddr>>> = LazyLock::new
                 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))],
-        ),
-        (
-            "mailchat.pl",
-            vec![IpAddr::V4(Ipv4Addr::new(46, 62, 144, 137))],
-        ),
-        (
-            "chatmail.woodpeckersnest.space",
-            vec![IpAddr::V4(Ipv4Addr::new(85, 215, 162, 146))],
-        ),
-        (
-            "chatmail.culturanerd.it",
-            vec![IpAddr::V4(Ipv4Addr::new(82, 165, 94, 165))],
-        ),
-        (
-            "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))],
-        ),
     ])
 });
 
@@ -850,7 +788,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 +799,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

@@ -148,9 +148,6 @@ pub enum Param {
     /// For Messages
     WebrtcAccepted = b'7',
 
-    /// For Messages
-    CallHasVideoInitially = b'8',
-
     /// For Messages: space-separated list of messaged IDs of forwarded copies.
     ///
     /// This is used when a [crate::message::Message] is in the
@@ -436,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:?}")
             }
         }
@@ -904,7 +904,7 @@ pub async fn set_config_from_qr(context: &Context, qr: &str) -> Result<()> {
             .await?;
             token::save(context, token::Namespace::Auth, None, &authcode, timestamp).await?;
             context.sync_qr_code_tokens(None).await?;
-            context.scheduler.interrupt_smtp().await;
+            context.scheduler.interrupt_inbox().await;
         }
         Qr::ReviveVerifyGroup {
             invitenumber,
@@ -936,7 +936,7 @@ pub async fn set_config_from_qr(context: &Context, qr: &str) -> Result<()> {
             )
             .await?;
             context.sync_qr_code_tokens(Some(&grpid)).await?;
-            context.scheduler.interrupt_smtp().await;
+            context.scheduler.interrupt_inbox().await;
         }
         Qr::Login { address, options } => {
             let mut param = login_param_from_login_qr(&address, options)?;

src/quota.rs

@@ -107,10 +107,10 @@ pub fn needs_quota_warning(curr_percentage: u64, warned_at_percentage: u64) -> b
 impl Context {
     /// Returns whether the quota value needs an update. If so, `update_recent_quota()` should be
     /// called.
-    pub(crate) async fn quota_needs_update(&self, transport_id: u32, ratelimit_secs: u64) -> bool {
+    pub(crate) async fn quota_needs_update(&self, ratelimit_secs: u64) -> bool {
         let quota = self.quota.read().await;
         quota
-            .get(&transport_id)
+            .as_ref()
             .filter(|quota| time_elapsed(&quota.modified) < Duration::from_secs(ratelimit_secs))
             .is_none()
     }
@@ -155,13 +155,10 @@ impl Context {
             }
         }
 
-        self.quota.write().await.insert(
-            session.transport_id(),
-            QuotaInfo {
-                recent: quota,
-                modified: tools::Time::now(),
-            },
-        );
+        *self.quota.write().await = Some(QuotaInfo {
+            recent: quota,
+            modified: tools::Time::now(),
+        });
 
         self.emit_event(EventType::ConnectivityChanged);
         Ok(())
@@ -206,42 +203,27 @@ mod tests {
         let mut tcm = TestContextManager::new();
         let t = &tcm.unconfigured().await;
         const TIMEOUT: u64 = 60;
-        assert!(t.quota_needs_update(0, TIMEOUT).await);
+        assert!(t.quota_needs_update(TIMEOUT).await);
 
-        *t.quota.write().await = {
-            let mut map = BTreeMap::new();
-            map.insert(
-                0,
-                QuotaInfo {
-                    recent: Ok(Default::default()),
-                    modified: tools::Time::now() - Duration::from_secs(TIMEOUT + 1),
-                },
-            );
-            map
-        };
-        assert!(t.quota_needs_update(0, TIMEOUT).await);
+        *t.quota.write().await = Some(QuotaInfo {
+            recent: Ok(Default::default()),
+            modified: tools::Time::now() - Duration::from_secs(TIMEOUT + 1),
+        });
+        assert!(t.quota_needs_update(TIMEOUT).await);
 
-        *t.quota.write().await = {
-            let mut map = BTreeMap::new();
-            map.insert(
-                0,
-                QuotaInfo {
-                    recent: Ok(Default::default()),
-                    modified: tools::Time::now(),
-                },
-            );
-            map
-        };
-        assert!(!t.quota_needs_update(0, TIMEOUT).await);
+        *t.quota.write().await = Some(QuotaInfo {
+            recent: Ok(Default::default()),
+            modified: tools::Time::now(),
+        });
+        assert!(!t.quota_needs_update(TIMEOUT).await);
 
         t.evtracker.clear_events();
         t.set_primary_self_addr("new@addr").await?;
-        assert!(t.quota.read().await.is_empty());
+        assert!(t.quota.read().await.is_none());
         t.evtracker
             .get_matching(|evt| matches!(evt, EventType::ConnectivityChanged))
             .await;
-        assert!(t.quota_needs_update(0, TIMEOUT).await);
-
+        assert!(t.quota_needs_update(TIMEOUT).await);
         Ok(())
     }
 }

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

@@ -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:#}.");
     }
@@ -2106,7 +2068,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()
@@ -2518,11 +2480,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 +2505,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 +3062,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 +3351,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));
     }

src/receive_imf/receive_imf_tests.rs

@@ -3852,38 +3852,6 @@ async fn test_sync_member_list_on_rejoin() -> Result<()> {
     Ok(())
 }
 
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_group_contacts_goto_bottom() -> Result<()> {
-    let mut tcm = TestContextManager::new();
-    let alice = &tcm.alice().await;
-    let bob = &tcm.bob().await;
-    let fiona = &tcm.fiona().await;
-
-    let bob_id = alice.add_or_lookup_contact_id(bob).await;
-    let fiona_id = alice.add_or_lookup_contact_id(fiona).await;
-
-    let alice_chat_id = create_group(alice, "Testing contact list").await?;
-    add_contact_to_chat(alice, alice_chat_id, bob_id).await?;
-    add_contact_to_chat(alice, alice_chat_id, fiona_id).await?;
-
-    send_text_msg(alice, alice_chat_id, "hello".to_string()).await?;
-    bob.recv_msg(&alice.pop_sent_msg().await).await;
-    let bob_chat_id = bob.get_last_msg().await.chat_id;
-    assert_eq!(get_chat_contacts(bob, bob_chat_id).await?.len(), 3);
-    assert_eq!(Contact::get_all(bob, 0, None).await?.len(), 0);
-    bob_chat_id.accept(bob).await?;
-    let contacts = Contact::get_all(bob, 0, None).await?;
-    assert_eq!(contacts.len(), 2);
-    let bob_fiona_id = bob.add_or_lookup_contact_id(fiona).await;
-    assert_eq!(contacts[1], bob_fiona_id);
-
-    ChatId::create_for_contact(bob, bob_fiona_id).await?;
-    let contacts = Contact::get_all(bob, 0, None).await?;
-    assert_eq!(contacts.len(), 2);
-    assert_eq!(contacts[0], bob_fiona_id);
-    Ok(())
-}
-
 /// Test for the bug when remote group membership changes from outdated messages overrode local
 /// ones. Especially that was a problem when a message is sent offline so that it doesn't
 /// incorporate recent group membership changes.

src/scheduler.rs

@@ -325,8 +325,6 @@ impl Drop for IoPausedGuard {
 
 #[derive(Debug)]
 struct SchedBox {
-    /// Hostname of used chatmail/email relay
-    host: String,
     meaning: FolderMeaning,
     conn_state: ImapConnectionState,
 
@@ -481,7 +479,7 @@ async fn inbox_fetch_idle(ctx: &Context, imap: &mut Imap, mut session: Session)
     }
 
     // Update quota no more than once a minute.
-    if ctx.quota_needs_update(session.transport_id(), 60).await
+    if ctx.quota_needs_update(60).await
         && let Err(err) = ctx.update_recent_quota(&mut session).await
     {
         warn!(ctx, "Failed to update quota: {:#}.", err);
@@ -538,9 +536,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
@@ -572,6 +570,21 @@ async fn fetch_idle(
     };
 
     if folder_config == Config::ConfiguredInboxFolder {
+        let mvbox;
+        let syncbox = match ctx.should_move_sync_msgs().await? {
+            false => &watch_folder,
+            true => {
+                mvbox = ctx.get_config(Config::ConfiguredMvboxFolder).await?;
+                mvbox.as_deref().unwrap_or(&watch_folder)
+            }
+        };
+        session
+            .send_sync_msgs(ctx, syncbox)
+            .await
+            .context("fetch_idle: send_sync_msgs")
+            .log_err(ctx)
+            .ok();
+
         session
             .store_seen_flags_on_imap(ctx)
             .await
@@ -861,14 +874,7 @@ impl Scheduler {
                 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,
                 conn_state,
                 handle,
@@ -884,7 +890,6 @@ impl Scheduler {
                 let meaning = FolderMeaning::Mvbox;
                 let handle = task::spawn(simple_imap_loop(ctx, start_send, handlers, meaning));
                 oboxes.push(SchedBox {
-                    host,
                     meaning,
                     conn_state,
                     handle,

src/scheduler/connectivity.rs

@@ -373,13 +373,7 @@ impl Context {
             InnerSchedulerState::Started(ref sched) => (
                 sched
                     .boxes()
-                    .map(|b| {
-                        (
-                            b.host.clone(),
-                            b.meaning,
-                            b.conn_state.state.connectivity.clone(),
-                        )
-                    })
+                    .map(|b| (b.meaning, b.conn_state.state.connectivity.clone()))
                     .collect::<Vec<_>>(),
                 sched.smtp.state.connectivity.clone(),
             ),
@@ -402,7 +396,7 @@ impl Context {
         let watched_folders = get_watched_folder_configs(self).await?;
         let incoming_messages = stock_str::incoming_messages(self).await;
         ret += &format!("<h3>{incoming_messages}</h3><ul>");
-        for (host, folder, state) in &folders_states {
+        for (folder, state) in &folders_states {
             let mut folder_added = false;
 
             if let Some(config) = folder.to_config().filter(|c| watched_folders.contains(c)) {
@@ -413,11 +407,7 @@ impl Context {
                     ret += "<li>";
                     ret += &*detailed.to_icon();
                     ret += " <b>";
-                    if folder == &FolderMeaning::Inbox {
-                        ret += &*escaper::encode_minimal(host);
-                    } else {
-                        ret += &*escaper::encode_minimal(&foldername);
-                    }
+                    ret += &*escaper::encode_minimal(&foldername);
                     ret += ":</b> ";
                     ret += &*escaper::encode_minimal(&detailed.to_string_imap(self).await);
                     ret += "</li>";
@@ -462,41 +452,21 @@ impl Context {
         //                                [======67%=====       ]
         // =============================================================================================
 
-        ret += "<h3>Message Buffers</h3>";
-        let transports = self
-            .sql
-            .query_map_vec("SELECT id, addr FROM transports", (), |row| {
-                let transport_id: u32 = row.get(0)?;
-                let addr: String = row.get(1)?;
-                Ok((transport_id, addr))
-            })
-            .await?;
+        let domain =
+            &deltachat_contact_tools::EmailAddress::new(&self.get_primary_self_addr().await?)?
+                .domain;
+        let storage_on_domain =
+            escaper::encode_minimal(&stock_str::storage_on_domain(self, domain).await);
+        ret += &format!("<h3>{storage_on_domain}</h3><ul>");
         let quota = self.quota.read().await;
-        ret += "<ul>";
-        for (transport_id, transport_addr) in transports {
-            let domain = &deltachat_contact_tools::EmailAddress::new(&transport_addr)
-                .map_or(transport_addr, |email| email.domain);
-            let domain_escaped = escaper::encode_minimal(domain);
-            let Some(quota) = quota.get(&transport_id) else {
-                let not_connected = stock_str::not_connected(self).await;
-                ret += &format!("<li>{domain_escaped} &middot; {not_connected}</li>");
-                continue;
-            };
+        if let Some(quota) = &*quota {
             match &quota.recent {
-                Err(e) => {
-                    let error_escaped = escaper::encode_minimal(&e.to_string());
-                    ret += &format!("<li>{domain_escaped} &middot; {error_escaped}</li>");
-                }
                 Ok(quota) => {
-                    if quota.is_empty() {
-                        ret += &format!(
-                            "<li>{domain_escaped} &middot; Warning: {domain_escaped} claims to support quota but gives no information</li>"
-                        );
-                    } else {
+                    if !quota.is_empty() {
                         for (root_name, resources) in quota {
                             use async_imap::types::QuotaResourceName::*;
                             for resource in resources {
-                                ret += &format!("<li>{domain_escaped} &middot; ");
+                                ret += "<li>";
 
                                 // root name is empty eg. for gmail and redundant eg. for riseup.
                                 // therefore, use it only if there are really several roots.
@@ -559,9 +529,21 @@ impl Context {
                                 ret += "</li>";
                             }
                         }
+                    } else {
+                        let domain_escaped = escaper::encode_minimal(domain);
+                        ret += &format!(
+                            "<li>Warning: {domain_escaped} claims to support quota but gives no information</li>"
+                        );
                     }
                 }
+                Err(e) => {
+                    let error_escaped = escaper::encode_minimal(&e.to_string());
+                    ret += &format!("<li>{error_escaped}</li>");
+                }
             }
+        } else {
+            let not_connected = stock_str::not_connected(self).await;
+            ret += &format!("<li>{not_connected}</li>");
         }
         ret += "</ul>";
 

src/securejoin.rs

@@ -160,7 +160,7 @@ pub async fn get_securejoin_qr(context: &Context, chat: Option<ChatId>) -> Resul
             context
                 .sync_qr_code_tokens(Some(chat.grpid.as_str()))
                 .await?;
-            context.scheduler.interrupt_smtp().await;
+            context.scheduler.interrupt_inbox().await;
         }
 
         let chat_name = chat.get_name();
@@ -192,7 +192,7 @@ pub async fn get_securejoin_qr(context: &Context, chat: Option<ChatId>) -> Resul
             .replace("%20", "+");
         if sync_token {
             context.sync_qr_code_tokens(None).await?;
-            context.scheduler.interrupt_smtp().await;
+            context.scheduler.interrupt_inbox().await;
         }
         format!(
             "https://i.delta.chat/#{fingerprint}&i={invitenumber}&s={auth}&a={self_addr_urlencoded}&n={self_name_urlencoded}",
@@ -567,7 +567,7 @@ pub(crate) async fn handle_securejoin_handshake(
         "vc-contact-confirm" => {
             context.emit_event(EventType::SecurejoinJoinerProgress {
                 contact_id,
-                progress: JoinerProgress::Succeeded.into_u16(),
+                progress: JoinerProgress::Succeeded.to_usize(),
             });
             Ok(HandshakeMessage::Ignore)
         }
@@ -590,7 +590,7 @@ pub(crate) async fn handle_securejoin_handshake(
 
             context.emit_event(EventType::SecurejoinJoinerProgress {
                 contact_id,
-                progress: JoinerProgress::Succeeded.into_u16(),
+                progress: JoinerProgress::Succeeded.to_usize(),
             });
             Ok(HandshakeMessage::Propagate)
         }

src/securejoin/bob.rs

@@ -5,16 +5,14 @@ use anyhow::{Context as _, Result};
 use super::HandshakeMessage;
 use super::qrinvite::QrInvite;
 use crate::chat::{self, ChatId, is_contact_in_chat};
-use crate::chatlist_events;
 use crate::constants::{Blocked, Chattype};
 use crate::contact::Origin;
 use crate::context::Context;
 use crate::events::EventType;
 use crate::key::self_fingerprint;
-use crate::log::LogExt;
-use crate::message::{Message, MsgId, Viewtype};
+use crate::message::{Message, Viewtype};
 use crate::mimeparser::{MimeMessage, SystemMessage};
-use crate::param::{Param, Params};
+use crate::param::Param;
 use crate::securejoin::{ContactId, encrypted_and_signed, verify_sender_by_fingerprint};
 use crate::stock_str;
 use crate::sync::Sync::*;
@@ -45,21 +43,31 @@ pub(super) async fn start_protocol(context: &Context, invite: QrInvite) -> Resul
     // A 1:1 chat is needed to send messages to Alice.  When joining a group this chat is
     // hidden, if a user starts sending messages in it it will be unhidden in
     // receive_imf.
-    let private_chat_id = private_chat_id(context, &invite).await?;
+    let hidden = match invite {
+        QrInvite::Contact { .. } => Blocked::Not,
+        QrInvite::Group { .. } => Blocked::Yes,
+        QrInvite::Broadcast { .. } => Blocked::Yes,
+    };
+
+    // The 1:1 chat with the inviter
+    let private_chat_id =
+        ChatId::create_for_contact_with_blocked(context, invite.contact_id(), hidden)
+            .await
+            .with_context(|| format!("can't create chat for contact {}", invite.contact_id()))?;
 
     ContactId::scaleup_origin(context, &[invite.contact_id()], Origin::SecurejoinJoined).await?;
     context.emit_event(EventType::ContactsChanged(None));
 
-    let has_key = context
-        .sql
-        .exists(
-            "SELECT COUNT(*) FROM public_keys WHERE fingerprint=?",
-            (invite.fingerprint().hex(),),
-        )
-        .await?;
-
     // Now start the protocol and initialise the state.
     {
+        let has_key = context
+            .sql
+            .exists(
+                "SELECT COUNT(*) FROM public_keys WHERE fingerprint=?",
+                (invite.fingerprint().hex(),),
+            )
+            .await?;
+
         // `joining_chat_id` is `Some` if group chat
         // already exists and we are in the chat.
         let joining_chat_id = match invite {
@@ -86,7 +94,7 @@ pub(super) async fn start_protocol(context: &Context, invite: QrInvite) -> Resul
             // Even if Alice is not verified, we don't send anything.
             context.emit_event(EventType::SecurejoinJoinerProgress {
                 contact_id: invite.contact_id(),
-                progress: JoinerProgress::Succeeded.into_u16(),
+                progress: JoinerProgress::Succeeded.to_usize(),
             });
             return Ok(joining_chat_id);
         } else if has_key
@@ -105,7 +113,7 @@ pub(super) async fn start_protocol(context: &Context, invite: QrInvite) -> Resul
 
             context.emit_event(EventType::SecurejoinJoinerProgress {
                 contact_id: invite.contact_id(),
-                progress: JoinerProgress::RequestWithAuthSent.into_u16(),
+                progress: JoinerProgress::RequestWithAuthSent.to_usize(),
             });
         } else {
             send_handshake_message(context, &invite, private_chat_id, BobHandshakeMsg::Request)
@@ -144,22 +152,20 @@ pub(super) async fn start_protocol(context: &Context, invite: QrInvite) -> Resul
             Ok(joining_chat_id)
         }
         QrInvite::Contact { .. } => {
-            // For setup-contact the BobState already ensured the 1:1 chat exists because it is
-            // used to send the handshake messages.
-            if !has_key {
-                chat::add_info_msg_with_cmd(
-                    context,
-                    private_chat_id,
-                    &stock_str::securejoin_wait(context).await,
-                    SystemMessage::SecurejoinWait,
-                    None,
-                    time(),
-                    None,
-                    None,
-                    None,
-                )
-                .await?;
-            }
+            // For setup-contact the BobState already ensured the 1:1 chat exists because it
+            // uses it to send the handshake messages.
+            chat::add_info_msg_with_cmd(
+                context,
+                private_chat_id,
+                &stock_str::securejoin_wait(context).await,
+                SystemMessage::SecurejoinWait,
+                None,
+                time(),
+                None,
+                None,
+                None,
+            )
+            .await?;
             Ok(private_chat_id)
         }
     }
@@ -169,9 +175,6 @@ pub(super) async fn start_protocol(context: &Context, invite: QrInvite) -> Resul
 ///
 /// Returns the ID of the newly inserted entry.
 async fn insert_new_db_entry(context: &Context, invite: QrInvite, chat_id: ChatId) -> Result<i64> {
-    // The `chat_id` isn't actually needed anymore,
-    // but we still save it;
-    // can be removed as a future improvement.
     context
         .sql
         .insert(
@@ -181,38 +184,6 @@ async fn insert_new_db_entry(context: &Context, invite: QrInvite, chat_id: ChatI
         .await
 }
 
-async fn delete_securejoin_wait_msg(context: &Context, chat_id: ChatId) -> Result<()> {
-    if let Some((msg_id, param)) = context
-        .sql
-        .query_row_optional(
-            "
-SELECT id, param FROM msgs
-WHERE timestamp=(SELECT MAX(timestamp) FROM msgs WHERE chat_id=? AND hidden=0)
-    AND chat_id=? AND hidden=0
-LIMIT 1
-            ",
-            (chat_id, chat_id),
-            |row| {
-                let id: MsgId = row.get(0)?;
-                let param: String = row.get(1)?;
-                let param: Params = param.parse().unwrap_or_default();
-                Ok((id, param))
-            },
-        )
-        .await?
-        && param.get_cmd() == SystemMessage::SecurejoinWait
-    {
-        let on_server = false;
-        msg_id.trash(context, on_server).await?;
-        context.emit_event(EventType::MsgDeleted { chat_id, msg_id });
-        context.emit_msgs_changed_without_msg_id(chat_id);
-        chatlist_events::emit_chatlist_item_changed(context, chat_id);
-        context.emit_msgs_changed_without_ids();
-        chatlist_events::emit_chatlist_changed(context);
-    }
-    Ok(())
-}
-
 /// Handles `vc-auth-required` and `vg-auth-required` handshake messages.
 ///
 /// # Bob - the joiner's side
@@ -224,10 +195,11 @@ pub(super) async fn handle_auth_required(
     // Load all Bob states that expect `vc-auth-required` or `vg-auth-required`.
     let bob_states = context
         .sql
-        .query_map_vec("SELECT id, invite FROM bobstate", (), |row| {
+        .query_map_vec("SELECT id, invite, chat_id FROM bobstate", (), |row| {
             let row_id: i64 = row.get(0)?;
             let invite: QrInvite = row.get(1)?;
-            Ok((row_id, invite))
+            let chat_id: ChatId = row.get(2)?;
+            Ok((row_id, invite, chat_id))
         })
         .await?;
 
@@ -237,7 +209,7 @@ pub(super) async fn handle_auth_required(
     );
 
     let mut auth_sent = false;
-    for (bobstate_row_id, invite) in bob_states {
+    for (bobstate_row_id, invite, chat_id) in bob_states {
         if !encrypted_and_signed(context, message, invite.fingerprint()) {
             continue;
         }
@@ -248,12 +220,6 @@ pub(super) async fn handle_auth_required(
         }
 
         info!(context, "Fingerprint verified.",);
-        let chat_id = private_chat_id(context, &invite).await?;
-        delete_securejoin_wait_msg(context, chat_id)
-            .await
-            .context("delete_securejoin_wait_msg")
-            .log_err(context)
-            .ok();
         send_handshake_message(context, &invite, chat_id, BobHandshakeMsg::RequestWithAuth).await?;
         context
             .sql
@@ -274,7 +240,7 @@ pub(super) async fn handle_auth_required(
 
         context.emit_event(EventType::SecurejoinJoinerProgress {
             contact_id: invite.contact_id(),
-            progress: JoinerProgress::RequestWithAuthSent.into_u16(),
+            progress: JoinerProgress::RequestWithAuthSent.to_usize(),
         });
 
         auth_sent = true;
@@ -382,22 +348,6 @@ impl BobHandshakeMsg {
     }
 }
 
-/// Returns the 1:1 chat with the inviter.
-///
-/// This is the chat in which securejoin messages are sent.
-/// The 1:1 chat will be created if it does not yet exist.
-async fn private_chat_id(context: &Context, invite: &QrInvite) -> Result<ChatId> {
-    let hidden = match invite {
-        QrInvite::Contact { .. } => Blocked::Not,
-        QrInvite::Group { .. } => Blocked::Yes,
-        QrInvite::Broadcast { .. } => Blocked::Yes,
-    };
-
-    ChatId::create_for_contact_with_blocked(context, invite.contact_id(), hidden)
-        .await
-        .with_context(|| format!("can't create chat for contact {}", invite.contact_id()))
-}
-
 /// Returns the [`ChatId`] of the chat being joined.
 ///
 /// This is the chat in which you want to notify the user as well.
@@ -456,7 +406,8 @@ pub(crate) enum JoinerProgress {
 }
 
 impl JoinerProgress {
-    pub(crate) fn into_u16(self) -> u16 {
+    #[expect(clippy::wrong_self_convention)]
+    pub(crate) fn to_usize(self) -> usize {
         match self {
             JoinerProgress::RequestWithAuthSent => 400,
             JoinerProgress::Succeeded => 1000,

src/securejoin/securejoin_tests.rs

@@ -100,17 +100,6 @@ async fn test_setup_contact_ex(case: SetupContactCase) {
         bob_chat.why_cant_send(&bob).await.unwrap(),
         Some(CantSendReason::MissingKey)
     );
-
-    // Check Bob's info messages.
-    let msg_cnt = 2;
-    let mut i = 0..msg_cnt;
-    let msg = get_chat_msg(&bob, bob_chat.get_id(), i.next().unwrap(), msg_cnt).await;
-    assert!(msg.is_info());
-    assert_eq!(msg.get_text(), messages_e2e_encrypted(&bob).await);
-    let msg = get_chat_msg(&bob, bob_chat.get_id(), i.next().unwrap(), msg_cnt).await;
-    assert!(msg.is_info());
-    assert_eq!(msg.get_text(), stock_str::securejoin_wait(&bob).await);
-
     let contact_alice_id = bob.add_or_lookup_contact_no_key(&alice).await.id;
     let sent = bob.pop_sent_msg().await;
     assert!(!sent.payload.contains("Bob Examplenet"));
@@ -254,7 +243,7 @@ async fn test_setup_contact_ex(case: SetupContactCase) {
         .unwrap();
     match case {
         SetupContactCase::AliceHasName => assert_eq!(contact_alice.get_authname(), "Alice"),
-        _ => assert_eq!(contact_alice.get_authname(), ""),
+        _ => assert_eq!(contact_alice.get_authname(), "Alice Exampleorg"),
     };
 
     // Check Alice sent the right message to Bob.
@@ -283,10 +272,15 @@ async fn test_setup_contact_ex(case: SetupContactCase) {
     assert!(contact_alice.get_name().is_empty());
     assert_eq!(contact_alice.is_bot(), case == SetupContactCase::AliceIsBot);
 
-    // The `SecurejoinWait` info message has been removed, but the e2ee notice remains.
-    let msg = get_chat_msg(&bob, bob_chat.get_id(), 0, 1).await;
+    // Check Bob got expected info messages in his 1:1 chat.
+    let msg_cnt = 2;
+    let mut i = 0..msg_cnt;
+    let msg = get_chat_msg(&bob, bob_chat.get_id(), i.next().unwrap(), msg_cnt).await;
     assert!(msg.is_info());
     assert_eq!(msg.get_text(), messages_e2e_encrypted(&bob).await);
+    let msg = get_chat_msg(&bob, bob_chat.get_id(), i.next().unwrap(), msg_cnt).await;
+    assert!(msg.is_info());
+    assert_eq!(msg.get_text(), stock_str::securejoin_wait(&bob).await);
 }
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -1019,7 +1013,7 @@ async fn test_expired_synced_auth_token() -> Result<()> {
     let qr = get_securejoin_qr(alice2, None).await?;
 
     alice2.send_sync_msg().await.unwrap();
-    let sync_msg = alice2.pop_sent_msg().await;
+    let sync_msg = alice2.pop_sent_sync_msg().await;
 
     // One week passes, QR code expires.
     SystemTime::shift(Duration::from_secs(7 * 24 * 3600));
@@ -1223,33 +1217,3 @@ async fn test_qr_no_implicit_inviter_addition() -> Result<()> {
 
     Ok(())
 }
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_user_deletes_chat_before_securejoin_completes() -> Result<()> {
-    let mut tcm = TestContextManager::new();
-    let alice = &tcm.alice().await;
-    let bob = &tcm.bob().await;
-
-    let qr = get_securejoin_qr(alice, None).await?;
-    let bob_chat_id = join_securejoin(bob, &qr).await?;
-
-    let bob_alice_chat = bob.get_chat(alice).await;
-    // It's not possible yet to send to the chat, because Bob doesn't have Alice's key:
-    assert_eq!(bob_alice_chat.can_send(bob).await?, false);
-    assert_eq!(bob_alice_chat.id, bob_chat_id);
-
-    let request = bob.pop_sent_msg().await;
-
-    bob_chat_id.delete(bob).await?;
-
-    alice.recv_msg_trash(&request).await;
-    let auth_required = alice.pop_sent_msg().await;
-
-    bob.recv_msg_trash(&auth_required).await;
-
-    // The chat with Alice should be recreated,
-    // and it should be sendable now:
-    assert!(bob.get_chat(alice).await.can_send(bob).await?);
-
-    Ok(())
-}

src/smtp.rs

@@ -495,7 +495,6 @@ async fn send_mdns(context: &Context, connection: &mut Smtp) -> Result<()> {
 pub(crate) async fn send_smtp_messages(context: &Context, connection: &mut Smtp) -> Result<()> {
     let ratelimited = if context.ratelimit.read().await.can_send() {
         // add status updates and sync messages to end of sending queue
-        context.send_sync_msg().await?;
         context.flush_status_updates().await?;
         false
     } else {

src/smtp/connect.rs

@@ -228,7 +228,6 @@ async fn connect_secure_proxy(
     strict_tls: bool,
     proxy_config: ProxyConfig,
 ) -> Result<Box<dyn SessionBufStream>> {
-    let use_sni = true;
     let proxy_stream = proxy_config
         .connect(context, hostname, port, strict_tls)
         .await?;
@@ -236,7 +235,6 @@ async fn connect_secure_proxy(
         strict_tls,
         hostname,
         port,
-        use_sni,
         alpn(port),
         proxy_stream,
         &context.tls_session_store,
@@ -255,7 +253,6 @@ async fn connect_starttls_proxy(
     strict_tls: bool,
     proxy_config: ProxyConfig,
 ) -> Result<Box<dyn SessionBufStream>> {
-    let use_sni = false;
     let proxy_stream = proxy_config
         .connect(context, hostname, port, strict_tls)
         .await?;
@@ -269,7 +266,6 @@ async fn connect_starttls_proxy(
         strict_tls,
         hostname,
         port,
-        use_sni,
         "",
         tcp_stream,
         &context.tls_session_store,
@@ -320,7 +316,6 @@ async fn connect_starttls(
     strict_tls: bool,
     tls_session_store: &TlsSessionStore,
 ) -> Result<Box<dyn SessionBufStream>> {
-    let use_sni = false;
     let tcp_stream = connect_tcp_inner(addr).await?;
 
     // Run STARTTLS command and convert the client back into a stream.
@@ -332,7 +327,6 @@ async fn connect_starttls(
         strict_tls,
         host,
         addr.port(),
-        use_sni,
         "",
         tcp_stream,
         tls_session_store,

src/sql.rs

@@ -9,6 +9,7 @@ use rusqlite::{Connection, OpenFlags, Row, config::DbConfig, types::ValueRef};
 use tokio::sync::RwLock;
 
 use crate::blob::BlobObject;
+use crate::chat::add_device_msg;
 use crate::config::Config;
 use crate::constants::DC_CHAT_ID_TRASH;
 use crate::context::Context;
@@ -17,11 +18,12 @@ use crate::ephemeral::start_ephemeral_timers;
 use crate::imex::BLOBS_BACKUP_NAME;
 use crate::location::delete_orphaned_poi_locations;
 use crate::log::{LogExt, warn};
-use crate::message::MsgId;
+use crate::message::{Message, MsgId};
 use crate::net::dns::prune_dns_cache;
 use crate::net::http::http_cache_cleanup;
 use crate::net::prune_connection_history;
 use crate::param::{Param, Params};
+use crate::stock_str;
 use crate::tools::{SystemTime, Time, delete_file, time, time_elapsed};
 
 /// Extension to [`rusqlite::ToSql`] trait
@@ -214,13 +216,26 @@ impl Sql {
         // this should be done before updates that use high-level objects that
         // rely themselves on the low-level structure.
 
-        let recode_avatar = migrations::run(context, self)
+        // `update_icons` is not used anymore, since it's not necessary anymore to "update" icons:
+        let (_update_icons, disable_server_delete, recode_avatar) = migrations::run(context, self)
             .await
             .context("failed to run migrations")?;
 
         // (2) updates that require high-level objects
         // the structure is complete now and all objects are usable
 
+        if disable_server_delete {
+            // We now always watch all folders and delete messages there if delete_server is enabled.
+            // So, for people who have delete_server enabled, disable it and add a hint to the devicechat:
+            if context.get_config_delete_server_after().await?.is_some() {
+                let mut msg = Message::new_text(stock_str::delete_server_turned_off(context).await);
+                add_device_msg(context, None, Some(&mut msg)).await?;
+                context
+                    .set_config_internal(Config::DeleteServerAfter, Some("0"))
+                    .await?;
+            }
+        }
+
         if recode_avatar && let Some(avatar) = context.get_config(Config::Selfavatar).await? {
             let mut blob = BlobObject::from_path(context, Path::new(&avatar))?;
             match blob.recode_to_avatar_size(context).await {