Update flake.lock

Switch nixpkgs to darwin-cross branch
ci: build macOS deltachat-rpc-server with Nix
2026-04-06 15:42:10 +03:00 · 2024-05-04 22:05:45 +00:00 · 2024-05-04 22:04:13 +00:00 · 2024-05-04 22:03:47 +00:00 · 2024-05-04 22:03:44 +00:00
69 changed files with 492 additions and 1975 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -113,9 +113,6 @@ jobs:
      - name: Tests
        env:
          RUST_BACKTRACE: 1
-
-          # Workaround for <https://github.com/nextest-rs/nextest/issues/1493>.
-          RUSTUP_WINDOWS_PATH_ADD_BIN: 1
        run: cargo nextest run --workspace

      - name: Doc-Tests
--- a/.github/workflows/deltachat-rpc-server.yml
+++ b/.github/workflows/deltachat-rpc-server.yml
@@ -80,18 +80,17 @@ jobs:
      - uses: actions/checkout@v4
        with:
          show-progress: false
+      - uses: DeterminateSystems/nix-installer-action@main
+      - uses: DeterminateSystems/magic-nix-cache-action@main

-      - name: Setup rust target
-        run: rustup target add ${{ matrix.arch }}-apple-darwin
-
-      - name: Build
-        run: cargo build --release --package deltachat-rpc-server --target ${{ matrix.arch }}-apple-darwin --features vendored
+      - name: Build deltachat-rpc-server binaries
+        run: nix build .#deltachat-rpc-server-${{ matrix.arch }}

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

  build_android:
@@ -266,135 +265,3 @@ jobs:
      - name: Publish deltachat-rpc-client to PyPI
        if: github.event_name == 'release'
        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"
-    permissions:
-      id-token: write
-
-      # Needed to publish the binaries to the release.
-      contents: write
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.11' 
-
-      - name: Download Linux aarch64 binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-aarch64-linux
-          path: deltachat-rpc-server-aarch64-linux.d
-
-      - name: Download Linux armv7l binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-armv7l-linux
-          path: deltachat-rpc-server-armv7l-linux.d
-
-      - name: Download Linux armv6l binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-armv6l-linux
-          path: deltachat-rpc-server-armv6l-linux.d
-
-      - name: Download Linux i686 binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-i686-linux
-          path: deltachat-rpc-server-i686-linux.d
-
-      - name: Download Linux x86_64 binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-x86_64-linux
-          path: deltachat-rpc-server-x86_64-linux.d
-
-      - name: Download Win32 binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-win32
-          path: deltachat-rpc-server-win32.d
-
-      - name: Download Win64 binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-win64
-          path: deltachat-rpc-server-win64.d
-
-      - name: Download macOS binary for x86_64
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-x86_64-macos
-          path: deltachat-rpc-server-x86_64-macos.d
-
-      - name: Download macOS binary for aarch64
-        uses: actions/download-artifact@v4
-        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@v4
-        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@v4
-        with:
-          name: deltachat-rpc-server-armeabi-v7a-android
-          path: deltachat-rpc-server-armeabi-v7a-android.d
-
-      - name: make npm packets for prebuilds and `@deltachat/stdio-rpc-server`
-        run: |
-          cd deltachat-rpc-server/npm-package
-
-          python --version
-
-          python scripts/pack_binary_for_platform.py aarch64-unknown-linux-musl     ../../deltachat-rpc-server-aarch64-linux.d/deltachat-rpc-server
-          python scripts/pack_binary_for_platform.py armv7-unknown-linux-musleabihf ../../deltachat-rpc-server-armv7l-linux.d/deltachat-rpc-server 
-          python scripts/pack_binary_for_platform.py arm-unknown-linux-musleabihf   ../../deltachat-rpc-server-armv6l-linux.d/deltachat-rpc-server 
-          python scripts/pack_binary_for_platform.py i686-unknown-linux-musl        ../../deltachat-rpc-server-i686-linux.d/deltachat-rpc-server 
-          python scripts/pack_binary_for_platform.py x86_64-unknown-linux-musl      ../../deltachat-rpc-server-x86_64-linux.d/deltachat-rpc-server
-          python scripts/pack_binary_for_platform.py i686-pc-windows-gnu            ../../deltachat-rpc-server-win32.d/deltachat-rpc-server.exe 
-          python scripts/pack_binary_for_platform.py x86_64-pc-windows-gnu          ../../deltachat-rpc-server-win64.d/deltachat-rpc-server.exe 
-          python scripts/pack_binary_for_platform.py x86_64-apple-darwin            ../../deltachat-rpc-server-x86_64-macos.d/deltachat-rpc-server 
-          python scripts/pack_binary_for_platform.py aarch64-apple-darwin           ../../deltachat-rpc-server-aarch64-macos.d/deltachat-rpc-server 
-          python scripts/pack_binary_for_platform.py aarch64-linux-android          ../../deltachat-rpc-server-arm64-v8a-android.d/deltachat-rpc-server
-          python scripts/pack_binary_for_platform.py armv7-linux-androideabi        ../../deltachat-rpc-server-armeabi-v7a-android.d/deltachat-rpc-server
-
-          ls -lah platform_package
-
-          for platform in ./platform_package/*; do npm pack "$platform"; done
-          npm pack    
-          ls -lah
-      
-      - name: Upload to artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: deltachat-rpc-server-npm-package
-          path: deltachat-rpc-server/npm-package/*.tgz
-          if-no-files-found: error
-
-      - name: Upload npm packets to the GitHub release
-        if: github.event_name == 'release'
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-        run: |
-          gh release upload ${{ github.ref_name }} \
-            --repo ${{ github.repository }} \
-            deltachat-rpc-server/npm-package/*.tgz
-
-      - 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"; done
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
--- a/.gitignore
+++ b/.gitignore
@@ -33,7 +33,6 @@ deltachat-ffi/xml

 coverage/
 .DS_Store
-.vscode
 .vscode/launch.json
 python/accounts.txt
 python/all-testaccounts.txt
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,150 +1,5 @@
 # Changelog

-## [1.138.3] - 2024-05-15
-
-### CI
-
- Give CI job permission to publish binaries to the release.
-
-## [1.138.2] - 2024-05-15
-
-### API-Changes
-
- deltachat-rpc-client: Add CONFIG_SYNCED constant.
-
-### CI
-
- Add npm token to publish deltachat-rpc-server packages.
-
-### Features / Changes
-
- Reset more settings when configuring a chatmail account.
-
-### Tests
-
- Set configuration after configure() finishes.
-
-## [1.138.1] - 2024-05-14
-
-### Features / Changes
-
- Detect XCHATMAIL capability and expose it as `is_chatmail` config.
-
-### Fixes
-
- Never treat message with Chat-Group-ID as a private reply.
- Always prefer Chat-Group-ID over In-Reply-To and References.
- Ignore parent message if message references itself.
-
-### CI
-
- Set RUSTUP_WINDOWS_PATH_ADD_BIN to work around `nextest` issue <https://github.com/nextest-rs/nextest/issues/1493>.
- deltachat-rpc-server: Fix upload of npm packages to github releases ([#5564](https://github.com/deltachat/deltachat-core-rust/pull/5564)).
-
-### Refactor
-
- Add MimeMessage.get_chat_group_id().
- Make MimeMessage.get_header() return Option<&str>.
- sql: Make open flags immutable.
- Resultify token::lookup_or_new().
-
-### Miscellaneous Tasks
-
- cargo: Bump parking_lot from 0.12.1 to 0.12.2.
- cargo: Bump libc from 0.2.153 to 0.2.154.
- cargo: Bump hickory-resolver from 0.24.0 to 0.24.1.
- cargo: Bump serde_json from 1.0.115 to 1.0.116.
- cargo: Bump human-panic from 1.2.3 to 2.0.0.
- cargo: Bump brotli from 5.0.0 to 6.0.0.
-
-## [1.138.0] - 2024-05-13
-
-### API-Changes
-
- Add dc_msg_save_file() which saves file copy at the provided path ([#4309](https://github.com/deltachat/deltachat-core-rust/pull/4309)).
- Api!(jsonrpc): replace EphemeralTimer tag "variant" with "kind"
-
-### CI
-
- Use rsync instead of 3rd party github action.
- Replace `black` with `ruff format`.
- Update Rust to 1.78.0.
-
-### Documentation
-
- Fix references in Message.set_location() documentation.
- Remove Doxygen markup from Message.has_location().
- Add `location` module documentation.
-
-### Features / Changes
-
- Delete expired path locations in ephemeral loop.
- Delete orphaned POI locations during housekeeping.
- Parsing vCards for contacts sharing ([#5482](https://github.com/deltachat/deltachat-core-rust/pull/5482)).
- contact-tools: Support parsing profile images from "PHOTO:data:image/jpeg;base64,...".
- contact-tools: Add make_vcard().
- Do not add location markers to messages with non-POI location.
- Make one-to-one chats read-only the first seconds of a SecureJoin ([#5512](https://github.com/deltachat/deltachat-core-rust/pull/5512)).
-
-### Fixes
-
- Message::set_file_from_bytes(): Set Param::Filename.
- Do not fail to send encrypted quotes to unencrypted chats.
- Never prepend subject to message text when bot receives it.
- Interrupt location loop when new location is stored.
- Correct message viewtype before recoding image blob ([#5496](https://github.com/deltachat/deltachat-core-rust/pull/5496)).
- Delete POI location when disappearing message expires.
- Delete non-POI locations after `delete_device_after`, not immediately.
- Update special chats icons even if they are blocked ([#5509](https://github.com/deltachat/deltachat-core-rust/pull/5509)).
- Use ChatIdBlocked::lookup_by_contact() instead of ChatId's method when applicable.
-
-### Miscellaneous Tasks
-
- cargo: Bump quote from 1.0.35 to 1.0.36.
- cargo: Bump base64 from 0.22.0 to 0.22.1.
- cargo: Bump serde from 1.0.197 to 1.0.200.
- cargo: Bump async-channel from 2.2.0 to 2.2.1.
- cargo: Bump thiserror from 1.0.58 to 1.0.59.
- cargo: Bump anyhow from 1.0.81 to 1.0.82.
- cargo: Bump chrono from 0.4.37 to 0.4.38.
- cargo: Bump imap-proto from 0.16.4 to 0.16.5.
- cargo: Bump syn from 2.0.57 to 2.0.60.
- cargo: Bump mailparse from 0.14.1 to 0.15.0.
- cargo: Bump schemars from 0.8.16 to 0.8.19.
-
-### Other
-
- Build ts docs with ci + nix.
- Push docs to delta.chat instead of codespeak
- Implement jsonrpc-docs build in github action
- Rm unneeded rust install from ts docs ci
- Correct folder for js.jsonrpc docs
- Add npm install to upload-docs.yml
- Add : to upload-docs.yml
- Upload-docs npm run => npm run build
- Rm leading slash
- Rm npm install
- Merge pull request #5515 from deltachat/dependabot/cargo/quote-1.0.36
- Merge pull request #5522 from deltachat/dependabot/cargo/chrono-0.4.38
- Merge pull request #5523 from deltachat/dependabot/cargo/mailparse-0.15.0
- Add webxdc internal integration commands in jsonrpc ([#5541](https://github.com/deltachat/deltachat-core-rust/pull/5541))
- Limit quote replies ([#5543](https://github.com/deltachat/deltachat-core-rust/pull/5543))
- Stdio jsonrpc server npm package ([#5332](https://github.com/deltachat/deltachat-core-rust/pull/5332))
-
-### Refactor
-
- python: Fix ruff 0.4.2 warnings.
- Move `delete_poi_location` to location module and document it.
- Remove allow_keychange.
-
-### Tests
-
- Explain test_was_seen_recently false-positive and give workaround instructions ([#5474](https://github.com/deltachat/deltachat-core-rust/pull/5474)).
- Test that member is added even if "Member added" is lost.
- Test that POIs are deleted when ephemeral message expires.
- Test ts build on branch
-
-
 ## [1.137.4] - 2024-04-24

 ### API-Changes
@@ -4128,7 +3983,3 @@ https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed
 [1.137.2]: https://github.com/deltachat/deltachat-core-rust/compare/v1.137.1...v1.137.2
 [1.137.3]: https://github.com/deltachat/deltachat-core-rust/compare/v1.137.2...v1.137.3
 [1.137.4]: https://github.com/deltachat/deltachat-core-rust/compare/v1.137.3...v1.137.4
-[1.138.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.137.4...v1.138.0
-[1.138.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.138.0...v1.138.1
-[1.138.2]: https://github.com/deltachat/deltachat-core-rust/compare/v1.138.1...v1.138.2
-[1.138.3]: https://github.com/deltachat/deltachat-core-rust/compare/v1.138.2...v1.138.3
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -163,9 +163,9 @@ dependencies = [

 [[package]]
 name = "anyhow"
-version = "1.0.82"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
+checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
 dependencies = [
 "backtrace",
 ]
@@ -344,7 +344,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.57",
 ]

 [[package]]
@@ -567,9 +567,9 @@ dependencies = [

 [[package]]
 name = "brotli"
-version = "6.0.0"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b"
+checksum = "19483b140a7ac7174d34b5a581b406c64f84da5409d3e09cf4fff604f9270e67"
 dependencies = [
 "alloc-no-stdlib",
 "alloc-stdlib",
@@ -724,9 +724,9 @@ dependencies = [

 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e"
 dependencies = [
 "android-tzdata",
 "iana-time-zone",
@@ -1059,7 +1059,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.57",
 ]

 [[package]]
@@ -1134,9 +1134,9 @@ dependencies = [

 [[package]]
 name = "data-encoding"
-version = "2.6.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"

 [[package]]
 name = "default-net"
@@ -1157,7 +1157,7 @@ dependencies = [

 [[package]]
 name = "deltachat"
-version = "1.138.3"
+version = "1.137.4"
 dependencies = [
 "ansi_term",
 "anyhow",
@@ -1239,10 +1239,9 @@ dependencies = [

 [[package]]
 name = "deltachat-contact-tools"
-version = "0.0.0"
+version = "0.1.0"
 dependencies = [
 "anyhow",
- "chrono",
 "once_cell",
 "regex",
 "rusqlite",
@@ -1250,7 +1249,7 @@ dependencies = [

 [[package]]
 name = "deltachat-jsonrpc"
-version = "1.138.3"
+version = "1.137.4"
 dependencies = [
 "anyhow",
 "async-channel 2.2.1",
@@ -1274,7 +1273,7 @@ dependencies = [

 [[package]]
 name = "deltachat-repl"
-version = "1.138.3"
+version = "1.137.4"
 dependencies = [
 "ansi_term",
 "anyhow",
@@ -1289,7 +1288,7 @@ dependencies = [

 [[package]]
 name = "deltachat-rpc-server"
-version = "1.138.3"
+version = "1.137.4"
 dependencies = [
 "anyhow",
 "deltachat",
@@ -1313,12 +1312,12 @@ name = "deltachat_derive"
 version = "2.0.0"
 dependencies = [
 "quote",
- "syn 2.0.60",
+ "syn 2.0.57",
 ]

 [[package]]
 name = "deltachat_ffi"
-version = "1.138.3"
+version = "1.137.4"
 dependencies = [
 "anyhow",
 "deltachat",
@@ -1522,7 +1521,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.57",
 ]

 [[package]]
@@ -1831,7 +1830,7 @@ dependencies = [
 "heck",
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.57",
 ]

 [[package]]
@@ -1844,7 +1843,7 @@ dependencies = [
 "num-traits",
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.57",
 ]

 [[package]]
@@ -2165,7 +2164,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.57",
 ]

 [[package]]
@@ -2363,9 +2362,9 @@ dependencies = [

 [[package]]
 name = "hickory-resolver"
-version = "0.24.1"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243"
+checksum = "35b8f021164e6a984c9030023544c57789c51760065cd510572fedcfb04164e8"
 dependencies = [
 "cfg-if",
 "futures-util",
@@ -2468,9 +2467,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"

 [[package]]
 name = "human-panic"
-version = "2.0.0"
+version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c5d0e9120f6bca6120d142c7ede1ba376dd6bf276d69dd3dbe6cbeb7824179"
+checksum = "c4f016c89920bbb30951a8405ecacbb4540db5524313b9445736e7e1855cf370"
 dependencies = [
 "backtrace",
 "os_info",
@@ -2639,9 +2638,9 @@ dependencies = [

 [[package]]
 name = "imap-proto"
-version = "0.16.5"
+version = "0.16.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de555d9526462b6f9ece826a26fb7c67eca9a0245bd9ff84fa91972a5d5d8856"
+checksum = "22e70cd66882c8cb1c9802096ba75212822153c51478dc61621e1a22f6c92361"
 dependencies = [
 "nom",
 ]
@@ -2835,9 +2834,9 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.154"
+version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"

 [[package]]
 name = "libm"
@@ -2907,9 +2906,9 @@ dependencies = [

 [[package]]
 name = "mailparse"
-version = "0.15.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3da03d5980411a724e8aaf7b61a7b5e386ec55a7fb49ee3d0ff79efc7e5e7c7e"
+checksum = "2d096594926cab442e054e047eb8c1402f7d5b2272573b97ba68aa40629f9757"
 dependencies = [
 "charset",
 "data-encoding",
@@ -3167,7 +3166,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.57",
 ]

 [[package]]
@@ -3228,7 +3227,7 @@ dependencies = [
 "proc-macro-crate",
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.57",
 ]

 [[package]]
@@ -3290,7 +3289,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.57",
 ]

 [[package]]
@@ -3398,9 +3397,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"

 [[package]]
 name = "parking_lot"
-version = "0.12.2"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
 dependencies = [
 "lock_api",
 "parking_lot_core",
@@ -3531,7 +3530,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.57",
 ]

 [[package]]
@@ -3748,9 +3747,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.81"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
 dependencies = [
 "unicode-ident",
 ]
@@ -4395,9 +4394,9 @@ dependencies = [

 [[package]]
 name = "schemars"
-version = "0.8.19"
+version = "0.8.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc6e7ed6919cb46507fb01ff1654309219f62b4d603822501b0b80d42f6f21ef"
+checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29"
 dependencies = [
 "dyn-clone",
 "schemars_derive",
@@ -4407,14 +4406,14 @@ dependencies = [

 [[package]]
 name = "schemars_derive"
-version = "0.8.19"
+version = "0.8.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "185f2b7aa7e02d418e453790dde16890256bbd2bcd04b7dc5348811052b53f49"
+checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967"
 dependencies = [
 "proc-macro2",
 "quote",
 "serde_derive_internals",
- "syn 2.0.60",
+ "syn 1.0.109",
 ]

 [[package]]
@@ -4534,25 +4533,25 @@ checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.57",
 ]

 [[package]]
 name = "serde_derive_internals"
-version = "0.29.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3"
+checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 1.0.109",
 ]

 [[package]]
 name = "serde_json"
-version = "1.0.116"
+version = "1.0.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
+checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
 dependencies = [
 "itoa",
 "ryu",
@@ -4819,7 +4818,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "rustversion",
- "syn 2.0.60",
+ "syn 2.0.57",
 ]

 [[package]]
@@ -4841,9 +4840,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.60"
+version = "2.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
+checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -4978,7 +4977,7 @@ checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.57",
 ]

 [[package]]
@@ -5095,7 +5094,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.57",
 ]

 [[package]]
@@ -5268,7 +5267,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.57",
 ]

 [[package]]
@@ -5562,7 +5561,7 @@ dependencies = [
 "once_cell",
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.57",
 "wasm-bindgen-shared",
 ]

@@ -5596,7 +5595,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.57",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]
@@ -5992,7 +5991,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.57",
 ]

 [[package]]
@@ -6012,7 +6011,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.57",
 ]

 [[package]]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.138.3"
+version = "1.137.4"
 edition = "2021"
 license = "MPL-2.0"
 rust-version = "1.77"
@@ -47,8 +47,8 @@ async-smtp = { version = "0.9", default-features = false, features = ["runtime-t
 async_zip = { version = "0.0.12", default-features = false, features = ["deflate", "fs"] }
 backtrace = "0.3"
 base64 = "0.22"
-brotli = { version = "6", default-features=false, features = ["std"] }
-chrono = { workspace = true }
+brotli = { version = "5", default-features=false, features = ["std"] }
+chrono = { version = "0.4.37", default-features=false, features = ["clock", "std"] }
 email = { git = "https://github.com/deltachat/rust-email", branch = "master" }
 encoded-words = { git = "https://github.com/async-email/encoded-words", branch = "master" }
 escaper = "0.1"
@@ -64,7 +64,7 @@ iroh = { version = "0.4.2", default-features = false }
 kamadak-exif = "0.5.3"
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
 libc = "0.2"
-mailparse = "0.15"
+mailparse = "0.14"
 mime = "0.3.17"
 num_cpus = "1.16"
 num-derive = "0.4"
@@ -168,8 +168,7 @@ harness = false
 anyhow = "1"
 once_cell = "1.18.0"
 regex = "1.10"
-rusqlite = "0.31"
-chrono = { version = "0.4.38", default-features=false, features = ["alloc", "clock", "std"] }
+rusqlite = { version = "0.31" }

 [features]
 default = ["vendored"]
--- a/deltachat-contact-tools/Cargo.toml
+++ b/deltachat-contact-tools/Cargo.toml
@@ -1,9 +1,10 @@
 [package]
 name = "deltachat-contact-tools"
-version = "0.0.0" # No semver-stable versioning
+version = "0.1.0"
 edition = "2021"
-description = "Contact-related tools, like parsing vcards and sanitizing name and address. Meant for internal use in the deltachat crate."
+description = "Contact-related tools, like parsing vcards and sanitizing name and address"
 license = "MPL-2.0"
+# TODO maybe it should be called "deltachat-text-utils" or similar?

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

@@ -12,7 +13,6 @@ anyhow = { workspace = true }
 once_cell = { workspace = true }
 regex = { workspace = true }
 rusqlite = { workspace = true } # Needed in order to `impl rusqlite::types::ToSql for EmailAddress`. Could easily be put behind a feature.
-chrono = { workspace = true }

 [dev-dependencies]
 anyhow = { workspace = true, features = ["backtrace"] } # Enable `backtrace` feature in tests.
--- a/deltachat-contact-tools/src/lib.rs
+++ b/deltachat-contact-tools/src/lib.rs
@@ -29,181 +29,10 @@ use std::fmt;
 use std::ops::Deref;

 use anyhow::bail;
-use anyhow::Context as _;
 use anyhow::Result;
-use chrono::{DateTime, NaiveDateTime};
 use once_cell::sync::Lazy;
 use regex::Regex;

-// TODOs to clean up:
-// - Check if sanitizing is done correctly everywhere
-// - Apply lints everywhere (https://doc.rust-lang.org/cargo/reference/workspaces.html#the-lints-table)
-
-#[derive(Debug)]
-/// A Contact, as represented in a VCard.
-pub struct VcardContact {
-    /// The email address, vcard property `email`
-    pub addr: String,
-    /// The contact's display name, vcard property `fn`
-    pub display_name: String,
-    /// The contact's public PGP key in Base64, vcard property `key`
-    pub key: Option<String>,
-    /// The contact's profile image (=avatar) in Base64, vcard property `photo`
-    pub profile_image: Option<String>,
-    /// The timestamp when the vcard was created / last updated, vcard property `rev`
-    pub timestamp: Result<u64>,
-}
-
-/// Returns a vCard containing given contacts.
-///
-/// Calling [`parse_vcard()`] on the returned result is a reverse operation.
-pub fn make_vcard(contacts: &[VcardContact]) -> String {
-    fn format_timestamp(c: &VcardContact) -> Option<String> {
-        let timestamp = *c.timestamp.as_ref().ok()?;
-        let timestamp: i64 = timestamp.try_into().ok()?;
-        let datetime = DateTime::from_timestamp(timestamp, 0)?;
-        Some(datetime.format("%Y%m%dT%H%M%SZ").to_string())
-    }
-
-    let mut res = "".to_string();
-    for c in contacts {
-        let addr = &c.addr;
-        let display_name = match c.display_name.is_empty() {
-            false => &c.display_name,
-            true => &c.addr,
-        };
-        res += &format!(
-            "BEGIN:VCARD\n\
-             VERSION:4.0\n\
-             EMAIL:{addr}\n\
-             FN:{display_name}\n"
-        );
-        if let Some(key) = &c.key {
-            res += &format!("KEY:data:application/pgp-keys;base64,{key}\n");
-        }
-        if let Some(profile_image) = &c.profile_image {
-            res += &format!("PHOTO:data:image/jpeg;base64,{profile_image}\n");
-        }
-        if let Some(timestamp) = format_timestamp(c) {
-            res += &format!("REV:{timestamp}\n");
-        }
-        res += "END:VCARD\n";
-    }
-    res
-}
-
-/// Parses `VcardContact`s from a given `&str`.
-pub fn parse_vcard(vcard: &str) -> Result<Vec<VcardContact>> {
-    fn remove_prefix<'a>(s: &'a str, prefix: &str) -> Option<&'a str> {
-        let start_of_s = s.get(..prefix.len())?;
-
-        if start_of_s.eq_ignore_ascii_case(prefix) {
-            s.get(prefix.len()..)
-        } else {
-            None
-        }
-    }
-    fn vcard_property<'a>(s: &'a str, property: &str) -> Option<&'a str> {
-        let remainder = remove_prefix(s, property)?;
-        // If `s` is `EMAIL;TYPE=work:alice@example.com` and `property` is `EMAIL`,
-        // then `remainder` is now `;TYPE=work:alice@example.com`
-
-        // TODO this doesn't handle the case where there are quotes around a colon
-        let (params, value) = remainder.split_once(':')?;
-        // In the example from above, `params` is now `;TYPE=work`
-        // and `value` is now `alice@example.com`
-
-        if params
-            .chars()
-            .next()
-            .filter(|c| !c.is_ascii_punctuation() || *c == '_')
-            .is_some()
-        {
-            // `s` started with `property`, but the next character after it was not punctuation,
-            // so this line's property is actually something else
-            return None;
-        }
-        Some(value)
-    }
-    fn parse_datetime(datetime: &str) -> Result<u64> {
-        // According to https://www.rfc-editor.org/rfc/rfc6350#section-4.3.5, the timestamp
-        // is in ISO.8601.2004 format. DateTime::parse_from_rfc3339() apparently parses
-        // ISO.8601, but fails to parse any of the examples given.
-        // So, instead just parse using a format string.
-
-        // Parses 19961022T140000Z, 19961022T140000-05, or 19961022T140000-0500.
-        let timestamp = match DateTime::parse_from_str(datetime, "%Y%m%dT%H%M%S%#z") {
-            Ok(datetime) => datetime.timestamp(),
-            // Parses 19961022T140000.
-            Err(e) => match NaiveDateTime::parse_from_str(datetime, "%Y%m%dT%H%M%S") {
-                Ok(datetime) => datetime
-                    .and_local_timezone(chrono::offset::Local)
-                    .single()
-                    .context("Could not apply local timezone to parsed date and time")?
-                    .timestamp(),
-                Err(_) => return Err(e.into()),
-            },
-        };
-        Ok(timestamp.try_into()?)
-    }
-
-    let mut lines = vcard.lines().peekable();
-    let mut contacts = Vec::new();
-
-    while lines.peek().is_some() {
-        // Skip to the start of the vcard:
-        for line in lines.by_ref() {
-            if line.eq_ignore_ascii_case("BEGIN:VCARD") {
-                break;
-            }
-        }
-
-        let mut display_name = None;
-        let mut addr = None;
-        let mut key = None;
-        let mut photo = None;
-        let mut datetime = None;
-
-        for line in lines.by_ref() {
-            if let Some(email) = vcard_property(line, "email") {
-                addr.get_or_insert(email);
-            } else if let Some(name) = vcard_property(line, "fn") {
-                display_name.get_or_insert(name);
-            } else if let Some(k) = remove_prefix(line, "KEY;PGP;ENCODING=BASE64:")
-                .or_else(|| remove_prefix(line, "KEY;TYPE=PGP;ENCODING=b:"))
-                .or_else(|| remove_prefix(line, "KEY:data:application/pgp-keys;base64,"))
-            {
-                key.get_or_insert(k);
-            } else if let Some(p) = remove_prefix(line, "PHOTO;JPEG;ENCODING=BASE64:")
-                .or_else(|| remove_prefix(line, "PHOTO;TYPE=JPEG;ENCODING=b:"))
-                .or_else(|| remove_prefix(line, "PHOTO;ENCODING=BASE64;TYPE=JPEG:"))
-                .or_else(|| remove_prefix(line, "PHOTO:data:image/jpeg;base64,"))
-            {
-                photo.get_or_insert(p);
-            } else if let Some(rev) = vcard_property(line, "rev") {
-                datetime.get_or_insert(rev);
-            } else if line.eq_ignore_ascii_case("END:VCARD") {
-                break;
-            }
-        }
-
-        let (display_name, addr) =
-            sanitize_name_and_addr(display_name.unwrap_or(""), addr.unwrap_or(""));
-
-        contacts.push(VcardContact {
-            display_name,
-            addr,
-            key: key.map(|s| s.to_string()),
-            profile_image: photo.map(|s| s.to_string()),
-            timestamp: datetime
-                .context("No timestamp in vcard")
-                .and_then(parse_datetime),
-        });
-    }
-
-    Ok(contacts)
-}
-
 /// Valid contact address.
 #[derive(Debug, Clone)]
 pub struct ContactAddress(String);
@@ -252,10 +81,14 @@ impl rusqlite::types::ToSql for ContactAddress {
 /// Make the name and address
 pub fn sanitize_name_and_addr(name: &str, addr: &str) -> (String, String) {
    static ADDR_WITH_NAME_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new("(.*)<(.*)>").unwrap());
-    let (name, addr) = if let Some(captures) = ADDR_WITH_NAME_REGEX.captures(addr.as_ref()) {
+    if let Some(captures) = ADDR_WITH_NAME_REGEX.captures(addr.as_ref()) {
        (
            if name.is_empty() {
-                strip_rtlo_characters(captures.get(1).map_or("", |m| m.as_str()))
+                strip_rtlo_characters(
+                    &captures
+                        .get(1)
+                        .map_or("".to_string(), |m| normalize_name(m.as_str())),
+                )
            } else {
                strip_rtlo_characters(name)
            },
@@ -264,21 +97,8 @@ pub fn sanitize_name_and_addr(name: &str, addr: &str) -> (String, String) {
                .map_or("".to_string(), |m| m.as_str().to_string()),
        )
    } else {
-        (
-            strip_rtlo_characters(&normalize_name(name)),
-            addr.to_string(),
-        )
-    };
-    let mut name = normalize_name(&name);
-
-    // If the 'display name' is just the address, remove it:
-    // Otherwise, the contact would sometimes be shown as "alice@example.com (alice@example.com)" (see `get_name_n_addr()`).
-    // If the display name is empty, DC will just show the address when it needs a display name.
-    if name == addr {
-        name = "".to_string();
+        (strip_rtlo_characters(name), addr.to_string())
    }
-
-    (name, addr)
 }

 /// Normalize a name.
@@ -410,105 +230,8 @@ impl rusqlite::types::ToSql for EmailAddress {

 #[cfg(test)]
 mod tests {
-    use chrono::TimeZone;
-
    use super::*;

-    #[test]
-    fn test_vcard_thunderbird() {
-        let contacts = parse_vcard(
-            "BEGIN:VCARD
-VERSION:4.0
-FN:'Alice Mueller'
-EMAIL;PREF=1:alice.mueller@posteo.de
-UID:a8083264-ca47-4be7-98a8-8ec3db1447ca
-END:VCARD
-BEGIN:VCARD
-VERSION:4.0
-FN:'bobzzz@freenet.de'
-EMAIL;PREF=1:bobzzz@freenet.de
-UID:cac4fef4-6351-4854-bbe4-9b6df857eaed
-END:VCARD
-",
-        )
-        .unwrap();
-
-        assert_eq!(contacts[0].addr, "alice.mueller@posteo.de".to_string());
-        assert_eq!(contacts[0].display_name, "Alice Mueller".to_string());
-        assert_eq!(contacts[0].key, None);
-        assert_eq!(contacts[0].profile_image, None);
-        assert!(contacts[0].timestamp.is_err());
-
-        assert_eq!(contacts[1].addr, "bobzzz@freenet.de".to_string());
-        assert_eq!(contacts[1].display_name, "".to_string());
-        assert_eq!(contacts[1].key, None);
-        assert_eq!(contacts[1].profile_image, None);
-        assert!(contacts[1].timestamp.is_err());
-
-        assert_eq!(contacts.len(), 2);
-    }
-
-    #[test]
-    fn test_vcard_simple_example() {
-        let contacts = parse_vcard(
-            "BEGIN:VCARD
-VERSION:4.0
-FN:Alice Wonderland
-N:Wonderland;Alice;;;Ms.
-GENDER:W
-EMAIL;TYPE=work:alice@example.com
-KEY;TYPE=PGP;ENCODING=b:[base64-data]
-REV:20240418T184242Z
-
-END:VCARD",
-        )
-        .unwrap();
-
-        assert_eq!(contacts[0].addr, "alice@example.com".to_string());
-        assert_eq!(contacts[0].display_name, "Alice Wonderland".to_string());
-        assert_eq!(contacts[0].key, Some("[base64-data]".to_string()));
-        assert_eq!(contacts[0].profile_image, None);
-        assert_eq!(*contacts[0].timestamp.as_ref().unwrap(), 1713465762);
-
-        assert_eq!(contacts.len(), 1);
-    }
-
-    #[test]
-    fn test_make_and_parse_vcard() {
-        let contacts = [
-            VcardContact {
-                addr: "alice@example.org".to_string(),
-                display_name: "Alice Wonderland".to_string(),
-                key: Some("[base64-data]".to_string()),
-                profile_image: Some("image in Base64".to_string()),
-                timestamp: Ok(1713465762),
-            },
-            VcardContact {
-                addr: "bob@example.com".to_string(),
-                display_name: "".to_string(),
-                key: None,
-                profile_image: None,
-                timestamp: Ok(0),
-            },
-        ];
-        for len in 0..=contacts.len() {
-            let contacts = &contacts[0..len];
-            let vcard = make_vcard(contacts);
-            let parsed = parse_vcard(&vcard).unwrap();
-            assert_eq!(parsed.len(), contacts.len());
-            for i in 0..parsed.len() {
-                assert_eq!(parsed[i].addr, contacts[i].addr);
-                assert_eq!(parsed[i].display_name, contacts[i].display_name);
-                assert_eq!(parsed[i].key, contacts[i].key);
-                assert_eq!(parsed[i].profile_image, contacts[i].profile_image);
-                assert_eq!(
-                    parsed[i].timestamp.as_ref().unwrap(),
-                    contacts[i].timestamp.as_ref().unwrap()
-                );
-            }
-        }
-    }
-
    #[test]
    fn test_contact_address() -> Result<()> {
        let alice_addr = "alice@example.org";
@@ -554,62 +277,4 @@ END:VCARD",
        assert!(EmailAddress::new("u@tt").is_ok());
        assert_eq!(EmailAddress::new("@d.tt").is_ok(), false);
    }
-
-    #[test]
-    fn test_vcard_android() {
-        let contacts = parse_vcard(
-            "BEGIN:VCARD
-VERSION:2.1
-N:;Bob;;;
-FN:Bob
-TEL;CELL:+1-234-567-890
-EMAIL;HOME:bob@example.org
-END:VCARD
-BEGIN:VCARD
-VERSION:2.1
-N:;Alice;;;
-FN:Alice
-EMAIL;HOME:alice@example.org
-END:VCARD
-",
-        )
-        .unwrap();
-
-        assert_eq!(contacts[0].addr, "bob@example.org".to_string());
-        assert_eq!(contacts[0].display_name, "Bob".to_string());
-        assert_eq!(contacts[0].key, None);
-        assert_eq!(contacts[0].profile_image, None);
-
-        assert_eq!(contacts[1].addr, "alice@example.org".to_string());
-        assert_eq!(contacts[1].display_name, "Alice".to_string());
-        assert_eq!(contacts[1].key, None);
-        assert_eq!(contacts[1].profile_image, None);
-
-        assert_eq!(contacts.len(), 2);
-    }
-
-    #[test]
-    fn test_vcard_local_datetime() {
-        let contacts = parse_vcard(
-            "BEGIN:VCARD\n\
-             VERSION:4.0\n\
-             FN:Alice Wonderland\n\
-             EMAIL;TYPE=work:alice@example.org\n\
-             REV:20240418T184242\n\
-             END:VCARD",
-        )
-        .unwrap();
-        assert_eq!(contacts.len(), 1);
-        assert_eq!(contacts[0].addr, "alice@example.org".to_string());
-        assert_eq!(contacts[0].display_name, "Alice Wonderland".to_string());
-        assert_eq!(
-            *contacts[0].timestamp.as_ref().unwrap(),
-            chrono::offset::Local
-                .with_ymd_and_hms(2024, 4, 18, 18, 42, 42)
-                .unwrap()
-                .timestamp()
-                .try_into()
-                .unwrap()
-        );
-    }
 }
--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.138.3"
+version = "1.137.4"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
@@ -17,7 +17,7 @@ crate-type = ["cdylib", "staticlib"]
 deltachat = { path = "../", default-features = false }
 deltachat-jsonrpc = { path = "../deltachat-jsonrpc", optional = true }
 libc = "0.2"
-human-panic = { version = "2", default-features = false }
+human-panic = { version = "1", default-features = false }
 num-traits = "0.2"
 serde_json = "1.0"
 tokio = { version = "1.37.0", features = ["rt-multi-thread"] }
--- a/deltachat-ffi/deltachat.h
+++ b/deltachat-ffi/deltachat.h
@@ -517,7 +517,6 @@ char*           dc_get_blobdir               (const dc_context_t* context);
 *                    0=Nothing else happens when the key changes.
 *                    1=After the key changed, `dc_chat_can_send()` returns false and `dc_chat_is_protection_broken()` returns true
 *                    until `dc_accept_chat()` is called.
- * - `is_chatmail` = 1 if the the server is a chatmail server, 0 otherwise.
 * - `ui.*`         = All keys prefixed by `ui.` can be used by the user-interfaces for system-specific purposes.
 *                    The prefix should be followed by the system and maybe subsystem,
 *                    e.g. `ui.desktop.foo`, `ui.desktop.linux.bar`, `ui.android.foo`, `ui.dc40.bar`, `ui.bot.simplebot.baz`.
@@ -4391,9 +4390,9 @@ int             dc_msg_has_deviating_timestamp(const dc_msg_t* msg);


 /**
- * Check if a message has a POI location bound to it.
- * These locations are also returned by dc_get_locations()
- * The UI may decide to display a special icon beside such messages.
+ * Check if a message has a location bound to it.
+ * These messages are also returned by dc_get_locations()
+ * and the UI may decide to display a special icon beside such messages,
 *
 * @memberof dc_msg_t
 * @param msg The message object.
@@ -7328,16 +7327,6 @@ void dc_event_unref(dc_event_t* event);
 /// Used in summaries.
 #define DC_STR_REACTED_BY 177

-/// "Establishing guaranteed end-to-end encryption, please wait…"
-///
-/// Used as info message.
-#define DC_STR_SECUREJOIN_WAIT 190
-
-/// "Could not yet establish guaranteed end-to-end encryption, but you may already send a message."
-///
-/// Used as info message.
-#define DC_STR_SECUREJOIN_WAIT_TIMEOUT 191
-
 /**
 * @}
 */
--- a/deltachat-jsonrpc/Cargo.toml
+++ b/deltachat-jsonrpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.138.3"
+version = "1.137.4"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
 default-run = "deltachat-jsonrpc-server"
@@ -16,7 +16,7 @@ required-features = ["webserver"]
 anyhow = "1"
 deltachat = { path = ".." }
 num-traits = "0.2"
-schemars = "0.8.19"
+schemars = "0.8.13"
 serde = { version = "1.0", features = ["derive"] }
 tempfile = "3.10.1"
 log = "0.4"
--- a/deltachat-jsonrpc/src/api.rs
+++ b/deltachat-jsonrpc/src/api.rs
@@ -1771,29 +1771,6 @@ impl CommandApi {
        Ok(general_purpose::STANDARD_NO_PAD.encode(blob))
    }

-    /// Sets Webxdc file as integration.
-    /// `file` is the .xdc to use as Webxdc integration.
-    async fn set_webxdc_integration(&self, account_id: u32, file_path: String) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        ctx.set_webxdc_integration(&file_path).await
-    }
-
-    /// Returns Webxdc instance used for optional integrations.
-    /// UI can open the Webxdc as usual.
-    /// Returns `None` if there is no integration; the caller can add one using `set_webxdc_integration` then.
-    /// `integrate_for` is the chat to get the integration for.
-    async fn init_webxdc_integration(
-        &self,
-        account_id: u32,
-        chat_id: Option<u32>,
-    ) -> Result<Option<u32>> {
-        let ctx = self.get_context(account_id).await?;
-        Ok(ctx
-            .init_webxdc_integration(chat_id.map(ChatId::new))
-            .await?
-            .map(|msg_id| msg_id.to_u32()))
-    }
-
    /// Makes an HTTP GET request and returns a response.
    ///
    /// `url` is the HTTP or HTTPS URL.
--- a/deltachat-jsonrpc/src/api/types/message.rs
+++ b/deltachat-jsonrpc/src/api/types/message.rs
@@ -35,10 +35,6 @@ pub struct MessageObject {
    parent_id: Option<u32>,

    text: String,
-
-    /// Check if a message has a POI location bound to it.
-    /// These locations are also returned by `get_locations` method.
-    /// The UI may decide to display a special icon beside such messages.
    has_location: bool,
    has_html: bool,
    view_type: MessageViewtype,
@@ -346,14 +342,6 @@ pub enum SystemMessageType {
    LocationOnly,
    InvalidUnencryptedMail,

-    /// 1:1 chats info message telling that SecureJoin has started and the user should wait for it
-    /// to complete.
-    SecurejoinWait,
-
-    /// 1:1 chats info message telling that SecureJoin is still running, but the user may already
-    /// send messages.
-    SecurejoinWaitTimeout,
-
    /// Chat ephemeral message timer is changed.
    EphemeralTimerChanged,

@@ -394,8 +382,6 @@ impl From<deltachat::mimeparser::SystemMessage> for SystemMessageType {
            SystemMessage::WebxdcStatusUpdate => SystemMessageType::WebxdcStatusUpdate,
            SystemMessage::WebxdcInfoMessage => SystemMessageType::WebxdcInfoMessage,
            SystemMessage::InvalidUnencryptedMail => SystemMessageType::InvalidUnencryptedMail,
-            SystemMessage::SecurejoinWait => SystemMessageType::SecurejoinWait,
-            SystemMessage::SecurejoinWaitTimeout => SystemMessageType::SecurejoinWaitTimeout,
        }
    }
 }
@@ -645,7 +631,7 @@ impl MessageInfo {
 #[derive(
    Debug, PartialEq, Eq, Copy, Clone, Serialize, Deserialize, TypeDef, schemars::JsonSchema,
 )]
-#[serde(rename_all = "camelCase", tag = "kind")]
+#[serde(rename_all = "camelCase", tag = "variant")]
 pub enum EphemeralTimer {
    /// Timer is disabled.
    Disabled,
--- a/deltachat-jsonrpc/typescript/package.json
+++ b/deltachat-jsonrpc/typescript/package.json
@@ -25,8 +25,7 @@
  "exports": {
    ".": {
      "import": "./dist/deltachat.js",
-      "require": "./dist/deltachat.cjs",
-      "types": "./dist/deltachat.d.ts"
+      "require": "./dist/deltachat.cjs"
    }
  },
  "license": "MPL-2.0",
@@ -54,5 +53,5 @@
  },
  "type": "module",
  "types": "dist/deltachat.d.ts",
-  "version": "1.138.3"
+  "version": "1.137.4"
 }
--- a/deltachat-repl/Cargo.toml
+++ b/deltachat-repl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-repl"
-version = "1.138.3"
+version = "1.137.4"
 license = "MPL-2.0"
 edition = "2021"
 repository = "https://github.com/deltachat/deltachat-core-rust"
--- a/deltachat-rpc-client/pyproject.toml
+++ b/deltachat-rpc-client/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "deltachat-rpc-client"
-version = "1.138.3"
+version = "1.137.4"
 description = "Python client for Delta Chat core JSON-RPC interface"
 classifiers = [
    "Development Status :: 5 - Production/Stable",
--- a/deltachat-rpc-client/src/deltachat_rpc_client/const.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/const.py
@@ -61,7 +61,6 @@ class EventType(str, Enum):
    WEBXDC_INSTANCE_DELETED = "WebxdcInstanceDeleted"
    CHATLIST_CHANGED = "ChatlistChanged"
    CHATLIST_ITEM_CHANGED = "ChatlistItemChanged"
-    CONFIG_SYNCED = "ConfigSynced"


 class ChatId(IntEnum):
--- a/deltachat-rpc-client/tests/test_something.py
+++ b/deltachat-rpc-client/tests/test_something.py
@@ -508,8 +508,8 @@ def test_reactions_for_a_reordering_move(acfactory):
    """
    (ac1,) = acfactory.get_online_accounts(1)
    ac2 = acfactory.new_preconfigured_account()
-    ac2.configure()
    ac2.set_config("mvbox_move", "1")
+    ac2.configure()
    ac2.bring_online()
    chat1 = acfactory.get_accepted_chat(ac1, ac2)
    ac2.stop_io()
--- a/deltachat-rpc-server/Cargo.toml
+++ b/deltachat-rpc-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.138.3"
+version = "1.137.4"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"
--- a/deltachat-rpc-server/npm-package/.gitignore
+++ b/deltachat-rpc-server/npm-package/.gitignore
@@ -1,2 +0,0 @@
-platform_package
-*.tgz
--- a/deltachat-rpc-server/npm-package/.npmignore
+++ b/deltachat-rpc-server/npm-package/.npmignore
@@ -1,3 +0,0 @@
-platform_package/*
-scripts/
-*.tgz
--- a/deltachat-rpc-server/npm-package/README.md
+++ b/deltachat-rpc-server/npm-package/README.md
@@ -1,77 +0,0 @@
-## npm package for deltachat-rpc-server
-
-This is the successor of `deltachat-node`,
-it does not use NAPI bindings but instead uses stdio executables
-to let you talk to core over jsonrpc over stdio.
-This simplifies cross-compilation and even reduces binary size (no CFFI layer and no NAPI layer).
-
-## Usage
-
-> The **minimum** nodejs version for this package is `20.11`
-
-```
-npm i @deltachat/stdio-rpc-server @deltachat/jsonrpc-client
-```
-
-```js
-import { startDeltaChat } from "@deltachat/stdio-rpc-server";
-import { C } from "@deltachat/jsonrpc-client";
-
-async function main() {
-    const dc = await startDeltaChat("deltachat-data");
-    console.log(await dc.rpc.getSystemInfo());
-}
-```
-
-For a more complete example refer to https://github.com/deltachat-bot/echo/pull/69/files (TODO change link when pr is merged).
-
-## How to use on an unsupported platform
-
-<!-- todo instructions, will uses an env var for pointing to `deltachat-rpc-server` binary -->
-
-<!-- todo copy parts from https://github.com/deltachat/deltachat-desktop/blob/7045c6f549e4b9d5caa0709d5bd314bbd9fd53db/docs/UPDATE_CORE.md -->
-
-## How does it work when you install it
-
-NPM automatically installs platform dependent optional dependencies when `os` and `cpu` fields are set correctly.
-
-references:
-
- https://napi.rs/docs/deep-dive/release#3-the-native-addon-for-different-platforms-is-distributed-through-different-npm-packages, [webarchive version](https://web.archive.org/web/20240309234250/https://napi.rs/docs/deep-dive/release#3-the-native-addon-for-different-platforms-is-distributed-through-different-npm-packages)
- https://docs.npmjs.com/cli/v6/configuring-npm/package-json#cpu
- https://docs.npmjs.com/cli/v6/configuring-npm/package-json#os
-
-When you import this package it searches for the rpc server in the following locations and order:
-
-1. `DELTA_CHAT_RPC_SERVER` environment variable
-2. in PATH
-   - unless `DELTA_CHAT_SKIP_PATH=1` is specified
-   - searches in .cargo/bin directory first
-   - but there an additional version check is performed
-3. prebuilds in npm packages
-
-## How do you built this package in CI
-
- To build platform packages, run the `build_platform_package.py` script:
-  ```
-  python3 build_platform_package.py <cargo-target>
-  # example
-  python3 build_platform_package.py x86_64-apple-darwin
-  ```
- Then pass it as an artifact to the last CI action that publishes the main package.
- upload all packages from `deltachat-rpc-server/npm-package/platform_package`.
- then publish `deltachat-rpc-server/npm-package`,
-  - this will run `update_optional_dependencies_and_version.js` (in the `prepack` script),
-    which puts all platform packages into `optionalDependencies` and updates the `version` in `package.json`
-
-## How to build a version you can use localy on your host machine for development
-
-You can not install the npm packet from the previous section locally, unless you have a local npm registry set up where you upload it too. This is why we have seperate scripts for making it work for local installation.
-
- If you just need your host platform run `python scripts/make_local_dev_version.py`
- note: this clears the `platform_package` folder
- (advanced) If you need more than one platform for local install you can just run `node scripts/update_optional_dependencies_and_version.js` after building multiple plaftorms with `build_platform_package.py`
-
-## Thanks to nlnet
-
-The initial work on this package was funded by nlnet as part of the [Delta Tauri](https://nlnet.nl/project/DeltaTauri/) Project.
--- a/deltachat-rpc-server/npm-package/index.d.ts
+++ b/deltachat-rpc-server/npm-package/index.d.ts
@@ -1,39 +0,0 @@
-import { StdioDeltaChat } from "@deltachat/jsonrpc-client";
-
-export interface SearchOptions {
-  /** whether to disable looking for deltachat-rpc-server inside of $PATH */
-  skipSearchInPath: boolean;
-
-  /** whether to disable the DELTA_CHAT_RPC_SERVER environment variable */
-  disableEnvPath: boolean;
-}
-
-/**
- * 
- * @returns absolute path to deltachat-rpc-server binary
- * @throws when it is not found
- */
-export function getRPCServerPath(
-  options?: Partial<SearchOptions>
-): Promise<string>;
-
-
-
-export type DeltaChatOverJsonRpcServer = StdioDeltaChat & {
-    shutdown: () => Promise<void>;
-    readonly pathToServerBinary: string;
-};
-
-
-/**
- * 
- * @param directory directory for accounts folder
- * @param options 
- */
-export function startDeltaChat(directory: string, options?: Partial<SearchOptions> ): Promise<DeltaChatOverJsonRpcServer>
-
-
-export namespace FnTypes {
-    export type getRPCServerPath = typeof getRPCServerPath
-    export type startDeltaChat = typeof startDeltaChat
-}
--- a/deltachat-rpc-server/npm-package/index.js
+++ b/deltachat-rpc-server/npm-package/index.js
@@ -1,143 +0,0 @@
-//@ts-check
-import { execFile, spawn } from "node:child_process";
-import { stat, readdir } from "node:fs/promises";
-import os from "node:os";
-import { join, basename } from "node:path";
-import process from "node:process";
-import { promisify } from "node:util";
-import {
-  ENV_VAR_NAME,
-  PATH_EXECUTABLE_NAME,
-  SKIP_SEARCH_IN_PATH,
-} from "./src/const.js";
-import {
-  ENV_VAR_LOCATION_NOT_FOUND,
-  FAILED_TO_START_SERVER_EXECUTABLE,
-  NPM_NOT_FOUND_SUPPORTED_PLATFORM_ERROR,
-  NPM_NOT_FOUND_UNSUPPORTED_PLATFORM_ERROR,
-} from "./src/errors.js";
-
-// Because this is not compiled by typescript, esm needs this stuff (` with { type: "json" };`,
-// nodejs still complains about it being experimental, but deno also uses it, so treefit bets taht it will become standard)
-import package_json from "./package.json" with { type: "json" };
-import { createRequire } from "node:module";
-
-// exports
-// - [ ] a raw starter that has a stdin/out handle thingie like desktop uses
-// - [X] a function that already wraps the stdio handle from above into the deltachat jsonrpc bindings
-
-function findRPCServerInNodeModules() {
-  const arch = os.arch();
-  const operating_system = process.platform;
-  const package_name = `@deltachat/stdio-rpc-server-${operating_system}-${arch}`;
-  try {
-    const { resolve } = createRequire(import.meta.url);
-    return resolve(package_name);
-  } catch (error) {
-    console.debug("findRpcServerInNodeModules", error);
-    if (Object.keys(package_json.optionalDependencies).includes(package_name)) {
-      throw new Error(NPM_NOT_FOUND_SUPPORTED_PLATFORM_ERROR(package_name));
-    } else {
-      throw new Error(NPM_NOT_FOUND_UNSUPPORTED_PLATFORM_ERROR());
-    }
-  }
-}
-
-/** @type {import("./index").FnTypes.getRPCServerPath} */
-export async function getRPCServerPath(
-  options = { skipSearchInPath: false, disableEnvPath: false }
-) {
-  // @TODO: improve confusing naming of these options
-  const { skipSearchInPath, disableEnvPath } = options;
-  // 1. check if it is set as env var
-  if (process.env[ENV_VAR_NAME] && !disableEnvPath) {
-    try {
-      if (!(await stat(process.env[ENV_VAR_NAME])).isFile()) {
-        throw new Error(
-          `expected ${ENV_VAR_NAME} to point to the deltachat-rpc-server executable`
-        );
-      }
-    } catch (error) {
-      throw new Error(ENV_VAR_LOCATION_NOT_FOUND());
-    }
-    return process.env[ENV_VAR_NAME];
-  }
-
-  // 2. check if it can be found in PATH
-  if (!process.env[SKIP_SEARCH_IN_PATH] && !skipSearchInPath) {
-    const exec = promisify(execFile);
-
-    const { stdout: executable } =
-      os.platform() !== "win32"
-        ? await exec("command", ["-v", PATH_EXECUTABLE_NAME])
-        : await exec("where", [PATH_EXECUTABLE_NAME]);
-
-    // by just trying to execute it and then use "command -v deltachat-rpc-server" (unix) or "where deltachat-rpc-server" (windows) to get the path to the executable
-    if (executable.length > 1) {
-      // test if it is the right version
-      try {
-        // for some unknown reason it is in stderr and not in stdout
-        const { stderr } = await promisify(execFile)(executable, ["--version"]);
-        const version = stderr.slice(0, stderr.indexOf("\n"));
-        if (package_json.version !== version) {
-          throw new Error(
-            `version mismatch: (npm package: ${package_json.version})  (installed ${PATH_EXECUTABLE_NAME} version: ${version})`
-          );
-        } else {
-          return executable;
-        }
-      } catch (error) {
-        console.error(
-          "Found executable in PATH, but there was an error: " + error
-        );
-        console.error("So falling back to using prebuild...");
-      }
-    }
-  }
-  // 3. check for prebuilds
-
-  return findRPCServerInNodeModules();
-}
-
-import { StdioDeltaChat } from "@deltachat/jsonrpc-client";
-
-/** @type {import("./index").FnTypes.startDeltaChat} */
-export async function startDeltaChat(directory, options) {
-  const pathToServerBinary = await getRPCServerPath(options);
-  const server = spawn(pathToServerBinary, {
-    env: {
-      RUST_LOG: process.env.RUST_LOG || "info",
-      DC_ACCOUNTS_PATH: directory,
-    },
-  });
-
-  server.on("error", (err) => {
-    throw new Error(FAILED_TO_START_SERVER_EXECUTABLE(pathToServerBinary, err));
-  });
-  let shouldClose = false;
-
-  server.on("exit", () => {
-    if (shouldClose) {
-      return;
-    }
-    throw new Error("Server quit");
-  });
-
-  server.stderr.pipe(process.stderr);
-
-  /** @type {import('./index').DeltaChatOverJsonRpcServer} */
-  //@ts-expect-error
-  const dc = new StdioDeltaChat(server.stdin, server.stdout, true);
-
-  dc.shutdown = async () => {
-    shouldClose = true;
-    if (!server.kill()) {
-      console.log("server termination failed");
-    }
-  };
-
-  //@ts-expect-error
-  dc.pathToServerBinary = pathToServerBinary;
-
-  return dc;
-}
--- a/deltachat-rpc-server/npm-package/package.json
+++ b/deltachat-rpc-server/npm-package/package.json
@@ -1,15 +0,0 @@
-{
-  "license": "MPL-2.0",
-  "main": "index.js",
-  "name": "@deltachat/stdio-rpc-server",
-  "optionalDependencies": {},
-  "peerDependencies": {
-    "@deltachat/jsonrpc-client": "*"
-  },
-  "scripts": {
-    "prepack": "node scripts/update_optional_dependencies_and_version.js"
-  },
-  "type": "module",
-  "types": "index.d.ts",
-  "version": "1.138.3"
-}
--- a/deltachat-rpc-server/npm-package/scripts/build_platform_package.py
+++ b/deltachat-rpc-server/npm-package/scripts/build_platform_package.py
@@ -1,53 +0,0 @@
-#!/usr/bin/env python3
-import subprocess
-from sys import argv
-from os import path, makedirs, chdir
-from shutil import copy
-from src.make_package import write_package_json
-
-# ensure correct working directory
-chdir(path.join(path.dirname(path.abspath(__file__)), "../"))
-
-if len(argv) < 2:
-    print("First argument should be target architecture as required by cargo")
-    exit(1)
-
-target = argv[1].strip()
-
-subprocess.run(
-    ["cargo", "build", "--release", "-p", "deltachat-rpc-server", "--target", target],
-    check=True,
-)
-
-newpath = "platform_package"
-if not path.exists(newpath):
-    makedirs(newpath)
-
-# make new folder
-
-platform_path = "platform_package/" + target
-if not path.exists(platform_path):
-    makedirs(platform_path)
-
-# copy binary it over
-
-
-def binary_path(binary_name):
-    return "../../target/" + target + "/release/" + binary_name
-
-
-my_binary_name = "deltachat-rpc-server"
-
-if not path.isfile(binary_path("deltachat-rpc-server")):
-    my_binary_name = "deltachat-rpc-server.exe"
-    if not path.isfile(binary_path("deltachat-rpc-server.exe")):
-        print("Did not find the build")
-        exit(1)
-
-my_binary_path = binary_path(my_binary_name)
-
-copy(my_binary_path, platform_path + "/" + my_binary_name)
-
-# make a package.json for it
-
-write_package_json(platform_path, target, my_binary_name)
--- a/deltachat-rpc-server/npm-package/scripts/make_local_dev_version.py
+++ b/deltachat-rpc-server/npm-package/scripts/make_local_dev_version.py
@@ -1,31 +0,0 @@
-# This script is for making a version of the npm packet that you can install locally
-
-import subprocess
-from sys import argv
-from os import path, makedirs, chdir
-import re
-import json
-import tomllib
-from shutil import copy, rmtree
-
-# ensure correct working directory
-chdir(path.join(path.dirname(path.abspath(__file__)), "../"))
-
-# get host target with "rustc -vV"
-output = subprocess.run(["rustc", "-vV"], capture_output=True)
-host_target = re.search('host: ([-\\w]*)', output.stdout.decode("utf-8")).group(1)
-print("host target to build for is:", host_target)
-
-# clean platform_package folder
-newpath = r'platform_package' 
-if not path.exists(newpath):
-    makedirs(newpath)
-else:
-    rmtree(path.join(path.dirname(path.abspath(__file__)), "../platform_package/"))
-    makedirs(newpath)
-
-# run build_platform_package.py with the host's target to build it
-subprocess.run(["python", "scripts/build_platform_package.py", host_target], capture_output=False, check=True)
-
-# run update_optional_dependencies_and_version.js to adjust the package / make it installable locally
-subprocess.run(["node", "scripts/update_optional_dependencies_and_version.js", "--local"], capture_output=False, check=True)
--- a/deltachat-rpc-server/npm-package/scripts/pack_binary_for_platform.py
+++ b/deltachat-rpc-server/npm-package/scripts/pack_binary_for_platform.py
@@ -1,46 +0,0 @@
-import subprocess
-from sys import argv
-from os import path, makedirs, chdir, chmod, stat
-import json
-from shutil import copy
-from src.make_package import write_package_json
-
-# ensure correct working directory
-chdir(path.join(path.dirname(path.abspath(__file__)), "../"))
-
-if len(argv) < 3:
-    print("First argument should be target architecture as required by cargo")
-    print("Second argument should be the location of th built binary (binary_path)")
-    exit(1)
-
-target = argv[1].strip()
-binary_path = argv[2].strip()
-
-output = subprocess.run(["rustc","--print","target-list"], capture_output=True, check=True)
-available_targets = output.stdout.decode("utf-8")
-
-if available_targets.find(target) == -1:
-    print("target", target, "is not known / not valid")
-    exit(1)
-
-
-newpath = r'platform_package' 
-if not path.exists(newpath):
-    makedirs(newpath)
-
-# make new folder
-
-platform_path = 'platform_package/' + target
-if not path.exists(platform_path):
-    makedirs(platform_path)
-
-# copy binary it over
-
-my_binary_name = path.basename(binary_path)
-new_binary_path = platform_path + "/" + my_binary_name
-copy(binary_path, new_binary_path)
-chmod(new_binary_path, 0o555) # everyone can read & execute, nobody can write
-
-# make a package.json for it
-
-write_package_json(platform_path, target, my_binary_name)
--- a/deltachat-rpc-server/npm-package/scripts/src/convert_platform.py
+++ b/deltachat-rpc-server/npm-package/scripts/src/convert_platform.py
@@ -1,21 +0,0 @@
-def convert_cpu_arch_to_npm_cpu_arch(arch):
-    if arch == "x86_64":
-        return "x64"
-    if arch == "i686":
-        return "i32"
-    if arch == "aarch64":
-        return "arm64"
-    if arch == "armv7" or arch == "arm":
-        return "arm"
-    print("architecture might not be known by nodejs, please make sure it can be returned by 'process.arch':", arch)
-    return arch
-
-def convert_os_to_npm_os(os):
-    if os == "windows":
-        return "win32"
-    if os == "darwin" or os == "linux":
-        return os
-    if os.startswith("android"):
-        return "android"
-    print("architecture might not be known by nodejs, please make sure it can be returned by 'process.platform':", os)
-    return os
--- a/deltachat-rpc-server/npm-package/scripts/src/make_package.py
+++ b/deltachat-rpc-server/npm-package/scripts/src/make_package.py
@@ -1,27 +0,0 @@
-import tomllib
-import json
-
-from .convert_platform import convert_cpu_arch_to_npm_cpu_arch, convert_os_to_npm_os
-
-def write_package_json(platform_path, rust_target, my_binary_name):
-    if len(rust_target.split("-")) == 3:
-        [cpu_arch, vendor, os] = rust_target.split("-")
-    else:
-        [cpu_arch, vendor, os, _env] = rust_target.split("-")
-
-    # read version
-    tomlfile = open("../../Cargo.toml", 'rb')
-    version = tomllib.load(tomlfile)['package']['version']
-
-    package_json = dict({
-        "name": "@deltachat/stdio-rpc-server-" + convert_os_to_npm_os(os) + "-" + convert_cpu_arch_to_npm_cpu_arch(cpu_arch),
-        "version": version,
-        "os": [convert_os_to_npm_os(os)],
-        "cpu": [convert_cpu_arch_to_npm_cpu_arch(cpu_arch)],
-        "main": my_binary_name,
-        "license": "MPL-2.0"
-    })
-
-    file = open(platform_path + "/package.json", 'w')
-    file.write(json.dumps(package_json, indent=4))
-
--- a/deltachat-rpc-server/npm-package/scripts/update_optional_dependencies_and_version.js
+++ b/deltachat-rpc-server/npm-package/scripts/update_optional_dependencies_and_version.js
@@ -1,57 +0,0 @@
-import fs from "node:fs/promises";
-import { join, dirname } from "node:path";
-import { fileURLToPath } from "node:url";
-
-const expected_cwd = join(dirname(fileURLToPath(import.meta.url)), "..");
-
-if (process.cwd() !== expected_cwd) {
-  console.error(
-    "CWD missmatch: this script needs to be run from " + expected_cwd,
-    { actual: process.cwd(), expected: expected_cwd }
-  );
-  process.exit(1);
-}
-
-// whether to use local paths instead of npm registry version number for the prebuilds in optionalDependencies
-// useful for local development
-const is_local = process.argv.includes("--local");
-
-const package_json = JSON.parse(await fs.readFile("./package.json", "utf8"));
-
-const cargo_toml = await fs.readFile("../Cargo.toml", "utf8");
-const version = cargo_toml
-  .split("\n")
-  .find((line) => line.includes("version"))
-  .split('"')[1];
-
-const platform_packages_dir = "./platform_package";
-
-const platform_package_names = await Promise.all(
-  (await fs.readdir(platform_packages_dir)).map(async (name) => {
-    const p = JSON.parse(
-      await fs.readFile(
-        join(platform_packages_dir, name, "package.json"),
-        "utf8"
-      )
-    );
-    if (p.version !== version) {
-      console.error(
-        name,
-        "has a different version than the version of the rpc server.",
-        { rpc_server: version, platform_package: p.version }
-      );
-      throw new Error("version missmatch");
-    }
-    return { folder_name: name, package_name: p.name };
-  })
-);
-
-package_json.version = version;
-package_json.optionalDependencies = {};
-for (const { folder_name, package_name } of platform_package_names) {
-  package_json.optionalDependencies[package_name] = is_local
-    ? `file:${expected_cwd}/platform_package/${folder_name}` // npm seems to work better with an absolute path here
-    : version;
-}
-
-await fs.writeFile("./package.json", JSON.stringify(package_json, null, 4));
--- a/deltachat-rpc-server/npm-package/src/const.js
+++ b/deltachat-rpc-server/npm-package/src/const.js
@@ -1,6 +0,0 @@
-//@ts-check
-
-export const PATH_EXECUTABLE_NAME = 'deltachat-rpc-server'
-
-export const ENV_VAR_NAME = "DELTA_CHAT_RPC_SERVER"
-export const SKIP_SEARCH_IN_PATH = "DELTA_CHAT_SKIP_PATH"
--- a/deltachat-rpc-server/npm-package/src/errors.js
+++ b/deltachat-rpc-server/npm-package/src/errors.js
@@ -1,41 +0,0 @@
-//@ts-check
-import { ENV_VAR_NAME } from "./const.js";
-
-const cargoInstallCommand =
-  "cargo install --git https://github.com/deltachat/deltachat-core-rust deltachat-rpc-server";
-
-export function NPM_NOT_FOUND_SUPPORTED_PLATFORM_ERROR(package_name) {
-  return `deltachat-rpc-server not found:
-
- Install it with "npm i ${package_name}"
- or download/compile deltachat-rpc-server for your platform and
- - either put it into your PATH (for example with "${cargoInstallCommand}")
- - or set the "${ENV_VAR_NAME}" env var to the path to deltachat-rpc-server"`;
-}
-
-export function NPM_NOT_FOUND_UNSUPPORTED_PLATFORM_ERROR() {
-  return `deltachat-rpc-server not found:
-
-Unfortunately no prebuild is available for your system, so you need to provide deltachat-rpc-server yourself.
-
- Download or Compile deltachat-rpc-server for your platform and
- - either put it into your PATH (for example with "${cargoInstallCommand}")
- - or set the "${ENV_VAR_NAME}" env var to the path to deltachat-rpc-server"`;
-}
-
-export function ENV_VAR_LOCATION_NOT_FOUND(error) {
-  return `deltachat-rpc-server not found in ${ENV_VAR_NAME}:
-
-    Error: ${error}
-
-    Content of ${ENV_VAR_NAME}: "${process.env[ENV_VAR_NAME]}"`;
-}
-
-export function FAILED_TO_START_SERVER_EXECUTABLE(pathToServerBinary, error) {
-  return `Failed to start server executable at '${pathToServerBinary}',
-
-  Error: ${error}
-
-Make sure the deltachat-rpc-server binary exists at this location 
-and you can start it with \`${pathToServerBinary} --version\``;
-}
--- a/flake.lock
+++ b/flake.lock
@@ -196,16 +196,16 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1713537308,
-        "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=",
-        "owner": "nixos",
+        "lastModified": 1714698973,
+        "narHash": "sha256-GcLKCUJ+TfOisWVi9ZsdsSASPxT0qk8NTN2wXnvkyho=",
+        "owner": "reckenrode",
        "repo": "nixpkgs",
-        "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f",
+        "rev": "0479d3c5baf4b4dd0528941f21b34c06fdfb3ed4",
        "type": "github"
      },
      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
+        "owner": "reckenrode",
+        "ref": "darwin-cross",
        "repo": "nixpkgs",
        "type": "github"
      }
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
    flake-utils.url = "github:numtide/flake-utils";
    naersk.url = "github:nix-community/naersk";
    nix-filter.url = "github:numtide/nix-filter";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:reckenrode/nixpkgs/darwin-cross";
    android.url = "github:tadfisher/android-nixpkgs";
  };
  outputs = { self, nixpkgs, flake-utils, nix-filter, naersk, fenix, android }:
@@ -241,6 +241,9 @@
            nativeBuildInputs = [
              pkgs.perl # Needed to build vendored OpenSSL.
            ];
+            buildInputs = pkgs.lib.optionals isDarwin [
+              pkgs.darwin.apple_sdk.frameworks.SystemConfiguration
+            ];
            auditable = false; # Avoid cargo-auditable failures.
            doCheck = false; # Disable test as it requires network access.

@@ -355,6 +358,8 @@
          mkRustPackages "x86_64-linux" //
          mkRustPackages "armv7l-linux" //
          mkRustPackages "armv6l-linux" //
+          mkRustPackages "x86_64-darwin" //
+          mkRustPackages "aarch64-darwin" //
          mkAndroidPackages "armeabi-v7a" //
          mkAndroidPackages "arm64-v8a" //
          mkAndroidPackages "x86" //
--- a/node/constants.js
+++ b/node/constants.js
@@ -266,8 +266,6 @@ module.exports = {
  DC_STR_REMOVE_MEMBER_BY_YOU: 130,
  DC_STR_REPLY_NOUN: 90,
  DC_STR_SAVED_MESSAGES: 69,
-  DC_STR_SECUREJOIN_WAIT: 190,
-  DC_STR_SECUREJOIN_WAIT_TIMEOUT: 191,
  DC_STR_SECURE_JOIN_GROUP_QR_DESC: 120,
  DC_STR_SECURE_JOIN_REPLIES: 118,
  DC_STR_SECURE_JOIN_STARTED: 117,
--- a/node/lib/constants.ts
+++ b/node/lib/constants.ts
@@ -266,8 +266,6 @@ export enum C {
  DC_STR_REMOVE_MEMBER_BY_YOU = 130,
  DC_STR_REPLY_NOUN = 90,
  DC_STR_SAVED_MESSAGES = 69,
-  DC_STR_SECUREJOIN_WAIT = 190,
-  DC_STR_SECUREJOIN_WAIT_TIMEOUT = 191,
  DC_STR_SECURE_JOIN_GROUP_QR_DESC = 120,
  DC_STR_SECURE_JOIN_REPLIES = 118,
  DC_STR_SECURE_JOIN_STARTED = 117,
--- a/package.json
+++ b/package.json
@@ -55,5 +55,5 @@
    "test:mocha": "mocha node/test/test.mjs --growl --reporter=spec --bail --exit"
  },
  "types": "node/dist/index.d.ts",
-  "version": "1.138.3"
+  "version": "1.137.4"
 }
--- a/python/pyproject.toml
+++ b/python/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "deltachat"
-version = "1.138.3"
+version = "1.137.4"
 description = "Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat"
 readme = "README.rst"
 requires-python = ">=3.7"
--- a/python/src/deltachat/testplugin.py
+++ b/python/src/deltachat/testplugin.py
@@ -275,7 +275,6 @@ class ACSetup:
    def __init__(self, testprocess, init_time) -> None:
        self._configured_events = Queue()
        self._account2state: Dict[Account, str] = {}
-        self._account2config: Dict[Account, Dict[str, str]] = {}
        self._imap_cleaned: Set[str] = set()
        self.testprocess = testprocess
        self.init_time = init_time
@@ -337,8 +336,6 @@ class ACSetup:
        if not success:
            pytest.fail(f"configuring online account {acc} failed: {comment}")
        self._account2state[acc] = self.CONFIGURED
-        if acc in self._account2config:
-            acc.update_config(self._account2config[acc])
        return acc

    def _onconfigure_start_io(self, acc):
@@ -526,7 +523,6 @@ class ACFactory:
        configdict.setdefault("sentbox_watch", False)
        configdict.setdefault("sync_msgs", False)
        ac.update_config(configdict)
-        self._acsetup._account2config[ac] = configdict
        self._preconfigure_key(ac, configdict["addr"])
        return ac

--- a/release-date.in
+++ b/release-date.in
@@ -1 +1 @@
-2024-05-15
+2024-04-24
--- a/scripts/set_core_version.py
+++ b/scripts/set_core_version.py
@@ -66,11 +66,7 @@ def main():
    parser = ArgumentParser(prog="set_core_version")
    parser.add_argument("newversion")

-    json_list = [
-        "package.json",
-        "deltachat-jsonrpc/typescript/package.json",
-        "deltachat-rpc-server/npm-package/package.json",
-    ]
+    json_list = ["package.json", "deltachat-jsonrpc/typescript/package.json"]
    toml_list = [
        "Cargo.toml",
        "deltachat-ffi/Cargo.toml",
--- a/src/authres.rs
+++ b/src/authres.rs
@@ -14,6 +14,7 @@ use once_cell::sync::Lazy;
 use crate::config::Config;
 use crate::context::Context;
 use crate::headerdef::HeaderDef;
+use crate::tools::time;

 /// `authres` is short for the Authentication-Results header, defined in
 /// <https://datatracker.ietf.org/doc/html/rfc8601>, which contains info
@@ -28,28 +29,45 @@ pub(crate) async fn handle_authres(
    context: &Context,
    mail: &ParsedMail<'_>,
    from: &str,
+    message_time: i64,
 ) -> Result<DkimResults> {
    let from_domain = match EmailAddress::new(from) {
        Ok(email) => email.domain,
        Err(e) => {
+            // This email is invalid, but don't return an error, we still want to
+            // add a stub to the database so that it's not downloaded again
            return Err(anyhow::format_err!("invalid email {}: {:#}", from, e));
        }
    };

    let authres = parse_authres_headers(&mail.get_headers(), &from_domain);
    update_authservid_candidates(context, &authres).await?;
-    compute_dkim_results(context, authres).await
+    compute_dkim_results(context, authres, &from_domain, message_time).await
 }

 #[derive(Debug)]
 pub(crate) struct DkimResults {
    /// Whether DKIM passed for this particular e-mail.
    pub dkim_passed: bool,
+    /// Whether DKIM is known to work for e-mails coming from the sender's domain,
+    /// i.e. whether we expect DKIM to work.
+    pub dkim_should_work: bool,
+    /// Whether changing the public Autocrypt key should be allowed.
+    /// This is false if we expected DKIM to work (dkim_works=true),
+    /// but it failed now (dkim_passed=false).
+    pub allow_keychange: bool,
 }

 impl fmt::Display for DkimResults {
    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        write!(fmt, "DKIM Results: Passed={}", self.dkim_passed)?;
+        write!(
+            fmt,
+            "DKIM Results: Passed={}, Works={}, Allow_Keychange={}",
+            self.dkim_passed, self.dkim_should_work, self.allow_keychange
+        )?;
+        if !self.allow_keychange {
+            write!(fmt, " KEYCHANGES NOT ALLOWED!!!!")?;
+        }
        Ok(())
    }
 }
@@ -200,6 +218,10 @@ async fn update_authservid_candidates(
        context
            .set_config_internal(Config::AuthservIdCandidates, Some(&new_config))
            .await?;
+        // Updating the authservid candidates may mean that we now consider
+        // emails as "failed" which "passed" previously, so we need to
+        // reset our expectation which DKIMs work.
+        clear_dkim_works(context).await?
    }
    Ok(())
 }
@@ -216,6 +238,8 @@ async fn update_authservid_candidates(
 async fn compute_dkim_results(
    context: &Context,
    mut authres: ParsedAuthresHeaders,
+    from_domain: &str,
+    message_time: i64,
 ) -> Result<DkimResults> {
    let mut dkim_passed = false;

@@ -248,7 +272,71 @@ async fn compute_dkim_results(
        }
    }

-    Ok(DkimResults { dkim_passed })
+    let last_working_timestamp = dkim_works_timestamp(context, from_domain).await?;
+    let mut dkim_should_work = dkim_should_work(last_working_timestamp)?;
+    if message_time > last_working_timestamp && dkim_passed {
+        set_dkim_works_timestamp(context, from_domain, message_time).await?;
+        dkim_should_work = true;
+    }
+
+    Ok(DkimResults {
+        dkim_passed,
+        dkim_should_work,
+        allow_keychange: dkim_passed || !dkim_should_work,
+    })
+}
+
+/// Whether DKIM in emails from this domain should be considered to work.
+fn dkim_should_work(last_working_timestamp: i64) -> Result<bool> {
+    // When we get an email with valid DKIM-Authentication-Results,
+    // then we assume that DKIM works for 30 days from this time on.
+    let should_work_until = last_working_timestamp + 3600 * 24 * 30;
+
+    let dkim_ever_worked = last_working_timestamp > 0;
+
+    // We're using time() here and not the time when the message
+    // claims to have been sent (passed around as `message_time`)
+    // because otherwise an attacker could just put a time way
+    // in the future into the `Date` header and then we would
+    // assume that DKIM doesn't have to be valid anymore.
+    let dkim_should_work_now = should_work_until > time();
+    Ok(dkim_ever_worked && dkim_should_work_now)
+}
+
+async fn dkim_works_timestamp(context: &Context, from_domain: &str) -> Result<i64, anyhow::Error> {
+    let last_working_timestamp: i64 = context
+        .sql
+        .query_get_value(
+            "SELECT dkim_works FROM sending_domains WHERE domain=?",
+            (from_domain,),
+        )
+        .await?
+        .unwrap_or(0);
+    Ok(last_working_timestamp)
+}
+
+async fn set_dkim_works_timestamp(
+    context: &Context,
+    from_domain: &str,
+    timestamp: i64,
+) -> Result<()> {
+    context
+        .sql
+        .execute(
+            "INSERT INTO sending_domains (domain, dkim_works) VALUES (?,?)
+                ON CONFLICT(domain) DO UPDATE SET dkim_works=excluded.dkim_works",
+            (from_domain, timestamp),
+        )
+        .await?;
+    Ok(())
+}
+
+async fn clear_dkim_works(context: &Context) -> Result<()> {
+    context
+        .sql
+        .execute("DELETE FROM sending_domains", ())
+        .await?;
+    Ok(())
 }

 fn parse_authservid_candidates_config(config: &Option<String>) -> BTreeSet<&str> {
@@ -261,12 +349,19 @@ fn parse_authservid_candidates_config(config: &Option<String>) -> BTreeSet<&str>
 #[cfg(test)]
 mod tests {
    #![allow(clippy::indexing_slicing)]
+    use std::time::Duration;
+
    use tokio::fs;
    use tokio::io::AsyncReadExt;

    use super::*;
+    use crate::aheader::EncryptPreference;
+    use crate::e2ee;
    use crate::mimeparser;
    use crate::peerstate::Peerstate;
+    use crate::securejoin::get_securejoin_qr;
+    use crate::securejoin::join_securejoin;
+    use crate::test_utils;
    use crate::test_utils::TestContext;
    use crate::test_utils::TestContextManager;
    use crate::tools;
@@ -479,8 +574,33 @@ Authentication-Results: box.hispanilandia.net; spf=pass smtp.mailfrom=adbenitez@
                let mail = mailparse::parse_mail(&bytes)?;
                let from = &mimeparser::get_from(&mail.headers).unwrap().addr;

-                let res = handle_authres(&t, &mail, from).await?;
+                let res = handle_authres(&t, &mail, from, time()).await?;
+                assert!(res.allow_keychange);
+            }
+
+            for entry in &dir {
+                let mut file = fs::File::open(entry.path()).await?;
+                bytes.clear();
+                file.read_to_end(&mut bytes).await.unwrap();
+
+                let mail = mailparse::parse_mail(&bytes)?;
+                let from = &mimeparser::get_from(&mail.headers).unwrap().addr;
+
+                let res = handle_authres(&t, &mail, from, time()).await?;
+                if !res.allow_keychange {
+                    println!(
+                        "!!!!!! FAILURE Receiving {:?}, keychange is not allowed !!!!!!",
+                        entry.path()
+                    );
+                    test_failed = true;
+                }
+
                let from_domain = EmailAddress::new(from).unwrap().domain;
+                assert_eq!(
+                    res.dkim_should_work,
+                    dkim_should_work(dkim_works_timestamp(&t, &from_domain).await?)?
+                );
+                assert_eq!(res.dkim_passed, res.dkim_should_work);

                // delta.blinzeln.de and gmx.de have invalid DKIM, so the DKIM check should fail
                let expected_result = (from_domain != "delta.blinzeln.de") && (from_domain != "gmx.de")
@@ -493,8 +613,9 @@ Authentication-Results: box.hispanilandia.net; spf=pass smtp.mailfrom=adbenitez@
                if res.dkim_passed != expected_result {
                    if authres_parsing_works {
                        println!(
-                            "!!!!!! FAILURE Receiving {:?} wrong result: !!!!!!",
+                            "!!!!!! FAILURE Receiving {:?}, order {:#?} wrong result: !!!!!!",
                            entry.path(),
+                            dir.iter().map(|e| e.file_name()).collect::<Vec<_>>()
                        );
                        test_failed = true;
                    }
@@ -517,7 +638,116 @@ Authentication-Results: box.hispanilandia.net; spf=pass smtp.mailfrom=adbenitez@
        let bytes = b"From: invalid@from.com
 Authentication-Results: dkim=";
        let mail = mailparse::parse_mail(bytes).unwrap();
-        handle_authres(&t, &mail, "invalid@rom.com").await.unwrap();
+        handle_authres(&t, &mail, "invalid@rom.com", time())
+            .await
+            .unwrap();
+    }
+
+    #[ignore = "Disallowing keychanges is disabled for now"]
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_handle_authres_fails() -> Result<()> {
+        let mut tcm = TestContextManager::new();
+        let alice = tcm.alice().await;
+        let bob = tcm.bob().await;
+
+        // Bob sends Alice a message, so she gets his key
+        tcm.send_recv_accept(&bob, &alice, "Hi").await;
+
+        // We don't need bob anymore, let's make sure it's not accidentally used
+        drop(bob);
+
+        // Assume Alice receives an email from bob@example.net with
+        // correct DKIM -> `set_dkim_works()` was called
+        set_dkim_works_timestamp(&alice, "example.net", time()).await?;
+        // And Alice knows her server's authserv-id
+        alice
+            .set_config(Config::AuthservIdCandidates, Some("example.org"))
+            .await?;
+
+        tcm.section("An attacker, bob2, sends a from-forged email to Alice!");
+
+        // Sleep to make sure key reset is ignored because of DKIM failure
+        // and not because reordering is suspected.
+        tokio::time::sleep(std::time::Duration::from_millis(1100)).await;
+
+        let bob2 = tcm.unconfigured().await;
+        bob2.configure_addr("bob@example.net").await;
+        e2ee::ensure_secret_key_exists(&bob2).await?;
+
+        let chat = bob2.create_chat(&alice).await;
+        let mut sent = bob2
+            .send_text(chat.id, "Please send me lots of money")
+            .await;
+
+        sent.payload
+            .insert_str(0, "Authentication-Results: example.org; dkim=fail\n");
+
+        let received = alice.recv_msg(&sent).await;
+
+        // Assert that the error tells the user about the problem
+        assert!(received.error.unwrap().contains("DKIM failed"));
+
+        let bob_state = Peerstate::from_addr(&alice, "bob@example.net")
+            .await?
+            .unwrap();
+
+        // Encryption preference is still mutual.
+        assert_eq!(bob_state.prefer_encrypt, EncryptPreference::Mutual);
+
+        // Also check that the keypair was not changed
+        assert_eq!(
+            bob_state.public_key.unwrap(),
+            test_utils::bob_keypair().public
+        );
+
+        // Since Alice didn't change the key, Bob can't read her message
+        let received = tcm
+            .try_send_recv(&alice, &bob2, "My credit card number is 1234")
+            .await;
+        assert!(!received.text.contains("1234"));
+        assert!(received.error.is_some());
+
+        tcm.section("Turns out bob2 wasn't an attacker at all, Bob just has a new phone and DKIM just stopped working.");
+        tcm.section("To fix the key problems, Bob scans Alice's QR code.");
+
+        let qr = get_securejoin_qr(&alice.ctx, None).await.unwrap();
+        join_securejoin(&bob2.ctx, &qr).await.unwrap();
+
+        loop {
+            if let Some(mut sent) = bob2.pop_sent_msg_opt(Duration::ZERO).await {
+                sent.payload
+                    .insert_str(0, "Authentication-Results: example.org; dkim=fail\n");
+                alice.recv_msg(&sent).await;
+            } else if let Some(sent) = alice.pop_sent_msg_opt(Duration::ZERO).await {
+                bob2.recv_msg(&sent).await;
+            } else {
+                break;
+            }
+        }
+
+        // Unfortunately, securejoin currently doesn't work with authres-checking,
+        // so these checks would fail:
+
+        // let contact_bob = alice.add_or_lookup_contact(&bob2).await;
+        // assert_eq!(
+        //     contact_bob.is_verified(&alice.ctx).await.unwrap(),
+        //     VerifiedStatus::BidirectVerified
+        // );
+
+        // let contact_alice = bob2.add_or_lookup_contact(&alice).await;
+        // assert_eq!(
+        //     contact_alice.is_verified(&bob2.ctx).await.unwrap(),
+        //     VerifiedStatus::BidirectVerified
+        // );
+
+        // // Bob can read Alice's messages again
+        // let received = tcm
+        //     .try_send_recv(&alice, &bob2, "Can you read this again?")
+        //     .await;
+        // assert_eq!(received.text.as_ref().unwrap(), "Can you read this again?");
+        // assert!(received.error.is_none());
+
+        Ok(())
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -566,7 +796,10 @@ Authentication-Results: dkim=";
        let alice = tcm.alice().await;
        let bob = tcm.bob().await;

-        // Bob knows his server's authserv-id
+        // Assume Bob received an email from something@example.net with
+        // correct DKIM -> `set_dkim_works()` was called
+        set_dkim_works_timestamp(&bob, "example.org", time()).await?;
+        // And Bob knows his server's authserv-id
        bob.set_config(Config::AuthservIdCandidates, Some("example.net"))
            .await?;

@@ -588,13 +821,15 @@ Authentication-Results: dkim=";
            .insert_str(0, "Authentication-Results: example.net; dkim=fail\n");
        let rcvd = bob.recv_msg(&sent).await;

+        // Disallowing keychanges is disabled for now:
+        // assert!(rcvd.error.unwrap().contains("DKIM failed"));
        // The message info should contain a warning:
        assert!(rcvd
            .id
            .get_info(&bob)
            .await
            .unwrap()
-            .contains("DKIM Results: Passed=false"));
+            .contains("KEYCHANGES NOT ALLOWED"));

        Ok(())
    }
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -12,7 +12,6 @@ use deltachat_contact_tools::{strip_rtlo_characters, ContactAddress};
 use deltachat_derive::{FromSql, ToSql};
 use serde::{Deserialize, Serialize};
 use strum_macros::EnumIter;
-use tokio::task;

 use crate::aheader::EncryptPreference;
 use crate::blob::BlobObject;
@@ -39,7 +38,6 @@ use crate::mimeparser::SystemMessage;
 use crate::param::{Param, Params};
 use crate::peerstate::Peerstate;
 use crate::receive_imf::ReceivedMsg;
-use crate::securejoin::BobState;
 use crate::smtp::send_msg_to_smtp;
 use crate::sql;
 use crate::stock_str;
@@ -128,10 +126,6 @@ pub(crate) enum CantSendReason {

    /// Not a member of the chat.
    NotAMember,
-
-    /// Temporary state for 1:1 chats while SecureJoin is in progress, after a timeout sending
-    /// messages (incl. unencrypted if we don't yet know the contact's pubkey) is allowed.
-    SecurejoinWait,
 }

 impl fmt::Display for CantSendReason {
@@ -151,7 +145,6 @@ impl fmt::Display for CantSendReason {
                write!(f, "mailing list does not have a know post address")
            }
            Self::NotAMember => write!(f, "not a member of the chat"),
-            Self::SecurejoinWait => write!(f, "awaiting SecureJoin for 1:1 chat"),
        }
    }
 }
@@ -617,10 +610,7 @@ impl ChatId {
        let sort_to_bottom = true;
        let ts = self
            .calc_sort_timestamp(context, timestamp_sent, sort_to_bottom, false)
-            .await?
-            // Always sort protection messages below `SystemMessage::SecurejoinWait{,Timeout}` ones
-            // in case of race conditions.
-            .saturating_add(1);
+            .await?;
        self.set_protection_for_timestamp_sort(context, protect, ts, contact_id)
            .await
    }
@@ -1417,18 +1407,6 @@ impl ChatId {

        Ok(sort_timestamp)
    }
-
-    /// Spawns a task checking after a timeout whether the SecureJoin has finished for the 1:1 chat
-    /// and otherwise notifying the user accordingly.
-    pub(crate) fn spawn_securejoin_wait(self, context: &Context, timeout: u64) {
-        let context = context.clone();
-        task::spawn(async move {
-            tokio::time::sleep(Duration::from_secs(timeout)).await;
-            let chat = Chat::load_from_db(&context, self).await?;
-            chat.check_securejoin_wait(&context, 0).await?;
-            Result::<()>::Ok(())
-        });
-    }
 }

 impl std::fmt::Display for ChatId {
@@ -1608,12 +1586,6 @@ impl Chat {
            Some(ReadOnlyMailingList)
        } else if !self.is_self_in_chat(context).await? {
            Some(NotAMember)
-        } else if self
-            .check_securejoin_wait(context, constants::SECUREJOIN_WAIT_TIMEOUT)
-            .await?
-            > 0
-        {
-            Some(SecurejoinWait)
        } else {
            None
        };
@@ -1627,69 +1599,6 @@ impl Chat {
        Ok(self.why_cant_send(context).await?.is_none())
    }

-    /// Returns the remaining timeout for the 1:1 chat in-progress SecureJoin.
-    ///
-    /// If the timeout has expired, notifies the user that sending messages is possible. See also
-    /// [`CantSendReason::SecurejoinWait`].
-    pub(crate) async fn check_securejoin_wait(
-        &self,
-        context: &Context,
-        timeout: u64,
-    ) -> Result<u64> {
-        if self.typ != Chattype::Single || self.protected != ProtectionStatus::Unprotected {
-            return Ok(0);
-        }
-        let (mut param0, mut param1) = (Params::new(), Params::new());
-        param0.set_cmd(SystemMessage::SecurejoinWait);
-        param1.set_cmd(SystemMessage::SecurejoinWaitTimeout);
-        let (param0, param1) = (param0.to_string(), param1.to_string());
-        let Some((param, ts_sort, ts_start)) = context
-            .sql
-            .query_row_optional(
-                "SELECT param, timestamp, timestamp_sent FROM msgs WHERE id=\
-                 (SELECT MAX(id) FROM msgs WHERE chat_id=? AND param IN (?, ?))",
-                (self.id, &param0, &param1),
-                |row| {
-                    let param: String = row.get(0)?;
-                    let ts_sort: i64 = row.get(1)?;
-                    let ts_start: i64 = row.get(2)?;
-                    Ok((param, ts_sort, ts_start))
-                },
-            )
-            .await?
-        else {
-            return Ok(0);
-        };
-        if param == param1 {
-            return Ok(0);
-        }
-        let now = time();
-        // Don't await SecureJoin if the clock was set back.
-        if ts_start <= now {
-            let timeout = ts_start
-                .saturating_add(timeout.try_into()?)
-                .saturating_sub(now);
-            if timeout > 0 {
-                return Ok(timeout as u64);
-            }
-        }
-        add_info_msg_with_cmd(
-            context,
-            self.id,
-            &stock_str::securejoin_wait_timeout(context).await,
-            SystemMessage::SecurejoinWaitTimeout,
-            // Use the sort timestamp of the "please wait" message, this way the added message is
-            // never sorted below the protection message if the SecureJoin finishes in parallel.
-            ts_sort,
-            Some(now),
-            None,
-            None,
-        )
-        .await?;
-        context.emit_event(EventType::ChatModified(self.id));
-        Ok(0)
-    }
-
    /// Checks if the user is part of a chat
    /// and has basically the permissions to edit the chat therefore.
    /// The function does not check if the chat type allows editing of concrete elements.
@@ -2326,9 +2235,8 @@ pub struct ChatInfo {
 }

 pub(crate) async fn update_saved_messages_icon(context: &Context) -> Result<()> {
-    if let Some(ChatIdBlocked { id: chat_id, .. }) =
-        ChatIdBlocked::lookup_by_contact(context, ContactId::SELF).await?
-    {
+    // if there is no saved-messages chat, there is nothing to update. this is no error.
+    if let Some(chat_id) = ChatId::lookup_by_contact(context, ContactId::SELF).await? {
        let icon = include_bytes!("../assets/icon-saved-messages.png");
        let blob = BlobObject::create(context, "icon-saved-messages.png", icon).await?;
        let icon = blob.as_name().to_string();
@@ -2341,9 +2249,8 @@ pub(crate) async fn update_saved_messages_icon(context: &Context) -> Result<()>
 }

 pub(crate) async fn update_device_icon(context: &Context) -> Result<()> {
-    if let Some(ChatIdBlocked { id: chat_id, .. }) =
-        ChatIdBlocked::lookup_by_contact(context, ContactId::DEVICE).await?
-    {
+    // if there is no device-chat, there is nothing to update. this is no error.
+    if let Some(chat_id) = ChatId::lookup_by_contact(context, ContactId::DEVICE).await? {
        let icon = include_bytes!("../assets/icon-device.png");
        let blob = BlobObject::create(context, "icon-device.png", icon).await?;
        let icon = blob.as_name().to_string();
@@ -2394,9 +2301,7 @@ async fn update_special_chat_name(
    contact_id: ContactId,
    name: String,
 ) -> Result<()> {
-    if let Some(ChatIdBlocked { id: chat_id, .. }) =
-        ChatIdBlocked::lookup_by_contact(context, contact_id).await?
-    {
+    if let Some(chat_id) = ChatId::lookup_by_contact(context, contact_id).await? {
        // the `!= name` condition avoids unneeded writes
        context
            .sql
@@ -2425,26 +2330,6 @@ pub(crate) async fn update_special_chat_names(context: &Context) -> Result<()> {
    Ok(())
 }

-/// Checks if there is a 1:1 chat in-progress SecureJoin for Bob and, if necessary, schedules a task
-/// unblocking the chat and notifying the user accordingly.
-pub(crate) async fn resume_securejoin_wait(context: &Context) -> Result<()> {
-    let Some(bobstate) = BobState::from_db(&context.sql).await? else {
-        return Ok(());
-    };
-    if !bobstate.in_progress() {
-        return Ok(());
-    }
-    let chat_id = bobstate.alice_chat();
-    let chat = Chat::load_from_db(context, chat_id).await?;
-    let timeout = chat
-        .check_securejoin_wait(context, constants::SECUREJOIN_WAIT_TIMEOUT)
-        .await?;
-    if timeout > 0 {
-        chat_id.spawn_securejoin_wait(context, timeout);
-    }
-    Ok(())
-}
-
 /// Handle a [`ChatId`] and its [`Blocked`] status at once.
 ///
 /// This struct is an optimisation to read a [`ChatId`] and its [`Blocked`] status at once
@@ -2698,9 +2583,7 @@ async fn prepare_msg_common(
    if let Some(reason) = chat.why_cant_send(context).await? {
        if matches!(
            reason,
-            CantSendReason::ProtectionBroken
-                | CantSendReason::ContactRequest
-                | CantSendReason::SecurejoinWait
+            CantSendReason::ProtectionBroken | CantSendReason::ContactRequest
        ) && msg.param.get_cmd() == SystemMessage::SecurejoinMessage
        {
            // Send out the message, the securejoin message is supposed to repair the verification.
@@ -2710,18 +2593,6 @@ async fn prepare_msg_common(
        }
    }

-    // Check a quote reply is not leaking data from other chats.
-    // This is meant as a last line of defence, the UI should check that before as well.
-    // (We allow Chattype::Single in general for "Reply Privately";
-    // checking for exact contact_id will produce false positives when ppl just left the group)
-    if chat.typ != Chattype::Single && !context.get_config_bool(Config::Bot).await? {
-        if let Some(quoted_message) = msg.quoted_message(context).await? {
-            if quoted_message.chat_id != chat_id {
-                bail!("Bad quote reply");
-            }
-        }
-    }
-
    // check current MessageState for drafts (to keep msg_id) ...
    let update_msg_id = if msg.state == MessageState::OutDraft {
        msg.hidden = false;
@@ -2964,10 +2835,17 @@ pub(crate) async fn create_send_msg_jobs(context: &Context, msg: &mut Message) -
            .await?;
    }

-    if rendered_msg.last_added_location_id.is_some() {
+    if let Some(last_added_location_id) = rendered_msg.last_added_location_id {
        if let Err(err) = location::set_kml_sent_timestamp(context, msg.chat_id, now).await {
            error!(context, "Failed to set kml sent_timestamp: {err:#}.");
        }
+        if !msg.hidden {
+            if let Err(err) =
+                location::set_msg_location_id(context, msg.id, last_added_location_id).await
+            {
+                error!(context, "Failed to set msg_location_id: {err:#}.");
+            }
+        }
    }

    if let Some(sync_ids) = rendered_msg.sync_ids_to_delete {
@@ -4593,10 +4471,9 @@ impl Context {
                    }
                    _ => (),
                }
-                ChatIdBlocked::lookup_by_contact(self, contact_id)
+                ChatId::lookup_by_contact(self, contact_id)
                    .await?
                    .with_context(|| format!("No chat for addr '{addr}'"))?
-                    .id
            }
            SyncId::Grpid(grpid) => {
                if let SyncAction::CreateBroadcast(name) = action {
@@ -4843,59 +4720,6 @@ mod tests {
        Ok(())
    }

-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_quote_replies() -> Result<()> {
-        let alice = TestContext::new_alice().await;
-        let bob = TestContext::new_bob().await;
-
-        let grp_chat_id = create_group_chat(&alice, ProtectionStatus::Unprotected, "grp").await?;
-        let grp_msg_id = send_text_msg(&alice, grp_chat_id, "bar".to_string()).await?;
-        let grp_msg = Message::load_from_db(&alice, grp_msg_id).await?;
-
-        let one2one_chat_id = alice.create_chat(&bob).await.id;
-        let one2one_msg_id = send_text_msg(&alice, one2one_chat_id, "foo".to_string()).await?;
-        let one2one_msg = Message::load_from_db(&alice, one2one_msg_id).await?;
-
-        // quoting messages in same chat is okay
-        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text("baz".to_string());
-        msg.set_quote(&alice, Some(&grp_msg)).await?;
-        let result = send_msg(&alice, grp_chat_id, &mut msg).await;
-        assert!(result.is_ok());
-
-        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text("baz".to_string());
-        msg.set_quote(&alice, Some(&one2one_msg)).await?;
-        let result = send_msg(&alice, one2one_chat_id, &mut msg).await;
-        assert!(result.is_ok());
-        let one2one_quote_reply_msg_id = result.unwrap();
-
-        // quoting messages from groups to one-to-ones is okay ("reply privately")
-        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text("baz".to_string());
-        msg.set_quote(&alice, Some(&grp_msg)).await?;
-        let result = send_msg(&alice, one2one_chat_id, &mut msg).await;
-        assert!(result.is_ok());
-
-        // quoting messages from one-to-one chats in groups is an error; usually this is also not allowed by UI at all ...
-        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text("baz".to_string());
-        msg.set_quote(&alice, Some(&one2one_msg)).await?;
-        let result = send_msg(&alice, grp_chat_id, &mut msg).await;
-        assert!(result.is_err());
-
-        // ... but forwarding messages with quotes is allowed
-        let result = forward_msgs(&alice, &[one2one_quote_reply_msg_id], grp_chat_id).await;
-        assert!(result.is_ok());
-
-        // ... and bots are not restricted
-        alice.set_config(Config::Bot, Some("1")).await?;
-        let result = send_msg(&alice, grp_chat_id, &mut msg).await;
-        assert!(result.is_ok());
-
-        Ok(())
-    }
-
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_add_contact_to_chat_ex_add_self() {
        // Adding self to a contact should succeed, even though it's pointless.
--- a/src/config.rs
+++ b/src/config.rs
@@ -254,9 +254,6 @@ pub enum Config {
    /// True if account is configured.
    Configured,

-    /// True if account is a chatmail account.
-    IsChatmail,
-
    /// All secondary self addresses separated by spaces
    /// (`addr1@example.org addr2@example.org addr3@example.org`)
    SecondaryAddrs,
@@ -1010,15 +1007,6 @@ mod tests {
            .set_config(Config::Selfavatar, Some(file.to_str().unwrap()))
            .await?;
        sync(&alice0, &alice1).await;
-        // There was a bug that a sync message creates the self-chat with the user avatar instead of
-        // the special icon and that remains so when the self-chat becomes user-visible. Let's check
-        // this.
-        let self_chat = alice0.get_self_chat().await;
-        let self_chat_avatar_path = self_chat.get_profile_image(&alice0).await?.unwrap();
-        assert_eq!(
-            self_chat_avatar_path,
-            alice0.get_blobdir().join("icon-saved-messages.png")
-        );
        assert!(alice1
            .get_config(Config::Selfavatar)
            .await?
--- a/src/configure.rs
+++ b/src/configure.rs
@@ -112,11 +112,6 @@ impl Context {

        let mut param = LoginParam::load_candidate_params(self).await?;
        let old_addr = self.get_config(Config::ConfiguredAddr).await?;
-
-        // Reset our knowledge about whether the server is a chatmail server.
-        // We will update it when we connect to IMAP.
-        self.set_config_internal(Config::IsChatmail, None).await?;
-
        let success = configure(self, &mut param).await;
        self.set_config_internal(Config::NotifyAboutWrongPw, None)
            .await?;
@@ -458,14 +453,6 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {

    progress!(ctx, 900);

-    if imap_session.is_chatmail() {
-        ctx.set_config(Config::SentboxWatch, None).await?;
-        ctx.set_config(Config::MvboxMove, Some("0")).await?;
-        ctx.set_config(Config::OnlyFetchMvbox, None).await?;
-        ctx.set_config(Config::ShowEmails, None).await?;
-        ctx.set_config(Config::E2eeEnabled, Some("1")).await?;
-    }
-
    let create_mvbox = ctx.should_watch_mvbox().await?;

    imap.configure_folders(ctx, &mut imap_session, create_mvbox)
--- a/src/constants.rs
+++ b/src/constants.rs
@@ -223,11 +223,6 @@ pub(crate) const DC_BACKGROUND_FETCH_QUOTA_CHECK_RATELIMIT: u64 = 12 * 60 * 60;
 /// in the group membership consistency algo to reject outdated membership changes.
 pub(crate) const TIMESTAMP_SENT_TOLERANCE: i64 = 60;

-/// How long a 1:1 chat can't be used for sending while the SecureJoin is in progress. This should
-/// be 10-20 seconds so that we are reasonably sure that the app remains active and receiving also
-/// on mobile devices. See also [`crate::chat::CantSendReason::SecurejoinWait`].
-pub(crate) const SECUREJOIN_WAIT_TIMEOUT: u64 = 15;
-
 #[cfg(test)]
 mod tests {
    use num_traits::FromPrimitive;
--- a/src/contact.rs
+++ b/src/contact.rs
@@ -20,7 +20,7 @@ use tokio::task;
 use tokio::time::{timeout, Duration};

 use crate::aheader::EncryptPreference;
-use crate::chat::{ChatId, ChatIdBlocked, ProtectionStatus};
+use crate::chat::{ChatId, ProtectionStatus};
 use crate::color::str_to_color;
 use crate::config::Config;
 use crate::constants::{Blocked, Chattype, DC_GCL_ADD_SELF, DC_GCL_VERIFIED_ONLY};
@@ -1315,9 +1315,7 @@ impl Contact {
    pub async fn is_profile_verified(&self, context: &Context) -> Result<bool> {
        let contact_id = self.id;

-        if let Some(ChatIdBlocked { id: chat_id, .. }) =
-            ChatIdBlocked::lookup_by_contact(context, contact_id).await?
-        {
+        if let Some(chat_id) = ChatId::lookup_by_contact(context, contact_id).await? {
            Ok(chat_id.is_protected(context).await? == ProtectionStatus::Protected)
        } else {
            // 1:1 chat does not exist.
--- a/src/context.rs
+++ b/src/context.rs
@@ -461,10 +461,18 @@ 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);
+        {
+            if self
+                .get_config(Config::ConfiguredAddr)
+                .await
+                .unwrap_or_default()
+                .filter(|s| s.ends_with(".testrun.org"))
+                .is_some()
+            {
+                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);
+            }
        }
        self.scheduler.start(self.clone()).await;
    }
@@ -485,11 +493,6 @@ impl Context {
        self.scheduler.maybe_network().await;
    }

-    /// Returns true if an account is on a chatmail server.
-    pub async fn is_chatmail(&self) -> Result<bool> {
-        self.get_config_bool(Config::IsChatmail).await
-    }
-
    /// Does a background fetch
    /// pauses the scheduler and does one imap fetch, then unpauses and returns
    pub async fn background_fetch(&self) -> Result<()> {
@@ -796,8 +799,6 @@ impl Context {
            res.insert("imap_server_id", format!("{server_id:?}"));
        }

-        res.insert("is_chatmail", self.is_chatmail().await?.to_string());
-
        if let Some(metadata) = &*self.metadata.read().await {
            if let Some(comment) = &metadata.comment {
                res.insert("imap_server_comment", format!("{comment:?}"));
--- a/src/decrypt.rs
+++ b/src/decrypt.rs
@@ -57,7 +57,11 @@ pub(crate) async fn prepare_decryption(
            autocrypt_header: None,
            peerstate: None,
            message_time,
-            dkim_results: DkimResults { dkim_passed: false },
+            dkim_results: DkimResults {
+                dkim_passed: false,
+                dkim_should_work: false,
+                allow_keychange: true,
+            },
        });
    }

@@ -82,13 +86,15 @@ pub(crate) async fn prepare_decryption(
        None
    };

-    let dkim_results = handle_authres(context, mail, from).await?;
+    let dkim_results = handle_authres(context, mail, from, message_time).await?;
    let allow_aeap = get_encrypted_mime(mail).is_some();
    let peerstate = get_autocrypt_peerstate(
        context,
        from,
        autocrypt_header.as_ref(),
        message_time,
+        // Disallowing keychanges is disabled for now:
+        true, // dkim_results.allow_keychange,
        allow_aeap,
    )
    .await?;
@@ -281,15 +287,19 @@ pub(crate) fn keyring_from_peerstate(peerstate: Option<&Peerstate>) -> Vec<Signe
 /// If we already know this fingerprint from another contact's peerstate, return that
 /// peerstate in order to make AEAP work, but don't save it into the db yet.
 ///
+/// The param `allow_change` is used to prevent the autocrypt key from being changed
+/// if we suspect that the message may be forged and have a spoofed sender identity.
+///
 /// Returns updated peerstate.
 pub(crate) async fn get_autocrypt_peerstate(
    context: &Context,
    from: &str,
    autocrypt_header: Option<&Aheader>,
    message_time: i64,
+    allow_change: bool,
    allow_aeap: bool,
 ) -> Result<Option<Peerstate>> {
-    let allow_change = !context.is_self_addr(from).await?;
+    let allow_change = allow_change && !context.is_self_addr(from).await?;
    let mut peerstate;

    // Apply Autocrypt header
--- a/src/ephemeral.rs
+++ b/src/ephemeral.rs
@@ -74,7 +74,7 @@ use async_channel::Receiver;
 use serde::{Deserialize, Serialize};
 use tokio::time::timeout;

-use crate::chat::{send_msg, ChatId, ChatIdBlocked};
+use crate::chat::{send_msg, ChatId};
 use crate::constants::{DC_CHAT_ID_LAST_SPECIAL, DC_CHAT_ID_TRASH};
 use crate::contact::ContactId;
 use crate::context::Context;
@@ -378,13 +378,11 @@ WHERE
        .await?;

    if let Some(delete_device_after) = context.get_config_delete_device_after().await? {
-        let self_chat_id = ChatIdBlocked::lookup_by_contact(context, ContactId::SELF)
+        let self_chat_id = ChatId::lookup_by_contact(context, ContactId::SELF)
            .await?
-            .map(|c| c.id)
            .unwrap_or_default();
-        let device_chat_id = ChatIdBlocked::lookup_by_contact(context, ContactId::DEVICE)
+        let device_chat_id = ChatId::lookup_by_contact(context, ContactId::DEVICE)
            .await?
-            .map(|c| c.id)
            .unwrap_or_default();

        let threshold_timestamp = now.saturating_sub(delete_device_after);
@@ -492,13 +490,11 @@ pub(crate) async fn delete_expired_messages(context: &Context, now: i64) -> Resu
 /// `delete_device_after` setting being set.
 async fn next_delete_device_after_timestamp(context: &Context) -> Result<Option<i64>> {
    if let Some(delete_device_after) = context.get_config_delete_device_after().await? {
-        let self_chat_id = ChatIdBlocked::lookup_by_contact(context, ContactId::SELF)
+        let self_chat_id = ChatId::lookup_by_contact(context, ContactId::SELF)
            .await?
-            .map(|c| c.id)
            .unwrap_or_default();
-        let device_chat_id = ChatIdBlocked::lookup_by_contact(context, ContactId::DEVICE)
+        let device_chat_id = ChatId::lookup_by_contact(context, ContactId::DEVICE)
            .await?
-            .map(|c| c.id)
            .unwrap_or_default();

        let oldest_message_timestamp: Option<i64> = context
--- a/src/imap/capabilities.rs
+++ b/src/imap/capabilities.rs
@@ -32,14 +32,6 @@ pub(crate) struct Capabilities {
    /// This is supported by <https://github.com/deltachat/chatmail>
    pub can_push: bool,

-    /// True if the server has an XCHATMAIL capability
-    /// indicating that it is a <https://github.com/deltachat/chatmail> server.
-    ///
-    /// This can be used to hide some advanced settings in the UI
-    /// that are only interesting for normal email accounts,
-    /// e.g. the ability to move messages to Delta Chat folder.
-    pub is_chatmail: bool,
-
    /// Server ID if the server supports ID capability.
    pub server_id: Option<HashMap<String, String>>,
 }
--- a/src/imap/client.rs
+++ b/src/imap/client.rs
@@ -61,7 +61,6 @@ async fn determine_capabilities(
        can_condstore: caps.has_str("CONDSTORE"),
        can_metadata: caps.has_str("METADATA"),
        can_push: caps.has_str("XDELTAPUSH"),
-        is_chatmail: caps.has_str("XCHATMAIL"),
        server_id,
    };
    Ok(capabilities)
--- a/src/imap/session.rs
+++ b/src/imap/session.rs
@@ -94,11 +94,6 @@ impl Session {
        self.capabilities.can_push
    }

-    // Returns true if IMAP server has `XCHATMAIL` capability.
-    pub fn is_chatmail(&self) -> bool {
-        self.capabilities.is_chatmail
-    }
-
    /// Returns the names of all folders on the IMAP server.
    pub async fn list_folders(&mut self) -> Result<Vec<async_imap::types::Name>> {
        let list = self.list(Some(""), Some("*")).await?.try_collect().await?;
--- a/src/location.rs
+++ b/src/location.rs
@@ -483,21 +483,15 @@ pub async fn delete_all(context: &Context) -> Result<()> {
 /// Only path locations are deleted.
 /// POIs should be deleted when corresponding message is deleted.
 pub(crate) async fn delete_expired(context: &Context, now: i64) -> Result<()> {
-    let Some(delete_device_after) = context.get_config_delete_device_after().await? else {
-        return Ok(());
-    };
-
-    let threshold_timestamp = now.saturating_sub(delete_device_after);
    let deleted = context
        .sql
        .execute(
            "DELETE FROM locations WHERE independent=0 AND timestamp < ?",
-            (threshold_timestamp,),
+            (now,),
        )
        .await?
        > 0;
    if deleted {
-        info!(context, "Deleted {deleted} expired locations.");
        context.emit_location_changed(None).await?;
    }
    Ok(())
@@ -884,10 +878,8 @@ mod tests {
    #![allow(clippy::indexing_slicing)]

    use super::*;
-    use crate::config::Config;
    use crate::receive_imf::receive_imf;
-    use crate::test_utils::{TestContext, TestContextManager};
-    use crate::tools::SystemTime;
+    use crate::test_utils::TestContext;

    #[test]
    fn test_kml_parse() {
@@ -1037,8 +1029,6 @@ Content-Disposition: attachment; filename="location.kml"
        let mut msg = Message::new(Viewtype::Image);
        msg.set_file(file.to_str().unwrap(), None);
        let sent = alice.send_msg(alice_chat.id, &mut msg).await;
-        let alice_msg = Message::load_from_db(&alice, sent.sender_msg_id).await?;
-        assert_eq!(alice_msg.has_location(), false);

        let msg = bob.recv_msg_opt(&sent).await.unwrap();
        assert!(msg.chat_id == bob_chat_id);
@@ -1047,60 +1037,6 @@ Content-Disposition: attachment; filename="location.kml"
        let bob_msg = Message::load_from_db(&bob, *msg.msg_ids.first().unwrap()).await?;
        assert_eq!(bob_msg.chat_id, bob_chat_id);
        assert_eq!(bob_msg.viewtype, Viewtype::Image);
-        assert_eq!(bob_msg.has_location(), false);
-
-        let bob_locations = get_range(&bob, None, None, 0, 0).await?;
-        assert_eq!(bob_locations.len(), 1);
-
-        Ok(())
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_delete_expired_locations() -> Result<()> {
-        let mut tcm = TestContextManager::new();
-        let alice = &tcm.alice().await;
-        let bob = &tcm.bob().await;
-
-        // Alice enables deletion of messages from device after 1 week.
-        alice
-            .set_config(Config::DeleteDeviceAfter, Some("604800"))
-            .await?;
-        // Bob enables deletion of messages from device after 1 day.
-        bob.set_config(Config::DeleteDeviceAfter, Some("86400"))
-            .await?;
-
-        let alice_chat = alice.create_chat(bob).await;
-
-        // Alice enables location streaming.
-        // Bob receives a message saying that Alice enabled location streaming.
-        send_locations_to_chat(alice, alice_chat.id, 60).await?;
-        bob.recv_msg(&alice.pop_sent_msg().await).await;
-
-        // Alice gets new location from GPS.
-        assert_eq!(set(alice, 10.0, 20.0, 1.0).await?, true);
-        assert_eq!(get_range(alice, None, None, 0, 0).await?.len(), 1);
-
-        // 10 seconds later location sending stream manages to send location.
-        SystemTime::shift(Duration::from_secs(10));
-        delete_expired(alice, time()).await?;
-        maybe_send_locations(alice).await?;
-        bob.recv_msg_opt(&alice.pop_sent_msg().await).await;
-        assert_eq!(get_range(alice, None, None, 0, 0).await?.len(), 1);
-        assert_eq!(get_range(bob, None, None, 0, 0).await?.len(), 1);
-
-        // Day later Bob removes location.
-        SystemTime::shift(Duration::from_secs(86400));
-        delete_expired(alice, time()).await?;
-        delete_expired(bob, time()).await?;
-        assert_eq!(get_range(alice, None, None, 0, 0).await?.len(), 1);
-        assert_eq!(get_range(bob, None, None, 0, 0).await?.len(), 0);
-
-        // Week late Alice removes location.
-        SystemTime::shift(Duration::from_secs(604800));
-        delete_expired(alice, time()).await?;
-        delete_expired(bob, time()).await?;
-        assert_eq!(get_range(alice, None, None, 0, 0).await?.len(), 0);
-        assert_eq!(get_range(bob, None, None, 0, 0).await?.len(), 0);

        Ok(())
    }
--- a/src/message.rs
+++ b/src/message.rs
@@ -9,7 +9,7 @@ use serde::{Deserialize, Serialize};
 use tokio::{fs, io};

 use crate::blob::BlobObject;
-use crate::chat::{Chat, ChatId, ChatIdBlocked};
+use crate::chat::{Chat, ChatId};
 use crate::chatlist_events;
 use crate::config::Config;
 use crate::constants::{
@@ -655,11 +655,9 @@ impl Message {
        Ok(())
    }

-    /// Check if a message has a POI location bound to it.
-    /// These locations are also returned by [`location::get_range()`].
-    /// The UI may decide to display a special icon beside such messages.
-    ///
-    /// [`location::get_range()`]: crate::location::get_range
+    /// Check if a message has a location bound to it.
+    /// These messages are also returned by get_locations()
+    /// and the UI may decide to display a special icon beside such messages,
    pub fn has_location(&self) -> bool {
        self.location_id != 0
    }
@@ -1813,9 +1811,8 @@ pub async fn estimate_deletion_cnt(
    from_server: bool,
    seconds: i64,
 ) -> Result<usize> {
-    let self_chat_id = ChatIdBlocked::lookup_by_contact(context, ContactId::SELF)
+    let self_chat_id = ChatId::lookup_by_contact(context, ContactId::SELF)
        .await?
-        .map(|c| c.id)
        .unwrap_or_default();
    let threshold_timestamp = time() - seconds;

--- a/src/mimeparser.rs
+++ b/src/mimeparser.rs
@@ -36,7 +36,6 @@ use crate::simplify::{simplify, SimplifiedText};
 use crate::sync::SyncItems;
 use crate::tools::{
    create_smeared_timestamp, get_filemeta, parse_receive_headers, smeared_time, truncate_by_lines,
-    validate_id,
 };
 use crate::{chatlist_events, location, stock_str, tools};

@@ -180,14 +179,6 @@ pub enum SystemMessage {
    /// which is sent by chatmail servers.
    InvalidUnencryptedMail = 13,

-    /// 1:1 chats info message telling that SecureJoin has started and the user should wait for it
-    /// to complete.
-    SecurejoinWait = 14,
-
-    /// 1:1 chats info message telling that SecureJoin is still running, but the user may already
-    /// send messages.
-    SecurejoinWaitTimeout = 15,
-
    /// Self-sent-message that contains only json used for multi-device-sync;
    /// if possible, we attach that to other messages as for locations.
    MultiDeviceSync = 20,
@@ -424,6 +415,8 @@ impl MimeMessage {
            if let (Some(peerstate), Ok(mail)) = (&mut decryption_info.peerstate, mail) {
                if timestamp_sent > peerstate.last_seen_autocrypt
                    && mail.ctype.mimetype != "multipart/report"
+                // Disallowing keychanges is disabled for now:
+                // && decryption_info.dkim_results.allow_keychange
                {
                    peerstate.degrade_encryption(timestamp_sent);
                }
@@ -513,6 +506,13 @@ impl MimeMessage {
        parser.heuristically_parse_ndn(context).await;
        parser.parse_headers(context).await?;

+        // Disallowing keychanges is disabled for now
+        // if !decryption_info.dkim_results.allow_keychange {
+        //     for part in parser.parts.iter_mut() {
+        //         part.error = Some("Seems like DKIM failed, this either is an attack or (more likely) a bug in Authentication-Results checking. Please tell us about this at https://support.delta.chat.".to_string());
+        //     }
+        // }
+
        if parser.is_mime_modified {
            parser.decoded_data = mail_raw;
        }
@@ -556,25 +556,19 @@ impl MimeMessage {

    /// Parses avatar action headers.
    async fn parse_avatar_headers(&mut self, context: &Context) {
-        if let Some(header_value) = self.get_header(HeaderDef::ChatGroupAvatar) {
-            self.group_avatar = self
-                .avatar_action_from_header(context, header_value.to_string())
-                .await;
+        if let Some(header_value) = self.get_header(HeaderDef::ChatGroupAvatar).cloned() {
+            self.group_avatar = self.avatar_action_from_header(context, header_value).await;
        }

-        if let Some(header_value) = self.get_header(HeaderDef::ChatUserAvatar) {
-            self.user_avatar = self
-                .avatar_action_from_header(context, header_value.to_string())
-                .await;
+        if let Some(header_value) = self.get_header(HeaderDef::ChatUserAvatar).cloned() {
+            self.user_avatar = self.avatar_action_from_header(context, header_value).await;
        }
    }

    fn parse_videochat_headers(&mut self) {
-        if let Some(value) = self.get_header(HeaderDef::ChatContent) {
+        if let Some(value) = self.get_header(HeaderDef::ChatContent).cloned() {
            if value == "videochat-invitation" {
-                let instance = self
-                    .get_header(HeaderDef::ChatWebrtcRoom)
-                    .map(|s| s.to_string());
+                let instance = self.get_header(HeaderDef::ChatWebrtcRoom).cloned();
                if let Some(part) = self.parts.first_mut() {
                    part.typ = Viewtype::VideochatInvitation;
                    part.param
@@ -821,16 +815,8 @@ impl MimeMessage {
            .map(|s| s.to_string())
    }

-    pub fn get_header(&self, headerdef: HeaderDef) -> Option<&str> {
-        self.headers
-            .get(headerdef.get_headername())
-            .map(|s| s.as_str())
-    }
-
-    /// Returns `Chat-Group-ID` header value if it is a valid group ID.
-    pub fn get_chat_group_id(&self) -> Option<&str> {
-        self.get_header(HeaderDef::ChatGroupId)
-            .filter(|s| validate_id(s))
+    pub fn get_header(&self, headerdef: HeaderDef) -> Option<&String> {
+        self.headers.get(headerdef.get_headername())
    }

    async fn parse_mime_recursive<'a>(
--- a/src/receive_imf.rs
+++ b/src/receive_imf.rs
@@ -37,7 +37,7 @@ use crate::simplify;
 use crate::sql;
 use crate::stock_str;
 use crate::sync::Sync::*;
-use crate::tools::{self, buf_compress, extract_grpid_from_rfc724_mid};
+use crate::tools::{self, buf_compress, extract_grpid_from_rfc724_mid, validate_id};
 use crate::{chatlist_events, location};
 use crate::{contact, imap};

@@ -703,9 +703,7 @@ async fn add_parts(
        better_msg = Some(stock_str::msg_location_enabled_by(context, from_id).await);
    }

-    let parent = get_parent_message(context, mime_parser)
-        .await?
-        .filter(|p| Some(p.id) != replace_msg_id);
+    let parent = get_parent_message(context, mime_parser).await?;

    let is_dc_message = if mime_parser.has_chat_version() {
        MessengerMessage::Yes
@@ -771,18 +769,6 @@ async fn add_parts(
            info!(context, "Message is an MDN (TRASH).",);
        }

-        // Try to assign to a chat based on Chat-Group-ID.
-        if chat_id.is_none() {
-            if let Some(grpid) = mime_parser.get_chat_group_id() {
-                if let Some((id, _protected, blocked)) =
-                    chat::get_chat_id_by_grpid(context, grpid).await?
-                {
-                    chat_id = Some(id);
-                    chat_id_blocked = blocked;
-                }
-            }
-        }
-
        if chat_id.is_none() {
            // try to assign to a chat based on In-Reply-To/References:

@@ -1049,18 +1035,6 @@ async fn add_parts(
            chat_id = Some(DC_CHAT_ID_TRASH);
        }

-        // Try to assign to a chat based on Chat-Group-ID.
-        if chat_id.is_none() {
-            if let Some(grpid) = mime_parser.get_chat_group_id() {
-                if let Some((id, _protected, blocked)) =
-                    chat::get_chat_id_by_grpid(context, grpid).await?
-                {
-                    chat_id = Some(id);
-                    chat_id_blocked = blocked;
-                }
-            }
-        }
-
        if chat_id.is_none() {
            // try to assign to a chat based on In-Reply-To/References:

@@ -1373,9 +1347,11 @@ async fn add_parts(

    let mime_in_reply_to = mime_parser
        .get_header(HeaderDef::InReplyTo)
+        .cloned()
        .unwrap_or_default();
    let mime_references = mime_parser
        .get_header(HeaderDef::References)
+        .cloned()
        .unwrap_or_default();

    // fine, so far.  now, split the message into simple parts usable as "short messages"
@@ -1435,7 +1411,7 @@ async fn add_parts(
            let reaction_str = simplify::remove_footers(part.msg.as_str());
            set_msg_reaction(
                context,
-                mime_in_reply_to,
+                &mime_in_reply_to,
                orig_chat_id.unwrap_or_default(),
                from_id,
                sort_timestamp,
@@ -1693,10 +1669,11 @@ async fn save_locations(
        if let Some(addr) = &location_kml.addr {
            let contact = Contact::get_by_id(context, from_id).await?;
            if contact.get_addr().to_lowercase() == addr.to_lowercase() {
-                if location::save(context, chat_id, from_id, &location_kml.locations, false)
-                    .await?
-                    .is_some()
+                if let Some(newest_location_id) =
+                    location::save(context, chat_id, from_id, &location_kml.locations, false)
+                        .await?
                {
+                    location::set_msg_location_id(context, msg_id, newest_location_id).await?;
                    send_event = true;
                }
            } else {
@@ -1778,11 +1755,6 @@ async fn is_probably_private_reply(
        return Ok(false);
    }

-    // Message cannot be a private reply if it has an explicit Chat-Group-ID header.
-    if mime_parser.get_chat_group_id().is_some() {
-        return Ok(false);
-    }
-
    if !mime_parser.has_chat_version() {
        let chat_contacts = chat::get_chat_contacts(context, parent_chat_id).await?;
        if chat_contacts.len() == 2 && chat_contacts.contains(&ContactId::SELF) {
@@ -2460,8 +2432,11 @@ async fn apply_mailinglist_changes(
 }

 fn try_getting_grpid(mime_parser: &MimeMessage) -> Option<String> {
-    if let Some(optional_field) = mime_parser.get_chat_group_id() {
-        return Some(optional_field.to_string());
+    if let Some(optional_field) = mime_parser
+        .get_header(HeaderDef::ChatGroupId)
+        .filter(|s| validate_id(s))
+    {
+        return Some(optional_field.clone());
    }

    // Useful for undecipherable messages sent to known group.
--- a/src/receive_imf/tests.rs
+++ b/src/receive_imf/tests.rs
@@ -2693,103 +2693,6 @@ Second thread."#;
    Ok(())
 }

-/// Test that `Chat-Group-ID` is preferred over `In-Reply-To` and `References`.
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_chat_assignment_chat_group_id_preference() -> Result<()> {
-    let t = &TestContext::new_alice().await;
-
-    receive_imf(
-        t,
-        br#"Subject: Hello
-Chat-Group-ID: eJ_llQIXf0K
-Chat-Group-Name: Group name
-Chat-Version: 1.0
-Message-ID: <first@localhost>
-References: <first@localhost>
-Date: Fri, 28 May 2021 10:15:05 +0000
-From: Alice <alice@example.org>
-To: Bob <bob@example.com>, <claire@example.org>
-Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
-Content-Transfer-Encoding: quoted-printable
-
-Hello, I've just created a group for us."#,
-        false,
-    )
-    .await?;
-    let group_msg = t.get_last_msg().await;
-
-    receive_imf(
-        t,
-        br#"Subject: Hello
-Chat-Version: 1.0
-Message-ID: <second@localhost>
-References: <second@localhost>
-Date: Fri, 28 May 2021 10:15:05 +0000
-From: Bob <bob@example.com>
-To: Alice <alice@example.org>
-Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
-Content-Transfer-Encoding: quoted-printable
-
-Hello from Bob in 1:1 chat."#,
-        false,
-    )
-    .await?;
-
-    // References and In-Reply-To point to a message
-    // already assigned to 1:1 chat, but Chat-Group-ID is
-    // a stronger signal to assign message to a group.
-    receive_imf(
-        t,
-        br#"Subject: Hello
-Chat-Group-ID: eJ_llQIXf0K
-Chat-Group-Name: Group name
-Chat-Version: 1.0
-Message-ID: <third@localhost>
-In-Reply-To: <second@localhost>
-References: <second@localhost>
-Date: Fri, 28 May 2021 10:15:05 +0000
-From: Bob <bob@example.com>
-To: Alice <alice@example.org>, <claire@example.org>
-Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
-Content-Transfer-Encoding: quoted-printable
-
-Hello from Bob in a group."#,
-        false,
-    )
-    .await?;
-
-    let msg = t.get_last_msg().await;
-    assert_eq!(msg.text, "Hello from Bob in a group.");
-    assert_eq!(msg.chat_id, group_msg.chat_id);
-
-    // Test outgoing message as well.
-    receive_imf(
-        t,
-        br#"Subject: Hello
-Chat-Group-ID: eJ_llQIXf0K
-Chat-Group-Name: Group name
-Chat-Version: 1.0
-Message-ID: <fourth@localhost>
-In-Reply-To: <second@localhost>
-References: <second@localhost>
-Date: Fri, 28 May 2021 10:15:05 +0000
-From: Alice <alice@example.org>
-To: Bob <bob@example.com>, <claire@example.org>
-Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
-Content-Transfer-Encoding: quoted-printable
-
-Hello from Alice in a group."#,
-        false,
-    )
-    .await?;
-
-    let msg_outgoing = t.get_last_msg().await;
-    assert_eq!(msg_outgoing.text, "Hello from Alice in a group.");
-    assert_eq!(msg_outgoing.chat_id, group_msg.chat_id);
-
-    Ok(())
-}
-
 /// Test that read receipts don't create chats.
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_read_receipts_dont_create_chats() -> Result<()> {
--- a/src/scheduler.rs
+++ b/src/scheduler.rs
@@ -466,12 +466,6 @@ pub async fn convert_folder_meaning(
 }

 async fn inbox_fetch_idle(ctx: &Context, imap: &mut Imap, mut session: Session) -> Result<Session> {
-    ctx.set_config_internal(
-        Config::IsChatmail,
-        crate::config::from_bool(session.is_chatmail()),
-    )
-    .await?;
-
    // Update quota no more than once a minute.
    let quota_needs_update = {
        let quota = ctx.quota.read().await;
--- a/src/securejoin.rs
+++ b/src/securejoin.rs
@@ -29,7 +29,7 @@ mod bob;
 mod bobstate;
 mod qrinvite;

-pub(crate) use bobstate::BobState;
+use bobstate::BobState;
 use qrinvite::QrInvite;

 use crate::token::Namespace;
@@ -65,8 +65,8 @@ pub async fn get_securejoin_qr(context: &Context, group: Option<ChatId>) -> Resu
    let sync_token = token::lookup(context, Namespace::InviteNumber, group)
        .await?
        .is_none();
-    let invitenumber = token::lookup_or_new(context, Namespace::InviteNumber, group).await?;
-    let auth = token::lookup_or_new(context, Namespace::Auth, group).await?;
+    let invitenumber = token::lookup_or_new(context, Namespace::InviteNumber, group).await;
+    let auth = token::lookup_or_new(context, Namespace::Auth, group).await;
    let self_addr = context.get_primary_self_addr().await?;
    let self_name = context
        .get_config(Config::Displayname)
@@ -294,7 +294,7 @@ pub(crate) async fn handle_securejoin_handshake(

    let join_vg = step.starts_with("vg-");

-    if !matches!(step, "vg-request" | "vc-request") {
+    if !matches!(step.as_str(), "vg-request" | "vc-request") {
        let mut self_found = false;
        let self_fingerprint = load_self_public_key(context).await?.fingerprint();
        for (addr, key) in &mime_message.gossiped_keys {
@@ -311,7 +311,7 @@ pub(crate) async fn handle_securejoin_handshake(
        }
    }

-    match step {
+    match step.as_str() {
        "vg-request" | "vc-request" => {
            /*=======================================================
            ====             Alice - the inviter side            ====
@@ -487,7 +487,7 @@ pub(crate) async fn handle_securejoin_handshake(
        =======================================================*/
        "vc-contact-confirm" => {
            if let Some(mut bobstate) = BobState::from_db(&context.sql).await? {
-                if !bobstate.is_msg_expected(context, step) {
+                if !bobstate.is_msg_expected(context, step.as_str()) {
                    warn!(context, "Unexpected vc-contact-confirm.");
                    return Ok(HandshakeMessage::Ignore);
                }
@@ -498,7 +498,9 @@ pub(crate) async fn handle_securejoin_handshake(
            Ok(HandshakeMessage::Ignore)
        }
        "vg-member-added" => {
-            let Some(member_added) = mime_message.get_header(HeaderDef::ChatGroupMemberAdded)
+            let Some(member_added) = mime_message
+                .get_header(HeaderDef::ChatGroupMemberAdded)
+                .map(|s| s.as_str())
            else {
                warn!(
                    context,
@@ -514,7 +516,7 @@ pub(crate) async fn handle_securejoin_handshake(
                return Ok(HandshakeMessage::Propagate);
            }
            if let Some(mut bobstate) = BobState::from_db(&context.sql).await? {
-                if !bobstate.is_msg_expected(context, step) {
+                if !bobstate.is_msg_expected(context, step.as_str()) {
                    warn!(context, "Unexpected vg-member-added.");
                    return Ok(HandshakeMessage::Propagate);
                }
@@ -569,7 +571,7 @@ pub(crate) async fn observe_securejoin_on_other_device(
    info!(context, "Observing secure-join message {step:?}.");

    if !matches!(
-        step,
+        step.as_str(),
        "vg-request-with-auth" | "vc-request-with-auth" | "vg-member-added" | "vc-contact-confirm"
    ) {
        return Ok(HandshakeMessage::Ignore);
@@ -640,21 +642,21 @@ pub(crate) async fn observe_securejoin_on_other_device(

    ChatId::set_protection_for_contact(context, contact_id, mime_message.timestamp_sent).await?;

-    if step == "vg-member-added" {
+    if step.as_str() == "vg-member-added" {
        inviter_progress(context, contact_id, 800);
    }
-    if step == "vg-member-added" || step == "vc-contact-confirm" {
+    if step.as_str() == "vg-member-added" || step.as_str() == "vc-contact-confirm" {
        inviter_progress(context, contact_id, 1000);
    }

-    if step == "vg-request-with-auth" || step == "vc-request-with-auth" {
+    if step.as_str() == "vg-request-with-auth" || step.as_str() == "vc-request-with-auth" {
        // This actually reflects what happens on the first device (which does the secure
        // join) and causes a subsequent "vg-member-added" message to create an unblocked
        // verified group.
        ChatId::create_for_contact_with_blocked(context, contact_id, Blocked::Not).await?;
    }

-    if step == "vg-member-added" {
+    if step.as_str() == "vg-member-added" {
        Ok(HandshakeMessage::Propagate)
    } else {
        Ok(HandshakeMessage::Ignore)
@@ -762,7 +764,7 @@ mod tests {
    use crate::constants::Chattype;
    use crate::imex::{imex, ImexMode};
    use crate::receive_imf::receive_imf;
-    use crate::stock_str::{self, chat_protection_enabled};
+    use crate::stock_str::chat_protection_enabled;
    use crate::test_utils::get_chat_msg;
    use crate::test_utils::{TestContext, TestContextManager};
    use crate::tools::SystemTime;
@@ -959,7 +961,7 @@ mod tests {
            let expected_text = chat_protection_enabled(&alice).await;
            assert_eq!(msg.get_text(), expected_text);
            if case == SetupContactCase::CheckProtectionTimestamp {
-                assert_eq!(msg.timestamp_sort, vc_request_with_auth_ts_sent + 1);
+                assert_eq!(msg.timestamp_sort, vc_request_with_auth_ts_sent);
            }
        }

@@ -988,12 +990,10 @@ mod tests {

        // Check Bob got the verified message in his 1:1 chat.
        let chat = bob.create_chat(&alice).await;
-        let msg = get_chat_msg(&bob, chat.get_id(), 0, 2).await;
+        let msg = get_chat_msg(&bob, chat.get_id(), 0, 1).await;
        assert!(msg.is_info());
-        assert_eq!(msg.get_text(), stock_str::securejoin_wait(&bob).await);
-        let msg = get_chat_msg(&bob, chat.get_id(), 1, 2).await;
-        assert!(msg.is_info());
-        assert_eq!(msg.get_text(), chat_protection_enabled(&bob).await);
+        let expected_text = chat_protection_enabled(&bob).await;
+        assert_eq!(msg.get_text(), expected_text);
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
--- a/src/securejoin/bob.rs
+++ b/src/securejoin/bob.rs
@@ -9,11 +9,11 @@ use super::bobstate::{BobHandshakeStage, BobState};
 use super::qrinvite::QrInvite;
 use super::HandshakeMessage;
 use crate::chat::{is_contact_in_chat, ChatId, ProtectionStatus};
-use crate::constants::{self, Blocked, Chattype};
+use crate::constants::{Blocked, Chattype};
 use crate::contact::Contact;
 use crate::context::Context;
 use crate::events::EventType;
-use crate::mimeparser::{MimeMessage, SystemMessage};
+use crate::mimeparser::MimeMessage;
 use crate::sync::Sync::*;
 use crate::tools::{create_smeared_timestamp, time};
 use crate::{chat, stock_str};
@@ -69,29 +69,7 @@ pub(super) async fn start_protocol(context: &Context, invite: QrInvite) -> Resul
        QrInvite::Contact { .. } => {
            // For setup-contact the BobState already ensured the 1:1 chat exists because it
            // uses it to send the handshake messages.
-            let chat_id = state.alice_chat();
-            // Calculate the sort timestamp before checking the chat protection status so that if we
-            // race with its change, we don't add our message below the protection message.
-            let sort_to_bottom = true;
-            let ts_sort = chat_id
-                .calc_sort_timestamp(context, 0, sort_to_bottom, false)
-                .await?;
-            if chat_id.is_protected(context).await? == ProtectionStatus::Unprotected {
-                let ts_start = time();
-                chat::add_info_msg_with_cmd(
-                    context,
-                    chat_id,
-                    &stock_str::securejoin_wait(context).await,
-                    SystemMessage::SecurejoinWait,
-                    ts_sort,
-                    Some(ts_start),
-                    None,
-                    None,
-                )
-                .await?;
-                chat_id.spawn_securejoin_wait(context, constants::SECUREJOIN_WAIT_TIMEOUT);
-            }
-            Ok(chat_id)
+            Ok(state.alice_chat())
        }
    }
 }
--- a/src/securejoin/bobstate.rs
+++ b/src/securejoin/bobstate.rs
@@ -261,7 +261,7 @@ impl BobState {
                return Ok(None);
            }
        };
-        if !self.is_msg_expected(context, step) {
+        if !self.is_msg_expected(context, step.as_str()) {
            info!(context, "{} message out of sync for BobState", step);
            return Ok(None);
        }
@@ -341,15 +341,6 @@ impl BobState {
    async fn send_handshake_message(&self, context: &Context, step: BobHandshakeMsg) -> Result<()> {
        send_handshake_message(context, &self.invite, self.chat_id, step).await
    }
-
-    /// Returns whether we are waiting for a SecureJoin message from Alice, i.e. the protocol hasn't
-    /// yet completed.
-    pub(crate) fn in_progress(&self) -> bool {
-        !matches!(
-            self.next,
-            SecureJoinStep::Terminated | SecureJoinStep::Completed
-        )
-    }
 }

 /// Sends the requested handshake message to Alice.
--- a/src/sql.rs
+++ b/src/sql.rs
@@ -8,7 +8,7 @@ use rusqlite::{config::DbConfig, types::ValueRef, Connection, OpenFlags, Row};
 use tokio::sync::{Mutex, MutexGuard, RwLock};

 use crate::blob::BlobObject;
-use crate::chat::{self, add_device_msg, update_device_icon, update_saved_messages_icon};
+use crate::chat::{add_device_msg, update_device_icon, update_saved_messages_icon};
 use crate::config::Config;
 use crate::constants::DC_CHAT_ID_TRASH;
 use crate::context::Context;
@@ -289,23 +289,21 @@ impl Sql {
        let passphrase_nonempty = !passphrase.is_empty();
        if let Err(err) = self.try_open(context, &self.dbfile, passphrase).await {
            self.close().await;
-            return Err(err);
-        }
-        info!(context, "Opened database {:?}.", self.dbfile);
-        *self.is_encrypted.write().await = Some(passphrase_nonempty);
+            Err(err)
+        } else {
+            info!(context, "Opened database {:?}.", self.dbfile);
+            *self.is_encrypted.write().await = Some(passphrase_nonempty);

-        // setup debug logging if there is an entry containing its id
-        if let Some(xdc_id) = self
-            .get_raw_config_u32(Config::DebugLogging.as_ref())
-            .await?
-        {
-            set_debug_logging_xdc(context, Some(MsgId::new(xdc_id))).await?;
+            // setup debug logging if there is an entry containing its id
+            if let Some(xdc_id) = self
+                .get_raw_config_u32(Config::DebugLogging.as_ref())
+                .await?
+            {
+                set_debug_logging_xdc(context, Some(MsgId::new(xdc_id))).await?;
+            }
+
+            Ok(())
        }
-        chat::resume_securejoin_wait(context)
-            .await
-            .log_err(context)
-            .ok();
-        Ok(())
    }

    /// Changes the passphrase of encrypted database.
@@ -671,9 +669,10 @@ impl Sql {
 /// `passphrase` is the SQLCipher database passphrase.
 /// Empty string if database is not encrypted.
 fn new_connection(path: &Path, passphrase: &str) -> Result<Connection> {
-    let flags = OpenFlags::SQLITE_OPEN_NO_MUTEX
-        | OpenFlags::SQLITE_OPEN_READ_WRITE
-        | OpenFlags::SQLITE_OPEN_CREATE;
+    let mut flags = OpenFlags::SQLITE_OPEN_NO_MUTEX;
+    flags.insert(OpenFlags::SQLITE_OPEN_READ_WRITE);
+    flags.insert(OpenFlags::SQLITE_OPEN_CREATE);
+
    let conn = Connection::open_with_flags(path, flags)?;
    conn.execute_batch(
        "PRAGMA cipher_memory_security = OFF; -- Too slow on Android
--- a/src/sql/migrations.rs
+++ b/src/sql/migrations.rs
@@ -613,7 +613,6 @@ CREATE INDEX smtp_messageid ON imap(rfc724_mid);
        ).await?;
    }
    if dbversion < 93 {
-        // `sending_domains` is now unused, but was not removed for backwards compatibility.
        sql.execute_migration(
            "CREATE TABLE sending_domains(domain TEXT PRIMARY KEY, dkim_works INTEGER DEFAULT 0);",
            93,
--- a/src/stock_str.rs
+++ b/src/stock_str.rs
@@ -435,14 +435,6 @@ pub enum StockMessage {

    #[strum(props(fallback = "%1$s reacted %2$s to \"%3$s\""))]
    MsgReactedBy = 177,
-
-    #[strum(props(fallback = "Establishing guaranteed end-to-end encryption, please wait…"))]
-    SecurejoinWait = 190,
-
-    #[strum(props(
-        fallback = "Could not yet establish guaranteed end-to-end encryption, but you may already send a message."
-    ))]
-    SecurejoinWaitTimeout = 191,
 }

 impl StockMessage {
@@ -850,16 +842,6 @@ pub(crate) async fn secure_join_replies(context: &Context, contact_id: ContactId
        .replace1(&contact_id.get_stock_name(context).await)
 }

-/// Stock string: `Establishing guaranteed end-to-end encryption, please wait…`.
-pub(crate) async fn securejoin_wait(context: &Context) -> String {
-    translated(context, StockMessage::SecurejoinWait).await
-}
-
-/// Stock string: `Could not yet establish guaranteed end-to-end encryption, but you may already send a message.`.
-pub(crate) async fn securejoin_wait_timeout(context: &Context) -> String {
-    translated(context, StockMessage::SecurejoinWaitTimeout).await
-}
-
 /// Stock string: `Scan to chat with %1$s`.
 pub(crate) async fn setup_contact_qr_description(
    context: &Context,
--- a/src/tests/verified_chats.rs
+++ b/src/tests/verified_chats.rs
@@ -376,7 +376,7 @@ async fn test_old_message_2() -> Result<()> {
        SystemMessage::ChatProtectionEnabled
    );

-    // This creates protection-changed info message #2 with `timestamp_sort` greater by 1.
+    // This creates protection-changed info message #2.
    let first_email = receive_imf(
        &alice,
        b"From: Bob <bob@example.net>\n\
@@ -390,7 +390,8 @@ async fn test_old_message_2() -> Result<()> {
    .await?
    .unwrap();

-    // Both messages will get the same timestamp, so this one will be sorted under the previous one
+    // Both messages will get the same timestamp as the protection-changed
+    // message, so this one will be sorted under the previous one
    // even though it has an older timestamp.
    let second_email = receive_imf(
        &alice,
@@ -406,10 +407,7 @@ async fn test_old_message_2() -> Result<()> {
    .unwrap();

    assert_eq!(first_email.sort_timestamp, second_email.sort_timestamp);
-    assert_eq!(
-        first_email.sort_timestamp,
-        protection_msg.timestamp_sort + 1
-    );
+    assert_eq!(first_email.sort_timestamp, protection_msg.timestamp_sort);

    alice.golden_test_chat(chat.id, "test_old_message_2").await;

--- a/src/token.rs
+++ b/src/token.rs
@@ -93,14 +93,14 @@ pub async fn lookup_or_new(
    context: &Context,
    namespace: Namespace,
    foreign_id: Option<ChatId>,
-) -> Result<String> {
-    if let Some(token) = lookup(context, namespace, foreign_id).await? {
-        return Ok(token);
+) -> String {
+    if let Ok(Some(token)) = lookup(context, namespace, foreign_id).await {
+        return token;
    }

    let token = create_id();
-    save(context, namespace, foreign_id, &token).await?;
-    Ok(token)
+    save(context, namespace, foreign_id, &token).await.ok();
+    token
 }

 pub async fn exists(context: &Context, namespace: Namespace, token: &str) -> Result<bool> {
--- a/src/tools.rs
+++ b/src/tools.rs
@@ -735,7 +735,7 @@ Message-ID: 2dfdbde7@example.org
 Hop: From: localhost; By: hq5.merlinux.eu; Date: Sat, 14 Sep 2019 17:00:22 +0000
 Hop: From: hq5.merlinux.eu; By: hq5.merlinux.eu; Date: Sat, 14 Sep 2019 17:00:25 +0000

-DKIM Results: Passed=true";
+DKIM Results: Passed=true, Works=true, Allow_Keychange=true";
        check_parse_receive_headers_integration(raw, expected).await;

        let raw = include_bytes!("../test-data/message/encrypted_with_received_headers.eml");
@@ -754,7 +754,7 @@ Hop: From: [127.0.0.1]; By: mail.example.org; Date: Mon, 27 Dec 2021 11:21:21 +0
 Hop: From: mout.example.org; By: hq5.example.org; Date: Mon, 27 Dec 2021 11:21:22 +0000
 Hop: From: hq5.example.org; By: hq5.example.org; Date: Mon, 27 Dec 2021 11:21:22 +0000

-DKIM Results: Passed=true";
+DKIM Results: Passed=true, Works=true, Allow_Keychange=true";
        check_parse_receive_headers_integration(raw, expected).await;
    }
Author	SHA1	Message	Date
link2xt	ae4202a7aa	Update flake.lock	2024-05-04 22:05:45 +00:00
link2xt	6b952690a0	Switch nixpkgs to darwin-cross branch	2024-05-04 22:04:13 +00:00
link2xt	90f70b6e7d	ci: build macOS deltachat-rpc-server with Nix	2024-05-04 22:03:47 +00:00
link2xt	f417effa81	build(nix): allow cross-compilation for darwin	2024-05-04 22:03:44 +00:00
@@ -1 +1 @@
 -05-15
 -04-24