Make it more performant

move can_send_edit_request() to send_edit_request()
remove unused param
2026-04-06 15:42:10 +03:00 · 2025-02-24 14:12:10 +01:00 · 2025-02-24 13:05:14 +01:00 · 2025-02-24 12:17:16 +01:00 · 2025-02-24 12:17:16 +01:00
190 changed files with 13371 additions and 8015 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,22 +20,20 @@ permissions: {}

 env:
  RUSTFLAGS: -Dwarnings
-  RUST_VERSION: 1.87.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 toolchain install $RUSTUP_TOOLCHAIN --profile minimal --component rustfmt --component clippy
      - name: Cache rust cargo artifacts
        uses: swatinem/rust-cache@v2
      - name: Run rustfmt
@@ -93,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/deltachat-rpc-server.yml
+++ b/.github/workflows/deltachat-rpc-server.yml
@@ -248,10 +248,6 @@ jobs:
          cp result/*.whl dist/
          nix build .#deltachat-rpc-server-win32-wheel
          cp result/*.whl dist/
-          nix build .#deltachat-rpc-server-arm64-v8a-android-wheel
-          cp result/*.whl dist/
-          nix build .#deltachat-rpc-server-armeabi-v7a-android-wheel
-          cp result/*.whl dist/
          nix build .#deltachat-rpc-server-source
          cp result/*.tar.gz dist/
          python3 scripts/wheel-rpc-server.py x86_64-darwin bin/deltachat-rpc-server-x86_64-macos
--- 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/jsonrpc.yml
+++ b/.github/workflows/jsonrpc.yml
@@ -37,6 +37,9 @@ jobs:
        run: npm run test
        env:
          CHATMAIL_DOMAIN: ${{ vars.CHATMAIL_DOMAIN }}
+      - name: make sure websocket server version still builds
+        working-directory: deltachat-jsonrpc
+        run: cargo build --bin deltachat-jsonrpc-server --features webserver
      - name: Run linter
        working-directory: deltachat-jsonrpc/typescript
        run: npm run prettier:check
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -55,9 +55,7 @@ jobs:
          - deltachat-rpc-server-aarch64-linux
          - deltachat-rpc-server-aarch64-linux-wheel
          - deltachat-rpc-server-arm64-v8a-android
-          - deltachat-rpc-server-arm64-v8a-android-wheel
          - deltachat-rpc-server-armeabi-v7a-android
-          - deltachat-rpc-server-armeabi-v7a-android-wheel
          - deltachat-rpc-server-armv6l-linux
          - deltachat-rpc-server-armv6l-linux-wheel
          - deltachat-rpc-server-armv7l-linux
@@ -95,10 +93,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/.gitignore
+++ b/.gitignore
@@ -1,9 +1,7 @@
-target/
+/target
 **/*.rs.bk
 /build
 /dist
-/fuzz/fuzz_targets/corpus/
-/fuzz/fuzz_targets/crashes/

 # ignore vi temporaries
 *~
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,7 +2,7 @@

 ## Bug reports

-If you found a bug, [report it on GitHub](https://github.com/chatmail/core/issues).
+If you found a bug, [report it on GitHub](https://github.com/deltachat/deltachat-core-rust/issues).
 If the bug you found is specific to
 [Android](https://github.com/deltachat/deltachat-android/issues),
 [iOS](https://github.com/deltachat/deltachat-ios/issues) or
@@ -67,7 +67,7 @@ If you want to contribute a code, follow this guide.
   BREAKING CHANGE: You have to call `dc_stop_io()`/`dc_start_io()` before/after `dc_imex(DC_IMEX_EXPORT_BACKUP)`
   ```

-4. [**Open a Pull Request**](https://github.com/chatmail/core/pulls).
+4. [**Open a Pull Request**](https://github.com/deltachat/deltachat-core-rust/pulls).

   Refer to the corresponding issue.

@@ -116,7 +116,7 @@ For other ways to contribute, refer to the [website](https://delta.chat/en/contr

 You can find the list of good first issues
 and a link to this guide
-on the contributing page: <https://github.com/chatmail/core/contribute>
+on the contributing page: <https://github.com/deltachat/deltachat-core-rust/contribute>

 [Conventional Commits]: https://www.conventionalcommits.org/
 [git-cliff]: https://git-cliff.org/
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "deltachat"
-version = "1.159.5"
+version = "1.155.6"
 edition = "2021"
 license = "MPL-2.0"
-rust-version = "1.85"
-repository = "https://github.com/chatmail/core"
+rust-version = "1.81"
+repository = "https://github.com/deltachat/deltachat-core-rust"

 [profile.dev]
 debug = 0
@@ -41,37 +41,39 @@ 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.2", 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"
+encoded-words = "0.2"
 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.4"
+http-body-util = "0.1.2"
 humansize = "2"
 hyper = "1"
-hyper-util = "0.1.11"
-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.32", default-features = false, features = ["net"] }
+iroh = { version = "0.32", default-features = false }
 kamadak-exif = "0.6.1"
 libc = { workspace = true }
-mail-builder = { version = "0.4.2", default-features = false }
-mailparse = { workspace = true }
+mail-builder = { git = "https://github.com/stalwartlabs/mail-builder", branch = "main", default-features = false }
+mailparse = "0.16"
 mime = "0.3.17"
 num_cpus = "1.16"
 num-derive = "0.4"
 num-traits = { workspace = true }
+once_cell = { workspace = true }
 parking_lot = "0.12"
 percent-encoding = "2.3"
 pgp = { version = "0.15.0", default-features = false }
@@ -91,15 +93,15 @@ 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.0"
-strum = "0.27"
-strum_macros = "0.27"
+shadowsocks = { version = "1.22.0", default-features = false, features = ["aead-cipher", "aead-cipher-2022"] }
+smallvec = "1.13.2"
+strum = "0.26"
+strum_macros = "0.26"
 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 }
+tokio-rustls = { version = "0.26.1", default-features = false }
 tokio-stream = { version = "0.1.17", features = ["fs"] }
 tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar
 tokio-util = { workspace = true }
@@ -108,7 +110,7 @@ toml = "0.8"
 url = "2"
 uuid = { version = "1", features = ["serde", "v4"] }
 webpki-roots = "0.26.8"
-blake3 = "1.8.2"
+blake3 = "1.5.5"

 [dev-dependencies]
 anyhow = { workspace = true, features = ["backtrace"] } # Enable `backtrace` feature in tests.
@@ -133,7 +135,6 @@ members = [
  "deltachat-time",
  "format-flowed",
  "deltachat-contact-tools",
-  "fuzz",
 ]

 [[bench]]
@@ -173,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.39", default-features = false }
 deltachat-contact-tools = { path = "deltachat-contact-tools" }
 deltachat-jsonrpc = { path = "deltachat-jsonrpc", default-features = false }
 deltachat = { path = ".", default-features = false }
@@ -181,21 +182,21 @@ futures = "0.3.31"
 futures-lite = "2.6.0"
 libc = "0.2"
 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.32"
 sanitize-filename = "0.5"
 serde = "1.0"
 serde_json = "1"
-tempfile = "3.19.1"
+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"]
--- a/README.md
+++ b/README.md
@@ -1,41 +1,19 @@
 <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">
-  <a href="https://github.com/chatmail/core/actions/workflows/ci.yml">
-    <img alt="Rust CI" src="https://github.com/chatmail/core/actions/workflows/ci.yml/badge.svg">
+  <a href="https://github.com/deltachat/deltachat-core-rust/actions/workflows/ci.yml">
+    <img alt="Rust CI" src="https://github.com/deltachat/deltachat-core-rust/actions/workflows/ci.yml/badge.svg">
  </a>
-  <a href="https://deps.rs/repo/github/chatmail/core">
-    <img alt="dependency status" src="https://deps.rs/repo/github/chatmail/core/status.svg">
+  <a href="https://deps.rs/repo/github/deltachat/deltachat-core-rust">
+    <img alt="dependency status" src="https://deps.rs/repo/github/deltachat/deltachat-core-rust/status.svg">
  </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:

 ```
@@ -121,7 +104,7 @@ For more commands type:
 ## Installing libdeltachat system wide

 ```
-$ git clone https://github.com/chatmail/core.git
+$ git clone https://github.com/deltachat/deltachat-core-rust.git
 $ cd deltachat-core-rust
 $ cmake -B build . -DCMAKE_INSTALL_PREFIX=/usr
 $ cmake --build build
@@ -156,7 +139,7 @@ $ cargo test -- --ignored

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

 Run fuzzing tests with
@@ -182,9 +165,11 @@ $ cargo bolero test fuzz_format_flowed --release=false -e afl -s NONE
 ## 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/RELEASE.md
+++ b/RELEASE.md
@@ -2,12 +2,12 @@

 For example, to release version 1.116.0 of the core, do the following steps.

-1. Resolve all [blocker issues](https://github.com/chatmail/core/labels/blocker).
+1. Resolve all [blocker issues](https://github.com/deltachat/deltachat-core-rust/labels/blocker).

 2. Update the changelog: `git cliff --unreleased --tag 1.116.0 --prepend CHANGELOG.md` or `git cliff -u -t 1.116.0 -p CHANGELOG.md`.

 3. add a link to compare previous with current version to the end of CHANGELOG.md:
-  `[1.116.0]: https://github.com/chatmail/core/compare/v1.115.2...v1.116.0`
+  `[1.116.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.115.2...v1.116.0`

 4. Update the version by running `scripts/set_core_version.py 1.116.0`.

--- a/cliff.toml
+++ b/cliff.toml
@@ -11,7 +11,7 @@ filter_unconventional = false
 split_commits = false
 # regex for preprocessing the commit messages
 commit_preprocessors = [
-    { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](https://github.com/chatmail/core/pull/${2}))"}, # replace pull request / issue numbers
+    { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](https://github.com/deltachat/deltachat-core-rust/pull/${2}))"}, # replace pull request / issue numbers
 ]
 # regex for parsing and grouping commits
 commit_parsers = [
@@ -82,11 +82,11 @@ footer = """
    {% if release.version -%}
        {% if release.previous.version -%}
            [{{ release.version | trim_start_matches(pat="v") }}]: \
-                https://github.com/chatmail/core\
+                https://github.com/deltachat/deltachat-core-rust\
                    /compare/{{ release.previous.version }}..{{ release.version }}
        {% endif -%}
    {% else -%}
-        [unreleased]: https://github.com/chatmail/core\
+        [unreleased]: https://github.com/deltachat/deltachat-core-rust\
            /compare/{{ release.previous.version }}..HEAD
    {% endif -%}
 {% endfor %}
--- 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)]
@@ -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() {
@@ -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,232 +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 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
-        }
-    }
-    /// Returns (parameters, value) tuple.
-    fn vcard_property<'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))
-    }
-    fn base64_key(line: &str) -> Option<&str> {
-        let (params, value) = vcard_property(line, "key")?;
-        if params.eq_ignore_ascii_case("PGP;ENCODING=BASE64")
-            || params.eq_ignore_ascii_case("TYPE=PGP;ENCODING=b")
-        {
-            return Some(value);
-        }
-        if let Some(value) = remove_prefix(value, "data:application/pgp-keys;base64,")
-            .or_else(|| remove_prefix(value, r"data:application/pgp-keys;base64\,"))
-        {
-            return Some(value);
-        }
-
-        None
-    }
-    fn base64_photo(line: &str) -> Option<&str> {
-        let (params, value) = vcard_property(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);
-        }
-        if let Some(value) = remove_prefix(value, "data:image/jpeg;base64,")
-            .or_else(|| remove_prefix(value, r"data:image/jpeg;base64\,"))
-        {
-            return Some(value);
-        }
-
-        None
-    }
-    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 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, 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
-}
-
-#[cfg(test)]
-mod vcard_tests;
--- a/deltachat-contact-tools/src/vcard/vcard_tests.rs
+++ b/deltachat-contact-tools/src/vcard/vcard_tests.rs
@@ -1,274 +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()),
-            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_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
-#[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 = "1.159.5"
+version = "1.155.6"
 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/deltachat.h
+++ b/deltachat-ffi/deltachat.h
@@ -220,7 +220,7 @@ typedef struct _dc_event_emitter dc_accounts_event_emitter_t;
 * - Strings in function arguments or return values are usually UTF-8 encoded.
 *
 * - The issue-tracker for the core library is here:
- *   <https://github.com/chatmail/core/issues>
+ *   <https://github.com/deltachat/deltachat-core-rust/issues>
 *
 * If you need further assistance,
 * please do not hesitate to contact us
@@ -440,6 +440,17 @@ char*           dc_get_blobdir               (const dc_context_t* context);
 *                    also show all mails of confirmed contacts,
 *                    DC_SHOW_EMAILS_ALL (2)=
 *                    also show mails of unconfirmed contacts (default).
+ * - `key_gen_type` = DC_KEY_GEN_DEFAULT (0)=
+ *                    generate recommended key type (default),
+ *                    DC_KEY_GEN_RSA2048 (1)=
+ *                    generate RSA 2048 keypair
+ *                    DC_KEY_GEN_ED25519 (2)=
+ *                    generate Curve25519 keypair
+ *                    DC_KEY_GEN_RSA4096 (3)=
+ *                    generate RSA 4096 keypair
+ * - `save_mime_headers` = 1=save mime headers
+ *                    and make dc_get_mime_headers() work for subsequent calls,
+ *                    0=do not save mime headers (default)
 * - `delete_device_after` = 0=do not delete messages from device automatically (default),
 *                    >=1=seconds, after which messages are deleted automatically from the device.
 *                    Messages in the "saved messages" chat (see dc_chat_is_self_talk()) are skipped.
@@ -1028,6 +1039,20 @@ uint32_t        dc_send_msg_sync                  (dc_context_t* context, uint32
 uint32_t        dc_send_text_msg             (dc_context_t* context, uint32_t chat_id, const char* text_to_send);


+/**
+ * Check if a message can be edited using dc_send_edit_request().
+ *
+ * Messages that cannot be edited are eg. info messages or messages not sent by self.
+ * UI will usually check this function whether to display an "Edit" option or not.
+ *
+ * @memberof dc_context_t
+ * @param context The context object.
+ * @param msg_id The message ID to check.
+ * @return 1=message can be edited, 0=message cannot be edited.
+ */
+ int             dc_can_send_edit_request    (dc_context_t* context, uint32_t msg_id);
+
+
 /**
 * Send chat members a request to edit the given message's text.
 *
@@ -1045,21 +1070,6 @@ uint32_t        dc_send_text_msg             (dc_context_t* context, uint32_t ch
 void            dc_send_edit_request         (dc_context_t* context, uint32_t msg_id, const char* new_text);


-/**
- * Send chat members a request to delete the given messages.
- *
- * Only outgoing messages can be deleted this way
- * and all messages must be in the same chat.
- * No tombstone or sth. like that is left.
- *
- * @memberof dc_context_t
- * @param context The context object as returned from dc_context_new().
- * @param msg_ids An array of uint32_t containing all message IDs to delete.
- * @param msg_cnt The number of messages IDs in the msg_ids array.
- */
- void            dc_send_delete_request       (dc_context_t* context, const uint32_t* msg_ids, int msg_cnt);
-
-
 /**
 * Send invitation to a videochat.
 *
@@ -1950,7 +1960,24 @@ void dc_download_full_msg (dc_context_t* context, int msg_id);


 /**
- * Delete messages. The messages are deleted on all devices and
+ * Get the raw mime-headers of the given message.
+ * Raw headers are saved for incoming messages
+ * only if `dc_set_config(context, "save_mime_headers", "1")`
+ * was called before.
+ *
+ * @memberof dc_context_t
+ * @param context The context object.
+ * @param msg_id The message ID, must be the ID of an incoming message.
+ * @return Raw headers as a multi-line string, must be released using dc_str_unref() after usage.
+ *     Returns NULL if there are no headers saved for the given message,
+ *     e.g. because of save_mime_headers is not set
+ *     or the message is not incoming.
+ */
+char*           dc_get_mime_headers          (dc_context_t* context, uint32_t msg_id);
+
+
+/**
+ * Delete messages. The messages are deleted on the current device and
 * on the IMAP server.
 *
 * @memberof dc_context_t
@@ -2132,10 +2159,7 @@ 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


@@ -2165,29 +2189,6 @@ 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.
 *
@@ -2197,6 +2198,8 @@ dc_array_t*     dc_import_vcard              (dc_context_t* context, const char*
 * @param context The context object.
 * @param flags A combination of flags:
 *     - 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
@@ -2487,9 +2490,8 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
 #define         DC_QR_FPR_MISMATCH           220 // id=contact
 #define         DC_QR_FPR_WITHOUT_ADDR       230 // test1=formatted fingerprint
 #define         DC_QR_ACCOUNT                250 // text1=domain
-#define         DC_QR_BACKUP                 251 // deprecated
+#define         DC_QR_BACKUP                 251
 #define         DC_QR_BACKUP2                252
-#define         DC_QR_BACKUP_TOO_NEW         255
 #define         DC_QR_WEBRTC_INSTANCE        260 // text1=domain, text2=instance pattern
 #define         DC_QR_PROXY                  271 // text1=address (e.g. "127.0.0.1:9050")
 #define         DC_QR_ADDR                   320 // id=contact
@@ -2536,14 +2538,11 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
 *   ask the user if they want to create an account on the given domain,
 *   if so, call dc_set_config_from_qr() and then dc_configure().
 *
+ * - DC_QR_BACKUP:
 * - DC_QR_BACKUP2:
 *   ask the user if they want to set up a new device.
 *   If so, pass the qr-code to dc_receive_backup().
 *
- * - DC_QR_BACKUP_TOO_NEW:
- *   show a hint to the user that this backup comes from a newer Delta Chat version
- *   and this device needs an update
- *
 * - DC_QR_WEBRTC_INSTANCE with dc_lot_t::text1=domain:
 *   ask the user if they want to use the given service for video chats;
 *   if so, call dc_set_config_from_qr().
@@ -4507,11 +4506,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",
@@ -4519,10 +4513,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()
 *
@@ -4535,29 +4525,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
@@ -6342,18 +6309,6 @@ void dc_event_unref(dc_event_t* event);
 #define DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED 2021


-/**
- * Chat was deleted.
- * This event is emitted in response to dc_delete_chat()
- * called on this or another device.
- * The event is a good place to remove notifications or homescreen shortcuts.
- *
- * @param data1 (int) chat_id
- * @param data2 (int) 0
- */
-#define DC_EVENT_CHAT_DELETED             2023
-
-
 /**
 * Contact(s) created, renamed, verified, blocked or deleted.
 *
@@ -6594,6 +6549,15 @@ void dc_event_unref(dc_event_t* event);
 #define DC_MEDIA_QUALITY_WORSE    1


+/*
+ * Values for dc_get|set_config("key_gen_type")
+ */
+#define DC_KEY_GEN_DEFAULT 0
+#define DC_KEY_GEN_RSA2048 1
+#define DC_KEY_GEN_ED25519 2
+#define DC_KEY_GEN_RSA4096 3
+
+
 /**
 * @defgroup DC_PROVIDER_STATUS DC_PROVIDER_STATUS
 *
@@ -6913,12 +6877,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."
@@ -7593,13 +7557,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.
-#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
@@ -537,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,
@@ -545,7 +544,6 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
        EventType::MsgDeleted { .. } => 2016,
        EventType::ChatModified(_) => 2020,
        EventType::ChatEphemeralTimerModified { .. } => 2021,
-        EventType::ChatDeleted { .. } => 2023,
        EventType::ContactsChanged(_) => 2030,
        EventType::LocationChanged(_) => 2035,
        EventType::ConfigureProgress { .. } => 2041,
@@ -595,7 +593,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
@@ -612,8 +610,7 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
        | EventType::MsgRead { chat_id, .. }
        | EventType::MsgDeleted { chat_id, .. }
        | EventType::ChatModified(chat_id)
-        | EventType::ChatEphemeralTimerModified { chat_id, .. }
-        | EventType::ChatDeleted { chat_id } => chat_id.to_u32() as libc::c_int,
+        | EventType::ChatEphemeralTimerModified { chat_id, .. } => chat_id.to_u32() as libc::c_int,
        EventType::ContactsChanged(id) | EventType::LocationChanged(id) => {
            let id = id.unwrap_or_default();
            id.to_u32() as libc::c_int
@@ -670,7 +667,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
@@ -679,7 +676,6 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
        | EventType::AccountsItemChanged
        | EventType::ConfigSynced { .. }
        | EventType::ChatModified(_)
-        | EventType::ChatDeleted { .. }
        | EventType::WebxdcRealtimeAdvertisementReceived { .. }
        | EventType::EventChannelOverflow { .. } => 0,
        EventType::MsgsChanged { msg_id, .. }
@@ -771,8 +767,7 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
        | EventType::WebxdcInstanceDeleted { .. }
        | EventType::AccountsBackgroundFetchDone
        | EventType::ChatEphemeralTimerModified { .. }
-        | EventType::ChatDeleted { .. }
-        | EventType::IncomingMsgBunch
+        | EventType::IncomingMsgBunch { .. }
        | EventType::ChatlistItemChanged { .. }
        | EventType::ChatlistChanged
        | EventType::AccountsChanged
@@ -1046,6 +1041,22 @@ pub unsafe extern "C" fn dc_send_text_msg(
    })
 }

+#[no_mangle]
+pub unsafe extern "C" fn dc_can_send_edit_request(
+    context: *mut dc_context_t,
+    msg_id: u32,
+) -> libc::c_int {
+    if context.is_null() {
+        eprintln!("ignoring careless call to dc_can_send_edit_request()");
+        return 0;
+    }
+    let ctx = &*context;
+
+    block_on(chat::can_send_edit_request(ctx, MsgId::new(msg_id)))
+        .log_err(ctx)
+        .unwrap_or_default() as libc::c_int
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn dc_send_edit_request(
    context: *mut dc_context_t,
@@ -1063,25 +1074,6 @@ pub unsafe extern "C" fn dc_send_edit_request(
        .unwrap_or_log_default(ctx, "Failed to send text edit")
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_send_delete_request(
-    context: *mut dc_context_t,
-    msg_ids: *const u32,
-    msg_cnt: libc::c_int,
-) {
-    if context.is_null() || msg_ids.is_null() || msg_cnt <= 0 {
-        eprintln!("ignoring careless call to dc_send_delete_request()");
-        return;
-    }
-    let ctx = &*context;
-    let msg_ids = convert_and_prune_message_ids(msg_ids, msg_cnt);
-
-    block_on(message::delete_msgs_ex(ctx, &msg_ids, true))
-        .context("failed dc_send_delete_request() call")
-        .log_err(ctx)
-        .ok();
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_send_videochat_invitation(
    context: *mut dc_context_t,
@@ -1659,7 +1651,6 @@ pub unsafe extern "C" fn dc_get_chat(context: *mut dc_context_t, chat_id: u32) -
        return ptr::null_mut();
    }
    let ctx = &*context;
-    let context: Context = ctx.clone();

    block_on(async move {
        match chat::Chat::load_from_db(ctx, ChatId::new(chat_id)).await {
@@ -1955,6 +1946,28 @@ pub unsafe extern "C" fn dc_get_msg_html(
        .strdup()
 }

+#[no_mangle]
+pub unsafe extern "C" fn dc_get_mime_headers(
+    context: *mut dc_context_t,
+    msg_id: u32,
+) -> *mut libc::c_char {
+    if context.is_null() {
+        eprintln!("ignoring careless call to dc_get_mime_headers()");
+        return ptr::null_mut(); // NULL explicitly defined as "no mime headers"
+    }
+    let ctx = &*context;
+
+    block_on(async move {
+        let mime = message::get_mime_headers(ctx, MsgId::new(msg_id))
+            .await
+            .unwrap_or_log_default(ctx, "failed to get mime headers");
+        if mime.is_empty() {
+            return ptr::null_mut();
+        }
+        mime.strdup()
+    })
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn dc_delete_msgs(
    context: *mut dc_context_t,
@@ -2077,7 +2090,7 @@ pub unsafe extern "C" fn dc_get_msg(context: *mut dc_context_t, msg_id: u32) ->
                        ctx,
                        "dc_get_msg called with special msg_id={msg_id}, returning empty msg"
                    );
-                    message::Message::new(Viewtype::default())
+                    message::Message::default()
                } else {
                    warn!(ctx, "dc_get_msg could not retrieve msg_id {msg_id}: {e:#}");
                    return ptr::null_mut();
@@ -2171,48 +2184,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,
@@ -3026,7 +2997,7 @@ pub unsafe extern "C" fn dc_chatlist_get_context(
 /// context, but the Rust API does not, so the FFI layer needs to glue
 /// these together.
 pub struct ChatWrapper {
-    context: Context,
+    context: *const dc_context_t,
    chat: chat::Chat,
 }

@@ -3093,13 +3064,14 @@ pub unsafe extern "C" fn dc_chat_get_profile_image(chat: *mut dc_chat_t) -> *mut
        return ptr::null_mut(); // NULL explicitly defined as "no image"
    }
    let ffi_chat = &*chat;
+    let ctx = &*ffi_chat.context;

    block_on(async move {
-        match ffi_chat.chat.get_profile_image(&ffi_chat.context).await {
+        match ffi_chat.chat.get_profile_image(ctx).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:#}");
+                error!(ctx, "failed to get profile image: {err:#}");
                ptr::null_mut()
            }
        }
@@ -3113,9 +3085,9 @@ pub unsafe extern "C" fn dc_chat_get_color(chat: *mut dc_chat_t) -> u32 {
        return 0;
    }
    let ffi_chat = &*chat;
+    let ctx = &*ffi_chat.context;

-    block_on(ffi_chat.chat.get_color(&ffi_chat.context))
-        .unwrap_or_log_default(&ffi_chat.context, "Failed get_color")
+    block_on(ffi_chat.chat.get_color(ctx)).unwrap_or_log_default(ctx, "Failed get_color")
 }

 #[no_mangle]
@@ -3179,9 +3151,10 @@ pub unsafe extern "C" fn dc_chat_can_send(chat: *mut dc_chat_t) -> libc::c_int {
        return 0;
    }
    let ffi_chat = &*chat;
-    block_on(ffi_chat.chat.can_send(&ffi_chat.context))
+    let ctx = &*ffi_chat.context;
+    block_on(ffi_chat.chat.can_send(ctx))
        .context("can_send failed")
-        .log_err(&ffi_chat.context)
+        .log_err(ctx)
        .unwrap_or_default() as libc::c_int
 }

@@ -3773,20 +3746,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() {
--- a/deltachat-ffi/src/lot.rs
+++ b/deltachat-ffi/src/lot.rs
@@ -50,7 +50,6 @@ impl Lot {
                Qr::FprWithoutAddr { fingerprint, .. } => Some(Cow::Borrowed(fingerprint)),
                Qr::Account { domain } => Some(Cow::Borrowed(domain)),
                Qr::Backup2 { .. } => None,
-                Qr::BackupTooNew { .. } => None,
                Qr::WebrtcInstance { domain, .. } => Some(Cow::Borrowed(domain)),
                Qr::Proxy { host, port, .. } => Some(Cow::Owned(format!("{host}:{port}"))),
                Qr::Addr { draft, .. } => draft.as_deref().map(Cow::Borrowed),
@@ -104,7 +103,6 @@ impl Lot {
                Qr::FprWithoutAddr { .. } => LotState::QrFprWithoutAddr,
                Qr::Account { .. } => LotState::QrAccount,
                Qr::Backup2 { .. } => LotState::QrBackup2,
-                Qr::BackupTooNew { .. } => LotState::QrBackupTooNew,
                Qr::WebrtcInstance { .. } => LotState::QrWebrtcInstance,
                Qr::Proxy { .. } => LotState::QrProxy,
                Qr::Addr { .. } => LotState::QrAddr,
@@ -131,7 +129,6 @@ impl Lot {
                Qr::FprWithoutAddr { .. } => Default::default(),
                Qr::Account { .. } => Default::default(),
                Qr::Backup2 { .. } => Default::default(),
-                Qr::BackupTooNew { .. } => Default::default(),
                Qr::WebrtcInstance { .. } => Default::default(),
                Qr::Proxy { .. } => Default::default(),
                Qr::Addr { contact_id, .. } => contact_id.to_u32(),
@@ -181,9 +178,9 @@ pub enum LotState {
    /// text1=domain
    QrAccount = 250,

-    QrBackup2 = 252,
+    QrBackup = 251,

-    QrBackupTooNew = 255,
+    QrBackup2 = 252,

    /// text1=domain, text2=instance pattern
    QrWebrtcInstance = 260,
--- a/deltachat-jsonrpc/Cargo.toml
+++ b/deltachat-jsonrpc/Cargo.toml
@@ -1,19 +1,28 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.159.5"
+version = "1.155.6"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
+default-run = "deltachat-jsonrpc-server"
 license = "MPL-2.0"
-repository = "https://github.com/chatmail/core"
+repository = "https://github.com/deltachat/deltachat-core-rust"
+
+[[bin]]
+name = "deltachat-jsonrpc-server"
+path = "src/webserver.rs"
+required-features = ["webserver"]

 [dependencies]
 anyhow = { workspace = true }
 deltachat = { workspace = true }
 deltachat-contact-tools = { workspace = true }
 num-traits = { workspace = true }
-schemars = "0.8.22"
+schemars = "0.8.21"
 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"] }
@@ -22,12 +31,15 @@ sanitize-filename = { workspace = true }
 walkdir = "2.5.0"
 base64 = { workspace = true }

+# optional dependencies
+axum = { version = "0.7", optional = true, features = ["ws"] }
+env_logger = { version = "0.11.6", optional = true }
+
 [dev-dependencies]
 tokio = { workspace = true, features = ["full", "rt-multi-thread"] }
-tempfile = { workspace = true }
-futures = { workspace = true }


 [features]
 default = ["vendored"]
+webserver = ["dep:env_logger", "dep:axum", "tokio/full", "yerpc/support-axum"]
 vendored = ["deltachat/vendored"]
--- a/deltachat-jsonrpc/README.md
+++ b/deltachat-jsonrpc/README.md
@@ -4,16 +4,46 @@ This crate provides a [JSON-RPC 2.0](https://www.jsonrpc.org/specification) inte

 The JSON-RPC API is exposed in two fashions:

-* A executable `deltachat-rpc-server` that exposes the JSON-RPC API through stdio.
-* The JSON-RPC API can also be called through the [C FFI](../deltachat-ffi). It exposes the functions `dc_jsonrpc_init`, `dc_jsonrpc_request`, `dc_jsonrpc_next_response` and `dc_jsonrpc_unref`. See the docs in the [header file](../deltachat-ffi/deltachat.h) for details.
+* A executable that exposes the JSON-RPC API through a [WebSocket](https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API) server running on localhost.
+* The JSON-RPC API can also be called through the [C FFI](../deltachat-ffi). The C FFI needs to be built with the `jsonrpc` feature. It will then expose the functions `dc_jsonrpc_init`, `dc_jsonrpc_request`, `dc_jsonrpc_next_response` and `dc_jsonrpc_unref`. See the docs in the [header file](../deltachat-ffi/deltachat.h) for details.

-We also include a JavaScript and TypeScript client for the JSON-RPC API. The source for this is in the [`typescript`](typescript) folder.
+We also include a JavaScript and TypeScript client for the JSON-RPC API. The source for this is in the [`typescript`](typescript) folder. The client can easily be used with the WebSocket server to build DeltaChat apps for web browsers or Node.js. See the [examples](typescript/example) for details.

 ## Usage

+#### Running the WebSocket server
+
+From within this folder, you can start the WebSocket server with the following command:
+
+```sh
+cargo run --features webserver
+```
+
+If you want to use the server in a production setup, first build it in release mode:
+
+```sh
+cargo build --features webserver --release
+```
+You will then find the `deltachat-jsonrpc-server` executable in your `target/release` folder.
+
+The executable currently does not support any command-line arguments. By default, once started it will accept WebSocket connections on `ws://localhost:20808/ws`. It will store the persistent configuration and databases in a `./accounts` folder relative to the directory from where it is started.
+
+The server can be configured with environment variables:
+
+|variable|default|description|
+|-|-|-|
+|`DC_PORT`|`20808`|port to listen on|
+|`DC_ACCOUNTS_PATH`|`./accounts`|path to storage directory|
+
+If you are targeting other architectures (like KaiOS or Android), the webserver binary can be cross-compiled easily with [rust-cross](https://github.com/cross-rs/cross):
+
+```sh
+cross build --features=webserver --target armv7-linux-androideabi --release
+```
+
 #### Using the TypeScript/JavaScript client

-The package includes a JavaScript/TypeScript client which is partially auto-generated through the JSON-RPC library used by this crate ([yerpc](https://github.com/chatmail/yerpc)). Find the source in the [`typescript`](typescript) folder. 
+The package includes a JavaScript/TypeScript client which is partially auto-generated through the JSON-RPC library used by this crate ([yerpc](https://github.com/Frando/yerpc/)). Find the source in the [`typescript`](typescript) folder. 

 To use it locally, first install the dependencies and compile the TypeScript code to JavaScript:
 ```sh
@@ -22,7 +52,15 @@ npm install
 npm run build
 ```

-The JavaScript client is [published on NPM](https://www.npmjs.com/package/@deltachat/jsonrpc-client).
+The JavaScript client is not yet published on NPM (but will likely be soon). Currently, it is recommended to vendor the bundled build. After running `npm run build` as documented above, there will be a file `dist/deltachat.bundle.js`. This is an ESM module containing all dependencies. Copy this file to your project and import the DeltaChat class.
+
+
+```typescript
+import { DeltaChat } from './deltachat.bundle.js'
+const dc = new DeltaChat('ws://localhost:20808/ws')
+const accounts = await dc.rpc.getAllAccounts()
+console.log('accounts', accounts)
+```

 A script is included to build autogenerated documentation, which includes all RPC methods:
 ```sh
@@ -35,6 +73,18 @@ Then open the [`typescript/docs`](typescript/docs) folder in a web browser.

 #### Running the example app

+We include a small demo web application that talks to the WebSocket server. It can be used for testing. Feel invited to expand this.
+
+```sh
+cd typescript
+npm run build
+npm run example:build
+npm run example:start
+```
+Then, open [`http://localhost:8080/example.html`](http://localhost:8080/example.html) in a web browser.
+
+Run `npm run example:dev` to live-rebuild the example app when files changes.
+
 ### Testing

 The crate includes both a basic Rust smoke test and more featureful integration tests that use the TypeScript client.
@@ -54,12 +104,14 @@ cd typescript
 npm run test
 ```

-This will build the `deltachat-jsonrpc-server` binary and then run a test suite.
+This will build the `deltachat-jsonrpc-server` binary and then run a test suite against the WebSocket server.

-The test suite includes some tests that need online connectivity and a way to create test email accounts. To run these tests, set the `CHATMAIL_DOMAIN` environment variable to your testing email server domain.
+The test suite includes some tests that need online connectivity and a way to create test email accounts. To run these tests, talk to DeltaChat developers to get a token for the `testrun.org` service, or use a local instance of [`mailadm`](https://github.com/deltachat/docker-mailadm).
+
+Then, set the `CHATMAIL_DOMAIN` environment variable to your testing email server domain.

 ```
-CHATMAIL_DOMAIN=ci-chatmail.testrun.org npm run test
+CHATMAIL_DOMAIN=chat.example.org npm run test
 ```

 #### Test Coverage
--- a/deltachat-jsonrpc/TODO.md
+++ b/deltachat-jsonrpc/TODO.md
@@ -0,0 +1,28 @@
+# TODO
+
+- [ ] different test type to simulate two devices: to test autocrypt_initiate_key_transfer & autocrypt_continue_key_transfer
+
+## MVP - Websocket server&client
+
+For kaiOS and other experiments, like a deltachat "web" over network from an android phone.
+
+- [ ] coverage for a majority of the API
+- [ ] Blobs served
+- [ ] Blob upload (for attachments, setting profile-picture, importing backup and so on)
+- [ ] other way blobs can be addressed when using websocket vs. jsonrpc over dc-node
+- [ ] Web push API? At least some kind of notification hook closure this lib can accept.
+
+### Other Ideas for the Websocket server
+
+- [ ] make sure there can only be one connection at a time to the ws
+  - why? , it could give problems if its commanded from multiple connections
+- [ ] encrypted connection?
+- [ ] authenticated connection?
+- [ ] Look into unit-testing for the proc macros?
+- [ ] proc macro taking over doc comments to generated typescript file
+
+## Desktop Apis
+
+Incomplete todo for desktop api porting, just some remainders for points that might need more work:
+
+- [ ] manual start/stop io functions in the api for context and accounts, so "not syncing all accounts" can still be done in desktop -> webserver should then not do start io on all accounts by default
--- a/deltachat-jsonrpc/src/api.rs
+++ b/deltachat-jsonrpc/src/api.rs
@@ -1,5 +1,5 @@
 use std::collections::BTreeMap;
-use std::path::{Path, PathBuf};
+use std::path::Path;
 use std::str;
 use std::sync::Arc;
 use std::time::Duration;
@@ -7,7 +7,6 @@ use std::{collections::HashMap, str::FromStr};

 use anyhow::{anyhow, bail, ensure, Context, Result};
 pub use deltachat::accounts::Accounts;
-use deltachat::blob::BlobObject;
 use deltachat::chat::{
    self, add_contact_to_chat, forward_msgs, get_chat_media, get_chat_msgs, get_chat_msgs_ex,
    marknoticed_chat, remove_contact_from_chat, Chat, ChatId, ChatItem, MessageListOptions,
@@ -22,7 +21,7 @@ use deltachat::ephemeral::Timer;
 use deltachat::location;
 use deltachat::message::get_msg_read_receipts;
 use deltachat::message::{
-    self, delete_msgs_ex, markseen_msgs, Message, MessageState, MsgId, Viewtype,
+    self, delete_msgs, markseen_msgs, Message, MessageState, MsgId, Viewtype,
 };
 use deltachat::peer_channels::{
    leave_webxdc_realtime, send_webxdc_realtime_advertisement, send_webxdc_realtime_data,
@@ -39,7 +38,6 @@ use deltachat::{imex, info};
 use sanitize_filename::is_sanitized;
 use tokio::fs;
 use tokio::sync::{watch, Mutex, RwLock};
-use types::login_param::EnteredLoginParam;
 use walkdir::WalkDir;
 use yerpc::rpc;

@@ -227,9 +225,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 +324,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))
    }

@@ -348,19 +341,11 @@ impl CommandApi {
        ctx.get_info().await
    }

-    /// Get the blob dir.
    async fn get_blob_dir(&self, account_id: u32) -> Result<Option<String>> {
        let ctx = self.get_context(account_id).await?;
        Ok(ctx.get_blobdir().to_str().map(|s| s.to_owned()))
    }

-    /// 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?;
-        let file = Path::new(&path);
-        Ok(BlobObject::create_and_deduplicate(&ctx, file, file)?.to_abs_path())
-    }
-
    async fn draft_self_report(&self, account_id: u32) -> Result<u32> {
        let ctx = self.get_context(account_id).await?;
        Ok(ctx.draft_self_report().await?.to_u32())
@@ -437,9 +422,6 @@ impl CommandApi {

    /// Configures this account with the currently set parameters.
    /// Setup the credential config before calling this.
-    ///
-    /// Deprecated as of 2025-02; use `add_transport_from_qr()`
-    /// or `add_or_update_transport()` instead.
    async fn configure(&self, account_id: u32) -> Result<()> {
        let ctx = self.get_context(account_id).await?;
        ctx.stop_io().await;
@@ -454,78 +436,6 @@ impl CommandApi {
        Ok(())
    }

-    /// Configures a new email account using the provided parameters
-    /// and adds it as a transport.
-    ///
-    /// If the email address is the same as an existing transport,
-    /// then this existing account will be reconfigured instead of a new one being added.
-    ///
-    /// This function stops and starts IO as needed.
-    ///
-    /// Usually it will be enough to only set `addr` and `password`,
-    /// and all the other settings will be autoconfigured.
-    ///
-    /// During configuration, ConfigureProgress events are emitted;
-    /// they indicate a successful configuration as well as errors
-    /// and may be used to create a progress bar.
-    /// This function will return after configuration is finished.
-    ///
-    /// If configuration is successful,
-    /// the working server parameters will be saved
-    /// and used for connecting to the server.
-    /// The parameters entered by the user will be saved separately
-    /// so that they can be prefilled when the user opens the server-configuration screen again.
-    ///
-    /// See also:
-    /// - [Self::is_configured()] to check whether there is
-    ///   at least one working transport.
-    /// - [Self::add_transport_from_qr()] to add a transport
-    ///   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
-    }
-
-    /// Adds a new email account as a transport
-    /// using the server encoded in the QR code.
-    /// See [Self::add_or_update_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
-    /// 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?;
-        let res = ctx
-            .list_transports()
-            .await?
-            .into_iter()
-            .map(|t| t.into())
-            .collect();
-        Ok(res)
-    }
-
-    /// Removes the transport with the specified email address
-    /// (i.e. [EnteredLoginParam::addr]).
-    async fn delete_transport(&self, account_id: u32, addr: String) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        ctx.delete_transport(&addr).await
-    }
-
    /// Signal an ongoing process to stop.
    async fn stop_ongoing_process(&self, account_id: u32) -> Result<()> {
        let ctx = self.get_context(account_id).await?;
@@ -1295,15 +1205,7 @@ impl CommandApi {
    async fn delete_messages(&self, account_id: u32, message_ids: Vec<u32>) -> Result<()> {
        let ctx = self.get_context(account_id).await?;
        let msgs: Vec<MsgId> = message_ids.into_iter().map(MsgId::new).collect();
-        delete_msgs_ex(&ctx, &msgs, false).await
-    }
-
-    /// Delete messages. The messages are deleted on the current device,
-    /// on the IMAP server and also for all chat members
-    async fn delete_messages_for_all(&self, account_id: u32, message_ids: Vec<u32>) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        let msgs: Vec<MsgId> = message_ids.into_iter().map(MsgId::new).collect();
-        delete_msgs_ex(&ctx, &msgs, true).await
+        delete_msgs(&ctx, &msgs).await
    }

    /// Get an informational text for a single message. The text is multiline and may
@@ -1551,7 +1453,6 @@ impl CommandApi {
        Ok(())
    }

-    /// Sets display name for existing contact.
    async fn change_contact_name(
        &self,
        account_id: u32,
@@ -1560,7 +1461,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(())
    }

@@ -1615,18 +1518,6 @@ impl CommandApi {
            .collect())
    }

-    /// Imports contacts from a vCard.
-    ///
-    /// Returns the ids of created/modified contacts in the order they appear in the vCard.
-    async fn import_vcard_contents(&self, account_id: u32, vcard: String) -> Result<Vec<u32>> {
-        let ctx = self.get_context(account_id).await?;
-        Ok(deltachat::contact::import_vcard(&ctx, &vcard)
-            .await?
-            .into_iter()
-            .map(|c| c.to_u32())
-            .collect())
-    }
-
    /// Returns a vCard containing contacts with the given ids.
    async fn make_vcard(&self, account_id: u32, contacts: Vec<u32>) -> Result<String> {
        let ctx = self.get_context(account_id).await?;
@@ -1960,9 +1851,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())
    }

@@ -2109,16 +2004,6 @@ impl CommandApi {
        Ok(msg_id)
    }

-    async fn send_edit_request(
-        &self,
-        account_id: u32,
-        msg_id: u32,
-        new_text: String,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        chat::send_edit_request(&ctx, MsgId::new(msg_id), new_text).await
-    }
-
    /// Checks if messages can be sent to a given chat.
    async fn can_send(&self, account_id: u32, chat_id: u32) -> Result<bool> {
        let ctx = self.get_context(account_id).await?;
@@ -2285,37 +2170,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/events.rs
+++ b/deltachat-jsonrpc/src/api/types/events.rs
@@ -243,12 +243,6 @@ pub enum EventType {
        timer: u32,
    },

-    /// Chat deleted.
-    ChatDeleted {
-        /// Chat ID.
-        chat_id: u32,
-    },
-
    /// Contact(s) created, renamed, blocked or deleted.
    #[serde(rename_all = "camelCase")]
    ContactsChanged {
@@ -505,9 +499,6 @@ impl From<CoreEventType> for EventType {
                    timer: timer.to_u32(),
                }
            }
-            CoreEventType::ChatDeleted { chat_id } => ChatDeleted {
-                chat_id: chat_id.to_u32(),
-            },
            CoreEventType::ContactsChanged(contact) => ContactsChanged {
                contact_id: contact.map(|c| c.to_u32()),
            },
--- a/deltachat-jsonrpc/src/api/types/login_param.rs
+++ b/deltachat-jsonrpc/src/api/types/login_param.rs
@@ -1,203 +0,0 @@
-use anyhow::Result;
-use deltachat::login_param as dc;
-use serde::Deserialize;
-use serde::Serialize;
-use yerpc::TypeDef;
-
-/// 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 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>,
-
-    /// TLS options: whether to allow invalid certificates and/or
-    /// invalid hostnames.
-    /// Default: Automatic
-    pub certificate_checks: Option<EnteredCertificateChecks>,
-
-    /// If true, login via OAUTH2 (not recommended anymore).
-    /// Default: false
-    pub oauth2: Option<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(),
-        }
-    }
-}
-
-impl TryFrom<EnteredLoginParam> for dc::EnteredLoginParam {
-    type Error = anyhow::Error;
-
-    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(),
-        })
-    }
-}
-
-#[derive(Serialize, Deserialize, TypeDef, schemars::JsonSchema, Default, PartialEq)]
-#[serde(rename_all = "camelCase")]
-pub enum Socket {
-    /// Unspecified socket security, select automatically.
-    #[default]
-    Automatic,
-
-    /// TLS connection.
-    Ssl,
-
-    /// STARTTLS connection.
-    Starttls,
-
-    /// No TLS, plaintext connection.
-    Plain,
-}
-
-impl From<dc::Socket> for Socket {
-    fn from(value: dc::Socket) -> Self {
-        match value {
-            dc::Socket::Automatic => Self::Automatic,
-            dc::Socket::Ssl => Self::Ssl,
-            dc::Socket::Starttls => Self::Starttls,
-            dc::Socket::Plain => Self::Plain,
-        }
-    }
-}
-
-impl From<Socket> for dc::Socket {
-    fn from(value: Socket) -> Self {
-        match value {
-            Socket::Automatic => Self::Automatic,
-            Socket::Ssl => Self::Ssl,
-            Socket::Starttls => Self::Starttls,
-            Socket::Plain => Self::Plain,
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, TypeDef, schemars::JsonSchema, Default, PartialEq)]
-#[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.
-    Strict,
-
-    /// Accept certificates that are expired, self-signed
-    /// or otherwise not valid for the server hostname.
-    AcceptInvalidCertificates,
-}
-
-impl From<dc::EnteredCertificateChecks> for EnteredCertificateChecks {
-    fn from(value: dc::EnteredCertificateChecks) -> Self {
-        match value {
-            dc::EnteredCertificateChecks::Automatic => Self::Automatic,
-            dc::EnteredCertificateChecks::Strict => Self::Strict,
-            dc::EnteredCertificateChecks::AcceptInvalidCertificates => {
-                Self::AcceptInvalidCertificates
-            }
-            dc::EnteredCertificateChecks::AcceptInvalidCertificates2 => {
-                Self::AcceptInvalidCertificates
-            }
-        }
-    }
-}
-
-impl From<EnteredCertificateChecks> for dc::EnteredCertificateChecks {
-    fn from(value: EnteredCertificateChecks) -> Self {
-        match value {
-            EnteredCertificateChecks::Automatic => Self::Automatic,
-            EnteredCertificateChecks::Strict => Self::Strict,
-            EnteredCertificateChecks::AcceptInvalidCertificates => Self::AcceptInvalidCertificates,
-        }
-    }
-}
-
-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
@@ -70,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,
@@ -231,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(),
@@ -680,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>,
@@ -692,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,
@@ -704,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
@@ -5,7 +5,6 @@ pub mod contact;
 pub mod events;
 pub mod http;
 pub mod location;
-pub mod login_param;
 pub mod message;
 pub mod provider_info;
 pub mod qr;
--- a/deltachat-jsonrpc/src/api/types/qr.rs
+++ b/deltachat-jsonrpc/src/api/types/qr.rs
@@ -63,7 +63,6 @@ pub enum QrObject {
        /// Iroh node address.
        node_addr: String,
    },
-    BackupTooNew {},
    /// Ask the user if they want to use the given service for video chats.
    WebrtcInstance {
        domain: String,
@@ -101,15 +100,11 @@ pub enum QrObject {
    /// URL scanned.
    ///
    /// Ask the user if they want to open a browser or copy the URL to clipboard.
-    Url {
-        url: String,
-    },
+    Url { url: String },
    /// Text scanned.
    ///
    /// Ask the user if they want to copy the text to clipboard.
-    Text {
-        text: String,
-    },
+    Text { text: String },
    /// Ask the user if they want to withdraw their own QR code.
    WithdrawVerifyContact {
        /// Contact ID.
@@ -165,9 +160,7 @@ pub enum QrObject {
    /// `dclogin:` scheme parameters.
    ///
    /// Ask the user if they want to login with the email address.
-    Login {
-        address: String,
-    },
+    Login { address: String },
 }

 impl From<Qr> for QrObject {
@@ -224,7 +217,6 @@ impl From<Qr> for QrObject {
                node_addr: serde_json::to_string(node_addr).unwrap_or_default(),
                auth_token,
            },
-            Qr::BackupTooNew {} => QrObject::BackupTooNew {},
            Qr::WebrtcInstance {
                domain,
                instance_pattern,
--- a/deltachat-jsonrpc/src/webserver.rs
+++ b/deltachat-jsonrpc/src/webserver.rs
@@ -0,0 +1,47 @@
+#![recursion_limit = "256"]
+use std::net::SocketAddr;
+use std::path::PathBuf;
+
+use axum::{extract::ws::WebSocketUpgrade, response::Response, routing::get, Extension, Router};
+use yerpc::axum::handle_ws_rpc;
+use yerpc::{RpcClient, RpcSession};
+
+mod api;
+use api::{Accounts, CommandApi};
+
+const DEFAULT_PORT: u16 = 20808;
+
+#[tokio::main(flavor = "multi_thread")]
+async fn main() -> Result<(), std::io::Error> {
+    env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init();
+
+    let path = std::env::var("DC_ACCOUNTS_PATH").unwrap_or_else(|_| "./accounts".to_string());
+    let port = std::env::var("DC_PORT")
+        .map(|port| port.parse::<u16>().expect("DC_PORT must be a number"))
+        .unwrap_or(DEFAULT_PORT);
+    log::info!("Starting with accounts directory `{path}`.");
+    let writable = true;
+    let accounts = Accounts::new(PathBuf::from(&path), writable).await.unwrap();
+    let state = CommandApi::new(accounts);
+
+    let app = Router::new()
+        .route("/ws", get(handler))
+        .layer(Extension(state.clone()));
+
+    tokio::spawn(async move {
+        state.accounts.write().await.start_io().await;
+    });
+
+    let addr = SocketAddr::from(([127, 0, 0, 1], port));
+    log::info!("JSON-RPC WebSocket server listening on {}", addr);
+    let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
+    axum::serve(listener, app).await.unwrap();
+
+    Ok(())
+}
+
+async fn handler(ws: WebSocketUpgrade, Extension(api): Extension<CommandApi>) -> Response {
+    let (client, out_receiver) = RpcClient::new();
+    let session = RpcSession::new(client.clone(), api.clone());
+    handle_ws_rpc(ws, out_receiver, session).await
+}
--- a/deltachat-jsonrpc/typescript/example.html
+++ b/deltachat-jsonrpc/typescript/example.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>DeltaChat JSON-RPC example</title>
+    <style>
+      body {
+        font-family: monospace;
+        background: black;
+        color: grey;
+      }
+      .grid {
+        display: grid;
+        grid-template-columns: 3fr 1fr;
+        grid-template-areas: "a a" "b c";
+      }
+      .message {
+        color: red;
+      }
+      #header {
+        grid-area: a;
+        color: white;
+        font-size: 1.2rem;
+      }
+      #header a {
+        color: white;
+        font-weight: bold;
+      }
+      #main {
+        grid-area: b;
+        color: green;
+      }
+      #main h2,
+      #main h3 {
+        color: blue;
+      }
+      #side {
+        grid-area: c;
+        color: #777;
+        overflow-y: auto;
+      }
+    </style>
+    <script type="module" src="dist/example.bundle.js"></script>
+  </head>
+  <body>
+    <h1>DeltaChat JSON-RPC example</h1>
+    <div class="grid">
+      <div id="header"></div>
+      <div id="main"></div>
+      <div id="side"><h2>log</h2></div>
+    </div>
+    <p>
+      Tip: open the dev console and use the client with
+      <code>window.client</code>
+    </p>
+  </body>
+</html>
--- a/deltachat-jsonrpc/typescript/example/example.ts
+++ b/deltachat-jsonrpc/typescript/example/example.ts
@@ -0,0 +1,109 @@
+import { DcEvent, DeltaChat } from "../deltachat.js";
+
+var SELECTED_ACCOUNT = 0;
+
+window.addEventListener("DOMContentLoaded", (_event) => {
+  (window as any).selectDeltaAccount = (id: string) => {
+    SELECTED_ACCOUNT = Number(id);
+    window.dispatchEvent(new Event("account-changed"));
+  };
+  console.log("launch run script...");
+  run().catch((err) => console.error("run failed", err));
+});
+
+async function run() {
+  const $main = document.getElementById("main")!;
+  const $side = document.getElementById("side")!;
+  const $head = document.getElementById("header")!;
+
+  const client = new DeltaChat("ws://localhost:20808/ws");
+
+  (window as any).client = client.rpc;
+
+  client.on("ALL", (accountId, event) => {
+    onIncomingEvent(accountId, event);
+  });
+
+  window.addEventListener("account-changed", async (_event: Event) => {
+    listChatsForSelectedAccount();
+  });
+
+  await Promise.all([loadAccountsInHeader(), listChatsForSelectedAccount()]);
+
+  async function loadAccountsInHeader() {
+    console.log("load accounts");
+    const accounts = await client.rpc.getAllAccounts();
+    console.log("accounts loaded", accounts);
+    for (const account of accounts) {
+      if (account.kind === "Configured") {
+        write(
+          $head,
+          `<a href="#" onclick="selectDeltaAccount(${account.id})">
+          ${account.id}: ${account.addr!}
+          </a>&nbsp;`
+        );
+      } else {
+        write(
+          $head,
+          `<a href="#">
+          ${account.id}: (unconfigured)
+          </a>&nbsp;`
+        );
+      }
+    }
+  }
+
+  async function listChatsForSelectedAccount() {
+    clear($main);
+    const selectedAccount = SELECTED_ACCOUNT;
+    const info = await client.rpc.getAccountInfo(selectedAccount);
+    if (info.kind !== "Configured") {
+      return write($main, "Account is not configured");
+    }
+    write($main, `<h2>${info.addr!}</h2>`);
+    const chats = await client.rpc.getChatlistEntries(
+      selectedAccount,
+      0,
+      null,
+      null
+    );
+    for (const chatId of chats) {
+      const chat = await client.rpc.getFullChatById(selectedAccount, chatId);
+      write($main, `<h3>${chat.name}</h3>`);
+      const messageIds = await client.rpc.getMessageIds(
+        selectedAccount,
+        chatId,
+        false,
+        false
+      );
+      const messages = await client.rpc.getMessages(
+        selectedAccount,
+        messageIds
+      );
+      for (const [_messageId, message] of Object.entries(messages)) {
+        if (message.kind === "message") write($main, `<p>${message.text}</p>`);
+        else write($main, `<p>loading error: ${message.error}</p>`);
+      }
+    }
+  }
+
+  function onIncomingEvent(accountId: number, event: DcEvent) {
+    write(
+      $side,
+      `
+        <p class="message">
+          [<strong>${event.kind}</strong> on account ${accountId}]<br>
+          <em>f1:</em> ${JSON.stringify(
+            Object.assign({}, event, { kind: undefined })
+          )}
+        </p>`
+    );
+  }
+}
+
+function write(el: HTMLElement, html: string) {
+  el.innerHTML += html;
+}
+function clear(el: HTMLElement) {
+  el.innerHTML = "";
+}
--- a/deltachat-jsonrpc/typescript/example/node-add-account.js
+++ b/deltachat-jsonrpc/typescript/example/node-add-account.js
@@ -0,0 +1,29 @@
+import { DeltaChat } from "../dist/deltachat.js";
+
+run().catch(console.error);
+
+async function run() {
+  const delta = new DeltaChat("ws://localhost:20808/ws");
+  delta.on("event", (event) => {
+    console.log("event", event.data);
+  });
+
+  const email = process.argv[2];
+  const password = process.argv[3];
+  if (!email || !password)
+    throw new Error(
+      "USAGE: node node-add-account.js <EMAILADDRESS> <PASSWORD>"
+    );
+  console.log(`creating account for ${email}`);
+  const id = await delta.rpc.addAccount();
+  console.log(`created account id ${id}`);
+  await delta.rpc.setConfig(id, "addr", email);
+  await delta.rpc.setConfig(id, "mail_pw", password);
+  console.log("configuration updated");
+  await delta.rpc.configure(id);
+  console.log("account configured!");
+
+  const accounts = await delta.rpc.getAllAccounts();
+  console.log("accounts", accounts);
+  console.log("waiting for events...");
+}
--- a/deltachat-jsonrpc/typescript/example/node-demo.js
+++ b/deltachat-jsonrpc/typescript/example/node-demo.js
@@ -0,0 +1,14 @@
+import { DeltaChat } from "../dist/deltachat.js";
+
+run().catch(console.error);
+
+async function run() {
+  const delta = new DeltaChat();
+  delta.on("event", (event) => {
+    console.log("event", event.data);
+  });
+
+  const accounts = await delta.rpc.getAllAccounts();
+  console.log("accounts", accounts);
+  console.log("waiting for events...");
+}
--- a/deltachat-jsonrpc/typescript/package.json
+++ b/deltachat-jsonrpc/typescript/package.json
@@ -34,7 +34,7 @@
  "name": "@deltachat/jsonrpc-client",
  "repository": {
    "type": "git",
-    "url": "https://github.com/chatmail/core.git"
+    "url": "https://github.com/deltachat/deltachat-core-rust.git"
  },
  "scripts": {
    "build": "run-s generate-bindings extract-constants build:tsc build:bundle build:cjs",
@@ -42,6 +42,10 @@
    "build:cjs": "esbuild --format=cjs --bundle --packages=external dist/deltachat.js --outfile=dist/deltachat.cjs",
    "build:tsc": "tsc",
    "docs": "typedoc --out docs deltachat.ts",
+    "example": "run-s build example:build example:start",
+    "example:build": "esbuild --bundle dist/example/example.js --outfile=dist/example.bundle.js",
+    "example:dev": "esbuild example/example.ts --bundle --outfile=dist/example.bundle.js --servedir=.",
+    "example:start": "http-server .",
    "extract-constants": "node ./scripts/generate-constants.js",
    "generate-bindings": "cargo test",
    "prettier:check": "prettier --check .",
@@ -54,5 +58,5 @@
  },
  "type": "module",
  "types": "dist/deltachat.d.ts",
-  "version": "1.159.5"
+  "version": "1.155.6"
 }
--- a/deltachat-jsonrpc/typescript/src/client.ts
+++ b/deltachat-jsonrpc/typescript/src/client.ts
@@ -2,7 +2,7 @@ import * as T from "../generated/types.js";
 import { EventType } from "../generated/types.js";
 import * as RPC from "../generated/jsonrpc.js";
 import { RawClient } from "../generated/client.js";
-import { BaseTransport, Request } from "yerpc";
+import { WebsocketTransport, BaseTransport, Request } from "yerpc";
 import { TinyEmitter } from "@deltachat/tiny-emitter";

 type Events = { ALL: (accountId: number, event: EventType) => void } & {
@@ -74,6 +74,34 @@ export class BaseDeltaChat<
  }
 }

+export type Opts = {
+  url: string;
+  startEventLoop: boolean;
+};
+
+export const DEFAULT_OPTS: Opts = {
+  url: "ws://localhost:20808/ws",
+  startEventLoop: true,
+};
+export class DeltaChat extends BaseDeltaChat<WebsocketTransport> {
+  opts: Opts;
+  close() {
+    this.transport.close();
+  }
+  constructor(opts?: Opts | string) {
+    if (typeof opts === "string") {
+      opts = { ...DEFAULT_OPTS, url: opts };
+    } else if (opts) {
+      opts = { ...DEFAULT_OPTS, ...opts };
+    } else {
+      opts = { ...DEFAULT_OPTS };
+    }
+    const transport = new WebsocketTransport(opts.url);
+    super(transport, opts.startEventLoop);
+    this.opts = opts;
+  }
+}
+
 export class StdioDeltaChat extends BaseDeltaChat<StdioTransport> {
  close() {}
  constructor(input: any, output: any, startEventLoop: boolean) {
--- 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;
@@ -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);

@@ -98,18 +101,20 @@ describe("online tests", function () {
    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");
--- a/deltachat-jsonrpc/typescript/tsconfig.json
+++ b/deltachat-jsonrpc/typescript/tsconfig.json
@@ -15,6 +15,6 @@
    "noImplicitAny": true,
    "isolatedModules": true
  },
-  "include": ["*.ts", "test/*.ts"],
+  "include": ["*.ts", "example/*.ts", "test/*.ts"],
  "compileOnSave": false
 }
--- a/deltachat-repl/Cargo.toml
+++ b/deltachat-repl/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "deltachat-repl"
-version = "1.159.5"
+version = "1.155.6"
 license = "MPL-2.0"
 edition = "2021"
-repository = "https://github.com/chatmail/core"
+repository = "https://github.com/deltachat/deltachat-core-rust"

 [dependencies]
 anyhow = { workspace = true }
--- a/deltachat-repl/src/cmdline.rs
+++ b/deltachat-repl/src/cmdline.rs
@@ -92,7 +92,7 @@ async fn reset_tables(context: &Context, bits: i32) {
    context.emit_msgs_changed_without_ids();
 }

-async fn poke_eml_file(context: &Context, filename: &Path) -> Result<()> {
+async fn poke_eml_file(context: &Context, filename: impl AsRef<Path>) -> Result<()> {
    let data = read_file(context, filename).await?;

    if let Err(err) = receive_imf(context, &data, false).await {
@@ -126,7 +126,7 @@ async fn poke_spec(context: &Context, spec: Option<&str>) -> bool {
        real_spec = rs.unwrap();
    }
    if let Some(suffix) = get_filesuffix_lc(&real_spec) {
-        if suffix == "eml" && poke_eml_file(context, Path::new(&real_spec)).await.is_ok() {
+        if suffix == "eml" && poke_eml_file(context, &real_spec).await.is_ok() {
            read_cnt += 1
        }
    } else {
@@ -140,10 +140,7 @@ async fn poke_spec(context: &Context, spec: Option<&str>) -> bool {
                if name.ends_with(".eml") {
                    let path_plus_name = format!("{}/{}", &real_spec, name);
                    println!("Import: {path_plus_name}");
-                    if poke_eml_file(context, Path::new(&path_plus_name))
-                        .await
-                        .is_ok()
-                    {
+                    if poke_eml_file(context, path_plus_name).await.is_ok() {
                        read_cnt += 1
                    }
                }
@@ -1162,8 +1159,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());
        }
@@ -1272,7 +1278,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
        "fileinfo" => {
            ensure!(!arg1.is_empty(), "Argument <file> missing.");

-            if let Ok(buf) = read_file(&context, Path::new(arg1)).await {
+            if let Ok(buf) = read_file(&context, &arg1).await {
                let (width, height) = get_filemeta(&buf)?;
                println!("width={width}, height={height}");
            } else {
--- a/deltachat-repl/src/main.rs
+++ b/deltachat-repl/src/main.rs
@@ -323,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 = "1.159.5"
+version = "1.155.6"
 description = "Python client for Delta Chat core JSON-RPC interface"
 classifiers = [
    "Development Status :: 5 - Production/Stable",
@@ -70,11 +70,3 @@ 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
@@ -28,36 +26,18 @@ class Account:
    def _rpc(self) -> "Rpc":
        return self.manager.rpc

-    def wait_for_event(self, event_type=None) -> AttrDict:
+    def wait_for_event(self) -> AttrDict:
        """Wait until the next event and return it."""
-        while True:
-            next_event = AttrDict(self._rpc.wait_for_event(self.id))
-            if event_type is None or next_event.kind == event_type:
-                return next_event
+        return AttrDict(self._rpc.wait_for_event(self.id))

    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:
        """Remove the account."""
        self._rpc.remove_account(self.id)

-    def clone(self) -> "Account":
-        """Clone given account.
-
-        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()
-        new_account._rpc.get_backup(new_account.id, qr)
-        future()
-        return new_account
-
    def start_io(self) -> None:
        """Start the account I/O."""
        self._rpc.start_io(self.id)
@@ -87,7 +67,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)

@@ -103,15 +83,9 @@ class Account:
        return self.get_config("selfavatar")

    def check_qr(self, qr):
-        """Parse QR code contents.
-
-        This function takes the raw text scanned
-        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 +93,15 @@ 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)
+        while True:
+            event = self.wait_for_event()
+            if event.kind == EventType.IMAP_INBOX_IDLE:
+                break

-    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,42 +109,19 @@ 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):
            obj = obj.get_snapshot().address
        return Contact(self, self._rpc.create_contact(self.id, obj, name))

-    def make_vcard(self, contacts: list[Contact]) -> str:
-        """Create vCard with the given contacts."""
-        assert all(contact.account == self for contact in contacts)
-        contact_ids = [contact.id for contact in contacts]
-        return self._rpc.make_vcard(self.id, contact_ids)
-
-    def import_vcard(self, vcard: str) -> list[Contact]:
-        """Import 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()
-
-    def get_device_chat(self) -> Chat:
-        """Return device chat."""
-        return self.device_contact.create_chat()
+        addr = account.get_config("addr")
+        contact = self.create_contact(addr)
+        return contact.create_chat()

    def get_contact_by_id(self, contact_id: int) -> Contact:
        """Return Contact instance for the given contact ID."""
@@ -211,8 +154,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 +163,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,14 +180,9 @@ 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."""
-        return Contact(self, SpecialContactId.DEVICE)
-
    def get_chatlist(
        self,
        query: Optional[str] = None,
@@ -297,7 +238,8 @@ class Account:
        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.
@@ -354,40 +296,34 @@ class Account:

    def wait_for_incoming_msg_event(self):
        """Wait for incoming message event and return it."""
-        return self.wait_for_event(EventType.INCOMING_MSG)
-
-    def wait_for_msgs_changed_event(self):
-        """Wait for messages changed event and return it."""
-        return self.wait_for_event(EventType.MSGS_CHANGED)
-
-    def wait_for_msgs_noticed_event(self):
-        """Wait for messages noticed event and return it."""
-        return self.wait_for_event(EventType.MSGS_NOTICED)
+        while True:
+            event = self.wait_for_event()
+            if event.kind == EventType.INCOMING_MSG:
+                return event

    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)
+        while True:
+            event = self.wait_for_event()
+            if event.kind == EventType.REACTIONS_CHANGED:
+                return event

    def get_fresh_messages_in_arrival_order(self) -> list[Message]:
        """Return fresh messages list sorted in the order of their arrival, with ascending IDs."""
@@ -416,7 +352,3 @@ class Account:
        """Import keys."""
        passphrase = ""  # Importing passphrase-protected keys is currently not supported.
        self._rpc.import_self_keys(self.id, str(path), passphrase)
-
-    def initiate_autocrypt_key_transfer(self) -> None:
-        """Send Autocrypt Setup Message."""
-        return self._rpc.initiate_autocrypt_key_transfer(self.id)
--- 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,19 +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


 class ChatlistFlag(IntEnum):
-    """Bit flags for get_chatlist() method."""
-
    ARCHIVED_ONLY = 0x01
    NO_SPECIALS = 0x02
    ADD_ALLDONE_HINT = 0x04
@@ -21,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
@@ -30,7 +23,7 @@ class SpecialContactId(IntEnum):


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

    INFO = "Info"
    SMTP_CONNECTED = "SmtpConnected"
@@ -55,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"
@@ -78,7 +70,7 @@ class EventType(str, Enum):


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

    TRASH = 3
    ARCHIVED_LINK = 6
@@ -87,7 +79,7 @@ class ChatId(IntEnum):


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

    UNDEFINED = 0
    SINGLE = 100
@@ -97,7 +89,7 @@ class ChatType(IntEnum):


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

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


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

    DONE = "Done"
    AVAILABLE = "Available"
@@ -166,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
@@ -181,7 +173,7 @@ class CertificateChecks(IntEnum):


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

    NOT_CONNECTED = 1000
    CONNECTING = 2000
@@ -190,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
@@ -200,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
@@ -222,7 +214,7 @@ class ProviderStatus(IntEnum):


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

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


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

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


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

    AUTOMATIC = 0
    SSL = 1
@@ -247,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.
    """
@@ -46,9 +45,8 @@ class 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)

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

    def make_vcard(self) -> str:
-        """Make a vCard for the contact."""
-        return self.account.make_vcard([self])
+        return self._rpc.make_vcard(self.account.id, [self.id])
--- 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,5 +1,3 @@
-"""Message module."""
-
 import json
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Optional, Union
@@ -47,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)

@@ -55,14 +52,6 @@ class Message:
        """Mark the message as seen."""
        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:
        """Send a webxdc status update. This message must be a webxdc."""
        if not isinstance(update, str):
@@ -70,15 +59,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:
@@ -90,10 +73,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,12 +1,9 @@
-"""Pytest plugin module."""
-
 from __future__ import annotations

 import os
 import random
 from typing import AsyncGenerator, Optional

-import py
 import pytest

 from . import Account, AttrDict, Bot, Chat, Client, DeltaChat, EventType, Message
@@ -14,55 +11,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 +74,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 +85,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 +103,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 +116,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,52 +123,4 @@ def rpc(tmp_path) -> AsyncGenerator:

@pytest.fixture
 def acfactory(rpc) -> AsyncGenerator:
-    """Return account factory fixture."""
    return ACFactory(DeltaChat(rpc))
-
-
-@pytest.fixture
-def data():
-    """Test data."""
-
-    class Data:
-        def __init__(self) -> None:
-            for path in reversed(py.path.local(__file__).parts()):
-                datadir = path.join("test-data")
-                if datadir.isdir():
-                    self.path = datadir
-                    return
-            raise Exception("Data path cannot be found")
-
-        def get_path(self, bn):
-            """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
-
-        def read_path(self, bn, mode="r"):
-            fn = self.get_path(bn)
-            if fn is not None:
-                with open(fn, mode) as f:
-                    return f.read()
-            return None
-
-    return Data()
-
-
-@pytest.fixture
-def log():
-    """Log printer fixture."""
-
-    class Printer:
-        def section(self, msg: str) -> None:
-            print()
-            print("=" * 10, msg, "=" * 10)
-
-        def step(self, msg: str) -> None:
-            print("-" * 5, "step " + msg, "-" * 5)
-
-        def indent(self, msg: str) -> None:
-            print("  " + msg)
-
-    return Printer()
--- 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,13 +150,18 @@ 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")

    bob.wait_for_incoming_msg_event()

-    alice_second_device = alice.clone()
+    alice_second_device: Account = acfactory.get_unconfigured_account()
+
+    alice._rpc.provide_backup.future(alice.id)
+    backup_code = alice._rpc.get_backup_qr(alice.id)
+    alice_second_device._rpc.get_backup(alice_second_device.id, backup_code)
    alice_second_device.start_io()
    alice.clear_all_events()
    alice_second_device.clear_all_events()
--- a/deltachat-rpc-client/tests/test_iroh_webxdc.py
+++ b/deltachat-rpc-client/tests/test_iroh_webxdc.py
@@ -175,11 +175,17 @@ def test_no_duplicate_messages(acfactory, path_to_webxdc):

    threading.Thread(target=thread_run, daemon=True).start()

-    event = ac2.wait_for_event(EventType.WEBXDC_REALTIME_DATA)
-    n = int(bytes(event.data).decode())
+    while 1:
+        event = ac2.wait_for_event()
+        if event.kind == EventType.WEBXDC_REALTIME_DATA:
+            n = int(bytes(event.data).decode())
+            break

-    event = ac2.wait_for_event(EventType.WEBXDC_REALTIME_DATA)
-    assert int(bytes(event.data).decode()) > n
+    while 1:
+        event = ac2.wait_for_event()
+        if event.kind == EventType.WEBXDC_REALTIME_DATA:
+            assert int(bytes(event.data).decode()) > n
+            break


 def test_no_reordering(acfactory, path_to_webxdc):
@@ -223,5 +229,8 @@ def test_advertisement_after_chatting(acfactory, path_to_webxdc):
    ac2_hello_msg_snapshot.chat.accept()

    ac2_webxdc_msg.send_webxdc_realtime_advertisement()
-    event = ac1.wait_for_event(EventType.WEBXDC_REALTIME_ADVERTISEMENT_RECEIVED)
-    assert event.msg_id == ac1_webxdc_msg.id
+    while 1:
+        event = ac1.wait_for_event()
+        if event.kind == EventType.WEBXDC_REALTIME_ADVERTISEMENT_RECEIVED:
+            assert event.msg_id == ac1_webxdc_msg.id
+            break
--- a/deltachat-rpc-client/tests/test_key_transfer.py
+++ b/deltachat-rpc-client/tests/test_key_transfer.py
@@ -1,53 +0,0 @@
-import pytest
-
-from deltachat_rpc_client import EventType
-from deltachat_rpc_client.rpc import JsonRpcError
-
-
-def wait_for_autocrypt_setup_message(account):
-    while True:
-        event = account.wait_for_event()
-        if event.kind == EventType.MSGS_CHANGED and event.msg_id != 0:
-            msg_id = event.msg_id
-            msg = account.get_message_by_id(msg_id)
-            if msg.get_snapshot().is_setupmessage:
-                return msg
-
-
-def test_autocrypt_setup_message_key_transfer(acfactory):
-    alice1 = acfactory.get_online_account()
-
-    alice2 = acfactory.get_unconfigured_account()
-    alice2.set_config("addr", alice1.get_config("addr"))
-    alice2.set_config("mail_pw", alice1.get_config("mail_pw"))
-    alice2.configure()
-    alice2.bring_online()
-
-    setup_code = alice1.initiate_autocrypt_key_transfer()
-    msg = wait_for_autocrypt_setup_message(alice2)
-
-    # Test that entering wrong code returns an error.
-    with pytest.raises(JsonRpcError):
-        msg.continue_autocrypt_key_transfer("7037-0673-6287-3013-4095-7956-5617-6806-6756")
-
-    msg.continue_autocrypt_key_transfer(setup_code)
-
-
-def test_ac_setup_message_twice(acfactory):
-    alice1 = acfactory.get_online_account()
-
-    alice2 = acfactory.get_unconfigured_account()
-    alice2.set_config("addr", alice1.get_config("addr"))
-    alice2.set_config("mail_pw", alice1.get_config("mail_pw"))
-    alice2.configure()
-    alice2.bring_online()
-
-    # Send the first Autocrypt Setup Message and ignore it.
-    _setup_code = alice1.initiate_autocrypt_key_transfer()
-    wait_for_autocrypt_setup_message(alice2)
-
-    # Send the second Autocrypt Setup Message and import it.
-    setup_code = alice1.initiate_autocrypt_key_transfer()
-    msg = wait_for_autocrypt_setup_message(alice2)
-
-    msg.continue_autocrypt_key_transfer(setup_code)
--- 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
@@ -4,7 +4,6 @@ import time
 import pytest

 from deltachat_rpc_client import Chat, EventType, SpecialContactId
-from deltachat_rpc_client.rpc import JsonRpcError


 def test_qr_setup_contact(acfactory, tmp_path) -> None:
@@ -27,21 +26,17 @@ def test_qr_setup_contact(acfactory, tmp_path) -> None:
    bob_contact_alice_snapshot = bob_contact_alice.get_snapshot()
    assert bob_contact_alice_snapshot.is_verified

-    # Test that if Bob imports a key,
-    # backwards verification is not lost
-    # because default key is not changed.
+    # Test that if Bob changes the key, backwards verification is lost.
    logging.info("Bob 2 is created")
    bob2 = acfactory.new_configured_account()
    bob2.export_self_keys(tmp_path)

-    logging.info("Bob tries to import a key")
-    # Importing a second key is not allowed.
-    with pytest.raises(JsonRpcError):
-        bob.import_self_keys(tmp_path)
+    logging.info("Bob imports a key")
+    bob.import_self_keys(tmp_path)

-    assert bob.get_config("key_id") == "1"
+    assert bob.get_config("key_id") == "2"
    bob_contact_alice_snapshot = bob_contact_alice.get_snapshot()
-    assert bob_contact_alice_snapshot.is_verified
+    assert not bob_contact_alice_snapshot.is_verified


 def test_qr_setup_contact_svg(acfactory) -> None:
@@ -60,12 +55,15 @@ def test_qr_setup_contact_svg(acfactory) -> None:


@pytest.mark.parametrize("protect", [True, False])
-def test_qr_securejoin(acfactory, protect):
+def test_qr_securejoin(acfactory, protect, tmp_path):
    alice, bob, fiona = acfactory.get_online_accounts(3)

    # Setup second device for Alice
    # to test observing securejoin protocol.
-    alice2 = alice.clone()
+    alice.export_backup(tmp_path)
+    files = list(tmp_path.glob("*.tar"))
+    alice2 = acfactory.get_unconfigured_account()
+    alice2.import_backup(files[0])

    logging.info("Alice creates a group")
    alice_chat = alice.create_group("Group", protect=protect)
@@ -76,11 +74,17 @@ def test_qr_securejoin(acfactory, protect):
    bob.secure_join(qr_code)

    # Alice deletes "vg-request".
-    alice.wait_for_event(EventType.IMAP_MESSAGE_DELETED)
+    while True:
+        event = alice.wait_for_event()
+        if event["kind"] == "ImapMessageDeleted":
+            break
    alice.wait_for_securejoin_inviter_success()
    # Bob deletes "vg-auth-required", Alice deletes "vg-request-with-auth".
    for ac in [alice, bob]:
-        ac.wait_for_event(EventType.IMAP_MESSAGE_DELETED)
+        while True:
+            event = ac.wait_for_event()
+            if event["kind"] == "ImapMessageDeleted":
+                break
    bob.wait_for_securejoin_joiner_success()

    # Test that Alice verified Bob's profile.
@@ -89,7 +93,7 @@ def test_qr_securejoin(acfactory, protect):
    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.
@@ -117,7 +121,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!")

@@ -154,8 +159,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)
@@ -182,7 +190,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")
@@ -453,12 +461,12 @@ def test_qr_new_group_unblocked(acfactory):
    assert ac2_msg.chat.get_basic_snapshot().is_contact_request


-@pytest.mark.skip(reason="AEAP is disabled for now")
 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)
@@ -478,8 +486,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()
@@ -492,9 +500,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:
@@ -510,9 +520,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")
@@ -563,7 +573,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
@@ -572,7 +582,7 @@ 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.
@@ -587,7 +597,7 @@ def test_securejoin_after_contact_resetup(acfactory) -> None:
    # header sent by old ac1.
    while True:
        # ac1 sends a message to ac2.
-        ac1_contact_ac2 = ac1.create_contact(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!")

@@ -643,14 +653,12 @@ def test_withdraw_securejoin_qr(acfactory):
    bob_chat = bob.secure_join(qr_code)
    bob.wait_for_securejoin_joiner_success()

-    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()

-    snapshot = alice.get_message_by_id(alice.wait_for_msgs_changed_event().msg_id).get_snapshot()
+    snapshot = alice.get_message_by_id(alice.wait_for_incoming_msg_event().msg_id).get_snapshot()
    assert snapshot.text == "Group left by {}.".format(bob.get_config("addr"))

    logging.info("Alice withdraws QR code.")
--- a/deltachat-rpc-client/tests/test_something.py
+++ b/deltachat-rpc-client/tests/test_something.py
@@ -61,102 +61,61 @@ 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!")

-    event = bob.wait_for_incoming_msg_event()
-    chat_id = event.chat_id
-    msg_id = event.msg_id
+    while True:
+        event = bob.wait_for_event()
+        if event.kind == EventType.INCOMING_MSG:
+            chat_id = event.chat_id
+            msg_id = event.msg_id
+            break

    message = bob.get_message_by_id(msg_id)
    snapshot = message.get_snapshot()
@@ -215,7 +174,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,7 +241,7 @@ 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)
@@ -298,7 +258,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!")

@@ -326,37 +287,16 @@ def test_message(acfactory) -> None:
    assert reactions == snapshot.reactions


-def test_selfavatar_sync(acfactory, data, log) -> None:
-    alice = acfactory.get_online_account()
-
-    log.section("Alice adds a second device")
-    alice2 = alice.clone()
-
-    log.section("Second device goes online")
-    alice2.start_io()
-
-    log.section("First device changes avatar")
-    image = data.get_path("image/avatar1000x1000.jpg")
-    alice.set_config("selfavatar", image)
-    avatar_config = alice.get_config("selfavatar")
-    avatar_hash = os.path.basename(avatar_config)
-    print("Info: avatar hash is ", avatar_hash)
-
-    log.section("First device receives avatar change")
-    alice2.wait_for_event(EventType.SELFAVATAR_CHANGED)
-    avatar_config2 = alice2.get_config("selfavatar")
-    avatar_hash2 = os.path.basename(avatar_config2)
-    print("Info: avatar hash on second device is ", avatar_hash2)
-    assert avatar_hash == avatar_hash2
-    assert avatar_config != avatar_config2
-
-
-def test_reaction_seen_on_another_dev(acfactory) -> None:
+def test_reaction_seen_on_another_dev(acfactory, tmp_path) -> None:
    alice, bob = acfactory.get_online_accounts(2)
-    alice2 = alice.clone()
+    alice.export_backup(tmp_path)
+    files = list(tmp_path.glob("*.tar"))
+    alice2 = acfactory.get_unconfigured_account()
+    alice2.import_backup(files[0])
    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!")

@@ -368,12 +308,20 @@ def test_reaction_seen_on_another_dev(acfactory) -> None:
    snapshot.chat.accept()
    message.send_reaction("😎")
    for a in [alice, alice2]:
-        a.wait_for_event(EventType.INCOMING_REACTION)
+        while True:
+            event = a.wait_for_event()
+            if event.kind == EventType.INCOMING_REACTION:
+                break

    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)
+    while True:
+        event = alice2.wait_for_event()
+        if event.kind == EventType.MSGS_NOTICED:
+            chat_id = event.chat_id
+            break
+    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


@@ -381,19 +329,24 @@ 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.
    alice.set_config("bot", "1")
    alice_chat_bob.send_text("Hello!")

-    event = bob.wait_for_incoming_msg_event()
-    message = bob.get_message_by_id(event.msg_id)
-    snapshot = message.get_snapshot()
-    assert snapshot.chat_id == event.chat_id
-    assert snapshot.text == "Hello!"
-    assert snapshot.is_bot
+    while True:
+        event = bob.wait_for_event()
+        if event.kind == EventType.INCOMING_MSG:
+            msg_id = event.msg_id
+            message = bob.get_message_by_id(msg_id)
+            snapshot = message.get_snapshot()
+            assert snapshot.chat_id == event.chat_id
+            assert snapshot.text == "Hello!"
+            assert snapshot.is_bot
+            break


 def test_bot(acfactory) -> None:
@@ -440,11 +393,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()
@@ -453,7 +404,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!")

@@ -477,7 +429,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()
@@ -527,7 +481,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()
@@ -551,7 +507,10 @@ def test_mdn_doesnt_break_autocrypt(acfactory) -> None:

    # Alice reads Bob's message.
    message.mark_seen()
-    bob.wait_for_event(EventType.MSG_READ)
+    while True:
+        event = bob.wait_for_event()
+        if event.kind == EventType.MSG_READ:
+            break

    # Bob sends a message to Alice, it should also be encrypted.
    bob_chat_alice.send_text("Hi Alice!")
@@ -623,13 +582,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()
@@ -673,7 +628,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:
@@ -704,7 +661,7 @@ def test_download_limit_chat_assignment(acfactory, tmp_path, n_accounts):
            assert snapshot.chat == bob_chat_alice


-def test_markseen_contact_request(acfactory):
+def test_markseen_contact_request(acfactory, tmp_path):
    """
    Test that seen status is synchronized for contact request messages
    even though read receipt is not sent.
@@ -712,7 +669,10 @@ def test_markseen_contact_request(acfactory):
    alice, bob = acfactory.get_online_accounts(2)

    # Bob sets up a second device.
-    bob2 = bob.clone()
+    bob.export_backup(tmp_path)
+    files = list(tmp_path.glob("*.tar"))
+    bob2 = acfactory.get_unconfigured_account()
+    bob2.import_backup(files[0])
    bob2.start_io()

    alice_chat_bob = alice.create_chat(bob)
@@ -723,7 +683,10 @@ def test_markseen_contact_request(acfactory):
    assert message2.get_snapshot().state == MessageState.IN_FRESH

    message.mark_seen()
-    bob2.wait_for_event(EventType.MSGS_NOTICED)
+    while True:
+        event = bob2.wait_for_event()
+        if event.kind == EventType.MSGS_NOTICED:
+            break
    assert message2.get_snapshot().state == MessageState.IN_SEEN


@@ -736,11 +699,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.
@@ -751,99 +715,4 @@ 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
-
-
-def test_no_old_msg_is_fresh(acfactory):
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac1_clone = ac1.clone()
-    ac1_clone.start_io()
-
-    ac1.create_chat(ac2)
-    ac1_clone_chat = ac1_clone.create_chat(ac2)
-
-    ac1.get_device_chat().mark_noticed()
-
-    logging.info("Send a first message from ac2 to ac1 and check that it's 'fresh'")
-    first_msg = ac2.create_chat(ac1).send_text("Hi")
-    ac1.wait_for_incoming_msg_event()
-    assert ac1.create_chat(ac2).get_fresh_message_count() == 1
-    assert len(list(ac1.get_fresh_messages())) == 1
-
-    ac1.wait_for_event(EventType.IMAP_INBOX_IDLE)
-
-    logging.info("Send a message from ac1_clone to ac2 and check that ac1 marks the first message as 'noticed'")
-    ac1_clone_chat.send_text("Hi back")
-    ev = ac1.wait_for_msgs_noticed_event()
-
-    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()
+    assert configured_certificate_checks != "0"
--- 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,13 +1,20 @@
+from deltachat_rpc_client import EventType
+
+
 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")

-    event = bob.wait_for_incoming_msg_event()
-    bob_chat_alice = bob.get_chat_by_id(event.chat_id)
-    message = bob.get_message_by_id(event.msg_id)
+    while True:
+        event = bob.wait_for_event()
+        if event.kind == EventType.INCOMING_MSG:
+            bob_chat_alice = bob.get_chat_by_id(event.chat_id)
+            message = bob.get_message_by_id(event.msg_id)
+            break

    webxdc_info = message.get_webxdc_info()
    assert webxdc_info == {
@@ -44,7 +51,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 = "1.159.5"
+version = "1.155.6"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"
--- a/deltachat-rpc-server/README.md
+++ b/deltachat-rpc-server/README.md
@@ -5,13 +5,13 @@ over standard I/O.

 ## Install

-To download binary pre-builds check the [releases page](https://github.com/chatmail/core/releases).
+To download binary pre-builds check the [releases page](https://github.com/deltachat/deltachat-core-rust/releases).
 Rename the downloaded binary to `deltachat-rpc-server` and add it to your `PATH`.

 To install from source run:

 ```sh
-cargo install --git https://github.com/chatmail/core/ deltachat-rpc-server
+cargo install --git https://github.com/deltachat/deltachat-core-rust/ deltachat-rpc-server
 ```

 The `deltachat-rpc-server` executable will be installed into `$HOME/.cargo/bin` that should be available
--- a/deltachat-rpc-server/npm-package/package.json
+++ b/deltachat-rpc-server/npm-package/package.json
@@ -8,12 +8,12 @@
  },
  "repository": {
    "type": "git",
-    "url": "https://github.com/chatmail/core.git"
+    "url": "https://github.com/deltachat/deltachat-core-rust.git"
  },
  "scripts": {
    "prepack": "node scripts/update_optional_dependencies_and_version.js"
  },
  "type": "module",
  "types": "index.d.ts",
-  "version": "1.159.5"
+  "version": "1.155.6"
 }
--- a/deltachat-rpc-server/npm-package/scripts/src/make_package.py
+++ b/deltachat-rpc-server/npm-package/scripts/src/make_package.py
@@ -25,7 +25,7 @@ def write_package_json(platform_path, rust_target, my_binary_name):
        "license": "MPL-2.0",
        "repository": {
            "type": "git",
-            "url": "https://github.com/chatmail/core.git",
+            "url": "https://github.com/deltachat/deltachat-core-rust.git",
        },
    }

--- a/deltachat-rpc-server/npm-package/src/errors.js
+++ b/deltachat-rpc-server/npm-package/src/errors.js
@@ -2,7 +2,7 @@
 import { ENV_VAR_NAME } from "./const.js";

 const cargoInstallCommand =
-  "cargo install --git https://github.com/chatmail/core deltachat-rpc-server";
+  "cargo install --git https://github.com/deltachat/deltachat-core-rust deltachat-rpc-server";

 export function NPM_NOT_FOUND_SUPPORTED_PLATFORM_ERROR(package_name) {
  return `deltachat-rpc-server not found:
--- 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 });
 }
--- a/deny.toml
+++ b/deny.toml
@@ -10,8 +10,8 @@ ignore = [
    # Unmaintained instant
    "RUSTSEC-2024-0384",

-    # Unmaintained paste
-    "RUSTSEC-2024-0436",
+    # DNSSEC validation that we don't use anyway.
+    "RUSTSEC-2025-0006",
 ]

 [bans]
@@ -21,31 +21,30 @@ 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 = "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 = "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 = "netlink-packet-route", version = "0.17.1" },
-     { name = "nom", version = "7.1.3" },
-     { name = "rand_chacha", version = "0.3.1" },
-     { name = "rand_core", version = "0.6.4" },
-     { name = "rand", version = "0.8.5" },
+     { name = "nix", version = "0.26.4" },
+     { name = "nix", version = "0.27.1" },
+     { name = "quick-error", version = "<2.0" },
     { name = "redox_syscall", version = "0.3.5" },
     { name = "regex-automata", version = "0.1.10" },
     { name = "regex-syntax", version = "0.6.29" },
-     { name = "rustix", version = "0.38.44" },
-     { name = "spin", version = "0.9.8" },
-     { name = "strum_macros", version = "0.26.2" },
-     { name = "strum", version = "0.26.2" },
+     { name = "rtnetlink", version = "0.13.1" },
+     { name = "security-framework", version = "2.11.1" },
+     { name = "sync_wrapper", version = "0.1.2" },
     { name = "syn", version = "1.0.109" },
-     { name = "lru", version = "0.12.3" },
     { name = "thiserror-impl", version = "1.0.69" },
     { name = "thiserror", version = "1.0.69" },
-     { name = "wasi", version = "0.11.0+wasi-snapshot-preview1" },
+     { name = "tokio-tungstenite", version = "0.21.0" },
+     { name = "tungstenite", version = "0.21.0" },
+     { name = "unicode-width", version = "0.1.11" },
     { name = "windows" },
     { name = "windows_aarch64_gnullvm" },
     { name = "windows_aarch64_msvc" },
@@ -62,7 +61,6 @@ skip = [
     { name = "windows_x86_64_gnu" },
     { name = "windows_x86_64_gnullvm" },
     { name = "windows_x86_64_msvc" },
-     { name = "zerocopy", version = "0.7.32" },
 ]


@@ -77,9 +75,9 @@ allow = [
    "ISC",
    "MIT",
    "MPL-2.0",
+    "OpenSSL",
    "Unicode-3.0",
    "Unicode-DFS-2016",
-    "Unlicense",
    "Zlib",
 ]

@@ -89,3 +87,9 @@ expression = "MIT AND ISC AND OpenSSL"
 license-files = [
      { path = "LICENSE", hash = 0xbd0eed23 },
 ]
+
+[sources.allow-org]
+# Organisations which we allow git sources from.
+github = [
+       "stalwartlabs",
+]
--- 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
@@ -18,9 +18,9 @@
        manifest = (pkgs.lib.importTOML ./Cargo.toml).package;
        androidSdk = android.sdk.${system} (sdkPkgs:
          builtins.attrValues {
-            inherit (sdkPkgs) ndk-27-2-12479018 cmdline-tools-latest;
+            inherit (sdkPkgs) ndk-27-0-11902837 cmdline-tools-latest;
          });
-        androidNdkRoot = "${androidSdk}/share/android-sdk/ndk/27.2.12479018";
+        androidNdkRoot = "${androidSdk}/share/android-sdk/ndk/27.0.11902837";

        rustSrc = nix-filter.lib {
          root = ./.;
@@ -30,7 +30,6 @@
          include = [
            ./benches
            ./assets
-            ./fuzz
            ./Cargo.lock
            ./Cargo.toml
            ./CMakeLists.txt
@@ -88,6 +87,9 @@
        };
        cargoLock = {
          lockFile = ./Cargo.lock;
+          outputHashes = {
+            "mail-builder-0.4.1" = "sha256-1hnsU76ProcX7iXT2UBjHnHbJ/ROT3077sLi3+yAV58=";
+          };
        };
        mkRustPackage = packageName:
          naersk'.buildPackage {
@@ -309,41 +311,10 @@
            LD = "${targetCc}";
          };

-        mkAndroidPackages = arch:
-          let
-            rpc-server = mkAndroidRustPackage arch "deltachat-rpc-server";
-          in
-          {
-            "deltachat-rpc-server-${arch}-android" = rpc-server;
-            "deltachat-repl-${arch}-android" = mkAndroidRustPackage arch "deltachat-repl";
-            "deltachat-rpc-server-${arch}-android-wheel" =
-              pkgs.stdenv.mkDerivation {
-                pname = "deltachat-rpc-server-${arch}-android-wheel";
-                version = manifest.version;
-                src = nix-filter.lib {
-                  root = ./.;
-                  include = [
-                    "scripts/wheel-rpc-server.py"
-                    "deltachat-rpc-server/README.md"
-                    "LICENSE"
-                    "Cargo.toml"
-                  ];
-                };
-                nativeBuildInputs = [
-                  pkgs.python3
-                  pkgs.python3Packages.wheel
-                ];
-                buildInputs = [
-                  rpc-server
-                ];
-                buildPhase = ''
-                  mkdir tmp
-                  cp ${rpc-server}/bin/deltachat-rpc-server tmp/deltachat-rpc-server
-                  python3 scripts/wheel-rpc-server.py ${arch}-android tmp/deltachat-rpc-server
-                '';
-                installPhase = ''mkdir -p $out; cp -av deltachat_rpc_server-*.whl $out'';
-              };
-          };
+        mkAndroidPackages = arch: {
+          "deltachat-rpc-server-${arch}-android" = mkAndroidRustPackage arch "deltachat-rpc-server";
+          "deltachat-repl-${arch}-android" = mkAndroidRustPackage arch "deltachat-repl";
+        };

        mkRustPackages = arch:
          let
@@ -584,9 +555,6 @@
              cargo-nextest
              perl # needed to build vendored OpenSSL
              git-cliff
-              (python3.withPackages (pypkgs: with pypkgs; [
-                tox
-              ]))
            ];
          };
      }
--- a/fuzz/Cargo.lock
+++ b/fuzz/Cargo.lock
--- a/fuzz/Cargo.toml
+++ b/fuzz/Cargo.toml
@@ -3,21 +3,28 @@ name = "deltachat-fuzz"
 version = "0.0.0"
 publish = false
 edition = "2021"
-license = "MPL-2.0"

 [dev-dependencies]
 bolero = "0.8"

 [dependencies]
-mailparse = { workspace = true }
+mailparse = "0.13"
 deltachat = { path = ".." }
 format-flowed = { path = "../format-flowed" }

+[workspace]
+members = ["."]
+
 [[test]]
 name = "fuzz_dateparse"
 path = "fuzz_targets/fuzz_dateparse.rs"
 harness = false

+[[test]]
+name = "fuzz_simplify"
+path = "fuzz_targets/fuzz_simplify.rs"
+harness = false
+
 [[test]]
 name = "fuzz_mailparse"
 path = "fuzz_targets/fuzz_mailparse.rs"
--- a/fuzz/fuzz_targets/fuzz_format_flowed.rs
+++ b/fuzz/fuzz_targets/fuzz_format_flowed.rs
@@ -9,7 +9,7 @@ fn round_trip(input: &str) -> String {

 fn main() {
    check!().for_each(|data: &[u8]| {
-        if let Ok(input) = std::str::from_utf8(data) {
+        if let Ok(input) = std::str::from_utf8(data.into()) {
            let input = input.trim().to_string();

            // Only consider inputs that are the result of unformatting format=flowed text.
--- a/fuzz/fuzz_targets/fuzz_simplify.rs
+++ b/fuzz/fuzz_targets/fuzz_simplify.rs
@@ -0,0 +1,13 @@
+use bolero::check;
+
+use deltachat::fuzzing::simplify;
+
+fn main() {
+    check!().for_each(|data: &[u8]| match String::from_utf8(data.to_vec()) {
+        Ok(input) => {
+            simplify(input.clone(), true);
+            simplify(input, false);
+        }
+        Err(_err) => {}
+    });
+}
--- a/python/README.rst
+++ b/python/README.rst
@@ -2,9 +2,9 @@
 CFFI Python Bindings
 ============================

-This package provides `Python bindings`_ to the `chatmail core library`_
+This package provides `Python bindings`_ to the `deltachat-core library`_
 which implements IMAP/SMTP/MIME/OpenPGP e-mail standards and offers
 a low-level Chat/Contact/Message API to user interfaces and bots.

-.. _`chatmail core library`: https://github.com/chatmail/core
+.. _`deltachat-core library`: https://github.com/deltachat/deltachat-core-rust
 .. _`Python bindings`: https://py.delta.chat/
--- a/python/doc/cffi/install.rst
+++ b/python/doc/cffi/install.rst
@@ -43,7 +43,7 @@ Bootstrap Rust and Cargo by using rustup::

 Then clone the deltachat-core-rust repo::

-   git clone https://github.com/chatmail/core
+   git clone https://github.com/deltachat/deltachat-core-rust
   cd deltachat-core-rust

 To install the Delta Chat Python bindings make sure you have Python3 installed.
--- a/python/doc/index.rst
+++ b/python/doc/index.rst
@@ -2,7 +2,7 @@ Delta Chat Python bindings, new and old
 =======

 `Delta Chat <https://delta.chat/>`_ provides two kinds of Python bindings
-to the `Rust Core <https://github.com/chatmail/core>`_:
+to the `Rust Core <https://github.com/deltachat/deltachat-core-rust>`_:
 JSON-RPC bindings and CFFI bindings.
 When starting a new project it is recommended to use JSON-RPC bindings,
 which are used in the Delta Chat Desktop app through generated Typescript-bindings. 
@@ -41,4 +41,4 @@ as the CFFI bindings are increasingly in maintenance-only mode.
 .. _virtualenv: http://pypi.org/project/virtualenv/
 .. _merlinux: http://merlinux.eu
 .. _pypi: http://pypi.org/
-.. _`issue-tracker`: https://github.com/chatmail/core
+.. _`issue-tracker`: https://github.com/deltachat/deltachat-core-rust
--- a/python/doc/jsonrpc/develop.rst
+++ b/python/doc/jsonrpc/develop.rst
@@ -3,9 +3,9 @@ Development
 ===========

 To develop JSON-RPC bindings,
-clone the `chatmail core <https://github.com/chatmail/core/>`_ repository::
+clone the `deltachat-core-rust <https://github.com/deltachat/deltachat-core-rust/>`_ repository::

-   git clone https://github.com/chatmail/core.git
+   git clone https://github.com/deltachat/deltachat-core-rust.git

 Testing
 =======
--- a/python/doc/jsonrpc/install.rst
+++ b/python/doc/jsonrpc/install.rst
@@ -17,8 +17,8 @@ Install ``deltachat-rpc-server``
 To get ``deltachat-rpc-server`` binary you have three options:

 1. Install ``deltachat-rpc-server`` from PyPI using ``pip install deltachat-rpc-server``.
-2. Build and install ``deltachat-rpc-server`` from source with ``cargo install --git https://github.com/chatmail/core/ deltachat-rpc-server``.
-3. Download prebuilt release from https://github.com/chatmail/core/releases and install it into ``PATH``.
+2. Build and install ``deltachat-rpc-server`` from source with ``cargo install --git https://github.com/deltachat/deltachat-core-rust/ deltachat-rpc-server``.
+3. Download prebuilt release from https://github.com/deltachat/deltachat-core-rust/releases and install it into ``PATH``.

 Check that ``deltachat-rpc-server`` is installed and can run::

@@ -33,4 +33,4 @@ Install ``deltachat-rpc-client``
 To get ``deltachat-rpc-client`` Python library you can:

 1. Install ``deltachat-rpc-client`` from PyPI using ``pip install deltachat-rpc-client``.
-2. Install ``deltachat-rpc-client`` from source with ``pip install git+https://github.com/chatmail/core.git@main#subdirectory=deltachat-rpc-client``.
+2. Install ``deltachat-rpc-client`` from source with ``pip install git+https://github.com/deltachat/deltachat-core-rust.git@main#subdirectory=deltachat-rpc-client``.
--- a/python/examples/test_examples.py
+++ b/python/examples/test_examples.py
@@ -25,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")
@@ -48,9 +48,7 @@ def test_group_tracking_plugin(acfactory, lp):
    ac2.add_account_plugin(FFIEventLogger(ac2))

    lp.sec("creating bot test group with bot")
-    bot_chat = ac1.qr_setup_contact(botproc.qr)
-    ac1._evtracker.wait_securejoin_joiner_progress(1000)
-    bot_contact = bot_chat.get_contacts()[0]
+    bot_contact = ac1.create_contact(botproc.addr)
    ch = ac1.create_group_chat("bot test group")
    ch.add_contact(bot_contact)
    ch.send_text("hello")
@@ -62,7 +60,7 @@ def test_group_tracking_plugin(acfactory, lp):
    )

    lp.sec("adding third member {}".format(ac2.get_config("addr")))
-    contact3 = ac1.create_contact(ac2)
+    contact3 = ac1.create_contact(ac2.get_config("addr"))
    ch.add_contact(contact3)

    reply = ac1._evtracker.wait_next_incoming_message()
--- a/python/pyproject.toml
+++ b/python/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "deltachat"
-version = "1.159.5"
+version = "1.155.6"
 description = "Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat"
 readme = "README.rst"
 requires-python = ">=3.8"
@@ -29,8 +29,8 @@ dependencies = [
 ]

 [project.urls]
-"Home" = "https://github.com/chatmail/core/"
-"Bug Tracker" = "https://github.com/chatmail/core/issues"
+"Home" = "https://github.com/deltachat/deltachat-core-rust/"
+"Bug Tracker" = "https://github.com/deltachat/deltachat-core-rust/issues"
 "Documentation" = "https://py.delta.chat/"
 "Mastodon" = "https://chaos.social/@delta"

--- 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)
@@ -355,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/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/message.py
+++ b/python/src/deltachat/message.py
@@ -215,7 +215,7 @@ class Message:
        """extract key and use it as primary key for this account."""
        res = lib.dc_continue_key_transfer(self.account._dc_context, self.id, as_dc_charpointer(setup_code))
        if res == 0:
-            raise ValueError("Importing the key from Autocrypt Setup Message failed")
+            raise ValueError("could not decrypt")

    @props.with_doc
    def time_sent(self):
@@ -285,6 +285,23 @@ class Message:
        """Force the message to be sent in plain text."""
        lib.dc_msg_force_plaintext(self._dc_msg)

+    def get_mime_headers(self):
+        """return mime-header object for an incoming message.
+
+        This only returns a non-None object if ``save_mime_headers``
+        config option was set and the message is incoming.
+
+        :returns: email-mime message object (with headers only, no body).
+        """
+        import email
+
+        mime_headers = lib.dc_get_mime_headers(self.account._dc_context, self.id)
+        if mime_headers:
+            s = ffi.string(ffi.gc(mime_headers, lib.dc_str_unref))
+            if isinstance(s, bytes):
+                return email.message_from_bytes(s)
+            return email.message_from_string(s)
+
    @property
    def error(self) -> Optional[str]:
        """Error message."""
--- a/python/src/deltachat/testplugin.py
+++ b/python/src/deltachat/testplugin.py
@@ -423,6 +423,8 @@ class ACFactory:
        where we can make valid SMTP and IMAP connections with.
        """
        configdict = next(self._liveconfig_producer).copy()
+        if "e2ee_enabled" not in configdict:
+            configdict["e2ee_enabled"] = "1"

        if self.pytestconfig.getoption("--strict-tls"):
            # Enable strict certificate checks for online accounts
@@ -482,8 +484,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 +651,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,118 @@ 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.
@@ -323,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.
@@ -332,7 +510,6 @@ def test_see_new_verified_member_after_going_online(acfactory, tmp_path, lp):
    """
    ac1, ac2 = acfactory.get_online_accounts(2)
    ac2_addr = ac2.get_config("addr")
-    acfactory.remove_preconfigured_keys()
    ac1_offl = acfactory.new_online_configuring_account(cloned_from=ac1)
    for ac in [ac1, ac1_offl]:
        ac.set_config("bcc_self", "1")
@@ -383,7 +560,6 @@ def test_use_new_verified_group_after_going_online(acfactory, data, tmp_path, lp
      missing, cannot encrypt".
    """
    ac1, ac2 = acfactory.get_online_accounts(2)
-    acfactory.remove_preconfigured_keys()
    ac2_offl = acfactory.new_online_configuring_account(cloned_from=ac2)
    for ac in [ac2, ac2_offl]:
        ac.set_config("bcc_self", "1")
@@ -439,7 +615,6 @@ def test_verified_group_vs_delete_server_after(acfactory, tmp_path, lp):
    - Now the seconds device has all members verified.
    """
    ac1, ac2 = acfactory.get_online_accounts(2)
-    acfactory.remove_preconfigured_keys()
    ac2_offl = acfactory.new_online_configuring_account(cloned_from=ac2)
    for ac in [ac2, ac2_offl]:
        ac.set_config("bcc_self", "1")
--- a/python/tests/test_1_online.py
+++ b/python/tests/test_1_online.py
@@ -31,6 +31,37 @@ def test_basic_imap_api(acfactory, tmp_path):
    imap2.shutdown()


+@pytest.mark.ignored()
+def test_configure_generate_key(acfactory, lp):
+    # A slow test which will generate new keys.
+    acfactory.remove_preconfigured_keys()
+    ac1 = acfactory.new_online_configuring_account(key_gen_type=str(dc.const.DC_KEY_GEN_RSA2048))
+    ac2 = acfactory.new_online_configuring_account(key_gen_type=str(dc.const.DC_KEY_GEN_ED25519))
+    acfactory.bring_accounts_online()
+    chat = acfactory.get_accepted_chat(ac1, ac2)
+
+    lp.sec("ac1: send unencrypted message to ac2")
+    chat.send_text("message1")
+    lp.sec("ac2: waiting for message from ac1")
+    msg_in = ac2._evtracker.wait_next_incoming_message()
+    assert msg_in.text == "message1"
+    assert not msg_in.is_encrypted()
+
+    lp.sec("ac2: send encrypted message to ac1")
+    msg_in.chat.send_text("message2")
+    lp.sec("ac1: waiting for message from ac2")
+    msg2_in = ac1._evtracker.wait_next_incoming_message()
+    assert msg2_in.text == "message2"
+    assert msg2_in.is_encrypted()
+
+    lp.sec("ac1: send encrypted message to ac2")
+    msg2_in.chat.send_text("message3")
+    lp.sec("ac2: waiting for message from ac1")
+    msg3_in = ac2._evtracker.wait_next_incoming_message()
+    assert msg3_in.text == "message3"
+    assert msg3_in.is_encrypted()
+
+
 def test_configure_canceled(acfactory):
    ac1 = acfactory.new_online_configuring_account()
    ac1.stop_ongoing()
@@ -54,6 +85,78 @@ def test_configure_unref(tmp_path):
    lib.dc_context_unref(dc_context)


+def test_export_import_self_keys(acfactory, tmp_path, lp):
+    ac1, ac2 = acfactory.get_online_accounts(2)
+
+    dir = tmp_path / "exportdir"
+    dir.mkdir()
+    export_files = ac1.export_self_keys(str(dir))
+    assert len(export_files) == 2
+    for x in export_files:
+        assert x.startswith(str(dir))
+    (key_id,) = ac1._evtracker.get_info_regex_groups(r".*xporting.*KeyId\((.*)\).*")
+    ac1._evtracker.consume_events()
+
+    lp.sec("exported keys (private and public)")
+    for name in dir.iterdir():
+        lp.indent(str(dir / name))
+    lp.sec("importing into existing account")
+    ac2.import_self_keys(str(dir))
+    (key_id2,) = ac2._evtracker.get_info_regex_groups(r".*stored.*KeyId\((.*)\).*")
+    assert key_id2 == key_id
+
+
+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 +539,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)
@@ -798,6 +921,12 @@ def test_send_and_receive_will_encrypt_decrypt(acfactory, lp):
    msg3.mark_seen()
    assert not list(ac1.get_fresh_messages())

+    # 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)
@@ -807,8 +936,102 @@ def test_send_and_receive_will_encrypt_decrypt(acfactory, lp):
    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_gossip_encryption_preference(acfactory, lp):
+    """Test that encryption preference of group members is gossiped to new members.
+    This is a Delta Chat extension to Autocrypt 1.1.0, which Autocrypt-Gossip headers
+    SHOULD NOT contain encryption preference.
+    """
+    ac1, ac2, ac3 = acfactory.get_online_accounts(3)
+
+    lp.sec("ac1 learns that ac2 prefers encryption")
+    ac1.create_chat(ac2)
+    msg = ac2.create_chat(ac1).send_text("first message")
+    msg = ac1._evtracker.wait_next_incoming_message()
+    assert msg.text == "first message"
+    assert not msg.is_encrypted()
+    res = "End-to-end encryption preferred:\n{}".format(ac2.get_config("addr"))
+    assert msg.chat.get_encryption_info() == res
+    lp.sec("ac2 learns that ac3 prefers encryption")
+    ac2.create_chat(ac3)
+    msg = ac3.create_chat(ac2).send_text("I prefer encryption")
+    msg = ac2._evtracker.wait_next_incoming_message()
+    assert msg.text == "I prefer encryption"
+    assert not msg.is_encrypted()
+
+    lp.sec("ac3 does not know that ac1 prefers encryption")
+    ac1.create_chat(ac3)
+    chat = ac3.create_chat(ac1)
+    res = "No encryption:\n{}".format(ac1.get_config("addr"))
+    assert chat.get_encryption_info() == res
+    msg = chat.send_text("not encrypted")
+    msg = ac1._evtracker.wait_next_incoming_message()
+    assert msg.text == "not encrypted"
+    assert not msg.is_encrypted()
+
+    lp.sec("ac1 creates a group chat with ac2")
+    group_chat = ac1.create_group_chat("hello")
+    group_chat.add_contact(ac2)
+    encryption_info = group_chat.get_encryption_info()
+    res = "End-to-end encryption preferred:\n{}".format(ac2.get_config("addr"))
+    assert encryption_info == res
+    msg = group_chat.send_text("hi")
+
+    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)
+    assert msg.is_encrypted()
+
+    lp.sec("ac3 learns that ac1 prefers encryption")
+    msg = ac3._evtracker.wait_next_incoming_message()
+    encryption_info = msg.chat.get_encryption_info().splitlines()
+    assert encryption_info[0] == "End-to-end encryption preferred:"
+    assert ac1.get_config("addr") in encryption_info[1:]
+    assert ac2.get_config("addr") in encryption_info[1:]
+    msg = chat.send_text("encrypted")
+    assert msg.is_encrypted()
+
+
 def test_send_first_message_as_long_unicode_with_cr(acfactory, lp):
    ac1, ac2 = acfactory.get_online_accounts(2)
+    ac2.set_config("save_mime_headers", "1")

    lp.sec("ac1: create chat with ac2")
    chat = acfactory.get_accepted_chat(ac1, ac2)
@@ -819,7 +1042,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()
@@ -828,7 +1051,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()
@@ -997,6 +1220,93 @@ def test_dont_show_emails(acfactory, lp):
    assert len(msg.chat.get_messages()) == 3


+def test_no_old_msg_is_fresh(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()
+
+    ac1.set_config("e2ee_enabled", "0")
+    ac1_clone.set_config("e2ee_enabled", "0")
+    ac2.set_config("e2ee_enabled", "0")
+
+    ac1_clone.set_config("bcc_self", "1")
+
+    ac1.create_chat(ac2)
+    ac1_clone.create_chat(ac2)
+
+    ac1.get_device_chat().mark_noticed()
+
+    lp.sec("Send a first message from ac2 to ac1 and check that it's 'fresh'")
+    first_msg_id = ac2.create_chat(ac1).send_text("Hi")
+    ac1._evtracker.wait_next_incoming_message()
+    assert ac1.create_chat(ac2).count_fresh_messages() == 1
+    assert len(list(ac1.get_fresh_messages())) == 1
+
+    lp.sec("Send a message from ac1_clone to ac2 and check that ac1 marks the first message as 'noticed'")
+    ac1_clone.create_chat(ac2).send_text("Hi back")
+    ev = ac1._evtracker.get_matching("DC_EVENT_MSGS_NOTICED")
+
+    assert ev.data1 == first_msg_id.chat.id
+    assert ac1.create_chat(ac2).count_fresh_messages() == 0
+    assert len(list(ac1.get_fresh_messages())) == 0
+
+
+def test_prefer_encrypt(acfactory, lp):
+    """Test quorum rule for encryption preference in 1:1 and group chat."""
+    ac1 = acfactory.new_online_configuring_account(fix_is_chatmail=True)
+    ac2 = acfactory.new_online_configuring_account(fix_is_chatmail=True)
+    ac3 = acfactory.new_online_configuring_account(fix_is_chatmail=True)
+    acfactory.bring_accounts_online()
+    ac1.set_config("e2ee_enabled", "0")
+    ac2.set_config("e2ee_enabled", "1")
+    ac3.set_config("e2ee_enabled", "0")
+
+    # Make sure we do not send a copy to ourselves. This is to
+    # test that we count own preference even when we are not in
+    # the recipient list.
+    ac1.set_config("bcc_self", "0")
+    ac2.set_config("bcc_self", "0")
+    ac3.set_config("bcc_self", "0")
+
+    acfactory.introduce_each_other([ac1, ac2, ac3])
+
+    lp.sec("ac1: sending message to ac2")
+    chat1 = ac1.create_chat(ac2)
+    msg1 = chat1.send_text("message1")
+    assert not msg1.is_encrypted()
+    ac2._evtracker.wait_next_incoming_message()
+
+    lp.sec("ac2: sending message to ac1")
+    chat2 = ac2.create_chat(ac1)
+    msg2 = chat2.send_text("message2")
+    # Own preference is `Mutual` and we have the peer's key.
+    assert msg2.is_encrypted()
+    ac1._evtracker.wait_next_incoming_message()
+
+    lp.sec("ac1: sending message to group chat with ac2 and ac3")
+    group = ac1.create_group_chat("hello")
+    group.add_contact(ac2)
+    group.add_contact(ac3)
+    msg3 = group.send_text("message3")
+    assert not msg3.is_encrypted()
+    ac2._evtracker.wait_next_incoming_message()
+    ac3._evtracker.wait_next_incoming_message()
+
+    lp.sec("ac3: start preferring encryption and inform ac1")
+    ac3.set_config("e2ee_enabled", "1")
+    chat3 = ac3.create_chat(ac1)
+    msg4 = chat3.send_text("message4")
+    # Own preference is `Mutual` and we have the peer's key.
+    assert msg4.is_encrypted()
+    ac1._evtracker.wait_next_incoming_message()
+
+    lp.sec("ac1: sending another message to group chat with ac2 and ac3")
+    msg5 = group.send_text("message5")
+    # Majority prefers encryption now
+    assert msg5.is_encrypted()
+
+
 def test_bot(acfactory, lp):
    """Test that bot messages can be identified as such"""
    ac1, ac2 = acfactory.get_online_accounts(2)
@@ -1025,6 +1335,59 @@ def test_bot(acfactory, lp):
    assert msg_in.is_bot()


+def test_quote_encrypted(acfactory, lp):
+    """Test that replies to encrypted messages with quotes are encrypted."""
+    ac1, ac2 = acfactory.get_online_accounts(2)
+
+    lp.sec("ac1: create chat with ac2")
+    chat = ac1.create_chat(ac2)
+
+    lp.sec("sending text message from ac1 to ac2")
+    msg1 = chat.send_text("message1")
+    assert not msg1.is_encrypted()
+
+    lp.sec("wait for ac2 to receive message")
+    msg2 = ac2._evtracker.wait_next_incoming_message()
+    assert msg2.text == "message1"
+    assert not msg2.is_encrypted()
+
+    lp.sec("create new chat with contact and send back (encrypted) message")
+    msg2.create_chat().send_text("message-back")
+
+    lp.sec("wait for ac1 to receive message")
+    msg3 = ac1._evtracker.wait_next_incoming_message()
+    assert msg3.text == "message-back"
+    assert msg3.is_encrypted()
+
+    lp.sec("ac1: e2ee_enabled=0 and see if reply is encrypted")
+    print("ac1: e2ee_enabled={}".format(ac1.get_config("e2ee_enabled")))
+    print("ac2: e2ee_enabled={}".format(ac2.get_config("e2ee_enabled")))
+    ac1.set_config("e2ee_enabled", "0")
+
+    for quoted_msg in msg1, msg3:
+        # Save the draft with a quote.
+        msg_draft = Message.new_empty(ac1, "text")
+        msg_draft.set_text("message reply")
+        msg_draft.quote = quoted_msg
+        chat.set_draft(msg_draft)
+
+        # Get the draft and send it.
+        msg_draft = chat.get_draft()
+        chat.send_msg(msg_draft)
+
+        chat.set_draft(None)
+        assert chat.get_draft() is None
+
+        # Quote should be replaced with "..." if quoted message is encrypted.
+        msg_in = ac2._evtracker.wait_next_incoming_message()
+        assert msg_in.text == "message reply"
+        assert not msg_in.is_encrypted()
+        if quoted_msg.is_encrypted():
+            assert msg_in.quoted_text == "..."
+        else:
+            assert msg_in.quoted_text == quoted_msg.text
+
+
 def test_quote_attachment(tmp_path, acfactory, lp):
    """Test that replies with an attachment and a quote are received correctly."""
    ac1, ac2 = acfactory.get_online_accounts(2)
@@ -1058,6 +1421,26 @@ def test_quote_attachment(tmp_path, acfactory, lp):
    assert open(received_reply.filename).read() == "data to send"


+def test_saved_mime_on_received_message(acfactory, lp):
+    ac1, ac2 = acfactory.get_online_accounts(2)
+
+    lp.sec("configure ac2 to save mime headers, create ac1/ac2 chat")
+    ac2.set_config("save_mime_headers", "1")
+    chat = ac1.create_chat(ac2)
+
+    lp.sec("sending text message from ac1 to ac2")
+    msg_out = chat.send_text("message1")
+    ac1._evtracker.wait_msg_delivered(msg_out)
+    assert msg_out.get_mime_headers() is None
+
+    lp.sec("wait for ac2 to receive message")
+    ev = ac2._evtracker.get_matching("DC_EVENT_INCOMING_MSG")
+    in_id = ev.data2
+    mime = ac2.get_message_by_id(in_id).get_mime_headers()
+    assert mime.get_all("From")
+    assert mime.get_all("Received")
+
+
 def test_send_mark_seen_clean_incoming_events(acfactory, lp):
    ac1, ac2 = acfactory.get_online_accounts(2)
    chat = acfactory.get_accepted_chat(ac1, ac2)
@@ -1214,6 +1597,53 @@ def test_import_export_online_all(acfactory, tmp_path, data, lp):
    assert ac2.get_latest_backupfile(str(backupdir)) == path2


+def test_ac_setup_message(acfactory, lp):
+    # note that the receiving account needs to be configured and running
+    # before the setup message is send. DC does not read old messages
+    # as of Jul2019
+    ac1 = acfactory.new_online_configuring_account()
+    ac2 = acfactory.new_online_configuring_account(cloned_from=ac1)
+    acfactory.bring_accounts_online()
+
+    lp.sec("trigger ac setup message and return setupcode")
+    assert ac1.get_info()["fingerprint"] != ac2.get_info()["fingerprint"]
+    setup_code = ac1.initiate_key_transfer()
+    ev = ac2._evtracker.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED")
+    msg = ac2.get_message_by_id(ev.data2)
+    assert msg.is_setup_message()
+    assert msg.get_setupcodebegin() == setup_code[:2]
+    lp.sec("try a bad setup code")
+    with pytest.raises(ValueError):
+        msg.continue_key_transfer(str(reversed(setup_code)))
+    lp.sec("try a good setup code")
+    print("*************** Incoming ASM File at: ", msg.filename)
+    print("*************** Setup Code: ", setup_code)
+    msg.continue_key_transfer(setup_code)
+    assert ac1.get_info()["fingerprint"] == ac2.get_info()["fingerprint"]
+
+
+def test_ac_setup_message_twice(acfactory, lp):
+    ac1 = acfactory.new_online_configuring_account()
+    ac2 = acfactory.new_online_configuring_account(cloned_from=ac1)
+    acfactory.bring_accounts_online()
+
+    lp.sec("trigger ac setup message but ignore")
+    assert ac1.get_info()["fingerprint"] != ac2.get_info()["fingerprint"]
+    ac1.initiate_key_transfer()
+    ac2._evtracker.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED")
+
+    lp.sec("trigger second ac setup message, wait for receive ")
+    setup_code2 = ac1.initiate_key_transfer()
+    ev = ac2._evtracker.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED")
+    msg = ac2.get_message_by_id(ev.data2)
+    assert msg.is_setup_message()
+    assert msg.get_setupcodebegin() == setup_code2[:2]
+
+    lp.sec("process second setup message")
+    msg.continue_key_transfer(setup_code2)
+    assert ac1.get_info()["fingerprint"] == ac2.get_info()["fingerprint"]
+
+
 def test_qr_email_capitalization(acfactory, lp):
    """Regression test for a bug
    that resulted in failure to propagate verification via gossip in a verified group
@@ -1234,7 +1664,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")
@@ -1333,7 +1763,7 @@ def test_add_remove_member_remote_events(acfactory, lp):
    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)
+    contact2 = chat.add_contact(ac3_addr)
    ev = in_list.get()
    assert ev.action == "chat-modified"
    ev = in_list.get()
@@ -1502,6 +1932,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,
@@ -1617,7 +2056,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
@@ -1653,7 +2092,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
@@ -1764,7 +2203,9 @@ def test_name_changes(acfactory):
    ac1, ac2 = acfactory.get_online_accounts(2)
    ac1.set_config("displayname", "Account 1")

-    chat12 = acfactory.get_accepted_chat(ac1, ac2)
+    # 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():
@@ -1929,6 +2370,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
@@ -105,6 +105,10 @@ class TestOfflineAccountBasic:
        ac1.update_config({"mvbox_move": False})
        assert ac1.get_config("mvbox_move") == "0"

+    def test_has_savemime(self, acfactory):
+        ac1 = acfactory.get_unconfigured_account()
+        assert "save_mime_headers" in ac1.get_config("sys.config_keys").split()
+
    def test_has_bccself(self, acfactory):
        ac1 = acfactory.get_unconfigured_account()
        assert "bcc_self" in ac1.get_config("sys.config_keys").split()
@@ -184,6 +188,7 @@ class TestOfflineContact:

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

        assert ac1.delete_contact(contact1)
--- 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-05-14
+2025-02-17
--- a/scripts/concourse/docs_wheels.yml
+++ b/scripts/concourse/docs_wheels.yml
@@ -4,14 +4,14 @@ resources:
    icon: github
    source:
      branch: main
-      uri: https://github.com/chatmail/core.git
+      uri: https://github.com/deltachat/deltachat-core-rust.git

  - name: deltachat-core-rust-release
    type: git
    icon: github
    source:
      branch: main
-      uri: https://github.com/chatmail/core.git
+      uri: https://github.com/deltachat/deltachat-core-rust.git
      tag_filter: "v*"

 jobs:
--- 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.87.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/Show More
+++ b/Show More
Author	SHA1	Message	Date
Hocuri	48c9945be5	Make it more performant	2025-02-24 14:12:10 +01:00
B. Petersen	2281f36ce5	move can_send_edit_request() to send_edit_request()	2025-02-24 13:05:14 +01:00
B. Petersen	307b61a2c0	remove unused param	2025-02-24 12:17:16 +01:00
B. Petersen	b455344a14	add can_send_edit_request() api	2025-02-24 12:17:16 +01:00
@@ -1 +1 @@
 -05-14
 -02-17