feat: jsonrpc add BasicMessage api

2026-04-02 05:22:14 +03:00 · 2025-04-01 06:15:04 +02:00
227 changed files with 12545 additions and 14207 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,35 +0,0 @@
---
-name: Bug report
-about: Report something that isn't working.
-title: ''
-assignees: ''
-labels: bug
---
-
-<!--
-This is the chatmail core's bug report tracker.
-For Delta Chat feature requests and support, please go to the forum: https://support.delta.chat
-Please fill out as much of this form as you can (leaving out stuff that is not applicable is ok).
-->
-
- Operating System (Linux/Mac/Windows/iOS/Android):
- Core Version: 
- Client Version:
-
-## Expected behavior
-
-*What did you try to achieve?*
-
-## Actual behavior
-
-*What happened instead?*
-
-### Steps to reproduce the problem
-
-1. 
-2. 
-
-### Screenshots
-
-### Logs
-
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,24 +20,20 @@ permissions: {}

 env:
  RUSTFLAGS: -Dwarnings
-  RUST_VERSION: 1.88.0
-
-  # Minimum Supported Rust Version
-  MSRV: 1.85.0

 jobs:
  lint_rust:
    name: Lint Rust
    runs-on: ubuntu-latest
+    env:
+      RUSTUP_TOOLCHAIN: 1.84.1
    steps:
      - uses: actions/checkout@v4
        with:
          show-progress: false
          persist-credentials: false
      - name: Install rustfmt and clippy
-        run: rustup toolchain install $RUST_VERSION --profile minimal --component rustfmt --component clippy
-      - run: rustup override set $RUST_VERSION
-        shell: bash
+        run: rustup toolchain install $RUSTUP_TOOLCHAIN --profile minimal --component rustfmt --component clippy
      - name: Cache rust cargo artifacts
        uses: swatinem/rust-cache@v2
      - name: Run rustfmt
@@ -95,36 +91,25 @@ jobs:
      matrix:
        include:
          - os: ubuntu-latest
-            rust: latest
+            rust: 1.84.1
          - os: windows-latest
-            rust: latest
+            rust: 1.84.1
          - os: macos-latest
-            rust: latest
+            rust: 1.84.1

-          # Minimum Supported Rust Version
+          # Minimum Supported Rust Version = 1.81.0
          - os: ubuntu-latest
-            rust: minimum
+            rust: 1.81.0
    runs-on: ${{ matrix.os }}
    steps:
-      - run:
-          echo "RUSTUP_TOOLCHAIN=$MSRV" >> $GITHUB_ENV
-        shell: bash
-        if: matrix.rust == 'minimum'
-      - run:
-          echo "RUSTUP_TOOLCHAIN=$RUST_VERSION" >> $GITHUB_ENV
-        shell: bash
-        if: matrix.rust == 'latest'
-
      - uses: actions/checkout@v4
        with:
          show-progress: false
          persist-credentials: false

      - name: Install Rust ${{ matrix.rust }}
-        run: rustup toolchain install --profile minimal $RUSTUP_TOOLCHAIN
-        shell: bash
-      - run: rustup override set $RUSTUP_TOOLCHAIN
-        shell: bash
+        run: rustup toolchain install --profile minimal ${{ matrix.rust }}
+      - run: rustup override set ${{ matrix.rust }}

      - name: Cache rust cargo artifacts
        uses: swatinem/rust-cache@v2
--- a/.github/workflows/dependabot.yml
+++ b/.github/workflows/dependabot.yml
@@ -14,7 +14,7 @@ jobs:
    steps:
      - name: Dependabot metadata
        id: metadata
-        uses: dependabot/fetch-metadata@v2.4.0
+        uses: dependabot/fetch-metadata@v2.3.0
        with:
          github-token: "${{ secrets.GITHUB_TOKEN }}"
      - name: Approve a PR
--- a/.github/workflows/jsonrpc-client-npm-package.yml
+++ b/.github/workflows/jsonrpc-client-npm-package.yml
@@ -9,7 +9,7 @@ permissions: {}
 jobs:
  pack-module:
    name: "Publish @deltachat/jsonrpc-client"
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    permissions:
      id-token: write
      contents: read
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -95,10 +95,9 @@ jobs:
      fail-fast: false
      matrix:
        installable:
-          - deltachat-rpc-server
+          - deltachat-rpc-server-aarch64-darwin

          # Fails to bulid
-          # - deltachat-rpc-server-aarch64-darwin
          # - deltachat-rpc-server-x86_64-darwin
    steps:
      - uses: actions/checkout@v4
--- a/.github/workflows/zizmor-scan.yml
+++ b/.github/workflows/zizmor-scan.yml
@@ -19,7 +19,7 @@ jobs:
          persist-credentials: false

      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v5

      - name: Run zizmor
        run: uvx zizmor --format sarif . > results.sarif
--- a/.gitignore
+++ b/.gitignore
@@ -53,4 +53,3 @@ result
 # direnv
 .envrc
 .direnv
-.aider*
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,371 +1,5 @@
 # Changelog

-## [2.0.0] - 2025-07-09
-
-This release changes the way the core handles contact keys.
-Instead of tracking OpenPGP keys corresponding to the
-contacts in [Autocrypt](https://autocrypt.org/) peerstate,
-the core creates a new "key-contact" for each known public key.
-Reception of a message signed with a new unknown key
-no longer results in warnings about setup changes,
-but creates a new contact and a new 1:1 chat if necessary.
-Additionally, there are "address-contacts" corresponding
-to the e-mail addresses.
-
-### Features / Changes
-
- Key-contacts ([#6796](https://github.com/chatmail/core/pull/6796), [#6941](https://github.com/chatmail/core/pull/6941)).
- Increase event channel size from 1000 to 10000.
- Minimize the amount of data preserved for trashed messages.
- Show broadcast channels in their own, proper "Channel" chat ([#6901](https://github.com/chatmail/core/pull/6901), [#6975](https://github.com/chatmail/core/pull/6975)).
- Check images passed as `File` before making them `Image`.
-
-### API-Changes
-
- CFFI: Add dc_contact_is_key_contact() ([#6955](https://github.com/chatmail/core/pull/6955)).
- Contact::get_all(): Support listing address-contacts.
- [**breaking**] Add InBroadcastChannel, OutBroadcastChannel chattypes, add create_broadcast_channel() ([#6901](https://github.com/chatmail/core/pull/6901)).
- deltachat-rpc-client: Add Message.get_read_receipts().
-
-### Fixes
-
- Remove display name from get_info(). This information usually goes at the top of the log and we don't want users to include it in bug reports.
- Wait for scheduler tasks shutdown in parallel.
- Update deltachat-repl help and autocomplete to match implementation ([#6978](https://github.com/chatmail/core/pull/6978), ([#6979](https://github.com/chatmail/core/pull/6979)).
- Send Autocrypt header in MDNs. This is needed to assign MDNs to key-contacts.
- Prefer encrypted List-Id header ([#6983](https://github.com/chatmail/core/pull/6983)).
- Treat "tgs" as Viewtype::File.
- Treat and send images that can't be decoded as Viewtype::File.
- Decide on filename used for sending depending on the original Viewtype.
- Migrate_key_contacts(): Remove "id>9" from encrypted messages SELECT.
- Save msgs to key-contacts migration state and run migration periodically ([#6956](https://github.com/chatmail/core/pull/6956)).
- Do not try to lookup key-contacts for unencrypted 1:1 messages.
- Add query to post request for account creation ([#6989](https://github.com/chatmail/core/pull/6989)).
-
-### CI
-
- Update Rust to 1.88.0.
-
-### Documentation
-
- Remove outdated comment that says MDNs are unencrypted.
-
-### Refactor
-
- Upgrade to Rust 2024.
- Build_body_file(): Remove guessing mimetype by file extension.
-
-### Tests
-
- Add online test for read receipts.
- Add a test reproducing chat assignment bug.
-
-### Miscellaneous Tasks
-
- cargo: Bump smallvec from 1.15.0 to 1.15.1.
- cargo: Bump syn from 2.0.101 to 2.0.104.
- cargo: Bump hyper-util from 0.1.13 to 0.1.14.
- cargo: Bump toml from 0.8.19 to 0.8.23.
- cargo: Bump proptest from 1.6.0 to 1.7.0.
- cargo: Bump libc from 0.2.172 to 0.2.174.
-
-## [1.160.0] - 2025-06-22
-
-### API-Changes
-
- [**breaking**] jsonrpc: remove webxdc info from MessageObject.
-  Users need to call `get_webxdc_info` separately now
-  and expect that the call may fail e.g. if WebXDC is not a valid ZIP archive.
- [**breaking**] Deprecate `DC_GCL_VERIFIED_ONLY`.
- [**breaking**] Make logging macros private.
-
-### Features / Changes
-
- Add more IMAP logging.
- Sort apps by recently-updated ([#6875](https://github.com/chatmail/core/pull/6875)).
- Better error for quoting a message from another chat.
- Put "biography" in the vCard ([#6819](https://github.com/chatmail/core/pull/6819)).
-
-### Fixes
-
- Do not allow chat creation if decryption failed.
- Remove faulty test ([#6880](https://github.com/chatmail/core/pull/6880)).
- Reduce the scope of the last_full_folder_scan lock in scan_folders.
- Ignore verification error if the chat is not protected yet.
- Create group chats unprotected on verification error.
- `fetch_url`: return err on non 2xx reponses.
- Sort multiple saved messages by timestamp ([#6862](https://github.com/chatmail/core/pull/6862)).
- contact-tools: Escape commas in vCards' FN, KEY, PHOTO, NOTE ([#6912](https://github.com/chatmail/core/pull/6912)).
- Don't change ConfiguredAddr when adding a transport ([#6804](https://github.com/chatmail/core/pull/6804)).
-
-### Build system
-
- Increase MSRV to 1.85.0.
- Update Doxygen config and layout file.
- Update to rPGP 0.16.0 ([#6719](https://github.com/chatmail/core/pull/6719)).
- Enable async-native-tls/vendored feature.
- Update rusqlite to 0.36.0.
-
-### CI
-
- Update Rust to 1.87.0.
- nix: Test build on macOS without cross-compilation.
- Use installed toolchain to lint Rust.
-
-### Refactor
-
- Remove explicit lock drop at the end of scope.
- Use CancellationToken instead of a 1-message channel.
-
-### Documentation
-
- Add more code style guide references.
-
-## [1.159.5] - 2025-05-14
-
-### Fixes
-
- Don't change webxdc self-addr when saving and loading draft ([#6854](https://github.com/chatmail/core/pull/6854)).
-
-### Miscellaneous Tasks
-
- Remove duplicate miniz_oxide dependency.
- Update async-smtp to 0.10.2.
-
-## [1.159.4] - 2025-05-13
-
-### Documentation
-
- Add missing documentation to deltachat-rpc-client.
-
-### Features / Changes
-
- Better avatar quality ([#6822](https://github.com/chatmail/core/pull/6822)).
- Update iroh from 0.33.0 to 0.35.0 ([#6687](https://github.com/chatmail/core/pull/6687)).
- Other dependency updates.
-
-### Fixes
-
- Emit progress(0) in case AEAP is tried.
- Replace `FuturesUnordered` from `futures` with `JoinSet` from `tokio`.
- Fix order of operations when handling "vc-request-with-auth" ([#6850](https://github.com/chatmail/core/pull/6850)).
- Generate rfc724_mid when creating Message ([#6704](https://github.com/chatmail/core/pull/6704))
-
-### Tests
-
- Profile data is attached to group leave messages.
-
-## [1.159.3] - 2025-04-24
-
-### CI
-
- Use `ubuntu-latest` runner for `@deltachat/jsonrpc-client` publishing.
-
-## [1.159.2] - 2025-04-23
-
-### Fixes
-
- Allow to send to chats after failed securejoin again ([#6817](https://github.com/chatmail/core/pull/6817)).
- Parse login scheme in `add_transport_from_qr()` ([#6802](https://github.com/chatmail/core/pull/6802)).
- Lowercase address in add_transport() ([#6805](https://github.com/chatmail/core/pull/6805)).
-
-### API-Changes
-
- Rename add_transport() -> add_or_update_transport() ([#6800](https://github.com/chatmail/core/pull/6800)).
-
-### Miscellaneous Tasks
-
- Update yerpc to 0.6.4.
- Clean up `deltachat-jsonrpc` dependencies.
-
-### Refactor
-
- Move logins into SQL table ([#6724](https://github.com/chatmail/core/pull/6724)).
-
-### Tests
-
- Check headers absense straightforwardly.
- Fix mismatch between the contact and the account in securejoin tests.
- Test that key of the recipient is gossiped in 1:1 chats.
-
-## [1.159.1] - 2025-04-12
-
-### API-Changes
-
- deltachat-rpc-client: Add `Account.add_transport()`.
- Add jsonrpc for info_contact_id.
-
-### Build system
-
- Update crossbeam-channel from 0.5.14 to 0.5.15.
- Increase MSRV to 1.82.0.
-
-### CI
-
- Don't make ruff format quiet ([#6785](https://github.com/chatmail/core/pull/6785)).
-
-### Documentation
-
- MimeFactory.member_timestamps has the same order as To: rather than RCPT TO:.
- Two JsonRPC doc improvements ([#6778](https://github.com/chatmail/core/pull/6778)).
-
-### Features / Changes
-
- Improve error message when the user tries to do AEAP ([#6786](https://github.com/chatmail/core/pull/6786)).
- Pass email and password via env in python-jsonrpc.
- Track gossiping per (chat, fingerprint) pair.
-
-### Fixes
-
- Add missing ChatDeleted event to python jsonrpc client.
- Never send Autocrypt-Gossip in broadcast lists.
- Restart I/O when mvbox_move setting is changed.
-
-### Tests
-
- Port test_delete_deltachat_folder to JSON-RPC.
- Autocrypt-Gossip header isn't sent in broadcast messages.
- Encrypt test_subject_in_group().
- Encrypt test_remove_member_bcc.
-
-## [1.159.0] - 2025-04-08
-
-### API-Changes
-
- deltachat-rpc-client: Add Message.get_info().
- CFFI: Add `dc_make_vcard()` and `dc_import_vcard()`.
- Add legacy Python bindings for `make_vcard` and `import_vcard`.
-
-### CI
-
- Upgrade Rust from 1.84.1 to 1.86.0 ([#6784](https://github.com/chatmail/core/pull/6784)).
-
-### Features / Changes
-
- Add name resp. "Me" to contact encryption info ([#6720](https://github.com/chatmail/core/pull/6720)).
- Get contact-id for info messages ([#6714](https://github.com/chatmail/core/pull/6714)).
- No unencrypted chat when securejoin times out ([#6722](https://github.com/chatmail/core/pull/6722)).
- Clear `Param::IsEdited` when forwarding a message.
- Remove email address from 'add second device' qr code ([#6760](https://github.com/chatmail/core/pull/6760)).
- Parse Proton Mail vCards again ([#6771](https://github.com/chatmail/core/pull/6771)).
- Do not consider encrypting to the primary OpenPGP key.
-
-### Fixes
-
- jsonrpc: Fix deadlock in get_all_accounts().
- Set GroupNameTimestamp on group promotion ([#6729](https://github.com/chatmail/core/pull/6729)).
- Encrypt broadcast lists.
-
-### Miscellaneous Tasks
-
- Update yerpc to 0.6.3.
- cargo: Update textwrap from 0.16.1 to 0.16.2.
- cargo: Bump uuid from 1.15.1 to 1.16.0.
- cargo: Bump libc from 0.2.170 to 0.2.171.
- cargo: Bump anyhow from 1.0.96 to 1.0.97.
- cargo: Bump bytes from 1.10.0 to 1.10.1.
- cargo: Bump once_cell from 1.20.3 to 1.21.3.
- cargo: Bump thiserror from 2.0.11 to 2.0.12.
- cargo: Bump pin-project from 1.1.9 to 1.1.10.
- cargo: Bump hyper-util from 0.1.10 to 0.1.11.
- cargo: Bump log from 0.4.26 to 0.4.27.
- cargo: Bump tokio-util from 0.7.13 to 0.7.14.
- cargo: Bump syn from 2.0.98 to 2.0.100.
- cargo: Bump serde_json from 1.0.139 to 1.0.140.
- cargo: Bump quote from 1.0.38 to 1.0.40.
- cargo: Bump http-body-util from 0.1.2 to 0.1.3.
- cargo: Bump openssl from 0.10.71 to 0.10.72.
- cargo: Bump quick-xml from 0.37.2 to 0.37.4.
- cargo: Bump blake3 from 1.6.1 to 1.8.0.
- cargo: Bump tokio from 1.43.0 to 1.43.1 ([#6780](https://github.com/chatmail/core/pull/6780)).
- Add issue template.
- Add bug label on bug issue template.
- cargo: Bump tokio from 1.43.0 to 1.44.1.
- cargo: Bump fd-lock from 4.0.2 to 4.0.4.
- Update async-smtp from 0.10.0 to 0.10.1.
- Update async-imap from 0.10.3 to 0.10.4.
- cargo: Bump tempfile from 3.14.0 to 3.19.1.
- cargo: Bump image from 0.25.5 to 0.25.6.
- cargo: Bump serde from 1.0.218 to 1.0.219.
-
-### Other
-
- Add python and tox to flake.nix devshell ([#6233](https://github.com/chatmail/core/pull/6233))
- Update spec wrt edit/delete, minor rewordings ([#6708](https://github.com/chatmail/core/pull/6708))
- Update 'takes longer' fallback wording.
- Handle classic emails as such only in classic profiles ([#6767](https://github.com/chatmail/core/pull/6767))
- Move ASM strings to core, point to "Add Second Device" ([#6777](https://github.com/chatmail/core/pull/6777))
-
-### Refactor
-
- Replace `once_cell::sync::Lazy` with `std::sync::LazyLock`.
- Move vCard code to its own file ([#6776](https://github.com/chatmail/core/pull/6776)).
-
-### Tests
-
- Use encryption in more Rust tests.
- Use encryption in all JSON-RPC online tests.
- Encrypt legacy Python tests.
- Send only encrypted messages in online JS tests.
- Add APIs to create `dom@example.net` and `elena@example.net`.
- Split public keys from secret keys in runtime.
- Remove fetch_existing tests.
- Port test_forward_encrypted_to_unencrypted from legacy Python to Rust.
- Port test_one_account_send_bcc_setting from legacy Python to JSON-RPC.
- Port test_multidevice_sync_seen to JSON-RPC.
- Use QR codes to setup contact with test bots.
- Remove flaky key::tests::test_load_self_existing test ([#6763](https://github.com/chatmail/core/pull/6763)).
- Update blob hash in blob::blob_tests::test_selfavatar_outside_blobdir.
-
-## [1.158.0] - 2025-03-29
-
-### API-Changes
-
- deltachat-rpc-client: Accept `Account` as `Account.create_contact()` argument.
- Rust: Add `ContactId.set_name()`.
- JSON-RPC: Rename parameter name in `get_webxdc_href` to `info_msg_id` to reduce confusion potential ([#6681](https://github.com/chatmail/core/pull/6681)).
-
-### Features / Changes
-
- Nicer configuration error ([#6684](https://github.com/chatmail/core/pull/6684)).
- securejoin: Do not create 1:1 chat on Alice's side until `vc-request-with-auth`.
- Understandable error message when accounts.lock can't be locked ([#6695](https://github.com/chatmail/core/pull/6695)).
- Simplify e2ee decision logic, remove majority vote.
- Stop saving txt_raw.
-
-### Fixes
-
- Do not fail to send the message if some keys are missing.
- Synchronize contact name changes.
- Move group name timestamp update up in create_send_msg_jobs().
- Fixes for transport JSON-RPC  ([#6680](https://github.com/chatmail/core/pull/6680)).
-
-### Build system
-
- deltachat-rpc-client: Move development dependencies from tox.ini to pyproject.toml.
- Update resolve-conf from 0.7.0 to 0.7.1.
-
-### Refactor
-
- Do not convert SQL arguments to `String` unnecessarily.
- Factor out `update_chat_names()`.
- Use `created_timestamp()` instead of duplicating its code ([#6692](https://github.com/chatmail/core/pull/6692)).
- Use `chat_id.get_timestamp()` instead of duplicating its code ([#6691](https://github.com/chatmail/core/pull/6691)).
- Move `mark_recipients_as_verified()` call out of `has_verified_encryption()`.
- Move `proxy_config` out of `ConfiguredLoginParam` ([#6712](https://github.com/chatmail/core/pull/6712)).
-
-### Tests
-
- Use vCard in TestContext.add_or_lookup_contact().
- Remove test_group_with_removed_message_id.
- Use add_or_lookup_address_contact() in get_chat().
- Use add_or_lookup_address_contact in test_setup_contact_ex.
- Use vCards more in Python tests.
- Use TestContextManager in more tests.
- Use vCards to create contacts in more Rust tests.
- Set chat name multiple times in a row.
- Online test for renaming the group multiple times.
-
 ## [1.157.3] - 2025-03-19

 ### API-Changes
@@ -6417,12 +6051,3 @@ https://github.com/chatmail/core/pulls?q=is%3Apr+is%3Aclosed
 [1.157.1]: https://github.com/chatmail/core/compare/v1.157.0..v1.157.1
 [1.157.2]: https://github.com/chatmail/core/compare/v1.157.1..v1.157.2
 [1.157.3]: https://github.com/chatmail/core/compare/v1.157.2..v1.157.3
-[1.158.0]: https://github.com/chatmail/core/compare/v1.157.3..v1.158.0
-[1.159.0]: https://github.com/chatmail/core/compare/v1.158.0..v1.159.0
-[1.159.1]: https://github.com/chatmail/core/compare/v1.159.0..v1.159.1
-[1.159.2]: https://github.com/chatmail/core/compare/v1.159.1..v1.159.2
-[1.159.3]: https://github.com/chatmail/core/compare/v1.159.2..v1.159.3
-[1.159.4]: https://github.com/chatmail/core/compare/v1.159.3..v1.159.4
-[1.159.5]: https://github.com/chatmail/core/compare/v1.159.4..v1.159.5
-[1.160.0]: https://github.com/chatmail/core/compare/v1.159.5..v1.160.0
-[2.0.0]: https://github.com/chatmail/core/compare/v1.160.0..v2.0.0
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "deltachat"
-version = "2.0.0"
-edition = "2024"
+version = "1.157.3"
+edition = "2021"
 license = "MPL-2.0"
-rust-version = "1.85"
+rust-version = "1.81"
 repository = "https://github.com/chatmail/core"

 [profile.dev]
@@ -18,9 +18,6 @@ opt-level = 1
 debug = 1
 opt-level = 0

-[profile.fuzz]
-inherits = "test"
-
 # Always optimize dependencies.
 # This does not apply to crates in the workspace.
 # <https://doc.rust-lang.org/cargo/reference/profiles.html#overrides>
@@ -44,40 +41,41 @@ ratelimit = { path = "./deltachat-ratelimit" }
 anyhow = { workspace = true }
 async-broadcast = "0.7.2"
 async-channel = { workspace = true }
-async-imap = { version = "0.10.4", default-features = false, features = ["runtime-tokio", "compress"] }
+async-imap = { version = "0.10.3", default-features = false, features = ["runtime-tokio", "compress"] }
 async-native-tls = { version = "0.5", default-features = false, features = ["runtime-tokio"] }
-async-smtp = { version = "0.10.2", default-features = false, features = ["runtime-tokio"] }
+async-smtp = { version = "0.10", default-features = false, features = ["runtime-tokio"] }
 async_zip = { version = "0.0.17", default-features = false, features = ["deflate", "tokio-fs"] }
 base64 = { workspace = true }
-brotli = { version = "8", default-features=false, features = ["std"] }
+brotli = { version = "7", default-features=false, features = ["std"] }
 bytes = "1"
 chrono = { workspace = true, features = ["alloc", "clock", "std"] }
-data-encoding = "2.9.0"
+data-encoding = "2.7.0"
 escaper = "0.1"
 fast-socks5 = "0.10"
 fd-lock = "4"
 futures-lite = { workspace = true }
 futures = { workspace = true }
 hex = "0.4.0"
-hickory-resolver = "0.25.2"
-http-body-util = "0.1.3"
+hickory-resolver = "=0.25.0-alpha.5"
+http-body-util = "0.1.2"
 humansize = "2"
 hyper = "1"
-hyper-util = "0.1.14"
-image = { version = "0.25.6", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
-iroh-gossip = { version = "0.35", default-features = false, features = ["net"] }
-iroh = { version = "0.35", default-features = false }
+hyper-util = "0.1.10"
+image = { version = "0.25.5", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
+iroh-gossip = { version = "0.33", default-features = false, features = ["net"] }
+iroh = { version = "0.33", default-features = false }
 kamadak-exif = "0.6.1"
 libc = { workspace = true }
-mail-builder = { version = "0.4.3", default-features = false }
+mail-builder = { version = "0.4.2", default-features = false }
 mailparse = { workspace = true }
 mime = "0.3.17"
-num_cpus = "1.17"
+num_cpus = "1.16"
 num-derive = "0.4"
 num-traits = { workspace = true }
-parking_lot = "0.12.4"
+once_cell = { workspace = true }
+parking_lot = "0.12"
 percent-encoding = "2.3"
-pgp = { version = "0.16.0", default-features = false }
+pgp = { version = "0.15.0", default-features = false }
 pin-project = "1"
 qrcodegen = "1.7.0"
 quick-xml = "0.37"
@@ -86,7 +84,7 @@ rand = { workspace = true }
 regex = { workspace = true }
 rusqlite = { workspace = true, features = ["sqlcipher"] }
 rust-hsluv = "0.1"
-rustls-pki-types = "1.12.0"
+rustls-pki-types = "1.11.0"
 rustls = { version = "0.23.22", default-features = false }
 sanitize-filename = { workspace = true }
 serde_json = { workspace = true }
@@ -94,12 +92,12 @@ serde_urlencoded = "0.7.1"
 serde = { workspace = true, features = ["derive"] }
 sha-1 = "0.10"
 sha2 = "0.10"
-shadowsocks = { version = "1.23.1", default-features = false, features = ["aead-cipher", "aead-cipher-2022"] }
-smallvec = "1.15.1"
+shadowsocks = { version = "1.22.0", default-features = false, features = ["aead-cipher", "aead-cipher-2022"] }
+smallvec = "1.14.0"
 strum = "0.27"
 strum_macros = "0.27"
 tagger = "4.3.4"
-textwrap = "0.16.2"
+textwrap = "0.16.1"
 thiserror = { workspace = true }
 tokio-io-timeout = "1.2.0"
 tokio-rustls = { version = "0.26.2", default-features = false }
@@ -111,11 +109,11 @@ toml = "0.8"
 url = "2"
 uuid = { version = "1", features = ["serde", "v4"] }
 webpki-roots = "0.26.8"
-blake3 = "1.8.2"
+blake3 = "1.6.1"

 [dev-dependencies]
 anyhow = { workspace = true, features = ["backtrace"] } # Enable `backtrace` feature in tests.
-criterion = { version = "0.6.0", features = ["async_tokio"] }
+criterion = { version = "0.5.1", features = ["async_tokio"] }
 futures-lite = { workspace = true }
 log = { workspace = true }
 nu-ansi-term = { workspace = true }
@@ -176,7 +174,7 @@ harness = false
 anyhow = "1"
 async-channel = "2.3.1"
 base64 = "0.22"
-chrono = { version = "0.4.41", default-features = false }
+chrono = { version = "0.4.40", default-features = false }
 deltachat-contact-tools = { path = "deltachat-contact-tools" }
 deltachat-jsonrpc = { path = "deltachat-jsonrpc", default-features = false }
 deltachat = { path = ".", default-features = false }
@@ -187,25 +185,25 @@ log = "0.4"
 mailparse = "0.16.1"
 nu-ansi-term = "0.46"
 num-traits = "0.2"
+once_cell = "1.20.2"
 rand = "0.8"
 regex = "1.10"
-rusqlite = "0.36"
+rusqlite = "0.32"
 sanitize-filename = "0.5"
 serde = "1.0"
 serde_json = "1"
-tempfile = "3.20.0"
+tempfile = "3.14.0"
 thiserror = "2"
 tokio = "1"
-tokio-util = "0.7.14"
+tokio-util = "0.7.13"
 tracing-subscriber = "0.3"
-yerpc = "0.6.4"
+yerpc = "0.6.2"

 [features]
 default = ["vendored"]
 internals = []
 vendored = [
-  "rusqlite/bundled-sqlcipher-vendored-openssl",
-  "async-native-tls/vendored"
+  "rusqlite/bundled-sqlcipher-vendored-openssl"
 ]

 [lints.rust]
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-<img alt="Chatmail logo" src="https://github.com/user-attachments/assets/25742da7-a837-48cd-a503-b303af55f10d" width="300" style="float:middle;" />
+  <img alt="Delta Chat Logo" height="200px" src="https://raw.githubusercontent.com/deltachat/deltachat-pages/master/assets/blog/rust-delta.png">
 </p>

 <p align="center">
@@ -11,31 +11,9 @@
  </a>
 </p>

-The chatmail core library implements low-level network and encryption protocols, 
-integrated by many chat bots and higher level applications, 
-allowing to securely participate in the globally scaled e-mail server network. 
-We provide reproducibly-built `deltachat-rpc-server` static binaries
-that offer a stdio-based high-level JSON-RPC API for instant messaging purposes. 
-
-The following protocols are handled without requiring API users to know much about them: 
-
- secure TLS setup with DNS caching and shadowsocks/proxy support 
-
- robust [SMTP](https://github.com/chatmail/async-imap) 
-  and [IMAP](https://github.com/chatmail/async-smtp) handling
-
- safe and interoperable [MIME parsing](https://github.com/staktrace/mailparse) 
-  and [MIME building](https://github.com/stalwartlabs/mail-builder). 
-
- security-audited end-to-end encryption with [rPGP](https://github.com/rpgp/rpgp)
-  and [Autocrypt and SecureJoin protocols](https://securejoin.rtfd.io)
-
- ephemeral [Peer-to-Peer networking using Iroh](https://iroh.computer) for multi-device setup and
-  [webxdc realtime data](https://delta.chat/en/2024-11-20-webxdc-realtime). 
-
- a simulation- and real-world tested [P2P group membership
-  protocol without requiring server state](https://github.com/chatmail/models/tree/main/group-membership). 
-
+<p align="center">
+The core library for Delta Chat, written in Rust
+</p>

 ## Installing Rust and Cargo

@@ -49,12 +27,12 @@ $ curl https://sh.rustup.rs -sSf | sh

 ## Using the CLI client

-Compile and run the command line utility, using `cargo`:
+Compile and run Delta Chat Core command line utility, using `cargo`:

 ```
-$ cargo run --locked -p deltachat-repl -- ~/profile-db
+$ cargo run --locked -p deltachat-repl -- ~/deltachat-db
 ```
-where ~/profile-db is the database file. The utility will create it if it does not exist.
+where ~/deltachat-db is the database file. Delta Chat will create it if it does not exist.

 Optionally, install `deltachat-repl` binary with
 ```
@@ -62,13 +40,13 @@ $ cargo install --locked --path deltachat-repl/
 ```
 and run as
 ```
-$ deltachat-repl ~/profile-db
+$ deltachat-repl ~/deltachat-db
 ```

 Configure your account (if not already configured):

 ```
-Chatmail is awaiting your commands.
+Delta Chat Core is awaiting your commands.
 > set addr your@email.org
 > set mail_pw yourpassword
 > configure
@@ -106,6 +84,11 @@ Single#10: yourfriends@email.org [yourfriends@email.org]
 Message sent.
 ```

+If `yourfriend@email.org` uses DeltaChat, but does not receive message just
+sent, it is advisable to check `Spam` folder. It is known that at least
+`gmx.com` treat such test messages as spam, unless told otherwise with web
+interface.
+
 List messages when inside a chat:

 ```
@@ -156,13 +139,13 @@ $ cargo test -- --ignored

 Install [`cargo-bolero`](https://github.com/camshaft/bolero) with
 ```sh
-$ cargo install cargo-bolero
+$ cargo install cargo-bolero@0.8.0
 ```

 Run fuzzing tests with
 ```sh
 $ cd fuzz
-$ cargo bolero test fuzz_mailparse -s NONE
+$ cargo bolero test fuzz_mailparse --release=false -s NONE
 ```

 Corpus is created at `fuzz/fuzz_targets/corpus`,
@@ -170,6 +153,11 @@ you can add initial inputs there.
 For `fuzz_mailparse` target corpus can be populated with
 `../test-data/message/*.eml`.

+To run with AFL instead of libFuzzer:
+```sh
+$ cargo bolero test fuzz_format_flowed --release=false -e afl -s NONE
+```
+
 ## Features

 - `vendored`: When using Openssl for TLS, this bundles a vendored version.
@@ -177,9 +165,11 @@ For `fuzz_mailparse` target corpus can be populated with
 ## Update Provider Data

 To add the updates from the
-[provider-db](https://github.com/chatmail/provider-db) to the core,
-check line `REV=` inside `./scripts/update-provider-database.sh`
-and then run the script.
+[provider-db](https://github.com/deltachat/provider-db) to the core, run:
+
+```
+./src/provider/update.py ../provider-db/_providers/ > src/provider/data.rs
+```

 ## Language bindings and frontend projects

--- a/STYLE.md
+++ b/STYLE.md
@@ -84,13 +84,6 @@ This allows to run `RUST_BACKTRACE=1 cargo test`
 and get a backtrace with line numbers in resultified tests
 which return `anyhow::Result`.

-`unwrap` and `expect` are not used in the library
-because panics are difficult to debug on user devices.
-However, in the tests `.expect` may be used.
-Follow
-<https://doc.rust-lang.org/core/error/index.html#common-message-styles>
-for `.expect` message style.
-
 ## Logging

 For logging, use `info!`, `warn!` and `error!` macros.
@@ -103,17 +96,3 @@ Format anyhow errors with `{:#}` to print all the contexts like this:
 ```
 error!(context, "Failed to set selfavatar timestamp: {err:#}.");
 ```
-
-## Documentation comments
-
-All public modules, methods and fields should be documented.
-This is checked by [`missing_docs`](https://doc.rust-lang.org/rustdoc/lints.html#missing_docs) lint.
-
-Private items do not have to be documented,
-but CI uses `cargo doc --document-private-items`
-to build the documentation,
-so it is preferred that new items
-are documented.
-
-Follow Rust guidelines for the documentation comments:
-<https://rust-lang.github.io/rfcs/1574-more-api-documentation-conventions.html#summary-sentence>
--- a/assets/icon-address-contact.png
+++ b/assets/icon-address-contact.png
--- a/assets/icon-address-contact.svg
+++ b/assets/icon-address-contact.svg
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   height="480"
-   viewBox="0 -960 9600 9600"
-   width="480"
-   fill="#ffffff"
-   version="1.1"
-   id="svg1"
-   sodipodi:docname="icon-email.svg"
-   inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs1" />
-  <sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="0.99091847"
-     inkscape:cx="263.392"
-     inkscape:cy="177.613"
-     inkscape:window-width="1884"
-     inkscape:window-height="1052"
-     inkscape:window-x="36"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg1" />
-  <rect
-     style="fill:#8c8c8c;fill-opacity:1;stroke:none;stroke-width:680.523;stroke-dasharray:none;paint-order:markers fill stroke"
-     id="rect1"
-     width="9951.9541"
-     height="9767.4756"
-     x="-71.697792"
-     y="-1012.83"
-     ry="0.43547946" />
-  <path
-     d="m 2948.0033,5553.6941 q -130.7292,0 -228.7761,-96.3953 -98.0468,-96.3953 -98.0468,-224.9223 V 2447.6234 q 0,-128.527 98.0468,-224.9223 98.0469,-96.3953 228.7761,-96.3953 h 3703.9934 q 130.7292,0 228.776,96.3953 98.0469,96.3953 98.0469,224.9223 v 2784.7531 q 0,128.527 -98.0469,224.9223 -98.0468,96.3953 -228.776,96.3953 z M 4800,3936.3952 2948.0033,2742.1646 V 5232.3765 H 6651.9967 V 2742.1646 Z m 0,-321.3176 1830.2085,-1167.4541 h -3654.97 z m -1851.9967,-872.913 v -294.5412 2784.7531 z"
-     id="path1"
-     style="stroke-width:5.40098" />
-</svg>
--- a/assets/self-reporting-bot.vcf
+++ b/assets/self-reporting-bot.vcf
@@ -1,7 +0,0 @@
-BEGIN:VCARD
-VERSION:4.0
-EMAIL:self_reporting@testrun.org
-FN:Statistics bot
-KEY:data:application/pgp-keys;base64,xjMEZbfBlBYJKwYBBAHaRw8BAQdABpLWS2PUIGGo4pslVt4R8sylP5wZihmhf1DTDr3oCMPNHDxzZWxmX3JlcG9ydGluZ0B0ZXN0cnVuLm9yZz7CiwQQFggAMwIZAQUCZbfBlAIbAwQLCQgHBhUICQoLAgMWAgEWIQTS2i16sHeYTckGn284K3M5Z4oohAAKCRA4K3M5Z4oohD8dAQCQV7CoH6UP4PD+NqI4kW5tbbqdh2AnDROg60qotmLExAEAxDfd3QHAK9f8b9qQUbLmHIztCLxhEuVbWPBEYeVW0gvOOARlt8GUEgorBgEEAZdVAQUBAQdAMBUhYoAAcI625vGZqnM5maPX4sGJ7qvJxPAFILPy6AcDAQgHwngEGBYIACAFAmW3wZQCGwwWIQTS2i16sHeYTckGn284K3M5Z4oohAAKCRA4K3M5Z4oohPwCAQCvzk1ObIkj2GqsuIfaULlgdnfdZY8LNary425CEfHZDQD5AblXVrlMO1frdlc/Vo9z3pEeCrfYdD7ITD3/OeVoiQ4=
-REV:20250412T195751Z
-END:VCARD
--- a/benches/contacts.rs
+++ b/benches/contacts.rs
@@ -1,11 +1,9 @@
 #![recursion_limit = "256"]
-use std::hint::black_box;
-
-use criterion::{Criterion, criterion_group, criterion_main};
-use deltachat::Events;
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::contact::Contact;
 use deltachat::context::Context;
 use deltachat::stock_str::StockStrings;
+use deltachat::Events;
 use tempfile::tempdir;

 async fn address_book_benchmark(n: u32, read_count: u32) {
--- a/benches/create_account.rs
+++ b/benches/create_account.rs
@@ -1,8 +1,7 @@
 #![recursion_limit = "256"]
-use std::hint::black_box;
 use std::path::PathBuf;

-use criterion::{Criterion, criterion_group, criterion_main};
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::accounts::Accounts;
 use tempfile::tempdir;

--- a/benches/get_chat_msgs.rs
+++ b/benches/get_chat_msgs.rs
@@ -1,13 +1,12 @@
 #![recursion_limit = "256"]
-use std::hint::black_box;
 use std::path::Path;

-use criterion::{Criterion, criterion_group, criterion_main};
-use deltachat::Events;
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::chat::{self, ChatId};
 use deltachat::chatlist::Chatlist;
 use deltachat::context::Context;
 use deltachat::stock_str::StockStrings;
+use deltachat::Events;

 async fn get_chat_msgs_benchmark(dbfile: &Path, chats: &[ChatId]) {
    let id = 100;
--- a/benches/get_chatlist.rs
+++ b/benches/get_chatlist.rs
@@ -1,12 +1,11 @@
 #![recursion_limit = "256"]
-use std::hint::black_box;
 use std::path::Path;

-use criterion::{Criterion, criterion_group, criterion_main};
-use deltachat::Events;
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::chatlist::Chatlist;
 use deltachat::context::Context;
 use deltachat::stock_str::StockStrings;
+use deltachat::Events;

 async fn get_chat_list_benchmark(context: &Context) {
    Chatlist::try_load(context, 0, None, None).await.unwrap();
--- a/benches/marknoticed_chat.rs
+++ b/benches/marknoticed_chat.rs
@@ -1,13 +1,12 @@
 #![recursion_limit = "256"]
-use std::hint::black_box;
 use std::path::Path;

-use criterion::{BatchSize, Criterion, criterion_group, criterion_main};
-use deltachat::Events;
+use criterion::{black_box, criterion_group, criterion_main, BatchSize, Criterion};
 use deltachat::chat::{self, ChatId};
 use deltachat::chatlist::Chatlist;
 use deltachat::context::Context;
 use deltachat::stock_str::StockStrings;
+use deltachat::Events;
 use futures_lite::future::block_on;
 use tempfile::tempdir;

--- a/benches/receive_emails.rs
+++ b/benches/receive_emails.rs
@@ -1,15 +1,14 @@
 #![recursion_limit = "256"]
-use std::hint::black_box;
 use std::path::PathBuf;

-use criterion::{Criterion, criterion_group, criterion_main};
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::{
-    Events,
    config::Config,
    context::Context,
-    imex::{ImexMode, imex},
+    imex::{imex, ImexMode},
    receive_imf::receive_imf,
    stock_str::StockStrings,
+    Events,
 };
 use tempfile::tempdir;

--- a/benches/search_msgs.rs
+++ b/benches/search_msgs.rs
@@ -1,11 +1,10 @@
 #![recursion_limit = "256"]
-use std::hint::black_box;
 use std::path::Path;

-use criterion::{Criterion, criterion_group, criterion_main};
-use deltachat::Events;
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::context::Context;
 use deltachat::stock_str::StockStrings;
+use deltachat::Events;

 async fn search_benchmark(dbfile: impl AsRef<Path>) {
    let id = 100;
--- a/benches/send_events.rs
+++ b/benches/send_events.rs
@@ -1,17 +1,17 @@
 #![recursion_limit = "256"]
-use criterion::{Criterion, criterion_group, criterion_main};
+use criterion::{criterion_group, criterion_main, Criterion};

 use deltachat::context::Context;
 use deltachat::stock_str::StockStrings;
-use deltachat::{Event, EventType, Events};
+use deltachat::{info, Event, EventType, Events};
 use tempfile::tempdir;

 async fn send_events_benchmark(context: &Context) {
    let emitter = context.get_event_emitter();
    for _i in 0..1_000_000 {
-        context.emit_event(EventType::Info("interesting event...".to_string()));
+        info!(context, "interesting event...");
    }
-    context.emit_event(EventType::Info("DONE".to_string()));
+    info!(context, "DONE");

    loop {
        match emitter.recv().await.unwrap() {
--- a/deltachat-contact-tools/Cargo.toml
+++ b/deltachat-contact-tools/Cargo.toml
@@ -9,6 +9,7 @@ license = "MPL-2.0"

 [dependencies]
 anyhow = { workspace = true }
+once_cell = { workspace = true }
 regex = { workspace = true }
 rusqlite = { workspace = true } # Needed in order to `impl rusqlite::types::ToSql for EmailAddress`. Could easily be put behind a feature.
 chrono = { workspace = true, features = ["alloc", "clock", "std"] }
--- a/deltachat-contact-tools/src/lib.rs
+++ b/deltachat-contact-tools/src/lib.rs
@@ -29,14 +29,202 @@

 use std::fmt;
 use std::ops::Deref;
-use std::sync::LazyLock;

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

-mod vcard;
-pub use vcard::{make_vcard, parse_vcard, VcardContact};
+#[derive(Debug)]
+/// A Contact, as represented in a VCard.
+pub struct VcardContact {
+    /// The email address, vcard property `email`
+    pub addr: String,
+    /// This must be the name authorized by the contact itself, not a locally given name. Vcard
+    /// property `fn`. Can be empty, one should use `display_name()` to obtain the display name.
+    pub authname: 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<i64>,
+}
+
+impl VcardContact {
+    /// Returns the contact's display name.
+    pub fn display_name(&self) -> &str {
+        match self.authname.is_empty() {
+            false => &self.authname,
+            true => &self.addr,
+        }
+    }
+}
+
+/// 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 datetime = DateTime::from_timestamp(timestamp, 0)?;
+        Some(datetime.format("%Y%m%dT%H%M%SZ").to_string())
+    }
+
+    let mut res = "".to_string();
+    for c in contacts {
+        let addr = &c.addr;
+        let display_name = c.display_name();
+        res += &format!(
+            "BEGIN:VCARD\r\n\
+             VERSION:4.0\r\n\
+             EMAIL:{addr}\r\n\
+             FN:{display_name}\r\n"
+        );
+        if let Some(key) = &c.key {
+            res += &format!("KEY:data:application/pgp-keys;base64,{key}\r\n");
+        }
+        if let Some(profile_image) = &c.profile_image {
+            res += &format!("PHOTO:data:image/jpeg;base64,{profile_image}\r\n");
+        }
+        if let Some(timestamp) = format_timestamp(c) {
+            res += &format!("REV:{timestamp}\r\n");
+        }
+        res += "END:VCARD\r\n";
+    }
+    res
+}
+
+/// Parses `VcardContact`s from a given `&str`.
+pub fn parse_vcard(vcard: &str) -> 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`
+
+        // Note: This doesn't handle the case where there are quotes around a colon,
+        // like `NAME;Foo="Some quoted text: that contains a colon":value`.
+        // This could be improved in the future, but for now, the parsing is good enough.
+        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<i64> {
+        // 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)
+    }
+
+    // Remove line folding, see https://datatracker.ietf.org/doc/html/rfc6350#section-3.2
+    static NEWLINE_AND_SPACE_OR_TAB: Lazy<Regex> = Lazy::new(|| Regex::new("\r?\n[\t ]").unwrap());
+    let unfolded_lines = NEWLINE_AND_SPACE_OR_TAB.replace_all(vcard, "");
+
+    let mut lines = unfolded_lines.lines().peekable();
+    let mut contacts = Vec::new();
+
+    while lines.peek().is_some() {
+        // Skip to the start of the vcard:
+        for line in lines.by_ref() {
+            if line.eq_ignore_ascii_case("BEGIN:VCARD") {
+                break;
+            }
+        }
+
+        let mut display_name = None;
+        let mut addr = None;
+        let mut key = None;
+        let mut photo = None;
+        let mut datetime = None;
+
+        for mut line in lines.by_ref() {
+            if let Some(remainder) = remove_prefix(line, "item1.") {
+                // Remove the group name, if the group is called "item1".
+                // If necessary, we can improve this to also remove groups that are called something different that "item1".
+                //
+                // Search "group name" at https://datatracker.ietf.org/doc/html/rfc6350 for more infos.
+                line = remainder;
+            }
+
+            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,"))
+                .or_else(|| remove_prefix(line, "KEY;PREF=1: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;ENCODING=BASE64;JPEG:"))
+                .or_else(|| remove_prefix(line, "PHOTO;TYPE=JPEG;ENCODING=b:"))
+                .or_else(|| remove_prefix(line, "PHOTO;ENCODING=b;TYPE=JPEG:"))
+                .or_else(|| remove_prefix(line, "PHOTO;ENCODING=BASE64;TYPE=JPEG:"))
+                .or_else(|| remove_prefix(line, "PHOTO;TYPE=JPEG;ENCODING=BASE64:"))
+                .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") {
+                let (authname, addr) =
+                    sanitize_name_and_addr(display_name.unwrap_or(""), addr.unwrap_or(""));
+
+                contacts.push(VcardContact {
+                    authname,
+                    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),
+                });
+                break;
+            }
+        }
+    }
+
+    contacts
+}

 /// Valid contact address.
 #[derive(Debug, Clone)]
@@ -76,7 +264,7 @@ impl ContactAddress {

 /// Allow converting [`ContactAddress`] to an SQLite type.
 impl rusqlite::types::ToSql for ContactAddress {
-    fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput<'_>> {
+    fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput> {
        let val = rusqlite::types::Value::Text(self.0.to_string());
        let out = rusqlite::types::ToSqlOutput::Owned(val);
        Ok(out)
@@ -88,8 +276,7 @@ impl rusqlite::types::ToSql for ContactAddress {
 /// - Removes special characters from the name, see [`sanitize_name()`]
 /// - Removes the name if it is equal to the address by setting it to ""
 pub fn sanitize_name_and_addr(name: &str, addr: &str) -> (String, String) {
-    static ADDR_WITH_NAME_REGEX: LazyLock<Regex> =
-        LazyLock::new(|| Regex::new("(.*)<(.*)>").unwrap());
+    static ADDR_WITH_NAME_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new("(.*)<(.*)>").unwrap());
    let (name, addr) = if let Some(captures) = ADDR_WITH_NAME_REGEX.captures(addr.as_ref()) {
        (
            if name.is_empty() {
@@ -282,7 +469,7 @@ impl EmailAddress {
 }

 impl rusqlite::types::ToSql for EmailAddress {
-    fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput<'_>> {
+    fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput> {
        let val = rusqlite::types::Value::Text(self.to_string());
        let out = rusqlite::types::ToSqlOutput::Owned(val);
        Ok(out)
@@ -291,8 +478,148 @@ impl rusqlite::types::ToSql for EmailAddress {

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

+    #[test]
+    fn test_vcard_thunderbird() {
+        let contacts = parse_vcard(
+            "BEGIN:VCARD
+VERSION:4.0
+FN:'Alice Mueller'
+EMAIL;PREF=1:alice.mueller@posteo.de
+UID:a8083264-ca47-4be7-98a8-8ec3db1447ca
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:'bobzzz@freenet.de'
+EMAIL;PREF=1:bobzzz@freenet.de
+UID:cac4fef4-6351-4854-bbe4-9b6df857eaed
+END:VCARD
+",
+        );
+
+        assert_eq!(contacts[0].addr, "alice.mueller@posteo.de".to_string());
+        assert_eq!(contacts[0].authname, "Alice Mueller".to_string());
+        assert_eq!(contacts[0].key, None);
+        assert_eq!(contacts[0].profile_image, None);
+        assert!(contacts[0].timestamp.is_err());
+
+        assert_eq!(contacts[1].addr, "bobzzz@freenet.de".to_string());
+        assert_eq!(contacts[1].authname, "".to_string());
+        assert_eq!(contacts[1].key, None);
+        assert_eq!(contacts[1].profile_image, None);
+        assert!(contacts[1].timestamp.is_err());
+
+        assert_eq!(contacts.len(), 2);
+    }
+
+    #[test]
+    fn test_vcard_simple_example() {
+        let contacts = parse_vcard(
+            "BEGIN:VCARD
+VERSION:4.0
+FN:Alice Wonderland
+N:Wonderland;Alice;;;Ms.
+GENDER:W
+EMAIL;TYPE=work:alice@example.com
+KEY;TYPE=PGP;ENCODING=b:[base64-data]
+REV:20240418T184242Z
+
+END:VCARD",
+        );
+
+        assert_eq!(contacts[0].addr, "alice@example.com".to_string());
+        assert_eq!(contacts[0].authname, "Alice Wonderland".to_string());
+        assert_eq!(contacts[0].key, Some("[base64-data]".to_string()));
+        assert_eq!(contacts[0].profile_image, None);
+        assert_eq!(*contacts[0].timestamp.as_ref().unwrap(), 1713465762);
+
+        assert_eq!(contacts.len(), 1);
+    }
+
+    #[test]
+    fn test_vcard_with_trailing_newline() {
+        let contacts = parse_vcard(
+            "BEGIN:VCARD\r
+VERSION:4.0\r
+FN:Alice Wonderland\r
+N:Wonderland;Alice;;;Ms.\r
+GENDER:W\r
+EMAIL;TYPE=work:alice@example.com\r
+KEY;TYPE=PGP;ENCODING=b:[base64-data]\r
+REV:20240418T184242Z\r
+END:VCARD\r
+\r",
+        );
+
+        assert_eq!(contacts[0].addr, "alice@example.com".to_string());
+        assert_eq!(contacts[0].authname, "Alice Wonderland".to_string());
+        assert_eq!(contacts[0].key, Some("[base64-data]".to_string()));
+        assert_eq!(contacts[0].profile_image, None);
+        assert_eq!(*contacts[0].timestamp.as_ref().unwrap(), 1713465762);
+
+        assert_eq!(contacts.len(), 1);
+    }
+
+    #[test]
+    fn test_make_and_parse_vcard() {
+        let contacts = [
+            VcardContact {
+                addr: "alice@example.org".to_string(),
+                authname: "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(),
+                authname: "".to_string(),
+                key: None,
+                profile_image: None,
+                timestamp: Ok(0),
+            },
+        ];
+        let items = [
+            "BEGIN:VCARD\r\n\
+             VERSION:4.0\r\n\
+             EMAIL:alice@example.org\r\n\
+             FN:Alice Wonderland\r\n\
+             KEY:data:application/pgp-keys;base64,[base64-data]\r\n\
+             PHOTO:data:image/jpeg;base64,image in Base64\r\n\
+             REV:20240418T184242Z\r\n\
+             END:VCARD\r\n",
+            "BEGIN:VCARD\r\n\
+             VERSION:4.0\r\n\
+             EMAIL:bob@example.com\r\n\
+             FN:bob@example.com\r\n\
+             REV:19700101T000000Z\r\n\
+             END:VCARD\r\n",
+        ];
+        let mut expected = "".to_string();
+        for len in 0..=contacts.len() {
+            let contacts = &contacts[0..len];
+            let vcard = make_vcard(contacts);
+            if len > 0 {
+                expected += items[len - 1];
+            }
+            assert_eq!(vcard, expected);
+            let parsed = parse_vcard(&vcard);
+            assert_eq!(parsed.len(), contacts.len());
+            for i in 0..parsed.len() {
+                assert_eq!(parsed[i].addr, contacts[i].addr);
+                assert_eq!(parsed[i].authname, contacts[i].authname);
+                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";
@@ -339,6 +666,112 @@ mod tests {
        assert_eq!(EmailAddress::new("@d.tt").is_ok(), false);
    }

+    #[test]
+    fn test_vcard_android() {
+        let contacts = parse_vcard(
+            "BEGIN:VCARD
+VERSION:2.1
+N:;Bob;;;
+FN:Bob
+TEL;CELL:+1-234-567-890
+EMAIL;HOME:bob@example.org
+END:VCARD
+BEGIN:VCARD
+VERSION:2.1
+N:;Alice;;;
+FN:Alice
+EMAIL;HOME:alice@example.org
+END:VCARD
+",
+        );
+
+        assert_eq!(contacts[0].addr, "bob@example.org".to_string());
+        assert_eq!(contacts[0].authname, "Bob".to_string());
+        assert_eq!(contacts[0].key, None);
+        assert_eq!(contacts[0].profile_image, None);
+
+        assert_eq!(contacts[1].addr, "alice@example.org".to_string());
+        assert_eq!(contacts[1].authname, "Alice".to_string());
+        assert_eq!(contacts[1].key, None);
+        assert_eq!(contacts[1].profile_image, None);
+
+        assert_eq!(contacts.len(), 2);
+    }
+
+    #[test]
+    fn test_vcard_local_datetime() {
+        let contacts = parse_vcard(
+            "BEGIN:VCARD\n\
+             VERSION:4.0\n\
+             FN:Alice Wonderland\n\
+             EMAIL;TYPE=work:alice@example.org\n\
+             REV:20240418T184242\n\
+             END:VCARD",
+        );
+        assert_eq!(contacts.len(), 1);
+        assert_eq!(contacts[0].addr, "alice@example.org".to_string());
+        assert_eq!(contacts[0].authname, "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()
+        );
+    }
+
+    #[test]
+    fn test_vcard_with_base64_avatar() {
+        // This is not an actual base64-encoded avatar, it's just to test the parsing.
+        // This one is Android-like.
+        let vcard0 = "BEGIN:VCARD
+VERSION:2.1
+N:;Bob;;;
+FN:Bob
+EMAIL;HOME:bob@example.org
+PHOTO;ENCODING=BASE64;JPEG:/9j/4AAQSkZJRgABAQAAAQABAAD/4gIoSUNDX1BST0ZJTEU
+ AAQEAAAIYAAAAAAQwAABtbnRyUkdCIFhZWiAAAAAAAAAAAAAAAABhY3NwAAAAAAAAAAAAAAAA
+ L8bRuAJYoZUYrI4ZY3VWwxw4Ay28AAGBISScmf/2Q==
+
+END:VCARD
+";
+        // This one is DOS-like.
+        let vcard1 = vcard0.replace('\n', "\r\n");
+        for vcard in [vcard0, vcard1.as_str()] {
+            let contacts = parse_vcard(vcard);
+            assert_eq!(contacts.len(), 1);
+            assert_eq!(contacts[0].addr, "bob@example.org".to_string());
+            assert_eq!(contacts[0].authname, "Bob".to_string());
+            assert_eq!(contacts[0].key, None);
+            assert_eq!(contacts[0].profile_image.as_deref().unwrap(), "/9j/4AAQSkZJRgABAQAAAQABAAD/4gIoSUNDX1BST0ZJTEUAAQEAAAIYAAAAAAQwAABtbnRyUkdCIFhZWiAAAAAAAAAAAAAAAABhY3NwAAAAAAAAAAAAAAAAL8bRuAJYoZUYrI4ZY3VWwxw4Ay28AAGBISScmf/2Q==");
+        }
+    }
+
+    #[test]
+    fn test_protonmail_vcard() {
+        let contacts = parse_vcard(
+            "BEGIN:VCARD
+VERSION:4.0
+FN;PREF=1:Alice Wonderland
+UID:proton-web-03747582-328d-38dc-5ddd-000000000000
+ITEM1.EMAIL;PREF=1:alice@example.org
+ITEM1.KEY;PREF=1:data:application/pgp-keys;base64,aaaaaaaaaaaaaaaaaaaaaaaaa
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ITEM1.KEY;PREF=2:data:application/pgp-keys;base64,bbbbbbbbbbbbbbbbbbbbbbbbb
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+ITEM1.X-PM-ENCRYPT:true
+ITEM1.X-PM-SIGN:true
+END:VCARD",
+        );
+
+        assert_eq!(contacts.len(), 1);
+        assert_eq!(&contacts[0].addr, "alice@example.org");
+        assert_eq!(&contacts[0].authname, "Alice Wonderland");
+        assert_eq!(contacts[0].key.as_ref().unwrap(), "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
+        assert!(contacts[0].timestamp.is_err());
+        assert_eq!(contacts[0].profile_image, None);
+    }
+
    #[test]
    fn test_sanitize_name() {
        assert_eq!(&sanitize_name(" hello world   "), "hello world");
--- a/deltachat-contact-tools/src/vcard.rs
+++ b/deltachat-contact-tools/src/vcard.rs
@@ -1,247 +0,0 @@
-use std::sync::LazyLock;
-
-use anyhow::Context as _;
-use anyhow::Result;
-use chrono::DateTime;
-use chrono::NaiveDateTime;
-use regex::Regex;
-
-use crate::sanitize_name_and_addr;
-
-#[derive(Debug)]
-/// A Contact, as represented in a VCard.
-pub struct VcardContact {
-    /// The email address, vcard property `email`
-    pub addr: String,
-    /// This must be the name authorized by the contact itself, not a locally given name. Vcard
-    /// property `fn`. Can be empty, one should use `display_name()` to obtain the display name.
-    pub authname: 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 biography, stored in the vcard property `note`
-    pub biography: Option<String>,
-    /// The timestamp when the vcard was created / last updated, vcard property `rev`
-    pub timestamp: Result<i64>,
-}
-
-impl VcardContact {
-    /// Returns the contact's display name.
-    pub fn display_name(&self) -> &str {
-        match self.authname.is_empty() {
-            false => &self.authname,
-            true => &self.addr,
-        }
-    }
-}
-
-/// 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 datetime = DateTime::from_timestamp(timestamp, 0)?;
-        Some(datetime.format("%Y%m%dT%H%M%SZ").to_string())
-    }
-
-    fn escape(s: &str) -> String {
-        s.replace(',', "\\,")
-    }
-
-    let mut res = "".to_string();
-    for c in contacts {
-        // Mustn't contain ',', but it's easier to escape than to error out.
-        let addr = escape(&c.addr);
-        let display_name = escape(c.display_name());
-        res += &format!(
-            "BEGIN:VCARD\r\n\
-             VERSION:4.0\r\n\
-             EMAIL:{addr}\r\n\
-             FN:{display_name}\r\n"
-        );
-        if let Some(key) = &c.key {
-            res += &format!("KEY:data:application/pgp-keys;base64\\,{key}\r\n");
-        }
-        if let Some(profile_image) = &c.profile_image {
-            res += &format!("PHOTO:data:image/jpeg;base64\\,{profile_image}\r\n");
-        }
-        if let Some(biography) = &c.biography {
-            res += &format!("NOTE:{}\r\n", escape(biography));
-        }
-        if let Some(timestamp) = format_timestamp(c) {
-            res += &format!("REV:{timestamp}\r\n");
-        }
-        res += "END:VCARD\r\n";
-    }
-    res
-}
-
-/// Parses `VcardContact`s from a given `&str`.
-pub fn parse_vcard(vcard: &str) -> 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
-        }
-    }
-    /// Returns (parameters, raw value) tuple.
-    fn vcard_property_raw<'a>(line: &'a str, property: &str) -> Option<(&'a str, &'a str)> {
-        let remainder = remove_prefix(line, property)?;
-        // If `s` is `EMAIL;TYPE=work:alice@example.com` and `property` is `EMAIL`,
-        // then `remainder` is now `;TYPE=work:alice@example.com`
-
-        // Note: This doesn't handle the case where there are quotes around a colon,
-        // like `NAME;Foo="Some quoted text: that contains a colon":value`.
-        // This could be improved in the future, but for now, the parsing is good enough.
-        let (mut 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;
-        }
-        if let Some(p) = remove_prefix(params, ";") {
-            params = p;
-        }
-        if let Some(p) = remove_prefix(params, "PREF=1") {
-            params = p;
-        }
-        Some((params, value))
-    }
-    /// Returns (parameters, unescaped value) tuple.
-    fn vcard_property<'a>(line: &'a str, property: &str) -> Option<(&'a str, String)> {
-        let (params, value) = vcard_property_raw(line, property)?;
-        // Some fields can't contain commas, but unescape them everywhere for safety.
-        Some((params, value.replace("\\,", ",")))
-    }
-    fn base64_key(line: &str) -> Option<&str> {
-        let (params, value) = vcard_property_raw(line, "key")?;
-        if params.eq_ignore_ascii_case("PGP;ENCODING=BASE64")
-            || params.eq_ignore_ascii_case("TYPE=PGP;ENCODING=b")
-        {
-            return Some(value);
-        }
-        remove_prefix(value, "data:application/pgp-keys;base64\\,")
-            // Old Delta Chat format.
-            .or_else(|| remove_prefix(value, "data:application/pgp-keys;base64,"))
-    }
-    fn base64_photo(line: &str) -> Option<&str> {
-        let (params, value) = vcard_property_raw(line, "photo")?;
-        if params.eq_ignore_ascii_case("JPEG;ENCODING=BASE64")
-            || params.eq_ignore_ascii_case("ENCODING=BASE64;JPEG")
-            || params.eq_ignore_ascii_case("TYPE=JPEG;ENCODING=b")
-            || params.eq_ignore_ascii_case("ENCODING=b;TYPE=JPEG")
-            || params.eq_ignore_ascii_case("ENCODING=BASE64;TYPE=JPEG")
-            || params.eq_ignore_ascii_case("TYPE=JPEG;ENCODING=BASE64")
-        {
-            return Some(value);
-        }
-        remove_prefix(value, "data:image/jpeg;base64\\,")
-            // Old Delta Chat format.
-            .or_else(|| remove_prefix(value, "data:image/jpeg;base64,"))
-    }
-    fn parse_datetime(datetime: &str) -> Result<i64> {
-        // 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)
-    }
-
-    // Remove line folding, see https://datatracker.ietf.org/doc/html/rfc6350#section-3.2
-    static NEWLINE_AND_SPACE_OR_TAB: LazyLock<Regex> =
-        LazyLock::new(|| Regex::new("\r?\n[\t ]").unwrap());
-    let unfolded_lines = NEWLINE_AND_SPACE_OR_TAB.replace_all(vcard, "");
-
-    let mut lines = unfolded_lines.lines().peekable();
-    let mut contacts = Vec::new();
-
-    while lines.peek().is_some() {
-        // Skip to the start of the vcard:
-        for line in lines.by_ref() {
-            if line.eq_ignore_ascii_case("BEGIN:VCARD") {
-                break;
-            }
-        }
-
-        let mut display_name = None;
-        let mut addr = None;
-        let mut key = None;
-        let mut photo = None;
-        let mut biography = None;
-        let mut datetime = None;
-
-        for mut line in lines.by_ref() {
-            if let Some(remainder) = remove_prefix(line, "item1.") {
-                // Remove the group name, if the group is called "item1".
-                // If necessary, we can improve this to also remove groups that are called something different that "item1".
-                //
-                // Search "group name" at https://datatracker.ietf.org/doc/html/rfc6350 for more infos.
-                line = remainder;
-            }
-
-            if let Some((_params, email)) = vcard_property(line, "email") {
-                addr.get_or_insert(email);
-            } else if let Some((_params, name)) = vcard_property(line, "fn") {
-                display_name.get_or_insert(name);
-            } else if let Some(k) = base64_key(line) {
-                key.get_or_insert(k);
-            } else if let Some(p) = base64_photo(line) {
-                photo.get_or_insert(p);
-            } else if let Some((_params, bio)) = vcard_property(line, "note") {
-                biography.get_or_insert(bio);
-            } else if let Some((_params, rev)) = vcard_property(line, "rev") {
-                datetime.get_or_insert(rev);
-            } else if line.eq_ignore_ascii_case("END:VCARD") {
-                let (authname, addr) = sanitize_name_and_addr(
-                    &display_name.unwrap_or_default(),
-                    &addr.unwrap_or_default(),
-                );
-
-                contacts.push(VcardContact {
-                    authname,
-                    addr,
-                    key: key.map(|s| s.to_string()),
-                    profile_image: photo.map(|s| s.to_string()),
-                    biography,
-                    timestamp: datetime
-                        .as_deref()
-                        .context("No timestamp in vcard")
-                        .and_then(parse_datetime),
-                });
-                break;
-            }
-        }
-    }
-
-    contacts
-}
-
-#[cfg(test)]
-mod vcard_tests;
--- a/deltachat-contact-tools/src/vcard/vcard_tests.rs
+++ b/deltachat-contact-tools/src/vcard/vcard_tests.rs
@@ -1,278 +0,0 @@
-use chrono::TimeZone as _;
-
-use super::*;
-
-#[test]
-fn test_vcard_thunderbird() {
-    let contacts = parse_vcard(
-        "BEGIN:VCARD
-VERSION:4.0
-FN:'Alice Mueller'
-EMAIL;PREF=1:alice.mueller@posteo.de
-UID:a8083264-ca47-4be7-98a8-8ec3db1447ca
-END:VCARD
-BEGIN:VCARD
-VERSION:4.0
-FN:'bobzzz@freenet.de'
-EMAIL;PREF=1:bobzzz@freenet.de
-UID:cac4fef4-6351-4854-bbe4-9b6df857eaed
-END:VCARD
-",
-    );
-
-    assert_eq!(contacts[0].addr, "alice.mueller@posteo.de".to_string());
-    assert_eq!(contacts[0].authname, "Alice Mueller".to_string());
-    assert_eq!(contacts[0].key, None);
-    assert_eq!(contacts[0].profile_image, None);
-    assert!(contacts[0].timestamp.is_err());
-
-    assert_eq!(contacts[1].addr, "bobzzz@freenet.de".to_string());
-    assert_eq!(contacts[1].authname, "".to_string());
-    assert_eq!(contacts[1].key, None);
-    assert_eq!(contacts[1].profile_image, None);
-    assert!(contacts[1].timestamp.is_err());
-
-    assert_eq!(contacts.len(), 2);
-}
-
-#[test]
-fn test_vcard_simple_example() {
-    let contacts = parse_vcard(
-        "BEGIN:VCARD
-VERSION:4.0
-FN:Alice Wonderland
-N:Wonderland;Alice;;;Ms.
-GENDER:W
-EMAIL;TYPE=work:alice@example.com
-KEY;TYPE=PGP;ENCODING=b:[base64-data]
-REV:20240418T184242Z
-
-END:VCARD",
-    );
-
-    assert_eq!(contacts[0].addr, "alice@example.com".to_string());
-    assert_eq!(contacts[0].authname, "Alice Wonderland".to_string());
-    assert_eq!(contacts[0].key, Some("[base64-data]".to_string()));
-    assert_eq!(contacts[0].profile_image, None);
-    assert_eq!(*contacts[0].timestamp.as_ref().unwrap(), 1713465762);
-
-    assert_eq!(contacts.len(), 1);
-}
-
-#[test]
-fn test_vcard_with_trailing_newline() {
-    let contacts = parse_vcard(
-        "BEGIN:VCARD\r
-VERSION:4.0\r
-FN:Alice Wonderland\r
-N:Wonderland;Alice;;;Ms.\r
-GENDER:W\r
-EMAIL;TYPE=work:alice@example.com\r
-KEY;TYPE=PGP;ENCODING=b:[base64-data]\r
-REV:20240418T184242Z\r
-END:VCARD\r
-\r",
-    );
-
-    assert_eq!(contacts[0].addr, "alice@example.com".to_string());
-    assert_eq!(contacts[0].authname, "Alice Wonderland".to_string());
-    assert_eq!(contacts[0].key, Some("[base64-data]".to_string()));
-    assert_eq!(contacts[0].profile_image, None);
-    assert_eq!(*contacts[0].timestamp.as_ref().unwrap(), 1713465762);
-
-    assert_eq!(contacts.len(), 1);
-}
-
-#[test]
-fn test_make_and_parse_vcard() {
-    let contacts = [
-        VcardContact {
-            addr: "alice@example.org".to_string(),
-            authname: "Alice Wonderland".to_string(),
-            key: Some("[base64-data]".to_string()),
-            profile_image: Some("image in Base64".to_string()),
-            biography: Some("Hi, I'm Alice".to_string()),
-            timestamp: Ok(1713465762),
-        },
-        VcardContact {
-            addr: "bob@example.com".to_string(),
-            authname: "".to_string(),
-            key: None,
-            profile_image: None,
-            biography: None,
-            timestamp: Ok(0),
-        },
-    ];
-    let items = [
-        "BEGIN:VCARD\r\n\
-             VERSION:4.0\r\n\
-             EMAIL:alice@example.org\r\n\
-             FN:Alice Wonderland\r\n\
-             KEY:data:application/pgp-keys;base64\\,[base64-data]\r\n\
-             PHOTO:data:image/jpeg;base64\\,image in Base64\r\n\
-             NOTE:Hi\\, I'm Alice\r\n\
-             REV:20240418T184242Z\r\n\
-             END:VCARD\r\n",
-        "BEGIN:VCARD\r\n\
-             VERSION:4.0\r\n\
-             EMAIL:bob@example.com\r\n\
-             FN:bob@example.com\r\n\
-             REV:19700101T000000Z\r\n\
-             END:VCARD\r\n",
-    ];
-    let mut expected = "".to_string();
-    for len in 0..=contacts.len() {
-        let contacts = &contacts[0..len];
-        let vcard = make_vcard(contacts);
-        if len > 0 {
-            expected += items[len - 1];
-        }
-        assert_eq!(vcard, expected);
-        let parsed = parse_vcard(&vcard);
-        assert_eq!(parsed.len(), contacts.len());
-        for i in 0..parsed.len() {
-            assert_eq!(parsed[i].addr, contacts[i].addr);
-            assert_eq!(parsed[i].authname, contacts[i].authname);
-            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_vcard_android() {
-    let contacts = parse_vcard(
-        "BEGIN:VCARD
-VERSION:2.1
-N:;Bob;;;
-FN:Bob
-TEL;CELL:+1-234-567-890
-EMAIL;HOME:bob@example.org
-END:VCARD
-BEGIN:VCARD
-VERSION:2.1
-N:;Alice;;;
-FN:Alice
-EMAIL;HOME:alice@example.org
-END:VCARD
-",
-    );
-
-    assert_eq!(contacts[0].addr, "bob@example.org".to_string());
-    assert_eq!(contacts[0].authname, "Bob".to_string());
-    assert_eq!(contacts[0].key, None);
-    assert_eq!(contacts[0].profile_image, None);
-
-    assert_eq!(contacts[1].addr, "alice@example.org".to_string());
-    assert_eq!(contacts[1].authname, "Alice".to_string());
-    assert_eq!(contacts[1].key, None);
-    assert_eq!(contacts[1].profile_image, None);
-
-    assert_eq!(contacts.len(), 2);
-}
-
-#[test]
-fn test_vcard_local_datetime() {
-    let contacts = parse_vcard(
-        "BEGIN:VCARD\n\
-             VERSION:4.0\n\
-             FN:Alice Wonderland\n\
-             EMAIL;TYPE=work:alice@example.org\n\
-             REV:20240418T184242\n\
-             END:VCARD",
-    );
-    assert_eq!(contacts.len(), 1);
-    assert_eq!(contacts[0].addr, "alice@example.org".to_string());
-    assert_eq!(contacts[0].authname, "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()
-    );
-}
-
-#[test]
-fn test_vcard_with_base64_avatar() {
-    // This is not an actual base64-encoded avatar, it's just to test the parsing.
-    // This one is Android-like.
-    let vcard0 = "BEGIN:VCARD
-VERSION:2.1
-N:;Bob;;;
-FN:Bob
-EMAIL;HOME:bob@example.org
-PHOTO;ENCODING=BASE64;JPEG:/9j/4AAQSkZJRgABAQAAAQABAAD/4gIoSUNDX1BST0ZJTEU
- AAQEAAAIYAAAAAAQwAABtbnRyUkdCIFhZWiAAAAAAAAAAAAAAAABhY3NwAAAAAAAAAAAAAAAA
- L8bRuAJYoZUYrI4ZY3VWwxw4Ay28AAGBISScmf/2Q==
-
-END:VCARD
-";
-    // This one is DOS-like.
-    let vcard1 = vcard0.replace('\n', "\r\n");
-    for vcard in [vcard0, vcard1.as_str()] {
-        let contacts = parse_vcard(vcard);
-        assert_eq!(contacts.len(), 1);
-        assert_eq!(contacts[0].addr, "bob@example.org".to_string());
-        assert_eq!(contacts[0].authname, "Bob".to_string());
-        assert_eq!(contacts[0].key, None);
-        assert_eq!(contacts[0].profile_image.as_deref().unwrap(), "/9j/4AAQSkZJRgABAQAAAQABAAD/4gIoSUNDX1BST0ZJTEUAAQEAAAIYAAAAAAQwAABtbnRyUkdCIFhZWiAAAAAAAAAAAAAAAABhY3NwAAAAAAAAAAAAAAAAL8bRuAJYoZUYrI4ZY3VWwxw4Ay28AAGBISScmf/2Q==");
-    }
-}
-
-#[test]
-fn test_protonmail_vcard() {
-    let contacts = parse_vcard(
-        "BEGIN:VCARD
-VERSION:4.0
-FN;PREF=1:Alice Wonderland
-UID:proton-web-03747582-328d-38dc-5ddd-000000000000
-ITEM1.EMAIL;PREF=1:alice@example.org
-ITEM1.KEY;PREF=1:data:application/pgp-keys;base64,aaaaaaaaaaaaaaaaaaaaaaaaa
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-ITEM1.KEY;PREF=2:data:application/pgp-keys;base64,bbbbbbbbbbbbbbbbbbbbbbbbb
- bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-ITEM1.X-PM-ENCRYPT:true
-ITEM1.X-PM-SIGN:true
-END:VCARD",
-    );
-
-    assert_eq!(contacts.len(), 1);
-    assert_eq!(&contacts[0].addr, "alice@example.org");
-    assert_eq!(&contacts[0].authname, "Alice Wonderland");
-    assert_eq!(contacts[0].key.as_ref().unwrap(), "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
-    assert!(contacts[0].timestamp.is_err());
-    assert_eq!(contacts[0].profile_image, None);
-}
-
-/// Proton at some point slightly changed the format of their vcards.
-/// This also tests unescaped commas in PHOTO and KEY (old Delta Chat format).
-#[test]
-fn test_protonmail_vcard2() {
-    let contacts = parse_vcard(
-        r"BEGIN:VCARD
-VERSION:4.0
-FN;PREF=1:Alice
-PHOTO;PREF=1:data:image/jpeg;base64,/9aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Z
-REV:Invalid Date
-ITEM1.EMAIL;PREF=1:alice@example.org
-KEY;PREF=1:data:application/pgp-keys;base64,xsaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa==
-UID:proton-web-aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa
-END:VCARD",
-    );
-
-    assert_eq!(contacts.len(), 1);
-    assert_eq!(&contacts[0].addr, "alice@example.org");
-    assert_eq!(&contacts[0].authname, "Alice");
-    assert_eq!(contacts[0].key.as_ref().unwrap(), "xsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa==");
-    assert!(contacts[0].timestamp.is_err());
-    assert_eq!(contacts[0].profile_image.as_ref().unwrap(), "/9aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Z");
-}
--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "2.0.0"
+version = "1.157.3"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
@@ -24,6 +24,7 @@ tokio = { workspace = true, features = ["rt-multi-thread"] }
 anyhow = { workspace = true }
 thiserror = { workspace = true }
 rand = { workspace = true }
+once_cell = { workspace = true }
 yerpc = { workspace = true, features = ["anyhow_expose"] }

 [features]
--- a/deltachat-ffi/Doxyfile
+++ b/deltachat-ffi/Doxyfile
--- a/deltachat-ffi/DoxygenLayout.xml
+++ b/deltachat-ffi/DoxygenLayout.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doxygenlayout version="2.0">
-  <!-- Generated by doxygen 1.13.2 -->
+<doxygenlayout version="1.0">
+  <!-- Generated by doxygen 1.8.20 -->
  <!-- Navigation index tabs for HTML output -->
  <navindex>
    <tab type="mainpage" visible="yes" title=""/>
@@ -12,16 +11,10 @@
    </tab>
    <tab type="topics" visible="yes" title="Constants" intro="Here is a list of constants:"/>
    <tab type="pages" visible="yes" title="" intro=""/>
-    <tab type="modules" visible="yes" title="" intro="">
-      <tab type="modulelist" visible="yes" title="" intro=""/>
-      <tab type="modulemembers" visible="yes" title="" intro=""/>
-    </tab>
    <tab type="namespaces" visible="yes" title="">
      <tab type="namespacelist" visible="yes" title="" intro=""/>
      <tab type="namespacemembers" visible="yes" title="" intro=""/>
    </tab>
-    <tab type="concepts" visible="yes" title="">
-    </tab>
    <tab type="interfaces" visible="yes" title="">
      <tab type="interfacelist" visible="yes" title="" intro=""/>
      <tab type="interfaceindex" visible="$ALPHABETICAL_INDEX" title=""/>
@@ -42,228 +35,4 @@
    </tab>
    <tab type="examples" visible="yes" title="" intro=""/>
  </navindex>
-
-  <!-- Layout definition for a class page -->
-  <class>
-    <briefdescription visible="yes"/>
-    <includes visible="$SHOW_HEADERFILE"/>
-    <inheritancegraph visible="yes"/>
-    <collaborationgraph visible="yes"/>
-    <memberdecl>
-      <nestedclasses visible="yes" title=""/>
-      <publictypes visible="yes" title=""/>
-      <services visible="yes" title=""/>
-      <interfaces visible="yes" title=""/>
-      <publicslots visible="yes" title=""/>
-      <signals visible="yes" title=""/>
-      <publicmethods visible="yes" title=""/>
-      <publicstaticmethods visible="yes" title=""/>
-      <publicattributes visible="yes" title=""/>
-      <publicstaticattributes visible="yes" title=""/>
-      <protectedtypes visible="yes" title=""/>
-      <protectedslots visible="yes" title=""/>
-      <protectedmethods visible="yes" title=""/>
-      <protectedstaticmethods visible="yes" title=""/>
-      <protectedattributes visible="yes" title=""/>
-      <protectedstaticattributes visible="yes" title=""/>
-      <packagetypes visible="yes" title=""/>
-      <packagemethods visible="yes" title=""/>
-      <packagestaticmethods visible="yes" title=""/>
-      <packageattributes visible="yes" title=""/>
-      <packagestaticattributes visible="yes" title=""/>
-      <properties visible="yes" title=""/>
-      <events visible="yes" title=""/>
-      <privatetypes visible="yes" title=""/>
-      <privateslots visible="yes" title=""/>
-      <privatemethods visible="yes" title=""/>
-      <privatestaticmethods visible="yes" title=""/>
-      <privateattributes visible="yes" title=""/>
-      <privatestaticattributes visible="yes" title=""/>
-      <friends visible="yes" title=""/>
-      <related visible="yes" title="" subtitle=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
-    <detaileddescription visible="yes" title=""/>
-    <memberdef>
-      <inlineclasses visible="yes" title=""/>
-      <typedefs visible="yes" title=""/>
-      <enums visible="yes" title=""/>
-      <services visible="yes" title=""/>
-      <interfaces visible="yes" title=""/>
-      <constructors visible="yes" title=""/>
-      <functions visible="yes" title=""/>
-      <related visible="yes" title=""/>
-      <variables visible="yes" title=""/>
-      <properties visible="yes" title=""/>
-      <events visible="yes" title=""/>
-    </memberdef>
-    <allmemberslink visible="yes"/>
-    <usedfiles visible="$SHOW_USED_FILES"/>
-    <authorsection visible="yes"/>
-  </class>
-
-  <!-- Layout definition for a namespace page -->
-  <namespace>
-    <briefdescription visible="yes"/>
-    <memberdecl>
-      <nestednamespaces visible="yes" title=""/>
-      <constantgroups visible="yes" title=""/>
-      <interfaces visible="yes" title=""/>
-      <classes visible="yes" title=""/>
-      <concepts visible="yes" title=""/>
-      <structs visible="yes" title=""/>
-      <exceptions visible="yes" title=""/>
-      <typedefs visible="yes" title=""/>
-      <sequences visible="yes" title=""/>
-      <dictionaries visible="yes" title=""/>
-      <enums visible="yes" title=""/>
-      <functions visible="yes" title=""/>
-      <variables visible="yes" title=""/>
-      <properties visible="yes" title=""/>
-      <membergroups visible="yes" visible="yes"/>
-    </memberdecl>
-    <detaileddescription visible="yes" title=""/>
-    <memberdef>
-      <inlineclasses visible="yes" title=""/>
-      <typedefs visible="yes" title=""/>
-      <sequences visible="yes" title=""/>
-      <dictionaries visible="yes" title=""/>
-      <enums visible="yes" title=""/>
-      <functions visible="yes" title=""/>
-      <variables visible="yes" title=""/>
-      <properties visible="yes" title=""/>
-    </memberdef>
-    <authorsection visible="yes"/>
-  </namespace>
-
-  <!-- Layout definition for a concept page -->
-  <concept>
-    <briefdescription visible="yes"/>
-    <includes visible="$SHOW_HEADERFILE"/>
-    <definition visible="yes" title=""/>
-    <detaileddescription visible="yes" title=""/>
-    <authorsection visible="yes"/>
-  </concept>
-
-  <!-- Layout definition for a file page -->
-  <file>
-    <briefdescription visible="yes"/>
-    <includes visible="$SHOW_INCLUDE_FILES"/>
-    <includegraph visible="yes"/>
-    <includedbygraph visible="yes"/>
-    <sourcelink visible="yes"/>
-    <memberdecl>
-      <interfaces visible="yes" title=""/>
-      <classes visible="yes" title=""/>
-      <structs visible="yes" title=""/>
-      <exceptions visible="yes" title=""/>
-      <namespaces visible="yes" title=""/>
-      <concepts visible="yes" title=""/>
-      <constantgroups visible="yes" title=""/>
-      <defines visible="yes" title=""/>
-      <typedefs visible="yes" title=""/>
-      <sequences visible="yes" title=""/>
-      <dictionaries visible="yes" title=""/>
-      <enums visible="yes" title=""/>
-      <functions visible="yes" title=""/>
-      <variables visible="yes" title=""/>
-      <properties visible="yes" title=""/>
-      <membergroups visible="yes" visible="yes"/>
-    </memberdecl>
-    <detaileddescription visible="yes" title=""/>
-    <memberdef>
-      <inlineclasses visible="yes" title=""/>
-      <defines visible="yes" title=""/>
-      <typedefs visible="yes" title=""/>
-      <sequences visible="yes" title=""/>
-      <dictionaries visible="yes" title=""/>
-      <enums visible="yes" title=""/>
-      <functions visible="yes" title=""/>
-      <variables visible="yes" title=""/>
-      <properties visible="yes" title=""/>
-    </memberdef>
-    <authorsection/>
-  </file>
-
-  <!-- Layout definition for a group page -->
-  <group>
-    <briefdescription visible="yes"/>
-    <groupgraph visible="yes"/>
-    <memberdecl>
-      <nestedgroups visible="yes" title=""/>
-      <modules visible="yes" title=""/>
-      <dirs visible="yes" title=""/>
-      <files visible="yes" title=""/>
-      <namespaces visible="yes" title=""/>
-      <concepts visible="yes" title=""/>
-      <classes visible="yes" title=""/>
-      <defines visible="yes" title=""/>
-      <typedefs visible="yes" title=""/>
-      <sequences visible="yes" title=""/>
-      <dictionaries visible="yes" title=""/>
-      <enums visible="yes" title=""/>
-      <enumvalues visible="yes" title=""/>
-      <functions visible="yes" title=""/>
-      <variables visible="yes" title=""/>
-      <signals visible="yes" title=""/>
-      <publicslots visible="yes" title=""/>
-      <protectedslots visible="yes" title=""/>
-      <privateslots visible="yes" title=""/>
-      <events visible="yes" title=""/>
-      <properties visible="yes" title=""/>
-      <friends visible="yes" title=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
-    <detaileddescription visible="yes" title=""/>
-    <memberdef>
-      <pagedocs/>
-      <inlineclasses visible="yes" title=""/>
-      <defines visible="yes" title=""/>
-      <typedefs visible="yes" title=""/>
-      <sequences visible="yes" title=""/>
-      <dictionaries visible="yes" title=""/>
-      <enums visible="yes" title=""/>
-      <enumvalues visible="yes" title=""/>
-      <functions visible="yes" title=""/>
-      <variables visible="yes" title=""/>
-      <signals visible="yes" title=""/>
-      <publicslots visible="yes" title=""/>
-      <protectedslots visible="yes" title=""/>
-      <privateslots visible="yes" title=""/>
-      <events visible="yes" title=""/>
-      <properties visible="yes" title=""/>
-      <friends visible="yes" title=""/>
-    </memberdef>
-    <authorsection visible="yes"/>
-  </group>
-
-  <!-- Layout definition for a C++20 module page -->
-  <module>
-    <briefdescription visible="yes"/>
-    <exportedmodules visible="yes"/>
-    <memberdecl>
-      <concepts visible="yes" title=""/>
-      <classes visible="yes" title=""/>
-      <enums visible="yes" title=""/>
-      <typedefs visible="yes" title=""/>
-      <functions visible="yes" title=""/>
-      <variables visible="yes" title=""/>
-      <membergroups visible="yes" title=""/>
-    </memberdecl>
-    <detaileddescription visible="yes" title=""/>
-    <memberdecl>
-      <files visible="yes"/>
-    </memberdecl>
-  </module>
-
-  <!-- Layout definition for a directory page -->
-  <directory>
-    <briefdescription visible="yes"/>
-    <directorygraph visible="yes"/>
-    <memberdecl>
-      <dirs visible="yes"/>
-      <files visible="yes"/>
-    </memberdecl>
-    <detaileddescription visible="yes" title=""/>
-  </directory>
 </doxygenlayout>
--- a/deltachat-ffi/deltachat.h
+++ b/deltachat-ffi/deltachat.h
@@ -2132,12 +2132,8 @@ uint32_t        dc_lookup_contact_id_by_addr (dc_context_t* context, const char*
 uint32_t        dc_create_contact            (dc_context_t* context, const char* name, const char* addr);


-
-// Deprecated 2025-05-20, setting this flag is a no-op.
-#define         DC_GCL_DEPRECATED_VERIFIED_ONLY         0x01
-
+#define         DC_GCL_VERIFIED_ONLY         0x01
 #define         DC_GCL_ADD_SELF              0x02
-#define         DC_GCL_ADDRESS               0x04


 /**
@@ -2166,40 +2162,17 @@ uint32_t        dc_create_contact            (dc_context_t* context, const char*
 int             dc_add_address_book          (dc_context_t* context, const char* addr_book);


-/**
- * Make a vCard.
- *
- * @memberof dc_context_t
- * @param context The context object.
- * @param contact_id The ID of the contact to make the vCard of.
- * @return vCard, must be released using dc_str_unref() after usage.
- */
-char*           dc_make_vcard                (dc_context_t* context, uint32_t contact_id);
-
-
-/**
- * Import a vCard.
- *
- * @memberof dc_context_t
- * @param context The context object.
- * @param vcard vCard contents.
- * @return Returns the IDs of the contacts in the order they appear in the vCard.
- *         Must be dc_array_unref()'d after usage.
- */
-dc_array_t*     dc_import_vcard              (dc_context_t* context, const char* vcard);
-
-
 /**
 * Returns known and unblocked contacts.
 *
 * To get information about a single contact, see dc_get_contact().
- * By default, key-contacts are listed.
 *
 * @memberof dc_context_t
 * @param context The context object.
 * @param flags A combination of flags:
- *     - DC_GCL_ADD_SELF: SELF is added to the list unless filtered by other parameters
- *     - DC_GCL_ADDRESS: List address-contacts instead of key-contacts.
+ *     - if the flag DC_GCL_ADD_SELF is set, SELF is added to the list unless filtered by other parameters
+ *     - if the flag DC_GCL_VERIFIED_ONLY is set, only verified contacts are returned.
+ *       if DC_GCL_VERIFIED_ONLY is not set, verified and unverified contacts are returned.
 * @param query A string to filter the list. Typically used to implement an
 *     incremental search. NULL for no filtering.
 * @return An array containing all contact IDs. Must be dc_array_unref()'d
@@ -3841,21 +3814,6 @@ int             dc_chat_can_send              (const dc_chat_t* chat);
 int             dc_chat_is_protected         (const dc_chat_t* chat);


-/**
- * Check if the chat is encrypted.
- *
- * 1:1 chats with key-contacts and group chats with key-contacts
- * are encrypted.
- * 1:1 chats with emails contacts and ad-hoc groups
- * created for email threads are not encrypted.
- *
- * @memberof dc_chat_t
- * @param chat The chat object.
- * @return 1=chat is encrypted, 0=chat is not encrypted.
- */
-int             dc_chat_is_encrypted         (const dc_chat_t *chat);
-
-
 /**
 * Checks if the chat was protected, and then an incoming message broke this protection.
 *
@@ -4525,11 +4483,6 @@ int             dc_msg_is_info                (const dc_msg_t* msg);
 * UIs can display e.g. an icon based upon the type.
 *
 * Currently, the following types are defined:
- * - DC_INFO_GROUP_NAME_CHANGED (2) - "Group name changd from OLD to BY by CONTACT"
- * - DC_INFO_GROUP_IMAGE_CHANGED (3) - "Group image changd by CONTACT"
- * - DC_INFO_MEMBER_ADDED_TO_GROUP (4) - "Member CONTACT added by OTHER_CONTACT"
- * - DC_INFO_MEMBER_REMOVED_FROM_GROUP (5) - "Member CONTACT removed by OTHER_CONTACT"
- * - DC_INFO_EPHEMERAL_TIMER_CHANGED (10) - "Disappearing messages CHANGED_TO by CONTACT"
 * - DC_INFO_PROTECTION_ENABLED (11) - Info-message for "Chat is now protected"
 * - DC_INFO_PROTECTION_DISABLED (12) - Info-message for "Chat is no longer protected"
 * - DC_INFO_INVALID_UNENCRYPTED_MAIL (13) - Info-message for "Provider requires end-to-end encryption which is not setup yet",
@@ -4537,10 +4490,6 @@ int             dc_msg_is_info                (const dc_msg_t* msg);
 *   and also offer a way to fix the encryption, eg. by a button offering a QR scan
 * - DC_INFO_WEBXDC_INFO_MESSAGE (32) - Info-message created by webxdc app sending `update.info`
 *
- * For the messages that refer to a CONTACT,
- * dc_msg_get_info_contact_id() returns the contact ID.
- * The UI should open the contact's profile when tapping the info message.
- *
 * Even when you display an icon,
 * you should still display the text of the informational message using dc_msg_get_text()
 *
@@ -4553,29 +4502,6 @@ int             dc_msg_is_info                (const dc_msg_t* msg);
 int             dc_msg_get_info_type          (const dc_msg_t* msg);


-/**
- * Return the contact ID of the profile to open when tapping the info message.
- *
- * - For DC_INFO_MEMBER_ADDED_TO_GROUP and DC_INFO_MEMBER_REMOVED_FROM_GROUP,
- *   this is the contact being added/removed.
- *   The contact that did the adding/removal is usually only a tap away
- *   (as introducer and/or atop of the memberlist),
- *   and usually more known anyways.
- * - For DC_INFO_GROUP_NAME_CHANGED, DC_INFO_GROUP_IMAGE_CHANGED and DC_INFO_EPHEMERAL_TIMER_CHANGED
- *   this is the contact who did the change.
- *
- * No need to check additionally for dc_msg_get_info_type(),
- * unless you e.g. want to show the info message in another style.
- *
- * @memberof dc_msg_t
- * @param msg The message object.
- * @return If the info message refers to a contact,
- *     this contact ID or DC_CONTACT_ID_SELF is returned.
- *     Otherwise 0.
- */
-uint32_t        dc_msg_get_info_contact_id    (const dc_msg_t* msg);
-
-
 // DC_INFO* uses the same values as SystemMessage in rust-land
 #define         DC_INFO_UNKNOWN                    0
 #define         DC_INFO_GROUP_NAME_CHANGED         2
@@ -5288,20 +5214,6 @@ int             dc_contact_is_verified       (dc_contact_t* contact);
 int             dc_contact_is_bot            (dc_contact_t* contact);


-/**
- * Returns whether contact is a key-contact,
- * i.e. it is identified by the public key
- * rather than the email address.
- *
- * If so, all messages to and from this contact are encrypted.
- *
- * @memberof dc_contact_t
- * @param contact The contact object.
- * @return 1 if the contact is a key-contact, 0 if it is an address-contact.
- */
-int             dc_contact_is_key_contact    (dc_contact_t* contact);
-
-
 /**
 * Return the contact ID that verified a contact.
 *
@@ -5747,33 +5659,9 @@ int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);
 #define         DC_CHAT_TYPE_MAILINGLIST     140

 /**
- * Outgoing broadcast channel, called "Channel" in the UI.
- *
- * The user can send into this chat,
- * and all recipients will receive messages
- * in a `DC_CHAT_TYPE_IN_BROADCAST`.
- *
- * Called `broadcast` here rather than `channel`,
- * because the word "channel" already appears a lot in the code,
- * which would make it hard to grep for it.
+ * A broadcast list. See dc_chat_get_type() for details.
 */
-#define         DC_CHAT_TYPE_OUT_BROADCAST   160
-
-/**
- * Incoming broadcast channel, called "Channel" in the UI.
- *
- * This chat is read-only,
- * and we do not know who the other recipients are.
- *
- * This is similar to `DC_CHAT_TYPE_MAILINGLIST`,
- * with the main difference being that
- * broadcasts are encrypted.
- *
- * Called `broadcast` here rather than `channel`,
- * because the word "channel" already appears a lot in the code,
- * which would make it hard to grep for it.
- */
-#define         DC_CHAT_TYPE_IN_BROADCAST    165
+#define         DC_CHAT_TYPE_BROADCAST       160

 /**
 * @}
@@ -6942,7 +6830,6 @@ void dc_event_unref(dc_event_t* event);
 /// "End-to-end encryption preferred."
 ///
 /// Used to build the string returned by dc_get_contact_encrinfo().
-/// @deprecated 2025-06-05
 #define DC_STR_E2E_PREFERRED              34

 /// "%1$s verified"
@@ -6955,14 +6842,12 @@ void dc_event_unref(dc_event_t* event);
 ///
 /// Used in status messages.
 /// - %1$s will be replaced by the name of the contact that cannot be verified
-/// @deprecated 2025-06-05
 #define DC_STR_CONTACT_NOT_VERIFIED       36

 /// "Changed setup for %1$s."
 ///
 /// Used in status messages.
 /// - %1$s will be replaced by the name of the contact with the changed setup
-/// @deprecated 2025-06-05
 #define DC_STR_CONTACT_SETUP_CHANGED      37

 /// "Archived chats"
@@ -6972,12 +6857,12 @@ void dc_event_unref(dc_event_t* event);

 /// "Autocrypt Setup Message"
 ///
-/// @deprecated 2025-04
+/// Used in subjects of outgoing Autocrypt Setup Messages.
 #define DC_STR_AC_SETUP_MSG_SUBJECT       42

 /// "This is the Autocrypt Setup Message, open it in a compatible client to use your setup"
 ///
-/// @deprecated 2025-04
+/// Used as message text of outgoing Autocrypt Setup Messages.
 #define DC_STR_AC_SETUP_MSG_BODY          43

 /// "Cannot login as %1$s."
@@ -7352,7 +7237,6 @@ void dc_event_unref(dc_event_t* event);
 /// "%1$s changed their address from %2$s to %3$s"
 ///
 /// Used as an info message to chats with contacts that changed their address.
-/// @deprecated 2025-06-05
 #define DC_STR_AEAP_ADDR_CHANGED          122

 /// "You changed your email address from %1$s to %2$s.
@@ -7653,14 +7537,8 @@ void dc_event_unref(dc_event_t* event);

 /// "Could not yet establish guaranteed end-to-end encryption, but you may already send a message."
 ///
-/// @deprecated 2025-03
-#define DC_STR_SECUREJOIN_WAIT_TIMEOUT 191
-
-/// "The contact must be online to proceed. This process will continue automatically in background."
-///
 /// Used as info message.
-/// @deprecated 2025-06-05
-#define DC_STR_SECUREJOIN_TAKES_LONGER 192
+#define DC_STR_SECUREJOIN_WAIT_TIMEOUT 191

 /// "Contact". Deprecated, currently unused.
 #define DC_STR_CONTACT 200
--- a/deltachat-ffi/src/lib.rs
+++ b/deltachat-ffi/src/lib.rs
@@ -18,7 +18,7 @@ use std::future::Future;
 use std::ops::Deref;
 use std::ptr;
 use std::str::FromStr;
-use std::sync::{Arc, LazyLock};
+use std::sync::Arc;
 use std::time::{Duration, SystemTime};

 use anyhow::Context as _;
@@ -37,8 +37,8 @@ use deltachat::*;
 use deltachat::{accounts::Accounts, log::LogExt};
 use deltachat_jsonrpc::api::CommandApi;
 use deltachat_jsonrpc::yerpc::{OutReceiver, RpcClient, RpcSession};
-use message::Viewtype;
 use num_traits::{FromPrimitive, ToPrimitive};
+use once_cell::sync::Lazy;
 use rand::Rng;
 use tokio::runtime::Runtime;
 use tokio::sync::RwLock;
@@ -68,8 +68,7 @@ const DC_GCM_INFO_ONLY: u32 = 0x02;
 /// Struct representing the deltachat context.
 pub type dc_context_t = Context;

-static RT: LazyLock<Runtime> =
-    LazyLock::new(|| Runtime::new().expect("unable to create tokio runtime"));
+static RT: Lazy<Runtime> = Lazy::new(|| Runtime::new().expect("unable to create tokio runtime"));

 fn block_on<T>(fut: T) -> T::Output
 where
@@ -235,10 +234,7 @@ pub unsafe extern "C" fn dc_set_config(
                .log_err(ctx)
                .is_ok() as libc::c_int
        } else {
-            match config::Config::from_str(&key)
-                .context("Invalid config key")
-                .log_err(ctx)
-            {
+            match config::Config::from_str(&key) {
                Ok(key) => ctx
                    .set_config(key, value.as_deref())
                    .await
@@ -247,7 +243,10 @@ pub unsafe extern "C" fn dc_set_config(
                    })
                    .log_err(ctx)
                    .is_ok() as libc::c_int,
-                Err(_) => 0,
+                Err(_) => {
+                    warn!(ctx, "dc_set_config(): invalid key");
+                    0
+                }
            }
        }
    })
@@ -276,10 +275,7 @@ pub unsafe extern "C" fn dc_get_config(
                .unwrap_or_default()
                .strdup()
        } else {
-            match config::Config::from_str(&key)
-                .with_context(|| format!("Invalid key {:?}", &key))
-                .log_err(ctx)
-            {
+            match config::Config::from_str(&key) {
                Ok(key) => ctx
                    .get_config(key)
                    .await
@@ -288,7 +284,10 @@ pub unsafe extern "C" fn dc_get_config(
                    .unwrap_or_default()
                    .unwrap_or_default()
                    .strdup(),
-                Err(_) => "".strdup(),
+                Err(_) => {
+                    warn!(ctx, "dc_get_config(): invalid key '{}'", &key);
+                    "".strdup()
+                }
            }
        }
    })
@@ -308,17 +307,18 @@ pub unsafe extern "C" fn dc_set_stock_translation(
    let ctx = &*context;

    block_on(async move {
-        match StockMessage::from_u32(stock_id)
-            .with_context(|| format!("Invalid stock message ID {stock_id}"))
-            .log_err(ctx)
-        {
-            Ok(id) => ctx
-                .set_stock_translation(id, msg)
-                .await
-                .context("set_stock_translation failed")
-                .log_err(ctx)
-                .is_ok() as libc::c_int,
-            Err(_) => 0,
+        match StockMessage::from_u32(stock_id) {
+            Some(id) => match ctx.set_stock_translation(id, msg).await {
+                Ok(()) => 1,
+                Err(err) => {
+                    warn!(ctx, "set_stock_translation failed: {err:#}");
+                    0
+                }
+            },
+            None => {
+                warn!(ctx, "invalid stock message id {stock_id}");
+                0
+            }
        }
    })
 }
@@ -335,10 +335,15 @@ pub unsafe extern "C" fn dc_set_config_from_qr(
    let qr = to_string_lossy(qr);
    let ctx = &*context;

-    block_on(qr::set_config_from_qr(ctx, &qr))
-        .context("Failed to create account from QR code")
-        .log_err(ctx)
-        .is_ok() as libc::c_int
+    block_on(async move {
+        match qr::set_config_from_qr(ctx, &qr).await {
+            Ok(()) => 1,
+            Err(err) => {
+                error!(ctx, "Failed to create account from QR code: {err:#}");
+                0
+            }
+        }
+    })
 }

 #[no_mangle]
@@ -348,13 +353,15 @@ pub unsafe extern "C" fn dc_get_info(context: *const dc_context_t) -> *mut libc:
        return "".strdup();
    }
    let ctx = &*context;
-    match block_on(ctx.get_info())
-        .context("Failed to get info")
-        .log_err(ctx)
-    {
-        Ok(info) => render_info(info).unwrap_or_default().strdup(),
-        Err(_) => "".strdup(),
-    }
+    block_on(async move {
+        match ctx.get_info().await {
+            Ok(info) => render_info(info).unwrap_or_default().strdup(),
+            Err(err) => {
+                warn!(ctx, "failed to get info: {err:#}");
+                "".strdup()
+            }
+        }
+    })
 }

 fn render_info(
@@ -387,13 +394,15 @@ pub unsafe extern "C" fn dc_get_connectivity_html(
        return "".strdup();
    }
    let ctx = &*context;
-    match block_on(ctx.get_connectivity_html())
-        .context("Failed to get connectivity html")
-        .log_err(ctx)
-    {
-        Ok(html) => html.strdup(),
-        Err(_) => "".strdup(),
-    }
+    block_on(async move {
+        match ctx.get_connectivity_html().await {
+            Ok(html) => html.strdup(),
+            Err(err) => {
+                error!(ctx, "Failed to get connectivity html: {err:#}");
+                "".strdup()
+            }
+        }
+    })
 }

 #[no_mangle]
@@ -527,7 +536,7 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
        EventType::IncomingReaction { .. } => 2002,
        EventType::IncomingWebxdcNotify { .. } => 2003,
        EventType::IncomingMsg { .. } => 2005,
-        EventType::IncomingMsgBunch => 2006,
+        EventType::IncomingMsgBunch { .. } => 2006,
        EventType::MsgsNoticed { .. } => 2008,
        EventType::MsgDelivered { .. } => 2010,
        EventType::MsgFailed { .. } => 2012,
@@ -585,7 +594,7 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
        | EventType::ConnectivityChanged
        | EventType::SelfavatarChanged
        | EventType::ConfigSynced { .. }
-        | EventType::IncomingMsgBunch
+        | EventType::IncomingMsgBunch { .. }
        | EventType::ErrorSelfNotInGroup(_)
        | EventType::AccountsBackgroundFetchDone
        | EventType::ChatlistChanged
@@ -660,7 +669,7 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
        | EventType::MsgsNoticed(_)
        | EventType::ConnectivityChanged
        | EventType::WebxdcInstanceDeleted { .. }
-        | EventType::IncomingMsgBunch
+        | EventType::IncomingMsgBunch { .. }
        | EventType::SelfavatarChanged
        | EventType::AccountsBackgroundFetchDone
        | EventType::ChatlistChanged
@@ -762,7 +771,7 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
        | EventType::AccountsBackgroundFetchDone
        | EventType::ChatEphemeralTimerModified { .. }
        | EventType::ChatDeleted { .. }
-        | EventType::IncomingMsgBunch
+        | EventType::IncomingMsgBunch { .. }
        | EventType::ChatlistItemChanged { .. }
        | EventType::ChatlistChanged
        | EventType::AccountsChanged
@@ -1245,19 +1254,22 @@ pub unsafe extern "C" fn dc_get_draft(context: *mut dc_context_t, chat_id: u32)
    }
    let ctx = &*context;

-    match block_on(ChatId::new(chat_id).get_draft(ctx))
-        .with_context(|| format!("Failed to get draft for chat #{chat_id}"))
-        .unwrap_or_default()
-    {
-        Some(draft) => {
-            let ffi_msg = MessageWrapper {
-                context,
-                message: draft,
-            };
-            Box::into_raw(Box::new(ffi_msg))
+    block_on(async move {
+        match ChatId::new(chat_id).get_draft(ctx).await {
+            Ok(Some(draft)) => {
+                let ffi_msg = MessageWrapper {
+                    context,
+                    message: draft,
+                };
+                Box::into_raw(Box::new(ffi_msg))
+            }
+            Ok(None) => ptr::null_mut(),
+            Err(err) => {
+                error!(ctx, "Failed to get draft for chat #{chat_id}: {err:#}");
+                ptr::null_mut()
+            }
        }
-        None => ptr::null_mut(),
-    }
+    })
 }

 #[no_mangle]
@@ -1513,7 +1525,10 @@ pub unsafe extern "C" fn dc_set_chat_visibility(
        1 => ChatVisibility::Archived,
        2 => ChatVisibility::Pinned,
        _ => {
-            eprintln!("ignoring careless call to dc_set_chat_visibility(): unknown archived state");
+            warn!(
+                ctx,
+                "ignoring careless call to dc_set_chat_visibility(): unknown archived state",
+            );
            return;
        }
    };
@@ -1667,11 +1682,10 @@ pub unsafe extern "C" fn dc_create_group_chat(
        return 0;
    }
    let ctx = &*context;
-    let Some(protect) = ProtectionStatus::from_i32(protect)
-        .context("Bad protect-value for dc_create_group_chat()")
-        .log_err(ctx)
-        .ok()
-    else {
+    let protect = if let Some(s) = ProtectionStatus::from_i32(protect) {
+        s
+    } else {
+        warn!(ctx, "bad protect-value for dc_create_group_chat()");
        return 0;
    };

@@ -1692,8 +1706,8 @@ pub unsafe extern "C" fn dc_create_broadcast_list(context: *mut dc_context_t) ->
        return 0;
    }
    let ctx = &*context;
-    block_on(chat::create_broadcast(ctx, "Channel".to_string()))
-        .context("Failed to create broadcast channel")
+    block_on(chat::create_broadcast_list(ctx))
+        .context("Failed to create broadcast list")
        .log_err(ctx)
        .map(|id| id.to_u32())
        .unwrap_or(0)
@@ -1817,20 +1831,23 @@ pub unsafe extern "C" fn dc_set_chat_mute_duration(
        return 0;
    }
    let ctx = &*context;
-    let mute_duration = match duration {
+    let muteDuration = match duration {
        0 => MuteDuration::NotMuted,
        -1 => MuteDuration::Forever,
        n if n > 0 => SystemTime::now()
            .checked_add(Duration::from_secs(duration as u64))
            .map_or(MuteDuration::Forever, MuteDuration::Until),
        _ => {
-            eprintln!("dc_chat_set_mute_duration(): Can not use negative duration other than -1");
+            warn!(
+                ctx,
+                "dc_chat_set_mute_duration(): Can not use negative duration other than -1",
+            );
            return 0;
        }
    };

    block_on(async move {
-        chat::set_muted(ctx, ChatId::new(chat_id), mute_duration)
+        chat::set_muted(ctx, ChatId::new(chat_id), muteDuration)
            .await
            .map(|_| 1)
            .unwrap_or_log_default(ctx, "Failed to set mute duration")
@@ -1848,10 +1865,16 @@ pub unsafe extern "C" fn dc_get_chat_encrinfo(
    }
    let ctx = &*context;

-    block_on(ChatId::new(chat_id).get_encryption_info(ctx))
-        .map(|s| s.strdup())
-        .log_err(ctx)
-        .unwrap_or(ptr::null_mut())
+    block_on(async move {
+        ChatId::new(chat_id)
+            .get_encryption_info(ctx)
+            .await
+            .map(|s| s.strdup())
+            .unwrap_or_else(|e| {
+                error!(ctx, "{e:#}");
+                ptr::null_mut()
+            })
+    })
 }

 #[no_mangle]
@@ -2008,10 +2031,12 @@ pub unsafe extern "C" fn dc_resend_msgs(
    let ctx = &*context;
    let msg_ids = convert_and_prune_message_ids(msg_ids, msg_cnt);

-    block_on(chat::resend_msgs(ctx, &msg_ids))
-        .context("Resending failed")
-        .log_err(ctx)
-        .is_ok() as libc::c_int
+    if let Err(err) = block_on(chat::resend_msgs(ctx, &msg_ids)) {
+        error!(ctx, "Resending failed: {err:#}");
+        0
+    } else {
+        1
+    }
 }

 #[no_mangle]
@@ -2041,22 +2066,26 @@ pub unsafe extern "C" fn dc_get_msg(context: *mut dc_context_t, msg_id: u32) ->
    }
    let ctx = &*context;

-    let message = match block_on(message::Message::load_from_db(ctx, MsgId::new(msg_id)))
-        .with_context(|| format!("dc_get_msg could not rectieve msg_id {msg_id}"))
-        .log_err(ctx)
-    {
-        Ok(msg) => msg,
-        Err(_) => {
-            if msg_id <= constants::DC_MSG_ID_LAST_SPECIAL {
-                // C-core API returns empty messages, do the same
-                message::Message::new(Viewtype::default())
-            } else {
-                return ptr::null_mut();
+    block_on(async move {
+        let message = match message::Message::load_from_db(ctx, MsgId::new(msg_id)).await {
+            Ok(msg) => msg,
+            Err(e) => {
+                if msg_id <= constants::DC_MSG_ID_LAST_SPECIAL {
+                    // C-core API returns empty messages, do the same
+                    warn!(
+                        ctx,
+                        "dc_get_msg called with special msg_id={msg_id}, returning empty msg"
+                    );
+                    message::Message::default()
+                } else {
+                    warn!(ctx, "dc_get_msg could not retrieve msg_id {msg_id}: {e:#}");
+                    return ptr::null_mut();
+                }
            }
-        }
-    };
-    let ffi_msg = MessageWrapper { context, message };
-    Box::into_raw(Box::new(ffi_msg))
+        };
+        let ffi_msg = MessageWrapper { context, message };
+        Box::into_raw(Box::new(ffi_msg))
+    })
 }

 #[no_mangle]
@@ -2141,48 +2170,6 @@ pub unsafe extern "C" fn dc_add_address_book(
    })
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_make_vcard(
-    context: *mut dc_context_t,
-    contact_id: u32,
-) -> *mut libc::c_char {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_make_vcard()");
-        return ptr::null_mut();
-    }
-    let ctx = &*context;
-    let contact_id = ContactId::new(contact_id);
-
-    block_on(contact::make_vcard(ctx, &[contact_id]))
-        .unwrap_or_log_default(ctx, "dc_make_vcard failed")
-        .strdup()
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_import_vcard(
-    context: *mut dc_context_t,
-    vcard: *const libc::c_char,
-) -> *mut dc_array::dc_array_t {
-    if context.is_null() || vcard.is_null() {
-        eprintln!("ignoring careless call to dc_import_vcard()");
-        return ptr::null_mut();
-    }
-    let ctx = &*context;
-
-    match block_on(contact::import_vcard(ctx, &to_string_lossy(vcard)))
-        .context("dc_import_vcard failed")
-        .log_err(ctx)
-    {
-        Ok(contact_ids) => Box::into_raw(Box::new(dc_array_t::from(
-            contact_ids
-                .iter()
-                .map(|id| id.to_u32())
-                .collect::<Vec<u32>>(),
-        ))),
-        Err(_) => ptr::null_mut(),
-    }
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_get_contacts(
    context: *mut dc_context_t,
@@ -2286,10 +2273,15 @@ pub unsafe extern "C" fn dc_get_contact_encrinfo(
    }
    let ctx = &*context;

-    block_on(Contact::get_encrinfo(ctx, ContactId::new(contact_id)))
-        .map(|s| s.strdup())
-        .log_err(ctx)
-        .unwrap_or(ptr::null_mut())
+    block_on(async move {
+        Contact::get_encrinfo(ctx, ContactId::new(contact_id))
+            .await
+            .map(|s| s.strdup())
+            .unwrap_or_else(|e| {
+                error!(ctx, "{e:#}");
+                ptr::null_mut()
+            })
+    })
 }

 #[no_mangle]
@@ -2304,10 +2296,15 @@ pub unsafe extern "C" fn dc_delete_contact(
    }
    let ctx = &*context;

-    block_on(Contact::delete(ctx, contact_id))
-        .context("Cannot delete contact")
-        .log_err(ctx)
-        .is_ok() as libc::c_int
+    block_on(async move {
+        match Contact::delete(ctx, contact_id).await {
+            Ok(_) => 1,
+            Err(err) => {
+                error!(ctx, "cannot delete contact: {err:#}");
+                0
+            }
+        }
+    })
 }

 #[no_mangle]
@@ -2378,13 +2375,17 @@ pub unsafe extern "C" fn dc_imex_has_backup(
    }
    let ctx = &*context;

-    match block_on(imex::has_backup(ctx, to_string_lossy(dir).as_ref()))
-        .context("dc_imex_has_backup")
-        .log_err(ctx)
-    {
-        Ok(res) => res.strdup(),
-        Err(_) => ptr::null_mut(),
-    }
+    block_on(async move {
+        match imex::has_backup(ctx, to_string_lossy(dir).as_ref()).await {
+            Ok(res) => res.strdup(),
+            Err(err) => {
+                // do not bubble up error to the user,
+                // the ui will expect that the file does not exist or cannot be accessed
+                warn!(ctx, "dc_imex_has_backup: {err:#}");
+                ptr::null_mut()
+            }
+        }
+    })
 }

 #[no_mangle]
@@ -2395,13 +2396,15 @@ pub unsafe extern "C" fn dc_initiate_key_transfer(context: *mut dc_context_t) ->
    }
    let ctx = &*context;

-    match block_on(imex::initiate_key_transfer(ctx))
-        .context("dc_initiate_key_transfer()")
-        .log_err(ctx)
-    {
-        Ok(res) => res.strdup(),
-        Err(_) => ptr::null_mut(),
-    }
+    block_on(async move {
+        match imex::initiate_key_transfer(ctx).await {
+            Ok(res) => res.strdup(),
+            Err(err) => {
+                error!(ctx, "dc_initiate_key_transfer(): {err:#}");
+                ptr::null_mut()
+            }
+        }
+    })
 }

 #[no_mangle]
@@ -2416,14 +2419,17 @@ pub unsafe extern "C" fn dc_continue_key_transfer(
    }
    let ctx = &*context;

-    block_on(imex::continue_key_transfer(
-        ctx,
-        MsgId::new(msg_id),
-        &to_string_lossy(setup_code),
-    ))
-    .context("dc_continue_key_transfer")
-    .log_err(ctx)
-    .is_ok() as libc::c_int
+    block_on(async move {
+        match imex::continue_key_transfer(ctx, MsgId::new(msg_id), &to_string_lossy(setup_code))
+            .await
+        {
+            Ok(()) => 1,
+            Err(err) => {
+                warn!(ctx, "dc_continue_key_transfer: {err:#}");
+                0
+            }
+        }
+    })
 }

 #[no_mangle]
@@ -2867,14 +2873,12 @@ pub unsafe extern "C" fn dc_chatlist_get_chat_id(
    }
    let ffi_list = &*chatlist;
    let ctx = &*ffi_list.context;
-    match ffi_list
-        .list
-        .get_chat_id(index)
-        .context("get_chat_id failed")
-        .log_err(ctx)
-    {
+    match ffi_list.list.get_chat_id(index) {
        Ok(chat_id) => chat_id.to_u32(),
-        Err(_) => 0,
+        Err(err) => {
+            warn!(ctx, "get_chat_id failed: {err:#}");
+            0
+        }
    }
 }

@@ -2889,14 +2893,12 @@ pub unsafe extern "C" fn dc_chatlist_get_msg_id(
    }
    let ffi_list = &*chatlist;
    let ctx = &*ffi_list.context;
-    match ffi_list
-        .list
-        .get_msg_id(index)
-        .context("get_msg_id failed")
-        .log_err(ctx)
-    {
+    match ffi_list.list.get_msg_id(index) {
        Ok(msg_id) => msg_id.map_or(0, |msg_id| msg_id.to_u32()),
-        Err(_) => 0,
+        Err(err) => {
+            warn!(ctx, "get_msg_id failed: {err:#}");
+            0
+        }
    }
 }

@@ -3050,16 +3052,13 @@ pub unsafe extern "C" fn dc_chat_get_profile_image(chat: *mut dc_chat_t) -> *mut
    let ffi_chat = &*chat;

    block_on(async move {
-        match ffi_chat
-            .chat
-            .get_profile_image(&ffi_chat.context)
-            .await
-            .context("Failed to get profile image")
-            .log_err(&ffi_chat.context)
-            .unwrap_or_default()
-        {
-            Some(p) => p.to_string_lossy().strdup(),
-            None => ptr::null_mut(),
+        match ffi_chat.chat.get_profile_image(&ffi_chat.context).await {
+            Ok(Some(p)) => p.to_string_lossy().strdup(),
+            Ok(None) => ptr::null_mut(),
+            Err(err) => {
+                error!(ffi_chat.context, "failed to get profile image: {err:#}");
+                ptr::null_mut()
+            }
        }
    })
 }
@@ -3153,18 +3152,6 @@ pub unsafe extern "C" fn dc_chat_is_protected(chat: *mut dc_chat_t) -> libc::c_i
    ffi_chat.chat.is_protected() as libc::c_int
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_chat_is_encrypted(chat: *mut dc_chat_t) -> libc::c_int {
-    if chat.is_null() {
-        eprintln!("ignoring careless call to dc_chat_is_encrypted()");
-        return 0;
-    }
-    let ffi_chat = &*chat;
-
-    block_on(ffi_chat.chat.is_encrypted(&ffi_chat.context))
-        .unwrap_or_log_default(&ffi_chat.context, "Failed dc_chat_is_encrypted") as libc::c_int
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_chat_is_protection_broken(chat: *mut dc_chat_t) -> libc::c_int {
    if chat.is_null() {
@@ -3228,20 +3215,22 @@ pub unsafe extern "C" fn dc_chat_get_info_json(
    let ctx = &*context;

    block_on(async move {
-        let Ok(chat) = chat::Chat::load_from_db(ctx, ChatId::new(chat_id))
-            .await
-            .context("dc_get_chat_info_json() failed to load chat")
-            .log_err(ctx)
-        else {
-            return "".strdup();
+        let chat = match chat::Chat::load_from_db(ctx, ChatId::new(chat_id)).await {
+            Ok(chat) => chat,
+            Err(err) => {
+                error!(ctx, "dc_get_chat_info_json() failed to load chat: {err:#}");
+                return "".strdup();
+            }
        };
-        let Ok(info) = chat
-            .get_info(ctx)
-            .await
-            .context("dc_get_chat_info_json() failed to get chat info")
-            .log_err(ctx)
-        else {
-            return "".strdup();
+        let info = match chat.get_info(ctx).await {
+            Ok(info) => info,
+            Err(err) => {
+                error!(
+                    ctx,
+                    "dc_get_chat_info_json() failed to get chat info: {err:#}"
+                );
+                return "".strdup();
+            }
        };
        serde_json::to_string(&info)
            .unwrap_or_log_default(ctx, "dc_get_chat_info_json() failed to serialise to json")
@@ -3501,15 +3490,18 @@ pub unsafe extern "C" fn dc_msg_get_webxdc_info(msg: *mut dc_msg_t) -> *mut libc
    let ffi_msg = &*msg;
    let ctx = &*ffi_msg.context;

-    let Ok(info) = block_on(ffi_msg.message.get_webxdc_info(ctx))
-        .context("dc_msg_get_webxdc_info() failed to get info")
-        .log_err(ctx)
-    else {
-        return "".strdup();
-    };
-    serde_json::to_string(&info)
-        .unwrap_or_log_default(ctx, "dc_msg_get_webxdc_info() failed to serialise to json")
-        .strdup()
+    block_on(async move {
+        let info = match ffi_msg.message.get_webxdc_info(ctx).await {
+            Ok(info) => info,
+            Err(err) => {
+                error!(ctx, "dc_msg_get_webxdc_info() failed to get info: {err:#}");
+                return "".strdup();
+            }
+        };
+        serde_json::to_string(&info)
+            .unwrap_or_log_default(ctx, "dc_msg_get_webxdc_info() failed to serialise to json")
+            .strdup()
+    })
 }

 #[no_mangle]
@@ -3738,20 +3730,6 @@ pub unsafe extern "C" fn dc_msg_get_info_type(msg: *mut dc_msg_t) -> libc::c_int
    ffi_msg.message.get_info_type() as libc::c_int
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_msg_get_info_contact_id(msg: *mut dc_msg_t) -> u32 {
-    if msg.is_null() {
-        eprintln!("ignoring careless call to dc_msg_get_info_contact_id()");
-        return 0;
-    }
-    let ffi_msg = &*msg;
-    let context = &*ffi_msg.context;
-    block_on(ffi_msg.message.get_info_contact_id(context))
-        .unwrap_or_default()
-        .map(|id| id.to_u32())
-        .unwrap_or_default()
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_msg_get_webxdc_href(msg: *mut dc_msg_t) -> *mut libc::c_char {
    if msg.is_null() {
@@ -4303,15 +4281,6 @@ pub unsafe extern "C" fn dc_contact_is_bot(contact: *mut dc_contact_t) -> libc::
    (*contact).contact.is_bot() as libc::c_int
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_contact_is_key_contact(contact: *mut dc_contact_t) -> libc::c_int {
-    if contact.is_null() {
-        eprintln!("ignoring careless call to dc_contact_is_key_contact()");
-        return 0;
-    }
-    (*contact).contact.is_key_contact() as libc::c_int
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_contact_get_verifier_id(contact: *mut dc_contact_t) -> u32 {
    if contact.is_null() {
@@ -4324,7 +4293,6 @@ pub unsafe extern "C" fn dc_contact_get_verifier_id(contact: *mut dc_contact_t)
        .context("failed to get verifier")
        .log_err(ctx)
        .unwrap_or_default()
-        .unwrap_or_default()
        .unwrap_or_default();

    verifier_contact_id.to_u32()
@@ -4549,10 +4517,13 @@ trait ResultExt<T, E> {

 impl<T: Default, E: std::fmt::Display> ResultExt<T, E> for Result<T, E> {
    fn unwrap_or_log_default(self, context: &context::Context, message: &str) -> T {
-        self.map_err(|err| anyhow::anyhow!("{err:#}"))
-            .with_context(|| message.to_string())
-            .log_err(context)
-            .unwrap_or_default()
+        match self {
+            Ok(t) => t,
+            Err(err) => {
+                error!(context, "{message}: {err:#}");
+                Default::default()
+            }
+        }
    }
 }

--- a/deltachat-ffi/src/lot.rs
+++ b/deltachat-ffi/src/lot.rs
@@ -34,7 +34,7 @@ pub enum Meaning {
 }

 impl Lot {
-    pub fn get_text1(&self) -> Option<Cow<'_, str>> {
+    pub fn get_text1(&self) -> Option<Cow<str>> {
        match self {
            Self::Summary(summary) => match &summary.prefix {
                None => None,
@@ -66,7 +66,7 @@ impl Lot {
        }
    }

-    pub fn get_text2(&self) -> Option<Cow<'_, str>> {
+    pub fn get_text2(&self) -> Option<Cow<str>> {
        match self {
            Self::Summary(summary) => Some(summary.truncated_text(160)),
            Self::Qr(_) => None,
--- a/deltachat-jsonrpc/Cargo.toml
+++ b/deltachat-jsonrpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "2.0.0"
+version = "1.157.3"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
 license = "MPL-2.0"
@@ -13,7 +13,10 @@ deltachat-contact-tools = { workspace = true }
 num-traits = { workspace = true }
 schemars = "0.8.22"
 serde = { workspace = true, features = ["derive"] }
+tempfile = { workspace = true }
+log = { workspace = true }
 async-channel = { workspace = true }
+futures = { workspace = true }
 serde_json = { workspace = true }
 yerpc = { workspace = true, features = ["anyhow_expose", "openrpc"] }
 typescript-type-def = { version = "0.5.13", features = ["json_value"] }
@@ -24,8 +27,6 @@ base64 = { workspace = true }

 [dev-dependencies]
 tokio = { workspace = true, features = ["full", "rt-multi-thread"] }
-tempfile = { workspace = true }
-futures = { workspace = true }


 [features]
--- a/deltachat-jsonrpc/src/api.rs
+++ b/deltachat-jsonrpc/src/api.rs
@@ -19,7 +19,6 @@ use deltachat::constants::DC_MSG_ID_DAYMARKER;
 use deltachat::contact::{may_be_valid_addr, Contact, ContactId, Origin};
 use deltachat::context::get_info;
 use deltachat::ephemeral::Timer;
-use deltachat::imex;
 use deltachat::location;
 use deltachat::message::get_msg_read_receipts;
 use deltachat::message::{
@@ -36,9 +35,11 @@ use deltachat::securejoin;
 use deltachat::stock_str::StockMessage;
 use deltachat::webxdc::StatusUpdateSerial;
 use deltachat::EventEmitter;
+use deltachat::{imex, info};
 use sanitize_filename::is_sanitized;
 use tokio::fs;
 use tokio::sync::{watch, Mutex, RwLock};
+use types::basic_message::{BasicMessageLoadResult, BasicMessageObject};
 use types::login_param::EnteredLoginParam;
 use walkdir::WalkDir;
 use yerpc::rpc;
@@ -227,9 +228,8 @@ impl CommandApi {
    /// Get a list of all configured accounts.
    async fn get_all_accounts(&self) -> Result<Vec<Account>> {
        let mut accounts = Vec::new();
-        let accounts_lock = self.accounts.read().await;
-        for id in accounts_lock.get_all() {
-            let context_option = accounts_lock.get_account(id);
+        for id in self.accounts.read().await.get_all() {
+            let context_option = self.accounts.read().await.get_account(id);
            if let Some(ctx) = context_option {
                accounts.push(Account::from_context(&ctx, id).await?)
            }
@@ -327,12 +327,8 @@ impl CommandApi {
            .get_config_bool(deltachat::config::Config::ProxyEnabled)
            .await?;

-        let provider_info = get_provider_info(
-            &ctx,
-            email.split('@').next_back().unwrap_or(""),
-            proxy_enabled,
-        )
-        .await;
+        let provider_info =
+            get_provider_info(&ctx, email.split('@').last().unwrap_or(""), proxy_enabled).await;
        Ok(ProviderInfo::from_dc_type(provider_info))
    }

@@ -354,20 +350,6 @@ impl CommandApi {
        Ok(ctx.get_blobdir().to_str().map(|s| s.to_owned()))
    }

-    /// If there was an error while the account was opened
-    /// and migrated to the current version,
-    /// then this function returns it.
-    ///
-    /// This function is useful because the key-contacts migration could fail due to bugs
-    /// and then the account will not work properly.
-    ///
-    /// After opening an account, the UI should call this function
-    /// and show the error string if one is returned.
-    async fn get_migration_error(&self, account_id: u32) -> Result<Option<String>> {
-        let ctx = self.get_context(account_id).await?;
-        Ok(ctx.get_migration_error())
-    }
-
    /// Copy file to blob dir.
    async fn copy_to_blob_dir(&self, account_id: u32, path: String) -> Result<PathBuf> {
        let ctx = self.get_context(account_id).await?;
@@ -453,7 +435,7 @@ impl CommandApi {
    /// Setup the credential config before calling this.
    ///
    /// Deprecated as of 2025-02; use `add_transport_from_qr()`
-    /// or `add_or_update_transport()` instead.
+    /// or `add_transport()` instead.
    async fn configure(&self, account_id: u32) -> Result<()> {
        let ctx = self.get_context(account_id).await?;
        ctx.stop_io().await;
@@ -476,7 +458,7 @@ impl CommandApi {
    ///
    /// This function stops and starts IO as needed.
    ///
-    /// Usually it will be enough to only set `addr` and `password`,
+    /// Usually it will be enough to only set `addr` and `imap.password`,
    /// and all the other settings will be autoconfigured.
    ///
    /// During configuration, ConfigureProgress events are emitted;
@@ -497,30 +479,21 @@ impl CommandApi {
    ///   from a server encoded in a QR code.
    /// - [Self::list_transports()] to get a list of all configured transports.
    /// - [Self::delete_transport()] to remove a transport.
-    async fn add_or_update_transport(
-        &self,
-        account_id: u32,
-        param: EnteredLoginParam,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        ctx.add_or_update_transport(&mut param.try_into()?).await
-    }
-
-    /// Deprecated 2025-04. Alias for [Self::add_or_update_transport()].
    async fn add_transport(&self, account_id: u32, param: EnteredLoginParam) -> Result<()> {
-        self.add_or_update_transport(account_id, param).await
+        let ctx = self.get_context(account_id).await?;
+        ctx.add_transport(&param.try_into()?).await
    }

    /// Adds a new email account as a transport
    /// using the server encoded in the QR code.
-    /// See [Self::add_or_update_transport].
+    /// See [Self::add_transport].
    async fn add_transport_from_qr(&self, account_id: u32, qr: String) -> Result<()> {
        let ctx = self.get_context(account_id).await?;
        ctx.add_transport_from_qr(&qr).await
    }

    /// Returns the list of all email accounts that are used as a transport in the current profile.
-    /// Use [Self::add_or_update_transport()] to add or change a transport
+    /// Use [Self::add_transport()] to add or change a transport
    /// and [Self::delete_transport()] to delete a transport.
    async fn list_transports(&self, account_id: u32) -> Result<Vec<EnteredLoginParam>> {
        let ctx = self.get_context(account_id).await?;
@@ -926,7 +899,7 @@ impl CommandApi {
    ///   explicitly as it may happen that oneself gets removed from a still existing
    ///   group
    ///
-    /// - for broadcast channels, all recipients are returned, DC_CONTACT_ID_SELF is not included
+    /// - for broadcasts, all recipients are returned, DC_CONTACT_ID_SELF is not included
    ///
    /// - for mailing lists, the behavior is not documented currently, we will decide on that later.
    ///   for now, the UI should not show the list for mailing lists.
@@ -975,30 +948,18 @@ impl CommandApi {
            .map(|id| id.to_u32())
    }

-    /// Deprecated 2025-07 in favor of create_broadcast().
-    async fn create_broadcast_list(&self, account_id: u32) -> Result<u32> {
-        self.create_broadcast(account_id, "Channel".to_string())
-            .await
-    }
-
-    /// Create a new **broadcast channel**
-    /// (called "Channel" in the UI).
+    /// Create a new broadcast list.
    ///
-    /// Broadcast channels are similar to groups on the sending device,
+    /// Broadcast lists are similar to groups on the sending device,
    /// however, recipients get the messages in a read-only chat
-    /// and will not see who the other members are.
+    /// and will see who the other members are.
    ///
-    /// Called `broadcast` here rather than `channel`,
-    /// because the word "channel" already appears a lot in the code,
-    /// which would make it hard to grep for it.
-    ///
-    /// After creation, the chat contains no recipients and is in _unpromoted_ state;
-    /// see [`CommandApi::create_group_chat`] for more information on the unpromoted state.
-    ///
-    /// Returns the created chat's id.
-    async fn create_broadcast(&self, account_id: u32, chat_name: String) -> Result<u32> {
+    /// For historical reasons, this function does not take a name directly,
+    /// instead you have to set the name using dc_set_chat_name()
+    /// after creating the broadcast list.
+    async fn create_broadcast_list(&self, account_id: u32) -> Result<u32> {
        let ctx = self.get_context(account_id).await?;
-        chat::create_broadcast(&ctx, chat_name)
+        chat::create_broadcast_list(&ctx)
            .await
            .map(|id| id.to_u32())
    }
@@ -1306,6 +1267,48 @@ impl CommandApi {
        Ok(messages)
    }

+    async fn basic_get_message(&self, account_id: u32, msg_id: u32) -> Result<BasicMessageObject> {
+        let ctx = self.get_context(account_id).await?;
+        let msg_id = MsgId::new(msg_id);
+        let message_object = BasicMessageObject::from_msg_id(&ctx, msg_id)
+            .await
+            .with_context(|| format!("Failed to load message {msg_id} for account {account_id}"))?
+            .with_context(|| format!("Message {msg_id} does not exist for account {account_id}"))?;
+        Ok(message_object)
+    }
+
+    /// get multiple messages in one call (but only basic properties)
+    /// 
+    /// This is for optimized performance, the result of [get_messages] is more complete, but is more expensive.
+    /// 
+    /// if loading one message fails the error is stored in the result object in it's place.
+    /// 
+    /// this is the batch variant of [basic_get_message]
+    async fn basic_get_messages(
+        &self,
+        account_id: u32,
+        message_ids: Vec<u32>,
+    ) -> Result<HashMap<u32, BasicMessageLoadResult>> {
+        let ctx = self.get_context(account_id).await?;
+        let mut messages: HashMap<u32, BasicMessageLoadResult> = HashMap::new();
+        for message_id in message_ids {
+            let message_result = BasicMessageObject::from_msg_id(&ctx, MsgId::new(message_id)).await;
+            messages.insert(
+                message_id,
+                match message_result {
+                    Ok(Some(message)) => BasicMessageLoadResult::Message(message),
+                    Ok(None) => BasicMessageLoadResult::LoadingError {
+                        error: "Message does not exist".to_string(),
+                    },
+                    Err(error) => BasicMessageLoadResult::LoadingError {
+                        error: format!("{error:#}"),
+                    },
+                },
+            );
+        }
+        Ok(messages)
+    }
+
    /// Fetch info desktop needs for creating a notification for a message
    async fn get_message_notification_info(
        &self,
@@ -1505,14 +1508,6 @@ impl CommandApi {
        Ok(contacts)
    }

-    /// Returns ids of known and unblocked contacts.
-    ///
-    /// By default, key-contacts are listed.
-    ///
-    /// * `list_flags` - A combination of flags:
-    ///   - `DC_GCL_ADD_SELF` - Add SELF unless filtered by other parameters.
-    ///   - `DC_GCL_ADDRESS` - List address-contacts instead of key-contacts.
-    /// * `query` - A string to filter the list.
    async fn get_contact_ids(
        &self,
        account_id: u32,
@@ -1524,10 +1519,8 @@ impl CommandApi {
        Ok(contacts.into_iter().map(|c| c.to_u32()).collect())
    }

-    /// Returns known and unblocked contacts.
-    ///
-    /// Formerly called `getContacts2` in Desktop.
-    /// See [`Self::get_contact_ids`] for parameters and more info.
+    /// Get a list of contacts.
+    /// (formerly called getContacts2 in desktop)
    async fn get_contacts(
        &self,
        account_id: u32,
@@ -1578,7 +1571,15 @@ impl CommandApi {
        Ok(())
    }

-    /// Sets display name for existing contact.
+    /// Resets contact encryption.
+    async fn reset_contact_encryption(&self, account_id: u32, contact_id: u32) -> Result<()> {
+        let ctx = self.get_context(account_id).await?;
+        let contact_id = ContactId::new(contact_id);
+
+        contact_id.reset_encryption(&ctx).await?;
+        Ok(())
+    }
+
    async fn change_contact_name(
        &self,
        account_id: u32,
@@ -1587,7 +1588,9 @@ impl CommandApi {
    ) -> Result<()> {
        let ctx = self.get_context(account_id).await?;
        let contact_id = ContactId::new(contact_id);
-        contact_id.set_name(&ctx, &name).await?;
+        let contact = Contact::get_by_id(&ctx, contact_id).await?;
+        let addr = contact.get_addr();
+        Contact::create(&ctx, &name, addr).await?;
        Ok(())
    }

@@ -1946,10 +1949,12 @@ impl CommandApi {
        instance_msg_id: u32,
    ) -> Result<()> {
        let ctx = self.get_context(account_id).await?;
-        if let Some(fut) =
-            send_webxdc_realtime_advertisement(&ctx, MsgId::new(instance_msg_id)).await?
-        {
-            tokio::spawn(fut);
+        let fut = send_webxdc_realtime_advertisement(&ctx, MsgId::new(instance_msg_id)).await?;
+        if let Some(fut) = fut {
+            tokio::spawn(async move {
+                fut.await.ok();
+                info!(ctx, "send_webxdc_realtime_advertisement done")
+            });
        }
        Ok(())
    }
@@ -1985,9 +1990,13 @@ impl CommandApi {

    /// Get href from a WebxdcInfoMessage which might include a hash holding
    /// information about a specific position or state in a webxdc app (optional)
-    async fn get_webxdc_href(&self, account_id: u32, info_msg_id: u32) -> Result<Option<String>> {
+    async fn get_webxdc_href(
+        &self,
+        account_id: u32,
+        instance_msg_id: u32,
+    ) -> Result<Option<String>> {
        let ctx = self.get_context(account_id).await?;
-        let message = Message::load_from_db(&ctx, MsgId::new(info_msg_id)).await?;
+        let message = Message::load_from_db(&ctx, MsgId::new(instance_msg_id)).await?;
        Ok(message.get_webxdc_href())
    }

@@ -2310,37 +2319,6 @@ impl CommandApi {

    // mimics the old desktop call, will get replaced with something better in the composer rewrite,
    // the better version will just be sending the current draft, though there will be probably something similar with more options to this for the corner cases like setting a marker on the map
-    /// Send a message to a chat.
-    ///
-    /// This function returns after the message has been placed in the sending queue.
-    /// This does not imply that the message was really sent out yet.
-    /// However, from your view, you're done with the message.
-    /// Sooner or later it will find its way.
-    ///
-    /// **Attaching files:**
-    ///
-    /// Pass the file path in the `file` parameter.
-    /// If `file` is not in the blob directory yet,
-    /// it will be copied into the blob directory.
-    /// If you want, you can delete the file immediately after this function returns.
-    ///
-    /// You can also write the attachment directly into the blob directory
-    /// and then pass the path as the `file` parameter;
-    /// this will prevent an unnecessary copying of the file.
-    ///
-    /// In `filename`, you can pass the original name of the file,
-    /// which will then be shown in the UI.
-    /// in this case the current name of `file` on the filesystem will be ignored.
-    ///
-    /// In order to deduplicate files that contain the same data,
-    /// the file will be named `<hash>.<extension>`, e.g. `ce940175885d7b78f7b7e9f1396611f.jpg`.
-    ///
-    /// NOTE:
-    /// - This function will rename the file. To get the new file path, call `get_file()`.
-    /// - The file must not be modified after this function was called.
-    /// - Images etc. will NOT be recoded.
-    ///   In order to recode images,
-    ///   use `misc_set_draft` and pass `Image` as the viewtype.
    #[expect(clippy::too_many_arguments)]
    async fn misc_send_msg(
        &self,
--- a/deltachat-jsonrpc/src/api/types/basic_message.rs
+++ b/deltachat-jsonrpc/src/api/types/basic_message.rs
@@ -0,0 +1,166 @@
+use anyhow::{Context as _, Result};
+
+use deltachat::context::Context;
+use deltachat::message::Message;
+use deltachat::message::MsgId;
+use num_traits::cast::ToPrimitive;
+use serde::Serialize;
+use typescript_type_def::TypeDef;
+
+use super::message::DownloadState;
+use super::message::MessageViewtype;
+use super::message::SystemMessageType;
+
+#[derive(Serialize, TypeDef, schemars::JsonSchema)]
+#[serde(rename_all = "camelCase", tag = "kind")]
+pub enum BasicMessageLoadResult {
+    Message(BasicMessageObject),
+    LoadingError { error: String },
+}
+
+/// Message that only has basic properties that doen't require additional db calls
+#[derive(Serialize, TypeDef, schemars::JsonSchema)]
+#[serde(rename = "BasicMessage", rename_all = "camelCase")]
+pub struct BasicMessageObject {
+    id: u32,
+    chat_id: u32,
+    from_id: u32,
+
+    text: String,
+
+    is_edited: bool,
+
+    /// 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,
+    state: u32,
+
+    /// An error text, if there is one.
+    error: Option<String>,
+
+    timestamp: i64,
+    sort_timestamp: i64,
+    received_timestamp: i64,
+    has_deviating_timestamp: bool,
+
+    // summary - use/create another function if you need it
+    subject: String,
+    show_padlock: bool,
+    is_setupmessage: bool,
+    is_info: bool,
+    is_forwarded: bool,
+
+    /// True if the message was sent by a bot.
+    is_bot: bool,
+
+    /// when is_info is true this describes what type of system message it is
+    system_message_type: SystemMessageType,
+
+    duration: i32,
+    dimensions_height: i32,
+    dimensions_width: i32,
+
+    videochat_type: Option<u32>,
+    videochat_url: Option<String>,
+
+    override_sender_name: Option<String>,
+
+    setup_code_begin: Option<String>,
+
+    file: Option<String>,
+    file_mime: Option<String>,
+    file_name: Option<String>,
+
+    webxdc_href: Option<String>,
+
+    download_state: DownloadState,
+
+    original_msg_id: Option<u32>,
+
+    saved_message_id: Option<u32>,
+}
+
+impl BasicMessageObject {
+    pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<Option<Self>> {
+        let Some(message) = Message::load_from_db_optional(context, msg_id).await? else {
+            return Ok(None);
+        };
+
+        let override_sender_name = message.get_override_sender_name();
+
+        let download_state = message.download_state().into();
+
+        let message_object = Self {
+            id: msg_id.to_u32(),
+            chat_id: message.get_chat_id().to_u32(),
+            from_id: message.get_from_id().to_u32(),
+            text: message.get_text(),
+            is_edited: message.is_edited(),
+            has_location: message.has_location(),
+            has_html: message.has_html(),
+            view_type: message.get_viewtype().into(),
+            state: message
+                .get_state()
+                .to_u32()
+                .context("state conversion to number failed")?,
+            error: message.error(),
+
+            timestamp: message.get_timestamp(),
+            sort_timestamp: message.get_sort_timestamp(),
+            received_timestamp: message.get_received_timestamp(),
+            has_deviating_timestamp: message.has_deviating_timestamp(),
+
+            subject: message.get_subject().to_owned(),
+            show_padlock: message.get_showpadlock(),
+            is_setupmessage: message.is_setupmessage(),
+            is_info: message.is_info(),
+            is_forwarded: message.is_forwarded(),
+            is_bot: message.is_bot(),
+            system_message_type: message.get_info_type().into(),
+
+            duration: message.get_duration(),
+            dimensions_height: message.get_height(),
+            dimensions_width: message.get_width(),
+
+            videochat_type: match message.get_videochat_type() {
+                Some(vct) => Some(
+                    vct.to_u32()
+                        .context("videochat type conversion to number failed")?,
+                ),
+                None => None,
+            },
+            videochat_url: message.get_videochat_url(),
+
+            override_sender_name,
+
+            setup_code_begin: message.get_setupcodebegin(context).await,
+
+            file: match message.get_file(context) {
+                Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
+                None => None,
+            }, //BLOBS
+            file_mime: message.get_filemime(),
+            file_name: message.get_filename(),
+
+            // On a WebxdcInfoMessage this might include a hash holding
+            // information about a specific position or state in a webxdc app
+            webxdc_href: message.get_webxdc_href(),
+
+            download_state,
+
+            original_msg_id: message
+                .get_original_msg_id(context)
+                .await?
+                .map(|id| id.to_u32()),
+
+            saved_message_id: message
+                .get_saved_msg_id(context)
+                .await?
+                .map(|id| id.to_u32()),
+        };
+        Ok(Some(message_object))
+    }
+}
--- a/deltachat-jsonrpc/src/api/types/chat.rs
+++ b/deltachat-jsonrpc/src/api/types/chat.rs
@@ -30,29 +30,6 @@ pub struct FullChat {
    /// in the contact profile
    /// if 1:1 chat with this contact exists and is protected.
    is_protected: bool,
-    /// True if the chat is encrypted.
-    /// This means that all messages in the chat are encrypted,
-    /// and all contacts in the chat are "key-contacts",
-    /// i.e. identified by the PGP key fingerprint.
-    ///
-    /// False if the chat is unencrypted.
-    /// This means that all messages in the chat are unencrypted,
-    /// and all contacts in the chat are "address-contacts",
-    /// i.e. identified by the email address.
-    /// The UI should mark this chat e.g. with a mail-letter icon.
-    ///
-    /// Unencrypted groups are called "ad-hoc groups"
-    /// and the user can't add/remove members,
-    /// create a QR invite code,
-    /// or set an avatar.
-    /// These options should therefore be disabled in the UI.
-    ///
-    /// Note that it can happen that an encrypted chat
-    /// contains unencrypted messages that were received in core <= v1.159.*
-    /// and vice versa.
-    ///
-    /// See also `is_key_contact` on `Contact`.
-    is_encrypted: bool,
    profile_image: Option<String>, //BLOBS ?
    archived: bool,
    pinned: bool,
@@ -131,7 +108,6 @@ impl FullChat {
            id: chat_id,
            name: chat.name.clone(),
            is_protected: chat.is_protected(),
-            is_encrypted: chat.is_encrypted(context).await?,
            profile_image, //BLOBS ?
            archived: chat.get_visibility() == chat::ChatVisibility::Archived,
            pinned: chat.get_visibility() == chat::ChatVisibility::Pinned,
@@ -183,30 +159,6 @@ pub struct BasicChat {
    /// in the contact profile
    /// if 1:1 chat with this contact exists and is protected.
    is_protected: bool,
-
-    /// True if the chat is encrypted.
-    /// This means that all messages in the chat are encrypted,
-    /// and all contacts in the chat are "key-contacts",
-    /// i.e. identified by the PGP key fingerprint.
-    ///
-    /// False if the chat is unencrypted.
-    /// This means that all messages in the chat are unencrypted,
-    /// and all contacts in the chat are "address-contacts",
-    /// i.e. identified by the email address.
-    /// The UI should mark this chat e.g. with a mail-letter icon.
-    ///
-    /// Unencrypted groups are called "ad-hoc groups"
-    /// and the user can't add/remove members,
-    /// create a QR invite code,
-    /// or set an avatar.
-    /// These options should therefore be disabled in the UI.
-    ///
-    /// Note that it can happen that an encrypted chat
-    /// contains unencrypted messages that were received in core <= v1.159.*
-    /// and vice versa.
-    ///
-    /// See also `is_key_contact` on `Contact`.
-    is_encrypted: bool,
    profile_image: Option<String>, //BLOBS ?
    archived: bool,
    pinned: bool,
@@ -235,7 +187,6 @@ impl BasicChat {
            id: chat_id,
            name: chat.name.clone(),
            is_protected: chat.is_protected(),
-            is_encrypted: chat.is_encrypted(context).await?,
            profile_image, //BLOBS ?
            archived: chat.get_visibility() == chat::ChatVisibility::Archived,
            pinned: chat.get_visibility() == chat::ChatVisibility::Pinned,
--- a/deltachat-jsonrpc/src/api/types/chat_list.rs
+++ b/deltachat-jsonrpc/src/api/types/chat_list.rs
@@ -30,30 +30,6 @@ pub enum ChatListItemFetchResult {
        /// showing preview if last chat message is image
        summary_preview_image: Option<String>,
        is_protected: bool,
-
-        /// True if the chat is encrypted.
-        /// This means that all messages in the chat are encrypted,
-        /// and all contacts in the chat are "key-contacts",
-        /// i.e. identified by the PGP key fingerprint.
-        ///
-        /// False if the chat is unencrypted.
-        /// This means that all messages in the chat are unencrypted,
-        /// and all contacts in the chat are "address-contacts",
-        /// i.e. identified by the email address.
-        /// The UI should mark this chat e.g. with a mail-letter icon.
-        ///
-        /// Unencrypted groups are called "ad-hoc groups"
-        /// and the user can't add/remove members,
-        /// create a QR invite code,
-        /// or set an avatar.
-        /// These options should therefore be disabled in the UI.
-        ///
-        /// Note that it can happen that an encrypted chat
-        /// contains unencrypted messages that were received in core <= v1.159.*
-        /// and vice versa.
-        ///
-        /// See also `is_key_contact` on `Contact`.
-        is_encrypted: bool,
        is_group: bool,
        fresh_message_counter: usize,
        is_self_talk: bool,
@@ -64,10 +40,8 @@ pub enum ChatListItemFetchResult {
        is_pinned: bool,
        is_muted: bool,
        is_contact_request: bool,
-        /// Deprecated 2025-07, alias for is_out_broadcast
+        /// true when chat is a broadcastlist
        is_broadcast: bool,
-        /// true if the chat type is OutBroadcast
-        is_out_broadcast: bool,
        /// contact id if this is a dm chat (for view profile entry in context menu)
        dm_chat_contact: Option<u32>,
        was_seen_recently: bool,
@@ -163,7 +137,6 @@ pub(crate) async fn get_chat_list_item_by_id(
        summary_status: summary.state.to_u32().expect("impossible"), // idea and a function to transform the constant to strings? or return string enum
        summary_preview_image,
        is_protected: chat.is_protected(),
-        is_encrypted: chat.is_encrypted(ctx).await?,
        is_group: chat.get_type() == Chattype::Group,
        fresh_message_counter,
        is_self_talk: chat.is_self_talk(),
@@ -174,8 +147,7 @@ pub(crate) async fn get_chat_list_item_by_id(
        is_pinned: visibility == ChatVisibility::Pinned,
        is_muted: chat.is_muted(),
        is_contact_request: chat.is_contact_request(),
-        is_broadcast: chat.get_type() == Chattype::OutBroadcast,
-        is_out_broadcast: chat.get_type() == Chattype::OutBroadcast,
+        is_broadcast: chat.get_type() == Chattype::Broadcast,
        dm_chat_contact,
        was_seen_recently,
        last_message_type: message_type,
--- a/deltachat-jsonrpc/src/api/types/contact.rs
+++ b/deltachat-jsonrpc/src/api/types/contact.rs
@@ -19,16 +19,6 @@ pub struct ContactObject {
    profile_image: Option<String>, // BLOBS
    name_and_addr: String,
    is_blocked: bool,
-
-    /// Is the contact a key contact.
-    is_key_contact: bool,
-
-    /// Is encryption available for this contact.
-    ///
-    /// This can only be true for key-contacts.
-    /// However, it is possible to have a key-contact
-    /// for which encryption is not available because we don't have a key yet,
-    /// e.g. if we just scanned the fingerprint from a QR code.
    e2ee_avail: bool,

    /// True if the contact can be added to verified groups.
@@ -77,7 +67,6 @@ impl ContactObject {
        let verifier_id = contact
            .get_verifier_id(context)
            .await?
-            .flatten()
            .map(|contact_id| contact_id.to_u32());

        Ok(ContactObject {
@@ -91,7 +80,6 @@ impl ContactObject {
            profile_image, //BLOBS
            name_and_addr: contact.get_name_n_addr(),
            is_blocked: contact.is_blocked(),
-            is_key_contact: contact.is_key_contact(),
            e2ee_avail: contact.e2ee_avail(context).await?,
            is_verified,
            is_profile_verified,
--- a/deltachat-jsonrpc/src/api/types/login_param.rs
+++ b/deltachat-jsonrpc/src/api/types/login_param.rs
@@ -4,77 +4,83 @@ use serde::Deserialize;
 use serde::Serialize;
 use yerpc::TypeDef;

+#[derive(Serialize, Deserialize, TypeDef, schemars::JsonSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct EnteredServerLoginParam {
+    /// Server hostname or IP address.
+    pub server: String,
+
+    /// Server port.
+    ///
+    /// 0 if not specified.
+    pub port: u16,
+
+    /// Socket security.
+    pub security: Socket,
+
+    /// Username.
+    ///
+    /// Empty string if not specified.
+    pub user: String,
+
+    /// Password.
+    pub password: String,
+}
+
+impl From<dc::EnteredServerLoginParam> for EnteredServerLoginParam {
+    fn from(param: dc::EnteredServerLoginParam) -> Self {
+        Self {
+            server: param.server,
+            port: param.port,
+            security: param.security.into(),
+            user: param.user,
+            password: param.password,
+        }
+    }
+}
+
+impl From<EnteredServerLoginParam> for dc::EnteredServerLoginParam {
+    fn from(param: EnteredServerLoginParam) -> Self {
+        Self {
+            server: param.server,
+            port: param.port,
+            security: param.security.into(),
+            user: param.user,
+            password: param.password,
+        }
+    }
+}
+
 /// Login parameters entered by the user.
-///
-/// Usually it will be enough to only set `addr` and `password`,
-/// and all the other settings will be autoconfigured.
+
 #[derive(Serialize, Deserialize, TypeDef, schemars::JsonSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct EnteredLoginParam {
    /// Email address.
    pub addr: String,

-    /// Password.
-    pub password: String,
+    /// IMAP settings.
+    pub imap: EnteredServerLoginParam,

-    /// Imap server hostname or IP address.
-    pub imap_server: Option<String>,
-
-    /// Imap server port.
-    pub imap_port: Option<u16>,
-
-    /// Imap socket security.
-    pub imap_security: Option<Socket>,
-
-    /// Imap username.
-    pub imap_user: Option<String>,
-
-    /// SMTP server hostname or IP address.
-    pub smtp_server: Option<String>,
-
-    /// SMTP server port.
-    pub smtp_port: Option<u16>,
-
-    /// SMTP socket security.
-    pub smtp_security: Option<Socket>,
-
-    /// SMTP username.
-    pub smtp_user: Option<String>,
-
-    /// SMTP Password.
-    ///
-    /// Only needs to be specified if different than IMAP password.
-    pub smtp_password: Option<String>,
+    /// SMTP settings.
+    pub smtp: EnteredServerLoginParam,

    /// TLS options: whether to allow invalid certificates and/or
-    /// invalid hostnames.
-    /// Default: Automatic
-    pub certificate_checks: Option<EnteredCertificateChecks>,
+    /// invalid hostnames
+    pub certificate_checks: EnteredCertificateChecks,

-    /// If true, login via OAUTH2 (not recommended anymore).
-    /// Default: false
-    pub oauth2: Option<bool>,
+    /// If true, login via OAUTH2 (not recommended anymore)
+    pub oauth2: bool,
 }

 impl From<dc::EnteredLoginParam> for EnteredLoginParam {
    fn from(param: dc::EnteredLoginParam) -> Self {
-        let imap_security: Socket = param.imap.security.into();
-        let smtp_security: Socket = param.smtp.security.into();
-        let certificate_checks: EnteredCertificateChecks = param.certificate_checks.into();
        Self {
            addr: param.addr,
-            password: param.imap.password,
-            imap_server: param.imap.server.into_option(),
-            imap_port: param.imap.port.into_option(),
-            imap_security: imap_security.into_option(),
-            imap_user: param.imap.user.into_option(),
-            smtp_server: param.smtp.server.into_option(),
-            smtp_port: param.smtp.port.into_option(),
-            smtp_security: smtp_security.into_option(),
-            smtp_user: param.smtp.user.into_option(),
-            smtp_password: param.smtp.password.into_option(),
-            certificate_checks: certificate_checks.into_option(),
-            oauth2: param.oauth2.into_option(),
+            imap: param.imap.into(),
+            smtp: param.smtp.into(),
+            certificate_checks: param.certificate_checks.into(),
+            oauth2: param.oauth2,
        }
    }
 }
@@ -85,31 +91,18 @@ impl TryFrom<EnteredLoginParam> for dc::EnteredLoginParam {
    fn try_from(param: EnteredLoginParam) -> Result<Self> {
        Ok(Self {
            addr: param.addr,
-            imap: dc::EnteredServerLoginParam {
-                server: param.imap_server.unwrap_or_default(),
-                port: param.imap_port.unwrap_or_default(),
-                security: param.imap_security.unwrap_or_default().into(),
-                user: param.imap_user.unwrap_or_default(),
-                password: param.password,
-            },
-            smtp: dc::EnteredServerLoginParam {
-                server: param.smtp_server.unwrap_or_default(),
-                port: param.smtp_port.unwrap_or_default(),
-                security: param.smtp_security.unwrap_or_default().into(),
-                user: param.smtp_user.unwrap_or_default(),
-                password: param.smtp_password.unwrap_or_default(),
-            },
-            certificate_checks: param.certificate_checks.unwrap_or_default().into(),
-            oauth2: param.oauth2.unwrap_or_default(),
+            imap: param.imap.into(),
+            smtp: param.smtp.into(),
+            certificate_checks: param.certificate_checks.into(),
+            oauth2: param.oauth2,
        })
    }
 }

-#[derive(Serialize, Deserialize, TypeDef, schemars::JsonSchema, Default, PartialEq)]
+#[derive(Serialize, Deserialize, TypeDef, schemars::JsonSchema)]
 #[serde(rename_all = "camelCase")]
 pub enum Socket {
    /// Unspecified socket security, select automatically.
-    #[default]
    Automatic,

    /// TLS connection.
@@ -144,13 +137,12 @@ impl From<Socket> for dc::Socket {
    }
 }

-#[derive(Serialize, Deserialize, TypeDef, schemars::JsonSchema, Default, PartialEq)]
+#[derive(Serialize, Deserialize, TypeDef, schemars::JsonSchema)]
 #[serde(rename_all = "camelCase")]
 pub enum EnteredCertificateChecks {
    /// `Automatic` means that provider database setting should be taken.
    /// If there is no provider database setting for certificate checks,
    /// check certificates strictly.
-    #[default]
    Automatic,

    /// Ensure that TLS certificate is valid for the server hostname.
@@ -185,19 +177,3 @@ impl From<EnteredCertificateChecks> for dc::EnteredCertificateChecks {
        }
    }
 }
-
-trait IntoOption<T> {
-    fn into_option(self) -> Option<T>;
-}
-impl<T> IntoOption<T> for T
-where
-    T: Default + std::cmp::PartialEq,
-{
-    fn into_option(self) -> Option<T> {
-        if self == T::default() {
-            None
-        } else {
-            Some(self)
-        }
-    }
-}
--- a/deltachat-jsonrpc/src/api/types/message.rs
+++ b/deltachat-jsonrpc/src/api/types/message.rs
@@ -19,10 +19,10 @@ use typescript_type_def::TypeDef;
 use super::color_int_to_hex_string;
 use super::contact::ContactObject;
 use super::reactions::JSONRPCReactions;
+use super::webxdc::WebxdcMessageInfo;

 #[derive(Serialize, TypeDef, schemars::JsonSchema)]
 #[serde(rename_all = "camelCase", tag = "kind")]
-#[expect(clippy::large_enum_variant)]
 pub enum MessageLoadResult {
    Message(MessageObject),
    LoadingError { error: String },
@@ -59,13 +59,6 @@ pub struct MessageObject {

    // summary - use/create another function if you need it
    subject: String,
-
-    /// True if the message was correctly encrypted&signed, false otherwise.
-    /// Historically, UIs showed a small padlock on the message then.
-    ///
-    /// Today, the UIs should instead show a small email-icon on the message
-    /// if `show_padlock` is `false`,
-    /// and nothing if it is `true`.
    show_padlock: bool,
    is_setupmessage: bool,
    is_info: bool,
@@ -77,9 +70,6 @@ pub struct MessageObject {
    /// when is_info is true this describes what type of system message it is
    system_message_type: SystemMessageType,

-    /// if is_info is set, this refers to the contact profile that should be opened when the info message is tapped.
-    info_contact_id: Option<u32>,
-
    duration: i32,
    dimensions_height: i32,
    dimensions_width: i32,
@@ -97,6 +87,8 @@ pub struct MessageObject {
    file_bytes: u64,
    file_name: Option<String>,

+    webxdc_info: Option<WebxdcMessageInfo>,
+
    webxdc_href: Option<String>,

    download_state: DownloadState,
@@ -147,6 +139,12 @@ impl MessageObject {
        let file_bytes = message.get_filebytes(context).await?.unwrap_or_default();
        let override_sender_name = message.get_override_sender_name();

+        let webxdc_info = if message.get_viewtype() == Viewtype::Webxdc {
+            Some(WebxdcMessageInfo::get_for_message(context, msg_id).await?)
+        } else {
+            None
+        };
+
        let parent_id = message.parent(context).await?.map(|m| m.get_id().to_u32());

        let download_state = message.download_state().into();
@@ -230,10 +228,6 @@ impl MessageObject {
            is_forwarded: message.is_forwarded(),
            is_bot: message.is_bot(),
            system_message_type: message.get_info_type().into(),
-            info_contact_id: message
-                .get_info_contact_id(context)
-                .await?
-                .map(|id| id.to_u32()),

            duration: message.get_duration(),
            dimensions_height: message.get_height(),
@@ -260,6 +254,7 @@ impl MessageObject {
            file_mime: message.get_filemime(),
            file_bytes,
            file_name: message.get_filename(),
+            webxdc_info,

            // On a WebxdcInfoMessage this might include a hash holding
            // information about a specific position or state in a webxdc app
@@ -678,6 +673,7 @@ pub struct MessageReadReceipt {
 #[derive(Serialize, TypeDef, schemars::JsonSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct MessageInfo {
+    rawtext: String,
    ephemeral_timer: EphemeralTimer,
    /// When message is ephemeral this contains the timestamp of the message expiry
    ephemeral_timestamp: Option<i64>,
@@ -690,6 +686,7 @@ pub struct MessageInfo {
 impl MessageInfo {
    pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<Self> {
        let message = Message::load_from_db(context, msg_id).await?;
+        let rawtext = msg_id.rawtext(context).await?;
        let ephemeral_timer = message.get_ephemeral_timer().into();
        let ephemeral_timestamp = match message.get_ephemeral_timer() {
            deltachat::ephemeral::Timer::Disabled => None,
@@ -702,6 +699,7 @@ impl MessageInfo {
        let hop_info = msg_id.hop_info(context).await?;

        Ok(Self {
+            rawtext,
            ephemeral_timer,
            ephemeral_timestamp,
            error: message.error(),
--- a/deltachat-jsonrpc/src/api/types/mod.rs
+++ b/deltachat-jsonrpc/src/api/types/mod.rs
@@ -1,4 +1,5 @@
 pub mod account;
+pub mod basic_message;
 pub mod chat;
 pub mod chat_list;
 pub mod contact;
--- a/deltachat-jsonrpc/typescript/package.json
+++ b/deltachat-jsonrpc/typescript/package.json
@@ -2,24 +2,24 @@
  "author": "Delta Chat Developers (ML) <delta@codespeak.net>",
  "dependencies": {
    "@deltachat/tiny-emitter": "3.0.0",
-    "isomorphic-ws": "^5.0.0",
+    "isomorphic-ws": "^4.0.1",
    "yerpc": "^0.6.2"
  },
  "devDependencies": {
-    "@types/chai": "^4.3.10",
-    "@types/chai-as-promised": "^7.1.8",
-    "@types/mocha": "^10.0.4",
-    "@types/ws": "^8.5.9",
-    "c8": "^8.0.1",
+    "@types/chai": "^4.2.21",
+    "@types/chai-as-promised": "^7.1.5",
+    "@types/mocha": "^9.0.0",
+    "@types/ws": "^7.2.4",
+    "c8": "^7.10.0",
    "chai": "^4.3.4",
    "chai-as-promised": "^7.1.1",
-    "esbuild": "^0.25.5",
+    "esbuild": "^0.17.9",
    "http-server": "^14.1.1",
-    "mocha": "^10.2.0",
+    "mocha": "^9.1.1",
    "npm-run-all": "^4.1.5",
-    "prettier": "^3.5.3",
-    "typedoc": "^0.28.5",
-    "typescript": "^5.8.3",
+    "prettier": "^2.6.2",
+    "typedoc": "^0.23.2",
+    "typescript": "^4.5.5",
    "ws": "^8.5.0"
  },
  "exports": {
@@ -54,5 +54,5 @@
  },
  "type": "module",
  "types": "dist/deltachat.d.ts",
-  "version": "2.0.0"
+  "version": "1.157.3"
 }
--- a/deltachat-jsonrpc/typescript/report_api_coverage.mjs
+++ b/deltachat-jsonrpc/typescript/report_api_coverage.mjs
@@ -5,24 +5,24 @@ const json = JSON.parse(readFileSync("./coverage/coverage-final.json"));
 const jsonCoverage =
  json[Object.keys(json).find((k) => k.includes(generatedFile))];
 const fnMap = Object.keys(jsonCoverage.fnMap).map(
-  (key) => jsonCoverage.fnMap[key],
+  (key) => jsonCoverage.fnMap[key]
 );
 const htmlCoverage = readFileSync(
  "./coverage/" + generatedFile + ".html",
-  "utf8",
+  "utf8"
 );
 const uncoveredLines = htmlCoverage
  .split("\n")
  .filter((line) => line.includes(`"function not covered"`));
 const uncoveredFunctions = uncoveredLines.map(
-  (line) => />([\w_]+)\(/.exec(line)[1],
+  (line) => />([\w_]+)\(/.exec(line)[1]
 );
 console.log(
  "\nUncovered api functions:\n" +
    uncoveredFunctions
      .map((uF) => fnMap.find(({ name }) => name === uF))
      .map(
-        ({ name, line }) => `.${name.padEnd(40)}  (${generatedFile}:${line})`,
+        ({ name, line }) => `.${name.padEnd(40)}  (${generatedFile}:${line})`
      )
-      .join("\n"),
+      .join("\n")
 );
--- a/deltachat-jsonrpc/typescript/scripts/generate-constants.js
+++ b/deltachat-jsonrpc/typescript/scripts/generate-constants.js
@@ -24,7 +24,7 @@ while (null != (match = regex.exec(header_data))) {

 const constants = data
  .filter(
-    ({ key }) => key.toUpperCase()[0] === key[0], // check if define name is uppercase
+    ({ key }) => key.toUpperCase()[0] === key[0] // check if define name is uppercase
  )
  .sort((lhs, rhs) => {
    if (lhs.key < rhs.key) return -1;
@@ -50,5 +50,5 @@ const constants = data

 writeFileSync(
  resolve(__dirname, "../generated/constants.ts"),
-  `// Generated!\n\nexport enum C {\n${constants.replace(/:/g, " =")},\n}\n`,
+  `// Generated!\n\nexport enum C {\n${constants.replace(/:/g, " =")},\n}\n`
 );
--- a/deltachat-jsonrpc/typescript/src/client.ts
+++ b/deltachat-jsonrpc/typescript/src/client.ts
@@ -8,13 +8,13 @@ import { TinyEmitter } from "@deltachat/tiny-emitter";
 type Events = { ALL: (accountId: number, event: EventType) => void } & {
  [Property in EventType["kind"]]: (
    accountId: number,
-    event: Extract<EventType, { kind: Property }>,
+    event: Extract<EventType, { kind: Property }>
  ) => void;
 };

 type ContextEvents = { ALL: (event: EventType) => void } & {
  [Property in EventType["kind"]]: (
-    event: Extract<EventType, { kind: Property }>,
+    event: Extract<EventType, { kind: Property }>
  ) => void;
 };

@@ -25,7 +25,7 @@ export type DcEventType<T extends EventType["kind"]> = Extract<
 >;

 export class BaseDeltaChat<
-  Transport extends BaseTransport<any>,
+  Transport extends BaseTransport<any>
 > extends TinyEmitter<Events> {
  rpc: RawClient;
  account?: T.Account;
@@ -34,10 +34,7 @@ export class BaseDeltaChat<
  //@ts-ignore
  private eventTask: Promise<void>;

-  constructor(
-    public transport: Transport,
-    startEventLoop: boolean,
-  ) {
+  constructor(public transport: Transport, startEventLoop: boolean) {
    super();
    this.rpc = new RawClient(this.transport);
    if (startEventLoop) {
@@ -56,7 +53,7 @@ export class BaseDeltaChat<
        this.contextEmitters[event.contextId].emit(
          event.event.kind,
          //@ts-ignore
-          event.event as any,
+          event.event as any
        );
        this.contextEmitters[event.contextId].emit("ALL", event.event as any);
      }
@@ -86,10 +83,7 @@ export class StdioDeltaChat extends BaseDeltaChat<StdioTransport> {
 }

 export class StdioTransport extends BaseTransport {
-  constructor(
-    public input: any,
-    public output: any,
-  ) {
+  constructor(public input: any, public output: any) {
    super();

    var buffer = "";
--- a/deltachat-jsonrpc/typescript/test/basic.ts
+++ b/deltachat-jsonrpc/typescript/test/basic.ts
@@ -1,3 +1,4 @@
+import { strictEqual } from "assert";
 import chai, { assert, expect } from "chai";
 import chaiAsPromised from "chai-as-promised";
 chai.use(chaiAsPromised);
@@ -31,14 +32,14 @@ describe("basic tests", () => {

    expect(
      await Promise.all(
-        validAddresses.map((email) => dc.rpc.checkEmailValidity(email)),
-      ),
+        validAddresses.map((email) => dc.rpc.checkEmailValidity(email))
+      )
    ).to.not.contain(false);

    expect(
      await Promise.all(
-        invalidAddresses.map((email) => dc.rpc.checkEmailValidity(email)),
-      ),
+        invalidAddresses.map((email) => dc.rpc.checkEmailValidity(email))
+      )
    ).to.not.contain(true);
  });

@@ -84,7 +85,7 @@ describe("basic tests", () => {
      const contactId = await dc.rpc.createContact(
        accountId,
        "example@delta.chat",
-        null,
+        null
      );
      expect((await dc.rpc.getContact(accountId, contactId)).isBlocked).to.be
        .false;
@@ -126,7 +127,7 @@ describe("basic tests", () => {
      await dc.rpc.batchSetConfig(accountId, config);
      const retrieved = await dc.rpc.batchGetConfig(
        accountId,
-        Object.keys(config),
+        Object.keys(config)
      );
      expect(retrieved).to.deep.equal(config);
    });
@@ -138,7 +139,7 @@ describe("basic tests", () => {
      await dc.rpc.batchSetConfig(accountId, config);
      const retrieved = await dc.rpc.batchGetConfig(
        accountId,
-        Object.keys(config),
+        Object.keys(config)
      );
      expect(retrieved).to.deep.equal(config);
    });
@@ -152,7 +153,7 @@ describe("basic tests", () => {
      await dc.rpc.batchSetConfig(accountId, config);
      const retrieved = await dc.rpc.batchGetConfig(
        accountId,
-        Object.keys(config),
+        Object.keys(config)
      );
      expect(retrieved).to.deep.equal(config);
    });
--- a/deltachat-jsonrpc/typescript/test/online.ts
+++ b/deltachat-jsonrpc/typescript/test/online.ts
@@ -1,5 +1,5 @@
 import { assert, expect } from "chai";
-import { StdioDeltaChat as DeltaChat, DcEvent, C } from "../deltachat.js";
+import { StdioDeltaChat as DeltaChat, DcEvent } from "../deltachat.js";
 import { RpcServerHandle, createTempUser, startServer } from "./test_base.js";

 const EVENT_TIMEOUT = 20000;
@@ -17,12 +17,12 @@ describe("online tests", function () {
      if (process.env.COVERAGE && !process.env.COVERAGE_OFFLINE) {
        console.error(
          "CAN NOT RUN COVERAGE correctly: Missing CHATMAIL_DOMAIN environment variable!\n\n",
-          "You can set COVERAGE_OFFLINE=1 to circumvent this check and skip the online tests, but those coverage results will be wrong, because some functions can only be tested in the online test",
+          "You can set COVERAGE_OFFLINE=1 to circumvent this check and skip the online tests, but those coverage results will be wrong, because some functions can only be tested in the online test"
        );
        process.exit(1);
      }
      console.log(
-        "Missing CHATMAIL_DOMAIN environment variable!, skip integration tests",
+        "Missing CHATMAIL_DOMAIN environment variable!, skip integration tests"
      );
      this.skip();
    }
@@ -36,7 +36,7 @@ describe("online tests", function () {
    account1 = createTempUser(process.env.CHATMAIL_DOMAIN);
    if (!account1 || !account1.email || !account1.password) {
      console.log(
-        "We didn't got back an account from the api, skip integration tests",
+        "We didn't got back an account from the api, skip integration tests"
      );
      this.skip();
    }
@@ -44,7 +44,7 @@ describe("online tests", function () {
    account2 = createTempUser(process.env.CHATMAIL_DOMAIN);
    if (!account2 || !account2.email || !account2.password) {
      console.log(
-        "We didn't got back an account2 from the api, skip integration tests",
+        "We didn't got back an account2 from the api, skip integration tests"
      );
      this.skip();
    }
@@ -80,8 +80,11 @@ describe("online tests", function () {
    }
    this.timeout(15000);

-    const vcard = await dc.rpc.makeVcard(accountId2, [C.DC_CONTACT_ID_SELF]);
-    const contactId = (await dc.rpc.importVcardContents(accountId1, vcard))[0];
+    const contactId = await dc.rpc.createContact(
+      accountId1,
+      account2.email,
+      null
+    );
    const chatId = await dc.rpc.createChatByContactId(accountId1, contactId);
    const eventPromise = waitForEvent(dc, "IncomingMsg", accountId2);

@@ -92,24 +95,26 @@ describe("online tests", function () {
      accountId2,
      chatIdOnAccountB,
      false,
-      false,
+      false
    );

    expect(messageList).have.length(1);
    const message = await dc.rpc.getMessage(accountId2, messageList[0]);
    expect(message.text).equal("Hello");
-    expect(message.showPadlock).equal(true);
  });

-  it("send and receive text message roundtrip", async function () {
+  it("send and receive text message roundtrip, encrypted on answer onwards", async function () {
    if (!accountsConfigured) {
      this.skip();
    }
    this.timeout(10000);

    // send message from A to B
-    const vcard = await dc.rpc.makeVcard(accountId2, [C.DC_CONTACT_ID_SELF]);
-    const contactId = (await dc.rpc.importVcardContents(accountId1, vcard))[0];
+    const contactId = await dc.rpc.createContact(
+      accountId1,
+      account2.email,
+      null
+    );
    const chatId = await dc.rpc.createChatByContactId(accountId1, contactId);
    const eventPromise = waitForEvent(dc, "IncomingMsg", accountId2);
    dc.rpc.miscSendTextMessage(accountId1, chatId, "Hello2");
@@ -124,11 +129,11 @@ describe("online tests", function () {
      accountId2,
      chatIdOnAccountB,
      false,
-      false,
+      false
    );
    const message = await dc.rpc.getMessage(
      accountId2,
-      messageList.reverse()[0],
+      messageList.reverse()[0]
    );
    expect(message.text).equal("Hello2");
    // Send message back from B to A
@@ -150,7 +155,7 @@ describe("online tests", function () {
    const info = await dc.rpc.getProviderInfo(acc, "example.com");
    expect(info).to.be.not.null;
    expect(info?.overviewPage).to.equal(
-      "https://providers.delta.chat/example-com",
+      "https://providers.delta.chat/example-com"
    );
    expect(info?.status).to.equal(3);
  });
@@ -167,12 +172,12 @@ async function waitForEvent<T extends DcEvent["kind"]>(
  dc: DeltaChat,
  eventType: T,
  accountId: number,
-  timeout: number = EVENT_TIMEOUT,
+  timeout: number = EVENT_TIMEOUT
 ): Promise<Extract<DcEvent, { kind: T }>> {
  return new Promise((resolve, reject) => {
    const rejectTimeout = setTimeout(
      () => reject(new Error("Timeout reached before event came in")),
-      timeout,
+      timeout
    );
    const callback = (contextId: number, event: DcEvent) => {
      if (contextId == accountId) {
--- a/deltachat-jsonrpc/typescript/test/test_base.ts
+++ b/deltachat-jsonrpc/typescript/test/test_base.ts
@@ -14,7 +14,7 @@ export async function startServer(): Promise<RpcServerHandle> {
  const tmpDir = await mkdtemp(join(tmpdir(), "deltachat-jsonrpc-test"));

  const pathToServerBinary = resolve(
-    join(await getTargetDir(), "debug/deltachat-rpc-server"),
+    join(await getTargetDir(), "debug/deltachat-rpc-server")
  );

  const server = spawn(pathToServerBinary, {
@@ -29,7 +29,7 @@ export async function startServer(): Promise<RpcServerHandle> {
    throw new Error(
      "Failed to start server executable " +
        pathToServerBinary +
-        ", make sure you built it first.",
+        ", make sure you built it first."
    );
  });
  let shouldClose = false;
@@ -83,7 +83,7 @@ function getTargetDir(): Promise<string> {
            reject(error);
          }
        }
-      },
+      }
    );
  });
 }
--- a/deltachat-repl/Cargo.toml
+++ b/deltachat-repl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-repl"
-version = "2.0.0"
+version = "1.157.3"
 license = "MPL-2.0"
 edition = "2021"
 repository = "https://github.com/chatmail/core"
@@ -13,7 +13,7 @@ log = { workspace = true }
 nu-ansi-term = { workspace = true }
 qr2term = "0.3.3"
 rusqlite = { workspace = true }
-rustyline = "16"
+rustyline = "15"
 tokio = { workspace = true, features = ["fs", "rt-multi-thread", "macros"] }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }

--- a/deltachat-repl/src/cmdline.rs
+++ b/deltachat-repl/src/cmdline.rs
@@ -20,6 +20,7 @@ use deltachat::log::LogExt;
 use deltachat::message::{self, Message, MessageState, MsgId, Viewtype};
 use deltachat::mimeparser::SystemMessage;
 use deltachat::peer_channels::{send_webxdc_realtime_advertisement, send_webxdc_realtime_data};
+use deltachat::peerstate::*;
 use deltachat::qr::*;
 use deltachat::qr_code_generator::create_qr_svg;
 use deltachat::reaction::send_reaction;
@@ -34,6 +35,14 @@ use tokio::fs;
 /// e.g. bitmask 7 triggers actions defined with bits 1, 2 and 4.
 async fn reset_tables(context: &Context, bits: i32) {
    println!("Resetting tables ({bits})...");
+    if 0 != bits & 2 {
+        context
+            .sql()
+            .execute("DELETE FROM acpeerstates;", ())
+            .await
+            .unwrap();
+        println!("(2) Peerstates reset.");
+    }
    if 0 != bits & 4 {
        context
            .sql()
@@ -111,7 +120,7 @@ async fn poke_spec(context: &Context, spec: Option<&str>) -> bool {
    } else {
        let rs = context.sql().get_raw_config("import_spec").await.unwrap();
        if rs.is_none() {
-            eprintln!("Import: No file or folder given.");
+            error!(context, "Import: No file or folder given.");
            return false;
        }
        real_spec = rs.unwrap();
@@ -140,7 +149,7 @@ async fn poke_spec(context: &Context, spec: Option<&str>) -> bool {
                }
            }
        } else {
-            eprintln!("Import: Cannot open directory \"{}\".", &real_spec);
+            error!(context, "Import: Cannot open directory \"{}\".", &real_spec);
            return false;
        }
    }
@@ -268,7 +277,7 @@ async fn log_msglist(context: &Context, msglist: &[MsgId]) -> Result<()> {

 async fn log_contactlist(context: &Context, contacts: &[ContactId]) -> Result<()> {
    for contact_id in contacts {
-        let line2 = "".to_string();
+        let mut line2 = "".to_string();
        let contact = Contact::get_by_id(context, *contact_id).await?;
        let name = contact.get_display_name();
        let addr = contact.get_addr();
@@ -287,6 +296,15 @@ async fn log_contactlist(context: &Context, contacts: &[ContactId]) -> Result<()
            verified_str,
            if !addr.is_empty() { addr } else { "addr unset" }
        );
+        let peerstate = Peerstate::from_addr(context, addr)
+            .await
+            .expect("peerstate error");
+        if peerstate.is_some() && *contact_id != ContactId::SELF {
+            line2 = format!(
+                ", prefer-encrypt={}",
+                peerstate.as_ref().unwrap().prefer_encrypt
+            );
+        }

        println!("Contact#{}: {}{}", *contact_id, line, line2);
    }
@@ -324,7 +342,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 send-backup\n\
                 receive-backup <qr>\n\
                 export-keys\n\
-                 import-keys <key-file>\n\
+                 import-keys\n\
                 poke [<eml-file>|<folder>|<addr> <key-file>]\n\
                 reset <flags>\n\
                 stop\n\
@@ -333,6 +351,8 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
            _ => println!(
                "==========================Database commands==\n\
                 info\n\
+                 open <file to open or create>\n\
+                 close\n\
                 set <configuration-key> [<value>]\n\
                 get <configuration-key>\n\
                 oauth2\n\
@@ -347,24 +367,21 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 ==============================Chat commands==\n\
                 listchats [<query>]\n\
                 listarchived\n\
-                 start-realtime <msg-id>\n\
-                 send-realtime <msg-id> <data>\n\
                 chat [<chat-id>|0]\n\
                 createchat <contact-id>\n\
                 creategroup <name>\n\
-                 createbroadcast <name>\n\
+                 createbroadcast\n\
                 createprotected <name>\n\
                 addmember <contact-id>\n\
                 removemember <contact-id>\n\
                 groupname <name>\n\
-                 groupimage <image>\n\
+                 groupimage [<file>]\n\
                 chatinfo\n\
                 sendlocations <seconds>\n\
                 setlocation <lat> <lng>\n\
                 dellocations\n\
                 getlocations [<contact-id>]\n\
                 send <text>\n\
-                 sendempty\n\
                 sendimage <file> [<text>]\n\
                 sendsticker <file> [<text>]\n\
                 sendfile <file> [<text>]\n\
@@ -383,7 +400,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 unmute <chat-id>\n\
                 delchat <chat-id>\n\
                 accept <chat-id>\n\
-                 blockchat <chat-id>\n\
+                 decline <chat-id>\n\
                 ===========================Message commands==\n\
                 listmsgs <query>\n\
                 msginfo <msg-id>\n\
@@ -397,9 +414,11 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 react <msg-id> [<reaction>]\n\
                 ===========================Contact commands==\n\
                 listcontacts [<query>]\n\
+                 listverified [<query>]\n\
                 addcontact [<name>] <addr>\n\
                 contactinfo <contact-id>\n\
                 delcontact <contact-id>\n\
+                 cleanupcontacts\n\
                 block <contact-id>\n\
                 unblock <contact-id>\n\
                 listblocked\n\
@@ -474,7 +493,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
        "send-backup" => {
            let provider = BackupProvider::prepare(&context).await?;
            let qr = format_backup(&provider.qr())?;
-            println!("QR code: {qr}");
+            println!("QR code: {}", qr);
            qr2term::print_qr(qr.as_str())?;
            provider.await?;
        }
@@ -489,17 +508,13 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
            println!("Exported to {}.", dir.to_string_lossy());
        }
        "import-keys" => {
-            ensure!(!arg1.is_empty(), "Argument <key-file> missing.");
            imex(&context, ImexMode::ImportSelfKeys, arg1.as_ref(), None).await?;
        }
        "poke" => {
            ensure!(poke_spec(&context, Some(arg1)).await, "Poke failed");
        }
        "reset" => {
-            ensure!(
-                !arg1.is_empty(),
-                "Argument <bits> missing: 4=private keys, 8=rest but server config"
-            );
+            ensure!(!arg1.is_empty(), "Argument <bits> missing: 1=jobs, 2=peerstates, 4=private keys, 8=rest but server config");
            let bits: i32 = arg1.parse()?;
            ensure!(bits < 16, "<bits> must be lower than 16.");
            reset_tables(&context, bits).await;
@@ -750,8 +765,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
            println!("Group#{chat_id} created successfully.");
        }
        "createbroadcast" => {
-            ensure!(!arg1.is_empty(), "Argument <name> missing.");
-            let chat_id = chat::create_broadcast(&context, arg1.to_string()).await?;
+            let chat_id = chat::create_broadcast_list(&context).await?;

            println!("Broadcast#{chat_id} created successfully.");
        }
@@ -1148,8 +1162,17 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
            let reaction = arg2;
            send_reaction(&context, msg_id, reaction).await?;
        }
-        "listcontacts" | "contacts" => {
-            let contacts = Contact::get_all(&context, DC_GCL_ADD_SELF, Some(arg1)).await?;
+        "listcontacts" | "contacts" | "listverified" => {
+            let contacts = Contact::get_all(
+                &context,
+                if arg0 == "listverified" {
+                    DC_GCL_VERIFIED_ONLY | DC_GCL_ADD_SELF
+                } else {
+                    DC_GCL_ADD_SELF
+                },
+                Some(arg1),
+            )
+            .await?;
            log_contactlist(&context, &contacts).await?;
            println!("{} contacts.", contacts.len());
        }
--- a/deltachat-repl/src/main.rs
+++ b/deltachat-repl/src/main.rs
@@ -5,6 +5,7 @@
 //! Usage:  cargo run --example repl --release -- <databasefile>
 //! All further options can be set using the set-command (type ? for help).

+#[macro_use]
 extern crate deltachat;

 use std::borrow::Cow::{self, Borrowed, Owned};
@@ -40,25 +41,25 @@ fn receive_event(event: EventType) {
    match event {
        EventType::Info(msg) => {
            /* do not show the event as this would fill the screen */
-            info!("{msg}");
+            info!("{}", msg);
        }
        EventType::SmtpConnected(msg) => {
-            info!("[SMTP_CONNECTED] {msg}");
+            info!("[SMTP_CONNECTED] {}", msg);
        }
        EventType::ImapConnected(msg) => {
-            info!("[IMAP_CONNECTED] {msg}");
+            info!("[IMAP_CONNECTED] {}", msg);
        }
        EventType::SmtpMessageSent(msg) => {
-            info!("[SMTP_MESSAGE_SENT] {msg}");
+            info!("[SMTP_MESSAGE_SENT] {}", msg);
        }
        EventType::Warning(msg) => {
-            warn!("{msg}");
+            warn!("{}", msg);
        }
        EventType::Error(msg) => {
-            error!("{msg}");
+            error!("{}", msg);
        }
        EventType::ErrorSelfNotInGroup(msg) => {
-            error!("[SELF_NOT_IN_GROUP] {msg}");
+            error!("[SELF_NOT_IN_GROUP] {}", msg);
        }
        EventType::MsgsChanged { chat_id, msg_id } => {
            info!(
@@ -123,7 +124,7 @@ fn receive_event(event: EventType) {
            );
        }
        _ => {
-            info!("Received {event:?}");
+            info!("Received {:?}", event);
        }
    }
 }
@@ -179,11 +180,9 @@ const DB_COMMANDS: [&str; 11] = [
    "housekeeping",
 ];

-const CHAT_COMMANDS: [&str; 39] = [
+const CHAT_COMMANDS: [&str; 36] = [
    "listchats",
    "listarchived",
-    "start-realtime",
-    "send-realtime",
    "chat",
    "createchat",
    "creategroup",
@@ -199,16 +198,13 @@ const CHAT_COMMANDS: [&str; 39] = [
    "dellocations",
    "getlocations",
    "send",
-    "sendempty",
    "sendimage",
-    "sendsticker",
    "sendfile",
    "sendhtml",
    "sendsyncmsg",
    "sendupdate",
    "videochat",
    "draft",
-    "devicemsg",
    "listmedia",
    "archive",
    "unarchive",
@@ -216,46 +212,47 @@ const CHAT_COMMANDS: [&str; 39] = [
    "unpin",
    "mute",
    "unmute",
+    "protect",
+    "unprotect",
    "delchat",
    "accept",
    "blockchat",
 ];
-const MESSAGE_COMMANDS: [&str; 10] = [
+const MESSAGE_COMMANDS: [&str; 9] = [
    "listmsgs",
    "msginfo",
-    "download",
-    "html",
    "listfresh",
    "forward",
    "resend",
    "markseen",
    "delmsg",
+    "download",
    "react",
 ];
-const CONTACT_COMMANDS: [&str; 7] = [
+const CONTACT_COMMANDS: [&str; 9] = [
    "listcontacts",
+    "listverified",
    "addcontact",
    "contactinfo",
    "delcontact",
+    "cleanupcontacts",
    "block",
    "unblock",
    "listblocked",
 ];
-const MISC_COMMANDS: [&str; 14] = [
+const MISC_COMMANDS: [&str; 12] = [
    "getqr",
    "getqrsvg",
    "getbadqr",
    "checkqr",
    "joinqr",
-    "setqr",
    "createqrsvg",
-    "providerinfo",
    "fileinfo",
-    "estimatedeletion",
    "clear",
    "exit",
    "quit",
    "help",
+    "estimatedeletion",
 ];

 impl Hinter for DcHelper {
@@ -326,7 +323,7 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
        }
    });

-    println!("Chatmail is awaiting your commands.");
+    println!("Delta Chat Core is awaiting your commands.");

    let config = Config::builder()
        .history_ignore_space(true)
--- a/deltachat-rpc-client/pyproject.toml
+++ b/deltachat-rpc-client/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "deltachat-rpc-client"
-version = "2.0.0"
+version = "1.157.3"
 description = "Python client for Delta Chat core JSON-RPC interface"
 classifiers = [
    "Development Status :: 5 - Production/Stable",
@@ -66,18 +66,7 @@ lint.select = [

  "RUF006" # asyncio-dangling-task
 ]
-lint.ignore = [
-  "PLC0415" # `import` should be at the top-level of a file
-]
 line-length = 120

 [tool.isort]
 profile = "black"
-
-[dependency-groups]
-dev = [
-    "imap-tools",
-    "pytest",
-    "pytest-timeout",
-    "pytest-xdist",
-]
--- a/deltachat-rpc-client/src/deltachat_rpc_client/init.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/init.py
@@ -1,4 +1,4 @@
-"""Delta Chat JSON-RPC high-level API."""
+"""Delta Chat JSON-RPC high-level API"""

 from ._utils import AttrDict, run_bot_cli, run_client_cli
 from .account import Account
--- a/deltachat-rpc-client/src/deltachat_rpc_client/_utils.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/_utils.py
@@ -1,5 +1,4 @@
 import argparse
-import os
 import re
 import sys
 from threading import Thread
@@ -90,8 +89,8 @@ def _run_cli(
        help="accounts folder (default: current working directory)",
        nargs="?",
    )
-    parser.add_argument("--email", action="store", help="email address", default=os.getenv("DELTACHAT_EMAIL"))
-    parser.add_argument("--password", action="store", help="password", default=os.getenv("DELTACHAT_PASSWORD"))
+    parser.add_argument("--email", action="store", help="email address")
+    parser.add_argument("--password", action="store", help="password")
    args = parser.parse_args(argv[1:])

    with Rpc(accounts_dir=args.accounts_dir, **kwargs) as rpc:
@@ -115,7 +114,7 @@ def _run_cli(


 def extract_addr(text: str) -> str:
-    """Extract email address from the given text."""
+    """extract email address from the given text."""
    match = re.match(r".*\((.+@.+)\)", text)
    if match:
        text = match.group(1)
@@ -124,7 +123,7 @@ def extract_addr(text: str) -> str:


 def parse_system_image_changed(text: str) -> Optional[Tuple[str, bool]]:
-    """Return image changed/deleted info from parsing the given system message text."""
+    """return image changed/deleted info from parsing the given system message text."""
    text = text.lower()
    match = re.match(r"group image (changed|deleted) by (.+).", text)
    if match:
@@ -143,7 +142,7 @@ def parse_system_title_changed(text: str) -> Optional[Tuple[str, str]]:


 def parse_system_add_remove(text: str) -> Optional[Tuple[str, str, str]]:
-    """Return add/remove info from parsing the given system message text.
+    """return add/remove info from parsing the given system message text.

    returns a (action, affected, actor) tuple.
    """
--- a/deltachat-rpc-client/src/deltachat_rpc_client/account.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/account.py
@@ -1,5 +1,3 @@
-"""Account module."""
-
 from __future__ import annotations

 from dataclasses import dataclass
@@ -36,10 +34,7 @@ class Account:
                return next_event

    def clear_all_events(self):
-        """Remove all queued-up events for a given account.
-
-        Useful for tests.
-        """
+        """Removes all queued-up events for a given account. Useful for tests."""
        self._rpc.clear_all_events(self.id)

    def remove(self) -> None:
@@ -48,9 +43,7 @@ class Account:

    def clone(self) -> "Account":
        """Clone given account.
-
-        This uses backup-transfer via iroh, i.e. the 'Add second device' feature.
-        """
+        This uses backup-transfer via iroh, i.e. the 'Add second device' feature."""
        future = self._rpc.provide_backup.future(self.id)
        qr = self._rpc.get_backup_qr(self.id)
        new_account = self.manager.add_account()
@@ -87,7 +80,7 @@ class Account:
        return self._rpc.get_config(self.id, key)

    def update_config(self, **kwargs) -> None:
-        """Update config values."""
+        """update config values."""
        for key, value in kwargs.items():
            self.set_config(key, value)

@@ -106,12 +99,10 @@ class Account:
        """Parse QR code contents.

        This function takes the raw text scanned
-        and checks what can be done with it.
-        """
+        and checks what can be done with it."""
        return self._rpc.check_qr(self.id, qr)

    def set_config_from_qr(self, qr: str):
-        """Set configuration values from a QR code."""
        self._rpc.set_config_from_qr(self.id, qr)

    @futuremethod
@@ -119,23 +110,12 @@ class Account:
        """Configure an account."""
        yield self._rpc.configure.future(self.id)

-    @futuremethod
-    def add_or_update_transport(self, params):
-        """Add a new transport."""
-        yield self._rpc.add_or_update_transport.future(self.id, params)
-
-    @futuremethod
-    def list_transports(self):
-        """Return the list of all email accounts that are used as a transport in the current profile."""
-        transports = yield self._rpc.list_transports.future(self.id)
-        return transports
-
    def bring_online(self):
        """Start I/O and wait until IMAP becomes IDLE."""
        self.start_io()
        self.wait_for_event(EventType.IMAP_INBOX_IDLE)

-    def create_contact(self, obj: Union[int, str, Contact, "Account"], name: Optional[str] = None) -> Contact:
+    def create_contact(self, obj: Union[int, str, Contact], name: Optional[str] = None) -> Contact:
        """Create a new Contact or return an existing one.

        Calling this method will always result in the same
@@ -143,15 +123,9 @@ class Account:
        with that e-mail address, it is unblocked and its display
        name is updated if specified.

-        :param obj: email-address, contact id or account.
+        :param obj: email-address or contact id.
        :param name: (optional) display name for this contact.
        """
-        if isinstance(obj, Account):
-            vcard = obj.self_contact.make_vcard()
-            [contact] = self.import_vcard(vcard)
-            if name:
-                contact.set_name(name)
-            return contact
        if isinstance(obj, int):
            obj = Contact(self, obj)
        if isinstance(obj, Contact):
@@ -167,14 +141,14 @@ class Account:
    def import_vcard(self, vcard: str) -> list[Contact]:
        """Import vCard.

-        Return created or modified contacts in the order they appear in vCard.
-        """
+        Return created or modified contacts in the order they appear in vCard."""
        contact_ids = self._rpc.import_vcard_contents(self.id, vcard)
        return [Contact(self, contact_id) for contact_id in contact_ids]

    def create_chat(self, account: "Account") -> Chat:
-        """Create a 1:1 chat with another account."""
-        return self.create_contact(account).create_chat()
+        vcard = account.self_contact.make_vcard()
+        [contact] = self.import_vcard(vcard)
+        return contact.create_chat()

    def get_device_chat(self) -> Chat:
        """Return device chat."""
@@ -211,8 +185,8 @@ class Account:
    def get_contacts(
        self,
        query: Optional[str] = None,
-        *,
        with_self: bool = False,
+        verified_only: bool = False,
        snapshot: bool = False,
    ) -> Union[list[Contact], list[AttrDict]]:
        """Get a filtered list of contacts.
@@ -220,9 +194,12 @@ class Account:
        :param query: if a string is specified, only return contacts
                      whose name or e-mail matches query.
        :param with_self: if True the self-contact is also included if it matches the query.
+        :param only_verified: if True only return verified contacts.
        :param snapshot: If True return a list of contact snapshots instead of Contact instances.
        """
        flags = 0
+        if verified_only:
+            flags |= ContactFlag.VERIFIED_ONLY
        if with_self:
            flags |= ContactFlag.ADD_SELF

@@ -234,12 +211,12 @@ class Account:

    @property
    def self_contact(self) -> Contact:
-        """Account's identity as a Contact."""
+        """This account's identity as a Contact."""
        return Contact(self, SpecialContactId.SELF)

    @property
    def device_contact(self) -> Chat:
-        """Account's device contact."""
+        """This account's device contact."""
        return Contact(self, SpecialContactId.DEVICE)

    def get_chatlist(
@@ -288,52 +265,17 @@ class Account:
    def create_group(self, name: str, protect: bool = False) -> Chat:
        """Create a new group chat.

-        After creation,
-        the group has only self-contact as member one member (see `SpecialContactId.SELF`)
-        and is in _unpromoted_ state.
-        This means, you can add or remove members, change the name,
-        the group image and so on without messages being sent to all group members.
-
-        This changes as soon as the first message is sent to the group members
-        and the group becomes _promoted_.
-        After that, all changes are synced with all group members
-        by sending status message.
-
-        To check, if a chat is still unpromoted, you can look at the `is_unpromoted` property of a chat
-        (see `get_full_snapshot()` / `get_basic_snapshot()`).
-        This may be useful if you want to show some help for just created groups.
-
-        :param protect: If set to 1 the function creates group with protection initially enabled.
-                        Only verified members are allowed in these groups
-                        and end-to-end-encryption is always enabled.
+        After creation, the group has only self-contact as member and is in unpromoted state.
        """
        return Chat(self, self._rpc.create_group_chat(self.id, name, protect))

-    def create_broadcast(self, name: str) -> Chat:
-        """Create a new **broadcast channel**
-        (called "Channel" in the UI).
-
-        Broadcast channels are similar to groups on the sending device,
-        however, recipients get the messages in a read-only chat
-        and will not see who the other members are.
-
-        Called `broadcast` here rather than `channel`,
-        because the word "channel" already appears a lot in the code,
-        which would make it hard to grep for it.
-
-        After creation, the chat contains no recipients and is in _unpromoted_ state;
-        see `create_group()` for more information on the unpromoted state.
-
-        Returns the created chat.
-        """
-        return Chat(self, self._rpc.create_broadcast(self.id, name))
-
    def get_chat_by_id(self, chat_id: int) -> Chat:
        """Return the Chat instance with the given ID."""
        return Chat(self, chat_id)

    def secure_join(self, qrdata: str) -> Chat:
-        """Continue a Setup-Contact or Verified-Group-Invite protocol started on another device.
+        """Continue a Setup-Contact or Verified-Group-Invite protocol started on
+        another device.

        The function returns immediately and the handshake runs in background, sending
        and receiving several messages.
@@ -403,26 +345,22 @@ class Account:
    def wait_for_incoming_msg(self):
        """Wait for incoming message and return it.

-        Consumes all events before the next incoming message event.
-        """
+        Consumes all events before the next incoming message event."""
        return self.get_message_by_id(self.wait_for_incoming_msg_event().msg_id)

    def wait_for_securejoin_inviter_success(self):
-        """Wait until SecureJoin process finishes successfully on the inviter side."""
        while True:
            event = self.wait_for_event()
            if event["kind"] == "SecurejoinInviterProgress" and event["progress"] == 1000:
                break

    def wait_for_securejoin_joiner_success(self):
-        """Wait until SecureJoin process finishes successfully on the joiner side."""
        while True:
            event = self.wait_for_event()
            if event["kind"] == "SecurejoinJoinerProgress" and event["progress"] == 1000:
                break

    def wait_for_reactions_changed(self):
-        """Wait for reaction change event."""
        return self.wait_for_event(EventType.REACTIONS_CHANGED)

    def get_fresh_messages_in_arrival_order(self) -> list[Message]:
--- a/deltachat-rpc-client/src/deltachat_rpc_client/chat.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/chat.py
@@ -1,5 +1,3 @@
-"""Chat module."""
-
 from __future__ import annotations

 import calendar
@@ -91,8 +89,7 @@ class Chat:
    def set_ephemeral_timer(self, timer: int) -> None:
        """Set ephemeral timer of this chat in seconds.

-        0 means the timer is disabled, use 1 for immediate deletion.
-        """
+        0 means the timer is disabled, use 1 for immediate deletion."""
        self._rpc.set_chat_ephemeral_timer(self.account.id, self.id, timer)

    def get_encryption_info(self) -> str:
@@ -202,12 +199,12 @@ class Chat:
        return snapshot

    def get_messages(self, info_only: bool = False, add_daymarker: bool = False) -> list[Message]:
-        """Get the list of messages in this chat."""
+        """get the list of messages in this chat."""
        msgs = self._rpc.get_message_ids(self.account.id, self.id, info_only, add_daymarker)
        return [Message(self.account, msg_id) for msg_id in msgs]

    def get_fresh_message_count(self) -> int:
-        """Get number of fresh messages in this chat."""
+        """Get number of fresh messages in this chat"""
        return self._rpc.get_fresh_msg_cnt(self.account.id, self.id)

    def mark_noticed(self) -> None:
--- a/deltachat-rpc-client/src/deltachat_rpc_client/client.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/client.py
@@ -48,7 +48,6 @@ class Client:
        self.add_hooks(hooks or [])

    def add_hooks(self, hooks: Iterable[tuple[Callable, Union[type, EventFilter]]]) -> None:
-        """Register multiple hooks."""
        for hook, event in hooks:
            self.add_hook(hook, event)

@@ -78,11 +77,9 @@ class Client:
        self._hooks.get(type(event), set()).remove((hook, event))

    def is_configured(self) -> bool:
-        """Return True if the client is configured."""
        return self.account.is_configured()

    def configure(self, email: str, password: str, **kwargs) -> None:
-        """Configure the client."""
        self.account.set_config("addr", email)
        self.account.set_config("mail_pw", password)
        for key, value in kwargs.items():
@@ -201,6 +198,5 @@ class Bot(Client):
    """Simple bot implementation that listens to events of a single account."""

    def configure(self, email: str, password: str, **kwargs) -> None:
-        """Configure the bot."""
        kwargs.setdefault("bot", "1")
        super().configure(email, password, **kwargs)
--- a/deltachat-rpc-client/src/deltachat_rpc_client/const.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/const.py
@@ -1,20 +1,14 @@
-"""Constants module."""
-
 from enum import Enum, IntEnum

 COMMAND_PREFIX = "/"


 class ContactFlag(IntEnum):
-    """Bit flags for get_contacts() method."""
-
+    VERIFIED_ONLY = 0x01
    ADD_SELF = 0x02
-    ADDRESS = 0x04


 class ChatlistFlag(IntEnum):
-    """Bit flags for get_chatlist() method."""
-
    ARCHIVED_ONLY = 0x01
    NO_SPECIALS = 0x02
    ADD_ALLDONE_HINT = 0x04
@@ -22,8 +16,6 @@ class ChatlistFlag(IntEnum):


 class SpecialContactId(IntEnum):
-    """Special contact IDs."""
-
    SELF = 1
    INFO = 2  # centered messages as "member added", used in all chats
    DEVICE = 5  #  messages "update info" in the device-chat
@@ -31,7 +23,7 @@ class SpecialContactId(IntEnum):


 class EventType(str, Enum):
-    """Core event types."""
+    """Core event types"""

    INFO = "Info"
    SMTP_CONNECTED = "SmtpConnected"
@@ -56,7 +48,6 @@ class EventType(str, Enum):
    MSG_READ = "MsgRead"
    MSG_DELETED = "MsgDeleted"
    CHAT_MODIFIED = "ChatModified"
-    CHAT_DELETED = "ChatDeleted"
    CHAT_EPHEMERAL_TIMER_MODIFIED = "ChatEphemeralTimerModified"
    CONTACTS_CHANGED = "ContactsChanged"
    LOCATION_CHANGED = "LocationChanged"
@@ -79,7 +70,7 @@ class EventType(str, Enum):


 class ChatId(IntEnum):
-    """Special chat IDs."""
+    """Special chat ids"""

    TRASH = 3
    ARCHIVED_LINK = 6
@@ -88,47 +79,17 @@ class ChatId(IntEnum):


 class ChatType(IntEnum):
-    """Chat type."""
+    """Chat types"""

    UNDEFINED = 0
-
    SINGLE = 100
-    """1:1 chat, i.e. a direct chat with a single contact"""
-
    GROUP = 120
-
    MAILINGLIST = 140
-
-    OUT_BROADCAST = 160
-    """Outgoing broadcast channel, called "Channel" in the UI.
-
-    The user can send into this channel,
-    and all recipients will receive messages
-    in an `IN_BROADCAST`.
-
-    Called `broadcast` here rather than `channel`,
-    because the word "channel" already appears a lot in the code,
-    which would make it hard to grep for it.
-    """
-
-    IN_BROADCAST = 165
-    """Incoming broadcast channel, called "Channel" in the UI.
-
-    This channel is read-only,
-    and we do not know who the other recipients are.
-
-    This is similar to a `MAILINGLIST`,
-    with the main difference being that
-    `IN_BROADCAST`s are encrypted.
-
-    Called `broadcast` here rather than `channel`,
-    because the word "channel" already appears a lot in the code,
-    which would make it hard to grep for it.
-    """
+    BROADCAST = 160


 class ChatVisibility(str, Enum):
-    """Chat visibility types."""
+    """Chat visibility types"""

    NORMAL = "Normal"
    ARCHIVED = "Archived"
@@ -136,7 +97,7 @@ class ChatVisibility(str, Enum):


 class DownloadState(str, Enum):
-    """Message download state."""
+    """Message download state"""

    DONE = "Done"
    AVAILABLE = "Available"
@@ -197,14 +158,14 @@ class MessageState(IntEnum):


 class MessageId(IntEnum):
-    """Special message IDs."""
+    """Special message ids"""

    DAYMARKER = 9
    LAST_SPECIAL = 9


 class CertificateChecks(IntEnum):
-    """Certificate checks mode."""
+    """Certificate checks mode"""

    AUTOMATIC = 0
    STRICT = 1
@@ -212,7 +173,7 @@ class CertificateChecks(IntEnum):


 class Connectivity(IntEnum):
-    """Connectivity states."""
+    """Connectivity states"""

    NOT_CONNECTED = 1000
    CONNECTING = 2000
@@ -221,7 +182,7 @@ class Connectivity(IntEnum):


 class KeyGenType(IntEnum):
-    """Type of the key to generate."""
+    """Type of the key to generate"""

    DEFAULT = 0
    RSA2048 = 1
@@ -231,21 +192,21 @@ class KeyGenType(IntEnum):

 # "Lp" means "login parameters"
 class LpAuthFlag(IntEnum):
-    """Authorization flags."""
+    """Authorization flags"""

    OAUTH2 = 0x2
    NORMAL = 0x4


 class MediaQuality(IntEnum):
-    """Media quality setting."""
+    """Media quality setting"""

    BALANCED = 0
    WORSE = 1


 class ProviderStatus(IntEnum):
-    """Provider status according to manual testing."""
+    """Provider status according to manual testing"""

    OK = 1
    PREPARATION = 2
@@ -253,7 +214,7 @@ class ProviderStatus(IntEnum):


 class PushNotifyState(IntEnum):
-    """Push notifications state."""
+    """Push notifications state"""

    NOT_CONNECTED = 0
    HEARTBEAT = 1
@@ -261,7 +222,7 @@ class PushNotifyState(IntEnum):


 class ShowEmails(IntEnum):
-    """Show emails mode."""
+    """Show emails mode"""

    OFF = 0
    ACCEPTED_CONTACTS = 1
@@ -269,7 +230,7 @@ class ShowEmails(IntEnum):


 class SocketSecurity(IntEnum):
-    """Socket security."""
+    """Socket security"""

    AUTOMATIC = 0
    SSL = 1
@@ -278,7 +239,7 @@ class SocketSecurity(IntEnum):


 class VideochatType(IntEnum):
-    """Video chat URL type."""
+    """Video chat URL type"""

    UNKNOWN = 0
    BASICWEBRTC = 1
--- a/deltachat-rpc-client/src/deltachat_rpc_client/contact.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/contact.py
@@ -1,5 +1,3 @@
-"""Contact module."""
-
 from dataclasses import dataclass
 from typing import TYPE_CHECKING

@@ -13,7 +11,8 @@ if TYPE_CHECKING:

@dataclass
 class Contact:
-    """Contact API.
+    """
+    Contact API.

    Essentially a wrapper for RPC, account ID and a contact ID.
    """
@@ -37,14 +36,17 @@ class Contact:
        """Delete contact."""
        self._rpc.delete_contact(self.account.id, self.id)

+    def reset_encryption(self) -> None:
+        """Reset contact encryption."""
+        self._rpc.reset_contact_encryption(self.account.id, self.id)
+
    def set_name(self, name: str) -> None:
        """Change the name of this contact."""
        self._rpc.change_contact_name(self.account.id, self.id, name)

    def get_encryption_info(self) -> str:
-        """Get a multi-line encryption info.
-
-        Encryption info contains your fingerprint and the fingerprint of the contact.
+        """Get a multi-line encryption info, containing your fingerprint and
+        the fingerprint of the contact.
        """
        return self._rpc.get_contact_encryption_info(self.account.id, self.id)

@@ -64,5 +66,4 @@ class Contact:
        )

    def make_vcard(self) -> str:
-        """Make a vCard for the contact."""
        return self.account.make_vcard([self])
--- a/deltachat-rpc-client/src/deltachat_rpc_client/deltachat.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/deltachat.py
@@ -1,5 +1,3 @@
-"""Account manager module."""
-
 from __future__ import annotations

 from typing import TYPE_CHECKING
@@ -12,13 +10,12 @@ if TYPE_CHECKING:


 class DeltaChat:
-    """Delta Chat accounts manager.
-
+    """
+    Delta Chat accounts manager.
    This is the root of the object oriented API.
    """

    def __init__(self, rpc: "Rpc") -> None:
-        """Initialize account manager."""
        self.rpc = rpc

    def add_account(self) -> Account:
@@ -40,7 +37,9 @@ class DeltaChat:
        self.rpc.stop_io_for_all_accounts()

    def maybe_network(self) -> None:
-        """Indicate that the network conditions might have changed."""
+        """Indicate that the network likely has come back or just that the network
+        conditions might have changed.
+        """
        self.rpc.maybe_network()

    def get_system_info(self) -> AttrDict:
--- a/deltachat-rpc-client/src/deltachat_rpc_client/events.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/events.py
@@ -36,7 +36,7 @@ class EventFilter(ABC):

    @abstractmethod
    def __hash__(self) -> int:
-        """Object's unique hash."""
+        """Object's unique hash"""

    @abstractmethod
    def __eq__(self, other) -> bool:
@@ -52,7 +52,9 @@ class EventFilter(ABC):

    @abstractmethod
    def filter(self, event):
-        """Return True-like value if the event passed the filter."""
+        """Return True-like value if the event passed the filter and should be
+        used, or False-like value otherwise.
+        """


 class RawEvent(EventFilter):
@@ -80,17 +82,31 @@ class RawEvent(EventFilter):
        return False

    def filter(self, event: "AttrDict") -> bool:
-        """Filter an event.
-
-        Return true if the event should be processed.
-        """
        if self.types and event.kind not in self.types:
            return False
        return self._call_func(event)


 class NewMessage(EventFilter):
-    """Matches whenever a new message arrives."""
+    """Matches whenever a new message arrives.
+
+    Warning: registering a handler for this event will cause the messages
+    to be marked as read. Its usage is mainly intended for bots.
+
+    :param pattern: if set, this Pattern will be used to filter the message by its text
+                    content.
+    :param command: If set, only match messages with the given command (ex. /help).
+                    Setting this property implies `is_info==False`.
+    :param is_bot: If set to True only match messages sent by bots, if set to None
+                   match messages from bots and users. If omitted or set to False
+                   only messages from users will be matched.
+    :param is_info: If set to True only match info/system messages, if set to False
+                    only match messages that are not info/system messages. If omitted
+                    info/system messages as well as normal messages will be matched.
+    :param func: A Callable function that should accept the event as input
+                 parameter, and return a bool value indicating whether the event
+                 should be dispatched or not.
+    """

    def __init__(
        self,
@@ -105,25 +121,6 @@ class NewMessage(EventFilter):
        is_info: Optional[bool] = None,
        func: Optional[Callable[["AttrDict"], bool]] = None,
    ) -> None:
-        """Initialize a new message filter.
-
-        Warning: registering a handler for this event will cause the messages
-        to be marked as read. Its usage is mainly intended for bots.
-
-        :param pattern: if set, this Pattern will be used to filter the message by its text
-                    content.
-        :param command: If set, only match messages with the given command (ex. /help).
-                    Setting this property implies `is_info==False`.
-        :param is_bot: If set to True only match messages sent by bots, if set to None
-                   match messages from bots and users. If omitted or set to False
-                   only messages from users will be matched.
-        :param is_info: If set to True only match info/system messages, if set to False
-                    only match messages that are not info/system messages. If omitted
-                    info/system messages as well as normal messages will be matched.
-        :param func: A Callable function that should accept the event as input
-                 parameter, and return a bool value indicating whether the event
-                 should be dispatched or not.
-        """
        super().__init__(func=func)
        self.is_bot = is_bot
        self.is_info = is_info
@@ -162,7 +159,6 @@ class NewMessage(EventFilter):
        return False

    def filter(self, event: "AttrDict") -> bool:
-        """Return true if if the event is a new message event."""
        if self.is_bot is not None and self.is_bot != event.message_snapshot.is_bot:
            return False
        if self.is_info is not None and self.is_info != event.message_snapshot.is_info:
@@ -203,7 +199,6 @@ class MemberListChanged(EventFilter):
        return False

    def filter(self, event: "AttrDict") -> bool:
-        """Return true if if the event is a member addition event."""
        if self.added is not None and self.added != event.member_added:
            return False
        return self._call_func(event)
@@ -236,7 +231,6 @@ class GroupImageChanged(EventFilter):
        return False

    def filter(self, event: "AttrDict") -> bool:
-        """Return True if event is matched."""
        if self.deleted is not None and self.deleted != event.image_deleted:
            return False
        return self._call_func(event)
@@ -262,12 +256,13 @@ class GroupNameChanged(EventFilter):
        return False

    def filter(self, event: "AttrDict") -> bool:
-        """Return True if event is matched."""
        return self._call_func(event)


 class HookCollection:
-    """Helper class to collect event hooks that can later be added to a Delta Chat client."""
+    """
+    Helper class to collect event hooks that can later be added to a Delta Chat client.
+    """

    def __init__(self) -> None:
        self._hooks: set[tuple[Callable, Union[type, EventFilter]]] = set()
--- a/deltachat-rpc-client/src/deltachat_rpc_client/message.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/message.py
@@ -1,8 +1,6 @@
-"""Message module."""
-
 import json
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, List, Optional, Union
+from typing import TYPE_CHECKING, Optional, Union

 from ._utils import AttrDict, futuremethod
 from .const import EventType
@@ -39,11 +37,6 @@ class Message:
        snapshot["message"] = self
        return snapshot

-    def get_read_receipts(self) -> List[AttrDict]:
-        """Get message read receipts."""
-        read_receipts = self._rpc.get_message_read_receipts(self.account.id, self.id)
-        return [AttrDict(read_receipt) for read_receipt in read_receipts]
-
    def get_reactions(self) -> Optional[AttrDict]:
        """Get message reactions."""
        reactions = self._rpc.get_message_reactions(self.account.id, self.id)
@@ -52,7 +45,6 @@ class Message:
        return None

    def get_sender_contact(self) -> Contact:
-        """Return sender contact."""
        from_id = self.get_snapshot().from_id
        return self.account.get_contact_by_id(from_id)

@@ -61,11 +53,6 @@ class Message:
        self._rpc.markseen_msgs(self.account.id, [self.id])

    def continue_autocrypt_key_transfer(self, setup_code: str) -> None:
-        """Continue the Autocrypt Setup Message key transfer.
-
-        This function can be called on received Autocrypt Setup Message
-        to import the key encrypted with the provided setup code.
-        """
        self._rpc.continue_autocrypt_key_transfer(self.account.id, self.id, setup_code)

    def send_webxdc_status_update(self, update: Union[dict, str], description: str) -> None:
@@ -75,15 +62,9 @@ class Message:
        self._rpc.send_webxdc_status_update(self.account.id, self.id, update, description)

    def get_webxdc_status_updates(self, last_known_serial: int = 0) -> list:
-        """Return a list of Webxdc status updates for Webxdc instance message."""
        return json.loads(self._rpc.get_webxdc_status_updates(self.account.id, self.id, last_known_serial))

-    def get_info(self) -> str:
-        """Return message info."""
-        return self._rpc.get_message_info(self.account.id, self.id)
-
    def get_webxdc_info(self) -> dict:
-        """Get info from a Webxdc message in JSON format."""
        return self._rpc.get_webxdc_info(self.account.id, self.id)

    def wait_until_delivered(self) -> None:
@@ -95,10 +76,8 @@ class Message:

    @futuremethod
    def send_webxdc_realtime_advertisement(self):
-        """Send an advertisement to join the realtime channel."""
        yield self._rpc.send_webxdc_realtime_advertisement.future(self.account.id, self.id)

    @futuremethod
    def send_webxdc_realtime_data(self, data) -> None:
-        """Send data to the realtime channel."""
        yield self._rpc.send_webxdc_realtime_data.future(self.account.id, self.id, list(data))
--- a/deltachat-rpc-client/src/deltachat_rpc_client/pytestplugin.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/pytestplugin.py
@@ -1,5 +1,3 @@
-"""Pytest plugin module."""
-
 from __future__ import annotations

 import os
@@ -14,55 +12,55 @@ from ._utils import futuremethod
 from .rpc import Rpc


-class ACFactory:
-    """Test account factory."""
+def get_temp_credentials() -> dict:
+    domain = os.getenv("CHATMAIL_DOMAIN")
+    username = "ci-" + "".join(random.choice("2345789acdefghjkmnpqrstuvwxyz") for i in range(6))
+    password = f"{username}${username}"
+    addr = f"{username}@{domain}"
+    return {"email": addr, "password": password}

+
+class ACFactory:
    def __init__(self, deltachat: DeltaChat) -> None:
        self.deltachat = deltachat

    def get_unconfigured_account(self) -> Account:
-        """Create a new unconfigured account."""
        account = self.deltachat.add_account()
        account.set_config("verified_one_on_one_chats", "1")
        return account

    def get_unconfigured_bot(self) -> Bot:
-        """Create a new unconfigured bot."""
        return Bot(self.get_unconfigured_account())

-    def get_credentials(self) -> (str, str):
-        """Generate new credentials for chatmail account."""
-        domain = os.getenv("CHATMAIL_DOMAIN")
-        username = "ci-" + "".join(random.choice("2345789acdefghjkmnpqrstuvwxyz") for i in range(6))
-        return f"{username}@{domain}", f"{username}${username}"
+    def new_preconfigured_account(self) -> Account:
+        """Make a new account with configuration options set, but configuration not started."""
+        credentials = get_temp_credentials()
+        account = self.get_unconfigured_account()
+        account.set_config("addr", credentials["email"])
+        account.set_config("mail_pw", credentials["password"])
+        assert not account.is_configured()
+        return account

    @futuremethod
    def new_configured_account(self):
-        """Create a new configured account."""
-        addr, password = self.get_credentials()
-        account = self.get_unconfigured_account()
-        params = {"addr": addr, "password": password}
-        yield account.add_or_update_transport.future(params)
-
+        account = self.new_preconfigured_account()
+        yield account.configure.future()
        assert account.is_configured()
        return account

    def new_configured_bot(self) -> Bot:
-        """Create a new configured bot."""
-        addr, password = self.get_credentials()
+        credentials = get_temp_credentials()
        bot = self.get_unconfigured_bot()
-        bot.configure(addr, password)
+        bot.configure(credentials["email"], credentials["password"])
        return bot

    @futuremethod
    def get_online_account(self):
-        """Create a new account and start I/O."""
        account = yield self.new_configured_account.future()
        account.bring_online()
        return account

    def get_online_accounts(self, num: int) -> list[Account]:
-        """Create multiple online accounts."""
        futures = [self.get_online_account.future() for _ in range(num)]
        return [f() for f in futures]

@@ -77,10 +75,6 @@ class ACFactory:
        return ac_clone

    def get_accepted_chat(self, ac1: Account, ac2: Account) -> Chat:
-        """Create a new 1:1 chat between ac1 and ac2 accepted on both sides.
-
-        Returned chat is a chat with ac2 from ac1 point of view.
-        """
        ac2.create_chat(ac1)
        return ac1.create_chat(ac2)

@@ -92,10 +86,9 @@ class ACFactory:
        file: Optional[str] = None,
        group: Optional[str] = None,
    ) -> Message:
-        """Send a message."""
        if not from_account:
            from_account = (self.get_online_accounts(1))[0]
-        to_contact = from_account.create_contact(to_account)
+        to_contact = from_account.create_contact(to_account.get_config("addr"))
        if group:
            to_chat = from_account.create_group(group)
            to_chat.add_contact(to_contact)
@@ -111,7 +104,6 @@ class ACFactory:
        file: Optional[str] = None,
        group: Optional[str] = None,
    ) -> AttrDict:
-        """Send a message and wait until recipient processes it."""
        self.send_message(
            to_account=to_client.account,
            from_account=from_account,
@@ -125,7 +117,6 @@ class ACFactory:

@pytest.fixture
 def rpc(tmp_path) -> AsyncGenerator:
-    """RPC client fixture."""
    rpc_server = Rpc(accounts_dir=str(tmp_path / "accounts"))
    with rpc_server:
        yield rpc_server
@@ -133,7 +124,6 @@ def rpc(tmp_path) -> AsyncGenerator:

@pytest.fixture
 def acfactory(rpc) -> AsyncGenerator:
-    """Return account factory fixture."""
    return ACFactory(DeltaChat(rpc))


@@ -151,7 +141,7 @@ def data():
            raise Exception("Data path cannot be found")

        def get_path(self, bn):
-            """Return path of file or None if it doesn't exist."""
+            """return path of file or None if it doesn't exist."""
            fn = os.path.join(self.path, *bn.split("/"))
            assert os.path.exists(fn)
            return fn
--- a/deltachat-rpc-client/src/deltachat_rpc_client/rpc.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/rpc.py
@@ -1,5 +1,3 @@
-"""JSON-RPC client module."""
-
 from __future__ import annotations

 import itertools
@@ -14,19 +12,16 @@ from typing import Any, Iterator, Optional


 class JsonRpcError(Exception):
-    """JSON-RPC error."""
+    pass


 class RpcFuture:
-    """RPC future waiting for RPC call result."""
-
    def __init__(self, rpc: "Rpc", request_id: int, event: Event):
        self.rpc = rpc
        self.request_id = request_id
        self.event = event

    def __call__(self):
-        """Wait for the future to return the result."""
        self.event.wait()
        response = self.rpc.request_results.pop(self.request_id)
        if "error" in response:
@@ -37,19 +32,17 @@ class RpcFuture:


 class RpcMethod:
-    """RPC method."""
-
    def __init__(self, rpc: "Rpc", name: str):
        self.rpc = rpc
        self.name = name

    def __call__(self, *args) -> Any:
-        """Call JSON-RPC method synchronously."""
+        """Synchronously calls JSON-RPC method."""
        future = self.future(*args)
        return future()

    def future(self, *args) -> Any:
-        """Call JSON-RPC method asynchronously."""
+        """Asynchronously calls JSON-RPC method."""
        request_id = next(self.rpc.id_iterator)
        request = {
            "jsonrpc": "2.0",
@@ -65,13 +58,8 @@ class RpcMethod:


 class Rpc:
-    """RPC client."""
-
    def __init__(self, accounts_dir: Optional[str] = None, **kwargs):
-        """Initialize RPC client.
-
-        The given arguments will be passed to subprocess.Popen().
-        """
+        """The given arguments will be passed to subprocess.Popen()"""
        if accounts_dir:
            kwargs["env"] = {
                **kwargs.get("env", os.environ),
@@ -93,7 +81,6 @@ class Rpc:
        self.events_thread: Thread

    def start(self) -> None:
-        """Start RPC server subprocess."""
        if sys.version_info >= (3, 11):
            self.process = subprocess.Popen(
                "deltachat-rpc-server",
@@ -143,7 +130,6 @@ class Rpc:
        self.close()

    def reader_loop(self) -> None:
-        """Process JSON-RPC responses from the RPC server process output."""
        try:
            while line := self.process.stdout.readline():
                response = json.loads(line)
@@ -171,13 +157,12 @@ class Rpc:
            logging.exception("Exception in the writer loop")

    def get_queue(self, account_id: int) -> Queue:
-        """Get event queue corresponding to the given account ID."""
        if account_id not in self.event_queues:
            self.event_queues[account_id] = Queue()
        return self.event_queues[account_id]

    def events_loop(self) -> None:
-        """Request new events and distributes them between queues."""
+        """Requests new events and distributes them between queues."""
        try:
            while True:
                if self.closing:
@@ -193,12 +178,12 @@ class Rpc:
            logging.exception("Exception in the event loop")

    def wait_for_event(self, account_id: int) -> Optional[dict]:
-        """Wait for the next event from the given account and returns it."""
+        """Waits for the next event from the given account and returns it."""
        queue = self.get_queue(account_id)
        return queue.get()

    def clear_all_events(self, account_id: int):
-        """Remove all queued-up events for a given account. Useful for tests."""
+        """Removes all queued-up events for a given account. Useful for tests."""
        queue = self.get_queue(account_id)
        try:
            while True:
--- a/deltachat-rpc-client/tests/test_account_events.py
+++ b/deltachat-rpc-client/tests/test_account_events.py
@@ -13,11 +13,10 @@ def test_event_on_configuration(acfactory: ACFactory) -> None:
    Test if ACCOUNTS_ITEM_CHANGED event is emitted on configure
    """

-    addr, password = acfactory.get_credentials()
-    account = acfactory.get_unconfigured_account()
+    account = acfactory.new_preconfigured_account()
    account.clear_all_events()
    assert not account.is_configured()
-    future = account.add_or_update_transport.future({"addr": addr, "password": password})
+    future = account.configure.future()
    while True:
        event = account.wait_for_event()
        if event.kind == EventType.ACCOUNTS_ITEM_CHANGED:
--- a/deltachat-rpc-client/tests/test_chatlist_events.py
+++ b/deltachat-rpc-client/tests/test_chatlist_events.py
@@ -48,7 +48,8 @@ def test_delivery_status(acfactory: ACFactory) -> None:
    """
    alice, bob = acfactory.get_online_accounts(2)

-    alice_contact_bob = alice.create_contact(bob, "Bob")
+    bob_addr = bob.get_config("addr")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
    alice_chat_bob = alice_contact_bob.create_chat()

    alice.clear_all_events()
@@ -118,7 +119,8 @@ def test_download_on_demand(acfactory: ACFactory) -> None:
    """
    alice, bob = acfactory.get_online_accounts(2)

-    alice_contact_bob = alice.create_contact(bob, "Bob")
+    bob_addr = bob.get_config("addr")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
    alice_chat_bob = alice_contact_bob.create_chat()
    alice_chat_bob.send_text("hi")

@@ -148,7 +150,8 @@ def test_download_on_demand(acfactory: ACFactory) -> None:
 def get_multi_account_test_setup(acfactory: ACFactory) -> [Account, Account, Account]:
    alice, bob = acfactory.get_online_accounts(2)

-    alice_contact_bob = alice.create_contact(bob, "Bob")
+    bob_addr = bob.get_config("addr")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
    alice_chat_bob = alice_contact_bob.create_chat()
    alice_chat_bob.send_text("hi")

--- a/deltachat-rpc-client/tests/test_multidevice.py
+++ b/deltachat-rpc-client/tests/test_multidevice.py
@@ -1,110 +0,0 @@
-from imap_tools import AND
-
-from deltachat_rpc_client import EventType
-from deltachat_rpc_client.const import MessageState
-
-
-def test_one_account_send_bcc_setting(acfactory, log, direct_imap):
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac1_clone = ac1.clone()
-    ac1_clone.bring_online()
-
-    log.section("send out message without bcc to ourselves")
-    ac1.set_config("bcc_self", "0")
-    chat = ac1.create_chat(ac2)
-    self_addr = ac1.get_config("addr")
-    other_addr = ac2.get_config("addr")
-
-    msg_out = chat.send_text("message1")
-    assert not msg_out.get_snapshot().is_forwarded
-
-    # wait for send out (no BCC)
-    ev = ac1.wait_for_event(EventType.SMTP_MESSAGE_SENT)
-    assert ac1.get_config("bcc_self") == "0"
-
-    assert self_addr not in ev.msg
-    assert other_addr in ev.msg
-
-    log.section("ac1: setting bcc_self=1")
-    ac1.set_config("bcc_self", "1")
-
-    log.section("send out message with bcc to ourselves")
-    msg_out = chat.send_text("message2")
-
-    # wait for send out (BCC)
-    ev = ac1.wait_for_event(EventType.SMTP_MESSAGE_SENT)
-    assert ac1.get_config("bcc_self") == "1"
-
-    # Second client receives only second message, but not the first.
-    ev_msg = ac1_clone.wait_for_event(EventType.MSGS_CHANGED)
-    assert ac1_clone.get_message_by_id(ev_msg.msg_id).get_snapshot().text == msg_out.get_snapshot().text
-
-    # now make sure we are sending message to ourselves too
-    assert self_addr in ev.msg
-    assert self_addr in ev.msg
-
-    # BCC-self messages are marked as seen by the sender device.
-    while True:
-        event = ac1.wait_for_event()
-        if event.kind == EventType.INFO and event.msg.endswith("Marked messages 1 in folder INBOX as seen."):
-            break
-
-    # Check that the message is marked as seen on IMAP.
-    ac1_direct_imap = direct_imap(ac1)
-    ac1_direct_imap.connect()
-    ac1_direct_imap.select_folder("Inbox")
-    assert len(list(ac1_direct_imap.conn.fetch(AND(seen=True)))) == 1
-
-
-def test_multidevice_sync_seen(acfactory, log):
-    """Test that message marked as seen on one device is marked as seen on another."""
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac1_clone = ac1.clone()
-    ac1_clone.bring_online()
-
-    ac1.set_config("bcc_self", "1")
-    ac1_clone.set_config("bcc_self", "1")
-
-    ac1_chat = ac1.create_chat(ac2)
-    ac1_clone_chat = ac1_clone.create_chat(ac2)
-    ac2_chat = ac2.create_chat(ac1)
-
-    log.section("Send a message from ac2 to ac1 and check that it's 'fresh'")
-    ac2_chat.send_text("Hi")
-    ac1_message = ac1.wait_for_incoming_msg()
-    ac1_clone_message = ac1_clone.wait_for_incoming_msg()
-    assert ac1_chat.get_fresh_message_count() == 1
-    assert ac1_clone_chat.get_fresh_message_count() == 1
-    assert ac1_message.get_snapshot().state == MessageState.IN_FRESH
-    assert ac1_clone_message.get_snapshot().state == MessageState.IN_FRESH
-
-    log.section("ac1 marks message as seen on the first device")
-    ac1.mark_seen_messages([ac1_message])
-    assert ac1_message.get_snapshot().state == MessageState.IN_SEEN
-
-    log.section("ac1 clone detects that message is marked as seen")
-    ev = ac1_clone.wait_for_event(EventType.MSGS_NOTICED)
-    assert ev.chat_id == ac1_clone_chat.id
-
-    log.section("Send an ephemeral message from ac2 to ac1")
-    ac2_chat.set_ephemeral_timer(60)
-    ac1.wait_for_event(EventType.CHAT_EPHEMERAL_TIMER_MODIFIED)
-    ac1.wait_for_incoming_msg()
-    ac1_clone.wait_for_event(EventType.CHAT_EPHEMERAL_TIMER_MODIFIED)
-    ac1_clone.wait_for_incoming_msg()
-
-    ac2_chat.send_text("Foobar")
-    ac1_message = ac1.wait_for_incoming_msg()
-    ac1_clone_message = ac1_clone.wait_for_incoming_msg()
-    assert "Ephemeral timer: 60\n" in ac1_message.get_info()
-    assert "Expires: " not in ac1_clone_message.get_info()
-    assert "Ephemeral timer: 60\n" in ac1_message.get_info()
-    assert "Expires: " not in ac1_clone_message.get_info()
-
-    ac1_message.mark_seen()
-    assert "Expires: " in ac1_message.get_info()
-    ev = ac1_clone.wait_for_event(EventType.MSGS_NOTICED)
-    assert ev.chat_id == ac1_clone_chat.id
-    assert ac1_clone_message.get_snapshot().state == MessageState.IN_SEEN
-    # Test that the timer is started on the second device after synchronizing the seen status.
-    assert "Expires: " in ac1_clone_message.get_info()
--- a/deltachat-rpc-client/tests/test_securejoin.py
+++ b/deltachat-rpc-client/tests/test_securejoin.py
@@ -1,4 +1,5 @@
 import logging
+import time

 import pytest

@@ -15,14 +16,14 @@ def test_qr_setup_contact(acfactory, tmp_path) -> None:
    alice.wait_for_securejoin_inviter_success()

    # Test that Alice verified Bob's profile.
-    alice_contact_bob = alice.create_contact(bob)
+    alice_contact_bob = alice.get_contact_by_addr(bob.get_config("addr"))
    alice_contact_bob_snapshot = alice_contact_bob.get_snapshot()
    assert alice_contact_bob_snapshot.is_verified

    bob.wait_for_securejoin_joiner_success()

    # Test that Bob verified Alice's profile.
-    bob_contact_alice = bob.create_contact(alice)
+    bob_contact_alice = bob.get_contact_by_addr(alice.get_config("addr"))
    bob_contact_alice_snapshot = bob_contact_alice.get_snapshot()
    assert bob_contact_alice_snapshot.is_verified

@@ -83,16 +84,16 @@ def test_qr_securejoin(acfactory, protect):
    bob.wait_for_securejoin_joiner_success()

    # Test that Alice verified Bob's profile.
-    alice_contact_bob = alice.create_contact(bob)
+    alice_contact_bob = alice.get_contact_by_addr(bob.get_config("addr"))
    alice_contact_bob_snapshot = alice_contact_bob.get_snapshot()
    assert alice_contact_bob_snapshot.is_verified

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

    # Test that Bob verified Alice's profile.
-    bob_contact_alice = bob.create_contact(alice)
+    bob_contact_alice = bob.get_contact_by_addr(alice.get_config("addr"))
    bob_contact_alice_snapshot = bob_contact_alice.get_snapshot()
    assert bob_contact_alice_snapshot.is_verified

@@ -100,7 +101,7 @@ def test_qr_securejoin(acfactory, protect):
    # Alice observes securejoin protocol and verifies Bob on second device.
    alice2.start_io()
    alice2.wait_for_securejoin_inviter_success()
-    alice2_contact_bob = alice2.create_contact(bob)
+    alice2_contact_bob = alice2.get_contact_by_addr(bob.get_config("addr"))
    alice2_contact_bob_snapshot = alice2_contact_bob.get_snapshot()
    assert alice2_contact_bob_snapshot.is_verified

@@ -116,7 +117,8 @@ def test_qr_securejoin_contact_request(acfactory) -> None:
    """Alice invites Bob to a group when Bob's chat with Alice is in a contact request mode."""
    alice, bob = acfactory.get_online_accounts(2)

-    alice_contact_bob = alice.create_contact(bob, "Bob")
+    bob_addr = bob.get_config("addr")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
    alice_chat_bob = alice_contact_bob.create_chat()
    alice_chat_bob.send_text("Hello!")

@@ -153,8 +155,11 @@ def test_qr_readreceipt(acfactory) -> None:
    logging.info("Alice creates a verified group")
    group = alice.create_group("Group", protect=True)

-    alice_contact_bob = alice.create_contact(bob, "Bob")
-    alice_contact_charlie = alice.create_contact(charlie, "Charlie")
+    bob_addr = bob.get_config("addr")
+    charlie_addr = charlie.get_config("addr")
+
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
+    alice_contact_charlie = alice.create_contact(charlie_addr, "Charlie")

    group.add_contact(alice_contact_bob)
    group.add_contact(alice_contact_charlie)
@@ -181,7 +186,7 @@ def test_qr_readreceipt(acfactory) -> None:
    charlie_snapshot = charlie_message.get_snapshot()
    assert charlie_snapshot.text == "Hi from Bob!"

-    bob_contact_charlie = bob.create_contact(charlie, "Charlie")
+    bob_contact_charlie = bob.create_contact(charlie_addr, "Charlie")
    assert not bob.get_chat_by_contact(bob_contact_charlie)

    logging.info("Charlie reads Bob's message")
@@ -212,8 +217,8 @@ def test_setup_contact_resetup(acfactory) -> None:
    bob.wait_for_securejoin_joiner_success()


-def test_verified_group_member_added_recovery(acfactory) -> None:
-    """Tests verified group recovery by reverifying then removing and adding a member back."""
+def test_verified_group_recovery(acfactory) -> None:
+    """Tests verified group recovery by reverifying a member and sending a message in a group."""
    ac1, ac2, ac3 = acfactory.get_online_accounts(3)

    logging.info("ac1 creates verified group")
@@ -226,7 +231,7 @@ def test_verified_group_member_added_recovery(acfactory) -> None:
    ac2.wait_for_securejoin_joiner_success()

    # ac1 has ac2 directly verified.
-    ac1_contact_ac2 = ac1.create_contact(ac2)
+    ac1_contact_ac2 = ac1.get_contact_by_addr(ac2.get_config("addr"))
    assert ac1_contact_ac2.get_snapshot().verifier_id == SpecialContactId.SELF

    logging.info("ac3 joins verified group")
@@ -234,8 +239,6 @@ def test_verified_group_member_added_recovery(acfactory) -> None:
    ac3.wait_for_securejoin_joiner_success()
    ac3.wait_for_incoming_msg_event()  # Member added

-    ac3_contact_ac2_old = ac3.create_contact(ac2)
-
    logging.info("ac2 logs in on a new device")
    ac2 = acfactory.resetup_account(ac2)

@@ -248,10 +251,85 @@ def test_verified_group_member_added_recovery(acfactory) -> None:
    assert len(ac3_chat.get_contacts()) == 3
    ac3_chat.send_text("Hi!")

+    snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
+    assert snapshot.text == "Hi!"
+
+    msg_id = ac2.wait_for_incoming_msg_event().msg_id
+    message = ac2.get_message_by_id(msg_id)
+    snapshot = message.get_snapshot()
+    assert snapshot.text == "Hi!"
+
+    # ac1 contact is verified for ac2 because ac3 gossiped ac1 key in the "Hi!" message.
+    ac1_contact = ac2.get_contact_by_addr(ac1.get_config("addr"))
+    assert ac1_contact.get_snapshot().is_verified
+
+    # ac2 can write messages to the group.
+    snapshot.chat.send_text("Works again!")
+
+    snapshot = ac3.get_message_by_id(ac3.wait_for_incoming_msg_event().msg_id).get_snapshot()
+    assert snapshot.text == "Works again!"
+
+    snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
+    assert snapshot.text == "Works again!"
+
+    ac1_chat_messages = snapshot.chat.get_messages()
+    ac2_addr = ac2.get_config("addr")
+    assert ac1_chat_messages[-2].get_snapshot().text == f"Changed setup for {ac2_addr}"
+
+    # ac2 is now verified by ac3 for ac1
+    ac1_contact_ac3 = ac1.get_contact_by_addr(ac3.get_config("addr"))
+    assert ac1_contact_ac2.get_snapshot().verifier_id == ac1_contact_ac3.id
+
+
+def test_verified_group_member_added_recovery(acfactory) -> None:
+    """Tests verified group recovery by reverifiying than removing and adding a member back."""
+    ac1, ac2, ac3 = acfactory.get_online_accounts(3)
+
+    logging.info("ac1 creates verified group")
+    chat = ac1.create_group("Verified group", protect=True)
+    assert chat.get_basic_snapshot().is_protected
+
+    logging.info("ac2 joins verified group")
+    qr_code = chat.get_qr_code()
+    ac2.secure_join(qr_code)
+    ac2.wait_for_securejoin_joiner_success()
+
+    # ac1 has ac2 directly verified.
+    ac1_contact_ac2 = ac1.get_contact_by_addr(ac2.get_config("addr"))
+    assert ac1_contact_ac2.get_snapshot().verifier_id == SpecialContactId.SELF
+
+    logging.info("ac3 joins verified group")
+    ac3_chat = ac3.secure_join(qr_code)
+    ac3.wait_for_securejoin_joiner_success()
+    ac3.wait_for_incoming_msg_event()  # Member added
+
+    logging.info("ac2 logs in on a new device")
+    ac2 = acfactory.resetup_account(ac2)
+
+    logging.info("ac2 reverifies with ac3")
+    qr_code = ac3.get_qr_code()
+    ac2.secure_join(qr_code)
+    ac2.wait_for_securejoin_joiner_success()
+
+    logging.info("ac3 sends a message to the group")
+    assert len(ac3_chat.get_contacts()) == 3
+    ac3_chat.send_text("Hi!")
+
+    msg_id = ac2.wait_for_incoming_msg_event().msg_id
+    message = ac2.get_message_by_id(msg_id)
+    snapshot = message.get_snapshot()
+    logging.info("Received message %s", snapshot.text)
+    assert snapshot.text == "Hi!"
+
    ac1.wait_for_incoming_msg_event()  # Hi!

-    ac3_contact_ac2 = ac3.create_contact(ac2)
-    ac3_chat.remove_contact(ac3_contact_ac2_old)
+    ac3_contact_ac2 = ac3.get_contact_by_addr(ac2.get_config("addr"))
+    ac3_chat.remove_contact(ac3_contact_ac2)
+
+    msg_id = ac2.wait_for_incoming_msg_event().msg_id
+    message = ac2.get_message_by_id(msg_id)
+    snapshot = message.get_snapshot()
+    assert "removed" in snapshot.text

    snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
    assert "removed" in snapshot.text
@@ -280,16 +358,19 @@ def test_verified_group_member_added_recovery(acfactory) -> None:
    snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
    assert snapshot.text == "Works again!"

-    ac1_contact_ac2 = ac1.create_contact(ac2)
-    ac1_contact_ac3 = ac1.create_contact(ac3)
+    ac1_contact_ac2 = ac1.get_contact_by_addr(ac2.get_config("addr"))
    ac1_contact_ac2_snapshot = ac1_contact_ac2.get_snapshot()
    assert ac1_contact_ac2_snapshot.is_verified
-    assert ac1_contact_ac2_snapshot.verifier_id == ac1_contact_ac3.id
+    assert ac1_contact_ac2_snapshot.verifier_id == ac1.get_contact_by_addr(ac3.get_config("addr")).id
+
+    # ac2 is now verified by ac3 for ac1
+    ac1_contact_ac3 = ac1.get_contact_by_addr(ac3.get_config("addr"))
+    assert ac1_contact_ac2.get_snapshot().verifier_id == ac1_contact_ac3.id


 def test_qr_join_chat_with_pending_bobstate_issue4894(acfactory):
    """Regression test for
-    issue <https://github.com/chatmail/core/issues/4894>.
+    issue <https://github.com/deltachat/deltachat-core-rust/issues/4894>.
    """
    ac1, ac2, ac3, ac4 = acfactory.get_online_accounts(4)

@@ -323,12 +404,12 @@ def test_qr_join_chat_with_pending_bobstate_issue4894(acfactory):
    logging.info("ac2 now has pending bobstate but ac1 is shutoff")

    # we meanwhile expect ac3/ac2 verification started in the beginning to have completed
-    assert ac3.create_contact(ac2).get_snapshot().is_verified
-    assert ac2.create_contact(ac3).get_snapshot().is_verified
+    assert ac3.get_contact_by_addr(ac2.get_config("addr")).get_snapshot().is_verified
+    assert ac2.get_contact_by_addr(ac3.get_config("addr")).get_snapshot().is_verified

    logging.info("ac3: create a verified group VG with ac2")
    vg = ac3.create_group("ac3-created", protect=True)
-    vg.add_contact(ac3.create_contact(ac2))
+    vg.add_contact(ac3.get_contact_by_addr(ac2.get_config("addr")))

    # ensure ac2 receives message in VG
    vg.send_text("hello")
@@ -366,7 +447,7 @@ def test_qr_new_group_unblocked(acfactory):
    ac1.wait_for_securejoin_inviter_success()

    ac1_new_chat = ac1.create_group("Another group")
-    ac1_new_chat.add_contact(ac1.create_contact(ac2))
+    ac1_new_chat.add_contact(ac1.get_contact_by_addr(ac2.get_config("addr")))
    # Receive "Member added" message.
    ac2.wait_for_incoming_msg_event()

@@ -381,7 +462,8 @@ def test_aeap_flow_verified(acfactory):
    """Test that a new address is added to a contact when it changes its address."""
    ac1, ac2 = acfactory.get_online_accounts(2)

-    addr, password = acfactory.get_credentials()
+    # ac1new is only used to get a new address.
+    ac1new = acfactory.new_preconfigured_account()

    logging.info("ac1: create verified-group QR, ac2 scans and joins")
    chat = ac1.create_group("hello", protect=True)
@@ -401,8 +483,8 @@ def test_aeap_flow_verified(acfactory):
    assert msg_in_1.text == msg_out.text

    logging.info("changing email account")
-    ac1.set_config("addr", addr)
-    ac1.set_config("mail_pw", password)
+    ac1.set_config("addr", ac1new.get_config("addr"))
+    ac1.set_config("mail_pw", ac1new.get_config("mail_pw"))
    ac1.stop_io()
    ac1.configure()
    ac1.start_io()
@@ -415,9 +497,11 @@ def test_aeap_flow_verified(acfactory):
    msg_in_2_snapshot = msg_in_2.get_snapshot()
    assert msg_in_2_snapshot.text == msg_out.text
    assert msg_in_2_snapshot.chat.id == msg_in_1.chat.id
-    assert msg_in_2.get_sender_contact().get_snapshot().address == addr
+    assert msg_in_2.get_sender_contact().get_snapshot().address == ac1new.get_config("addr")
    assert len(msg_in_2_snapshot.chat.get_contacts()) == 2
-    assert addr in [contact.get_snapshot().address for contact in msg_in_2_snapshot.chat.get_contacts()]
+    assert ac1new.get_config("addr") in [
+        contact.get_snapshot().address for contact in msg_in_2_snapshot.chat.get_contacts()
+    ]


 def test_gossip_verification(acfactory) -> None:
@@ -433,9 +517,9 @@ def test_gossip_verification(acfactory) -> None:
    bob.secure_join(qr_code)
    bob.wait_for_securejoin_joiner_success()

-    bob_contact_alice = bob.create_contact(alice, "Alice")
-    bob_contact_carol = bob.create_contact(carol, "Carol")
-    carol_contact_alice = carol.create_contact(alice, "Alice")
+    bob_contact_alice = bob.create_contact(alice.get_config("addr"), "Alice")
+    bob_contact_carol = bob.create_contact(carol.get_config("addr"), "Carol")
+    carol_contact_alice = carol.create_contact(alice.get_config("addr"), "Alice")

    logging.info("Bob creates an Autocrypt group")
    bob_group_chat = bob.create_group("Autocrypt Group")
@@ -486,7 +570,7 @@ def test_securejoin_after_contact_resetup(acfactory) -> None:

    # ac1 waits for member added message and creates a QR code.
    snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "Member Me added by {}.".format(ac3.get_config("addr"))
+    assert snapshot.text == "Member Me ({}) added by {}.".format(ac1.get_config("addr"), ac3.get_config("addr"))
    ac1_qr_code = snapshot.chat.get_qr_code()

    # ac2 verifies ac1
@@ -495,13 +579,35 @@ def test_securejoin_after_contact_resetup(acfactory) -> None:
    ac2.wait_for_securejoin_joiner_success()

    # ac1 is verified for ac2.
-    ac2_contact_ac1 = ac2.create_contact(ac1, "")
+    ac2_contact_ac1 = ac2.create_contact(ac1.get_config("addr"), "")
    assert ac2_contact_ac1.get_snapshot().is_verified

    # ac1 resetups the account.
    ac1 = acfactory.resetup_account(ac1)
-    ac2_contact_ac1 = ac2.create_contact(ac1, "")
-    assert not ac2_contact_ac1.get_snapshot().is_verified
+
+    # Loop sending message from ac1 to ac2
+    # until ac2 accepts new ac1 key.
+    #
+    # This may not happen immediately because resetup of ac1
+    # rewinds "smeared timestamp" so Date: header for messages
+    # sent by new ac1 are in the past compared to the last Date:
+    # header sent by old ac1.
+    while True:
+        # ac1 sends a message to ac2.
+        ac1_contact_ac2 = ac1.create_contact(ac2.get_config("addr"), "")
+        ac1_chat_ac2 = ac1_contact_ac2.create_chat()
+        ac1_chat_ac2.send_text("Hello!")
+
+        # ac2 receives a message.
+        snapshot = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot()
+        assert snapshot.text == "Hello!"
+        logging.info("ac2 received Hello!")
+
+        # ac1 is no longer verified for ac2 as new Autocrypt key is not the same as old verified key.
+        logging.info("ac2 addr={}, ac1 addr={}".format(ac2.get_config("addr"), ac1.get_config("addr")))
+        if not ac2_contact_ac1.get_snapshot().is_verified:
+            break
+        time.sleep(1)

    # ac1 goes offline.
    ac1.remove()
@@ -547,7 +653,7 @@ def test_withdraw_securejoin_qr(acfactory):
    alice.clear_all_events()

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

--- a/deltachat-rpc-client/tests/test_something.py
+++ b/deltachat-rpc-client/tests/test_something.py
@@ -11,7 +11,7 @@ from unittest.mock import MagicMock
 import pytest

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


@@ -61,96 +61,52 @@ def test_acfactory(acfactory) -> None:


 def test_configure_starttls(acfactory) -> None:
-    addr, password = acfactory.get_credentials()
-    account = acfactory.get_unconfigured_account()
-    account.add_or_update_transport(
-        {
-            "addr": addr,
-            "password": password,
-            "imapSecurity": "starttls",
-            "smtpSecurity": "starttls",
-        },
-    )
+    account = acfactory.new_preconfigured_account()
+
+    # Use STARTTLS
+    account.set_config("mail_security", "2")
+    account.set_config("send_security", "2")
+    account.configure()
    assert account.is_configured()


-def test_lowercase_address(acfactory) -> None:
-    addr, password = acfactory.get_credentials()
-    addr_upper = addr.upper()
-    account = acfactory.get_unconfigured_account()
-    account.add_or_update_transport(
-        {
-            "addr": addr_upper,
-            "password": password,
-        },
-    )
-    assert account.is_configured()
-    assert addr_upper != addr
-    assert account.get_config("configured_addr") == addr
-    assert account.list_transports()[0]["addr"] == addr
-
-    for param in [
-        account.get_info()["used_account_settings"],
-        account.get_info()["entered_account_settings"],
-    ]:
-        assert addr in param
-        assert addr_upper not in param
-
-
 def test_configure_ip(acfactory) -> None:
-    addr, password = acfactory.get_credentials()
-    account = acfactory.get_unconfigured_account()
-    ip_address = socket.gethostbyname(addr.rsplit("@")[-1])
+    account = acfactory.new_preconfigured_account()

+    domain = account.get_config("addr").rsplit("@")[-1]
+    ip_address = socket.gethostbyname(domain)
+
+    # This should fail TLS check.
+    account.set_config("mail_server", ip_address)
    with pytest.raises(JsonRpcError):
-        account.add_or_update_transport(
-            {
-                "addr": addr,
-                "password": password,
-                # This should fail TLS check.
-                "imapServer": ip_address,
-            },
-        )
+        account.configure()


 def test_configure_alternative_port(acfactory) -> None:
    """Test that configuration with alternative port 443 works."""
-    addr, password = acfactory.get_credentials()
-    account = acfactory.get_unconfigured_account()
-    account.add_or_update_transport(
-        {
-            "addr": addr,
-            "password": password,
-            "imapPort": 443,
-            "smtpPort": 443,
-        },
-    )
-    assert account.is_configured()
+    account = acfactory.new_preconfigured_account()
+
+    account.set_config("mail_port", "443")
+    account.set_config("send_port", "443")
+
+    account.configure()


-def test_list_transports(acfactory) -> None:
-    addr, password = acfactory.get_credentials()
-    account = acfactory.get_unconfigured_account()
-    account.add_or_update_transport(
-        {
-            "addr": addr,
-            "password": password,
-            "imapUser": addr,
-        },
-    )
-    transports = account.list_transports()
-    assert len(transports) == 1
-    params = transports[0]
-    assert params["addr"] == addr
-    assert params["password"] == password
-    assert params["imapUser"] == addr
+def test_configure_username(acfactory) -> None:
+    account = acfactory.new_preconfigured_account()
+
+    addr = account.get_config("addr")
+    account.set_config("mail_user", addr)
+    account.configure()
+
+    assert account.get_config("configured_mail_user") == addr


 def test_account(acfactory) -> None:
    alice, bob = acfactory.get_online_accounts(2)

    bob_addr = bob.get_config("addr")
-    alice_contact_bob = alice.create_contact(bob, "Bob")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
    alice_chat_bob = alice_contact_bob.create_chat()
    alice_chat_bob.send_text("Hello!")

@@ -170,7 +126,7 @@ def test_account(acfactory) -> None:
    assert alice.get_size()
    assert alice.is_configured()
    assert not alice.get_avatar()
-    assert alice.get_contact_by_addr(bob_addr) is None  # There is no address-contact, only key-contact
+    assert alice.get_contact_by_addr(bob_addr) == alice_contact_bob
    assert alice.get_contacts()
    assert alice.get_contacts(snapshot=True)
    assert alice.self_contact
@@ -215,7 +171,8 @@ def test_account(acfactory) -> None:
 def test_chat(acfactory) -> None:
    alice, bob = acfactory.get_online_accounts(2)

-    alice_contact_bob = alice.create_contact(bob, "Bob")
+    bob_addr = bob.get_config("addr")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
    alice_chat_bob = alice_contact_bob.create_chat()
    alice_chat_bob.send_text("Hello!")

@@ -281,12 +238,13 @@ def test_contact(acfactory) -> None:
    alice, bob = acfactory.get_online_accounts(2)

    bob_addr = bob.get_config("addr")
-    alice_contact_bob = alice.create_contact(bob, "Bob")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")

    assert alice_contact_bob == alice.get_contact_by_id(alice_contact_bob.id)
    assert repr(alice_contact_bob)
    alice_contact_bob.block()
    alice_contact_bob.unblock()
+    alice_contact_bob.reset_encryption()
    alice_contact_bob.set_name("new name")
    alice_contact_bob.get_encryption_info()
    snapshot = alice_contact_bob.get_snapshot()
@@ -297,7 +255,8 @@ def test_contact(acfactory) -> None:
 def test_message(acfactory) -> None:
    alice, bob = acfactory.get_online_accounts(2)

-    alice_contact_bob = alice.create_contact(bob, "Bob")
+    bob_addr = bob.get_config("addr")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
    alice_chat_bob = alice_contact_bob.create_chat()
    alice_chat_bob.send_text("Hello!")

@@ -355,7 +314,8 @@ def test_reaction_seen_on_another_dev(acfactory) -> None:
    alice2 = alice.clone()
    alice2.start_io()

-    alice_contact_bob = alice.create_contact(bob, "Bob")
+    bob_addr = bob.get_config("addr")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
    alice_chat_bob = alice_contact_bob.create_chat()
    alice_chat_bob.send_text("Hello!")

@@ -372,7 +332,8 @@ def test_reaction_seen_on_another_dev(acfactory) -> None:
    alice2.clear_all_events()
    alice_chat_bob.mark_noticed()
    chat_id = alice2.wait_for_event(EventType.MSGS_NOTICED).chat_id
-    alice2_chat_bob = alice2.create_chat(bob)
+    alice2_contact_bob = alice2.get_contact_by_addr(bob_addr)
+    alice2_chat_bob = alice2_contact_bob.create_chat()
    assert chat_id == alice2_chat_bob.id


@@ -380,7 +341,8 @@ def test_is_bot(acfactory) -> None:
    """Test that we can recognize messages submitted by bots."""
    alice, bob = acfactory.get_online_accounts(2)

-    alice_contact_bob = alice.create_contact(bob, "Bob")
+    bob_addr = bob.get_config("addr")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
    alice_chat_bob = alice_contact_bob.create_chat()

    # Alice becomes a bot.
@@ -439,11 +401,9 @@ def test_wait_next_messages(acfactory) -> None:
    alice = acfactory.new_configured_account()

    # Create a bot account so it does not receive device messages in the beginning.
-    addr, password = acfactory.get_credentials()
-    bot = acfactory.get_unconfigured_account()
+    bot = acfactory.new_preconfigured_account()
    bot.set_config("bot", "1")
-    bot.add_or_update_transport({"addr": addr, "password": password})
-    assert bot.is_configured()
+    bot.configure()

    # There are no old messages and the call returns immediately.
    assert not bot.wait_next_messages()
@@ -452,7 +412,8 @@ def test_wait_next_messages(acfactory) -> None:
        # Bot starts waiting for messages.
        next_messages_task = executor.submit(bot.wait_next_messages)

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

@@ -476,7 +437,9 @@ def test_import_export_backup(acfactory, tmp_path) -> None:
 def test_import_export_keys(acfactory, tmp_path) -> None:
    alice, bob = acfactory.get_online_accounts(2)

-    alice_chat_bob = alice.create_chat(bob)
+    bob_addr = bob.get_config("addr")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
+    alice_chat_bob = alice_contact_bob.create_chat()
    alice_chat_bob.send_text("Hello Bob!")

    snapshot = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot()
@@ -526,7 +489,9 @@ def test_provider_info(rpc) -> None:
 def test_mdn_doesnt_break_autocrypt(acfactory) -> None:
    alice, bob = acfactory.get_online_accounts(2)

-    alice_contact_bob = alice.create_contact(bob, "Bob")
+    bob_addr = bob.get_config("addr")
+
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")

    # Bob creates chat manually so chat with Alice is accepted.
    alice_chat_bob = alice_contact_bob.create_chat()
@@ -622,13 +587,9 @@ def test_reactions_for_a_reordering_move(acfactory, direct_imap):
    messages they refer to and thus dropped.
    """
    (ac1,) = acfactory.get_online_accounts(1)
-
-    addr, password = acfactory.get_credentials()
-    ac2 = acfactory.get_unconfigured_account()
-    ac2.add_or_update_transport({"addr": addr, "password": password})
+    ac2 = acfactory.new_preconfigured_account()
+    ac2.configure()
    ac2.set_config("mvbox_move", "1")
-    assert ac2.is_configured()
-
    ac2.bring_online()
    chat1 = acfactory.get_accepted_chat(ac1, ac2)
    ac2.stop_io()
@@ -672,7 +633,9 @@ def test_download_limit_chat_assignment(acfactory, tmp_path, n_accounts):
        chat.send_text("Hello Alice!")
        assert alice.get_message_by_id(alice.wait_for_incoming_msg_event().msg_id).get_snapshot().text == "Hello Alice!"

-        contact = alice.create_contact(account)
+        contact_addr = account.get_config("addr")
+        contact = alice.create_contact(contact_addr, "")
+
        alice_group.add_contact(contact)

    if n_accounts == 2:
@@ -726,26 +689,6 @@ def test_markseen_contact_request(acfactory):
    assert message2.get_snapshot().state == MessageState.IN_SEEN


-def test_read_receipt(acfactory):
-    """
-    Test sending a read receipt and ensure it is attributed to the correct contact.
-    """
-    alice, bob = acfactory.get_online_accounts(2)
-
-    alice_chat_bob = alice.create_chat(bob)
-    alice_contact_bob = alice.create_contact(bob)
-    bob.create_chat(alice)  # Accept the chat
-
-    alice_chat_bob.send_text("Hello Bob!")
-    msg = bob.wait_for_incoming_msg()
-    msg.mark_seen()
-
-    read_msg = alice.get_message_by_id(alice.wait_for_event(EventType.MSG_READ).msg_id)
-    read_receipts = read_msg.get_read_receipts()
-    assert len(read_receipts) == 1
-    assert read_receipts[0].contact_id == alice_contact_bob.id
-
-
 def test_get_http_response(acfactory):
    alice = acfactory.new_configured_account()
    http_response = alice._rpc.get_http_response(alice.id, "https://example.org")
@@ -755,11 +698,12 @@ def test_get_http_response(acfactory):

 def test_configured_imap_certificate_checks(acfactory):
    alice = acfactory.new_configured_account()
+    configured_certificate_checks = alice.get_config("configured_imap_certificate_checks")

    # Certificate checks should be configured (not None)
-    assert "cert_automatic" in alice.get_info().used_account_settings
+    assert configured_certificate_checks

-    # "cert_old_automatic" is the value old Delta Chat core versions used
+    # 0 is the value old Delta Chat core versions used
    # to mean user entered "imap_certificate_checks=0" (Automatic)
    # and configuration failed to use strict TLS checks
    # so it switched strict TLS checks off.
@@ -770,7 +714,7 @@ def test_configured_imap_certificate_checks(acfactory):
    #
    # Core 1.142.4, 1.142.5 and 1.142.6 saved this value due to bug.
    # This test is a regression test to prevent this happening again.
-    assert "cert_old_automatic" not in alice.get_info().used_account_settings
+    assert configured_certificate_checks != "0"


 def test_no_old_msg_is_fresh(acfactory):
@@ -798,104 +742,3 @@ def test_no_old_msg_is_fresh(acfactory):
    assert ev.chat_id == first_msg.get_snapshot().chat_id
    assert ac1.create_chat(ac2).get_fresh_message_count() == 0
    assert len(list(ac1.get_fresh_messages())) == 0
-
-
-def test_rename_synchronization(acfactory):
-    """Test synchronization of contact renaming."""
-    alice, bob = acfactory.get_online_accounts(2)
-    alice2 = alice.clone()
-    alice2.bring_online()
-
-    bob.set_config("displayname", "Bob")
-    bob.create_chat(alice).send_text("Hello!")
-    alice_msg = alice.wait_for_incoming_msg().get_snapshot()
-    alice2_msg = alice2.wait_for_incoming_msg().get_snapshot()
-
-    assert alice2_msg.sender.get_snapshot().display_name == "Bob"
-    alice_msg.sender.set_name("Bobby")
-    alice2.wait_for_event(EventType.CONTACTS_CHANGED)
-    assert alice2_msg.sender.get_snapshot().display_name == "Bobby"
-
-
-def test_rename_group(acfactory):
-    """Test renaming the group."""
-    alice, bob = acfactory.get_online_accounts(2)
-
-    alice_group = alice.create_group("Test group")
-    alice_contact_bob = alice.create_contact(bob)
-    alice_group.add_contact(alice_contact_bob)
-    alice_group.send_text("Hello!")
-
-    bob_msg = bob.wait_for_incoming_msg()
-    bob_chat = bob_msg.get_snapshot().chat
-    assert bob_chat.get_basic_snapshot().name == "Test group"
-
-    for name in ["Baz", "Foo bar", "Xyzzy"]:
-        alice_group.set_name(name)
-        bob.wait_for_incoming_msg_event()
-        assert bob_chat.get_basic_snapshot().name == name
-
-
-def test_get_all_accounts_deadlock(rpc):
-    """Regression test for get_all_accounts deadlock."""
-    for _ in range(100):
-        all_accounts = rpc.get_all_accounts.future()
-        rpc.add_account()
-        all_accounts()
-
-
-def test_delete_deltachat_folder(acfactory, direct_imap):
-    """Test that DeltaChat folder is recreated if user deletes it manually."""
-    ac1 = acfactory.new_configured_account()
-    ac1.set_config("mvbox_move", "1")
-    ac1.bring_online()
-
-    ac1_direct_imap = direct_imap(ac1)
-    ac1_direct_imap.conn.folder.delete("DeltaChat")
-    assert "DeltaChat" not in ac1_direct_imap.list_folders()
-
-    # Wait until new folder is created and UIDVALIDITY is updated.
-    while True:
-        event = ac1.wait_for_event()
-        if event.kind == EventType.INFO and "uid/validity change folder DeltaChat" in event.msg:
-            break
-
-    ac2 = acfactory.get_online_account()
-    ac2.create_chat(ac1).send_text("hello")
-    msg = ac1.wait_for_incoming_msg().get_snapshot()
-    assert msg.text == "hello"
-
-    assert "DeltaChat" in ac1_direct_imap.list_folders()
-
-
-def test_broadcast(acfactory):
-    alice, bob = acfactory.get_online_accounts(2)
-
-    alice_chat = alice.create_broadcast("My great channel")
-    snapshot = alice_chat.get_basic_snapshot()
-    assert snapshot.name == "My great channel"
-    assert snapshot.is_unpromoted
-    assert snapshot.is_encrypted
-    assert snapshot.chat_type == ChatType.OUT_BROADCAST
-
-    alice_contact_bob = alice.create_contact(bob, "Bob")
-    alice_chat.add_contact(alice_contact_bob)
-
-    alice_msg = alice_chat.send_message(text="hello").get_snapshot()
-    assert alice_msg.text == "hello"
-    assert alice_msg.show_padlock
-
-    bob_msg = bob.wait_for_incoming_msg().get_snapshot()
-    assert bob_msg.text == "hello"
-    assert bob_msg.show_padlock
-    assert bob_msg.error is None
-
-    bob_chat = bob.get_chat_by_id(bob_msg.chat_id)
-    bob_chat_snapshot = bob_chat.get_basic_snapshot()
-    assert bob_chat_snapshot.name == "My great channel"
-    assert not bob_chat_snapshot.is_unpromoted
-    assert bob_chat_snapshot.is_encrypted
-    assert bob_chat_snapshot.chat_type == ChatType.IN_BROADCAST
-    assert bob_chat_snapshot.is_contact_request
-
-    assert not bob_chat.can_send()
--- a/deltachat-rpc-client/tests/test_vcard.py
+++ b/deltachat-rpc-client/tests/test_vcard.py
@@ -1,7 +1,8 @@
 def test_vcard(acfactory) -> None:
    alice, bob = acfactory.get_online_accounts(2)

-    alice_contact_bob = alice.create_contact(bob, "Bob")
+    bob_addr = bob.get_config("addr")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
    alice_contact_charlie = alice.create_contact("charlie@example.org", "Charlie")

    alice_chat_bob = alice_contact_bob.create_chat()
--- a/deltachat-rpc-client/tests/test_webxdc.py
+++ b/deltachat-rpc-client/tests/test_webxdc.py
@@ -1,7 +1,8 @@
 def test_webxdc(acfactory) -> None:
    alice, bob = acfactory.get_online_accounts(2)

-    alice_contact_bob = alice.create_contact(bob, "Bob")
+    bob_addr = bob.get_config("addr")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
    alice_chat_bob = alice_contact_bob.create_chat()
    alice_chat_bob.send_message(text="Let's play chess!", file="../test-data/webxdc/chess.xdc")

@@ -44,7 +45,8 @@ def test_webxdc(acfactory) -> None:
 def test_webxdc_insert_lots_of_updates(acfactory) -> None:
    alice, bob = acfactory.get_online_accounts(2)

-    alice_contact_bob = alice.create_contact(bob, "Bob")
+    bob_addr = bob.get_config("addr")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
    alice_chat_bob = alice_contact_bob.create_chat()
    message = alice_chat_bob.send_message(text="Let's play chess!", file="../test-data/webxdc/chess.xdc")

--- a/deltachat-rpc-client/tox.ini
+++ b/deltachat-rpc-client/tox.ini
@@ -12,8 +12,11 @@ setenv =
    RUST_MIN_STACK=8388608
 passenv =
    CHATMAIL_DOMAIN
-dependency_groups =
-    dev
+deps =
+    pytest
+    pytest-timeout
+    pytest-xdist
+    imap-tools

 [testenv:lint]
 skipsdist = True
@@ -21,7 +24,7 @@ skip_install = True
 deps =
    ruff
 commands =
-    ruff format --diff src/ examples/ tests/
+    ruff format --quiet --diff src/ examples/ tests/
    ruff check src/ examples/ tests/

 [pytest]
--- a/deltachat-rpc-server/Cargo.toml
+++ b/deltachat-rpc-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "2.0.0"
+version = "1.157.3"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"
--- a/deltachat-rpc-server/npm-package/package.json
+++ b/deltachat-rpc-server/npm-package/package.json
@@ -15,5 +15,5 @@
  },
  "type": "module",
  "types": "index.d.ts",
-  "version": "2.0.0"
+  "version": "1.157.3"
 }
--- a/deltachat-rpc-server/src/main.rs
+++ b/deltachat-rpc-server/src/main.rs
@@ -30,7 +30,7 @@ async fn main() {
    // thread, and it is impossible to cancel that read. This can make shutdown of the runtime hang
    // until the user presses enter."
    if let Err(error) = &r {
-        log::error!("Error: {error:#}.")
+        log::error!("Fatal error: {error:#}.")
    }
    std::process::exit(if r.is_ok() { 0 } else { 1 });
 }
@@ -73,7 +73,7 @@ async fn main_impl() -> Result<()> {
        .init();

    let path = std::env::var("DC_ACCOUNTS_PATH").unwrap_or_else(|_| "accounts".to_string());
-    log::info!("Starting with accounts directory `{path}`.");
+    log::info!("Starting with accounts directory `{}`.", path);
    let writable = true;
    let accounts = Accounts::new(PathBuf::from(&path), writable).await?;

@@ -97,7 +97,7 @@ async fn main_impl() -> Result<()> {
                    Some(message) => serde_json::to_string(&message)?,
                }
            };
-            log::trace!("RPC send {message}");
+            log::trace!("RPC send {}", message);
            println!("{message}");
        }
        Ok(())
@@ -141,7 +141,7 @@ async fn main_impl() -> Result<()> {
                    Some(message) => message,
                }
            };
-            log::trace!("RPC recv {message}");
+            log::trace!("RPC recv {}", message);
            let session = session.clone();
            tokio::spawn(async move {
                session.handle_incoming(&message).await;
--- a/deny.toml
+++ b/deny.toml
@@ -10,6 +10,9 @@ ignore = [
    # Unmaintained instant
    "RUSTSEC-2024-0384",

+    # Unmaintained backoff
+    "RUSTSEC-2025-0012",
+
    # Unmaintained paste
    "RUSTSEC-2024-0436",
 ]
@@ -21,35 +24,34 @@ ignore = [
 # Please keep this list alphabetically sorted.
 skip = [
     { name = "async-channel", version = "1.9.0" },
+     { name = "base64", version = "<0.21" },
+     { name = "base64", version = "0.21.7" },
     { name = "bitflags", version = "1.3.2" },
-     { name = "derive_more-impl", version = "1.0.0" },
-     { name = "derive_more", version = "1.0.0" },
+     { name = "core-foundation", version = "0.9.4" },
     { name = "event-listener", version = "2.5.3" },
     { name = "generator", version = "0.7.5" },
     { name = "getrandom", version = "0.2.12" },
-     { name = "hashbrown", version = "0.14.5" },
     { name = "heck", version = "0.4.1" },
     { name = "http", version = "0.2.12" },
-     { name = "linux-raw-sys", version = "0.4.14" },
     { name = "loom", version = "0.5.6" },
-     { name = "lru", version = "0.12.3" },
     { name = "netlink-packet-route", version = "0.17.1" },
-     { name = "nom", version = "7.1.3" },
+     { name = "nix", version = "0.26.4" },
+     { name = "nix", version = "0.27.1" },
+     { name = "quick-error", version = "<2.0" },
     { name = "rand_chacha", version = "0.3.1" },
     { name = "rand_core", version = "0.6.4" },
     { name = "rand", version = "0.8.5" },
     { name = "redox_syscall", version = "0.3.5" },
-     { name = "redox_syscall", version = "0.4.1" },
     { name = "regex-automata", version = "0.1.10" },
     { name = "regex-syntax", version = "0.6.29" },
-     { name = "rustix", version = "0.38.44" },
-     { name = "serdect", version = "0.2.0" },
-     { name = "spin", version = "0.9.8" },
+     { name = "rtnetlink", version = "0.13.1" },
+     { name = "security-framework", version = "2.11.1" },
     { name = "strum_macros", version = "0.26.2" },
     { name = "strum", version = "0.26.2" },
     { name = "syn", version = "1.0.109" },
     { name = "thiserror-impl", version = "1.0.69" },
     { name = "thiserror", version = "1.0.69" },
+     { name = "unicode-width", version = "0.1.11" },
     { name = "wasi", version = "0.11.0+wasi-snapshot-preview1" },
     { name = "windows" },
     { name = "windows_aarch64_gnullvm" },
@@ -84,7 +86,6 @@ allow = [
    "MPL-2.0",
    "Unicode-3.0",
    "Unicode-DFS-2016",
-    "Unlicense",
    "Zlib",
 ]

--- a/flake.lock
+++ b/flake.lock
@@ -47,11 +47,11 @@
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1747291057,
-        "narHash": "sha256-9Wir6aLJAeJKqdoQUiwfKdBn7SyNXTJGRSscRyVOo2Y=",
+        "lastModified": 1737527504,
+        "narHash": "sha256-Z8S5gLPdIYeKwBXDaSxlJ72ZmiilYhu3418h3RSQZA0=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "76ffc1b7b3ec8078fe01794628b6abff35cbda8f",
+        "rev": "aa13f23e3e91b95377a693ac655bbc6545ebec0d",
        "type": "github"
      },
      "original": {
@@ -147,11 +147,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1747179050,
-        "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
+        "lastModified": 1737469691,
+        "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
+        "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
        "type": "github"
      },
      "original": {
@@ -175,11 +175,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1747179050,
-        "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
+        "lastModified": 1731139594,
+        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
+        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
        "type": "github"
      },
      "original": {
@@ -202,11 +202,11 @@
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1746889290,
-        "narHash": "sha256-h3LQYZgyv2l3U7r+mcsrEOGRldaK0zJFwAAva4hV/6g=",
+        "lastModified": 1737453499,
+        "narHash": "sha256-fa5AJI9mjFU2oVXqdCq2oA2pripAXbHzkUkewJRQpxA=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "2bafe9d96c6734aacfd49e115f6cf61e7adc68bc",
+        "rev": "0b68402d781955d526b80e5d479e9e47addb4075",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -584,9 +584,6 @@
              cargo-nextest
              perl # needed to build vendored OpenSSL
              git-cliff
-              (python3.withPackages (pypkgs: with pypkgs; [
-                tox
-              ]))
            ];
          };
      }
--- a/fuzz/Cargo.toml
+++ b/fuzz/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 license = "MPL-2.0"

 [dev-dependencies]
-bolero = "0.13.3"
+bolero = "0.8"

 [dependencies]
 mailparse = { workspace = true }
--- a/python/examples/group_tracking.py
+++ b/python/examples/group_tracking.py
@@ -0,0 +1,49 @@
+# content of group_tracking.py
+
+from deltachat import account_hookimpl, run_cmdline
+
+
+class GroupTrackingPlugin:
+    @account_hookimpl
+    def ac_incoming_message(self, message):
+        print("process_incoming message", message)
+        if message.text.strip() == "/quit":
+            message.account.shutdown()
+        else:
+            # unconditionally accept the chat
+            message.create_chat()
+            addr = message.get_sender_contact().addr
+            text = message.text
+            message.chat.send_text(f"echoing from {addr}:\n{text}")
+
+    @account_hookimpl
+    def ac_outgoing_message(self, message):
+        print("ac_outgoing_message:", message)
+
+    @account_hookimpl
+    def ac_configure_completed(self, success):
+        print("ac_configure_completed:", success)
+
+    @account_hookimpl
+    def ac_chat_modified(self, chat):
+        print("ac_chat_modified:", chat.id, chat.get_name())
+        for member in chat.get_contacts():
+            print(f"chat member: {member.addr}")
+
+    @account_hookimpl
+    def ac_member_added(self, chat, contact, actor, message):
+        print(f"ac_member_added {contact.addr} to chat {chat.id} from {actor or message.get_sender_contact().addr}")
+        for member in chat.get_contacts():
+            print(f"chat member: {member.addr}")
+
+    @account_hookimpl
+    def ac_member_removed(self, chat, contact, actor, message):
+        print(f"ac_member_removed {contact.addr} from chat {chat.id} by {actor or message.get_sender_contact().addr}")
+
+
+def main(argv=None):
+    run_cmdline(argv=argv, account_plugins=[GroupTrackingPlugin()])
+
+
+if __name__ == "__main__":
+    main()
--- a/python/examples/test_examples.py
+++ b/python/examples/test_examples.py
@@ -1,7 +1,10 @@
 import echo_and_quit
+import group_tracking
 import py
 import pytest

+from deltachat.events import FFIEventLogger
+

@pytest.fixture(scope="session")
 def datadir():
@@ -22,8 +25,8 @@ def test_echo_quit_plugin(acfactory, lp):
    (ac1,) = acfactory.get_online_accounts(1)

    lp.sec("sending a message to the bot")
-    bot_chat = ac1.qr_setup_contact(botproc.qr)
-    ac1._evtracker.wait_securejoin_joiner_progress(1000)
+    bot_contact = ac1.create_contact(botproc.addr)
+    bot_chat = bot_contact.create_chat()
    bot_chat.send_text("hello")

    lp.sec("waiting for the reply message from the bot to arrive")
@@ -33,3 +36,53 @@ def test_echo_quit_plugin(acfactory, lp):
    lp.sec("send quit sequence")
    bot_chat.send_text("/quit")
    botproc.wait()
+
+
+def test_group_tracking_plugin(acfactory, lp):
+    lp.sec("creating one group-tracking bot and two temp accounts")
+    botproc = acfactory.run_bot_process(group_tracking)
+
+    ac1, ac2 = acfactory.get_online_accounts(2)
+
+    ac1.add_account_plugin(FFIEventLogger(ac1))
+    ac2.add_account_plugin(FFIEventLogger(ac2))
+
+    lp.sec("creating bot test group with bot")
+    bot_contact = ac1.create_contact(botproc.addr)
+    ch = ac1.create_group_chat("bot test group")
+    ch.add_contact(bot_contact)
+    ch.send_text("hello")
+
+    botproc.fnmatch_lines(
+        """
+        *ac_chat_modified*bot test group*
+    """,
+    )
+
+    lp.sec("adding third member {}".format(ac2.get_config("addr")))
+    contact3 = ac1.create_contact(ac2.get_config("addr"))
+    ch.add_contact(contact3)
+
+    reply = ac1._evtracker.wait_next_incoming_message()
+    assert "hello" in reply.text
+
+    lp.sec("now looking at what the bot received")
+    botproc.fnmatch_lines(
+        """
+        *ac_member_added {}*from*{}*
+    """.format(
+            contact3.addr,
+            ac1.get_config("addr"),
+        ),
+    )
+
+    lp.sec("contact successfully added, now removing")
+    ch.remove_contact(contact3)
+    botproc.fnmatch_lines(
+        """
+        *ac_member_removed {}*from*{}*
+    """.format(
+            contact3.addr,
+            ac1.get_config("addr"),
+        ),
+    )
--- a/python/pyproject.toml
+++ b/python/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "deltachat"
-version = "2.0.0"
+version = "1.157.3"
 description = "Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat"
 readme = "README.rst"
 requires-python = ">=3.8"
@@ -47,10 +47,6 @@ 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"]
-lint.ignore = [
-  "PLC0415", # `import` should be at the top-level of a file
-  "PLW1641" # Object does not implement `__hash__` method
-]
 line-length = 120

 [tool.isort]
--- a/python/src/deltachat/init.py
+++ b/python/src/deltachat/init.py
@@ -55,8 +55,6 @@ def run_cmdline(argv=None, account_plugins=None):
    args = parser.parse_args(argv[1:])

    ac = Account(args.db)
-    qr = ac.get_setup_contact_qr()
-    print(qr)

    ac.run_account(addr=args.email, password=args.password, account_plugins=account_plugins, show_ffi=args.show_ffi)

--- a/python/src/deltachat/account.py
+++ b/python/src/deltachat/account.py
@@ -280,12 +280,6 @@ class Account:
        :param name: (optional) display name for this contact
        :returns: :class:`deltachat.contact.Contact` instance.
        """
-        if isinstance(obj, Account):
-            if not obj.is_configured():
-                raise ValueError("Can only add configured accounts as contacts")
-            assert name is None
-            vcard = obj.get_self_contact().make_vcard()
-            return self.import_vcard(vcard)[0]
        (name, addr) = self.get_contact_addr_and_name(obj, name)
        name_c = as_dc_charpointer(name)
        addr_c = as_dc_charpointer(addr)
@@ -293,8 +287,6 @@ class Account:
        return Contact(self, contact_id)

    def get_contact(self, obj) -> Optional[Contact]:
-        if isinstance(obj, Account):
-            return self.create_contact(obj)
        if isinstance(obj, Contact):
            return obj
        (_, addr) = self.get_contact_addr_and_name(obj)
@@ -357,26 +349,25 @@ class Account:
        self,
        query: Optional[str] = None,
        with_self: bool = False,
+        only_verified: bool = False,
    ) -> List[Contact]:
        """get a (filtered) list of contacts.

        :param query: if a string is specified, only return contacts
                      whose name or e-mail matches query.
+        :param only_verified: if true only return verified contacts.
        :param with_self: if true the self-contact is also returned.
        :returns: list of :class:`deltachat.contact.Contact` objects.
        """
        flags = 0
        query_c = as_dc_charpointer(query)
+        if only_verified:
+            flags |= const.DC_GCL_VERIFIED_ONLY
        if with_self:
            flags |= const.DC_GCL_ADD_SELF
        dc_array = ffi.gc(lib.dc_get_contacts(self._dc_context, flags, query_c), lib.dc_array_unref)
        return list(iter_array(dc_array, lambda x: Contact(self, x)))

-    def import_vcard(self, vcard):
-        """Import a vCard and return an array of contacts."""
-        dc_array = ffi.gc(lib.dc_import_vcard(self._dc_context, as_dc_charpointer(vcard)), lib.dc_array_unref)
-        return list(iter_array(dc_array, lambda x: Contact(self, x)))
-
    def get_fresh_messages(self) -> Generator[Message, None, None]:
        """yield all fresh messages from all chats."""
        dc_array = ffi.gc(lib.dc_get_fresh_msgs(self._dc_context), lib.dc_array_unref)
--- a/python/src/deltachat/chat.py
+++ b/python/src/deltachat/chat.py
@@ -417,13 +417,7 @@ class Chat:
        :raises ValueError: if contact could not be added
        :returns: None
        """
-        from .contact import Contact
-
-        if isinstance(obj, Contact):
-            contact = obj
-        else:
-            contact = self.account.create_contact(obj)
-
+        contact = self.account.create_contact(obj)
        ret = lib.dc_add_contact_to_chat(self.account._dc_context, self.id, contact.id)
        if ret != 1:
            raise ValueError(f"could not add contact {contact!r} to chat")
--- a/python/src/deltachat/contact.py
+++ b/python/src/deltachat/contact.py
@@ -90,14 +90,6 @@ class Contact:
        dc_res = lib.dc_contact_get_profile_image(self._dc_contact)
        return from_optional_dc_charpointer(dc_res)

-    def make_vcard(self) -> str:
-        """Make a contact vCard.
-
-        :returns: vCard
-        """
-        dc_context = self.account._dc_context
-        return from_dc_charpointer(lib.dc_make_vcard(dc_context, self.id))
-
    @property
    def status(self):
        """Get contact status.
--- a/python/src/deltachat/events.py
+++ b/python/src/deltachat/events.py
@@ -13,6 +13,7 @@ from .account import Account
 from .capi import ffi, lib
 from .cutil import from_optional_dc_charpointer
 from .hookspec import account_hookimpl
+from .message import map_system_message


 def get_dc_event_name(integer, _DC_EVENTNAME_MAP={}):
@@ -303,15 +304,21 @@ class EventThread(threading.Thread):
        elif name == "DC_EVENT_INCOMING_MSG":
            msg = account.get_message_by_id(ffi_event.data2)
            if msg is not None:
-                yield ("ac_incoming_message", {"message": msg})
+                yield map_system_message(msg) or ("ac_incoming_message", {"message": msg})
        elif name == "DC_EVENT_MSGS_CHANGED":
            if ffi_event.data2 != 0:
                msg = account.get_message_by_id(ffi_event.data2)
                if msg is not None:
                    if msg.is_outgoing():
+                        res = map_system_message(msg)
+                        if res and res[0].startswith("ac_member"):
+                            yield res
                        yield "ac_outgoing_message", {"message": msg}
                    elif msg.is_in_fresh():
-                        yield "ac_incoming_message", {"message": msg}
+                        yield map_system_message(msg) or (
+                            "ac_incoming_message",
+                            {"message": msg},
+                        )
        elif name == "DC_EVENT_REACTIONS_CHANGED":
            assert ffi_event.data1 > 0
            msg = account.get_message_by_id(ffi_event.data2)
--- a/python/src/deltachat/message.py
+++ b/python/src/deltachat/message.py
@@ -2,6 +2,7 @@

 import json
 import os
+import re
 from datetime import datetime, timezone
 from typing import Optional, Union

@@ -503,3 +504,56 @@ def get_viewtype_code_from_name(view_type_name):
    raise ValueError(
        f"message typecode not found for {view_type_name!r}, available {list(_view_type_mapping.keys())!r}",
    )
+
+
+#
+# some helper code for turning system messages into hook events
+#
+
+
+def map_system_message(msg):
+    if msg.is_system_message():
+        res = parse_system_add_remove(msg.text)
+        if not res:
+            return None
+        action, affected, actor = res
+        affected = msg.account.get_contact_by_addr(affected)
+        actor = None if actor == "me" else msg.account.get_contact_by_addr(actor)
+        d = {"chat": msg.chat, "contact": affected, "actor": actor, "message": msg}
+        return "ac_member_" + res[0], d
+
+
+def extract_addr(text):
+    m = re.match(r".*\((.+@.+)\)", text)
+    if m:
+        text = m.group(1)
+    text = text.rstrip(".")
+    return text.strip()
+
+
+def parse_system_add_remove(text):
+    """return add/remove info from parsing the given system message text.
+
+    returns a (action, affected, actor) triple
+    """
+    # You removed member a@b.
+    # You added member a@b.
+    # Member Me (x@y) removed by a@b.
+    # Member x@y added by a@b
+    # Member With space (tmp1@x.org) removed by tmp2@x.org.
+    # Member With space (tmp1@x.org) removed by Another member (tmp2@x.org).",
+    # Group left by some one (tmp1@x.org).
+    # Group left by tmp1@x.org.
+    text = text.lower()
+    m = re.match(r"member (.+) (removed|added) by (.+)", text)
+    if m:
+        affected, action, actor = m.groups()
+        return action, extract_addr(affected), extract_addr(actor)
+    m = re.match(r"you (removed|added) member (.+)", text)
+    if m:
+        action, affected = m.groups()
+        return action, extract_addr(affected), "me"
+    if text.startswith("group left by "):
+        addr = extract_addr(text[13:])
+        if addr:
+            return "removed", addr, addr
--- a/python/src/deltachat/testplugin.py
+++ b/python/src/deltachat/testplugin.py
@@ -482,8 +482,12 @@ class ACFactory:
        addr = f"{acname}@offline.org"
        ac.update_config(
            {
-                "configured_addr": addr,
+                "addr": addr,
                "displayname": acname,
+                "mail_pw": "123",
+                "configured_addr": addr,
+                "configured_mail_pw": "123",
+                "configured": "1",
            },
        )
        self._preconfigure_key(ac)
@@ -645,9 +649,6 @@ class BotProcess:

    def __init__(self, popen, addr) -> None:
        self.popen = popen
-
-        # The first thing the bot prints to stdout is an invite link.
-        self.qr = self.popen.stdout.readline()
        self.addr = addr

        # we read stdout as quickly as we can in a thread and make
--- a/python/tests/test_0_complex_or_slow.py
+++ b/python/tests/test_0_complex_or_slow.py
@@ -1,6 +1,7 @@
 import sys
 import time

+import pytest
 import deltachat as dc


@@ -16,6 +17,8 @@ class TestGroupStressTests:
        lp.sec("ac1: send message to new group chat")
        msg1 = chat.send_text("hello")
        assert msg1.is_encrypted()
+        gossiped_timestamp = chat.get_summary()["gossiped_timestamp"]
+        assert gossiped_timestamp > 0

        assert chat.num_contacts() == 3 + 1

@@ -44,13 +47,19 @@ class TestGroupStressTests:
        assert to_remove.addr in sysmsg.text
        assert sysmsg.chat.num_contacts() == 3

+        # Receiving message about removed contact does not reset gossip
+        assert chat.get_summary()["gossiped_timestamp"] == gossiped_timestamp
+
        lp.sec("ac1: sending another message to the chat")
        chat.send_text("hello2")
        msg = ac2._evtracker.wait_next_incoming_message()
        assert msg.text == "hello2"
+        assert chat.get_summary()["gossiped_timestamp"] == gossiped_timestamp

        lp.sec("ac1: adding fifth member to the chat")
        chat.add_contact(ac5)
+        # Adding contact to chat resets gossiped_timestamp
+        assert chat.get_summary()["gossiped_timestamp"] >= gossiped_timestamp

        lp.sec("ac2: receiving system message about contact addition")
        sysmsg = ac2._evtracker.wait_next_incoming_message()
@@ -187,6 +196,195 @@ def test_qr_verified_group_and_chatting(acfactory, lp):
    assert msg.is_encrypted()


+@pytest.mark.parametrize("mvbox_move", [False, True])
+def test_fetch_existing(acfactory, lp, mvbox_move):
+    """Delta Chat reads the recipients from old emails sent by the user and adds them as contacts.
+    This way, we can already offer them some email addresses they can write to.
+
+    Also, the newest existing emails from each folder are fetched during onboarding.
+
+    Additionally tests that bcc_self messages moved to the mvbox/sentbox are marked as read."""
+
+    def assert_folders_configured(ac):
+        """There was a bug that scan_folders() set the configured folders to None under some circumstances.
+        So, check that they are still configured:"""
+        assert ac.get_config("configured_sentbox_folder") == "Sent"
+        if mvbox_move:
+            assert ac.get_config("configured_mvbox_folder")
+
+    ac1 = acfactory.new_online_configuring_account(mvbox_move=mvbox_move)
+    ac2 = acfactory.new_online_configuring_account()
+    acfactory.wait_configured(ac1)
+    ac1.direct_imap.create_folder("Sent")
+    ac1.set_config("sentbox_watch", "1")
+
+    # We need to reconfigure to find the new "Sent" folder.
+    # `scan_folders()`, which runs automatically shortly after `start_io()` is invoked,
+    # would also find the "Sent" folder, but it would be too late:
+    # The sentbox thread, started by `start_io()`, would have seen that there is no
+    # ConfiguredSentboxFolder and do nothing.
+    acfactory._acsetup.start_configure(ac1)
+    acfactory.bring_accounts_online()
+    assert_folders_configured(ac1)
+
+    lp.sec("send out message with bcc to ourselves")
+    ac1.set_config("bcc_self", "1")
+    chat = acfactory.get_accepted_chat(ac1, ac2)
+    chat.send_text("message text")
+
+    lp.sec("wait until the bcc_self message arrives in correct folder and is marked seen")
+    if mvbox_move:
+        ac1._evtracker.get_info_contains("Marked messages [0-9]+ in folder DeltaChat as seen.")
+    else:
+        ac1._evtracker.get_info_contains("Marked messages [0-9]+ in folder INBOX as seen.")
+    assert_folders_configured(ac1)
+
+    lp.sec("create a cloned ac1 and fetch contact history during configure")
+    ac1_clone = acfactory.new_online_configuring_account(cloned_from=ac1)
+    ac1_clone.set_config("fetch_existing_msgs", "1")
+    acfactory.wait_configured(ac1_clone)
+    ac1_clone.start_io()
+    assert_folders_configured(ac1_clone)
+
+    lp.sec("check that ac2 contact was fetched during configure")
+    ac1_clone._evtracker.get_matching("DC_EVENT_CONTACTS_CHANGED")
+    ac2_addr = ac2.get_config("addr")
+    assert any(c.addr == ac2_addr for c in ac1_clone.get_contacts())
+    assert_folders_configured(ac1_clone)
+
+    lp.sec("check that messages changed events arrive for the correct message")
+    msg = ac1_clone._evtracker.wait_next_messages_changed()
+    assert msg.text == "message text"
+    assert_folders_configured(ac1)
+    assert_folders_configured(ac1_clone)
+
+
+def test_fetch_existing_msgs_group_and_single(acfactory, lp):
+    """There was a bug concerning fetch-existing-msgs:
+
+    A sent a message to you, adding you to a group. This created a contact request.
+    You wrote a message to A, creating a chat.
+    ...but the group stayed blocked.
+    So, after fetch-existing-msgs you have one contact request and one chat with the same person.
+
+    See https://github.com/deltachat/deltachat-core-rust/issues/2097"""
+    ac1 = acfactory.new_online_configuring_account()
+    ac2 = acfactory.new_online_configuring_account()
+
+    acfactory.bring_accounts_online()
+
+    lp.sec("receive a message")
+    ac2.create_group_chat("group name", contacts=[ac1]).send_text("incoming, unencrypted group message")
+    ac1._evtracker.wait_next_incoming_message()
+
+    lp.sec("send out message with bcc to ourselves")
+    ac1.set_config("bcc_self", "1")
+    ac1_ac2_chat = ac1.create_chat(ac2)
+    ac1_ac2_chat.send_text("outgoing, encrypted direct message, creating a chat")
+
+    # wait until the bcc_self message arrives
+    ac1._evtracker.get_info_contains("Marked messages [0-9]+ in folder INBOX as seen.")
+
+    lp.sec("Clone online account and let it fetch the existing messages")
+    ac1_clone = acfactory.new_online_configuring_account(cloned_from=ac1)
+    ac1_clone.set_config("fetch_existing_msgs", "1")
+    acfactory.wait_configured(ac1_clone)
+
+    ac1_clone.start_io()
+    ac1_clone._evtracker.wait_idle_inbox_ready()
+
+    chats = ac1_clone.get_chats()
+    assert len(chats) == 4  # two newly created chats + self-chat + device-chat
+    group_chat = [c for c in chats if c.get_name() == "group name"][0]
+    assert group_chat.is_group()
+    (private_chat,) = [c for c in chats if c.get_name() == ac1_ac2_chat.get_name()]
+    assert not private_chat.is_group()
+
+    group_messages = group_chat.get_messages()
+    assert len(group_messages) == 1
+    assert group_messages[0].text == "incoming, unencrypted group message"
+    private_messages = private_chat.get_messages()
+    # We can't decrypt the message in this chat, so the chat is empty:
+    assert len(private_messages) == 0
+
+
+def test_undecipherable_group(acfactory, lp):
+    """Test how group messages that cannot be decrypted are
+    handled.
+
+    Group name is encrypted and plaintext subject is set to "..." in
+    this case, so we should assign the messages to existing chat
+    instead of creating a new one. Since there is no existing group
+    chat, the messages should be assigned to 1-1 chat with the sender
+    of the message.
+    """
+
+    lp.sec("creating and configuring three accounts")
+    ac1, ac2, ac3 = acfactory.get_online_accounts(3)
+
+    acfactory.introduce_each_other([ac1, ac2, ac3])
+
+    lp.sec("ac3 reinstalls DC and generates a new key")
+    ac3.stop_io()
+    acfactory.remove_preconfigured_keys()
+    ac4 = acfactory.new_online_configuring_account(cloned_from=ac3)
+    acfactory.wait_configured(ac4)
+    # Create contacts to make sure incoming messages are not treated as contact requests
+    chat41 = ac4.create_chat(ac1)
+    chat42 = ac4.create_chat(ac2)
+    ac4.start_io()
+    ac4._evtracker.wait_idle_inbox_ready()
+
+    lp.sec("ac1: creating group chat with 2 other members")
+    chat = ac1.create_group_chat("title", contacts=[ac2, ac3])
+
+    lp.sec("ac1: send message to new group chat")
+    msg = chat.send_text("hello")
+
+    lp.sec("ac2: checking that the chat arrived correctly")
+    msg = ac2._evtracker.wait_next_incoming_message()
+    assert msg.text == "hello"
+    assert msg.is_encrypted(), "Message is not encrypted"
+
+    # ac4 cannot decrypt the message.
+    # Error message should be assigned to the chat with ac1.
+    lp.sec("ac4: checking that message is assigned to the sender chat")
+    error_msg = ac4._evtracker.wait_next_incoming_message()
+    assert error_msg.error  # There is an error decrypting the message
+    assert error_msg.chat == chat41
+
+    lp.sec("ac2: sending a reply to the chat")
+    msg.chat.send_text("reply")
+    reply = ac1._evtracker.wait_next_incoming_message()
+    assert reply.text == "reply"
+    assert reply.is_encrypted(), "Reply is not encrypted"
+
+    lp.sec("ac4: checking that reply is assigned to ac2 chat")
+    error_reply = ac4._evtracker.wait_next_incoming_message()
+    assert error_reply.error  # There is an error decrypting the message
+    assert error_reply.chat == chat42
+
+    # Test that ac4 replies to error messages don't appear in the
+    # group chat on ac1 and ac2.
+    lp.sec("ac4: replying to ac1 and ac2")
+
+    # Otherwise reply becomes a contact request.
+    chat41.send_text("I can't decrypt your message, ac1!")
+    chat42.send_text("I can't decrypt your message, ac2!")
+
+    msg = ac1._evtracker.wait_next_incoming_message()
+    assert msg.error is None
+    assert msg.text == "I can't decrypt your message, ac1!"
+    assert msg.is_encrypted(), "Message is not encrypted"
+    assert msg.chat == ac1.create_chat(ac3)
+
+    msg = ac2._evtracker.wait_next_incoming_message()
+    assert msg.error is None
+    assert msg.text == "I can't decrypt your message, ac2!"
+    assert msg.is_encrypted(), "Message is not encrypted"
+    assert msg.chat == ac2.create_chat(ac4)
+
+
 def test_ephemeral_timer(acfactory, lp):
    ac1, ac2 = acfactory.get_online_accounts(2)

@@ -246,6 +444,63 @@ def test_ephemeral_timer(acfactory, lp):
    assert chat1.get_ephemeral_timer() == 0


+def test_multidevice_sync_seen(acfactory, lp):
+    """Test that message marked as seen on one device is marked as seen on another."""
+    ac1 = acfactory.new_online_configuring_account()
+    ac2 = acfactory.new_online_configuring_account()
+    ac1_clone = acfactory.new_online_configuring_account(cloned_from=ac1)
+    acfactory.bring_accounts_online()
+
+    ac1.set_config("bcc_self", "1")
+    ac1_clone.set_config("bcc_self", "1")
+
+    ac1_chat = ac1.create_chat(ac2)
+    ac1_clone_chat = ac1_clone.create_chat(ac2)
+    ac2_chat = ac2.create_chat(ac1)
+
+    lp.sec("Send a message from ac2 to ac1 and check that it's 'fresh'")
+    ac2_chat.send_text("Hi")
+    ac1_message = ac1._evtracker.wait_next_incoming_message()
+    ac1_clone_message = ac1_clone._evtracker.wait_next_incoming_message()
+    assert ac1_chat.count_fresh_messages() == 1
+    assert ac1_clone_chat.count_fresh_messages() == 1
+    assert ac1_message.is_in_fresh
+    assert ac1_clone_message.is_in_fresh
+
+    lp.sec("ac1 marks message as seen on the first device")
+    ac1.mark_seen_messages([ac1_message])
+    assert ac1_message.is_in_seen
+
+    lp.sec("ac1 clone detects that message is marked as seen")
+    ev = ac1_clone._evtracker.get_matching("DC_EVENT_MSGS_NOTICED")
+    assert ev.data1 == ac1_clone_chat.id
+    assert ac1_clone_message.is_in_seen
+
+    lp.sec("Send an ephemeral message from ac2 to ac1")
+    ac2_chat.set_ephemeral_timer(60)
+    ac1._evtracker.get_matching("DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED")
+    ac1._evtracker.wait_next_incoming_message()
+    ac1_clone._evtracker.get_matching("DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED")
+    ac1_clone._evtracker.wait_next_incoming_message()
+
+    ac2_chat.send_text("Foobar")
+    ac1_message = ac1._evtracker.wait_next_incoming_message()
+    ac1_clone_message = ac1_clone._evtracker.wait_next_incoming_message()
+    assert "Ephemeral timer: 60\n" in ac1_message.get_message_info()
+    assert "Expires: " not in ac1_clone_message.get_message_info()
+    assert "Ephemeral timer: 60\n" in ac1_message.get_message_info()
+    assert "Expires: " not in ac1_clone_message.get_message_info()
+
+    ac1.mark_seen_messages([ac1_message])
+    assert ac1_message.is_in_seen
+    assert "Expires: " in ac1_message.get_message_info()
+    ev = ac1_clone._evtracker.get_matching("DC_EVENT_MSGS_NOTICED")
+    assert ev.data1 == ac1_clone_chat.id
+    assert ac1_clone_message.is_in_seen
+    # Test that the timer is started on the second device after synchronizing the seen status.
+    assert "Expires: " in ac1_clone_message.get_message_info()
+
+
 def test_see_new_verified_member_after_going_online(acfactory, tmp_path, lp):
    """The test for the bug #3836:
    - Alice has two devices, the second is offline.
@@ -357,10 +612,9 @@ def test_verified_group_vs_delete_server_after(acfactory, tmp_path, lp):
    - First device of the user downloads "member added" from the group.
    - First device removes "member added" from the server.
    - Some new messages are sent to the group.
-    - Second device comes online, receives these new messages.
-      The result is an unverified group with unverified members.
+    - Second device comes online, receives these new messages. The result is a verified group with unverified members.
    - First device re-gossips Autocrypt keys to the group.
-    - Now the second device has all members and group verified.
+    - Now the seconds device has all members verified.
    """
    ac1, ac2 = acfactory.get_online_accounts(2)
    acfactory.remove_preconfigured_keys()
@@ -398,12 +652,12 @@ def test_verified_group_vs_delete_server_after(acfactory, tmp_path, lp):
    ac2_offl.start_io()
    msg_in = ac2_offl._evtracker.wait_next_incoming_message()
    assert not msg_in.is_system_message()
-    assert msg_in.text == "hi"
+    assert msg_in.text.startswith("[The message was sent with non-verified encryption")
    ac2_offl_ac1_contact = msg_in.get_sender_contact()
    assert ac2_offl_ac1_contact.addr == ac1.get_config("addr")
    assert not ac2_offl_ac1_contact.is_verified()
    chat2_offl = msg_in.chat
-    assert not chat2_offl.is_protected()
+    assert chat2_offl.is_protected()

    lp.sec("ac2: sending message re-gossiping Autocrypt keys")
    chat2.send_text("hi2")
@@ -424,7 +678,6 @@ def test_verified_group_vs_delete_server_after(acfactory, tmp_path, lp):
    assert msg_in.text == "hi2"
    assert msg_in.chat == chat2_offl
    assert msg_in.get_sender_contact().addr == ac2.get_config("addr")
-    assert msg_in.chat.is_protected()
    assert ac2_offl_ac1_contact.is_verified()


--- a/python/tests/test_1_online.py
+++ b/python/tests/test_1_online.py
@@ -54,6 +54,57 @@ def test_configure_unref(tmp_path):
    lib.dc_context_unref(dc_context)


+def test_one_account_send_bcc_setting(acfactory, lp):
+    ac1 = acfactory.new_online_configuring_account()
+    ac2 = acfactory.new_online_configuring_account()
+    ac1_clone = acfactory.new_online_configuring_account(cloned_from=ac1)
+    acfactory.bring_accounts_online()
+
+    # test if sent messages are copied to it via BCC.
+
+    chat = acfactory.get_accepted_chat(ac1, ac2)
+    self_addr = ac1.get_config("addr")
+    other_addr = ac2.get_config("addr")
+
+    lp.sec("send out message without bcc to ourselves")
+    ac1.set_config("bcc_self", "0")
+    msg_out = chat.send_text("message1")
+    assert not msg_out.is_forwarded()
+
+    # wait for send out (no BCC)
+    ev = ac1._evtracker.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
+    assert ac1.get_config("bcc_self") == "0"
+
+    # make sure we are not sending message to ourselves
+    assert self_addr not in ev.data2
+    assert other_addr in ev.data2
+
+    lp.sec("ac1: setting bcc_self=1")
+    ac1.set_config("bcc_self", "1")
+
+    lp.sec("send out message with bcc to ourselves")
+    msg_out = chat.send_text("message2")
+
+    # wait for send out (BCC)
+    ev = ac1._evtracker.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
+    assert ac1.get_config("bcc_self") == "1"
+
+    # Second client receives only second message, but not the first.
+    ev_msg = ac1_clone._evtracker.wait_next_messages_changed()
+    assert ev_msg.text == msg_out.text
+
+    # now make sure we are sending message to ourselves too
+    assert self_addr in ev.data2
+    assert other_addr in ev.data2
+
+    # BCC-self messages are marked as seen by the sender device.
+    ac1._evtracker.get_info_contains("Marked messages [0-9]+ in folder INBOX as seen.")
+
+    # Check that the message is marked as seen on IMAP.
+    ac1.direct_imap.select_folder("Inbox")
+    assert len(list(ac1.direct_imap.conn.fetch(AND(seen=True)))) == 1
+
+
 def test_send_file_twice_unicode_filename_mangling(tmp_path, acfactory, lp):
    ac1, ac2 = acfactory.get_online_accounts(2)
    chat = acfactory.get_accepted_chat(ac1, ac2)
@@ -436,6 +487,26 @@ def test_forward_messages(acfactory, lp):
    assert not chat3.get_messages()


+def test_forward_encrypted_to_unencrypted(acfactory, lp):
+    ac1, ac2, ac3 = acfactory.get_online_accounts(3)
+    chat = acfactory.get_protected_chat(ac1, ac2)
+
+    lp.sec("ac1: send encrypted message to ac2")
+    txt = "This should be encrypted"
+    chat.send_text(txt)
+    msg = ac2._evtracker.wait_next_incoming_message()
+    assert msg.text == txt
+    assert msg.is_encrypted()
+
+    lp.sec("ac2: forward message to ac3 unencrypted")
+    unencrypted_chat = ac2.create_chat(ac3)
+    msg_id = msg.id
+    msg2 = unencrypted_chat.send_msg(msg)
+    assert msg2 == msg
+    assert msg.id != msg_id
+    assert not msg.is_encrypted()
+
+
 def test_forward_own_message(acfactory, lp):
    ac1, ac2 = acfactory.get_online_accounts(2)
    chat = acfactory.get_accepted_chat(ac1, ac2)
@@ -767,7 +838,7 @@ def test_mdn_asymmetric(acfactory, lp):
    assert len(list(ac1.direct_imap.conn.fetch(AND(seen=True)))) == 1


-def test_send_receive_encrypt(acfactory, lp):
+def test_send_and_receive_will_encrypt_decrypt(acfactory, lp):
    ac1, ac2 = acfactory.get_online_accounts(2)

    ac1.get_device_chat().mark_noticed()
@@ -798,14 +869,56 @@ def test_send_receive_encrypt(acfactory, lp):
    msg3.mark_seen()
    assert not list(ac1.get_fresh_messages())

-    lp.sec("create group chat with two members")
+    # Test that we do not gossip peer keys in 1-to-1 chat,
+    # as it makes no sense to gossip to peers their own keys.
+    # Gossip is only sent in encrypted messages,
+    # and we sent encrypted msg_back right above.
+    assert chat2b.get_summary()["gossiped_timestamp"] == 0
+
+    lp.sec("create group chat with two members, one of which has no encrypt state")
    chat = ac1.create_group_chat("encryption test")
    chat.add_contact(ac2)
+    chat.add_contact(ac1.create_contact("notexisting@testrun.org"))
    msg = chat.send_text("test not encrypt")
-    assert msg.is_encrypted()
+    assert not msg.is_encrypted()
    ac1._evtracker.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")


+def test_gossip_optimization(acfactory, lp):
+    """Test that gossip timestamp is updated when someone else sends gossip,
+    so we don't have to send gossip ourselves.
+    """
+    ac1, ac2, ac3 = acfactory.get_online_accounts(3)
+
+    acfactory.introduce_each_other([ac1, ac2])
+    acfactory.introduce_each_other([ac2, ac3])
+
+    lp.sec("ac1 creates a group chat with ac2")
+    group_chat = ac1.create_group_chat("hello")
+    group_chat.add_contact(ac2)
+    msg = group_chat.send_text("hi")
+
+    # No Autocrypt gossip was sent yet.
+    gossiped_timestamp = msg.chat.get_summary()["gossiped_timestamp"]
+    assert gossiped_timestamp == 0
+
+    msg = ac2._evtracker.wait_next_incoming_message()
+    assert msg.is_encrypted()
+    assert msg.text == "hi"
+
+    lp.sec("ac2 adds ac3 to the group")
+    msg.chat.add_contact(ac3)
+
+    lp.sec("ac1 receives message from ac2 and updates gossip timestamp")
+    msg = ac1._evtracker.wait_next_incoming_message()
+    assert msg.is_encrypted()
+
+    # ac1 has updated the gossip timestamp even though no gossip was sent by ac1.
+    # ac1 does not need to send gossip because ac2 already did it.
+    gossiped_timestamp = msg.chat.get_summary()["gossiped_timestamp"]
+    assert gossiped_timestamp == int(msg.time_sent.timestamp())
+
+
 def test_send_first_message_as_long_unicode_with_cr(acfactory, lp):
    ac1, ac2 = acfactory.get_online_accounts(2)

@@ -818,7 +931,7 @@ def test_send_first_message_as_long_unicode_with_cr(acfactory, lp):
        " wrapped using format=flowed and unwrapped on the receiver"
    )
    msg_out = chat.send_text(text1)
-    assert msg_out.is_encrypted()
+    assert not msg_out.is_encrypted()

    lp.sec("wait for ac2 to receive multi-line non-unicode message")
    msg_in = ac2._evtracker.wait_next_incoming_message()
@@ -827,7 +940,7 @@ def test_send_first_message_as_long_unicode_with_cr(acfactory, lp):
    lp.sec("sending multi-line unicode text message from ac1 to ac2")
    text2 = "äalis\nthis is ßßÄ"
    msg_out = chat.send_text(text2)
-    assert msg_out.is_encrypted()
+    assert not msg_out.is_encrypted()

    lp.sec("wait for ac2 to receive multi-line unicode message")
    msg_in = ac2._evtracker.wait_next_incoming_message()
@@ -1138,9 +1251,9 @@ def test_import_export_online_all(acfactory, tmp_path, data, lp):

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

    original_image_path = data.get_path("d.png")
    chat1.send_image(original_image_path)
@@ -1152,7 +1265,7 @@ def test_import_export_online_all(acfactory, tmp_path, data, lp):
    chat1.send_file(str(path))

    def assert_account_is_proper(ac):
-        contacts = ac.get_contacts()
+        contacts = ac.get_contacts(query="some1")
        assert len(contacts) == 1
        contact2 = contacts[0]
        assert contact2.addr == some1_addr
@@ -1233,7 +1346,7 @@ def test_qr_email_capitalization(acfactory, lp):
    lp.sec("ac1 joins a verified group via a QR code")
    ac1_chat = ac1.qr_join_chat(qr)
    msg = ac1._evtracker.wait_next_incoming_message()
-    assert msg.text == "Member Me added by {}.".format(ac3.get_config("addr"))
+    assert msg.text == "Member Me ({}) added by {}.".format(ac1.get_config("addr"), ac3.get_config("addr"))
    assert len(ac1_chat.get_contacts()) == 2

    lp.sec("ac2 joins a verified group via a QR code")
@@ -1287,6 +1400,79 @@ def test_set_get_contact_avatar(acfactory, data, lp):
    assert msg6.get_sender_contact().get_profile_image() is None


+def test_add_remove_member_remote_events(acfactory, lp):
+    ac1, ac2, ac3 = acfactory.get_online_accounts(3)
+    ac1_addr = ac1.get_config("addr")
+    ac3_addr = ac3.get_config("addr")
+    # activate local plugin for ac2
+    in_list = queue.Queue()
+
+    class EventHolder:
+        def __init__(self, **kwargs) -> None:
+            self.__dict__.update(kwargs)
+
+    class InPlugin:
+        @account_hookimpl
+        def ac_incoming_message(self, message):
+            # we immediately accept the sender because
+            # otherwise we won't see member_added contacts
+            message.create_chat()
+
+        @account_hookimpl
+        def ac_chat_modified(self, chat):
+            in_list.put(EventHolder(action="chat-modified", chat=chat))
+
+        @account_hookimpl
+        def ac_member_added(self, chat, contact, message):
+            in_list.put(EventHolder(action="added", chat=chat, contact=contact, message=message))
+
+        @account_hookimpl
+        def ac_member_removed(self, chat, contact, message):
+            in_list.put(EventHolder(action="removed", chat=chat, contact=contact, message=message))
+
+    ac2.add_account_plugin(InPlugin())
+
+    lp.sec("ac1: create group chat with ac2")
+    chat = ac1.create_group_chat("hello", contacts=[ac2])
+
+    lp.sec("ac1: send a message to group chat to promote the group")
+    chat.send_text("afterwards promoted")
+    ev = in_list.get()
+    assert ev.action == "chat-modified"
+    assert chat.is_promoted()
+    assert sorted(x.addr for x in chat.get_contacts()) == sorted(x.addr for x in ev.chat.get_contacts())
+
+    lp.sec("ac1: add address2")
+    # note that if the above create_chat() would not
+    # happen we would not receive a proper member_added event
+    contact2 = chat.add_contact(ac3_addr)
+    ev = in_list.get()
+    assert ev.action == "chat-modified"
+    ev = in_list.get()
+    assert ev.action == "chat-modified"
+    ev = in_list.get()
+    assert ev.action == "added"
+    assert ev.message.get_sender_contact().addr == ac1_addr
+    assert ev.contact.addr == ac3_addr
+
+    lp.sec("ac1: remove address2")
+    chat.remove_contact(contact2)
+    ev = in_list.get()
+    assert ev.action == "chat-modified"
+    ev = in_list.get()
+    assert ev.action == "removed"
+    assert ev.contact.addr == contact2.addr
+    assert ev.message.get_sender_contact().addr == ac1_addr
+
+    lp.sec("ac1: remove ac2 contact from chat")
+    chat.remove_contact(ac2)
+    ev = in_list.get()
+    assert ev.action == "chat-modified"
+    ev = in_list.get()
+    assert ev.action == "removed"
+    assert ev.message.get_sender_contact().addr == ac1_addr
+
+
 def test_system_group_msg_from_blocked_user(acfactory, lp):
    """
    Tests that a blocked user removes you from a group.
@@ -1428,6 +1614,15 @@ def test_connectivity(acfactory, lp):
    assert len(msgs) == 2
    assert msgs[1].text == "Hi 2"

+    lp.sec("Test that the connectivity is NOT_CONNECTED if the password is wrong")
+
+    ac1.set_config("configured_mail_pw", "abc")
+    ac1.stop_io()
+    ac1._evtracker.wait_for_connectivity(dc.const.DC_CONNECTIVITY_NOT_CONNECTED)
+    ac1.start_io()
+    ac1._evtracker.wait_for_connectivity(dc.const.DC_CONNECTIVITY_CONNECTING)
+    ac1._evtracker.wait_for_connectivity(dc.const.DC_CONNECTIVITY_NOT_CONNECTED)
+

 def test_fetch_deleted_msg(acfactory, lp):
    """This is a regression test: Messages with \\Deleted flag were downloaded again and again,
@@ -1543,7 +1738,7 @@ def test_immediate_autodelete(acfactory, lp):

    lp.sec("ac2: wait for close/expunge on autodelete")
    ac2._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_DELETED")
-    ac2._evtracker.get_info_contains("Close/expunge succeeded.")
+    ac2._evtracker.get_info_contains("close/expunge succeeded")

    lp.sec("ac2: check that message was autodeleted on server")
    assert len(ac2.direct_imap.get_all_messages()) == 0
@@ -1579,7 +1774,7 @@ def test_delete_multiple_messages(acfactory, lp):
    lp.sec("ac2: test that only one message is left")
    while 1:
        ac2._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_DELETED")
-        ac2._evtracker.get_info_contains("Close/expunge succeeded.")
+        ac2._evtracker.get_info_contains("close/expunge succeeded")
        ac2.direct_imap.select_config_folder("inbox")
        nr_msgs = len(ac2.direct_imap.get_all_messages())
        assert nr_msgs > 0
@@ -1686,6 +1881,46 @@ def test_configure_error_msgs_invalid_server(acfactory):
    assert "configuration" not in ev.data2.lower()


+def test_name_changes(acfactory):
+    ac1, ac2 = acfactory.get_online_accounts(2)
+    ac1.set_config("displayname", "Account 1")
+
+    # Similar to acfactory.get_accepted_chat, but without setting the contact name.
+    ac2.create_contact(ac1.get_config("addr")).create_chat()
+    chat12 = ac1.create_contact(ac2.get_config("addr")).create_chat()
+    contact = None
+
+    def update_name():
+        """Send a message from ac1 to ac2 to update the name"""
+        nonlocal contact
+        chat12.send_text("Hello")
+        msg = ac2._evtracker.wait_next_incoming_message()
+        contact = msg.get_sender_contact()
+        return contact.name
+
+    assert update_name() == "Account 1"
+
+    ac1.set_config("displayname", "Account 1 revision 2")
+    assert update_name() == "Account 1 revision 2"
+
+    # Explicitly rename contact on ac2 to "Renamed"
+    ac2.create_contact(contact, name="Renamed")
+    assert contact.name == "Renamed"
+    ev = ac2._evtracker.get_matching("DC_EVENT_CONTACTS_CHANGED")
+    assert ev.data1 == contact.id
+
+    # ac1 also renames itself into "Renamed"
+    assert update_name() == "Renamed"
+    ac1.set_config("displayname", "Renamed")
+    assert update_name() == "Renamed"
+
+    # Contact name was set to "Renamed" explicitly before,
+    # so it should not be changed.
+    ac1.set_config("displayname", "Renamed again")
+    updated_name = update_name()
+    assert updated_name == "Renamed"
+
+
 def test_status(acfactory):
    """Test that status is transferred over the network."""
    ac1, ac2 = acfactory.get_online_accounts(2)
@@ -1817,6 +2052,23 @@ def test_scan_folders(acfactory, lp, folder, move, expected_destination):
        assert len(ac1.direct_imap.get_all_messages()) == 0


+def test_delete_deltachat_folder(acfactory):
+    """Test that DeltaChat folder is recreated if user deletes it manually."""
+    ac1 = acfactory.new_online_configuring_account(mvbox_move=True)
+    ac2 = acfactory.new_online_configuring_account()
+    acfactory.wait_configured(ac1)
+
+    ac1.direct_imap.conn.folder.delete("DeltaChat")
+    assert "DeltaChat" not in ac1.direct_imap.list_folders()
+    acfactory.bring_accounts_online()
+
+    ac2.create_chat(ac1).send_text("hello")
+    msg = ac1._evtracker.wait_next_incoming_message()
+    assert msg.text == "hello"
+
+    assert "DeltaChat" in ac1.direct_imap.list_folders()
+
+
 def test_archived_muted_chat(acfactory, lp):
    """If an archived and muted chat receives a new message, DC_EVENT_MSGS_CHANGED for
    DC_CHAT_ID_ARCHIVED_LINK must be generated if the chat had only seen messages previously.
--- a/python/tests/test_3_offline.py
+++ b/python/tests/test_3_offline.py
@@ -1,11 +1,51 @@
 import os
+import time
 from datetime import datetime, timedelta, timezone

 import pytest

 import deltachat as dc
 from deltachat.tracker import ImexFailed
-from deltachat import Account, Message
+from deltachat import Account, account_hookimpl, Message
+
+
+@pytest.mark.parametrize(
+    ("msgtext", "res"),
+    [
+        (
+            "Member Me (tmp1@x.org) removed by tmp2@x.org.",
+            ("removed", "tmp1@x.org", "tmp2@x.org"),
+        ),
+        (
+            "Member With space (tmp1@x.org) removed by tmp2@x.org.",
+            ("removed", "tmp1@x.org", "tmp2@x.org"),
+        ),
+        (
+            "Member With space (tmp1@x.org) removed by Another member (tmp2@x.org).",
+            ("removed", "tmp1@x.org", "tmp2@x.org"),
+        ),
+        (
+            "Member With space (tmp1@x.org) removed by me",
+            ("removed", "tmp1@x.org", "me"),
+        ),
+        (
+            "Group left by some one (tmp1@x.org).",
+            ("removed", "tmp1@x.org", "tmp1@x.org"),
+        ),
+        ("Group left by tmp1@x.org.", ("removed", "tmp1@x.org", "tmp1@x.org")),
+        (
+            "Member tmp1@x.org added by tmp2@x.org.",
+            ("added", "tmp1@x.org", "tmp2@x.org"),
+        ),
+        ("Member nothing bla bla", None),
+        ("Another unknown system message", None),
+    ],
+)
+def test_parse_system_add_remove(msgtext, res):
+    from deltachat.message import parse_system_add_remove
+
+    out = parse_system_add_remove(msgtext)
+    assert out == res


 class TestOfflineAccountBasic:
@@ -137,15 +177,15 @@ class TestOfflineContact:

    def test_get_contacts_and_delete(self, acfactory):
        ac1 = acfactory.get_pseudo_configured_account()
-        ac2 = acfactory.get_pseudo_configured_account()
-        contact1 = ac1.create_contact(ac2)
+        contact1 = ac1.create_contact("some1@example.org", name="some1")
        contacts = ac1.get_contacts()
        assert len(contacts) == 1
+        assert contact1 in contacts

        assert not ac1.get_contacts(query="some2")
-        assert not ac1.get_contacts(query="some1")
+        assert ac1.get_contacts(query="some1")
+        assert not ac1.get_contacts(only_verified=True)
        assert len(ac1.get_contacts(with_self=True)) == 2
-        assert contact1 in ac1.get_contacts()

        assert ac1.delete_contact(contact1)
        assert contact1 not in ac1.get_contacts()
@@ -160,9 +200,9 @@ class TestOfflineContact:
    def test_create_chat_flexibility(self, acfactory):
        ac1 = acfactory.get_pseudo_configured_account()
        ac2 = acfactory.get_pseudo_configured_account()
-        chat1 = ac1.create_chat(ac2)  # This creates a key-contact chat
-        chat2 = ac1.create_chat(ac2.get_self_contact().addr)  # This creates address-contact chat
-        assert chat1 != chat2
+        chat1 = ac1.create_chat(ac2)
+        chat2 = ac1.create_chat(ac2.get_self_contact().addr)
+        assert chat1 == chat2
        ac3 = acfactory.get_unconfigured_account()
        with pytest.raises(ValueError):
            ac1.create_chat(ac3)
@@ -220,18 +260,17 @@ class TestOfflineChat:
        ac1 = acfactory.get_pseudo_configured_account()
        ac2 = acfactory.get_pseudo_configured_account()
        chat = ac1.create_group_chat(name="title1")
+        with pytest.raises(ValueError):
+            chat.add_contact(ac2.get_self_contact())
        contact = chat.add_contact(ac2)
        assert contact.addr == ac2.get_config("addr")
        assert contact.name == ac2.get_config("displayname")
        assert contact.account == ac1
        chat.remove_contact(ac2)

-    def test_group_chat_creation(self, acfactory):
-        ac1 = acfactory.get_pseudo_configured_account()
-        ac2 = acfactory.get_pseudo_configured_account()
-        ac3 = acfactory.get_pseudo_configured_account()
-        contact1 = ac1.create_contact(ac2)
-        contact2 = ac1.create_contact(ac3)
+    def test_group_chat_creation(self, ac1):
+        contact1 = ac1.create_contact("some1@example.org", name="some1")
+        contact2 = ac1.create_contact("some2@example.org", name="some2")
        chat = ac1.create_group_chat(name="title1", contacts=[contact1, contact2])
        assert chat.get_name() == "title1"
        assert contact1 in chat.get_contacts()
@@ -278,14 +317,13 @@ class TestOfflineChat:
        qr = chat.get_join_qr()
        assert ac2.check_qr(qr).is_ask_verifygroup

-    def test_removing_blocked_user_from_group(self, ac1, acfactory, lp):
+    def test_removing_blocked_user_from_group(self, ac1, lp):
        """
        Test that blocked contact is not unblocked when removed from a group.
        See https://github.com/deltachat/deltachat-core-rust/issues/2030
        """
        lp.sec("Create a group chat with a contact")
-        ac2 = acfactory.get_pseudo_configured_account()
-        contact = ac1.create_contact(ac2)
+        contact = ac1.create_contact("some1@example.org")
        group = ac1.create_group_chat("title", contacts=[contact])
        group.send_text("First group message")

@@ -297,6 +335,10 @@ class TestOfflineChat:
        group.remove_contact(contact)
        assert contact.is_blocked()

+        lp.sec("ac1 adding blocked contact unblocks it")
+        group.add_contact(contact)
+        assert not contact.is_blocked()
+
    def test_get_set_profile_image_simple(self, ac1, data):
        chat = ac1.create_group_chat(name="title1")
        p = data.get_path("d.png")
@@ -439,8 +481,7 @@ class TestOfflineChat:
        backupdir = tmp_path / "backup"
        backupdir.mkdir()
        ac1 = acfactory.get_pseudo_configured_account()
-        ac_contact = acfactory.get_pseudo_configured_account()
-        chat = ac1.create_contact(ac_contact).create_chat()
+        chat = ac1.create_contact("some1 <some1@example.org>").create_chat()
        # send a text message
        msg = chat.send_text("msg1")
        # send a binary file
@@ -455,10 +496,10 @@ class TestOfflineChat:
        assert os.path.exists(path)
        ac2 = acfactory.get_unconfigured_account()
        ac2.import_all(path)
-        contacts = ac2.get_contacts()
+        contacts = ac2.get_contacts(query="some1")
        assert len(contacts) == 1
        contact2 = contacts[0]
-        assert contact2.addr == ac_contact.get_config("addr")
+        assert contact2.addr == "some1@example.org"
        chat2 = contact2.create_chat()
        messages = chat2.get_messages()
        assert len(messages) == 2
@@ -471,9 +512,8 @@ class TestOfflineChat:
        backupdir = tmp_path / "backup"
        backupdir.mkdir()
        ac1 = acfactory.get_pseudo_configured_account(passphrase=passphrase1)
-        ac2 = acfactory.get_pseudo_configured_account()

-        chat = ac1.create_contact(ac2).create_chat()
+        chat = ac1.create_contact("some1 <some1@example.org>").create_chat()
        # send a text message
        msg = chat.send_text("msg1")
        # send a binary file
@@ -494,10 +534,10 @@ class TestOfflineChat:
        ac2.import_all(path)

        # check data integrity
-        contacts = ac2.get_contacts()
+        contacts = ac2.get_contacts(query="some1")
        assert len(contacts) == 1
        contact2 = contacts[0]
-        contact2_addr = contact2.addr
+        assert contact2.addr == "some1@example.org"
        chat2 = contact2.create_chat()
        messages = chat2.get_messages()
        assert len(messages) == 2
@@ -511,10 +551,10 @@ class TestOfflineChat:
        ac2.open(passphrase2)

        # check data integrity
-        contacts = ac2.get_contacts()
+        contacts = ac2.get_contacts(query="some1")
        assert len(contacts) == 1
        contact2 = contacts[0]
-        assert contact2.addr == contact2_addr
+        assert contact2.addr == "some1@example.org"
        chat2 = contact2.create_chat()
        messages = chat2.get_messages()
        assert len(messages) == 2
@@ -527,9 +567,8 @@ class TestOfflineChat:
        backupdir = tmp_path / "backup"
        backupdir.mkdir()
        ac1 = acfactory.get_pseudo_configured_account()
-        ac_contact = acfactory.get_pseudo_configured_account()

-        chat = ac1.create_contact(ac_contact).create_chat()
+        chat = ac1.create_contact("some1 <some1@example.org>").create_chat()
        # send a text message
        msg = chat.send_text("msg1")
        # send a binary file
@@ -551,10 +590,10 @@ class TestOfflineChat:
        ac2.import_all(path, passphrase)

        # check data integrity
-        contacts = ac2.get_contacts()
+        contacts = ac2.get_contacts(query="some1")
        assert len(contacts) == 1
        contact2 = contacts[0]
-        assert contact2.addr == ac_contact.get_config("addr")
+        assert contact2.addr == "some1@example.org"
        chat2 = contact2.create_chat()
        messages = chat2.get_messages()
        assert len(messages) == 2
@@ -573,8 +612,7 @@ class TestOfflineChat:
        backupdir.mkdir()

        ac1 = acfactory.get_pseudo_configured_account()
-        ac_contact = acfactory.get_pseudo_configured_account()
-        chat = ac1.create_contact(ac_contact).create_chat()
+        chat = ac1.create_contact("some1 <some1@example.org>").create_chat()
        # send a text message
        msg = chat.send_text("msg1")
        # send a binary file
@@ -597,10 +635,10 @@ class TestOfflineChat:
        ac2.import_all(path, bak_passphrase)

        # check data integrity
-        contacts = ac2.get_contacts()
+        contacts = ac2.get_contacts(query="some1")
        assert len(contacts) == 1
        contact2 = contacts[0]
-        assert contact2.addr == ac_contact.get_config("addr")
+        assert contact2.addr == "some1@example.org"
        chat2 = contact2.create_chat()
        messages = chat2.get_messages()
        assert len(messages) == 2
@@ -614,10 +652,10 @@ class TestOfflineChat:
        ac2.open(acct_passphrase)

        # check data integrity
-        contacts = ac2.get_contacts()
+        contacts = ac2.get_contacts(query="some1")
        assert len(contacts) == 1
        contact2 = contacts[0]
-        assert contact2.addr == ac_contact.get_config("addr")
+        assert contact2.addr == "some1@example.org"
        chat2 = contact2.create_chat()
        messages = chat2.get_messages()
        assert len(messages) == 2
@@ -644,10 +682,78 @@ class TestOfflineChat:
        assert not res.is_ask_verifygroup()
        assert res.contact_id == 10

-    def test_audit_log_view_without_daymarker(self, acfactory, lp):
-        ac1 = acfactory.get_pseudo_configured_account()
-        ac2 = acfactory.get_pseudo_configured_account()
+    def test_group_chat_many_members_add_remove(self, ac1, lp):
+        lp.sec("ac1: creating group chat with 10 other members")
+        chat = ac1.create_group_chat(name="title1")
+        # promote chat
+        chat.send_text("hello")
+        assert chat.is_promoted()

+        # activate local plugin
+        in_list = []
+
+        class InPlugin:
+            @account_hookimpl
+            def ac_member_added(self, chat, contact, actor):
+                in_list.append(("added", chat, contact, actor))
+
+            @account_hookimpl
+            def ac_member_removed(self, chat, contact, actor):
+                in_list.append(("removed", chat, contact, actor))
+
+        ac1.add_account_plugin(InPlugin())
+
+        # perform add contact many times
+        contacts = []
+        for i in range(10):
+            lp.sec("create contact")
+            contact = ac1.create_contact(f"some{i}@example.org")
+            contacts.append(contact)
+            lp.sec("add contact")
+            chat.add_contact(contact)
+
+        assert chat.num_contacts() == 11
+
+        # let's make sure the events perform plugin hooks
+        def wait_events(cond):
+            now = time.time()
+            while time.time() < now + 5:
+                if cond():
+                    break
+                time.sleep(0.1)
+            else:
+                pytest.fail("failed to get events")
+
+        wait_events(lambda: len(in_list) == 10)
+
+        assert len(in_list) == 10
+        chat_contacts = chat.get_contacts()
+        for in_cmd, in_chat, in_contact, in_actor in in_list:
+            assert in_cmd == "added"
+            assert in_chat == chat
+            assert in_contact in chat_contacts
+            assert in_actor is None
+            chat_contacts.remove(in_contact)
+
+        assert chat_contacts[0].id == 1  # self contact
+
+        in_list[:] = []
+
+        lp.sec("ac1: removing two contacts and checking things are right")
+        chat.remove_contact(contacts[9])
+        chat.remove_contact(contacts[3])
+        assert chat.num_contacts() == 9
+
+        wait_events(lambda: len(in_list) == 2)
+        assert len(in_list) == 2
+        assert in_list[0][0] == "removed"
+        assert in_list[0][1] == chat
+        assert in_list[0][2] == contacts[9]
+        assert in_list[1][0] == "removed"
+        assert in_list[1][1] == chat
+        assert in_list[1][2] == contacts[3]
+
+    def test_audit_log_view_without_daymarker(self, ac1, lp):
        lp.sec("ac1: test audit log (show only system messages)")
        chat = ac1.create_group_chat(name="audit log sample data")

@@ -656,7 +762,7 @@ class TestOfflineChat:
        assert chat.is_promoted()

        lp.sec("create test data")
-        chat.add_contact(ac2)
+        chat.add_contact(ac1.create_contact("some-1@example.org"))
        chat.set_name("audit log test group")
        chat.send_text("a message in between")

--- a/python/tox.ini
+++ b/python/tox.ini
@@ -45,7 +45,7 @@ deps =
    pygments
    restructuredtext_lint 
 commands =
-    ruff format --diff setup.py src/deltachat examples/ tests/
+    ruff format --quiet --diff setup.py src/deltachat examples/ tests/
    ruff check src/deltachat tests/ examples/
    rst-lint --encoding 'utf-8' README.rst

--- a/release-date.in
+++ b/release-date.in
@@ -1 +1 @@
-2025-07-09
+2025-03-19
--- a/scripts/coredeps/install-rust.sh
+++ b/scripts/coredeps/install-rust.sh
@@ -7,7 +7,7 @@ set -euo pipefail
 #
 # Avoid using rustup here as it depends on reading /proc/self/exe and
 # has problems running under QEMU.
-RUST_VERSION=1.88.0
+RUST_VERSION=1.84.1

 ARCH="$(uname -m)"
 test -f "/lib/libc.musl-$ARCH.so.1" && LIBC=musl || LIBC=gnu
--- a/scripts/create-provider-data-rs.py
+++ b/scripts/create-provider-data-rs.py
@@ -215,7 +215,7 @@ if __name__ == "__main__":
        "    Config, ConfigDefault, Oauth2Authorizer, Provider, ProviderOptions, Server, Status,\n"
        "};\n"
        "use std::collections::HashMap;\n\n"
-        "use std::sync::LazyLock;\n\n"
+        "use once_cell::sync::Lazy;\n\n"
    )

    process_dir(Path(sys.argv[1]))
@@ -224,7 +224,7 @@ if __name__ == "__main__":
    out_all += out_domains
    out_all += "];\n\n"

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

@@ -233,8 +233,8 @@ if __name__ == "__main__":
    else:
        now = datetime.datetime.fromisoformat(sys.argv[2])
    out_all += (
-        "pub static _PROVIDER_UPDATED: LazyLock<chrono::NaiveDate> = "
-        "LazyLock::new(|| chrono::NaiveDate::from_ymd_opt("
+        "pub static _PROVIDER_UPDATED: Lazy<chrono::NaiveDate> = "
+        "Lazy::new(|| chrono::NaiveDate::from_ymd_opt("
        + str(now.year)
        + ", "
        + str(now.month)
--- a/scripts/update-provider-database.sh
+++ b/scripts/update-provider-database.sh
@@ -15,7 +15,7 @@ cd "$TMP"
 git checkout "$REV"
 DATE=$(git show -s --format=%cs)
 "$CORE_ROOT"/scripts/create-provider-data-rs.py "$TMP/_providers" "$DATE" >"$CORE_ROOT/src/provider/data.rs"
-rustfmt --edition 2024 "$CORE_ROOT/src/provider/data.rs"
+rustfmt "$CORE_ROOT/src/provider/data.rs"
 rm -fr "$TMP"

 cd "$CORE_ROOT"
--- a/spec.md
+++ b/spec.md
@@ -1,10 +1,10 @@
-# Chatmail Specification
+# chat-mail specification

-Version: 0.36.0
+Version: 0.35.0
 Status:  In-progress 
 Format:  [Semantic Line Breaks](https://sembr.org/)

-This document roughly describes how chatmail 
+This document roughly describes how chat-mail 
 apps use the standard e-mail system 
 to implement typical messenger functions.

@@ -18,8 +18,6 @@ to implement typical messenger functions.
    - [Add and remove members](#add-and-remove-members)
    - [Change group name](#change-group-name)
    - [Set group image](#set-group-image)
- [Request editing](#request-editing)
- [Request deletion](#request-deletion)
 - [Set profile image](#set-profile-image)
 - [Locations](#locations)
    - [User locations](#user-locations)
@@ -306,84 +304,6 @@ To save data, it is RECOMMENDED
 to add a `Chat-Group-Avatar` only on image changes.


-# Request editing
-
-To request recipients to edit the text of an already sent message,
-the messenger MUST set the header `Chat-Edit`
-with value set to the message-id of the message to edit
-and the body to the new message text.
-
-The body MAY be prefixed by a quote
-and the emoji "✏️" directly before the new text.
-Both MUST be skipped by the recipient.
-
-Receiving messengers MUST look up the message-id from `Chat-Edit`,
-replace the text and MAY indicate the edit in the UI.
-
-The new message text MUST NOT be empty.
-It is not possible to edit images or other attachments, including HTML messages.
-However, they can be deleted for everyone.
-
-Example:
-
-    From: sender@domain
-    To: rcpt@domain
-    Chat-Version: 1.0
-    Message-ID: 00001@domain
-    Content-Type: text/plain
-
-    Hello wordl!
-
-The typo from the message above can be fixed by the following message:
-
-    From: sender@domain
-    To: rcpt@domain
-    Chat-Version: 1.0
-    Chat-Edit: 00001@domain
-    In-Reply-To: 00001@domain
-    Message-ID: 00002@domain
-    Content-Type: text/plain
-
-    On 2025-03-27, sender@domain wrote:
-    > Hello wordl!
-
-    ✏️Hello world!
-
-
-# Request deletion
-
-To request recipient to delete a message,
-the messenger MUST set the header `Chat-Delete`
-with the value set to the message-id of the message to delete.
-
-Receiving messengers MUST look up the message-id, delete the corresponding message
-and MAY indicating the deletion in the UI.
-
-The sender MUST set the body to any, non-empty text.
-The receiver MUST ignore the body.
-
-Example:
-
-    From: sender@domain
-    To: rcpt@domain
-    Chat-Version: 1.0
-    Message-ID: 00003@domain
-    Content-Type: text/plain
-
-    reminder for my pin: 1234
-
-The message above can be requested for deletion by the following message:
-
-    From: sender@domain
-    To: rcpt@domain
-    Chat-Version: 1.0
-    Chat-Delete: 00003@domain
-    Message-ID: 00004@domain
-    Content-Type: text/plain
-
-    foo
-
-
 # Set profile image

 A user MAY have a profile-image that MAY be distributed to their contacts.
@@ -455,7 +375,7 @@ eg. forwarded from a normal MUA.

    <?xml version="1.0" encoding="UTF-8"?>
    <kml xmlns="http://www.opengis.net/kml/2.2">
-      <Document addr="foo@domain">
+      <Document addr="ndh@deltachat.de">
        <Placemark>
          <Timestamp><when>2020-01-11T20:40:19Z</when></Timestamp>
          <Point><coordinates accuracy="1.2">1.234,5.678</coordinates></Point>
@@ -622,4 +542,4 @@ We define the effective date of a message
 as the sending time of the message as indicated by its Date header,
 or the time of first receipt if that date is in the future or unavailable.

-Copyright © Chatmail contributors.
+Copyright © 2017-2021 Delta Chat contributors.
--- a/src/accounts.rs
+++ b/src/accounts.rs
@@ -4,21 +4,22 @@ use std::collections::BTreeMap;
 use std::future::Future;
 use std::path::{Path, PathBuf};

-use anyhow::{Context as _, Result, bail, ensure};
+use anyhow::{ensure, Context as _, Result};
+use futures::stream::FuturesUnordered;
+use futures::StreamExt;
 use serde::{Deserialize, Serialize};
 use tokio::fs;
 use tokio::io::AsyncWriteExt;
-use tokio::task::{JoinHandle, JoinSet};
+use tokio::task::JoinHandle;
 use uuid::Uuid;

 #[cfg(not(target_os = "ios"))]
 use tokio::sync::oneshot;
 #[cfg(not(target_os = "ios"))]
-use tokio::time::{Duration, sleep};
+use tokio::time::{sleep, Duration};

 use crate::context::{Context, ContextBuilder};
 use crate::events::{Event, EventEmitter, EventType, Events};
-use crate::log::{info, warn};
 use crate::push::PushSubscriber;
 use crate::stock_str::StockStrings;

@@ -72,7 +73,9 @@ impl Accounts {
        let config_file = dir.join(CONFIG_NAME);
        ensure!(config_file.exists(), "{:?} does not exist", config_file);

-        let config = Config::from_file(config_file, writable).await?;
+        let config = Config::from_file(config_file, writable)
+            .await
+            .context("failed to load accounts config")?;
        let events = Events::new();
        let stockstrings = StockStrings::new();
        let push_subscriber = PushSubscriber::new();
@@ -303,6 +306,12 @@ impl Accounts {
    /// This is an auxiliary function and not part of public API.
    /// Use [Accounts::background_fetch] instead.
    async fn background_fetch_no_timeout(accounts: Vec<Context>, events: Events) {
+        async fn background_fetch_and_log_error(account: Context) {
+            if let Err(error) = account.background_fetch().await {
+                warn!(account, "{error:#}");
+            }
+        }
+
        events.emit(Event {
            id: 0,
            typ: EventType::Info(format!(
@@ -310,15 +319,11 @@ impl Accounts {
                accounts.len()
            )),
        });
-        let mut set = JoinSet::new();
-        for account in accounts {
-            set.spawn(async move {
-                if let Err(error) = account.background_fetch().await {
-                    warn!(account, "{error:#}");
-                }
-            });
-        }
-        set.join_all().await;
+        let mut futures_unordered: FuturesUnordered<_> = accounts
+            .into_iter()
+            .map(background_fetch_and_log_error)
+            .collect();
+        while futures_unordered.next().await.is_some() {}
    }

    /// Auxiliary function for [Accounts::background_fetch].
@@ -352,10 +357,7 @@ impl Accounts {
    ///
    /// Returns a future that resolves when background fetch is done,
    /// but does not capture `&self`.
-    pub fn background_fetch(
-        &self,
-        timeout: std::time::Duration,
-    ) -> impl Future<Output = ()> + use<> {
+    pub fn background_fetch(&self, timeout: std::time::Duration) -> impl Future<Output = ()> {
        let accounts: Vec<Context> = self.accounts.values().cloned().collect();
        let events = self.events.clone();
        Self::background_fetch_with_timeout(accounts, events, timeout)
@@ -458,11 +460,7 @@ impl Config {
            rx.await?;
            Ok(())
        });
-        if locked_rx.await.is_err() {
-            bail!(
-                "Delta Chat is already running. To use Delta Chat, you must first close the existing Delta Chat process, or restart your device. (accounts.lock file is already locked)"
-            );
-        };
+        locked_rx.await?;
        Ok(Some(lock_task))
    }

@@ -505,13 +503,11 @@ impl Config {
    /// protects from parallel calls resulting to a wrong file contents.
    async fn sync(&mut self) -> Result<()> {
        #[cfg(not(target_os = "ios"))]
-        ensure!(
-            !self
-                .lock_task
-                .as_ref()
-                .context("Config is read-only")?
-                .is_finished()
-        );
+        ensure!(!self
+            .lock_task
+            .as_ref()
+            .context("Config is read-only")?
+            .is_finished());

        let tmp_path = self.file.with_extension("toml.tmp");
        let mut file = fs::File::create(&tmp_path)
@@ -969,11 +965,9 @@ mod tests {

        // Test that event emitter does not return `None` immediately.
        let duration = std::time::Duration::from_millis(1);
-        assert!(
-            tokio::time::timeout(duration, event_emitter.recv())
-                .await
-                .is_err()
-        );
+        assert!(tokio::time::timeout(duration, event_emitter.recv())
+            .await
+            .is_err());

        // When account manager is dropped, event emitter is exhausted.
        drop(accounts);
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 -07-09
 -03-19