remove allow_creation override

feat: create all contacts from the To field with IncomingUnknownTo origin
Contacts are created with IncomingUnknownTo origin instead of IncomingTo now even if the message is from a known contact. Removed IncomingTo, IncomingCc, OutgoingBcc, OutgoingCc, IncomingUnknownCc origins.
2026-10-28 15:58:22 +03:00 · 2025-05-17 18:34:56 +00:00 · 2025-05-17 18:34:33 +00:00 · 2025-05-17 18:34:33 +00:00 · 2025-05-17 18:34:33 +00:00 · 2025-05-16 04:30:39 +00:00
58 changed files with 963 additions and 930 deletions
@@ -20,10 +20,10 @@ permissions: {}

 env:
  RUSTFLAGS: -Dwarnings
-  RUST_VERSION: 1.86.0
+  RUST_VERSION: 1.87.0

  # Minimum Supported Rust Version
-  MSRV: 1.82.0
+  MSRV: 1.85.0

 jobs:
  lint_rust:
@@ -9,7 +9,7 @@ permissions: {}
 jobs:
  pack-module:
    name: "Publish @deltachat/jsonrpc-client"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
    permissions:
      id-token: write
      contents: read
@@ -95,9 +95,10 @@ jobs:
      fail-fast: false
      matrix:
        installable:
-          - deltachat-rpc-server-aarch64-darwin
+          - deltachat-rpc-server

          # Fails to bulid
+          # - deltachat-rpc-server-aarch64-darwin
          # - deltachat-rpc-server-x86_64-darwin
    steps:
      - uses: actions/checkout@v4
@@ -1,5 +1,45 @@
 # Changelog

+## [1.159.5] - 2025-05-14
+
+### Fixes
+
+- Don't change webxdc self-addr when saving and loading draft ([#6854](https://github.com/chatmail/core/pull/6854)).
+
+### Miscellaneous Tasks
+
+- Remove duplicate miniz_oxide dependency.
+- Update async-smtp to 0.10.2.
+
+## [1.159.4] - 2025-05-13
+
+### Documentation
+
+- Add missing documentation to deltachat-rpc-client.
+
+### Features / Changes
+
+- Better avatar quality ([#6822](https://github.com/chatmail/core/pull/6822)).
+- Update iroh from 0.33.0 to 0.35.0 ([#6687](https://github.com/chatmail/core/pull/6687)).
+- Other dependency updates.
+
+### Fixes
+
+- Emit progress(0) in case AEAP is tried.
+- Replace `FuturesUnordered` from `futures` with `JoinSet` from `tokio`.
+- Fix order of operations when handling "vc-request-with-auth" ([#6850](https://github.com/chatmail/core/pull/6850)).
+- Generate rfc724_mid when creating Message ([#6704](https://github.com/chatmail/core/pull/6704))
+
+### Tests
+
+- Profile data is attached to group leave messages.
+
+## [1.159.3] - 2025-04-24
+
+### CI
+
+- Use `ubuntu-latest` runner for `@deltachat/jsonrpc-client` publishing.
+
 ## [1.159.2] - 2025-04-23

 ### Fixes
@@ -6260,3 +6300,6 @@ https://github.com/chatmail/core/pulls?q=is%3Apr+is%3Aclosed
 [1.159.0]: https://github.com/chatmail/core/compare/v1.158.0..v1.159.0
 [1.159.1]: https://github.com/chatmail/core/compare/v1.159.0..v1.159.1
 [1.159.2]: https://github.com/chatmail/core/compare/v1.159.1..v1.159.2
+[1.159.3]: https://github.com/chatmail/core/compare/v1.159.2..v1.159.3
+[1.159.4]: https://github.com/chatmail/core/compare/v1.159.3..v1.159.4
+[1.159.5]: https://github.com/chatmail/core/compare/v1.159.4..v1.159.5
@@ -1,9 +1,9 @@
 [package]
 name = "deltachat"
-version = "1.159.2"
+version = "1.159.5"
 edition = "2021"
 license = "MPL-2.0"
-rust-version = "1.82"
+rust-version = "1.85"
 repository = "https://github.com/chatmail/core"

 [profile.dev]
@@ -43,27 +43,27 @@ async-broadcast = "0.7.2"
 async-channel = { workspace = true }
 async-imap = { version = "0.10.4", default-features = false, features = ["runtime-tokio", "compress"] }
 async-native-tls = { version = "0.5", default-features = false, features = ["runtime-tokio"] }
-async-smtp = { version = "0.10", default-features = false, features = ["runtime-tokio"] }
+async-smtp = { version = "0.10.2", default-features = false, features = ["runtime-tokio"] }
 async_zip = { version = "0.0.17", default-features = false, features = ["deflate", "tokio-fs"] }
 base64 = { workspace = true }
-brotli = { version = "7", default-features=false, features = ["std"] }
+brotli = { version = "8", default-features=false, features = ["std"] }
 bytes = "1"
 chrono = { workspace = true, features = ["alloc", "clock", "std"] }
-data-encoding = "2.7.0"
+data-encoding = "2.9.0"
 escaper = "0.1"
 fast-socks5 = "0.10"
 fd-lock = "4"
 futures-lite = { workspace = true }
 futures = { workspace = true }
 hex = "0.4.0"
-hickory-resolver = "=0.25.0-alpha.5"
+hickory-resolver = "0.25.2"
 http-body-util = "0.1.3"
 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.33", default-features = false, features = ["net"] }
-iroh = { version = "0.33", default-features = false }
+iroh-gossip = { version = "0.35", default-features = false, features = ["net"] }
+iroh = { version = "0.35", default-features = false }
 kamadak-exif = "0.6.1"
 libc = { workspace = true }
 mail-builder = { version = "0.4.2", default-features = false }
@@ -91,8 +91,8 @@ serde_urlencoded = "0.7.1"
 serde = { workspace = true, features = ["derive"] }
 sha-1 = "0.10"
 sha2 = "0.10"
-shadowsocks = { version = "1.22.0", default-features = false, features = ["aead-cipher", "aead-cipher-2022"] }
-smallvec = "1.14.0"
+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"
 tagger = "4.3.4"
@@ -108,7 +108,7 @@ toml = "0.8"
 url = "2"
 uuid = { version = "1", features = ["serde", "v4"] }
 webpki-roots = "0.26.8"
-blake3 = "1.8.0"
+blake3 = "1.8.2"

 [dev-dependencies]
 anyhow = { workspace = true, features = ["backtrace"] } # Enable `backtrace` feature in tests.
@@ -173,7 +173,7 @@ harness = false
 anyhow = "1"
 async-channel = "2.3.1"
 base64 = "0.22"
-chrono = { version = "0.4.40", default-features = false }
+chrono = { version = "0.4.41", default-features = false }
 deltachat-contact-tools = { path = "deltachat-contact-tools" }
 deltachat-jsonrpc = { path = "deltachat-jsonrpc", default-features = false }
 deltachat = { path = ".", default-features = false }
@@ -49,12 +49,12 @@ $ curl https://sh.rustup.rs -sSf | sh

 ## Using the CLI client

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

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

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

 Configure your account (if not already configured):

 ```
-Delta Chat Core is awaiting your commands.
+Chatmail is awaiting your commands.
 > set addr your@email.org
 > set mail_pw yourpassword
 > configure
@@ -106,11 +106,6 @@ 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:

 ```
@@ -187,11 +182,9 @@ $ 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/deltachat/provider-db) to the core, run:
-
-```
-./src/provider/update.py ../provider-db/_providers/ > src/provider/data.rs
-```
+[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.

 ## Language bindings and frontend projects

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.159.2"
+version = "1.159.5"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
@@ -436,10 +436,10 @@ char*           dc_get_blobdir               (const dc_context_t* context);
 *                    0=watch all folders normally (default)
 * - `show_emails`  = DC_SHOW_EMAILS_OFF (0)=
 *                    show direct replies to chats only,
- *                    DC_SHOW_EMAILS_ACCEPTED_CONTACTS (1)=
- *                    also show all mails of confirmed contacts,
+ *                    DC_SHOW_EMAILS_ALL1 (1)=
+ *                    deprecated, same as DC_SHOW_EMAILS_ALL,
 *                    DC_SHOW_EMAILS_ALL (2)=
- *                    also show mails of unconfirmed contacts (default).
+ *                    show all mails (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.
@@ -6582,7 +6582,7 @@ void dc_event_unref(dc_event_t* event);
 * Values for dc_get|set_config("show_emails")
 */
 #define DC_SHOW_EMAILS_OFF               0
-#define DC_SHOW_EMAILS_ACCEPTED_CONTACTS 1
+#define DC_SHOW_EMAILS_ALL1              1
 #define DC_SHOW_EMAILS_ALL               2


@@ -37,6 +37,7 @@ 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 rand::Rng;
 use tokio::runtime::Runtime;
@@ -2076,7 +2077,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::default()
+                    message::Message::new(Viewtype::default())
                } else {
                    warn!(ctx, "dc_get_msg could not retrieve msg_id {msg_id}: {e:#}");
                    return ptr::null_mut();
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.159.2"
+version = "1.159.5"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
 license = "MPL-2.0"
@@ -54,5 +54,5 @@
  },
  "type": "module",
  "types": "dist/deltachat.d.ts",
-  "version": "1.159.2"
+  "version": "1.159.5"
 }
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-repl"
-version = "1.159.2"
+version = "1.159.5"
 license = "MPL-2.0"
 edition = "2021"
 repository = "https://github.com/chatmail/core"
@@ -323,7 +323,7 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
        }
    });

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

    let config = Config::builder()
        .history_ignore_space(true)
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "deltachat-rpc-client"
-version = "1.159.2"
+version = "1.159.5"
 description = "Python client for Delta Chat core JSON-RPC interface"
 classifiers = [
    "Development Status :: 5 - Production/Stable",
@@ -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
@@ -115,7 +115,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 +124,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 +143,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.
    """
@@ -1,3 +1,5 @@
+"""Account module."""
+
 from __future__ import annotations

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

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

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

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

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

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

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

    @futuremethod
@@ -117,7 +126,7 @@ class Account:

    @futuremethod
    def list_transports(self):
-        """Returns the list of all email accounts that are used as a transport in the current profile."""
+        """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

@@ -158,7 +167,8 @@ class Account:
    def import_vcard(self, vcard: str) -> list[Contact]:
        """Import vCard.

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

@@ -227,12 +237,12 @@ class Account:

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

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

    def get_chatlist(
@@ -290,8 +300,7 @@ 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.
@@ -361,22 +370,26 @@ class Account:
    def wait_for_incoming_msg(self):
        """Wait for incoming message and return it.

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

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

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

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

    def get_fresh_messages_in_arrival_order(self) -> list[Message]:
@@ -1,3 +1,5 @@
+"""Chat module."""
+
 from __future__ import annotations

 import calendar
@@ -89,7 +91,8 @@ 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:
@@ -199,12 +202,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:
@@ -48,6 +48,7 @@ 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)

@@ -77,9 +78,11 @@ 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():
@@ -198,5 +201,6 @@ 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)
@@ -1,14 +1,20 @@
+"""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
@@ -16,6 +22,8 @@ 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
@@ -23,7 +31,7 @@ class SpecialContactId(IntEnum):


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

    INFO = "Info"
    SMTP_CONNECTED = "SmtpConnected"
@@ -71,7 +79,7 @@ class EventType(str, Enum):


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

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


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

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


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

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


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

    DONE = "Done"
    AVAILABLE = "Available"
@@ -159,14 +167,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
@@ -174,7 +182,7 @@ class CertificateChecks(IntEnum):


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

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


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

    DEFAULT = 0
    RSA2048 = 1
@@ -193,21 +201,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
@@ -215,7 +223,7 @@ class ProviderStatus(IntEnum):


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

    NOT_CONNECTED = 0
    HEARTBEAT = 1
@@ -223,15 +231,14 @@ class PushNotifyState(IntEnum):


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

    OFF = 0
-    ACCEPTED_CONTACTS = 1
    ALL = 2


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

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


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

    UNKNOWN = 0
    BASICWEBRTC = 1
@@ -1,3 +1,5 @@
+"""Contact module."""
+
 from dataclasses import dataclass
 from typing import TYPE_CHECKING

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

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

    Essentially a wrapper for RPC, account ID and a contact ID.
    """
@@ -45,8 +46,9 @@ 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, containing your fingerprint and
-        the fingerprint of the contact.
+        """Get a multi-line encryption info.
+
+        Encryption info contains your fingerprint and the fingerprint of the contact.
        """
        return self._rpc.get_contact_encryption_info(self.account.id, self.id)

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

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

 from typing import TYPE_CHECKING
@@ -10,12 +12,13 @@ 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:
@@ -37,9 +40,7 @@ class DeltaChat:
        self.rpc.stop_io_for_all_accounts()

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

    def get_system_info(self) -> AttrDict:
@@ -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,9 +52,7 @@ class EventFilter(ABC):

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


 class RawEvent(EventFilter):
@@ -82,31 +80,17 @@ 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.
-
-    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.
-    """
+    """Matches whenever a new message arrives."""

    def __init__(
        self,
@@ -121,6 +105,25 @@ 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
@@ -159,6 +162,7 @@ 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:
@@ -199,6 +203,7 @@ 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)
@@ -231,6 +236,7 @@ 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)
@@ -256,13 +262,12 @@ 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()
@@ -1,3 +1,5 @@
+"""Message module."""
+
 import json
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Optional, Union
@@ -45,6 +47,7 @@ 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)

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

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

    def send_webxdc_status_update(self, update: Union[dict, str], description: str) -> None:
@@ -62,6 +70,7 @@ 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:
@@ -69,6 +78,7 @@ class Message:
        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:
@@ -80,8 +90,10 @@ 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))
@@ -1,3 +1,5 @@
+"""Pytest plugin module."""
+
 from __future__ import annotations

 import os
@@ -13,24 +15,30 @@ from .rpc import Rpc


 class ACFactory:
+    """Test account factory."""
+
    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}"

    @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}
@@ -40,6 +48,7 @@ class ACFactory:
        return account

    def new_configured_bot(self) -> Bot:
+        """Create a new configured bot."""
        addr, password = self.get_credentials()
        bot = self.get_unconfigured_bot()
        bot.configure(addr, password)
@@ -47,11 +56,13 @@ class ACFactory:

    @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]

@@ -66,6 +77,10 @@ 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)

@@ -77,6 +92,7 @@ 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)
@@ -95,6 +111,7 @@ 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,
@@ -108,6 +125,7 @@ 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
@@ -115,6 +133,7 @@ def rpc(tmp_path) -> AsyncGenerator:

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


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

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

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


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


 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:
@@ -32,17 +37,19 @@ class RpcFuture:


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

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

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


 class Rpc:
+    """RPC client."""
+
    def __init__(self, accounts_dir: Optional[str] = None, **kwargs):
-        """The given arguments will be passed to subprocess.Popen()"""
+        """Initialize RPC client.
+
+        The given arguments will be passed to subprocess.Popen().
+        """
        if accounts_dir:
            kwargs["env"] = {
                **kwargs.get("env", os.environ),
@@ -81,6 +93,7 @@ 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",
@@ -130,6 +143,7 @@ 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)
@@ -157,12 +171,13 @@ 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:
-        """Requests new events and distributes them between queues."""
+        """Request new events and distributes them between queues."""
        try:
            while True:
                if self.closing:
@@ -178,12 +193,12 @@ class Rpc:
            logging.exception("Exception in the event loop")

    def wait_for_event(self, account_id: int) -> Optional[dict]:
-        """Waits for the next event from the given account and returns it."""
+        """Wait 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):
-        """Removes all queued-up events for a given account. Useful for tests."""
+        """Remove all queued-up events for a given account. Useful for tests."""
        queue = self.get_queue(account_id)
        try:
            while True:
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.159.2"
+version = "1.159.5"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"
@@ -15,5 +15,5 @@
  },
  "type": "module",
  "types": "index.d.ts",
-  "version": "1.159.2"
+  "version": "1.159.5"
 }
@@ -10,9 +10,6 @@ ignore = [
    # Unmaintained instant
    "RUSTSEC-2024-0384",

-    # Unmaintained backoff
-    "RUSTSEC-2025-0012",
-
    # Unmaintained paste
    "RUSTSEC-2024-0436",
 ]
@@ -25,7 +22,6 @@ ignore = [
 skip = [
     { name = "async-channel", version = "1.9.0" },
     { 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" },
@@ -34,20 +30,19 @@ skip = [
     { name = "linux-raw-sys", version = "0.4.14" },
     { name = "loom", version = "0.5.6" },
     { name = "netlink-packet-route", version = "0.17.1" },
-     { name = "nix", version = "0.26.4" },
-     { name = "nix", version = "0.27.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 = "redox_syscall", version = "0.3.5" },
     { name = "regex-automata", version = "0.1.10" },
     { name = "regex-syntax", version = "0.6.29" },
-     { name = "rtnetlink", version = "0.13.1" },
     { name = "rustix", version = "0.38.44" },
-     { name = "security-framework", version = "2.11.1" },
+     { name = "spin", version = "0.9.8" },
     { name = "strum_macros", version = "0.26.2" },
     { name = "strum", version = "0.26.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" },
@@ -84,6 +79,7 @@ allow = [
    "MPL-2.0",
    "Unicode-3.0",
    "Unicode-DFS-2016",
+    "Unlicense",
    "Zlib",
 ]

@@ -47,11 +47,11 @@
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1737527504,
-        "narHash": "sha256-Z8S5gLPdIYeKwBXDaSxlJ72ZmiilYhu3418h3RSQZA0=",
+        "lastModified": 1747291057,
+        "narHash": "sha256-9Wir6aLJAeJKqdoQUiwfKdBn7SyNXTJGRSscRyVOo2Y=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "aa13f23e3e91b95377a693ac655bbc6545ebec0d",
+        "rev": "76ffc1b7b3ec8078fe01794628b6abff35cbda8f",
        "type": "github"
      },
      "original": {
@@ -147,11 +147,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1737469691,
-        "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
+        "lastModified": 1747179050,
+        "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
+        "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
        "type": "github"
      },
      "original": {
@@ -175,11 +175,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1731139594,
-        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
+        "lastModified": 1747179050,
+        "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
+        "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
        "type": "github"
      },
      "original": {
@@ -202,11 +202,11 @@
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1737453499,
-        "narHash": "sha256-fa5AJI9mjFU2oVXqdCq2oA2pripAXbHzkUkewJRQpxA=",
+        "lastModified": 1746889290,
+        "narHash": "sha256-h3LQYZgyv2l3U7r+mcsrEOGRldaK0zJFwAAva4hV/6g=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "0b68402d781955d526b80e5d479e9e47addb4075",
+        "rev": "2bafe9d96c6734aacfd49e115f6cf61e7adc68bc",
        "type": "github"
      },
      "original": {
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "deltachat"
-version = "1.159.2"
+version = "1.159.5"
 description = "Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat"
 readme = "README.rst"
 requires-python = ">=3.8"
@@ -1 +1 @@
-2025-04-23
+2025-05-14
@@ -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.86.0
+RUST_VERSION=1.87.0

 ARCH="$(uname -m)"
 test -f "/lib/libc.musl-$ARCH.so.1" && LIBC=musl || LIBC=gnu
@@ -5,12 +5,10 @@ use std::future::Future;
 use std::path::{Path, PathBuf};

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

 #[cfg(not(target_os = "ios"))]
@@ -304,12 +302,6 @@ impl Accounts {
    /// This is an auxiliary function and not part of public API.
    /// Use [Accounts::background_fetch] instead.
    async fn background_fetch_no_timeout(accounts: Vec<Context>, events: Events) {
-        async fn background_fetch_and_log_error(account: Context) {
-            if let Err(error) = account.background_fetch().await {
-                warn!(account, "{error:#}");
-            }
-        }
-
        events.emit(Event {
            id: 0,
            typ: EventType::Info(format!(
@@ -317,11 +309,15 @@ impl Accounts {
                accounts.len()
            )),
        });
-        let mut futures_unordered: FuturesUnordered<_> = accounts
-            .into_iter()
-            .map(background_fetch_and_log_error)
-            .collect();
-        while futures_unordered.next().await.is_some() {}
+        let mut set = JoinSet::new();
+        for account in accounts {
+            set.spawn(async move {
+                if let Err(error) = account.background_fetch().await {
+                    warn!(account, "{error:#}");
+                }
+            });
+        }
+        set.join_all().await;
    }

    /// Auxiliary function for [Accounts::background_fetch].
@@ -432,7 +432,20 @@ impl<'a> BlobObject<'a> {
                    if mem::take(&mut add_white_bg) {
                        self::add_white_bg(&mut img);
                    }
-                    let new_img = img.thumbnail(img_wh, img_wh);
+
+                    // resize() results in often slightly better quality,
+                    // however, comes at high price of being 4+ times slower than thumbnail().
+                    // for a typical camera image that is sent, this may be a change from "instant" (500ms) to "long time waiting" (3s).
+                    // as we do not have recoding in background while chat has already a preview,
+                    // we vote for speed.
+                    // exception is the avatar image: this is far more often sent than recoded,
+                    // usually has less pixels by cropping, UI that needs to wait anyways,
+                    // and also benefits from slightly better (5%) encoding of Triangle-filtered images.
+                    let new_img = if is_avatar {
+                        img.resize(img_wh, img_wh, image::imageops::FilterType::Triangle)
+                    } else {
+                        img.thumbnail(img_wh, img_wh)
+                    };

                    if encoded_img_exceeds_bytes(
                        context,
@@ -174,7 +174,7 @@ async fn test_selfavatar_outside_blobdir() {
    let avatar_blob = t.get_config(Config::Selfavatar).await.unwrap().unwrap();
    let avatar_path = Path::new(&avatar_blob);
    assert!(
-        avatar_blob.ends_with("1e08d1c9398297c21dd3820f7db2324.jpg"),
+        avatar_blob.ends_with("7dde69e06b5ae6c27520a436bbfd65b.jpg"),
        "The avatar filename should be its hash, put instead it's {avatar_blob}"
    );
    let scaled_avatar_size = file_size(avatar_path).await;
@@ -226,7 +226,7 @@ async fn test_selfavatar_in_blobdir() {
        .unwrap();
    let avatar_cfg = t.get_config(Config::Selfavatar).await.unwrap().unwrap();
    assert!(
-        avatar_cfg.ends_with("ec054c444a5755adf2b0aaea40209f2.png"),
+        avatar_cfg.ends_with("d57cb5ce5f371531b6e1fb17b6dd1af.png"),
        "Avatar file name {avatar_cfg} should end with its hash"
    );

@@ -995,6 +995,7 @@ impl ChatId {
                transaction.execute(
                    "INSERT INTO msgs (
                 chat_id,
+                 rfc724_mid,
                 from_id,
                 timestamp,
                 type,
@@ -1004,9 +1005,10 @@ impl ChatId {
                 param,
                 hidden,
                 mime_in_reply_to)
-         VALUES (?,?,?,?,?,?,?,?,?,?);",
+         VALUES (?,?,?,?,?,?,?,?,?,?,?);",
                    (
                        self,
+                        &msg.rfc724_mid,
                        ContactId::SELF,
                        time(),
                        msg.viewtype,
@@ -2005,7 +2007,9 @@ impl Chat {
        let mut to_id = 0;
        let mut location_id = 0;

-        let new_rfc724_mid = create_outgoing_rfc724_mid();
+        if msg.rfc724_mid.is_empty() {
+            msg.rfc724_mid = create_outgoing_rfc724_mid();
+        }

        if self.typ == Chattype::Single {
            if let Some(id) = context
@@ -2103,7 +2107,7 @@ impl Chat {
            if references_vec.is_empty() {
                // As a fallback, use our Message-ID,
                // same as in the case of top-level message.
-                new_references = new_rfc724_mid.clone();
+                new_references = msg.rfc724_mid.clone();
            } else {
                new_references = references_vec.join(" ");
            }
@@ -2113,7 +2117,7 @@ impl Chat {
            // This allows us to identify replies to our message even if
            // email server such as Outlook changes `Message-ID:` header.
            // MUAs usually keep the first Message-ID in `References:` header unchanged.
-            new_references = new_rfc724_mid.clone();
+            new_references = msg.rfc724_mid.clone();
        }

        // add independent location to database
@@ -2181,7 +2185,6 @@ impl Chat {

        msg.chat_id = self.id;
        msg.from_id = ContactId::SELF;
-        msg.rfc724_mid = new_rfc724_mid;
        msg.timestamp_sort = timestamp;

        // add message to the database
@@ -3846,7 +3849,7 @@ pub(crate) async fn add_contact_to_chat_ex(
 ) -> Result<bool> {
    ensure!(!chat_id.is_special(), "can not add member to special chats");
    let contact = Contact::get_by_id(context, contact_id).await?;
-    let mut msg = Message::default();
+    let mut msg = Message::new(Viewtype::default());

    chat_id.reset_gossiped_timestamp(context).await?;

@@ -4077,7 +4080,7 @@ pub async fn remove_contact_from_chat(
        "Cannot remove special contact"
    );

-    let mut msg = Message::default();
+    let mut msg = Message::new(Viewtype::default());

    let chat = Chat::load_from_db(context, chat_id).await?;
    if chat.typ == Chattype::Group || chat.typ == Chattype::Broadcast {
@@ -4184,7 +4187,7 @@ async fn rename_ex(
    ensure!(!chat_id.is_special(), "Invalid chat ID");

    let chat = Chat::load_from_db(context, chat_id).await?;
-    let mut msg = Message::default();
+    let mut msg = Message::new(Viewtype::default());

    if chat.typ == Chattype::Group
        || chat.typ == Chattype::Mailinglist
@@ -4347,9 +4350,11 @@ pub async fn forward_msgs(context: &Context, msg_ids: &[MsgId], chat_id: ChatId)
        msg.subject = "".to_string();

        msg.state = MessageState::OutPending;
+        msg.rfc724_mid = create_outgoing_rfc724_mid();
        let new_msg_id = chat
            .prepare_msg_raw(context, &mut msg, None, curr_timestamp)
            .await?;
+
        curr_timestamp += 1;
        if !create_send_msg_jobs(context, &mut msg).await?.is_empty() {
            context.scheduler.interrupt_smtp().await;
@@ -1503,6 +1503,39 @@ async fn test_shall_attach_selfavatar() -> Result<()> {
    Ok(())
 }

+/// Tests that profile data is attached to group leave messages. There are some pros and cons of
+/// doing this, but at least we don't want to complicate the code with this special case.
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_profile_data_on_group_leave() -> Result<()> {
+    let mut tcm = TestContextManager::new();
+    let t = &tcm.alice().await;
+    let chat_id = create_group_chat(t, ProtectionStatus::Unprotected, "foo").await?;
+
+    let (contact_id, _) = Contact::add_or_lookup(
+        t,
+        "",
+        &ContactAddress::new("foo@bar.org")?,
+        Origin::IncomingUnknownTo,
+    )
+    .await?;
+    add_contact_to_chat(t, chat_id, contact_id).await?;
+
+    send_text_msg(t, chat_id, "populate".to_string()).await?;
+    t.pop_sent_msg().await;
+
+    let file = t.dir.path().join("avatar.png");
+    let bytes = include_bytes!("../../test-data/image/avatar64x64.png");
+    tokio::fs::write(&file, bytes).await?;
+    t.set_config(Config::Selfavatar, Some(file.to_str().unwrap()))
+        .await?;
+    assert!(shall_attach_selfavatar(t, chat_id).await?);
+
+    remove_contact_from_chat(t, chat_id, ContactId::SELF).await?;
+    let sent_msg = t.pop_sent_msg().await;
+    assert!(sent_msg.payload().contains("Chat-User-Avatar"));
+    Ok(())
+}
+
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_set_mute_duration() {
    let t = TestContext::new().await;
@@ -2007,20 +2040,28 @@ async fn test_sticker_forward() -> Result<()> {
 }

 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_forward() -> Result<()> {
+async fn test_forward_basic() -> Result<()> {
    let alice = TestContext::new_alice().await;
    let bob = TestContext::new_bob().await;
    let alice_chat = alice.create_chat(&bob).await;
    let bob_chat = bob.create_chat(&alice).await;

-    let mut msg = Message::new_text("Hi Bob".to_owned());
-    let sent_msg = alice.send_msg(alice_chat.get_id(), &mut msg).await;
+    let mut alice_msg = Message::new_text("Hi Bob".to_owned());
+    let sent_msg = alice.send_msg(alice_chat.get_id(), &mut alice_msg).await;
    let msg = bob.recv_msg(&sent_msg).await;
+    assert_eq!(alice_msg.rfc724_mid, msg.rfc724_mid);

    forward_msgs(&bob, &[msg.id], bob_chat.get_id()).await?;

    let forwarded_msg = bob.pop_sent_msg().await;
+    assert_eq!(bob_chat.id.get_msg_cnt(&bob).await?, 2);
+    assert_ne!(
+        forwarded_msg.load_from_db().await.rfc724_mid,
+        msg.rfc724_mid,
+    );
+    let msg_bob = Message::load_from_db(&bob, forwarded_msg.sender_msg_id).await?;
    let msg = alice.recv_msg(&forwarded_msg).await;
+    assert_eq!(msg.rfc724_mid(), msg_bob.rfc724_mid());
    assert_eq!(msg.get_text(), "Hi Bob");
    assert!(msg.is_forwarded());
    Ok(())
@@ -3827,8 +3868,10 @@ async fn test_restore_backup_after_60_days() -> Result<()> {
    alice.recv_msg(&bob_sent_text).await;
    fiona.recv_msg(&bob_sent_text).await;

+    // Alice did not knew that Charlie is not part of the group
+    // when sending a message, so sent it to Charlie.
    bob.recv_msg(&alice_sent_text).await;
-    fiona.recv_msg(&alice_sent_text).await;
+    charlie.recv_msg(&alice_sent_text).await;

    // Alice should have learned about Charlie not being part of the group
    // by receiving Bob's message.
@@ -129,7 +129,9 @@ impl Context {
        param.addr = addr_normalize(&param.addr);
        let old_addr = self.get_config(Config::ConfiguredAddr).await?;
        if self.is_configured().await? && !addr_cmp(&old_addr.unwrap_or_default(), &param.addr) {
-            bail!("Changing your email address is not supported right now. Check back in a few months!");
+            let error_msg = "Changing your email address is not supported right now. Check back in a few months!";
+            progress!(self, 0, Some(error_msg.to_string()));
+            bail!(error_msg);
        }
        let cancel_channel = self.alloc_ongoing().await?;

@@ -45,8 +45,12 @@ pub enum Blocked {
 #[repr(u8)]
 pub enum ShowEmails {
    Off = 0,
-    AcceptedContacts = 1,
-    #[default] // also change Config.ShowEmails props(default) on changes
+
+    /// Deprecated 2025-04-16, same as All.
+    All1 = 1,
+
+    // also change Config.ShowEmails props(default) on changes
+    #[default]
    All = 2,
 }

@@ -253,10 +257,7 @@ mod tests {
        // values may be written to disk and must not change
        assert_eq!(ShowEmails::All, ShowEmails::default());
        assert_eq!(ShowEmails::Off, ShowEmails::from_i32(0).unwrap());
-        assert_eq!(
-            ShowEmails::AcceptedContacts,
-            ShowEmails::from_i32(1).unwrap()
-        );
+        assert_eq!(ShowEmails::All1, ShowEmails::from_i32(1).unwrap());
        assert_eq!(ShowEmails::All, ShowEmails::from_i32(2).unwrap());
    }

@@ -501,14 +501,12 @@ pub enum Origin {
    MailinglistAddress = 0x2,

    /// Hidden on purpose, e.g. addresses with the word "noreply" in it
+    /// or past members of the groups.
    Hidden = 0x8,

    /// From: of incoming messages of unknown sender
    IncomingUnknownFrom = 0x10,

-    /// Cc: of incoming messages of unknown sender
-    IncomingUnknownCc = 0x20,
-
    /// To: of incoming messages of unknown sender
    IncomingUnknownTo = 0x40,

@@ -522,21 +520,9 @@ pub enum Origin {
    /// Contacts with at least this origin value are shown in the contact list.
    IncomingReplyTo = 0x100,

-    /// Cc: of incoming message of known sender
-    IncomingCc = 0x200,
-
-    /// additional To:'s of incoming message of known sender
-    IncomingTo = 0x400,
-
    /// a chat was manually created for this user, but no message yet sent
    CreateChat = 0x800,

-    /// message sent by us
-    OutgoingBcc = 0x1000,
-
-    /// message sent by us
-    OutgoingCc = 0x2000,
-
    /// message sent by us
    OutgoingTo = 0x4000,

@@ -522,7 +522,7 @@ test some special html-characters as &lt; &gt; and &amp; but also &quot; and &#x
    async fn test_html_forwarding_encrypted() {
        let mut tcm = TestContextManager::new();
        // Alice receives a non-delta html-message
-        // (`ShowEmails=AcceptedContacts` lets Alice actually receive non-delta messages for known
+        // (`ShowEmails=All` lets Alice actually receive non-delta messages for known
        // contacts, the contact is marked as known by creating a chat using `chat_with_contact()`)
        let alice = &tcm.alice().await;
        alice
@@ -1885,20 +1885,19 @@ async fn should_move_out_of_spam(
            None => return Ok(false),
        };
        // No chat found.
-        let (from_id, blocked_contact, _origin) =
-            match from_field_to_contact_id(context, &from, true)
-                .await
-                .context("from_field_to_contact_id")?
-            {
-                Some(res) => res,
-                None => {
-                    warn!(
-                        context,
-                        "Contact with From address {:?} cannot exist, not moving out of spam", from
-                    );
-                    return Ok(false);
-                }
-            };
+        let (from_id, blocked_contact) = match from_field_to_contact_id(context, &from, true)
+            .await
+            .context("from_field_to_contact_id")?
+        {
+            Some(res) => res,
+            None => {
+                warn!(
+                    context,
+                    "Contact with From address {:?} cannot exist, not moving out of spam", from
+                );
+                return Ok(false);
+            }
+        };
        if blocked_contact {
            // Contact is blocked, leave the message in spam.
            return Ok(false);
@@ -2243,11 +2242,10 @@ pub(crate) async fn prefetch_should_download(
        Some(f) => f,
        None => return Ok(false),
    };
-    let (_from_id, blocked_contact, origin) =
-        match from_field_to_contact_id(context, &from, true).await? {
-            Some(res) => res,
-            None => return Ok(false),
-        };
+    let (_from_id, blocked_contact) = match from_field_to_contact_id(context, &from, true).await? {
+        Some(res) => res,
+        None => return Ok(false),
+    };
    // prevent_rename=true as this might be a mailing list message and in this case it would be bad if we rename the contact.
    // (prevent_rename is the last argument of from_field_to_contact_id())

@@ -2257,7 +2255,6 @@ pub(crate) async fn prefetch_should_download(
    }

    let is_chat_message = headers.get_header_value(HeaderDef::ChatVersion).is_some();
-    let accepted_contact = origin.is_known();
    let is_reply_to_chat_message = get_prefetch_parent_message(context, headers)
        .await?
        .map(|parent| match parent.is_dc_message {
@@ -2272,10 +2269,7 @@ pub(crate) async fn prefetch_should_download(
    let show = is_autocrypt_setup_message
        || match show_emails {
            ShowEmails::Off => is_chat_message || is_reply_to_chat_message,
-            ShowEmails::AcceptedContacts => {
-                is_chat_message || is_reply_to_chat_message || accepted_contact
-            }
-            ShowEmails::All => true,
+            ShowEmails::All | ShowEmails::All1 => true,
        };

    let should_download = (show && !blocked_contact) || maybe_ndn;
@@ -32,10 +32,7 @@ pub async fn initiate_key_transfer(context: &Context) -> Result<String> {
    )?;

    let chat_id = ChatId::create_for_contact(context, ContactId::SELF).await?;
-    let mut msg = Message {
-        viewtype: Viewtype::File,
-        ..Default::default()
-    };
+    let mut msg = Message::new(Viewtype::File);
    msg.param.set(Param::File, setup_file_blob.as_name());
    msg.param
        .set(Param::Filename, "autocrypt-setup-message.html");
@@ -95,6 +95,7 @@ impl BackupProvider {
    pub async fn prepare(context: &Context) -> Result<Self> {
        let relay_mode = RelayMode::Disabled;
        let endpoint = Endpoint::builder()
+            .tls_x509() // For compatibility with iroh <0.34.0
            .alpns(vec![BACKUP_ALPN.to_vec()])
            .relay_mode(relay_mode)
            .bind()
@@ -301,7 +302,11 @@ pub async fn get_backup2(
 ) -> Result<()> {
    let relay_mode = RelayMode::Disabled;

-    let endpoint = Endpoint::builder().relay_mode(relay_mode).bind().await?;
+    let endpoint = Endpoint::builder()
+        .tls_x509() // For compatibility with iroh <0.34.0
+        .relay_mode(relay_mode)
+        .bind()
+        .await?;

    let conn = endpoint.connect(node_addr, BACKUP_ALPN).await?;
    let (mut send_stream, mut recv_stream) = conn.open_bi().await?;
@@ -33,6 +33,7 @@ use crate::reaction::get_msg_reactions;
 use crate::sql;
 use crate::summary::Summary;
 use crate::sync::SyncData;
+use crate::tools::create_outgoing_rfc724_mid;
 use crate::tools::{
    buf_compress, buf_decompress, get_filebytes, get_filemeta, gm2local_offset, read_file,
    sanitize_filename, time, timestamp_to_str,
@@ -470,6 +471,7 @@ impl Message {
    pub fn new(viewtype: Viewtype) -> Self {
        Message {
            viewtype,
+            rfc724_mid: create_outgoing_rfc724_mid(),
            ..Default::default()
        }
    }
@@ -479,6 +481,7 @@ impl Message {
        Message {
            viewtype: Viewtype::Text,
            text,
+            rfc724_mid: create_outgoing_rfc724_mid(),
            ..Default::default()
        }
    }
@@ -135,7 +135,7 @@ async fn test_get_width_height() {
 }

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

@@ -144,13 +144,10 @@ async fn test_quote() {
        .unwrap();

    let chat = d.create_chat_with_contact("", "dest@example.com").await;
-
    let mut msg = Message::new_text("Quoted message".to_string());

-    // Send message, so it gets a Message-Id.
-    assert!(msg.rfc724_mid.is_empty());
-    let msg_id = chat::send_msg(ctx, chat.id, &mut msg).await.unwrap();
-    let msg = Message::load_from_db(ctx, msg_id).await.unwrap();
+    // Message has to be sent such that it gets saved to db.
+    chat::send_msg(ctx, chat.id, &mut msg).await.unwrap();
    assert!(!msg.rfc724_mid.is_empty());

    let mut msg2 = Message::new(Viewtype::Text);
@@ -358,6 +355,7 @@ async fn test_markseen_msgs() -> Result<()> {
    let sent1 = alice.send_msg(alice_chat.id, &mut msg).await;
    let msg1 = bob.recv_msg(&sent1).await;
    let bob_chat_id = msg1.chat_id;
+    let mut msg = Message::new_text("this is the text!".to_string());
    let sent2 = alice.send_msg(alice_chat.id, &mut msg).await;
    let msg2 = bob.recv_msg(&sent2).await;
    assert_eq!(msg1.chat_id, msg2.chat_id);
@@ -380,9 +378,11 @@ async fn test_markseen_msgs() -> Result<()> {

    // bob sends to alice,
    // alice knows bob and messages appear in normal chat
+    let mut msg = Message::new_text("this is the text!".to_string());
    let msg1 = alice
        .recv_msg(&bob.send_msg(bob_chat_id, &mut msg).await)
        .await;
+    let mut msg = Message::new_text("this is the text!".to_string());
    let msg2 = alice
        .recv_msg(&bob.send_msg(bob_chat_id, &mut msg).await)
        .await;
@@ -728,6 +728,7 @@ async fn test_selfavatar_unencrypted_signed() {
        .is_some());

    // if another message is sent, that one must not contain the avatar
+    let mut msg = Message::new_text("this is the text!".to_string());
    let sent_msg = t.send_msg(chat.id, &mut msg).await;
    let mut payload = sent_msg.payload().splitn(4, "\r\n\r\n");

@@ -26,7 +26,7 @@
 use anyhow::{anyhow, bail, Context as _, Result};
 use data_encoding::BASE32_NOPAD;
 use futures_lite::StreamExt;
-use iroh::{Endpoint, NodeAddr, NodeId, PublicKey, RelayMap, RelayMode, RelayUrl, SecretKey};
+use iroh::{Endpoint, NodeAddr, NodeId, PublicKey, RelayMode, RelayUrl, SecretKey};
 use iroh_gossip::net::{Event, Gossip, GossipEvent, JoinOptions, GOSSIP_ALPN};
 use iroh_gossip::proto::TopicId;
 use parking_lot::Mutex;
@@ -245,7 +245,7 @@ impl Context {
            .as_ref()
            .and_then(|conf| conf.iroh_relay.clone())
        {
-            RelayMode::Custom(RelayMap::from_url(RelayUrl::from(relay_url)))
+            RelayMode::Custom(RelayUrl::from(relay_url).into())
        } else {
            // FIXME: this should be RelayMode::Disabled instead.
            // Currently using default relays because otherwise Rust tests fail.
@@ -253,6 +253,7 @@ impl Context {
        };

        let endpoint = Endpoint::builder()
+            .tls_x509() // For compatibility with iroh <0.34.0
            .secret_key(secret_key)
            .alpns(vec![GOSSIP_ALPN.to_vec()])
            .relay_mode(relay_mode)
@@ -271,8 +272,7 @@ impl Context {

        let router = iroh::protocol::Router::builder(endpoint)
            .accept(GOSSIP_ALPN, gossip.clone())
-            .spawn()
-            .await?;
+            .spawn();

        Ok(Iroh {
            router,
@@ -4,6 +4,7 @@ pub(crate) mod data;

 use anyhow::Result;
 use deltachat_contact_tools::EmailAddress;
+use hickory_resolver::name_server::TokioConnectionProvider;
 use hickory_resolver::{config, Resolver, TokioResolver};
 use serde::{Deserialize, Serialize};

@@ -179,14 +180,14 @@ impl ProviderOptions {
 /// This does not work at least on some Androids, therefore we fallback
 /// to the default `ResolverConfig` which uses eg. to google's `8.8.8.8` or `8.8.4.4`.
 fn get_resolver() -> Result<TokioResolver> {
-    if let Ok(resolver) = Resolver::tokio_from_system_conf() {
-        return Ok(resolver);
+    if let Ok(resolver) = TokioResolver::builder_tokio() {
+        return Ok(resolver.build());
    }
-    let resolver = Resolver::tokio(
+    let resolver = Resolver::builder_with_config(
        config::ResolverConfig::default(),
-        config::ResolverOpts::default(),
+        TokioConnectionProvider::default(),
    );
-    Ok(resolver)
+    Ok(resolver.build())
 }

 /// Returns provider for the given an e-mail address.
@@ -322,7 +322,7 @@ pub(crate) async fn receive_imf_inner(
    // For example, GitHub sends messages from `notifications@github.com`,
    // but uses display name of the user whose action generated the notification
    // as the display name.
-    let (from_id, _from_id_blocked, incoming_origin) =
+    let (from_id, _from_id_blocked) =
        match from_field_to_contact_id(context, &mime_parser.from, prevent_rename).await? {
            Some(contact_id_res) => contact_id_res,
            None => {
@@ -337,27 +337,16 @@ pub(crate) async fn receive_imf_inner(
    let to_ids = add_or_lookup_contacts_by_address_list(
        context,
        &mime_parser.recipients,
-        if !mime_parser.incoming {
-            Origin::OutgoingTo
-        } else if incoming_origin.is_known() {
-            Origin::IncomingTo
-        } else {
-            Origin::IncomingUnknownTo
-        },
-    )
-    .await?;
-    let past_ids = add_or_lookup_contacts_by_address_list(
-        context,
-        &mime_parser.past_members,
-        if !mime_parser.incoming {
-            Origin::OutgoingTo
-        } else if incoming_origin.is_known() {
-            Origin::IncomingTo
-        } else {
+        if mime_parser.incoming {
            Origin::IncomingUnknownTo
+        } else {
+            Origin::OutgoingTo
        },
    )
    .await?;
+    let past_ids =
+        add_or_lookup_contacts_by_address_list(context, &mime_parser.past_members, Origin::Hidden)
+            .await?;

    update_verified_keys(context, &mut mime_parser, from_id).await?;

@@ -655,7 +644,7 @@ pub(crate) async fn receive_imf_inner(

 /// Converts "From" field to contact id.
 ///
-/// Also returns whether it is blocked or not and its origin.
+/// Also returns whether it is blocked or not.
 ///
 /// * `prevent_rename`: if true, the display_name of this contact will not be changed. Useful for
 ///   mailing lists: In some mailing lists, many users write from the same address but with different
@@ -667,7 +656,7 @@ pub async fn from_field_to_contact_id(
    context: &Context,
    from: &SingleInfo,
    prevent_rename: bool,
-) -> Result<Option<(ContactId, bool, Origin)>> {
+) -> Result<Option<(ContactId, bool)>> {
    let display_name = if prevent_rename {
        Some("")
    } else {
@@ -693,12 +682,11 @@ pub async fn from_field_to_contact_id(
    .await?;

    if from_id == ContactId::SELF {
-        Ok(Some((ContactId::SELF, false, Origin::OutgoingBcc)))
+        Ok(Some((ContactId::SELF, false)))
    } else {
        let contact = Contact::get_by_id(context, from_id).await?;
        let from_id_blocked = contact.blocked;
-        let incoming_origin = contact.origin;
-        Ok(Some((from_id, from_id_blocked, incoming_origin)))
+        Ok(Some((from_id, from_id_blocked)))
    }
 }

@@ -761,7 +749,9 @@ async fn add_parts(
        ShowEmails::from_i32(context.get_config_int(Config::ShowEmails).await?).unwrap_or_default();

    let allow_creation;
-    if mime_parser.is_system_message != SystemMessage::AutocryptSetupMessage
+    if mime_parser.decrypting_failed {
+        allow_creation = false;
+    } else if mime_parser.is_system_message != SystemMessage::AutocryptSetupMessage
        && is_dc_message == MessengerMessage::No
        && !context.get_config_bool(Config::IsChatmail).await?
    {
@@ -773,8 +763,7 @@ async fn add_parts(
                chat_id = Some(DC_CHAT_ID_TRASH);
                allow_creation = false;
            }
-            ShowEmails::AcceptedContacts => allow_creation = false,
-            ShowEmails::All => allow_creation = !is_mdn,
+            ShowEmails::All | ShowEmails::All1 => allow_creation = !is_mdn,
        }
    } else {
        allow_creation = !is_mdn && !is_reaction;
@@ -878,7 +867,7 @@ async fn add_parts(
                &parent,
                to_ids,
                from_id,
-                allow_creation || test_normal_chat.is_some(),
+                allow_creation,
                create_blocked,
                is_partial_download.is_some(),
            )
@@ -113,11 +113,8 @@ async fn test_adhoc_group_outgoing_show_accepted_contact_unaccepted() -> Result<
    let mut tcm = TestContextManager::new();
    let alice = &tcm.alice().await;
    let bob = &tcm.bob().await;
-    bob.set_config(
-        Config::ShowEmails,
-        Some(&ShowEmails::AcceptedContacts.to_string()),
-    )
-    .await?;
+    bob.set_config(Config::ShowEmails, Some(&ShowEmails::All.to_string()))
+        .await?;
    tcm.send_recv(alice, bob, "hi").await;
    receive_imf(
        bob,
@@ -140,7 +137,7 @@ async fn test_adhoc_group_outgoing_show_accepted_contact_unaccepted() -> Result<
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_adhoc_group_show_accepted_contact_known() {
    let t = TestContext::new_alice().await;
-    t.set_config(Config::ShowEmails, Some("1")).await.unwrap();
+    t.set_config(Config::ShowEmails, Some("2")).await.unwrap();
    Contact::create(&t, "Bob", "bob@example.com").await.unwrap();
    receive_imf(&t, GRP_MAIL, false).await.unwrap();

@@ -153,7 +150,7 @@ async fn test_adhoc_group_show_accepted_contact_known() {
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_adhoc_group_show_accepted_contact_accepted() {
    let t = TestContext::new_alice().await;
-    t.set_config(Config::ShowEmails, Some("1")).await.unwrap();
+    t.set_config(Config::ShowEmails, Some("2")).await.unwrap();

    // accept Bob by accepting a delta-message from Bob
    receive_imf(&t, MSGRMSG, false).await.unwrap();
@@ -2322,7 +2319,7 @@ async fn test_ignore_footer_status_from_mailinglist() -> Result<()> {
        &t,
        "",
        &ContactAddress::new("bob@example.net").unwrap(),
-        Origin::IncomingUnknownCc,
+        Origin::IncomingUnknownTo,
    )
    .await?
    .0;
@@ -3988,7 +3985,7 @@ async fn test_mua_user_adds_recipient_to_single_chat() -> Result<()> {
        chat::get_chat_contacts(&alice, group_chat.id).await?.len(),
        4
    );
-    let fiona = Contact::lookup_id_by_addr(&alice, "fiona@example.net", Origin::IncomingTo)
+    let fiona = Contact::lookup_id_by_addr(&alice, "fiona@example.net", Origin::IncomingUnknownTo)
        .await?
        .unwrap();
    assert!(chat::is_contact_in_chat(&alice, group_chat.id, fiona).await?);
@@ -5090,7 +5087,7 @@ async fn test_references() -> Result<()> {
    alice.set_config_bool(Config::BccSelf, true).await?;

    let alice_chat_id = create_group_chat(alice, ProtectionStatus::Unprotected, "Group").await?;
-    let _sent = alice
+    alice
        .send_text(alice_chat_id, "Hi! I created a group.")
        .await;

@@ -374,14 +374,6 @@ pub(crate) async fn handle_securejoin_handshake(
                );
                return Ok(HandshakeMessage::Ignore);
            }
-            if !verify_sender_by_fingerprint(context, &fingerprint, contact_id).await? {
-                warn!(
-                    context,
-                    "Ignoring {step} message because of fingerprint mismatch."
-                );
-                return Ok(HandshakeMessage::Ignore);
-            }
-            info!(context, "Fingerprint verified.",);
            // verify that the `Secure-Join-Auth:`-header matches the secret written to the QR code
            let Some(auth) = mime_message.get_header(HeaderDef::SecureJoinAuth) else {
                warn!(
@@ -408,6 +400,14 @@ pub(crate) async fn handle_securejoin_handshake(
                }
            };

+            if !verify_sender_by_fingerprint(context, &fingerprint, contact_id).await? {
+                warn!(
+                    context,
+                    "Ignoring {step} message because of fingerprint mismatch."
+                );
+                return Ok(HandshakeMessage::Ignore);
+            }
+
            let contact_addr = Contact::get_by_id(context, contact_id)
                .await?
                .get_addr()
@@ -427,6 +427,7 @@ pub(crate) async fn handle_securejoin_handshake(
                );
                return Ok(HandshakeMessage::Ignore);
            }
+            info!(context, "Fingerprint verified via Auth code.",);
            contact_id.regossip_keys(context).await?;
            ContactId::scaleup_origin(context, &[contact_id], Origin::SecurejoinInvited).await?;
            // for setup-contact, make Alice's one-to-one chat with Bob visible
@@ -434,7 +435,6 @@ pub(crate) async fn handle_securejoin_handshake(
            if !join_vg {
                ChatId::create_for_contact(context, contact_id).await?;
            }
-            info!(context, "Auth verified.",);
            context.emit_event(EventType::ContactsChanged(Some(contact_id)));
            inviter_progress(context, contact_id, 600);
            if let Some(group_chat_id) = group_chat_id {
@@ -951,3 +951,34 @@ async fn test_parallel_setup_contact() -> Result<()> {

    Ok(())
 }
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_wrong_auth_token() -> Result<()> {
+    let mut tcm = TestContextManager::new();
+    let alice = &tcm.alice().await;
+    let bob = &tcm.bob().await;
+
+    // Bob should already have Alice's key
+    // so that he can directly send vc-request-with-auth
+    tcm.send_recv(alice, bob, "hi").await;
+
+    let alice_qr = get_securejoin_qr(alice, None).await?;
+    println!("{}", &alice_qr);
+    let invalid_alice_qr = alice_qr.replace("&s=", "&s=INVALIDAUTHTOKEN&someotherkey=");
+
+    join_securejoin(bob, &invalid_alice_qr).await?;
+    let sent = bob.pop_sent_msg().await;
+
+    let msg = alice.parse_msg(&sent).await;
+    assert_eq!(
+        msg.get_header(HeaderDef::SecureJoin).unwrap(),
+        "vc-request-with-auth"
+    );
+
+    alice.recv_msg_trash(&sent).await;
+
+    let alice_bob_contact = alice.add_or_lookup_contact(bob).await;
+    assert!(!alice_bob_contact.is_forward_verified(alice).await?);
+
+    Ok(())
+}
@@ -612,7 +612,7 @@ mod tests {

        // the same sync message sent to bob must not be executed
        let bob = TestContext::new_bob().await;
-        bob.recv_msg(&sent_msg).await;
+        bob.recv_msg_trash(&sent_msg).await;
        assert!(!token::exists(&bob, token::Namespace::Auth, "testtoken").await?);

        Ok(())
@@ -987,13 +987,10 @@ async fn test_verified_lost_member_added() -> Result<()> {
    assert_eq!(sent_msg.get_showpadlock(), true);

    // The message will not be sent to Fiona.
-    // Test that Fiona will not be able to decrypt it.
-    let fiona_rcvd = fiona.recv_msg(&sent).await;
-    assert_eq!(fiona_rcvd.get_showpadlock(), false);
-    assert_eq!(
-        fiona_rcvd.get_text(),
-        "[...] – [This message was encrypted for another setup.]"
-    );
+    // Test that Fiona will not be able to decrypt it
+    // and the message is trashed because
+    // we don't create groups from undecipherable messages.
+    fiona.recv_msg_trash(&sent).await;

    // Advance the time so Alice does not leave at the same second
    // as the group was created.
@@ -2195,3 +2195,26 @@ async fn test_webxdc_href() -> Result<()> {

    Ok(())
 }
+
+/// Test that the draft `selfAddr` is equal to the `selfAddr` of the sent message.
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_self_addr_consistency() -> Result<()> {
+    let mut tcm = TestContextManager::new();
+    let alice = &tcm.alice().await;
+    let alice_chat = alice
+        .create_group_with_members(ProtectionStatus::Unprotected, "No friends :(", &[])
+        .await;
+    let mut instance = create_webxdc_instance(
+        alice,
+        "minimal.xdc",
+        include_bytes!("../../test-data/webxdc/minimal.xdc"),
+    )?;
+    alice_chat.set_draft(alice, Some(&mut instance)).await?;
+    let mut instance = alice_chat.get_draft(alice).await?.unwrap();
+    let self_addr = instance.get_webxdc_self_addr(alice).await?;
+    let sent = alice.send_msg(alice_chat, &mut instance).await;
+    let db_msg = Message::load_from_db(alice, sent.sender_msg_id).await?;
+    assert_eq!(db_msg.get_webxdc_self_addr(alice).await?, self_addr);
+    assert_eq!(alice_chat.get_msg_cnt(alice).await?, 1);
+    Ok(())
+}
Author	SHA1	Message	Date
link2xt	bce13b3bfd	remove allow_creation override	2025-05-17 18:34:56 +00:00
link2xt	32b6a14c71	feat: create all contacts from the To field with IncomingUnknownTo origin Contacts are created with IncomingUnknownTo origin instead of IncomingTo now even if the message is from a known contact. Removed IncomingTo, IncomingCc, OutgoingBcc, OutgoingCc, IncomingUnknownCc origins.	2025-05-17 18:34:33 +00:00
link2xt	0754638417	fix: create past group members with Origin::Hidden	2025-05-17 18:34:33 +00:00
link2xt	37462b3801	api!: deprecate DC_SHOW_EMAILS_ACCEPTED_CONTACTS	2025-05-17 18:34:33 +00:00
dependabot[bot]	b0508e661a	Merge pull request #6827 from chatmail/dependabot/cargo/shadowsocks-1.23.1	2025-05-16 04:30:39 +00:00
link2xt	ab3cd6a8f7	chore(deny.toml): add exception for deplicate spin 0.9.8 dependency	2025-05-16 04:14:27 +00:00
dependabot[bot]	85461204c5	chore(cargo): bump shadowsocks from 1.22.0 to 1.23.1 Bumps [shadowsocks](https://github.com/shadowsocks/shadowsocks-rust) from 1.22.0 to 1.23.1. - [Release notes](https://github.com/shadowsocks/shadowsocks-rust/releases) - [Commits](https://github.com/shadowsocks/shadowsocks-rust/compare/v1.22.0...v1.23.1) --- updated-dependencies: - dependency-name: shadowsocks dependency-version: 1.23.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-05-16 03:07:34 +00:00
link2xt	3abf2b5227	build: increase MSRV to 1.85.0	2025-05-16 03:03:58 +00:00
link2xt	0d5d7032fe	build: nix flake update nixpkgs	2025-05-16 03:03:58 +00:00
link2xt	c48b04ab99	ci(nix): test build on macOS without cross-compilation	2025-05-16 03:03:58 +00:00
link2xt	eaa30dbe21	build: nix flake update fenix	2025-05-16 03:03:58 +00:00
link2xt	bb0f812f71	ci: update Rust to 1.87.0	2025-05-16 03:03:58 +00:00
link2xt	4c287075da	fix: do not allow chat creation if decryption failed	2025-05-15 18:02:19 +00:00
link2xt	09d18f9097	test: fixup for test_restore_backup_after_60_days	2025-05-15 18:02:19 +00:00
Hocuri	47b9bfc8bf	chore(release): prepare for 1.159.5	2025-05-14 16:58:17 +02:00
Hocuri	21d13e8a9c	fix: Don't change webxdc self-addr when saving and loading draft (#6854 ) Fix https://github.com/chatmail/core/issues/6621; I also tested on Android that the webxdc self-addr actually stays the same when staging a draft and then sending. Follow-up to https://github.com/chatmail/core/pull/6704; #6704 made sure that the webxdc self-addr doesn't change when creating a message and then sending it. This PR here makes sure that the rfc724_mid (which is needed to compute the self-addr) is saved when setting a draft, so that it's loaded properly after a call to get_draft(). cc @adbenitez @r10s @Septias	2025-05-14 16:14:35 +02:00
link2xt	079260a7cf	chore: update async-smtp to 0.10.2	2025-05-13 16:18:25 +00:00
link2xt	fdec78c092	chore: remove duplicate miniz_oxide dependency	2025-05-13 15:25:56 +00:00
link2xt	259ffef0bb	chore(release): prepare for 1.159.4	2025-05-13 14:56:09 +00:00
l	6661a0803e	chore: update iroh from 0.33.0 to 0.35.0 (#6687 )	2025-05-12 20:33:21 +00:00
link2xt	c1471bdbd9	docs: add missing documentation to deltachat-rpc-client	2025-05-12 17:39:50 +00:00
Hocuri	a981573e48	fix: Fix order of operations when handling "vc-request-with-auth" (#6850 )	2025-05-12 16:52:10 +02:00
link2xt	8fb3a7514e	fix: replace FuturesUnordered from futures with JoinSet from tokio FuturesUnordered is likely buggy and iroh previously switched to JoinSet in <https://github.com/n0-computer/iroh/pull/1647>. We also have reports with logs of background_fetch getting stuck so apparently task cancellation after timeout does not work as intended with FuturesUnordered.	2025-05-10 17:26:05 +00:00
Sebastian Klähn	846c8e7f1b	Generate rfc724_mid when creating Message (#6704 ) Set `rfc724_mid` in `Message::new()`, `Message::new_text()`, and `Message::default()` instead of when sending the message. This way the rfc724 mid can be read in the draft stage which makes it more consistent for bots. Tests had to be adjusted to create multiple messages to get unique mid, otherwise core would not send the messages out.	2025-05-05 15:06:05 +00:00
iequidoo	98a1b9e373	test: Profile data is attached to group leave messages	2025-05-05 05:28:43 -03:00
dependabot[bot]	ba55dd339e	Merge pull request #6842 from chatmail/dependabot/cargo/chrono-0.4.41	2025-05-03 02:55:28 +00:00
dependabot[bot]	5a2ce60392	chore(cargo): bump chrono from 0.4.40 to 0.4.41 Bumps [chrono](https://github.com/chronotope/chrono) from 0.4.40 to 0.4.41. - [Release notes](https://github.com/chronotope/chrono/releases) - [Changelog](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md) - [Commits](https://github.com/chronotope/chrono/compare/v0.4.40...v0.4.41) --- updated-dependencies: - dependency-name: chrono dependency-version: 0.4.41 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-05-02 23:36:52 +00:00
dependabot[bot]	7ebcee14e7	Merge pull request #6839 from chatmail/dependabot/cargo/data-encoding-2.9.0	2025-05-02 23:35:05 +00:00
dependabot[bot]	ccf829fe8c	Merge pull request #6837 from chatmail/dependabot/cargo/syn-2.0.101	2025-05-02 23:29:57 +00:00
dependabot[bot]	a274f5fb86	Merge pull request #6832 from chatmail/dependabot/cargo/anyhow-1.0.98	2025-05-02 23:29:42 +00:00
dependabot[bot]	5421a555f4	Merge pull request #6840 from chatmail/dependabot/cargo/sha2-0.10.9	2025-05-02 23:29:25 +00:00
dependabot[bot]	b1233b2b07	chore(cargo): bump anyhow from 1.0.97 to 1.0.98 Bumps [anyhow](https://github.com/dtolnay/anyhow) from 1.0.97 to 1.0.98. - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](https://github.com/dtolnay/anyhow/compare/1.0.97...1.0.98) --- updated-dependencies: - dependency-name: anyhow dependency-version: 1.0.98 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-05-02 16:22:22 +00:00
dependabot[bot]	e55ac59846	chore(cargo): bump sha2 from 0.10.8 to 0.10.9 Bumps [sha2](https://github.com/RustCrypto/hashes) from 0.10.8 to 0.10.9. - [Commits](https://github.com/RustCrypto/hashes/compare/sha2-v0.10.8...sha2-v0.10.9) --- updated-dependencies: - dependency-name: sha2 dependency-version: 0.10.9 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-05-02 16:15:55 +00:00
dependabot[bot]	cd6cd6ba47	chore(cargo): bump data-encoding from 2.8.0 to 2.9.0 Bumps [data-encoding](https://github.com/ia0/data-encoding) from 2.8.0 to 2.9.0. - [Commits](https://github.com/ia0/data-encoding/compare/v2.8.0...v2.9.0) --- updated-dependencies: - dependency-name: data-encoding dependency-version: 2.9.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-05-02 16:15:04 +00:00
dependabot[bot]	026b06003b	chore(cargo): bump syn from 2.0.100 to 2.0.101 Bumps [syn](https://github.com/dtolnay/syn) from 2.0.100 to 2.0.101. - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](https://github.com/dtolnay/syn/compare/2.0.100...2.0.101) --- updated-dependencies: - dependency-name: syn dependency-version: 2.0.101 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-05-02 16:06:28 +00:00
dependabot[bot]	02141b86c2	Merge pull request #6834 from chatmail/dependabot/cargo/quick-xml-0.37.5	2025-05-02 16:05:37 +00:00
dependabot[bot]	9bb2600d73	Merge pull request #6836 from chatmail/dependabot/cargo/libc-0.2.172	2025-05-02 16:05:23 +00:00
dependabot[bot]	33ea13daf4	Merge pull request #6829 from chatmail/dependabot/cargo/blake3-1.8.2	2025-05-02 16:04:56 +00:00
dependabot[bot]	10b6019e7e	Merge pull request #6831 from chatmail/dependabot/cargo/smallvec-1.15.0	2025-05-02 16:03:13 +00:00
dependabot[bot]	727f0ab6ce	Merge pull request #6841 from chatmail/dependabot/cargo/brotli-8.0.0	2025-05-02 16:02:50 +00:00
dependabot[bot]	31752e9674	chore(cargo): bump brotli from 7.0.0 to 8.0.0 Bumps [brotli](https://github.com/dropbox/rust-brotli) from 7.0.0 to 8.0.0. - [Release notes](https://github.com/dropbox/rust-brotli/releases) - [Commits](https://github.com/dropbox/rust-brotli/compare/7.0.0...8.0.0) --- updated-dependencies: - dependency-name: brotli dependency-version: 8.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2025-05-01 21:10:36 +00:00
dependabot[bot]	841d4e6e1e	chore(cargo): bump libc from 0.2.171 to 0.2.172 Bumps [libc](https://github.com/rust-lang/libc) from 0.2.171 to 0.2.172. - [Release notes](https://github.com/rust-lang/libc/releases) - [Changelog](https://github.com/rust-lang/libc/blob/0.2.172/CHANGELOG.md) - [Commits](https://github.com/rust-lang/libc/compare/0.2.171...0.2.172) --- updated-dependencies: - dependency-name: libc dependency-version: 0.2.172 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-05-01 21:09:03 +00:00
dependabot[bot]	7dc890119d	chore(cargo): bump quick-xml from 0.37.4 to 0.37.5 Bumps [quick-xml](https://github.com/tafia/quick-xml) from 0.37.4 to 0.37.5. - [Release notes](https://github.com/tafia/quick-xml/releases) - [Changelog](https://github.com/tafia/quick-xml/blob/master/Changelog.md) - [Commits](https://github.com/tafia/quick-xml/compare/v0.37.4...v0.37.5) --- updated-dependencies: - dependency-name: quick-xml dependency-version: 0.37.5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-05-01 21:08:21 +00:00
dependabot[bot]	293a683484	chore(cargo): bump smallvec from 1.14.0 to 1.15.0 Bumps [smallvec](https://github.com/servo/rust-smallvec) from 1.14.0 to 1.15.0. - [Release notes](https://github.com/servo/rust-smallvec/releases) - [Commits](https://github.com/servo/rust-smallvec/compare/v1.14.0...v1.15.0) --- updated-dependencies: - dependency-name: smallvec dependency-version: 1.15.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-05-01 21:07:14 +00:00
dependabot[bot]	737bc15382	chore(cargo): bump blake3 from 1.8.0 to 1.8.2 Bumps [blake3](https://github.com/BLAKE3-team/BLAKE3) from 1.8.0 to 1.8.2. - [Release notes](https://github.com/BLAKE3-team/BLAKE3/releases) - [Commits](https://github.com/BLAKE3-team/BLAKE3/compare/1.8.0...1.8.2) --- updated-dependencies: - dependency-name: blake3 dependency-version: 1.8.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-05-01 21:06:40 +00:00
B. Petersen	1a72711999	chore: adapt some top-level-mentions of delta	2025-04-30 01:07:09 +02:00
bjoernandiequidoo	3fea829340	feat: better avatar quality (#6822 ) this PR scaled avatars using the Triangle-filter, resulting in often better image quality and smaller files (5%). it comes at high costs, therefore, we do not do that unconditionally for each image sent, see comment in the code and https://github.com/chatmail/core/pull/6815 --------- Co-authored-by: iequidoo <117991069+iequidoo@users.noreply.github.com>	2025-04-24 18:44:23 +00:00
B. Petersen	6dba14158a	fix: emit progress(0) in case AEAP is tried	2025-04-24 18:32:29 +02:00
link2xt	83bc497f0d	chore(release): prepare for 1.159.3	2025-04-24 13:44:06 +00:00
link2xt	990a13fd96	ci: use ubuntu-latest for @deltachat/jsonrpc-client publishing Ubuntu 20.04 runner is removed.	2025-04-24 13:39:50 +00:00
@@ -1 +1 @@
 -04-23
 -05-14