--wip-- [skip ci]

Make parsing of name, addr, and timestamp work
Add basic parsing code
2026-10-17 02:13:01 +03:00 · 2024-04-24 16:45:44 +02:00 · 2024-04-19 23:07:12 +02:00 · 2024-04-16 19:11:15 +02:00
72 changed files with 875 additions and 2204 deletions
@@ -24,7 +24,7 @@ jobs:
    name: Lint Rust
    runs-on: ubuntu-latest
    env:
-      RUSTUP_TOOLCHAIN: 1.78.0
+      RUSTUP_TOOLCHAIN: 1.77.1
    steps:
      - uses: actions/checkout@v4
        with:
@@ -83,11 +83,11 @@ jobs:
      matrix:
        include:
          - os: ubuntu-latest
-            rust: 1.78.0
-          - os: windows-2019
-            rust: 1.78.0
+            rust: 1.77.1
+          - os: windows-latest
+            rust: 1.77.1
          - os: macos-latest
-            rust: 1.78.0
+            rust: 1.77.1

          # Minimum Supported Rust Version = 1.77.0
          - os: ubuntu-latest
@@ -4,7 +4,6 @@ on:
  push:
    branches:
      - main
-      - build_jsonrpc_docs_ci

 jobs:
  build-rs:
@@ -18,11 +17,13 @@ jobs:
        run: |
          cargo doc --package deltachat --no-deps --document-private-items
      - name: Upload to rs.delta.chat
-        run: |
-          mkdir -p "$HOME/.ssh"
-          echo "${{ secrets.KEY }}" > "$HOME/.ssh/key"
-          chmod 600 "$HOME/.ssh/key"
-          rsync -avzh -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/target/doc "${{ secrets.USERNAME }}@rs.delta.chat:/var/www/html/rs/"
+        uses: up9cloud/action-rsync@v1.3
+        env:
+          USER: ${{ secrets.USERNAME }}
+          KEY: ${{ secrets.KEY }}
+          HOST: "delta.chat"
+          SOURCE: "target/doc"
+          TARGET: "/var/www/html/rs/"

  build-python:
    runs-on: ubuntu-latest
@@ -61,31 +62,3 @@ jobs:
          echo "${{ secrets.CODESPEAK_KEY }}" > "$HOME/.ssh/key"
          chmod 600 "$HOME/.ssh/key"
          rsync -avzh -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/result/html/ "delta@c.delta.chat:/home/delta/build-c/master"
-
-  build-ts:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./deltachat-jsonrpc/typescript
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          fetch-depth: 0 # Fetch history to calculate VCS version number.
-      - name: Use Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: '18'
-      - name: npm install
-        run: npm install
-      - name: npm run build
-        run: npm run build
-      - name: Run docs script
-        run: npm run docs
-      - name: Upload to js.jsonrpc.delta.chat
-        run: |
-          mkdir -p "$HOME/.ssh"
-          echo "${{ secrets.KEY }}" > "$HOME/.ssh/key"
-          chmod 600 "$HOME/.ssh/key"
-          rsync -avzh -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/deltachat-jsonrpc/typescript/docs/ "${{ secrets.USERNAME }}@js.jsonrpc.delta.chat:/var/www/html/js-jsonrpc/"
@@ -1,114 +1,5 @@
 # Changelog

-## [1.137.4] - 2024-04-24
-
-### API-Changes
-
- [**breaking**] Remove `Stream` implementation for `EventEmitter`.
- Experimental Webxdc Integration API, Maps Integration ([#5461](https://github.com/deltachat/deltachat-core-rust/pull/5461)).
-
-### Features / Changes
-
- Add progressive backoff for failing IMAP connection attempts ([#5443](https://github.com/deltachat/deltachat-core-rust/pull/5443)).
- Replace event channel with broadcast channel.
- Mark contact request messages as seen on IMAP.
-
-### Fixes
-
- Convert images to RGB8 (without alpha) before encoding into JPEG to fix sending of large RGBA images.
- Don't set `is_bot` for webxdc status updates ([#5445](https://github.com/deltachat/deltachat-core-rust/pull/5445)).
- Do not fail if Autocrypt Setup Message has no encryption preference to fix key transfer from K-9 Mail to Delta Chat.
- Use only CRLF in Autocrypt Setup Message.
- python: Use cached message object if `dc_get_msg()` returns `NULL`.
- python: `Message::is_outgoing`: Don't reload message from db.
- python: `_map_ffi_event`: Always check if `get_message_by_id()` returned None.
- node: Undefine `NAPI_EXPERIMENTAL` to fix build with new clang.
-
-### Build system
-
- nix: Add `imap-tools` as `deltachat-rpc-client` dependency.
- nix: Add `./deltachat-contact-tools` to sources.
- nix: Update nix flake.
- deps: Update rustls to 0.21.11.
-
-### Documentation
-
- Update references to SecureJoin protocols.
- Fix broken references in documentation comments.
-
-### Refactor
-
- imap: remove `RwLock` from `ratelimit`.
- deltachat-ffi: Remove unused `ResultNullableExt`.
- Remove duplicate clippy exceptions.
- Group `use` at the top of the test modules.
-
-## [1.137.3] - 2024-04-16
-
-### API-Changes
-
- [**breaking**] Remove reactions ffi; all implementations use jsonrpc.
- Don't load trashed messages with `Message::load_from_db`.
- Add `ChatListChanged` and `ChatListItemChanged` events ([#4476](https://github.com/deltachat/deltachat-core-rust/pull/4476)).
- deltachat-rpc-client: Add `check_qr` and `set_config_from_qr` APIs.
- deltachat-rpc-client: Add `Account.create_chat()`.
- deltachat-rpc-client: Add `Message.wait_until_delivered()`.
- deltachat-rpc-client: Add `Chat.send_file()`.
- deltachat-rpc-client: Add `Account.wait_for_reactions_changed()`.
- deltachat-rpc-client: Return Message from `Message.send_reaction()`.
- deltachat-rpc-client: Add `Account.bring_online()`.
- deltachat-rpc-client: Add `ACFactory.get_accepted_chat()`.
-
-### Features / Changes
-
- Port `direct_imap.py` into deltachat-rpc-client.
-
-### Fixes
-
- Do not emit `MSGS_CHANGED` event for outgoing hidden messages.
- `Message::get_summary()` must not return reaction summary.
- Fix emitting `ContactsChanged` events on "recently seen" status change ([#5377](https://github.com/deltachat/deltachat-core-rust/pull/5377)).
- deltachat-jsonrpc: block in `inner_get_backup_qr`.
- Add tolerance to `MemberListTimestamp` ([#5366](https://github.com/deltachat/deltachat-core-rust/pull/5366)).
- Keep webxdc instance for `delete_device_after` period after a status update ([#5365](https://github.com/deltachat/deltachat-core-rust/pull/5365)).
- Don't try to do `fetch_move_delete()` if Trash is needed but not yet configured.
- Assign messages to chats based on not fully downloaded references.
- Do not create ad-hoc groups from partial downloads.
- deltachat-rpc-client: construct Thread with `target` keyword argument.
- Format error context in `Message::load_from_db`.
-
-### Build system
-
- cmake: adapt target install path if env var `CARGO_BUILD_TARGET` is set.
- nix: Use stable Rust in flake.nix devshell.
-
-### CI
-
- Use cargo-nextest instead of cargo-test.
- Run doc tests with cargo test --workspace --doc ([#5459](https://github.com/deltachat/deltachat-core-rust/pull/5459)).
- Typos in CI files ([#5453](https://github.com/deltachat/deltachat-core-rust/pull/5453)).
-
-### Documentation
-
- Add <https://deps.rs> badge.
- Add 'Ubuntu Touch' to the list of 'frontend projects'
-
-### Refactor
-
- Do not ignore `Contact::get_by_id` errors in `get_encrinfo`.
- deltachat-rpc-client: Use `list`, `set` and `tuple` instead of `typing`.
- Use `clone_from()` ([#5451](https://github.com/deltachat/deltachat-core-rust/pull/5451)).
- Do not check for `is_trash()` in `get_last_reaction_if_newer_than()`.
- Split off functional contact tools into its own crate ([#5444](https://github.com/deltachat/deltachat-core-rust/pull/5444))
- Fix nightly clippy warnings.
-
-### Tests
-
- Test withdrawing group join QR codes.
- `display_chat()`: Don't add day markers.
- Move reaction tests to JSON-RPC.
- node: Increase 'static tests' timeout to 5 minutes.
-
 ## [1.137.2] - 2024-04-05

 ### API-Changes
@@ -3981,5 +3872,3 @@ https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed
 [1.137.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.136.6...v1.137.0
 [1.137.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.137.0...v1.137.1
 [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
@@ -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",
 ]
@@ -227,18 +227,6 @@ dependencies = [
 "syn 1.0.109",
 ]

-[[package]]
-name = "async-broadcast"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb"
-dependencies = [
- "event-listener 5.2.0",
- "event-listener-strategy",
- "futures-core",
- "pin-project-lite",
-]
-
 [[package]]
 name = "async-channel"
 version = "1.9.0"
@@ -252,9 +240,9 @@ dependencies = [

 [[package]]
 name = "async-channel"
-version = "2.2.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928"
+checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3"
 dependencies = [
 "concurrent-queue",
 "event-listener 5.2.0",
@@ -282,7 +270,7 @@ version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98892ebee4c05fc66757e600a7466f0d9bfcde338f645d64add323789f26cb36"
 dependencies = [
- "async-channel 2.2.1",
+ "async-channel 2.2.0",
 "base64 0.21.7",
 "bytes",
 "chrono",
@@ -344,7 +332,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.57",
 ]

 [[package]]
@@ -478,9 +466,9 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"

 [[package]]
 name = "base64"
-version = "0.22.1"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51"

 [[package]]
 name = "base64ct"
@@ -724,9 +712,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 +1047,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.57",
 ]

 [[package]]
@@ -1134,9 +1122,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,18 +1145,17 @@ dependencies = [

 [[package]]
 name = "deltachat"
-version = "1.137.4"
+version = "1.137.2"
 dependencies = [
 "ansi_term",
 "anyhow",
- "async-broadcast",
- "async-channel 2.2.1",
+ "async-channel 2.2.0",
 "async-imap",
 "async-native-tls",
 "async-smtp",
 "async_zip",
 "backtrace",
- "base64 0.22.1",
+ "base64 0.22.0",
 "brotli",
 "chrono",
 "criterion",
@@ -1202,6 +1189,7 @@ dependencies = [
 "parking_lot",
 "percent-encoding",
 "pgp",
+ "pin-project",
 "pretty_assertions",
 "pretty_env_logger",
 "proptest",
@@ -1243,6 +1231,7 @@ version = "0.0.0"
 dependencies = [
 "anyhow",
 "chrono",
+ "ical",
 "once_cell",
 "regex",
 "rusqlite",
@@ -1250,12 +1239,12 @@ dependencies = [

 [[package]]
 name = "deltachat-jsonrpc"
-version = "1.137.4"
+version = "1.137.2"
 dependencies = [
 "anyhow",
- "async-channel 2.2.1",
+ "async-channel 2.2.0",
 "axum",
- "base64 0.22.1",
+ "base64 0.22.0",
 "deltachat",
 "env_logger 0.11.3",
 "futures",
@@ -1274,7 +1263,7 @@ dependencies = [

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

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

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

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

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

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

 [[package]]
@@ -2575,6 +2564,15 @@ dependencies = [
 "cc",
 ]

+[[package]]
+name = "ical"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b7cab7543a8b7729a19e2c04309f902861293dcdae6558dfbeb634454d279f6"
+dependencies = [
+ "thiserror",
+]
+
 [[package]]
 name = "idea"
 version = "0.5.1"
@@ -2639,9 +2637,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",
 ]
@@ -2907,9 +2905,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 +3165,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.57",
 ]

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

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

 [[package]]
@@ -3531,7 +3529,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.57",
 ]

 [[package]]
@@ -3748,9 +3746,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",
 ]
@@ -3861,9 +3859,9 @@ dependencies = [

 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
 "proc-macro2",
 ]
@@ -4291,9 +4289,9 @@ dependencies = [

 [[package]]
 name = "rustls"
-version = "0.21.11"
+version = "0.21.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4"
+checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba"
 dependencies = [
 "ring 0.17.8",
 "rustls-webpki",
@@ -4395,9 +4393,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 +4405,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]]
@@ -4501,9 +4499,9 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.200"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
 dependencies = [
 "serde_derive",
 ]
@@ -4528,24 +4526,24 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.200"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 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]]
@@ -4819,7 +4817,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "rustversion",
- "syn 2.0.60",
+ "syn 2.0.57",
 ]

 [[package]]
@@ -4841,9 +4839,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",
@@ -4963,22 +4961,22 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "1.0.59"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa"
+checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.59"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
+checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.57",
 ]

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

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

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

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

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

 [[package]]
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.137.4"
+version = "1.137.2"
 edition = "2021"
 license = "MPL-2.0"
 rust-version = "1.77"
@@ -39,8 +39,7 @@ format-flowed = { path = "./format-flowed" }
 ratelimit = { path = "./deltachat-ratelimit" }

 anyhow = { workspace = true }
-async-broadcast = "0.7.0"
-async-channel = "2.2.1"
+async-channel = "2.0.0"
 async-imap = { version = "0.9.7", default-features = false, features = ["runtime-tokio"] }
 async-native-tls = { version = "0.5", default-features = false, features = ["runtime-tokio"] }
 async-smtp = { version = "0.9", default-features = false, features = ["runtime-tokio"] }
@@ -64,7 +63,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"
@@ -73,6 +72,7 @@ once_cell = { workspace = true }
 percent-encoding = "2.3"
 parking_lot = "0.12"
 pgp = { version = "0.11", default-features = false }
+pin-project = "1"
 pretty_env_logger = { version = "0.5", optional = true }
 qrcodegen = "1.7.0"
 quick-xml = "0.31"
@@ -169,7 +169,7 @@ 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"] }
+chrono = { version = "0.4.37", default-features=false, features = ["clock", "std"] }

 [features]
 default = ["vendored"]
@@ -4,6 +4,7 @@ version = "0.0.0" # No semver-stable versioning
 edition = "2021"
 description = "Contact-related tools, like parsing vcards and sanitizing name and address. Meant for internal use in the deltachat crate."
 license = "MPL-2.0"
+# 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

@@ -13,6 +14,7 @@ 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 }
+ical = { version = "0.11.0", default-features = false, features = ["vcard"] }

 [dev-dependencies]
 anyhow = { workspace = true, features = ["backtrace"] } # Enable `backtrace` feature in tests.
@@ -31,7 +31,7 @@ use std::ops::Deref;
 use anyhow::bail;
 use anyhow::Context as _;
 use anyhow::Result;
-use chrono::{DateTime, NaiveDateTime};
+use chrono::DateTime;
 use once_cell::sync::Lazy;
 use regex::Regex;

@@ -39,166 +39,66 @@ use regex::Regex;
 // - 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>,
+#[derive(Debug, Default)]
+pub struct Contact {
+    addr: String,
+    display_name: String,
+    key: String,
+    profile_photo: String,
+    timestamp: 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())
-    }
+pub fn parse_vcard(vcard: String) -> Result<Vec<Contact>> {
+    let reader = ical::VcardParser::new(vcard.as_bytes());

-    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;
-            }
-        }
+    for vcard_contact in reader {
+        let vcard_contact = vcard_contact?; // TODO should just continue with the next contact
+        let mut new_contact = Contact::default();

        let mut display_name = None;
        let mut addr = None;
        let mut key = None;
        let mut photo = None;
-        let mut datetime = None;
+        let mut timestamp = 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;
+        for property in vcard_contact.properties {
+            match &*property.name.to_lowercase() {
+                "email" => addr = addr.or(property.value),
+                "fn" => display_name = display_name.or(property.value),
+                "key" => key = key.or(dbg!(property).value), // TODO hmmm, the ical crate can apparently only parse version 3.0
+                "photo" => photo = photo.or(property.value),
+                "rev" => {
+                    timestamp = timestamp.or(property.value);
+                }
+                _ => {}
            }
        }

        let (display_name, addr) =
-            sanitize_name_and_addr(display_name.unwrap_or(""), addr.unwrap_or(""));
+            sanitize_name_and_addr(&display_name.unwrap_or_default(), &addr.unwrap_or_default());
+        new_contact.display_name = display_name;
+        new_contact.addr = addr;

-        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),
-        });
+        if let Some(key) = key {
+            if let Some(base64_key) = key
+                .strip_prefix("PGP;ENCODING=BASE64:")
+                .or(key.strip_prefix("TYPE=PGP;ENCODING=b:"))
+                .or(key.strip_prefix("data:application/pgp-keys;base64,"))
+            {
+                new_contact.key = base64_key.to_string();
+            }
+        }
+
+        if let Some(photo) = photo {
+            if let Some(base64_photo) = photo
+                .strip_prefix("PGP;ENCODING=BASE64:")
+                .or(photo.strip_prefix("TYPE=PGP;ENCODING=b:"))
+                .or(photo.strip_prefix("data:application/pgp-keys;base64,"))
+            {}
+        }
+
+        contacts.push(new_contact);
    }

    Ok(contacts)
@@ -410,12 +310,10 @@ impl rusqlite::types::ToSql for EmailAddress {

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

    #[test]
-    fn test_vcard_thunderbird() {
+    fn test_thunderbird() {
        let contacts = parse_vcard(
            "BEGIN:VCARD
 VERSION:4.0
@@ -429,27 +327,26 @@ FN:'bobzzz@freenet.de'
 EMAIL;PREF=1:bobzzz@freenet.de
 UID:cac4fef4-6351-4854-bbe4-9b6df857eaed
 END:VCARD
-",
+"
+            .to_string(),
        )
        .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[0].key, "".to_string());
+        assert_eq!(contacts[0].profile_photo, "".to_string());

        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[1].key, "".to_string());
+        assert_eq!(contacts[1].profile_photo, "".to_string());

        assert_eq!(contacts.len(), 2);
    }

    #[test]
-    fn test_vcard_simple_example() {
+    fn test_simple_example() {
        let contacts = parse_vcard(
            "BEGIN:VCARD
 VERSION:4.0
@@ -460,55 +357,20 @@ EMAIL;TYPE=work:alice@example.com
 KEY;TYPE=PGP;ENCODING=b:[base64-data]
 REV:20240418T184242Z

-END:VCARD",
+END:VCARD"
+                .to_string(),
        )
        .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[0].key, "[base64-data]".to_string());
+        assert_eq!(contacts[0].profile_photo, "".to_string());
+        assert_eq!(contacts[0].timestamp, 1713465762); // I did not check whether this timestamp is correct

        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";
@@ -556,7 +418,7 @@ END:VCARD",
    }

    #[test]
-    fn test_vcard_android() {
+    fn test_android_contact_export() {
        let contacts = parse_vcard(
            "BEGIN:VCARD
 VERSION:2.1
@@ -571,45 +433,21 @@ N:;Alice;;;
 FN:Alice
 EMAIL;HOME:alice@example.org
 END:VCARD
-",
+"
+            .to_string(),
        )
        .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[0].key, "".to_string());
+        assert_eq!(contacts[0].profile_photo, "".to_string());

        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[1].key, "".to_string());
+        assert_eq!(contacts[1].profile_photo, "".to_string());

        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()
-        );
-    }
 }
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.137.4"
+version = "1.137.2"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
@@ -362,12 +362,8 @@ uint32_t        dc_get_id                    (dc_context_t* context);
 *     Must be freed using dc_event_emitter_unref() after usage.
 *
 * Note: Use only one event emitter per context.
- * The result of having multiple event emitters is unspecified.
- * Currently events are broadcasted to all existing event emitters,
- * but previous versions delivered events to only one event emitter
- * and this behavior may change again in the future.
- * Events emitted before creation of event emitter
- * may or may not be available to event emitter.
+ * Having more than one event emitter running at the same time on the same context
+ * will result in events being randomly delivered to one of the emitters.
 */
 dc_event_emitter_t* dc_get_event_emitter(dc_context_t* context);

@@ -1182,65 +1178,6 @@ int dc_send_webxdc_status_update (dc_context_t* context, uint32_t msg_id, const
 */
 char* dc_get_webxdc_status_updates (dc_context_t* context, uint32_t msg_id, uint32_t serial);

-
-/**
- * Set Webxdc file as integration.
- * see dc_init_webxdc_integration() for more details about Webxdc integrations.
- *
- * @warning This is an experimental API which may change in the future
- *
- * @memberof dc_context_t
- * @param context The context object.
- * @param file The .xdc file to use as Webxdc integration.
- */
-void             dc_set_webxdc_integration (dc_context_t* context, const char* file);
-
-
-/**
- * Init a Webxdc integration.
- *
- * A Webxdc integration is
- * a Webxdc showing a map, getting locations via setUpdateListener(), setting POIs via sendUpdate();
- * core takes eg. care of feeding locations to the Webxdc or sending the data out.
- *
- * @warning This is an experimental API, esp. support of integration types (eg. image editor, tools) is left out for simplicity
- *
- * Currently, Webxdc integrations are .xdc files shipped together with the main app.
- * Before dc_init_webxdc_integration() can be called,
- * UI has to call dc_set_webxdc_integration() to define a .xdc file to be used as integration.
- *
- * dc_init_webxdc_integration() returns a Webxdc message ID that
- * UI can open and use mostly as usual.
- *
- * Concrete behaviour and status updates depend on the integration, driven by UI needs.
- *
- * There is no need to de-initialize the integration,
- * however, unless documented otherwise,
- * the integration is valid only as long as not re-initialized
- * In other words, UI must not have a Webxdc with the same integration open twice.
- *
- * Example:
- *
- * ~~~
- * // Define a .xdc file to be used as maps integration
- * dc_set_webxdc_integration(context, path_to_maps_xdc);
- *
- * // Integrate the map to a chat, the map will show locations for this chat then:
- * uint32_t webxdc_instance = dc_init_webxdc_integration(context, any_chat_id);
- *
- * // Or use the Webxdc as a global map, showing locations of all chats:
- * uint32_t webxdc_instance = dc_init_webxdc_integration(context, 0);
- * ~~~
- *
- * @memberof dc_context_t
- * @param context The context object.
- * @param chat_id The chat to get the integration for.
- * @return ID of the message that refers to the Webxdc instance.
- *     UI can open a Webxdc as usual with this instance.
- */
-uint32_t        dc_init_webxdc_integration    (dc_context_t* context, uint32_t chat_id);
-
-
 /**
 * Save a draft for a chat in the database.
 *
@@ -2608,7 +2545,7 @@ dc_lot_t*       dc_check_qr                  (dc_context_t* context, const char*
 *     the Verified-Group-Invite protocol is offered in the QR code;
 *     works for protected groups as well as for normal groups.
 *     If set to 0, the Setup-Contact protocol is offered in the QR code.
- *     See https://securejoin.delta.chat/
+ *     See https://securejoin.readthedocs.io/en/latest/new.html
 *     for details about both protocols.
 * @return The text that should go to the QR code,
 *     On errors, an empty QR code is returned, NULL is never returned.
@@ -2644,7 +2581,8 @@ char*           dc_get_securejoin_qr_svg         (dc_context_t* context, uint32_
 *
 * Subsequent calls of dc_join_securejoin() will abort previous, unfinished handshakes.
 *
- * See https://securejoin.delta.chat/ for details about both protocols.
+ * See https://securejoin.readthedocs.io/en/latest/new.html
+ * for details about both protocols.
 *
 * @memberof dc_context_t
 * @param context The context object.
@@ -4105,19 +4043,6 @@ char*           dc_msg_get_subject            (const dc_msg_t* msg);
 char*           dc_msg_get_file               (const dc_msg_t* msg);


-/**
- * Save file copy at the user-provided path.
- *
- * Fails if file already exists at the provided path.
- *
- * @memberof dc_msg_t
- * @param msg The message object.
- * @param path Destination file path with filename and extension.
- * @return 0 on failure, 1 on success.
- */
-int             dc_msg_save_file              (const dc_msg_t* msg, const char* path);
-
-
 /**
 * Get an original attachment filename, with extension but without the path. To get the full path,
 * use dc_msg_get_file().
@@ -4182,6 +4107,7 @@ char*             dc_msg_get_webxdc_blob      (const dc_msg_t* msg, const char*
 *   true if the Webxdc should get full internet access, including Webrtc.
 *   currently, this is only true for encrypted Webxdc's in the self chat
 *   that have requested internet access in the manifest.
+ *   this is useful for development and maybe for internal integrations at some point.
 *
 * @memberof dc_msg_t
 * @param msg The webxdc instance.
@@ -4390,9 +4316,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.
@@ -3,6 +3,8 @@
    non_camel_case_types,
    non_snake_case,
    non_upper_case_globals,
+    non_upper_case_globals,
+    non_camel_case_types,
    clippy::missing_safety_doc,
    clippy::expect_fun_call
 )]
@@ -1063,43 +1065,6 @@ pub unsafe extern "C" fn dc_get_webxdc_status_updates(
    .strdup()
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_set_webxdc_integration(
-    context: *mut dc_context_t,
-    file: *const libc::c_char,
-) {
-    if context.is_null() || file.is_null() {
-        eprintln!("ignoring careless call to dc_set_webxdc_integration()");
-        return;
-    }
-    let ctx = &*context;
-    block_on(ctx.set_webxdc_integration(&to_string_lossy(file)))
-        .log_err(ctx)
-        .unwrap_or_default();
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_init_webxdc_integration(
-    context: *mut dc_context_t,
-    chat_id: u32,
-) -> u32 {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_init_webxdc_integration()");
-        return 0;
-    }
-    let ctx = &*context;
-    let chat_id = if chat_id == 0 {
-        None
-    } else {
-        Some(ChatId::new(chat_id))
-    };
-
-    block_on(ctx.init_webxdc_integration(chat_id))
-        .log_err(ctx)
-        .map(|msg_id| msg_id.map(|id| id.to_u32()).unwrap_or_default())
-        .unwrap_or(0)
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_set_draft(
    context: *mut dc_context_t,
@@ -2045,7 +2010,7 @@ pub unsafe extern "C" fn dc_get_msg(context: *mut dc_context_t, msg_id: u32) ->
                    );
                    message::Message::default()
                } else {
-                    warn!(ctx, "dc_get_msg could not retrieve msg_id {msg_id}: {e:#}");
+                    error!(ctx, "dc_get_msg could not retrieve msg_id {msg_id}: {e:#}");
                    return ptr::null_mut();
                }
            }
@@ -3368,34 +3333,6 @@ pub unsafe extern "C" fn dc_msg_get_file(msg: *mut dc_msg_t) -> *mut libc::c_cha
        .unwrap_or_else(|| "".strdup())
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_msg_save_file(
-    msg: *mut dc_msg_t,
-    path: *const libc::c_char,
-) -> libc::c_int {
-    if msg.is_null() || path.is_null() {
-        eprintln!("ignoring careless call to dc_msg_save_file()");
-        return 0;
-    }
-    let ffi_msg = &*msg;
-    let ctx = &*ffi_msg.context;
-    let path = to_string_lossy(path);
-    let r = block_on(
-        ffi_msg
-            .message
-            .save_file(ctx, &std::path::PathBuf::from(path)),
-    );
-    match r {
-        Ok(()) => 1,
-        Err(_) => {
-            r.context("Failed to save file from message")
-                .log_err(ctx)
-                .unwrap_or_default();
-            0
-        }
-    }
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_msg_get_filename(msg: *mut dc_msg_t) -> *mut libc::c_char {
    if msg.is_null() {
@@ -4471,6 +4408,19 @@ where
    }
 }

+trait ResultNullableExt<T> {
+    fn into_raw(self) -> *mut T;
+}
+
+impl<T, E> ResultNullableExt<T> for Result<T, E> {
+    fn into_raw(self) -> *mut T {
+        match self {
+            Ok(t) => Box::into_raw(Box::new(t)),
+            Err(_) => ptr::null_mut(),
+        }
+    }
+}
+
 fn convert_and_prune_message_ids(msg_ids: *const u32, msg_cnt: libc::c_int) -> Vec<MsgId> {
    let ids = unsafe { std::slice::from_raw_parts(msg_ids, msg_cnt as usize) };
    let msg_ids: Vec<MsgId> = ids
@@ -4950,9 +4900,7 @@ mod jsonrpc {
        }

        let account_manager = &*account_manager;
-        let cmd_api = block_on(deltachat_jsonrpc::api::CommandApi::from_arc(
-            account_manager.inner.clone(),
-        ));
+        let cmd_api = deltachat_jsonrpc::api::CommandApi::from_arc(account_manager.inner.clone());

        let (request_handle, receiver) = RpcClient::new();
        let handle = RpcSession::new(request_handle, cmd_api);
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.137.4"
+version = "1.137.2"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
 default-run = "deltachat-jsonrpc-server"
@@ -16,11 +16,11 @@ 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"
-async-channel = { version = "2.2.1" }
+async-channel = { version = "2.0.0" }
 futures = { version = "0.3.30" }
 serde_json = "1"
 yerpc = { version = "0.5.2", features = ["anyhow_expose", "openrpc"] }
@@ -1,5 +1,4 @@
 use std::collections::BTreeMap;
-use std::path::Path;
 use std::sync::Arc;
 use std::time::Duration;
 use std::{collections::HashMap, str::FromStr};
@@ -30,7 +29,6 @@ use deltachat::reaction::{get_msg_reactions, send_reaction};
 use deltachat::securejoin;
 use deltachat::stock_str::StockMessage;
 use deltachat::webxdc::StatusUpdateSerial;
-use deltachat::EventEmitter;
 use sanitize_filename::is_sanitized;
 use tokio::fs;
 use tokio::sync::{watch, Mutex, RwLock};
@@ -83,30 +81,21 @@ impl Default for AccountState {
 pub struct CommandApi {
    pub(crate) accounts: Arc<RwLock<Accounts>>,

-    /// Receiver side of the event channel.
-    ///
-    /// Events from it can be received by calling `get_next_event` method.
-    event_emitter: Arc<EventEmitter>,
-
    states: Arc<Mutex<BTreeMap<u32, AccountState>>>,
 }

 impl CommandApi {
    pub fn new(accounts: Accounts) -> Self {
-        let event_emitter = Arc::new(accounts.get_event_emitter());
        CommandApi {
            accounts: Arc::new(RwLock::new(accounts)),
-            event_emitter,
            states: Arc::new(Mutex::new(BTreeMap::new())),
        }
    }

    #[allow(dead_code)]
-    pub async fn from_arc(accounts: Arc<RwLock<Accounts>>) -> Self {
-        let event_emitter = Arc::new(accounts.read().await.get_event_emitter());
+    pub fn from_arc(accounts: Arc<RwLock<Accounts>>) -> Self {
        CommandApi {
            accounts,
-            event_emitter,
            states: Arc::new(Mutex::new(BTreeMap::new())),
        }
    }
@@ -169,7 +158,8 @@ impl CommandApi {

    /// Get the next event.
    async fn get_next_event(&self) -> Result<Event> {
-        self.event_emitter
+        let event_emitter = self.accounts.read().await.get_event_emitter();
+        event_emitter
            .recv()
            .await
            .map(|event| event.into())
@@ -700,7 +690,8 @@ impl CommandApi {
    ///     the Verified-Group-Invite protocol is offered in the QR code;
    ///     works for protected groups as well as for normal groups.
    ///     If not set, the Setup-Contact protocol is offered in the QR code.
-    ///     See https://securejoin.delta.chat/ for details about both protocols.
+    ///     See https://securejoin.readthedocs.io/en/latest/new.html
+    ///     for details about both protocols.
    ///
    /// return format: `[code, svg]`
    async fn get_chat_securejoin_qr_code_svg(
@@ -728,7 +719,8 @@ impl CommandApi {
    ///
    /// Subsequent calls of `secure_join()` will abort previous, unfinished handshakes.
    ///
-    /// See https://securejoin.delta.chat/ for details about both protocols.
+    /// See https://securejoin.readthedocs.io/en/latest/new.html
+    /// for details about both protocols.
    ///
    /// **qr**: The text of the scanned QR code. Typically, the same string as given
    ///     to `check_qr()`.
@@ -1771,29 +1763,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.
@@ -1902,15 +1871,6 @@ impl CommandApi {
        Ok(can_send)
    }

-    /// Saves a file copy at the user-provided path.
-    ///
-    /// Fails if file already exists at the provided path.
-    async fn save_msg_file(&self, account_id: u32, msg_id: u32, path: String) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        let message = Message::load_from_db(&ctx, MsgId::new(msg_id)).await?;
-        message.save_file(&ctx, Path::new(&path)).await
-    }
-
    // ---------------------------------------------
    //           functions for the composer
    //    the composer is the message input field
@@ -1983,21 +1943,19 @@ impl CommandApi {
        );
        let destination_path = account_folder.join("stickers").join(collection);
        fs::create_dir_all(&destination_path).await?;
-        let file = message.get_filename().context("no file?")?;
-        message
-            .save_file(
-                &ctx,
-                &destination_path.join(format!(
-                    "{}.{}",
-                    msg_id,
-                    Path::new(&file)
-                        .extension()
-                        .unwrap_or_default()
-                        .to_str()
-                        .unwrap_or_default()
-                )),
-            )
-            .await?;
+        let file = message.get_file(&ctx).context("no file")?;
+        fs::copy(
+            &file,
+            destination_path.join(format!(
+                "{}.{}",
+                msg_id,
+                file.extension()
+                    .unwrap_or_default()
+                    .to_str()
+                    .unwrap_or_default()
+            )),
+        )
+        .await?;
        Ok(())
    }

@@ -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,
@@ -53,5 +53,5 @@
  },
  "type": "module",
  "types": "dist/deltachat.d.ts",
-  "version": "1.137.4"
+  "version": "1.137.2"
 }
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-repl"
-version = "1.137.4"
+version = "1.137.2"
 license = "MPL-2.0"
 edition = "2021"
 repository = "https://github.com/deltachat/deltachat-core-rust"
@@ -4,7 +4,6 @@
 it will echo back any text send to it, it also will print to console all Delta Chat core events.
 Pass --help to the CLI to see available options.
 """
-
 from deltachat_rpc_client import events, run_bot_cli

 hooks = events.HookCollection()
@@ -3,7 +3,6 @@

 it will echo back any message that has non-empty text and also supports the /help command.
 """
-
 import logging
 import sys
 from threading import Thread
@@ -2,7 +2,6 @@
 """
 Example echo bot without using hooks
 """
-
 import logging
 import sys

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

 [project]
 name = "deltachat-rpc-client"
-version = "1.137.4"
+version = "1.137.2"
 description = "Python client for Delta Chat core JSON-RPC interface"
 classifiers = [
    "Development Status :: 5 - Production/Stable",
@@ -37,7 +37,7 @@ deltachat_rpc_client = [
 line-length = 120

 [tool.ruff]
-lint.select = [
+select = [
  "E", "W", # pycodestyle
  "F", # Pyflakes
  "N", # pep8-naming
@@ -244,7 +244,7 @@ class Account:
        The function returns immediately and the handshake runs in background, sending
        and receiving several messages.
        Subsequent calls of `secure_join()` will abort previous, unfinished handshakes.
-        See https://securejoin.delta.chat/ for protocol details.
+        See https://securejoin.readthedocs.io/en/latest/new.html for protocol details.

        :param qrdata: The text of the scanned QR code.
        """
@@ -8,7 +8,7 @@ from unittest.mock import MagicMock

 import pytest
 from deltachat_rpc_client import Contact, EventType, Message, events
-from deltachat_rpc_client.const import DownloadState, MessageState
+from deltachat_rpc_client.const import DownloadState
 from deltachat_rpc_client.direct_imap import DirectImap
 from deltachat_rpc_client.rpc import JsonRpcError

@@ -584,32 +584,3 @@ def test_download_limit_chat_assignment(acfactory, tmp_path, n_accounts):
            #
            # Message may be a private reply, so we assign it to 1:1 chat with Alice.
            assert snapshot.chat == bob_chat_alice
-
-
-def test_markseen_contact_request(acfactory, tmp_path):
-    """
-    Test that seen status is synchronized for contact request messages
-    even though read receipt is not sent.
-    """
-    alice, bob = acfactory.get_online_accounts(2)
-
-    # Bob sets up a second device.
-    bob.export_backup(tmp_path)
-    files = list(tmp_path.glob("*.tar"))
-    bob2 = acfactory.get_unconfigured_account()
-    bob2.import_backup(files[0])
-    bob2.start_io()
-
-    alice_chat_bob = alice.create_chat(bob)
-    alice_chat_bob.send_text("Hello Bob!")
-
-    message = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id)
-    message2 = bob2.get_message_by_id(bob2.wait_for_incoming_msg_event().msg_id)
-    assert message2.get_snapshot().state == MessageState.IN_FRESH
-
-    message.mark_seen()
-    while True:
-        event = bob2.wait_for_event()
-        if event.kind == EventType.MSGS_NOTICED:
-            break
-    assert message2.get_snapshot().state == MessageState.IN_SEEN
@@ -22,8 +22,9 @@ skipsdist = True
 skip_install = True
 deps =
    ruff
+    black
 commands =
-    ruff format --quiet --diff src/ examples/ tests/
+    black --quiet --check --diff src/ examples/ tests/
    ruff check src/ examples/ tests/

 [pytest]
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.137.4"
+version = "1.137.2"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"
@@ -68,7 +68,7 @@ async fn main_impl() -> Result<()> {

    log::info!("Creating JSON-RPC API.");
    let accounts = Arc::new(RwLock::new(accounts));
-    let state = CommandApi::from_arc(accounts.clone()).await;
+    let state = CommandApi::from_arc(accounts.clone());

    let (client, mut out_receiver) = RpcClient::new();
    let session = RpcSession::new(client.clone(), state.clone());
@@ -7,11 +7,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1712088936,
-        "narHash": "sha256-mVjeSWQiR/t4UZ9fUawY9OEPAhY1R3meYG+0oh8DUBs=",
+        "lastModified": 1710633978,
+        "narHash": "sha256-yemnwSvW7cdWtXGpivFA5jDO35rGPs6fqxlQ4l6ODXs=",
        "owner": "tadfisher",
        "repo": "android-nixpkgs",
-        "rev": "2d8181caef279f19c4a33dc694723f89ffc195d4",
+        "rev": "e91fb3d8517538e5ad9b422c9a4f604b56008a9e",
        "type": "github"
      },
      "original": {
@@ -29,11 +29,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1711099426,
-        "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=",
+        "lastModified": 1708939976,
+        "narHash": "sha256-O5+nFozxz2Vubpdl1YZtPrilcIXPcRAjqNdNE8oCRoA=",
        "owner": "numtide",
        "repo": "devshell",
-        "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8",
+        "rev": "5ddecd67edbd568ebe0a55905273e56cc82aabe3",
        "type": "github"
      },
      "original": {
@@ -48,11 +48,11 @@
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1713421495,
-        "narHash": "sha256-5vVF9W1tJT+WdfpWAEG76KywktKDAW/71mVmNHEHjac=",
+        "lastModified": 1710742993,
+        "narHash": "sha256-W0PQCe0bW3hKF5lHawXrKynBcdSP18Qa4sb8DcUfOqI=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "fd47b1f9404fae02a4f38bd9f4b12bad7833c96b",
+        "rev": "6f2fec850f569d61562d3a47dc263f19e9c7d825",
        "type": "github"
      },
      "original": {
@@ -84,11 +84,11 @@
        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1709126324,
+        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
        "type": "github"
      },
      "original": {
@@ -120,11 +120,11 @@
        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1713520724,
-        "narHash": "sha256-CO8MmVDmqZX2FovL75pu5BvwhW+Vugc7Q6ze7Hj8heI=",
+        "lastModified": 1698420672,
+        "narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=",
        "owner": "nix-community",
        "repo": "naersk",
-        "rev": "c5037590290c6c7dae2e42e7da1e247e54ed2d49",
+        "rev": "aeb58d5e8faead8980a807c840232697982d47b9",
        "type": "github"
      },
      "original": {
@@ -150,11 +150,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1711703276,
-        "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
+        "lastModified": 1709237383,
+        "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
+        "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
        "type": "github"
      },
      "original": {
@@ -166,11 +166,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1713248628,
-        "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=",
+        "lastModified": 1710631334,
+        "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8",
+        "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a",
        "type": "github"
      },
      "original": {
@@ -182,11 +182,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1713562564,
-        "narHash": "sha256-NQpYhgoy0M89g9whRixSwsHb8RFIbwlxeYiVSDwSXJg=",
+        "lastModified": 1710765496,
+        "narHash": "sha256-p7ryWEeQfMwTB6E0wIUd5V2cFTgq+DRRBz2hYGnJZyA=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "92d295f588631b0db2da509f381b4fb1e74173c5",
+        "rev": "e367f7a1fb93137af22a3908f00b9a35e2d286a7",
        "type": "github"
      },
      "original": {
@@ -196,11 +196,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1713537308,
-        "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=",
+        "lastModified": 1710631334,
+        "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f",
+        "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a",
        "type": "github"
      },
      "original": {
@@ -223,11 +223,11 @@
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1713373173,
-        "narHash": "sha256-octd9BFY9G/Gbr4KfwK4itZp4Lx+qvJeRRcYnN+dEH8=",
+        "lastModified": 1710708100,
+        "narHash": "sha256-Jd6pmXlwKk5uYcjyO/8BfbUVmx8g31Qfk7auI2IG66A=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "46702ffc1a02a2ac153f1d1ce619ec917af8f3a6",
+        "rev": "b6d1887bc4f9543b6c6bf098179a62446f34a6c3",
        "type": "github"
      },
      "original": {
@@ -35,7 +35,6 @@
            ./CMakeLists.txt
            ./CONTRIBUTING.md
            ./deltachat_derive
-            ./deltachat-contact-tools
            ./deltachat-ffi
            ./deltachat-jsonrpc
            ./deltachat-ratelimit
@@ -483,7 +482,6 @@
                format = "pyproject";
                propagatedBuildInputs = [
                  pkgs.python3Packages.setuptools
-                  pkgs.python3Packages.imap-tools
                ];
              };

@@ -94,12 +94,6 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"

-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -527,9 +521,9 @@ dependencies = [

 [[package]]
 name = "brotli"
-version = "5.0.0"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19483b140a7ac7174d34b5a581b406c64f84da5409d3e09cf4fff604f9270e67"
+checksum = "125740193d7fee5cc63ab9e16c2fdc4e07c74ba755cc53b327d6ea029e9fc569"
 dependencies = [
 "alloc-no-stdlib",
 "alloc-stdlib",
@@ -538,9 +532,9 @@ dependencies = [

 [[package]]
 name = "brotli-decompressor"
-version = "4.0.0"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6221fe77a248b9117d431ad93761222e1cf8ff282d9d1d5d9f53d6299a1cf76"
+checksum = "65622a320492e09b5e0ac436b14c54ff68199bac392d0e89a6832c4518eea525"
 dependencies = [
 "alloc-no-stdlib",
 "alloc-stdlib",
@@ -645,16 +639,17 @@ dependencies = [

 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
 dependencies = [
- "android-tzdata",
 "iana-time-zone",
 "js-sys",
+ "num-integer",
 "num-traits",
+ "time 0.1.45",
 "wasm-bindgen",
- "windows-targets 0.52.0",
+ "winapi",
 ]

 [[package]]
@@ -964,7 +959,7 @@ dependencies = [

 [[package]]
 name = "deltachat"
-version = "1.137.3"
+version = "1.137.2"
 dependencies = [
 "anyhow",
 "async-channel 2.1.1",
@@ -973,10 +968,9 @@ dependencies = [
 "async-smtp",
 "async_zip",
 "backtrace",
- "base64 0.22.0",
+ "base64 0.21.0",
 "brotli",
 "chrono",
- "deltachat-contact-tools",
 "deltachat-time",
 "deltachat_derive",
 "email",
@@ -1036,16 +1030,6 @@ dependencies = [
 "uuid 1.2.2",
 ]

-[[package]]
-name = "deltachat-contact-tools"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "once_cell",
- "regex",
- "rusqlite",
-]
-
 [[package]]
 name = "deltachat-fuzz"
 version = "0.0.0"
@@ -2170,7 +2154,7 @@ dependencies = [
 "http-body",
 "hyper",
 "pin-project-lite",
- "socket2 0.5.6",
+ "socket2 0.5.4",
 "tokio",
 "tower",
 "tower-service",
@@ -3355,7 +3339,7 @@ checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7"
 dependencies = [
 "bytes",
 "libc",
- "socket2 0.5.6",
+ "socket2 0.5.4",
 "tracing",
 "windows-sys 0.48.0",
 ]
@@ -3764,9 +3748,9 @@ dependencies = [

 [[package]]
 name = "rustls"
-version = "0.21.11"
+version = "0.21.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4"
+checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9"
 dependencies = [
 "ring 0.17.6",
 "rustls-webpki",
@@ -4149,12 +4133,12 @@ dependencies = [

 [[package]]
 name = "socket2"
-version = "0.5.6"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
+checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e"
 dependencies = [
 "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
 ]

 [[package]]
@@ -4449,9 +4433,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"

 [[package]]
 name = "tokio"
-version = "1.37.0"
+version = "1.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
 dependencies = [
 "backtrace",
 "bytes",
@@ -4461,7 +4445,7 @@ dependencies = [
 "parking_lot",
 "pin-project-lite",
 "signal-hook-registry",
- "socket2 0.5.6",
+ "socket2 0.5.4",
 "tokio-macros",
 "windows-sys 0.48.0",
 ]
@@ -4478,9 +4462,9 @@ dependencies = [

 [[package]]
 name = "tokio-macros"
-version = "2.2.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1,4 +1,5 @@
 #define NAPI_VERSION 4
+#define NAPI_EXPERIMENTAL

 #include <stdlib.h>
 #include <stdio.h>
@@ -55,5 +55,5 @@
    "test:mocha": "mocha node/test/test.mjs --growl --reporter=spec --bail --exit"
  },
  "types": "node/dist/index.d.ts",
-  "version": "1.137.4"
+  "version": "1.137.2"
 }
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "deltachat"
-version = "1.137.4"
+version = "1.137.2"
 description = "Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat"
 readme = "README.rst"
 requires-python = ">=3.7"
@@ -46,7 +46,7 @@ deltachat = [
 line-length = 120

 [tool.ruff]
-lint.select = ["E", "F", "W", "YTT", "C4", "ISC", "ICN", "TID", "DTZ", "PLC", "PLE", "PLW", "PIE", "COM", "UP004", "UP010", "UP031", "UP032", "ANN204"]
+select = ["E", "F", "W", "YTT", "C4", "ISC", "ICN", "TID", "DTZ", "PLC", "PLE", "PLW", "PIE", "COM", "UP004", "UP010", "UP031", "UP032", "ANN204"]
 line-length = 120

 [tool.isort]
@@ -328,12 +328,10 @@ class EventThread(threading.Thread):
        elif name == "DC_EVENT_REACTIONS_CHANGED":
            assert ffi_event.data1 > 0
            msg = account.get_message_by_id(ffi_event.data2)
-            if msg is not None:
-                yield "ac_reactions_changed", {"message": msg}
+            yield "ac_reactions_changed", {"message": msg}
        elif name == "DC_EVENT_MSG_DELIVERED":
            msg = account.get_message_by_id(ffi_event.data2)
-            if msg is not None:
-                yield "ac_message_delivered", {"message": msg}
+            yield "ac_message_delivered", {"message": msg}
        elif name == "DC_EVENT_CHAT_MODIFIED":
            chat = account.get_chat_by_id(ffi_event.data1)
            yield "ac_chat_modified", {"chat": chat}
@@ -364,9 +364,6 @@ class Message:
        else:
            # load message from db to get a fresh/current state
            dc_msg = ffi.gc(lib.dc_get_msg(self.account._dc_context, self.id), lib.dc_msg_unref)
-            # Message could be trashed, use the cached object if so.
-            if dc_msg == ffi.NULL:
-                dc_msg = self._dc_msg
        return lib.dc_msg_get_state(dc_msg)

    def is_in_fresh(self):
@@ -395,7 +392,7 @@ class Message:

    def is_outgoing(self):
        """Return True if Message is outgoing."""
-        return lib.dc_msg_get_state(self._dc_msg) in (
+        return self._msgstate in (
            const.DC_STATE_OUT_PREPARING,
            const.DC_STATE_OUT_PENDING,
            const.DC_STATE_OUT_FAILED,
@@ -487,9 +484,6 @@ class Message:

        # load message from db to get a fresh/current state
        dc_msg = ffi.gc(lib.dc_get_msg(self.account._dc_context, self.id), lib.dc_msg_unref)
-        # Message could be trashed, use the cached object if so.
-        if dc_msg == ffi.NULL:
-            dc_msg = self._dc_msg
        return lib.dc_msg_get_download_state(dc_msg)

    def download_full(self) -> None:
@@ -18,14 +18,14 @@ def test_db_busy_error(acfactory):

    # make a number of accounts
    accounts = acfactory.get_many_online_accounts(3)
-    log(f"created {len(accounts)} accounts")
+    log("created %s accounts" % len(accounts))

    # put a bigfile into each account
    for acc in accounts:
        acc.bigfile = os.path.join(acc.get_blobdir(), "bigfile")
        with open(acc.bigfile, "wb") as f:
            f.write(b"01234567890" * 1000_000)
-    log(f"created {len(accounts)} bigfiles")
+    log("created %s bigfiles" % len(accounts))

    contact_addrs = [acc.get_self_contact().addr for acc in accounts]
    chat = accounts[0].create_group_chat("stress-group")
@@ -1343,6 +1343,7 @@ def test_quote_encrypted(acfactory, lp):

    for quoted_msg in msg1, msg3:
        # Save the draft with a quote.
+        # It should be encrypted if quoted message is encrypted.
        msg_draft = Message.new_empty(ac1, "text")
        msg_draft.set_text("message reply")
        msg_draft.quote = quoted_msg
@@ -1356,14 +1357,10 @@ def test_quote_encrypted(acfactory, lp):
        chat.set_draft(None)
        assert chat.get_draft() is None

-        # Quote should be replaced with "..." if quoted message is encrypted.
        msg_in = ac2._evtracker.wait_next_incoming_message()
        assert msg_in.text == "message reply"
-        assert not msg_in.is_encrypted()
-        if quoted_msg.is_encrypted():
-            assert msg_in.quoted_text == "..."
-        else:
-            assert msg_in.quoted_text == quoted_msg.text
+        assert msg_in.quoted_text == quoted_msg.text
+        assert msg_in.is_encrypted() == quoted_msg.is_encrypted()


 def test_quote_attachment(tmp_path, acfactory, lp):
@@ -2036,15 +2033,14 @@ def test_send_receive_locations(acfactory, lp):
    assert chat1.is_sending_locations()
    ac1._evtracker.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")

-    # Wait for "enabled location streaming" message.
-    ac2._evtracker.wait_next_incoming_message()
-
-    # First location is sent immediately as a location-only message.
    ac1.set_location(latitude=2.0, longitude=3.0, accuracy=0.5)
    ac1._evtracker.get_matching("DC_EVENT_LOCATION_CHANGED")
+    chat1.send_text("🍞")
    ac1._evtracker.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")

    lp.sec("ac2: wait for incoming location message")
+
+    # currently core emits location changed before event_incoming message
    ac2._evtracker.get_matching("DC_EVENT_LOCATION_CHANGED")

    locations = chat2.get_locations()
@@ -2053,7 +2049,7 @@ def test_send_receive_locations(acfactory, lp):
    assert locations[0].longitude == 3.0
    assert locations[0].accuracy == 0.5
    assert locations[0].timestamp > now
-    assert locations[0].marker is None
+    assert locations[0].marker == "🍞"

    contact = ac2.create_contact(ac1)
    locations2 = chat2.get_locations(contact=contact)
@@ -41,11 +41,12 @@ skipsdist = True
 skip_install = True
 deps =
    ruff
+    black
    # pygments required by rst-lint
    pygments
    restructuredtext_lint 
 commands =
-    ruff format --quiet --diff setup.py src/deltachat examples/ tests/
+    black --quiet --check --diff setup.py src/deltachat examples/ tests/
    ruff check src/deltachat tests/ examples/
    rst-lint --encoding 'utf-8' README.rst

@@ -61,8 +62,7 @@ commands =
 [testenv:doc]
 changedir=doc
 deps =
-# Pinned version, workaround for <https://github.com/breathe-doc/breathe/issues/981>
-    sphinx<7.3
+    sphinx
    breathe
    sphinx_rtd_theme
 commands =
@@ -1 +1 @@
-2024-04-24
+2024-04-05
@@ -7,7 +7,7 @@ set -euo pipefail
 #
 # Avoid using rustup here as it depends on reading /proc/self/exe and
 # has problems running under QEMU.
-RUST_VERSION=1.78.0
+RUST_VERSION=1.77.1

 ARCH="$(uname -m)"
 test -f "/lib/libc.musl-$ARCH.so.1" && LIBC=musl || LIBC=gnu
@@ -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(())
    }
@@ -698,10 +698,7 @@ fn encode_img(
        ImageOutputFormat::Png => img.write_to(&mut buf, ImageFormat::Png)?,
        ImageOutputFormat::Jpeg { quality } => {
            let encoder = JpegEncoder::new_with_quality(&mut buf, quality);
-            // Convert image into RGB8 to avoid the error
-            // "The encoder or decoder for Jpeg does not support the color type Rgba8"
-            // (<https://github.com/image-rs/image/issues/2211>).
-            img.clone().into_rgb8().write_with_encoder(encoder)?;
+            img.write_with_encoder(encoder)?;
        }
    }
    Ok(())
@@ -1208,28 +1205,6 @@ mod tests {
        .unwrap();
    }

-    /// Tests that RGBA PNG can be recoded into JPEG
-    /// by dropping alpha channel.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_recode_image_rgba_png_to_jpeg() {
-        let bytes = include_bytes!("../test-data/image/screenshot-rgba.png");
-
-        send_image_check_mediaquality(
-            Viewtype::Image,
-            Some("1"),
-            bytes,
-            "png",
-            false, // no Exif
-            1920,
-            1080,
-            0,
-            constants::WORSE_IMAGE_SIZE,
-            constants::WORSE_IMAGE_SIZE * 1080 / 1920,
-        )
-        .await
-        .unwrap();
-    }
-
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_recode_image_huge_jpg() {
        let bytes = include_bytes!("../test-data/image/screenshot.jpg");
@@ -1307,65 +1282,26 @@ mod tests {
        let alice_msg = alice.get_last_msg().await;
        assert_eq!(alice_msg.get_width() as u32, compressed_width);
        assert_eq!(alice_msg.get_height() as u32, compressed_height);
-        let file_saved = alice
-            .get_blobdir()
-            .join("saved-".to_string() + &alice_msg.get_filename().unwrap());
-        alice_msg.save_file(&alice, &file_saved).await?;
-        check_image_size(file_saved, compressed_width, compressed_height);
+        check_image_size(
+            alice_msg.get_file(&alice).unwrap(),
+            compressed_width,
+            compressed_height,
+        );

        let bob_msg = bob.recv_msg(&sent).await;
        assert_eq!(bob_msg.get_viewtype(), Viewtype::Image);
        assert_eq!(bob_msg.get_width() as u32, compressed_width);
        assert_eq!(bob_msg.get_height() as u32, compressed_height);
-        let file_saved = bob
-            .get_blobdir()
-            .join("saved-".to_string() + &bob_msg.get_filename().unwrap());
-        bob_msg.save_file(&bob, &file_saved).await?;
+        let file = bob_msg.get_file(&bob).unwrap();

-        let blob = BlobObject::new_from_path(&bob, &file_saved).await?;
+        let blob = BlobObject::new_from_path(&bob, &file).await?;
        let (_, exif) = blob.metadata()?;
        assert!(exif.is_none());

-        let img = check_image_size(file_saved, compressed_width, compressed_height);
+        let img = check_image_size(file, compressed_width, compressed_height);
        Ok(img)
    }

-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_send_big_gif_as_image() -> Result<()> {
-        let bytes = include_bytes!("../test-data/image/screenshot.gif");
-        let (width, height) = (1920u32, 1080u32);
-        let alice = TestContext::new_alice().await;
-        let bob = TestContext::new_bob().await;
-        alice
-            .set_config(
-                Config::MediaQuality,
-                Some(&(MediaQuality::Worse as i32).to_string()),
-            )
-            .await?;
-        let file = alice.get_blobdir().join("file").with_extension("gif");
-        fs::write(&file, &bytes)
-            .await
-            .context("failed to write file")?;
-        let mut msg = Message::new(Viewtype::Image);
-        msg.set_file(file.to_str().unwrap(), None);
-        let chat = alice.create_chat(&bob).await;
-        let sent = alice.send_msg(chat.id, &mut msg).await;
-        let bob_msg = bob.recv_msg(&sent).await;
-        // DC must detect the image as GIF and send it w/o reencoding.
-        assert_eq!(bob_msg.get_viewtype(), Viewtype::Gif);
-        assert_eq!(bob_msg.get_width() as u32, width);
-        assert_eq!(bob_msg.get_height() as u32, height);
-        let file_saved = bob
-            .get_blobdir()
-            .join("saved-".to_string() + &bob_msg.get_filename().unwrap());
-        bob_msg.save_file(&bob, &file_saved).await?;
-        let blob = BlobObject::new_from_path(&bob, &file_saved).await?;
-        let (file_size, _) = blob.metadata()?;
-        assert_eq!(file_size, bytes.len() as u64);
-        check_image_size(file_saved, width, height);
-        Ok(())
-    }
-
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_increation_in_blobdir() -> Result<()> {
        let t = TestContext::new_alice().await;
@@ -2049,7 +2049,6 @@ impl Chat {
            msg.id = MsgId::new(u32::try_from(raw_id)?);

            maybe_set_logging_xdc(context, msg, self.id).await?;
-            context.update_webxdc_integration_database(msg).await?;
        }
        context.scheduler.interrupt_ephemeral_task().await;
        Ok(msg.id)
@@ -2505,30 +2504,6 @@ async fn prepare_msg_blob(context: &Context, msg: &mut Message) -> Result<()> {
            .await?
            .with_context(|| format!("attachment missing for message of type #{}", msg.viewtype))?;

-        if msg.viewtype == Viewtype::File || msg.viewtype == Viewtype::Image {
-            // Correct the type, take care not to correct already very special
-            // formats as GIF or VOICE.
-            //
-            // Typical conversions:
-            // - from FILE to AUDIO/VIDEO/IMAGE
-            // - from FILE/IMAGE to GIF */
-            if let Some((better_type, _)) = message::guess_msgtype_from_suffix(&blob.to_abs_path())
-            {
-                if better_type != Viewtype::Webxdc
-                    || context
-                        .ensure_sendable_webxdc_file(&blob.to_abs_path())
-                        .await
-                        .is_ok()
-                {
-                    msg.viewtype = better_type;
-                }
-            }
-        } else if msg.viewtype == Viewtype::Webxdc {
-            context
-                .ensure_sendable_webxdc_file(&blob.to_abs_path())
-                .await?;
-        }
-
        let mut maybe_sticker = msg.viewtype == Viewtype::Sticker;
        if msg.viewtype == Viewtype::Image
            || maybe_sticker && !msg.param.exists(Param::ForceSticker)
@@ -2550,6 +2525,34 @@ async fn prepare_msg_blob(context: &Context, msg: &mut Message) -> Result<()> {
                .set(Param::Filename, stem.to_string() + "." + blob_ext);
        }

+        if msg.viewtype == Viewtype::File || msg.viewtype == Viewtype::Image {
+            // Correct the type, take care not to correct already very special
+            // formats as GIF or VOICE.
+            //
+            // Typical conversions:
+            // - from FILE to AUDIO/VIDEO/IMAGE
+            // - from FILE/IMAGE to GIF */
+            if let Some((better_type, better_mime)) =
+                message::guess_msgtype_from_suffix(&blob.to_abs_path())
+            {
+                if better_type != Viewtype::Webxdc
+                    || context
+                        .ensure_sendable_webxdc_file(&blob.to_abs_path())
+                        .await
+                        .is_ok()
+                {
+                    msg.viewtype = better_type;
+                    if !msg.param.exists(Param::MimeType) {
+                        msg.param.set(Param::MimeType, better_mime);
+                    }
+                }
+            }
+        } else if msg.viewtype == Viewtype::Webxdc {
+            context
+                .ensure_sendable_webxdc_file(&blob.to_abs_path())
+                .await?;
+        }
+
        if !msg.param.exists(Param::MimeType) {
            if let Some((_, mime)) = message::guess_msgtype_from_suffix(&blob.to_abs_path()) {
                msg.param.set(Param::MimeType, mime);
@@ -2593,18 +2596,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;
@@ -2723,7 +2714,7 @@ async fn send_msg_inner(context: &Context, chat_id: ChatId, msg: &mut Message) -
        }

        if msg.param.exists(Param::SetLatitude) {
-            context.emit_location_changed(Some(ContactId::SELF)).await?;
+            context.emit_event(EventType::LocationChanged(Some(ContactId::SELF)));
        }

        context.scheduler.interrupt_smtp().await;
@@ -2790,11 +2781,6 @@ pub(crate) async fn create_send_msg_jobs(context: &Context, msg: &mut Message) -
        recipients.push(from);
    }

-    // Webxdc integrations are messages, however, shipped with main app and must not be sent out
-    if msg.param.get_int(Param::WebxdcIntegration).is_some() {
-        recipients.clear();
-    }
-
    if recipients.is_empty() {
        // may happen eg. for groups with only SELF and bcc_self disabled
        info!(
@@ -2847,10 +2833,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 {
@@ -4725,59 +4718,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.
@@ -5092,32 +5032,6 @@ mod tests {
        Ok(())
    }

-    /// Tests that if member added message is completely lost,
-    /// member is eventually added.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_lost_member_added() -> Result<()> {
-        let mut tcm = TestContextManager::new();
-        let alice = &tcm.alice().await;
-        let bob = &tcm.bob().await;
-        let alice_chat_id = alice
-            .create_group_with_members(ProtectionStatus::Unprotected, "Group", &[bob])
-            .await;
-        let alice_sent = alice.send_text(alice_chat_id, "Hi!").await;
-        let bob_chat_id = bob.recv_msg(&alice_sent).await.chat_id;
-        assert_eq!(get_chat_contacts(bob, bob_chat_id).await?.len(), 2);
-
-        // Attempt to add member, but message is lost.
-        let claire_id = Contact::create(alice, "", "claire@foo.de").await?;
-        add_contact_to_chat(alice, alice_chat_id, claire_id).await?;
-        alice.pop_sent_msg().await;
-
-        let alice_sent = alice.send_text(alice_chat_id, "Hi again!").await;
-        bob.recv_msg(&alice_sent).await;
-        assert_eq!(get_chat_contacts(bob, bob_chat_id).await?.len(), 3);
-
-        Ok(())
-    }
-
    /// Test that group updates are robust to lost messages and eventual out of order arrival.
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_modify_chat_lost() -> Result<()> {
@@ -356,9 +356,6 @@ pub enum Config {
    /// This key is sent to the self_reporting bot so that the bot can recognize the user
    /// without storing the email address
    SelfReportingId,
-
-    /// MsgId of webxdc map integration.
-    WebxdcIntegration,
 }

 impl Config {
@@ -671,7 +668,7 @@ impl Context {
        {
            return Ok(());
        }
-        Box::pin(self.send_sync_msg()).await.log_err(self).ok();
+        self.send_sync_msg().await.log_err(self).ok();
        Ok(())
    }

@@ -2708,19 +2708,7 @@ Hi."#;

        bob.recv_msg(&sent_msg).await;
        let contact = Contact::get_by_id(&bob, *contacts.first().unwrap()).await?;
-
-        let green = ansi_term::Color::Green.normal();
-        assert!(
-            contact.was_seen_recently(),
-            "{}",
-            green.paint(
-                "\nNOTE: This test failure is probably a false-positive, caused by tests running in parallel.
-The issue is that `SystemTime::shift()` (a utility function for tests) changes the time for all threads doing tests, and not only for the running test.
-Until the false-positive is fixed:
- Use `cargo test -- --test-threads 1` instead of `cargo test`
- Or use `cargo nextest run` (install with `cargo install cargo-nextest --locked`)\n"
-            )
-        );
+        assert!(contact.was_seen_recently());

        let self_contact = Contact::get_by_id(&bob, ContactId::SELF).await?;
        assert!(!self_contact.was_seen_recently());
@@ -2742,7 +2730,7 @@ Until the false-positive is fixed:
            let sent_msg = alice.send_text(chat.id, "moin").await;
            let contact = Contact::get_by_id(&bob, *contacts.first().unwrap()).await?;
            assert!(!contact.was_seen_recently());
-            bob.evtracker.clear_events();
+            while bob.evtracker.try_recv().is_ok() {}
            bob.recv_msg(&sent_msg).await;
            let contact = Contact::get_by_id(&bob, *contacts.first().unwrap()).await?;
            assert!(contact.was_seen_recently());
@@ -2754,7 +2742,7 @@ Until the false-positive is fixed:
                .await;

            // Wait for `was_seen_recently()` to turn off.
-            bob.evtracker.clear_events();
+            while bob.evtracker.try_recv().is_ok() {}
            SystemTime::shift(Duration::from_secs(SEEN_RECENTLY_SECONDS as u64 * 2));
            recently_seen_loop.interrupt(ContactId::UNDEFINED, 0).await;
            let contact = Contact::get_by_id(&bob, *contacts.first().unwrap()).await?;
@@ -605,23 +605,6 @@ impl Context {
        chatlist_events::emit_chatlist_item_changed(self, chat_id);
    }

-    /// Emits an LocationChanged event and a WebxdcStatusUpdate in case there is a maps integration
-    pub async fn emit_location_changed(&self, contact_id: Option<ContactId>) -> Result<()> {
-        self.emit_event(EventType::LocationChanged(contact_id));
-
-        if let Some(msg_id) = self
-            .get_config_parsed::<u32>(Config::WebxdcIntegration)
-            .await?
-        {
-            self.emit_event(EventType::WebxdcStatusUpdate {
-                msg_id: MsgId::new(msg_id),
-                status_update_serial: Default::default(),
-            })
-        }
-
-        Ok(())
-    }
-
    /// Returns a receiver for emitted events.
    ///
    /// Multiple emitters can be created, but note that in this case each emitted event will
@@ -1648,7 +1631,6 @@ mod tests {
            "socks5_user",
            "socks5_password",
            "key_id",
-            "webxdc_integration",
        ];
        let t = TestContext::new().await;
        let info = t.get_info().await.unwrap();
@@ -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
@@ -80,7 +80,6 @@ use crate::contact::ContactId;
 use crate::context::Context;
 use crate::download::MIN_DELETE_SERVER_AFTER;
 use crate::events::EventType;
-use crate::location;
 use crate::log::LogExt;
 use crate::message::{Message, MessageState, MsgId, Viewtype};
 use crate::mimeparser::SystemMessage;
@@ -349,16 +348,16 @@ pub(crate) async fn start_ephemeral_timers_msgids(
 /// Selects messages which are expired according to
 /// `delete_device_after` setting or `ephemeral_timestamp` column.
 ///
-/// For each message a row ID, chat id, viewtype and location ID is returned.
+/// For each message a row ID, chat id and viewtype is returned.
 async fn select_expired_messages(
    context: &Context,
    now: i64,
-) -> Result<Vec<(MsgId, ChatId, Viewtype, u32)>> {
+) -> Result<Vec<(MsgId, ChatId, Viewtype)>> {
    let mut rows = context
        .sql
        .query_map(
            r#"
-SELECT id, chat_id, type, location_id
+SELECT id, chat_id, type
 FROM msgs
 WHERE
  ephemeral_timestamp != 0
@@ -370,8 +369,7 @@ WHERE
                let id: MsgId = row.get("id")?;
                let chat_id: ChatId = row.get("chat_id")?;
                let viewtype: Viewtype = row.get("type")?;
-                let location_id: u32 = row.get("location_id")?;
-                Ok((id, chat_id, viewtype, location_id))
+                Ok((id, chat_id, viewtype))
            },
            |rows| rows.collect::<Result<Vec<_>, _>>().map_err(Into::into),
        )
@@ -391,7 +389,7 @@ WHERE
            .sql
            .query_map(
                r#"
-SELECT id, chat_id, type, location_id
+SELECT id, chat_id, type
 FROM msgs
 WHERE
  timestamp < ?1
@@ -410,8 +408,7 @@ WHERE
                    let id: MsgId = row.get("id")?;
                    let chat_id: ChatId = row.get("chat_id")?;
                    let viewtype: Viewtype = row.get("type")?;
-                    let location_id: u32 = row.get("location_id")?;
-                    Ok((id, chat_id, viewtype, location_id))
+                    Ok((id, chat_id, viewtype))
                },
                |rows| rows.collect::<Result<Vec<_>, _>>().map_err(Into::into),
            )
@@ -442,7 +439,7 @@ pub(crate) async fn delete_expired_messages(context: &Context, now: i64) -> Resu

                // If you change which information is removed here, also change MsgId::trash() and
                // which information receive_imf::add_parts() still adds to the db if the chat_id is TRASH
-                for (msg_id, chat_id, viewtype, location_id) in rows {
+                for (msg_id, chat_id, viewtype) in rows {
                    transaction.execute(
                        "UPDATE msgs
                     SET chat_id=?, txt='', subject='', txt_raw='',
@@ -451,13 +448,6 @@ pub(crate) async fn delete_expired_messages(context: &Context, now: i64) -> Resu
                        (DC_CHAT_ID_TRASH, msg_id),
                    )?;

-                    if location_id > 0 {
-                        transaction.execute(
-                            "DELETE FROM locations WHERE independent=1 AND id=?",
-                            (location_id,),
-                        )?;
-                    }
-
                    msgs_changed.push((chat_id, msg_id));
                    if viewtype == Viewtype::Webxdc {
                        webxdc_deleted.push(msg_id)
@@ -602,11 +592,6 @@ pub(crate) async fn ephemeral_loop(context: &Context, interrupt_receiver: Receiv
            .await
            .log_err(context)
            .ok();
-
-        location::delete_expired(context, time())
-            .await
-            .log_err(context)
-            .ok();
    }
 }

@@ -686,10 +671,8 @@ mod tests {
    use super::*;
    use crate::config::Config;
    use crate::download::DownloadState;
-    use crate::location;
-    use crate::message::markseen_msgs;
    use crate::receive_imf::receive_imf;
-    use crate::test_utils::{TestContext, TestContextManager};
+    use crate::test_utils::TestContext;
    use crate::timesmearing::MAX_SECONDS_TO_LEND_FROM_FUTURE;
    use crate::{
        chat::{self, create_group_chat, send_text_msg, Chat, ChatItem, ProtectionStatus},
@@ -1366,44 +1349,4 @@ mod tests {

        Ok(())
    }
-
-    /// Tests that POI location is deleted when ephemeral message expires.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_ephemeral_poi_location() -> Result<()> {
-        let mut tcm = TestContextManager::new();
-        let alice = &tcm.alice().await;
-        let bob = &tcm.bob().await;
-
-        let chat = alice.create_chat(bob).await;
-
-        let duration = 60;
-        chat.id
-            .set_ephemeral_timer(alice, Timer::Enabled { duration })
-            .await?;
-        let sent = alice.pop_sent_msg().await;
-        bob.recv_msg(&sent).await;
-
-        let mut poi_msg = Message::new(Viewtype::Text);
-        poi_msg.text = "Here".to_string();
-        poi_msg.set_location(10.0, 20.0);
-
-        let alice_sent_message = alice.send_msg(chat.id, &mut poi_msg).await;
-        let bob_received_message = bob.recv_msg(&alice_sent_message).await;
-        markseen_msgs(bob, vec![bob_received_message.id]).await?;
-
-        for account in [alice, bob] {
-            let locations = location::get_range(account, None, None, 0, 0).await?;
-            assert_eq!(locations.len(), 1);
-        }
-
-        SystemTime::shift(Duration::from_secs(100));
-
-        for account in [alice, bob] {
-            delete_expired_messages(account, time()).await?;
-            let locations = location::get_range(account, None, None, 0, 0).await?;
-            assert_eq!(locations.len(), 0);
-        }
-
-        Ok(())
-    }
 }
@@ -1,7 +1,7 @@
 //! # Events specification.

-use anyhow::Result;
-use tokio::sync::Mutex;
+use async_channel::{self as channel, Receiver, Sender, TrySendError};
+use pin_project::pin_project;

 pub(crate) mod chatlist_events;
 mod payload;
@@ -11,11 +11,8 @@ pub use self::payload::EventType;
 /// Event channel.
 #[derive(Debug, Clone)]
 pub struct Events {
-    /// Unused receiver to prevent the channel from closing.
-    _receiver: async_broadcast::InactiveReceiver<Event>,
-
-    /// Sender side of the event channel.
-    sender: async_broadcast::Sender<Event>,
+    receiver: Receiver<Event>,
+    sender: Sender<Event>,
 }

 impl Default for Events {
@@ -27,30 +24,33 @@ impl Default for Events {
 impl Events {
    /// Creates a new event channel.
    pub fn new() -> Self {
-        let (mut sender, _receiver) = async_broadcast::broadcast(1_000);
+        let (sender, receiver) = channel::bounded(1_000);

-        // We only keep this receiver around
-        // to prevent the channel from closing.
-        // Deactivating it to prevent it from consuming memory
-        // holding events that are not going to be received.
-        let _receiver = _receiver.deactivate();
-
-        // Remove oldest event on overflow.
-        sender.set_overflow(true);
-
-        Self { _receiver, sender }
+        Self { receiver, sender }
    }

    /// Emits an event into event channel.
    ///
    /// If the channel is full, deletes the oldest event first.
    pub fn emit(&self, event: Event) {
-        self.sender.try_broadcast(event).ok();
+        match self.sender.try_send(event) {
+            Ok(()) => {}
+            Err(TrySendError::Full(event)) => {
+                // when we are full, we pop remove the oldest event and push on the new one
+                let _ = self.receiver.try_recv();
+
+                // try again
+                self.emit(event);
+            }
+            Err(TrySendError::Closed(_)) => {
+                unreachable!("unable to emit event, channel disconnected");
+            }
+        }
    }

    /// Creates an event emitter.
    pub fn get_emitter(&self) -> EventEmitter {
-        EventEmitter(Mutex::new(self.sender.new_receiver()))
+        EventEmitter(self.receiver.clone())
    }
 }

@@ -60,34 +60,30 @@ impl Events {
 /// created events emitted by the [`Context`] will only be delivered to one of the
 /// `EventEmitter`s.
 ///
+/// The `EventEmitter` is also a [`Stream`], so a typical usage is in a `while let` loop.
+///
 /// [`Context`]: crate::context::Context
 /// [`Context::get_event_emitter`]: crate::context::Context::get_event_emitter
-#[derive(Debug)]
-pub struct EventEmitter(Mutex<async_broadcast::Receiver<Event>>);
+/// [`Stream`]: futures::stream::Stream
+#[derive(Debug, Clone)]
+#[pin_project]
+pub struct EventEmitter(#[pin] Receiver<Event>);

 impl EventEmitter {
    /// Async recv of an event. Return `None` if the `Sender` has been dropped.
-    ///
-    /// [`try_recv`]: Self::try_recv
    pub async fn recv(&self) -> Option<Event> {
-        let mut lock = self.0.lock().await;
-        lock.recv().await.ok()
+        self.0.recv().await.ok()
    }
+}

-    /// Tries to receive an event without blocking.
-    ///
-    /// Returns error if no events are available for reception
-    /// or if receiver mutex is locked by a concurrent call to [`recv`]
-    /// or `try_recv`.
-    ///
-    /// [`recv`]: Self::recv
-    pub fn try_recv(&self) -> Result<Event> {
-        // Using `try_lock` instead of `lock`
-        // to avoid blocking
-        // in case there is a concurrent call to `recv`.
-        let mut lock = self.0.try_lock()?;
-        let event = lock.try_recv()?;
-        Ok(event)
+impl futures::stream::Stream for EventEmitter {
+    type Item = Event;
+
+    fn poll_next(
+        self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<Option<Self::Item>> {
+        self.project().0.poll_next(cx)
    }
 }

@@ -79,7 +79,6 @@ mod test_chatlist_events {
        EventType,
    };

-    use crate::tools::SystemTime;
    use anyhow::Result;

    async fn wait_for_chatlist_and_specific_item(context: &TestContext, chat_id: ChatId) {
@@ -353,7 +352,7 @@ mod test_chatlist_events {
        );
        chat::set_muted(&alice, chat, mute_duration).await?;
        alice.evtracker.clear_events();
-        SystemTime::shift(Duration::from_secs(3));
+        tokio::time::sleep(Duration::from_secs(3)).await;
        wait_for_chatlist_specific_item(&alice, chat).await;

        Ok(())
@@ -511,25 +510,18 @@ mod test_chatlist_events {
        Ok(())
    }

-    /// Tests that expired disappearing message
-    /// produces events about chatlist being modified.
+    /// ephemeral / disappearing messages
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_update_after_ephemeral_messages() -> Result<()> {
        let mut tcm = TestContextManager::new();
        let alice = tcm.alice().await;
        let chat = create_group_chat(&alice, ProtectionStatus::Protected, "My Group").await?;
-        chat.set_ephemeral_timer(&alice, crate::ephemeral::Timer::Enabled { duration: 60 })
+        chat.set_ephemeral_timer(&alice, crate::ephemeral::Timer::Enabled { duration: 1 })
            .await?;
-        alice
-            .evtracker
-            .get_matching(|evt| matches!(evt, EventType::ChatEphemeralTimerModified { .. }))
-            .await;
-
        let _ = chat::send_text_msg(&alice, chat, "Hello".to_owned()).await?;
-        wait_for_chatlist_and_specific_item(&alice, chat).await;

-        SystemTime::shift(Duration::from_secs(70));
-        crate::ephemeral::delete_expired_messages(&alice, crate::tools::time()).await?;
+        alice.evtracker.clear_events();
+        tokio::time::sleep(Duration::from_secs(2)).await;
        wait_for_chatlist_and_specific_item(&alice, chat).await;

        Ok(())
@@ -576,20 +568,20 @@ First thread."#;

        // Step 3: Alice receives vg-request, sends vg-auth-required
        alice.evtracker.clear_events();
-        alice.recv_msg_trash(&sent).await;
+        alice.recv_msg(&sent).await;

        let sent = alice.pop_sent_msg().await;

        // Step 4: Bob receives vg-auth-required, sends vg-request-with-auth
        bob.evtracker.clear_events();
-        bob.recv_msg_trash(&sent).await;
+        bob.recv_msg(&sent).await;
        wait_for_chatlist_and_specific_item(&bob, bob_chatid).await;

        let sent = bob.pop_sent_msg().await;

        // Step 5+6: Alice receives vg-request-with-auth, sends vg-member-added
        alice.evtracker.clear_events();
-        alice.recv_msg_trash(&sent).await;
+        alice.recv_msg(&sent).await;
        wait_for_chatlist_and_specific_item(&alice, alice_chatid).await;

        let sent = alice.pop_sent_msg().await;
@@ -5,12 +5,11 @@

 use std::{
    cmp::max,
-    cmp::min,
    collections::{BTreeMap, BTreeSet, HashMap},
    iter::Peekable,
    mem::take,
    sync::atomic::Ordering,
-    time::{Duration, UNIX_EPOCH},
+    time::Duration,
 };

 use anyhow::{bail, format_err, Context as _, Result};
@@ -20,8 +19,8 @@ use deltachat_contact_tools::{normalize_name, ContactAddress};
 use futures::{FutureExt as _, StreamExt, TryStreamExt};
 use futures_lite::FutureExt;
 use num_traits::FromPrimitive;
-use rand::Rng;
 use ratelimit::Ratelimit;
+use tokio::sync::RwLock;

 use crate::chat::{self, ChatId, ChatIdBlocked};
 use crate::chatlist_events;
@@ -43,7 +42,7 @@ use crate::scheduler::connectivity::ConnectivityStore;
 use crate::socks::Socks5Config;
 use crate::sql;
 use crate::stock_str;
-use crate::tools::{self, create_id, duration_to_str};
+use crate::tools::{create_id, duration_to_str};

 pub(crate) mod capabilities;
 mod client;
@@ -83,17 +82,15 @@ pub(crate) struct Imap {

    pub(crate) connectivity: ConnectivityStore,

-    conn_last_try: tools::Time,
-    conn_backoff_ms: u64,
-
-    /// Rate limit for successful IMAP connections.
+    /// Rate limit for IMAP connection attempts.
    ///
-    /// This rate limit prevents busy loop in case the server refuses logins
+    /// This rate limit prevents busy loop
+    /// in case the server refuses connections
    /// or in case connection gets dropped over and over due to IMAP bug,
    /// e.g. the server returning invalid response to SELECT command
    /// immediately after logging in or returning an error in response to LOGIN command
    /// due to internal server error.
-    ratelimit: Ratelimit,
+    ratelimit: RwLock<Ratelimit>,
 }

 #[derive(Debug)]
@@ -251,10 +248,8 @@ impl Imap {
            strict_tls,
            login_failed_once: false,
            connectivity: Default::default(),
-            conn_last_try: UNIX_EPOCH,
-            conn_backoff_ms: 0,
            // 1 connection per minute + a burst of 2.
-            ratelimit: Ratelimit::new(Duration::new(120, 0), 2.0),
+            ratelimit: RwLock::new(Ratelimit::new(Duration::new(120, 0), 2.0)),
        };

        Ok(imap)
@@ -298,15 +293,7 @@ impl Imap {
            bail!("IMAP operation attempted while it is torn down");
        }

-        let now = tools::Time::now();
-        let until_can_send = max(
-            min(self.conn_last_try, now)
-                .checked_add(Duration::from_millis(self.conn_backoff_ms))
-                .unwrap_or(now),
-            now,
-        )
-        .duration_since(now)?;
-        let ratelimit_duration = max(until_can_send, self.ratelimit.until_can_send());
+        let ratelimit_duration = self.ratelimit.read().await.until_can_send();
        if !ratelimit_duration.is_zero() {
            warn!(
                context,
@@ -329,16 +316,7 @@ impl Imap {

        info!(context, "Connecting to IMAP server");
        self.connectivity.set_connecting(context).await;
-
-        self.conn_last_try = tools::Time::now();
-        const BACKOFF_MIN_MS: u64 = 2000;
-        const BACKOFF_MAX_MS: u64 = 80_000;
-        self.conn_backoff_ms = min(self.conn_backoff_ms, BACKOFF_MAX_MS / 2);
-        self.conn_backoff_ms = self.conn_backoff_ms.saturating_add(
-            rand::thread_rng().gen_range((self.conn_backoff_ms / 2)..=self.conn_backoff_ms),
-        );
-        self.conn_backoff_ms = max(BACKOFF_MIN_MS, self.conn_backoff_ms);
-
+        self.ratelimit.write().await.send();
        let connection_res: Result<Client> =
            if self.lp.security == Socket::Starttls || self.lp.security == Socket::Plain {
                let imap_server: &str = self.lp.server.as_ref();
@@ -386,8 +364,6 @@ impl Imap {
                }
            };
        let client = connection_res?;
-        self.conn_backoff_ms = BACKOFF_MIN_MS;
-        self.ratelimit.send();

        let imap_user: &str = self.lp.user.as_ref();
        let imap_pw: &str = self.lp.password.as_ref();
@@ -193,9 +193,7 @@ pub async fn render_setup_file(context: &Context, passphrase: &str) -> Result<St
        true => Some(("Autocrypt-Prefer-Encrypt", "mutual")),
    };
    let private_key_asc = private_key.to_asc(ac_headers);
-    let encr = pgp::symm_encrypt(passphrase, private_key_asc.as_bytes())
-        .await?
-        .replace('\n', "\r\n");
+    let encr = pgp::symm_encrypt(passphrase, private_key_asc.as_bytes()).await?;

    let replacement = format!(
        concat!(
@@ -286,7 +284,7 @@ pub async fn continue_key_transfer(
        let file = open_file_std(context, filename)?;
        let sc = normalize_setup_code(setup_code);
        let armored_key = decrypt_setup_file(&sc, file).await?;
-        set_self_key(context, &armored_key, true).await?;
+        set_self_key(context, &armored_key, true, true).await?;
        maybe_add_bcc_self_device_msg(context).await?;

        Ok(())
@@ -295,32 +293,35 @@ pub async fn continue_key_transfer(
    }
 }

-async fn set_self_key(context: &Context, armored: &str, set_default: bool) -> Result<()> {
+async fn set_self_key(
+    context: &Context,
+    armored: &str,
+    set_default: bool,
+    prefer_encrypt_required: bool,
+) -> Result<()> {
    // try hard to only modify key-state
    let (private_key, header) = SignedSecretKey::from_asc(armored)?;
    let public_key = private_key.split_public_key()?;
-    if let Some(preferencrypt) = header.get("Autocrypt-Prefer-Encrypt") {
-        let e2ee_enabled = match preferencrypt.as_str() {
-            "nopreference" => 0,
-            "mutual" => 1,
-            _ => {
-                bail!("invalid Autocrypt-Prefer-Encrypt header: {:?}", header);
+    let preferencrypt = header.get("Autocrypt-Prefer-Encrypt");
+    match preferencrypt.map(|s| s.as_str()) {
+        Some(headerval) => {
+            let e2ee_enabled = match headerval {
+                "nopreference" => 0,
+                "mutual" => 1,
+                _ => {
+                    bail!("invalid Autocrypt-Prefer-Encrypt header: {:?}", header);
+                }
+            };
+            context
+                .sql
+                .set_raw_config_int("e2ee_enabled", e2ee_enabled)
+                .await?;
+        }
+        None => {
+            if prefer_encrypt_required {
+                bail!("missing Autocrypt-Prefer-Encrypt header");
            }
-        };
-        context
-            .sql
-            .set_raw_config_int("e2ee_enabled", e2ee_enabled)
-            .await?;
-    } else {
-        // `Autocrypt-Prefer-Encrypt` is not included
-        // in keys exported to file.
-        //
-        // `Autocrypt-Prefer-Encrypt` also SHOULD be sent
-        // in Autocrypt Setup Message according to Autocrypt specification,
-        // but K-9 6.802 does not include this header.
-        //
-        // We keep current setting in this case.
-        info!(context, "No Autocrypt-Prefer-Encrypt header.");
+        }
    };

    let self_addr = context.get_primary_self_addr().await?;
@@ -603,7 +604,7 @@ async fn export_backup_inner(
 async fn import_secret_key(context: &Context, path: &Path, set_default: bool) -> Result<()> {
    let buf = read_file(context, &path).await?;
    let armored = std::string::String::from_utf8_lossy(&buf);
-    set_self_key(context, &armored, set_default).await?;
+    set_self_key(context, &armored, set_default, false).await?;
    Ok(())
 }

@@ -824,7 +825,6 @@ mod tests {

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

@@ -834,17 +834,15 @@ mod tests {
        let msg = render_setup_file(&t, "hello").await.unwrap();
        println!("{}", &msg);
        // Check some substrings, indicating things got substituted.
+        // In particular note the mixing of `\r\n` and `\n` depending
+        // on who generated the strings.
        assert!(msg.contains("<title>Autocrypt Setup Message</title"));
        assert!(msg.contains("<h1>Autocrypt Setup Message</h1>"));
        assert!(msg.contains("<p>This is the Autocrypt Setup Message used to"));
        assert!(msg.contains("-----BEGIN PGP MESSAGE-----\r\n"));
        assert!(msg.contains("Passphrase-Format: numeric9x4\r\n"));
-        assert!(msg.contains("Passphrase-Begin: he\r\n"));
-        assert!(msg.contains("-----END PGP MESSAGE-----\r\n"));
-
-        for line in msg.rsplit_terminator('\n') {
-            assert!(line.ends_with('\r'));
-        }
+        assert!(msg.contains("Passphrase-Begin: he\n"));
+        assert!(msg.contains("-----END PGP MESSAGE-----\n"));
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -1195,22 +1193,4 @@ mod tests {

        Ok(())
    }
-
-    /// Tests reception of Autocrypt Setup Message from K-9 6.802.
-    ///
-    /// Unlike Autocrypt Setup Message sent by Delta Chat,
-    /// this message does not contain `Autocrypt-Prefer-Encrypt` header.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_key_transfer_k_9() -> Result<()> {
-        let t = &TestContext::new().await;
-        t.configure_addr("autocrypt@nine.testrun.org").await;
-
-        let raw = include_bytes!("../test-data/message/k-9-autocrypt-setup-message.eml");
-        let received = receive_imf(t, raw, false).await?.unwrap();
-
-        let setup_code = "0655-9868-8252-5455-4232-5158-1237-5333-2638";
-        continue_key_transfer(t, *received.msg_ids.last().unwrap(), setup_code).await?;
-
-        Ok(())
-    }
 }
@@ -656,12 +656,6 @@ mod tests {
        let text = fs::read_to_string(&path).await.unwrap();
        assert_eq!(text, "i am attachment");

-        let path = path.with_file_name("saved.txt");
-        msg.save_file(&ctx1, &path).await.unwrap();
-        let text = fs::read_to_string(&path).await.unwrap();
-        assert_eq!(text, "i am attachment");
-        assert!(msg.save_file(&ctx1, &path).await.is_err());
-
        // Check that both received the ImexProgress events.
        ctx0.evtracker
            .get_matching(|ev| matches!(ev, EventType::ImexProgress(1000)))
@@ -1,14 +1,4 @@
 //! Location handling.
-//!
-//! Delta Chat handles two kind of locations.
-//!
-//! There are two kinds of locations:
-//! - Independent locations, also known as Points of Interest (POI).
-//! - Path locations.
-//!
-//! Locations are sent as KML attachments.
-//! Independent locations are sent in `message.kml` attachments
-//! and path locations are sent in `location.kml` attachments.

 use std::time::Duration;

@@ -18,7 +8,6 @@ use quick_xml::events::{BytesEnd, BytesStart, BytesText};
 use tokio::time::timeout;

 use crate::chat::{self, ChatId};
-use crate::constants::DC_CHAT_ID_TRASH;
 use crate::contact::ContactId;
 use crate::context::Context;
 use crate::events::EventType;
@@ -361,7 +350,6 @@ pub async fn set(context: &Context, latitude: f64, longitude: f64, accuracy: f64
        )
        .await?;

-    let mut stored_location = false;
    for chat_id in chats {
        context.sql.execute(
                "INSERT INTO locations  \
@@ -374,18 +362,13 @@ pub async fn set(context: &Context, latitude: f64, longitude: f64, accuracy: f64
                    chat_id,
                    ContactId::SELF,
                )).await.context("Failed to store location")?;
-        stored_location = true;

        info!(context, "Stored location for chat {chat_id}.");
        continue_streaming = true;
    }
    if continue_streaming {
-        context.emit_location_changed(Some(ContactId::SELF)).await?;
+        context.emit_event(EventType::LocationChanged(Some(ContactId::SELF)));
    };
-    if stored_location {
-        // Interrupt location loop so it may send a location-only message.
-        context.scheduler.interrupt_location().await;
-    }

    Ok(continue_streaming)
 }
@@ -474,59 +457,7 @@ fn is_marker(txt: &str) -> bool {
 /// Deletes all locations from the database.
 pub async fn delete_all(context: &Context) -> Result<()> {
    context.sql.execute("DELETE FROM locations;", ()).await?;
-    context.emit_location_changed(None).await?;
-    Ok(())
-}
-
-/// Deletes expired locations.
-///
-/// 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,),
-        )
-        .await?
-        > 0;
-    if deleted {
-        info!(context, "Deleted {deleted} expired locations.");
-        context.emit_location_changed(None).await?;
-    }
-    Ok(())
-}
-
-/// Deletes location if it is an independent location.
-///
-/// This function is used when a message is deleted
-/// that has a corresponding `location_id`.
-pub(crate) async fn delete_poi_location(context: &Context, location_id: u32) -> Result<()> {
-    context
-        .sql
-        .execute(
-            "DELETE FROM locations WHERE independent = 1 AND id=?",
-            (location_id as i32,),
-        )
-        .await?;
-    Ok(())
-}
-
-/// Deletes POI locations that don't have corresponding message anymore.
-pub(crate) async fn delete_orphaned_poi_locations(context: &Context) -> Result<()> {
-    context.sql.execute("
-    DELETE FROM locations
-    WHERE independent=1 AND id NOT IN
-    (SELECT location_id from MSGS LEFT JOIN locations
-     ON locations.id=location_id
-     WHERE location_id>0 -- This check makes the query faster by not looking for locations with ID 0 that don't exist.
-     AND msgs.chat_id != ?)", (DC_CHAT_ID_TRASH,)).await?;
+    context.emit_event(EventType::LocationChanged(None));
    Ok(())
 }

@@ -884,10 +815,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 +966,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 +974,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(())
    }
@@ -6,7 +6,6 @@ use std::path::{Path, PathBuf};
 use anyhow::{ensure, format_err, Context as _, Result};
 use deltachat_derive::{FromSql, ToSql};
 use serde::{Deserialize, Serialize};
-use tokio::{fs, io};

 use crate::blob::BlobObject;
 use crate::chat::{Chat, ChatId};
@@ -22,7 +21,6 @@ use crate::download::DownloadState;
 use crate::ephemeral::{start_ephemeral_timers_msgids, Timer as EphemeralTimer};
 use crate::events::EventType;
 use crate::imap::markseen_on_imap_table;
-use crate::location::delete_poi_location;
 use crate::mimeparser::{parse_message_id, SystemMessage};
 use crate::param::{Param, Params};
 use crate::pgp::split_armored_data;
@@ -85,16 +83,6 @@ impl MsgId {
        Ok(result)
    }

-    pub(crate) async fn get_param(self, context: &Context) -> Result<Params> {
-        let res: Option<String> = context
-            .sql
-            .query_get_value("SELECT param FROM msgs WHERE id=?", (self,))
-            .await?;
-        Ok(res
-            .map(|s| s.parse().unwrap_or_default())
-            .unwrap_or_default())
-    }
-
    /// Put message into trash chat and delete message text.
    ///
    /// It means the message is deleted locally, but not on the server.
@@ -607,19 +595,6 @@ impl Message {
        self.param.get_path(Param::File, context).unwrap_or(None)
    }

-    /// Save file copy at the user-provided path.
-    pub async fn save_file(&self, context: &Context, path: &Path) -> Result<()> {
-        let path_src = self.get_file(context).context("No file")?;
-        let mut src = fs::OpenOptions::new().read(true).open(path_src).await?;
-        let mut dst = fs::OpenOptions::new()
-            .write(true)
-            .create_new(true)
-            .open(path)
-            .await?;
-        io::copy(&mut src, &mut dst).await?;
-        Ok(())
-    }
-
    /// If message is an image or gif, set Param::Width and Param::Height
    pub(crate) async fn try_calc_and_set_dimensions(&mut self, context: &Context) -> Result<()> {
        if self.viewtype.has_file() {
@@ -655,11 +630,13 @@ 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.
+    /// 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,
    ///
-    /// [`location::get_range()`]: crate::location::get_range
+    /// @memberof Message
+    /// @param msg The message object.
+    /// @return 1=Message has location bound to it, 0=No location bound to message.
    pub fn has_location(&self) -> bool {
        self.location_id != 0
    }
@@ -669,17 +646,13 @@ impl Message {
    /// at a position different from the self-location.
    /// You should not call this function
    /// if you want to bind the current self-location to a message;
-    /// this is done by [`location::set()`] and [`send_locations_to_chat()`].
+    /// this is done by set_location() and send_locations_to_chat().
    ///
-    /// Typically results in the event [`LocationChanged`] with
-    /// `contact_id` set to [`ContactId::SELF`].
+    /// Typically results in the event #DC_EVENT_LOCATION_CHANGED with
+    /// contact_id set to ContactId::SELF.
    ///
-    /// `latitude` is the North-south position of the location.
-    /// `longitutde` is the East-west position of the location.
-    ///
-    /// [`location::set()`]: crate::location::set
-    /// [`send_locations_to_chat()`]: crate::location::send_locations_to_chat
-    /// [`LocationChanged`]: crate::events::EventType::LocationChanged
+    /// @param latitude North-south position of the location.
+    /// @param longitude East-west position of the location.
    pub fn set_location(&mut self, latitude: f64, longitude: f64) {
        if latitude == 0.0 && longitude == 0.0 {
            return;
@@ -1060,7 +1033,6 @@ impl Message {
        filemime: Option<&str>,
    ) -> Result<()> {
        let blob = BlobObject::create(context, suggested_name, data).await?;
-        self.param.set(Param::Filename, suggested_name);
        self.param.set(Param::File, blob.as_name());
        self.param.set_optional(Param::MimeType, filemime);
        Ok(())
@@ -1130,7 +1102,7 @@ impl Message {
                .get_bool(Param::GuaranteeE2ee)
                .unwrap_or_default()
            {
-                self.param.set(Param::ProtectQuote, "1");
+                self.param.set(Param::GuaranteeE2ee, "1");
            }

            let text = quote.get_text();
@@ -1574,6 +1546,17 @@ pub async fn delete_msgs(context: &Context, msg_ids: &[MsgId]) -> Result<()> {
    Ok(())
 }

+async fn delete_poi_location(context: &Context, location_id: u32) -> Result<()> {
+    context
+        .sql
+        .execute(
+            "DELETE FROM locations WHERE independent = 1 AND id=?;",
+            (location_id as i32,),
+        )
+        .await?;
+    Ok(())
+}
+
 /// Marks requested messages as seen.
 pub async fn markseen_msgs(context: &Context, msg_ids: Vec<MsgId>) -> Result<()> {
    if msg_ids.is_empty() {
@@ -1650,7 +1633,9 @@ pub async fn markseen_msgs(context: &Context, msg_ids: Vec<MsgId>) -> Result<()>
        _curr_ephemeral_timer,
    ) in msgs
    {
-        if curr_state == MessageState::InFresh || curr_state == MessageState::InNoticed {
+        if curr_blocked == Blocked::Not
+            && (curr_state == MessageState::InFresh || curr_state == MessageState::InNoticed)
+        {
            update_msg_state(context, id, MessageState::InSeen).await?;
            info!(context, "Seen message {}.", id);

@@ -1662,11 +1647,7 @@ pub async fn markseen_msgs(context: &Context, msg_ids: Vec<MsgId>) -> Result<()>
            // "Group left by me", a read receipt will quote "Group left by <name>", and the name can
            // be a display name stored in address book rather than the name sent in the From field by
            // the user.
-            //
-            // We also don't send read receipts for contact requests.
-            // Read receipts will not be sent even after accepting the chat.
-            if curr_blocked == Blocked::Not
-                && curr_param.get_bool(Param::WantsMdn).unwrap_or_default()
+            if curr_param.get_bool(Param::WantsMdn).unwrap_or_default()
                && curr_param.get_cmd() == SystemMessage::Unknown
            {
                let mdns_enabled = context.get_config_bool(Config::MdnsEnabled).await?;
@@ -2007,11 +1988,8 @@ mod tests {
    use num_traits::FromPrimitive;

    use super::*;
-    use crate::chat::{
-        self, add_contact_to_chat, marknoticed_chat, send_text_msg, ChatItem, ProtectionStatus,
-    };
+    use crate::chat::{self, marknoticed_chat, send_text_msg, ChatItem};
    use crate::chatlist::Chatlist;
-    use crate::config::Config;
    use crate::reaction::send_reaction;
    use crate::receive_imf::receive_imf;
    use crate::test_utils as test;
@@ -2035,6 +2013,8 @@ mod tests {

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_prepare_message_and_send() {
+        use crate::config::Config;
+
        let d = test::TestContext::new().await;
        let ctx = &d.ctx;

@@ -2173,6 +2153,8 @@ mod tests {

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_quote() {
+        use crate::config::Config;
+
        let d = test::TestContext::new().await;
        let ctx = &d.ctx;

@@ -2205,42 +2187,6 @@ mod tests {
        assert_eq!(quoted_msg.get_text(), msg2.quoted_text().unwrap());
    }

-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_unencrypted_quote_encrypted_message() -> Result<()> {
-        let mut tcm = TestContextManager::new();
-
-        let alice = &tcm.alice().await;
-        let bob = &tcm.bob().await;
-
-        let alice_group = alice
-            .create_group_with_members(ProtectionStatus::Unprotected, "Group chat", &[bob])
-            .await;
-        let sent = alice.send_text(alice_group, "Hi! I created a group").await;
-        let bob_received_message = bob.recv_msg(&sent).await;
-
-        let bob_group = bob_received_message.chat_id;
-        bob_group.accept(bob).await?;
-        let sent = bob.send_text(bob_group, "Encrypted message").await;
-        let alice_received_message = alice.recv_msg(&sent).await;
-        assert!(alice_received_message.get_showpadlock());
-
-        // Alice adds contact without key so chat becomes unencrypted.
-        let alice_flubby_contact_id =
-            Contact::create(alice, "Flubby", "flubby@example.org").await?;
-        add_contact_to_chat(alice, alice_group, alice_flubby_contact_id).await?;
-
-        // Alice quotes encrypted message in unencrypted chat.
-        let mut msg = Message::new(Viewtype::Text);
-        msg.set_quote(alice, Some(&alice_received_message)).await?;
-        chat::send_msg(alice, alice_group, &mut msg).await?;
-
-        let bob_received_message = bob.recv_msg(&alice.pop_sent_msg().await).await;
-        assert_eq!(bob_received_message.quoted_text().unwrap(), "...");
-        assert_eq!(bob_received_message.get_showpadlock(), false);
-
-        Ok(())
-    }
-
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_get_chat_id() {
        // Alice receives a message that pops up as a contact request
@@ -669,19 +669,19 @@ impl<'a> MimeFactory<'a> {

        let mut is_gossiped = false;

-        let peerstates = self.peerstates_for_recipients(context).await?;
-        let should_encrypt =
-            encrypt_helper.should_encrypt(context, e2ee_guaranteed, &peerstates)?;
-        let is_encrypted = should_encrypt && !force_plaintext;
-
        let (main_part, parts) = match self.loaded {
            Loaded::Message { .. } => {
-                self.render_message(context, &mut headers, &grpimage, is_encrypted)
+                self.render_message(context, &mut headers, &grpimage)
                    .await?
            }
            Loaded::Mdn { .. } => (self.render_mdn(context).await?, Vec::new()),
        };

+        let peerstates = self.peerstates_for_recipients(context).await?;
+        let should_encrypt =
+            encrypt_helper.should_encrypt(context, e2ee_guaranteed, &peerstates)?;
+        let is_encrypted = should_encrypt && !force_plaintext;
+
        let message = if parts.is_empty() {
            // Single part, render as regular message.
            main_part
@@ -960,7 +960,6 @@ impl<'a> MimeFactory<'a> {
        context: &Context,
        headers: &mut MessageHeaders,
        grpimage: &Option<String>,
-        is_encrypted: bool,
    ) -> Result<(PartBuilder, Vec<PartBuilder>)> {
        let chat = match &self.loaded {
            Loaded::Message { chat } => chat,
@@ -1222,16 +1221,6 @@ impl<'a> MimeFactory<'a> {
            .msg
            .quoted_text()
            .map(|quote| format_flowed_quote(&quote) + "\r\n\r\n");
-        if !is_encrypted
-            && self
-                .msg
-                .param
-                .get_bool(Param::ProtectQuote)
-                .unwrap_or_default()
-        {
-            // Message is not encrypted but quotes encrypted message.
-            quoted_text = Some("> ...\r\n\r\n".to_string());
-        }
        if quoted_text.is_none() && final_text.starts_with('>') {
            // Insert empty line to avoid receiver treating user-sent quote as topquote inserted by
            // Delta Chat.
@@ -415,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);
                }
@@ -492,7 +494,7 @@ impl MimeMessage {
            },
        };

-        if parser.mdn_reports.is_empty() && parser.webxdc_status_update.is_none() {
+        if parser.mdn_reports.is_empty() {
            // "Auto-Submitted" is also set by holiday-notices so we also check "chat-version".
            let is_bot = parser.headers.get("auto-submitted")
                == Some(&"auto-generated".to_string())
@@ -504,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;
        }
@@ -653,34 +662,32 @@ impl MimeMessage {
            self.squash_attachment_parts();
        }

-        if !context.get_config_bool(Config::Bot).await? {
-            if let Some(ref subject) = self.get_subject() {
-                let mut prepend_subject = true;
-                if !self.decrypting_failed {
-                    let colon = subject.find(':');
-                    if colon == Some(2)
-                        || colon == Some(3)
-                        || self.has_chat_version()
-                        || subject.contains("Chat:")
-                    {
-                        prepend_subject = false
-                    }
+        if let Some(ref subject) = self.get_subject() {
+            let mut prepend_subject = true;
+            if !self.decrypting_failed {
+                let colon = subject.find(':');
+                if colon == Some(2)
+                    || colon == Some(3)
+                    || self.has_chat_version()
+                    || subject.contains("Chat:")
+                {
+                    prepend_subject = false
                }
+            }

-                // For mailing lists, always add the subject because sometimes there are different topics
-                // and otherwise it might be hard to keep track:
-                if self.is_mailinglist_message() && !self.has_chat_version() {
-                    prepend_subject = true;
-                }
+            // For mailing lists, always add the subject because sometimes there are different topics
+            // and otherwise it might be hard to keep track:
+            if self.is_mailinglist_message() && !self.has_chat_version() {
+                prepend_subject = true;
+            }

-                if prepend_subject && !subject.is_empty() {
-                    let part_with_text = self
-                        .parts
-                        .iter_mut()
-                        .find(|part| !part.msg.is_empty() && !part.is_reaction);
-                    if let Some(part) = part_with_text {
-                        part.msg = format!("{} – {}", subject, part.msg);
-                    }
+            if prepend_subject && !subject.is_empty() {
+                let part_with_text = self
+                    .parts
+                    .iter_mut()
+                    .find(|part| !part.msg.is_empty() && !part.is_reaction);
+                if let Some(part) = part_with_text {
+                    part.msg = format!("{} – {}", subject, part.msg);
                }
            }
        }
@@ -3926,31 +3933,4 @@ Content-Disposition: reaction\n\

        Ok(())
    }
-
-    /// Tests that subject is not prepended to the message
-    /// when bot receives it.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_bot_no_subject() {
-        let context = TestContext::new().await;
-        context.set_config(Config::Bot, Some("1")).await.unwrap();
-        let raw = br#"Message-ID: <foobar@example.org>
-From: foo <foo@example.org>
-Subject: Some subject
-To: bar@example.org
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-
-/help
-"#;
-
-        let message = MimeMessage::from_bytes(&context.ctx, &raw[..], None)
-            .await
-            .unwrap();
-        assert_eq!(message.get_subject(), Some("Some subject".to_string()));
-
-        assert_eq!(message.parts.len(), 1);
-        assert_eq!(message.parts[0].typ, Viewtype::Text);
-        // Not "Some subject – /help"
-        assert_eq!(message.parts[0].msg, "/help");
-    }
 }
@@ -48,11 +48,6 @@ pub enum Param {
    /// For Messages: message is encrypted, outgoing: guarantee E2EE or the message is not send
    GuaranteeE2ee = b'c',

-    /// For Messages: quoted message is encrypted.
-    ///
-    /// If this message is sent unencrypted, quote text should be replaced.
-    ProtectQuote = b'0',
-
    /// For Messages: decrypted with validation errors or without mutual set, if neither
    /// 'c' nor 'e' are preset, the messages is only transport encrypted.
    ErroneousE2ee = b'e',
@@ -192,12 +187,6 @@ pub enum Param {
    /// For Webxdc Message Instances: timestamp of summary update.
    WebxdcSummaryTimestamp = b'Q',

-    /// For Webxdc Message Instances: Webxdc is an integration, see init_webxdc_integration()
-    WebxdcIntegration = b'3',
-
-    /// For Webxdc Message Instances: Chat to integrate the Webxdc for.
-    WebxdcIntegrateFor = b'2',
-
    /// For messages: Whether [crate::message::Viewtype::Sticker] should be forced.
    ForceSticker = b'X',
    // 'L' was defined as ProtectionSettingsTimestamp for Chats, however, never used in production.
@@ -449,8 +449,7 @@ mod tests {
        assert_ne!(keypair0.public, keypair1.public);
    }

-    /// [SignedSecretKey] and [SignedPublicKey] objects
-    /// to use in tests.
+    /// [Key] objects to use in tests.
    struct TestKeys {
        alice_secret: SignedSecretKey,
        alice_public: SignedPublicKey,
@@ -1669,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 {
@@ -1686,7 +1687,7 @@ async fn save_locations(
        }
    }
    if send_event {
-        context.emit_location_changed(Some(from_id)).await?;
+        context.emit_event(EventType::LocationChanged(Some(from_id)));
    }
    Ok(())
 }
@@ -2994,15 +2994,11 @@ async fn test_long_and_duplicated_filenames() -> Result<()> {
            let resulting_filename = msg.get_filename().unwrap();
            assert_eq!(resulting_filename, filename);
            let path = msg.get_file(t).unwrap();
-            let path2 = path.with_file_name("saved.txt");
-            msg.save_file(t, &path2).await.unwrap();
            assert!(
                path.to_str().unwrap().ends_with(".tar.gz"),
                "path {path:?} doesn't end with .tar.gz"
            );
-            assert_eq!(fs::read_to_string(&path).await.unwrap(), content);
-            assert_eq!(fs::read_to_string(&path2).await.unwrap(), content);
-            fs::remove_file(path2).await.unwrap();
+            assert_eq!(fs::read_to_string(path).await.unwrap(), content);
        }
        check_message(&msg_alice, &alice, filename_sent, &content).await;
        check_message(&msg_bob, &bob, filename_sent, &content).await;
@@ -1,4 +1,4 @@
-//! Implementation of [SecureJoin protocols](https://securejoin.delta.chat/).
+//! Verified contact protocol implementation as [specified by countermitm project](https://securejoin.readthedocs.io/en/latest/new.html#setup-contact-protocol).

 use anyhow::{bail, Context as _, Error, Result};
 use percent_encoding::{utf8_percent_encode, AsciiSet, NON_ALPHANUMERIC};
@@ -15,7 +15,6 @@ use crate::context::Context;
 use crate::debug_logging::set_debug_logging_xdc;
 use crate::ephemeral::start_ephemeral_timers;
 use crate::imex::BLOBS_BACKUP_NAME;
-use crate::location::delete_orphaned_poi_locations;
 use crate::log::LogExt;
 use crate::message::{Message, MsgId, Viewtype};
 use crate::param::{Param, Params};
@@ -780,14 +779,6 @@ pub async fn housekeeping(context: &Context) -> Result<()> {
        .log_err(context)
        .ok();

-    // Delete POI locations
-    // which don't have corresponding message.
-    delete_orphaned_poi_locations(context)
-        .await
-        .context("Failed to delete orphaned POI locations")
-        .log_err(context)
-        .ok();
-
    info!(context, "Housekeeping done.");
    Ok(())
 }
@@ -1016,6 +1007,8 @@ pub fn repeat_vars(count: usize) -> String {

 #[cfg(test)]
 mod tests {
+    use async_channel as channel;
+
    use super::*;
    use crate::{test_utils::TestContext, EventType};

@@ -1092,7 +1085,8 @@ mod tests {
            .await
            .unwrap();

-        let event_source = t.get_event_emitter();
+        let (event_sink, event_source) = channel::unbounded();
+        t.add_event_sender(event_sink).await;

        let a = t.get_config(Config::Selfavatar).await.unwrap().unwrap();
        assert_eq!(avatar_bytes, &tokio::fs::read(&a).await.unwrap()[..]);
@@ -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,
@@ -19,6 +19,7 @@ use pretty_assertions::assert_eq;
 use rand::Rng;
 use tempfile::{tempdir, TempDir};
 use tokio::runtime::Handle;
+use tokio::sync::RwLock;
 use tokio::{fs, task};

 use crate::chat::{
@@ -33,7 +34,7 @@ use crate::constants::{Blocked, Chattype};
 use crate::contact::{Contact, ContactId, Modifier, Origin};
 use crate::context::Context;
 use crate::e2ee::EncryptHelper;
-use crate::events::{Event, EventEmitter, EventType, Events};
+use crate::events::{Event, EventType, Events};
 use crate::key::{self, DcKey, KeyPairUse};
 use crate::message::{update_msg_state, Message, MessageState, MsgId, Viewtype};
 use crate::mimeparser::{MimeMessage, SystemMessage};
@@ -46,7 +47,7 @@ use crate::stock_str::StockStrings;
 #[allow(non_upper_case_globals)]
 pub const AVATAR_900x900_BYTES: &[u8] = include_bytes!("../test-data/image/avatar900x900.png");

-/// Map of context IDs to names for [`TestContext`]s.
+/// Map of [`Context::id`] to names for [`TestContext`]s.
 static CONTEXT_NAMES: Lazy<std::sync::RwLock<BTreeMap<u32, String>>> =
    Lazy::new(|| std::sync::RwLock::new(BTreeMap::new()));

@@ -56,19 +57,20 @@ static CONTEXT_NAMES: Lazy<std::sync::RwLock<BTreeMap<u32, String>>> =
 /// occurred rather than grouped by context like would happen when you use separate
 /// [`TestContext`]s without managing your own [`LogSink`].
 pub struct TestContextManager {
-    log_sink: LogSink,
+    log_tx: Sender<LogEvent>,
+    _log_sink: LogSink,
 }

 impl TestContextManager {
    pub fn new() -> Self {
-        let log_sink = LogSink::new();
-        Self { log_sink }
+        let (log_tx, _log_sink) = LogSink::create();
+        Self { log_tx, _log_sink }
    }

    pub async fn alice(&mut self) -> TestContext {
        TestContext::builder()
            .configure_alice()
-            .with_log_sink(self.log_sink.clone())
+            .with_log_sink(self.log_tx.clone())
            .build()
            .await
    }
@@ -76,7 +78,7 @@ impl TestContextManager {
    pub async fn bob(&mut self) -> TestContext {
        TestContext::builder()
            .configure_bob()
-            .with_log_sink(self.log_sink.clone())
+            .with_log_sink(self.log_tx.clone())
            .build()
            .await
    }
@@ -84,7 +86,7 @@ impl TestContextManager {
    pub async fn fiona(&mut self) -> TestContext {
        TestContext::builder()
            .configure_fiona()
-            .with_log_sink(self.log_sink.clone())
+            .with_log_sink(self.log_tx.clone())
            .build()
            .await
    }
@@ -92,7 +94,7 @@ impl TestContextManager {
    /// Creates a new unconfigured test account.
    pub async fn unconfigured(&mut self) -> TestContext {
        TestContext::builder()
-            .with_log_sink(self.log_sink.clone())
+            .with_log_sink(self.log_tx.clone())
            .build()
            .await
    }
@@ -101,8 +103,7 @@ impl TestContextManager {
    ///
    /// ========== `msg` goes here ==========
    pub fn section(&self, msg: &str) {
-        self.log_sink
-            .sender
+        self.log_tx
            .try_send(LogEvent::Section(msg.to_string()))
            .expect(
            "The events channel should be unbounded and not closed, so try_send() shouldn't fail",
@@ -189,31 +190,30 @@ impl TestContextManager {
    }
 }

-/// Builder for the [TestContext].
 #[derive(Debug, Clone, Default)]
 pub struct TestContextBuilder {
    key_pair: Option<KeyPair>,
-    log_sink: LogSink,
+    log_sink: Option<Sender<LogEvent>>,
 }

 impl TestContextBuilder {
    /// Configures as alice@example.org with fixed secret key.
    ///
-    /// This is a shortcut for `.with_key_pair(alice_keypair())`.
+    /// This is a shortcut for `.with_key_pair(alice_keypair()).
    pub fn configure_alice(self) -> Self {
        self.with_key_pair(alice_keypair())
    }

    /// Configures as bob@example.net with fixed secret key.
    ///
-    /// This is a shortcut for `.with_key_pair(bob_keypair())`.
+    /// This is a shortcut for `.with_key_pair(bob_keypair()).
    pub fn configure_bob(self) -> Self {
        self.with_key_pair(bob_keypair())
    }

    /// Configures as fiona@example.net with fixed secret key.
    ///
-    /// This is a shortcut for `.with_key_pair(fiona_keypair())`.
+    /// This is a shortcut for `.with_key_pair(bob_keypair()).
    pub fn configure_fiona(self) -> Self {
        self.with_key_pair(fiona_keypair())
    }
@@ -233,8 +233,8 @@ impl TestContextBuilder {
    /// using a single [`LogSink`] for both contexts.  This shows the log messages in
    /// sequence as they occurred rather than all messages from each context in a single
    /// block.
-    pub fn with_log_sink(mut self, sink: LogSink) -> Self {
-        self.log_sink = sink;
+    pub fn with_log_sink(mut self, sink: Sender<LogEvent>) -> Self {
+        self.log_sink = Some(sink);
        self
    }

@@ -242,7 +242,7 @@ impl TestContextBuilder {
    pub async fn build(self) -> TestContext {
        let name = self.key_pair.as_ref().map(|key| key.addr.local.clone());

-        let test_context = TestContext::new_internal(name, Some(self.log_sink.clone())).await;
+        let test_context = TestContext::new_internal(name, self.log_sink).await;

        if let Some(key_pair) = self.key_pair {
            test_context
@@ -257,24 +257,26 @@ impl TestContextBuilder {
 }

 /// A Context and temporary directory.
+///
+/// The temporary directory can be used to store the SQLite database,
+/// see e.g. [test_context] which does this.
 #[derive(Debug)]
 pub struct TestContext {
    pub ctx: Context,
-
-    /// Temporary directory used to store SQLite database.
    pub dir: TempDir,
-
    pub evtracker: EventTracker,
-
+    /// Channels which should receive events from this context.
+    event_senders: Arc<RwLock<Vec<Sender<Event>>>>,
    /// Reference to implicit [`LogSink`] so it is dropped together with the context.
    ///
    /// Only used if no explicit `log_sender` is passed into [`TestContext::new_internal`]
    /// (which is assumed to be the sending end of a [`LogSink`]).
    ///
    /// This is a convenience in case only a single [`TestContext`] is used to avoid dealing
-    /// with [`LogSink`].  Never read, since the only purpose is to
+    /// with [`LogSink`].  Never read, thus "dead code", since the only purpose is to
    /// control when Drop is invoked.
-    _log_sink: Option<LogSink>,
+    #[allow(dead_code)]
+    log_sink: Option<LogSink>,
 }

 impl TestContext {
@@ -296,7 +298,9 @@ impl TestContext {

    /// Creates a new configured [`TestContext`].
    ///
-    /// This is a shortcut which configures alice@example.org with a fixed key.
+    /// This is a shortcut which automatically calls [`TestContext::configure_alice`] after
+    /// creating the context.
+    /// alice-email: alice@example.org
    pub async fn new_alice() -> Self {
        Self::builder().configure_alice().build().await
    }
@@ -334,7 +338,7 @@ impl TestContext {
    /// `log_sender` is assumed to be the sender for a [`LogSink`].  If not supplied a new
    /// [`LogSink`] will be created so that events are logged to this test when the
    /// [`TestContext`] is dropped.
-    async fn new_internal(name: Option<String>, log_sink: Option<LogSink>) -> Self {
+    async fn new_internal(name: Option<String>, log_sender: Option<Sender<LogEvent>>) -> Self {
        let dir = tempdir().unwrap();
        let dbfile = dir.path().join("db.sqlite");
        let id = rand::thread_rng().gen();
@@ -342,23 +346,35 @@ impl TestContext {
            let mut context_names = CONTEXT_NAMES.write().unwrap();
            context_names.insert(id, name);
        }
-        let events = Events::new();
-        let evtracker_receiver = events.get_emitter();
-        let ctx = Context::new(&dbfile, id, events, StockStrings::new())
+        let ctx = Context::new(&dbfile, id, Events::new(), StockStrings::new())
            .await
            .expect("failed to create context");

-        let _log_sink = if let Some(log_sink) = log_sink {
-            // Subscribe existing LogSink and don't store reference to it.
-            log_sink.subscribe(ctx.get_event_emitter());
-            None
-        } else {
-            // Create new LogSink and store it inside the `TestContext`.
-            let log_sink = LogSink::new();
-            log_sink.subscribe(ctx.get_event_emitter());
-            Some(log_sink)
+        let events = ctx.get_event_emitter();
+
+        let (log_sender, log_sink) = match log_sender {
+            Some(sender) => (sender, None),
+            None => {
+                let (sender, sink) = LogSink::create();
+                (sender, Some(sink))
+            }
        };

+        let (evtracker_sender, evtracker_receiver) = channel::unbounded();
+        let event_senders = Arc::new(RwLock::new(vec![evtracker_sender]));
+        let senders = Arc::clone(&event_senders);
+
+        task::spawn(async move {
+            while let Some(event) = events.recv().await {
+                for sender in senders.read().await.iter() {
+                    // Don't block because someone wanted to use a oneshot receiver, use
+                    // an unbounded channel if you want all events.
+                    sender.try_send(event.clone()).ok();
+                }
+                log_sender.try_send(LogEvent::Event(event.clone())).ok();
+            }
+        });
+
        ctx.set_config(Config::SkipStartMessages, Some("1"))
            .await
            .unwrap();
@@ -368,7 +384,8 @@ impl TestContext {
            ctx,
            dir,
            evtracker: EventTracker(evtracker_receiver),
-            _log_sink,
+            event_senders,
+            log_sink,
        }
    }

@@ -391,6 +408,14 @@ impl TestContext {
        context_names.get(id).unwrap_or(&id.to_string()).to_string()
    }

+    /// Adds a new [`Event`]s sender.
+    ///
+    /// Once added, all events emitted by this context will be sent to this channel.  This
+    /// is useful if you need to wait for events or make assertions on them.
+    pub async fn add_event_sender(&self, sink: Sender<Event>) {
+        self.event_senders.write().await.push(sink)
+    }
+
    /// Configure as a given email address.
    ///
    /// The context will be configured but the key will not be pre-generated so if a key is
@@ -473,7 +498,7 @@ impl TestContext {
    ///
    /// Parsing a message does not run the entire receive pipeline, but is not without
    /// side-effects either.  E.g. if the message includes autocrypt headers the relevant
-    /// peerstates will be updated.  Later receiving the message using [Self.recv_msg()] is
+    /// peerstates will be updated.  Later receiving the message using [recv_msg] is
    /// unlikely to be affected as the peerstate would be processed again in exactly the
    /// same way.
    pub(crate) async fn parse_msg(&self, msg: &SentMessage<'_>) -> MimeMessage {
@@ -825,62 +850,22 @@ pub enum LogEvent {
 /// This sink achieves this by printing the events, in the order received, at the time it is
 /// dropped.  Thus to use you must only make sure this sink is dropped in the test itself.
 ///
-/// To use this create an instance using [`LogSink::new`] and then use the
-/// [`TestContextBuilder::with_log_sink`] or use [`TestContextManager`].
-#[derive(Debug, Clone, Default)]
-pub struct LogSink(Arc<InnerLogSink>);
+/// To use this create an instance using [`LogSink::create`] and then use the
+/// [`TestContextBuilder::with_log_sink`].
+#[derive(Debug)]
+pub struct LogSink {
+    events: Receiver<LogEvent>,
+}

 impl LogSink {
    /// Creates a new [`LogSink`] and returns the attached event sink.
-    pub fn new() -> Self {
-        Default::default()
-    }
-}
-
-impl Deref for LogSink {
-    type Target = InnerLogSink;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-#[derive(Debug)]
-pub struct InnerLogSink {
-    events: Receiver<LogEvent>,
-
-    /// Sender side of the log receiver.
-    ///
-    /// It is cloned when log sink is subscribed
-    /// to new event emitter
-    /// and can be used directly from the test to
-    /// add "sections" to the log.
-    sender: Sender<LogEvent>,
-}
-
-impl Default for InnerLogSink {
-    fn default() -> Self {
+    pub fn create() -> (Sender<LogEvent>, Self) {
        let (tx, rx) = channel::unbounded();
-        Self {
-            events: rx,
-            sender: tx,
-        }
+        (tx, Self { events: rx })
    }
 }

-impl InnerLogSink {
-    /// Subscribes this log sink to event emitter.
-    pub fn subscribe(&self, event_emitter: EventEmitter) {
-        let sender = self.sender.clone();
-        task::spawn(async move {
-            while let Some(event) = event_emitter.recv().await {
-                sender.try_send(LogEvent::Event(event.clone())).ok();
-            }
-        });
-    }
-}
-
-impl Drop for InnerLogSink {
+impl Drop for LogSink {
    fn drop(&mut self) {
        while let Ok(event) = self.events.try_recv() {
            print_logevent(&event);
@@ -991,10 +976,10 @@ pub fn fiona_keypair() -> KeyPair {
 /// be attached to a single [`TestContext`] and therefore the context is already known as
 /// you will be accessing it as [`TestContext::evtracker`].
 #[derive(Debug)]
-pub struct EventTracker(EventEmitter);
+pub struct EventTracker(Receiver<Event>);

 impl Deref for EventTracker {
-    type Target = EventEmitter;
+    type Target = Receiver<Event>;

    fn deref(&self) -> &Self::Target {
        &self.0
@@ -1040,9 +1025,9 @@ impl EventTracker {
            .await;
    }

-    /// Clears event queue.
+    /// Clears event queue
    pub fn clear_events(&self) {
-        while let Ok(_ev) = self.try_recv() {}
+        while self.try_recv().is_ok() {}
    }
 }

@@ -2,7 +2,7 @@
 //!
 //! Functions to read/write token from/to the database. A token is any string associated with a key.
 //!
-//! Tokens are used in SecureJoin verification protocols.
+//! Tokens are used in countermitm verification protocols.

 use anyhow::Result;
 use deltachat_derive::{FromSql, ToSql};
@@ -683,12 +683,7 @@ pub(crate) fn buf_decompress(buf: &[u8]) -> Result<Vec<u8>> {
 mod tests {
    #![allow(clippy::indexing_slicing)]

-    use chrono::NaiveDate;
-    use proptest::prelude::*;
-
    use super::*;
-    use crate::chatlist::Chatlist;
-    use crate::{chat, test_utils};
    use crate::{receive_imf::receive_imf, test_utils::TestContext};

    #[test]
@@ -735,7 +730,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 +749,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;
    }

@@ -966,6 +961,12 @@ DKIM Results: Passed=true";
        assert!(extract_grpid_from_rfc724_mid(mid.as_str()).is_none());
    }

+    use chrono::NaiveDate;
+    use proptest::prelude::*;
+
+    use crate::chatlist::Chatlist;
+    use crate::{chat, test_utils};
+
    proptest! {
        #[test]
        fn test_truncate(
@@ -15,9 +15,6 @@
 //! - `last_serial` - serial number of the last status update to send
 //! - `descr` - text to send along with the updates

-mod integration;
-mod maps_integration;
-
 use std::path::Path;

 use anyhow::{anyhow, bail, ensure, format_err, Context as _, Result};
@@ -459,12 +456,6 @@ impl Context {
            bail!("send_webxdc_status_update: message {instance_msg_id} is not a webxdc message, but a {viewtype} message.");
        }

-        if instance.param.get_int(Param::WebxdcIntegration).is_some() {
-            return self
-                .intercept_send_webxdc_status_update(instance, status_update)
-                .await;
-        }
-
        let chat_id = instance.chat_id;
        let chat = Chat::load_from_db(self, chat_id)
            .await
@@ -634,14 +625,6 @@ impl Context {
        instance_msg_id: MsgId,
        last_known_serial: StatusUpdateSerial,
    ) -> Result<String> {
-        let param = instance_msg_id.get_param(self).await?;
-        if param.get_int(Param::WebxdcIntegration).is_some() {
-            let instance = Message::load_from_db(self, instance_msg_id).await?;
-            return self
-                .intercept_get_webxdc_status_updates(instance, last_known_serial)
-                .await;
-        }
-
        let json = self
            .sql
            .query_map(
@@ -862,7 +845,6 @@ impl Message {
 mod tests {
    use std::time::Duration;

-    use regex::Regex;
    use serde_json::json;

    use super::*;
@@ -1712,6 +1694,8 @@ mod tests {

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_render_webxdc_status_update_object_range() -> Result<()> {
+        use regex::Regex;
+
        let t = TestContext::new_alice().await;
        let chat_id = create_group_chat(&t, ProtectionStatus::Unprotected, "a chat").await?;
        let instance = send_webxdc_instance(&t, chat_id).await?;
@@ -2688,8 +2672,6 @@ sth_for_the = "future""#
        Ok(())
    }

-    // NB: This test also checks that a contact is not marked as bot after receiving from it a
-    // webxdc instance and status updates.
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_status_update_vs_delete_device_after() -> Result<()> {
        let alice = &TestContext::new_alice().await;
@@ -2699,7 +2681,6 @@ sth_for_the = "future""#
        let alice_chat = alice.create_chat(bob).await;
        let alice_instance = send_webxdc_instance(alice, alice_chat.id).await?;
        let bob_instance = bob.recv_msg(&alice.pop_sent_msg().await).await;
-        assert_eq!(bob.add_or_lookup_contact(alice).await.is_bot(), false);

        SystemTime::shift(Duration::from_secs(1800));
        let mut update = Message {
@@ -2716,13 +2697,11 @@ sth_for_the = "future""#
        update.set_quote(alice, Some(&alice_instance)).await?;
        let sent_msg = alice.send_msg(alice_chat.id, &mut update).await;
        bob.recv_msg_trash(&sent_msg).await;
-        assert_eq!(bob.add_or_lookup_contact(alice).await.is_bot(), false);
        assert_eq!(
            bob.get_webxdc_status_updates(bob_instance.id, StatusUpdateSerial(0))
                .await?,
            r#"[{"payload":{"foo":"bar"},"serial":1,"max_serial":1}]"#
        );
-        assert_eq!(bob.add_or_lookup_contact(alice).await.is_bot(), false);

        SystemTime::shift(Duration::from_secs(2700));
        ephemeral::delete_expired_messages(bob, tools::time()).await?;
@@ -1,129 +0,0 @@
-use crate::chat::{send_msg, ChatId};
-use crate::config::Config;
-use crate::contact::ContactId;
-use crate::context::Context;
-use crate::message::{Message, MsgId, Viewtype};
-use crate::param::Param;
-use crate::webxdc::{maps_integration, StatusUpdateItem, StatusUpdateSerial};
-use anyhow::Result;
-
-impl Context {
-    /// Sets Webxdc file as integration.
-    /// `file` is the .xdc to use as Webxdc integration.
-    pub async fn set_webxdc_integration(&self, file: &str) -> Result<()> {
-        let chat_id = ChatId::create_for_contact(self, ContactId::SELF).await?;
-        let mut msg = Message::new(Viewtype::Webxdc);
-        msg.set_file(file, None);
-        msg.hidden = true;
-        msg.param.set_int(Param::WebxdcIntegration, 1);
-        msg.param.set_int(Param::GuaranteeE2ee, 1); // needed to pass `internet_access` requirements
-        send_msg(self, chat_id, &mut msg).await?;
-        Ok(())
-    }
-
-    /// 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.
-    pub async fn init_webxdc_integration(
-        &self,
-        integrate_for: Option<ChatId>,
-    ) -> Result<Option<MsgId>> {
-        let Some(instance_id) = self
-            .get_config_parsed::<u32>(Config::WebxdcIntegration)
-            .await?
-        else {
-            return Ok(None);
-        };
-
-        let Some(mut instance) =
-            Message::load_from_db_optional(self, MsgId::new(instance_id)).await?
-        else {
-            return Ok(None);
-        };
-
-        if instance.viewtype != Viewtype::Webxdc {
-            return Ok(None);
-        }
-
-        let integrate_for = integrate_for.unwrap_or_default().to_u32() as i32;
-        if instance.param.get_int(Param::WebxdcIntegrateFor) != Some(integrate_for) {
-            instance
-                .param
-                .set_int(Param::WebxdcIntegrateFor, integrate_for);
-            instance.update_param(self).await?;
-        }
-        Ok(Some(instance.id))
-    }
-
-    // Check if a Webxdc shall be used as an integration and remember that.
-    pub(crate) async fn update_webxdc_integration_database(&self, msg: &Message) -> Result<()> {
-        if msg.viewtype == Viewtype::Webxdc && msg.param.get_int(Param::WebxdcIntegration).is_some()
-        {
-            self.set_config_internal(
-                Config::WebxdcIntegration,
-                Some(&msg.id.to_u32().to_string()),
-            )
-            .await?;
-        }
-        Ok(())
-    }
-
-    // Intercepts sending updates from Webxdc to core.
-    pub(crate) async fn intercept_send_webxdc_status_update(
-        &self,
-        instance: Message,
-        status_update: StatusUpdateItem,
-    ) -> Result<()> {
-        let chat_id = instance.webxdc_integrated_for();
-        maps_integration::intercept_send_update(self, chat_id, status_update).await
-    }
-
-    // Intercepts Webxdc requesting updates from core.
-    pub(crate) async fn intercept_get_webxdc_status_updates(
-        &self,
-        instance: Message,
-        last_known_serial: StatusUpdateSerial,
-    ) -> Result<String> {
-        let chat_id = instance.webxdc_integrated_for();
-        maps_integration::intercept_get_updates(self, chat_id, last_known_serial).await
-    }
-}
-
-impl Message {
-    // Get chat the Webxdc is integrated for.
-    // This is the chat given to `init_webxdc_integration()`.
-    fn webxdc_integrated_for(&self) -> Option<ChatId> {
-        let raw_id = self.param.get_int(Param::WebxdcIntegrateFor).unwrap_or(0) as u32;
-        if raw_id > 0 {
-            Some(ChatId::new(raw_id))
-        } else {
-            None
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::config::Config;
-    use crate::test_utils::TestContext;
-    use anyhow::Result;
-    use std::time::Duration;
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_default_integrations_are_single_device() -> Result<()> {
-        let t = TestContext::new_alice().await;
-        t.set_config_bool(Config::BccSelf, false).await?;
-
-        let bytes = include_bytes!("../../test-data/webxdc/minimal.xdc");
-        let file = t.get_blobdir().join("maps.xdc");
-        tokio::fs::write(&file, bytes).await.unwrap();
-        t.set_webxdc_integration(file.to_str().unwrap()).await?;
-
-        // default integrations are shipped with the apps and should not be sent over the wire
-        let sent = t.pop_sent_msg_opt(Duration::from_secs(1)).await;
-        assert!(sent.is_none());
-
-        Ok(())
-    }
-}
@@ -1,277 +0,0 @@
-//! # Maps Webxdc Integration.
-//!
-//! A Maps Webxdc Integration uses `sendUpdate()` and `setUpdateListener()` as usual,
-//! however, it agrees with the core on the following update format:
-//!
-//! ## Setting POIs via `sendUpdate()`
-//!
-//! ```json
-//! payload: {
-//!     action: "pos",
-//!     lat:    53.550556,
-//!     lng:    9.993333,
-//!     label:  "my poi"
-//! }
-//! ```
-//!
-//! Just sent POI are received via `setUpdateListener()`, as well as old POI.
-//!
-//! ## Receiving Locations via `setUpdateListener()`
-//!
-//! ```json
-//! payload: {
-//!     action:     "pos",
-//!     lat:        47.994828,
-//!     lng:        7.849881,
-//!     timestamp:  1712928222,
-//!     contactId:  123,    // can be used as a unique ID to differ tracks etc
-//!     name:       "Alice",
-//!     color:      "#ff8080",
-//!     independent: false, // false: current or past position of contact, true: a POI
-//!     label:       ""     // used for POI only
-//! }
-//! ```
-
-use crate::{chat, location};
-use std::collections::{hash_map, HashMap};
-
-use crate::context::Context;
-use crate::message::{Message, MsgId, Viewtype};
-
-use crate::chat::ChatId;
-use crate::color::color_int_to_hex_string;
-use crate::contact::{Contact, ContactId};
-use crate::tools::time;
-use crate::webxdc::{StatusUpdateItem, StatusUpdateItemAndSerial, StatusUpdateSerial};
-use anyhow::Result;
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Serialize, Deserialize)]
-struct MapsActionPayload {
-    action: String,
-    lat: Option<f64>,
-    lng: Option<f64>,
-    label: Option<String>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-struct LocationItem {
-    action: String,
-    #[serde(rename = "contactId")]
-    contact_id: u32,
-    lat: f64,
-    lng: f64,
-    independent: bool,
-    timestamp: i64,
-    label: String,
-    name: String,
-    color: String,
-}
-
-pub(crate) async fn intercept_send_update(
-    context: &Context,
-    chat_id: Option<ChatId>,
-    status_update: StatusUpdateItem,
-) -> Result<()> {
-    let payload = serde_json::from_value::<MapsActionPayload>(status_update.payload)?;
-    let lat = payload.lat.unwrap_or_default();
-    let lng = payload.lng.unwrap_or_default();
-    let label = payload.label.unwrap_or_default();
-
-    if payload.action == "pos" && !label.is_empty() {
-        let chat_id = if let Some(chat_id) = chat_id {
-            chat_id
-        } else {
-            ChatId::create_for_contact(context, ContactId::SELF).await?
-        };
-
-        let mut poi_msg = Message::new(Viewtype::Text);
-        poi_msg.text = label;
-        poi_msg.set_location(lat, lng);
-        chat::send_msg(context, chat_id, &mut poi_msg).await?;
-    } else {
-        warn!(context, "unknown maps integration action");
-    }
-
-    Ok(())
-}
-
-pub(crate) async fn intercept_get_updates(
-    context: &Context,
-    chat_id: Option<ChatId>,
-    last_known_serial: StatusUpdateSerial,
-) -> Result<String> {
-    let mut json = String::default();
-    let mut contact_data: HashMap<ContactId, (String, String)> = HashMap::new();
-
-    let begin = time() - 24 * 60 * 60;
-    let locations = location::get_range(context, chat_id, None, begin, 0).await?;
-    for location in locations.iter().rev() {
-        if location.location_id > last_known_serial.to_u32() {
-            let (name, color) = match contact_data.entry(location.contact_id) {
-                hash_map::Entry::Vacant(e) => {
-                    let contact = Contact::get_by_id(context, location.contact_id).await?;
-                    let name = contact.get_display_name().to_string();
-                    let color = color_int_to_hex_string(contact.get_color());
-                    e.insert((name, color)).clone()
-                }
-                hash_map::Entry::Occupied(e) => e.get().clone(),
-            };
-
-            let mut label = String::new();
-            if location.independent != 0 {
-                if let Some(marker) = &location.marker {
-                    label = marker.to_string() // marker contains one-char labels only
-                } else if location.msg_id != 0 {
-                    if let Some(msg) =
-                        Message::load_from_db_optional(context, MsgId::new(location.msg_id)).await?
-                    {
-                        label = msg.get_text()
-                    }
-                }
-            }
-
-            let location_item = LocationItem {
-                action: "pos".to_string(),
-                contact_id: location.contact_id.to_u32(),
-                lat: location.latitude,
-                lng: location.longitude,
-                independent: location.independent != 0,
-                timestamp: location.timestamp,
-                label,
-                name,
-                color,
-            };
-
-            let update_item = StatusUpdateItemAndSerial {
-                item: StatusUpdateItem {
-                    payload: serde_json::to_value(location_item)?,
-                    info: None,
-                    document: None,
-                    summary: None,
-                    uid: None,
-                },
-                serial: StatusUpdateSerial(location.location_id),
-                max_serial: StatusUpdateSerial(location.location_id),
-            };
-
-            if !json.is_empty() {
-                json.push_str(",\n");
-            }
-            json.push_str(&serde_json::to_string(&update_item)?);
-        }
-    }
-
-    Ok(format!("[{json}]"))
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::chat::{create_group_chat, ChatId, ProtectionStatus};
-    use crate::chatlist::Chatlist;
-    use crate::contact::Contact;
-    use crate::message::Message;
-    use crate::test_utils::TestContext;
-    use crate::webxdc::StatusUpdateSerial;
-    use crate::{location, EventType};
-    use anyhow::Result;
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_maps_integration() -> Result<()> {
-        let t = TestContext::new_alice().await;
-
-        let bytes = include_bytes!("../../test-data/webxdc/mapstest.xdc");
-        let file = t.get_blobdir().join("maps.xdc");
-        tokio::fs::write(&file, bytes).await.unwrap();
-        t.set_webxdc_integration(file.to_str().unwrap()).await?;
-
-        let chatlist = Chatlist::try_load(&t, 0, None, None).await?;
-        let summary = chatlist.get_summary(&t, 0, None).await?;
-        assert_eq!(summary.text, "No messages.");
-
-        // Integrate Webxdc into a chat with Bob;
-        // sending updates is intercepted by integrations and results in setting a POI in core
-        let bob_id = Contact::create(&t, "", "bob@example.net").await?;
-        let bob_chat_id = ChatId::create_for_contact(&t, bob_id).await?;
-        let integration_id = t.init_webxdc_integration(Some(bob_chat_id)).await?.unwrap();
-        assert!(!integration_id.is_special());
-
-        let integration = Message::load_from_db(&t, integration_id).await?;
-        let info = integration.get_webxdc_info(&t).await?;
-        assert_eq!(info.name, "Maps Test");
-        assert_eq!(info.internet_access, true);
-
-        t.send_webxdc_status_update(
-            integration_id,
-            r#"{"payload": {"action": "pos", "lat": 11.0, "lng": 12.0, "label": "poi #1"}}"#,
-            "descr",
-        )
-        .await?;
-        t.evtracker
-            .get_matching(|evt| matches!(evt, EventType::WebxdcStatusUpdate { .. }))
-            .await;
-        let updates = t
-            .get_webxdc_status_updates(integration_id, StatusUpdateSerial(0))
-            .await?;
-        assert!(updates.contains(r#""lat":11"#));
-        assert!(updates.contains(r#""lng":12"#));
-        assert!(updates.contains(r#""label":"poi #1""#));
-        assert!(updates.contains(r#""contactId":"#)); // checking for sth. that is not in the sent update make sure integration is called
-        assert!(updates.contains(r#""name":"Me""#));
-        assert!(updates.contains(r##""color":"#"##));
-        let locations = location::get_range(&t, Some(bob_chat_id), None, 0, 0).await?;
-        assert_eq!(locations.len(), 1);
-        let location = locations.last().unwrap();
-        assert_eq!(location.latitude, 11.0);
-        assert_eq!(location.longitude, 12.0);
-        assert_eq!(location.independent, 1);
-        let msg = t.get_last_msg().await;
-        assert_eq!(msg.text, "poi #1");
-        assert_eq!(msg.chat_id, bob_chat_id);
-
-        // Integrate Webxdc into another group
-        let group_id = create_group_chat(&t, ProtectionStatus::Unprotected, "foo").await?;
-        let integration_id = t.init_webxdc_integration(Some(group_id)).await?.unwrap();
-
-        let locations = location::get_range(&t, Some(group_id), None, 0, 0).await?;
-        assert_eq!(locations.len(), 0);
-        t.send_webxdc_status_update(
-            integration_id,
-            r#"{"payload": {"action": "pos", "lat": 22.0, "lng": 23.0, "label": "poi #2"}}"#,
-            "descr",
-        )
-        .await?;
-        let updates = t
-            .get_webxdc_status_updates(integration_id, StatusUpdateSerial(0))
-            .await?;
-        assert!(!updates.contains(r#""lat":11"#));
-        assert!(!updates.contains(r#""label":"poi #1""#));
-        assert!(updates.contains(r#""lat":22"#));
-        assert!(updates.contains(r#""lng":23"#));
-        assert!(updates.contains(r#""label":"poi #2""#));
-        let locations = location::get_range(&t, Some(group_id), None, 0, 0).await?;
-        assert_eq!(locations.len(), 1);
-        let location = locations.last().unwrap();
-        assert_eq!(location.latitude, 22.0);
-        assert_eq!(location.longitude, 23.0);
-        assert_eq!(location.independent, 1);
-        let msg = t.get_last_msg().await;
-        assert_eq!(msg.text, "poi #2");
-        assert_eq!(msg.chat_id, group_id);
-
-        // In global map, both POI are visible
-        let integration_id = t.init_webxdc_integration(None).await?.unwrap();
-
-        let updates = t
-            .get_webxdc_status_updates(integration_id, StatusUpdateSerial(0))
-            .await?;
-        assert!(updates.contains(r#""lat":11"#));
-        assert!(updates.contains(r#""label":"poi #1""#));
-        assert!(updates.contains(r#""lat":22"#));
-        assert!(updates.contains(r#""label":"poi #2""#));
-        let locations = location::get_range(&t, None, None, 0, 0).await?;
-        assert_eq!(locations.len(), 2);
-
-        Ok(())
-    }
-}
@@ -29,7 +29,7 @@ Return receipts                  | Message Disposition Notification (MDN, [RFC 8
 Locations                        | KML ([Open Geospatial Consortium](http://www.opengeospatial.org/standards/kml/), [Google Dev](https://developers.google.com/kml/))

 [Autocrypt Level 1]: https://autocrypt.org/level1.html
-[securejoin]: https://securejoin.delta.chat/
+[securejoin]: https://securejoin.readthedocs.io/en/latest/
 [openpgp4fpr]: https://metacode.biz/openpgp/openpgp4fpr
 [Autodiscover]: https://learn.microsoft.com/en-us/exchange/autodiscover-service-for-exchange-2013
 [XEP-0392]: https://xmpp.org/extensions/xep-0392.html
@@ -1,65 +0,0 @@
-Return-Path: <autocrypt@nine.testrun.org>
-Delivered-To: autocrypt@nine.testrun.org
-Received: from nine.testrun.org
-	by nine with LMTP
-	id wNinAKX2J2YWDwEAPdT8mA
-	(envelope-from <autocrypt@nine.testrun.org>)
-	for <autocrypt@nine.testrun.org>; Tue, 23 Apr 2024 19:57:57 +0200
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nine.testrun.org;
-	s=opendkim; t=1713895076;
-	bh=yuHuHSbYX5hE/xr8aU2fy/SlqfTL7XjfV2m1eEePTz4=;
-	h=Subject:Date:From:To:From;
-	b=ZbVNpJ8zjHmgrCqiRnqzENcR/PwR/G182hL18U5bp5CZmkyWcuhQU0EkhkJpCCv1n
-	 8bZ9WlOT0cmzBHpWU43t7HufuUM56NwwuVqEuz2agpVzQV8zKIPhthrBzbYIeR4Prg
-	 1DgwWr8EhotoV6yPgzxi9sMyO3l4spJeaREisB5MPOIdKeIxtRPLR+Woo5hQWNTFoh
-	 ZQtCcY7w5vxXGhBMVPXOjbrrzOCsE5gGB5QYSAR8Bv3ZdJn/mHvIRCEJG5hJGSxXjQ
-	 fD0UGJ5m5RVrF0tWnZ7U5tpoRD/UVV1+Us9Woq733R97ZchpoE4hNpMG9zYW90z4QU
-	 kBajbsH81Nm0A==
-MIME-Version: 1.0
-Content-Type: multipart/mixed;
- boundary=----X2OJUZLGILKJEHMTO29ZMST9701ZDH
-Content-Transfer-Encoding: 7bit
-Subject: Autocrypt Setup Message
-Autocrypt-Setup-Message: v1
-Date: Tue, 23 Apr 2024 19:57:57 +0200
-From: autocrypt@nine.testrun.org
-To: autocrypt@nine.testrun.org
-Message-Id: <20240423175756.F19EB17C214A@nine.testrun.org>
-
------X2OJUZLGILKJEHMTO29ZMST9701ZDH
-Content-Type: text/plain;
- charset=utf-8
-Content-Transfer-Encoding: quoted-printable
-
-This message contains all information to transfer your Autocrypt settings a=
-long with your secret key securely from your original device=2E To set up y=
-our new device for Autocrypt, please follow the instructions that should be=
- presented by your new device=2E You can keep this message and use it as a =
-backup for your secret key=2E If you want to do this, you should write down=
- the password and store it securely=2E
------X2OJUZLGILKJEHMTO29ZMST9701ZDH
-Content-Transfer-Encoding: 7bit
-Content-Type: application/autocrypt-setup
-Content-Disposition: attachment; filename="autocrypt-setup-message"
-
-----BEGIN PGP MESSAGE-----
-Passphrase-Format: numeric9x4
-Passphrase-Begin: 06
-
-ww0ECQMCAhlJ+TRwb2Fg0sGXAUc+92rmg4k57Sd4D3O/SPQNzShbVdlKsoFzyH+B
-YhimOr/8C5ZHyg/WjRGlk4pD+t57WfVdE7LYnv8qsK86h2kffZAGlj+B9Lh9+qbV
-KgJLpHUKg7ZGa/9aMq7KuFoNSNTbcHtzJ/Ml9GVe+opimER87mpFCjmaEHCcCp0a
-ZeS5VU8gTV7AKuPW40BBipyEmKpUvE/ZWfz3KSI4RZyIwM8v8kXBMojT4WLqWm93
-JoEKUyeh+3JKMvsfyRbmHXrHprG9f2e8PLvNkAiie68YJniFnwA8nmNSnPv9S9rf
-7oUHtnTDKJ4FIpmfPgj1v/KIWWW9KaZWHi7K5mFUCTb4pBoCRIGaFh+JzbSlNL9i
-fz7HIiN95bFJ4xXXL4gcU9wO5//npkVDUncaeHhUy1VBLu0NFYvze+s+eAIesqec
-X3x++U9d+Slbpa1G2Z5Knj50mBY+k9aNwVMZGu50hzhPvdwesqmbr+GTSh0O1bxI
-gw/cDq5s58Ewze3WvYaLxJz/RcwOCGSV8k21FM4WTnEahs4yfLbzNuusYvvciU6l
-w0eZC+vEmh+bINSSRX/mcvkQcIkkCsqvfWyxdSNIBCwmR86oalWnxZniBLbbbZHD
-0KAsv0w7t00Y715gyyFWyiEiT5Lyl4TA+cUIHKmmpKOaVubz50UD1z5rqT7joJ7G
-KRmWtQW8MScgcmK7+tyavLQOxwe8i8i9JkUy+d9jhj17XZil/If26Q3V3epqCXq3
-FdvEvvNGJF0DyJ4YAe9QMBumf22sMmX/XVock9/k0pB46mciMhPL3VA=
-=LYx9
-----END PGP MESSAGE-----
-
------X2OJUZLGILKJEHMTO29ZMST9701ZDH--
Author	SHA1	Message	Date
Hocuri	2580ec2201	--wip-- [skip ci]	2024-04-24 16:45:44 +02:00
Hocuri	d2014f6038	Make parsing of name, addr, and timestamp work	2024-04-19 23:07:12 +02:00
Hocuri	ba6f3291ea	Add basic parsing code	2024-04-16 19:11:15 +02:00
@@ -1 +1 @@
 -04-24
 -04-05