fix: Send pre-message after successful sending of post-message (#8063 )

This isn't easy to test though because the `smtp` sending code requires an SMTP connection, so it's only tested (by already existing tests) that messages are queued in the right order. Another problem is that the `smtp` sending logic doesn't try to send any messages following a failed-to-send message until the retry limit is reached, so if there's smth wrong with a post-message, other unrelated messages are delayed, but this problem has already existed.
feat: Get rid of MessageState::{OutPreparing,OutMdnRcvd} in the db
2026-05-08 17:36:29 +03:00 · 2026-05-08 08:37:12 -04:00 · 2026-05-07 20:37:11 -03:00 · 2026-05-07 20:04:22 -03:00 · 2026-05-07 19:35:03 -03:00 · 2026-05-07 19:31:38 -03:00
25 changed files with 338 additions and 395 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,6 +41,8 @@ jobs:
        shell: bash
      - name: Cache rust cargo artifacts
        uses: swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4
+        with:
+          save-if: ${{ github.ref == 'refs/heads/main' }}
      - name: Run rustfmt
        run: cargo fmt --all -- --check
      - name: Run clippy
@@ -92,6 +94,8 @@ jobs:
          persist-credentials: false
      - name: Cache rust cargo artifacts
        uses: swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4
+        with:
+          save-if: ${{ github.ref == 'refs/heads/main' }}
      - name: Rustdoc
        run: cargo doc --document-private-items --no-deps

@@ -135,6 +139,8 @@ jobs:

      - name: Cache rust cargo artifacts
        uses: swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4
+        with:
+          save-if: ${{ github.ref == 'refs/heads/main' }}

      - name: Install nextest
        uses: taiki-e/install-action@5f57d6cb7cd20b14a8a27f522884c4bc8a187458
@@ -169,6 +175,8 @@ jobs:

      - name: Cache rust cargo artifacts
        uses: swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4
+        with:
+          save-if: ${{ github.ref == 'refs/heads/main' }}

      - name: Build C library
        run: cargo build -p deltachat_ffi
@@ -195,6 +203,8 @@ jobs:

      - name: Cache rust cargo artifacts
        uses: swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4
+        with:
+          save-if: ${{ github.ref == 'refs/heads/main' }}

      - name: Build deltachat-rpc-server
        run: cargo build -p deltachat-rpc-server
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -36,7 +36,7 @@ checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
 dependencies = [
 "cfg-if",
 "cipher",
- "cpufeatures",
+ "cpufeatures 0.2.17",
 ]

 [[package]]
@@ -136,7 +136,7 @@ checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072"
 dependencies = [
 "base64ct",
 "blake2",
- "cpufeatures",
+ "cpufeatures 0.2.17",
 "password-hash",
 "zeroize",
 ]
@@ -497,16 +497,16 @@ dependencies = [

 [[package]]
 name = "blake3"
-version = "1.8.3"
+version = "1.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2468ef7d57b3fb7e16b576e8377cdbde2320c60e1491e961d11da40fc4f02a2d"
+checksum = "0aa83c34e62843d924f905e0f5c866eb1dd6545fc4d719e803d9ba6030371fce"
 dependencies = [
 "arrayref",
 "arrayvec",
 "cc",
 "cfg-if",
 "constant_time_eq 0.4.2",
- "cpufeatures",
+ "cpufeatures 0.3.0",
 ]

 [[package]]
@@ -799,7 +799,7 @@ checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818"
 dependencies = [
 "cfg-if",
 "cipher",
- "cpufeatures",
+ "cpufeatures 0.2.17",
 ]

 [[package]]
@@ -934,9 +934,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"

 [[package]]
 name = "colorutils-rs"
-version = "0.7.6"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2fc25857fa523662de5cae84225b0e7bfb24a2a3f9ed8802fecf03df7252b1"
+checksum = "69abc9a8ed011e2b7946769f460b9e76e8b659ece9ef4001b9d8bba3489f796d"
 dependencies = [
 "erydanos",
 "half",
@@ -1011,6 +1011,15 @@ dependencies = [
 "libc",
 ]

+[[package]]
+name = "cpufeatures"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "crc"
 version = "3.2.1"
@@ -1216,7 +1225,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
 dependencies = [
 "cfg-if",
- "cpufeatures",
+ "cpufeatures 0.2.17",
 "curve25519-dalek-derive",
 "digest",
 "fiat-crypto",
@@ -1292,9 +1301,9 @@ dependencies = [

 [[package]]
 name = "data-encoding"
-version = "2.10.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea"
+checksum = "a4ae5f15dda3c708c0ade84bfee31ccab44a3da4f88015ed22f63732abe300c8"

 [[package]]
 name = "dbl"
@@ -2601,9 +2610,9 @@ dependencies = [

 [[package]]
 name = "hyper"
-version = "1.8.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11"
+checksum = "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca"
 dependencies = [
 "atomic-waker",
 "bytes",
@@ -2616,7 +2625,6 @@ dependencies = [
 "httpdate",
 "itoa",
 "pin-project-lite",
- "pin-utils",
 "smallvec",
 "tokio",
 "want",
@@ -2654,7 +2662,7 @@ dependencies = [
 "hyper",
 "libc",
 "pin-project-lite",
- "socket2 0.6.0",
+ "socket2 0.6.3",
 "tokio",
 "tower-service",
 "tracing",
@@ -3246,7 +3254,7 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653"
 dependencies = [
- "cpufeatures",
+ "cpufeatures 0.2.17",
 ]

 [[package]]
@@ -3260,9 +3268,9 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.184"
+version = "0.2.186"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af"
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"

 [[package]]
 name = "libm"
@@ -3453,13 +3461,13 @@ dependencies = [

 [[package]]
 name = "mio"
-version = "1.0.3"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1"
 dependencies = [
 "libc",
 "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.1",
 ]

 [[package]]
@@ -3933,15 +3941,14 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"

 [[package]]
 name = "openssl"
-version = "0.10.78"
+version = "0.10.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f38c4372413cdaaf3cc79dd92d29d7d9f5ab09b51b10dded508fb90bb70b9222"
+checksum = "bf0b434746ee2832f4f0baf10137e1cabb18cbe6912c69e2e33263c45250f542"
 dependencies = [
 "bitflags 2.11.0",
 "cfg-if",
 "foreign-types",
 "libc",
- "once_cell",
 "openssl-macros",
 "openssl-sys",
 ]
@@ -3974,9 +3981,9 @@ dependencies = [

 [[package]]
 name = "openssl-sys"
-version = "0.9.114"
+version = "0.9.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13ce1245cd07fcc4cfdb438f7507b0c7e4f3849a69fd84d52374c66d83741bb6"
+checksum = "158fe5b292746440aa6e7a7e690e55aeb72d41505e2804c23c6973ad0e9c9781"
 dependencies = [
 "cc",
 "libc",
@@ -4412,7 +4419,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf"
 dependencies = [
- "cpufeatures",
+ "cpufeatures 0.2.17",
 "opaque-debug",
 "universal-hash",
 ]
@@ -4424,7 +4431,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25"
 dependencies = [
 "cfg-if",
- "cpufeatures",
+ "cpufeatures 0.2.17",
 "opaque-debug",
 "universal-hash",
 ]
@@ -5508,7 +5515,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c"
 dependencies = [
 "cfg-if",
- "cpufeatures",
+ "cpufeatures 0.2.17",
 "digest",
 ]

@@ -5519,7 +5526,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
 "cfg-if",
- "cpufeatures",
+ "cpufeatures 0.2.17",
 "digest",
 ]

@@ -5547,7 +5554,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
 "cfg-if",
- "cpufeatures",
+ "cpufeatures 0.2.17",
 "digest",
 ]

@@ -5725,12 +5732,12 @@ dependencies = [

 [[package]]
 name = "socket2"
-version = "0.6.0"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
+checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
 dependencies = [
 "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.1",
 ]

 [[package]]
@@ -6144,9 +6151,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

 [[package]]
 name = "tokio"
-version = "1.50.0"
+version = "1.52.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d"
+checksum = "b67dee974fe86fd92cc45b7a95fdd2f99a36a6d7b0d431a231178d3d670bbcc6"
 dependencies = [
 "bytes",
 "libc",
@@ -6154,7 +6161,7 @@ dependencies = [
 "parking_lot",
 "pin-project-lite",
 "signal-hook-registry",
- "socket2 0.6.0",
+ "socket2 0.6.3",
 "tokio-macros",
 "windows-sys 0.61.1",
 ]
@@ -6171,9 +6178,9 @@ dependencies = [

 [[package]]
 name = "tokio-macros"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
+checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496"
 dependencies = [
 "proc-macro2",
 "quote",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -53,7 +53,7 @@ blake3 = "1.8.2"
 brotli = { version = "8", default-features=false, features = ["std"] }
 bytes = "1"
 chrono = { workspace = true, features = ["alloc", "clock", "std"] }
-colorutils-rs = { version = "0.7.5", default-features = false }
+colorutils-rs = { version = "0.8.0", default-features = false }
 data-encoding = "2.9.0"
 escaper = "0.1"
 fast-socks5 = "1"
--- a/deltachat-ffi/deltachat.h
+++ b/deltachat-ffi/deltachat.h
@@ -4003,8 +4003,6 @@ int             dc_msg_get_viewtype           (const dc_msg_t* msg);
 *   Marked as read on IMAP and MDN may be sent. Use dc_markseen_msgs() to mark messages as being seen.
 *
 * Outgoing message states:
- * - @ref DC_STATE_OUT_PREPARING - For files which need time to be prepared before they can be sent,
- *   the message enters this state before @ref DC_STATE_OUT_PENDING. Deprecated.
 * - @ref DC_STATE_OUT_DRAFT - Message saved as draft using dc_set_draft()
 * - @ref DC_STATE_OUT_PENDING - The user has pressed the "send" button but the
 *   message is not yet sent and is pending in some way. Maybe we're offline (no checkmark).
@@ -5589,13 +5587,6 @@ int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);
 */
 #define         DC_STATE_IN_SEEN             16

-/**
- * Outgoing message being prepared. See dc_msg_get_state() for details.
- *
- * @deprecated 2024-12-07
- */
-#define         DC_STATE_OUT_PREPARING       18
-
 /**
 * Outgoing message drafted. See dc_msg_get_state() for details.
 */
--- a/deltachat-ffi/src/lot.rs
+++ b/deltachat-ffi/src/lot.rs
@@ -230,7 +230,6 @@ pub enum LotState {
    MsgInFresh = 10,
    MsgInNoticed = 13,
    MsgInSeen = 16,
-    MsgOutPreparing = 18,
    MsgOutDraft = 19,
    MsgOutPending = 20,
    MsgOutFailed = 24,
@@ -246,7 +245,6 @@ impl From<MessageState> for LotState {
            InFresh => LotState::MsgInFresh,
            InNoticed => LotState::MsgInNoticed,
            InSeen => LotState::MsgInSeen,
-            OutPreparing => LotState::MsgOutPreparing,
            OutDraft => LotState::MsgOutDraft,
            OutPending => LotState::MsgOutPending,
            OutFailed => LotState::MsgOutFailed,
--- a/deltachat-rpc-client/src/deltachat_rpc_client/const.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/const.py
@@ -190,7 +190,6 @@ class MessageState(IntEnum):
    IN_FRESH = 10
    IN_NOTICED = 13
    IN_SEEN = 16
-    OUT_PREPARING = 18
    OUT_DRAFT = 19
    OUT_PENDING = 20
    OUT_FAILED = 24
--- a/deltachat-rpc-client/tests/test_something.py
+++ b/deltachat-rpc-client/tests/test_something.py
@@ -348,7 +348,7 @@ def test_receive_imf_failure(acfactory) -> None:
        snapshot.text == "❌ Failed to receive a message:"
        " Condition failed: `!context.get_config_bool(Config::SimulateReceiveImfError).await?`."
        f" Core version {version}."
-        " Please report this bug to delta@merlinux.eu or https://support.delta.chat/"
+        " Please report this bug to delta@merlinux.eu or https://support.delta.chat/."
    )

    # The failed message doesn't break the IMAP loop.
--- a/deny.toml
+++ b/deny.toml
@@ -33,7 +33,17 @@ ignore = [
    # We do not check CRL and cannot update rustls-webpki 0.102.8 
    # which is a dependency of iroh 0.35.0.
    # <https://rustsec.org/advisories/RUSTSEC-2026-0104>
-    "RUSTSEC-2026-0104"
+    "RUSTSEC-2026-0104",
+
+    # hickory-proto 0.25.2 unbounded loop in DNSSEC code.
+    # Dependency of iroh 0.35.0, cannot be updated as of 2026-05-02.
+    # <https://rustsec.org/advisories/RUSTSEC-2026-0118>
+    "RUSTSEC-2026-0118",
+
+    # hickory-proto 0.25.2 quadratic complexity issue.
+    # Dependency of iroh 0.35.0, cannot be updated as of 2026-05-02.
+    # <https://rustsec.org/advisories/RUSTSEC-2026-0119>
+    "RUSTSEC-2026-0119"
 ]

 [bans]
@@ -45,6 +55,7 @@ skip = [
     { name = "async-channel", version = "1.9.0" },
     { name = "bitflags", version = "1.3.2" },
     { name = "constant_time_eq", version = "0.3.1" },
+     { name = "cpufeatures", version = "0.2.17" },
     { name = "derive_more-impl", version = "1.0.0" },
     { name = "derive_more", version = "1.0.0" },
     { name = "event-listener", version = "2.5.3" },
--- a/python/src/deltachat/chat.py
+++ b/python/src/deltachat/chat.py
@@ -271,15 +271,6 @@ class Chat:
           sent out.  This is the same object as was passed in, which
           has been modified with the new state of the core.
        """
-        if msg.is_out_preparing():
-            assert msg.id != 0
-            # get a fresh copy of dc_msg, the core needs it
-            maybe_msg = Message.from_db(self.account, msg.id)
-            if maybe_msg is not None:
-                msg = maybe_msg
-            else:
-                raise ValueError("message does not exist")
-
        sent_id = lib.dc_send_msg(self.account._dc_context, self.id, msg._dc_msg)
        if sent_id == 0:
            raise ValueError("message could not be sent")
@@ -333,26 +324,6 @@ class Chat:
            raise ValueError("message could not be sent")
        return Message.from_db(self.account, sent_id)

-    def send_prepared(self, message):
-        """send a previously prepared message.
-
-        :param message: a :class:`Message` instance previously returned by
-                        :meth:`prepare_file`.
-        :raises ValueError: if message can not be sent.
-        :returns: a :class:`deltachat.message.Message` instance as sent out.
-        """
-        assert message.id != 0 and message.is_out_preparing()
-        # get a fresh copy of dc_msg, the core needs it
-        msg = Message.from_db(self.account, message.id)
-
-        # pass 0 as chat-id because core-docs say it's ok when out-preparing
-        sent_id = lib.dc_send_msg(self.account._dc_context, 0, msg._dc_msg)
-        if sent_id == 0:
-            raise ValueError("message could not be sent")
-        assert sent_id == msg.id
-        # modify message in place to avoid bad state for the caller
-        msg._dc_msg = Message.from_db(self.account, sent_id)._dc_msg
-
    def set_draft(self, message):
        """set message as draft.

--- a/python/src/deltachat/message.py
+++ b/python/src/deltachat/message.py
@@ -351,17 +351,12 @@ class Message:
    def is_outgoing(self):
        """Return True if Message is outgoing."""
        return lib.dc_msg_get_state(self._dc_msg) in (
-            const.DC_STATE_OUT_PREPARING,
            const.DC_STATE_OUT_PENDING,
            const.DC_STATE_OUT_FAILED,
            const.DC_STATE_OUT_MDN_RCVD,
            const.DC_STATE_OUT_DELIVERED,
        )

-    def is_out_preparing(self):
-        """Return True if Message is outgoing, but its file is being prepared."""
-        return self._msgstate == const.DC_STATE_OUT_PREPARING
-
    def is_out_pending(self):
        """Return True if Message is outgoing, but is pending (no single checkmark)."""
        return self._msgstate == const.DC_STATE_OUT_PENDING
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -2613,7 +2613,7 @@ pub async fn send_msg(context: &Context, chat_id: ChatId, msg: &mut Message) ->
        "chat_id cannot be a special chat: {chat_id}"
    );

-    if msg.state != MessageState::Undefined && msg.state != MessageState::OutPreparing {
+    if msg.state != MessageState::Undefined {
        msg.param.remove(Param::GuaranteeE2ee);
        msg.param.remove(Param::ForcePlaintext);
        // create_send_msg_jobs() will update `param` in the db.
@@ -2721,10 +2721,7 @@ async fn prepare_send_msg(
        None
    };

-    if matches!(
-        msg.state,
-        MessageState::Undefined | MessageState::OutPreparing
-    )
+    if msg.state == MessageState::Undefined
        // Legacy SecureJoin "v*-request" messages are unencrypted.
        && msg.param.get_cmd() != SystemMessage::SecurejoinMessage
        && chat.is_encrypted(context).await?
@@ -2937,8 +2934,8 @@ pub(crate) async fn create_send_msg_jobs(context: &Context, msg: &mut Message) -
 UPDATE msgs SET
    timestamp=(
        SELECT MAX(timestamp) FROM msgs INDEXED BY msgs_index7 WHERE
-            -- From `InFresh` to `OutMdnRcvd` inclusive except `OutDraft`.
-            state IN(10,13,16,18,20,24,26,28) AND
+            -- From `InFresh` to `OutDelivered` inclusive, except `OutDraft`.
+            state IN(10,13,16,18,20,24,26) AND
            hidden IN(0,1) AND
            chat_id=? AND
            id<=?
@@ -2973,15 +2970,6 @@ WHERE id=?
        )?;
        for recipients_chunk in recipients.chunks(chunk_size) {
            let recipients_chunk = recipients_chunk.join(" ");
-            if let Some(pre_msg) = &rendered_pre_msg {
-                let row_id = stmt.execute((
-                    &pre_msg.rfc724_mid,
-                    &recipients_chunk,
-                    &pre_msg.message,
-                    msg.id,
-                ))?;
-                row_ids.push(row_id.try_into()?);
-            }
            let row_id = stmt.execute((
                &rendered_msg.rfc724_mid,
                &recipients_chunk,
@@ -2989,6 +2977,16 @@ WHERE id=?
                msg.id,
            ))?;
            row_ids.push(row_id.try_into()?);
+            let Some(pre_msg) = &rendered_pre_msg else {
+                continue;
+            };
+            let row_id = stmt.execute((
+                &pre_msg.rfc724_mid,
+                &recipients_chunk,
+                &pre_msg.message,
+                msg.id,
+            ))?;
+            row_ids.push(row_id.try_into()?);
        }
        Ok(row_ids)
    };
@@ -4539,6 +4537,7 @@ pub async fn forward_msgs_2ctx(

        msg.state = MessageState::OutPending;
        msg.rfc724_mid = create_outgoing_rfc724_mid();
+        msg.pre_rfc724_mid.clear();
        msg.timestamp_sort = curr_timestamp;
        chat.prepare_msg_raw(ctx_dst, &mut msg, None).await?;

--- a/src/imap.rs
+++ b/src/imap.rs
@@ -1383,15 +1383,13 @@ impl Session {
                let res = receive_imf_inner(context, rfc724_mid, body, is_seen).await;
                let received_msg = match res {
                    Err(err) => {
-                        let err = format!("{err:#}");
-                        warn!(context, "receive_imf error: {err}.");
-                        if !err.contains("(SKIP_DEVICE_MSG)") {
-                            let text = format!(
-                                "❌ Failed to receive a message: {err}. Core version v{DC_VERSION_STR}. Please report this bug to delta@merlinux.eu or https://support.delta.chat/",
-                            );
-                            let mut msg = Message::new_text(text);
-                            add_device_msg(context, None, Some(&mut msg)).await?;
-                        }
+                        warn!(context, "receive_imf error: {err:#}.");
+
+                        let text = format!(
+                            "❌ Failed to receive a message: {err:#}. Core version v{DC_VERSION_STR}. Please report this bug to delta@merlinux.eu or https://support.delta.chat/.",
+                        );
+                        let mut msg = Message::new_text(text);
+                        add_device_msg(context, None, Some(&mut msg)).await?;
                        None
                    }
                    Ok(msg) => msg,
--- a/src/message.rs
+++ b/src/message.rs
@@ -1381,13 +1381,8 @@ pub enum MessageState {
    /// IMAP and MDN may be sent.
    InSeen = 16,

-    /// For files which need time to be prepared before they can be
-    /// sent, the message enters this state before
-    /// OutPending.
-    ///
-    /// Deprecated 2024-12-07.
-    OutPreparing = 18,
-
+    // Deprecated 2024-12-07. Removed 2026-04.
+    // OutPreparing = 18,
    /// Message saved as draft.
    OutDraft = 19,

@@ -1420,7 +1415,6 @@ impl std::fmt::Display for MessageState {
                Self::InFresh => "Fresh",
                Self::InNoticed => "Noticed",
                Self::InSeen => "Seen",
-                Self::OutPreparing => "Preparing",
                Self::OutDraft => "Draft",
                Self::OutPending => "Pending",
                Self::OutFailed => "Failed",
@@ -1437,7 +1431,7 @@ impl MessageState {
        use MessageState::*;
        matches!(
            self,
-            OutPreparing | OutPending | OutDelivered | OutMdnRcvd // OutMdnRcvd can still fail because it could be a group message and only some recipients failed.
+            OutPending | OutDelivered | OutMdnRcvd // OutMdnRcvd can still fail because it could be a group message and only some recipients failed.
        )
    }

@@ -1446,7 +1440,7 @@ impl MessageState {
        use MessageState::*;
        matches!(
            self,
-            OutPreparing | OutDraft | OutPending | OutFailed | OutDelivered | OutMdnRcvd
+            OutDraft | OutPending | OutFailed | OutDelivered | OutMdnRcvd
        )
    }

--- a/src/mimeparser.rs
+++ b/src/mimeparser.rs
@@ -490,11 +490,13 @@ impl MimeMessage {
        let mail = mail.as_ref().map(|mail| {
            let (content, signatures_detached) = validate_detached_signature(mail, &public_keyring)
                .unwrap_or((mail, Default::default()));
-            let signatures_detached = signatures_detached
-                .into_iter()
-                .map(|fp| (fp, Vec::new()))
-                .collect::<HashMap<_, _>>();
-            signatures.extend(signatures_detached);
+            if is_encrypted {
+                let signatures_detached = signatures_detached
+                    .into_iter()
+                    .map(|fp| (fp, Vec::new()))
+                    .collect::<HashMap<_, _>>();
+                signatures.extend(signatures_detached);
+            }
            content
        });

--- a/src/quota.rs
+++ b/src/quota.rs
@@ -66,12 +66,6 @@ impl Context {

    /// Updates `quota.recent`, sets `quota.modified` to the current time
    /// and emits an event to let the UIs update connectivity view.
-    ///
-    /// Moreover, once each time quota gets larger than `QUOTA_WARN_THRESHOLD_PERCENTAGE`,
-    /// a device message is added.
-    /// As the message is added only once, the user is not spammed
-    /// in case for some providers the quota is always at ~100%
-    /// and new space is allocated as needed.
    pub(crate) async fn update_recent_quota(
        &self,
        session: &mut ImapSession,
--- a/src/reaction.rs
+++ b/src/reaction.rs
@@ -18,7 +18,7 @@ use std::cmp::Ordering;
 use std::collections::BTreeMap;
 use std::fmt;

-use anyhow::{Result, bail};
+use anyhow::Result;
 use serde::{Deserialize, Serialize};

 use crate::chat::{Chat, ChatId, send_msg};
@@ -259,8 +259,9 @@ pub(crate) async fn set_msg_reaction(
            });
        }
    } else {
-        bail!(
-            "Can't assign reaction to unknown message with Message-ID {in_reply_to} (SKIP_DEVICE_MSG)"
+        info!(
+            context,
+            "Can't assign reaction to unknown message with Message-ID {}", in_reply_to
        );
    }
    Ok(())
@@ -518,54 +519,6 @@ Content-Disposition: reaction\n\
        Ok(())
    }

-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_reaction_and_multitransport() -> Result<()> {
-        let mut tcm = TestContextManager::new();
-        let alice = &tcm.alice().await;
-        let device_chat_id = ChatId::get_for_contact(alice, ContactId::DEVICE).await?;
-        let n_device_msgs = get_chat_msgs(alice, device_chat_id).await?.len();
-
-        let reaction_bytes = "To: alice@example.org, claire@example.org\n\
-From: bob@example.net\n\
-Date: Today, 29 February 2021 00:00:10 -800\n\
-Message-ID: 56789@example.net\n\
-In-Reply-To: 12345@example.org\n\
-Content-Type: text/plain; charset=utf-8\n\
-Content-Disposition: reaction\n\
-\n\
-\u{1F44D}"
-            .as_bytes();
-        // Alice receives a reaction to Claire's message from Bob earler than the message itself
-        // because Bob knows about Alice's new transport.
-        assert!(receive_imf(alice, reaction_bytes, false).await.is_err());
-
-        let msg_id = receive_imf(
-            alice,
-            "To: alice@example.org, bob@example.net\n\
-From: claire@example.org\n\
-Date: Today, 29 February 2021 00:00:00 -800\n\
-Message-ID: 12345@example.org\n\
-\n\
-Can we chat at 1pm pacific, today?"
-                .as_bytes(),
-            false,
-        )
-        .await?
-        .unwrap()
-        .msg_ids[0];
-
-        // Finally the reaction arrives on Alice's older transport.
-        receive_imf(alice, reaction_bytes, false).await?;
-        let reactions = get_msg_reactions(alice, msg_id).await?;
-        assert_eq!(reactions.to_string(), "👍1");
-
-        assert_eq!(
-            get_chat_msgs(alice, device_chat_id).await?.len(),
-            n_device_msgs
-        );
-        Ok(())
-    }
-
    async fn expect_reactions_changed_event(
        t: &TestContext,
        expected_chat_id: ChatId,
--- a/src/receive_imf.rs
+++ b/src/receive_imf.rs
@@ -6,7 +6,7 @@ use std::iter;
 use std::str::FromStr as _;
 use std::sync::LazyLock;

-use anyhow::{Context as _, Result, bail, ensure};
+use anyhow::{Context as _, Result, ensure};
 use deltachat_contact_tools::{
    ContactAddress, addr_cmp, addr_normalize, may_be_valid_addr, sanitize_bidi_characters,
    sanitize_single_line,
@@ -525,18 +525,10 @@ pub(crate) async fn receive_imf_inner(
        "Receiving message {rfc724_mid_orig:?}, seen={seen}...",
    );

-    // These checks must be done before processing of SecureJoin and other special messages.
-    if mime_parser.pre_message == mimeparser::PreMessageMode::Post {
-        // Post-Message just replaces the attachment and modifies Params, not the whole message.
-        // This is done in the `handle_post_message` method.
-    } else if let Some(msg_id) = message::rfc724_mid_exists(context, rfc724_mid_orig).await? {
-        info!(
-            context,
-            "Message {rfc724_mid} is already in some chat or deleted."
-        );
-        if mime_parser.incoming {
-            return Ok(None);
-        }
+    let msg_id = message::rfc724_mid_exists(context, rfc724_mid_orig).await?;
+    if let Some(msg_id) = msg_id
+        && !mime_parser.incoming
+    {
        // For the case if we missed a successful SMTP response. Be optimistic that the message is
        // delivered also.
        let self_addr = context.get_primary_self_addr().await?;
@@ -551,6 +543,16 @@ pub(crate) async fn receive_imf_inner(
        if !msg_has_pending_smtp_job(context, msg_id).await? {
            msg_id.set_delivered(context).await?;
        }
+    }
+    // These checks must be done before processing of SecureJoin and other special messages.
+    if mime_parser.pre_message == mimeparser::PreMessageMode::Post {
+        // Post-Message just replaces the attachment and modifies Params, not the whole message.
+        // This is done in the `handle_post_message` method.
+    } else if msg_id.is_some() {
+        info!(
+            context,
+            "Message {rfc724_mid} is already in some chat or deleted."
+        );
        return Ok(None);
    }

@@ -806,8 +808,6 @@ UPDATE config SET value=? WHERE keyname='configured_addr' AND value!=?1
                if transport_changed {
                    info!(context, "Primary transport changed to {from_addr:?}.");
                    context.sql.uncache_raw_config("configured_addr").await;
-
-                    // Regenerate User ID in V4 keys.
                    context.self_public_key.lock().await.take();

                    context.emit_event(EventType::TransportsModified);
@@ -935,6 +935,75 @@ UPDATE config SET value=? WHERE keyname='configured_addr' AND value!=?1
            // This is a Delta Chat MDN. Mark as read.
            markseen_on_imap_table(context, rfc724_mid_orig).await?;
        }
+        if !mime_parser.incoming && !context.get_config_bool(Config::TeamProfile).await? {
+            let mut updated_chats = BTreeMap::new();
+            let mut archived_chats_maybe_noticed = false;
+            for report in &mime_parser.mdn_reports {
+                for msg_rfc724_mid in report
+                    .original_message_id
+                    .iter()
+                    .chain(&report.additional_message_ids)
+                {
+                    let Some(msg_id) = rfc724_mid_exists(context, msg_rfc724_mid).await? else {
+                        continue;
+                    };
+                    let Some(msg) = Message::load_from_db_optional(context, msg_id).await? else {
+                        continue;
+                    };
+                    if msg.state < MessageState::InFresh || msg.state >= MessageState::InSeen {
+                        continue;
+                    }
+                    if !mime_parser.was_encrypted() && msg.get_showpadlock() {
+                        warn!(context, "MDN: Not encrypted. Ignoring.");
+                        continue;
+                    }
+                    message::update_msg_state(context, msg_id, MessageState::InSeen).await?;
+                    if let Err(e) = msg_id.start_ephemeral_timer(context).await {
+                        error!(context, "start_ephemeral_timer for {msg_id}: {e:#}.");
+                    }
+                    if !mime_parser.has_chat_version() {
+                        continue;
+                    }
+                    archived_chats_maybe_noticed |= msg.state < MessageState::InNoticed
+                        && msg.chat_visibility == ChatVisibility::Archived;
+                    updated_chats
+                        .entry(msg.chat_id)
+                        .and_modify(|pos| *pos = cmp::max(*pos, (msg.timestamp_sort, msg.id)))
+                        .or_insert((msg.timestamp_sort, msg.id));
+                }
+            }
+            for (chat_id, (timestamp_sort, msg_id)) in updated_chats {
+                context
+                    .sql
+                    .execute(
+                        "
+UPDATE msgs SET state=? WHERE
+    state=? AND
+    hidden=0 AND
+    chat_id=? AND
+    (timestamp,id)<(?,?)",
+                        (
+                            MessageState::InNoticed,
+                            MessageState::InFresh,
+                            chat_id,
+                            timestamp_sort,
+                            msg_id,
+                        ),
+                    )
+                    .await
+                    .context("UPDATE msgs.state")?;
+                if chat_id.get_fresh_msg_cnt(context).await? == 0 {
+                    // Removes all notifications for the chat in UIs.
+                    context.emit_event(EventType::MsgsNoticed(chat_id));
+                } else {
+                    context.emit_msgs_changed_without_msg_id(chat_id);
+                }
+                chatlist_events::emit_chatlist_item_changed(context, chat_id);
+            }
+            if archived_chats_maybe_noticed {
+                context.on_archived_chats_maybe_noticed();
+            }
+        }
    }

    if mime_parser.is_call() {
@@ -1996,8 +2065,9 @@ async fn add_parts(
                    }
                }
                None => {
-                    bail!(
-                        "Cannot add iroh peer because WebXDC instance {in_reply_to} does not exist (SKIP_DEVICE_MSG)"
+                    warn!(
+                        context,
+                        "Cannot add iroh peer because WebXDC instance does not exist."
                    );
                }
            },
@@ -2030,82 +2100,6 @@ async fn add_parts(
            warn!(context, "Call: Not a reply.")
        }
    }
-    if !mime_parser.incoming && !context.get_config_bool(Config::TeamProfile).await? {
-        let mut missing_rfc724_mid = None;
-        let mut updated_chats = BTreeMap::new();
-        let mut archived_chats_maybe_noticed = false;
-        for report in &mime_parser.mdn_reports {
-            for msg_rfc724_mid in report
-                .original_message_id
-                .iter()
-                .chain(&report.additional_message_ids)
-            {
-                let Some(msg_id) = rfc724_mid_exists(context, msg_rfc724_mid).await? else {
-                    missing_rfc724_mid.get_or_insert(msg_rfc724_mid.as_str());
-                    continue;
-                };
-                let Some(msg) = Message::load_from_db_optional(context, msg_id).await? else {
-                    continue;
-                };
-                if msg.state < MessageState::InFresh || msg.state >= MessageState::InSeen {
-                    continue;
-                }
-                if !mime_parser.was_encrypted() && msg.get_showpadlock() {
-                    warn!(context, "MDN: Not encrypted. Ignoring.");
-                    continue;
-                }
-                message::update_msg_state(context, msg_id, MessageState::InSeen).await?;
-                if let Err(e) = msg_id.start_ephemeral_timer(context).await {
-                    error!(context, "start_ephemeral_timer for {msg_id}: {e:#}.");
-                }
-                if !mime_parser.has_chat_version() {
-                    continue;
-                }
-                archived_chats_maybe_noticed |= msg.state < MessageState::InNoticed
-                    && msg.chat_visibility == ChatVisibility::Archived;
-                updated_chats
-                    .entry(msg.chat_id)
-                    .and_modify(|pos| *pos = cmp::max(*pos, (msg.timestamp_sort, msg.id)))
-                    .or_insert((msg.timestamp_sort, msg.id));
-            }
-        }
-        for (chat_id, (timestamp_sort, msg_id)) in updated_chats {
-            context
-                .sql
-                .execute(
-                    "
-UPDATE msgs SET state=? WHERE
-state=? AND
-hidden=0 AND
-chat_id=? AND
-(timestamp,id)<(?,?)",
-                    (
-                        MessageState::InNoticed,
-                        MessageState::InFresh,
-                        chat_id,
-                        timestamp_sort,
-                        msg_id,
-                    ),
-                )
-                .await
-                .context("UPDATE msgs.state")?;
-            if chat_id.get_fresh_msg_cnt(context).await? == 0 {
-                // Removes all notifications for the chat in UIs.
-                context.emit_event(EventType::MsgsNoticed(chat_id));
-            } else {
-                context.emit_msgs_changed_without_msg_id(chat_id);
-            }
-            chatlist_events::emit_chatlist_item_changed(context, chat_id);
-        }
-        if archived_chats_maybe_noticed {
-            context.on_archived_chats_maybe_noticed();
-        }
-        ensure!(
-            missing_rfc724_mid.is_none(),
-            "Self-MDN: {} not found (SKIP_DEVICE_MSG)",
-            missing_rfc724_mid.unwrap_or(""),
-        );
-    }

    let hidden = mime_parser.parts.iter().all(|part| part.is_reaction);
    let mut parts = mime_parser.parts.iter().peekable();
@@ -2386,7 +2380,10 @@ async fn handle_edit_delete(
                warn!(context, "Edit message: Database entry does not exist.");
            }
        } else {
-            bail!("Edit message: rfc724_mid {rfc724_mid:?} not found (SKIP_DEVICE_MSG)");
+            warn!(
+                context,
+                "Edit message: rfc724_mid {rfc724_mid:?} not found."
+            );
        }
    } else if let Some(rfc724_mid_list) = mime_parser.get_header(HeaderDef::ChatDelete)
        && let Some(part) = mime_parser.parts.first()
@@ -2509,7 +2506,10 @@ WHERE id=?
                part.typ,
                part.bytes as isize,
                part.error.as_deref().unwrap_or_default(),
-                state,
+                match mime_parser.incoming {
+                    true => state,
+                    false => MessageState::Undefined,
+                },
                DownloadState::Done as u32,
                original_msg.id,
            ),
--- a/src/receive_imf/receive_imf_tests.rs
+++ b/src/receive_imf/receive_imf_tests.rs
@@ -14,9 +14,7 @@ use crate::contact;
 use crate::imap::prefetch_should_download;
 use crate::imex::{ImexMode, imex};
 use crate::key;
-use crate::message::markseen_msgs;
 use crate::securejoin::get_securejoin_qr;
-use crate::smtp;
 use crate::test_utils::{
    TestContext, TestContextManager, alice_keypair, get_chat_msg, mark_as_verified,
 };
@@ -2657,32 +2655,6 @@ async fn test_read_receipts_dont_unmark_bots() -> Result<()> {
    Ok(())
 }

-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_self_mdn_before_msg() -> Result<()> {
-    let mut tcm = TestContextManager::new();
-    let alice = &tcm.alice().await;
-    let bob = &tcm.bob().await;
-    let bob2 = &tcm.bob().await;
-    let alice_chat = alice.create_chat(bob).await;
-
-    let sent = alice.send_text(alice_chat.id, "hi").await;
-    let msg = bob.recv_msg(&sent).await;
-    msg.chat_id.accept(bob).await?;
-    markseen_msgs(bob, vec![msg.id]).await?;
-    smtp::queue_mdn(bob).await?;
-    let sent_mdn = bob.pop_sent_msg().await;
-
-    let Err(err) = receive_imf(bob2, sent_mdn.payload().as_bytes(), false).await else {
-        unreachable!();
-    };
-    assert!(format!("{err:#}").contains("(SKIP_DEVICE_MSG)"));
-    let msg = bob2.recv_msg(&sent).await;
-    assert_eq!(msg.get_state(), MessageState::InFresh);
-    bob2.recv_msg_trash(&sent_mdn).await;
-    assert_eq!(msg.id.get_state(bob2).await?, MessageState::InSeen);
-    Ok(())
-}
-
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_gmx_forwarded_msg() -> Result<()> {
    let t = TestContext::new_alice().await;
@@ -5620,27 +5592,27 @@ async fn test_mark_message_as_delivered_only_after_sent_out_fully() -> Result<()
        .await
        .unwrap();

-    let (pre_msg_id, pre_msg_payload) = first_row_in_smtp_queue(alice).await;
-    assert_eq!(msg_id, pre_msg_id);
-    assert!(pre_msg_payload.len() < file_bytes.len());
-
-    assert_eq!(msg_id.get_state(alice).await?, MessageState::OutPending);
-    // Alice receives her own pre-message because of bcc_self
-    // This should not yet mark the message as delivered,
-    // because not everything was sent,
-    // but it does remove the pre-message from the SMTP queue
-    receive_imf(alice, pre_msg_payload.as_bytes(), false).await?;
-    assert_eq!(msg_id.get_state(alice).await?, MessageState::OutPending);
-
    let (post_msg_id, post_msg_payload) = first_row_in_smtp_queue(alice).await;
    assert_eq!(msg_id, post_msg_id);
    assert!(post_msg_payload.len() > file_bytes.len());

    assert_eq!(msg_id.get_state(alice).await?, MessageState::OutPending);
    // Alice receives her own post-message because of bcc_self
+    // This should not yet mark the message as delivered,
+    // because not everything was sent,
+    // but it does remove the post-message from the SMTP queue.
+    receive_imf(alice, post_msg_payload.as_bytes(), false).await?;
+    assert_eq!(msg_id.get_state(alice).await?, MessageState::OutPending);
+
+    let (pre_msg_id, pre_msg_payload) = first_row_in_smtp_queue(alice).await;
+    assert_eq!(msg_id, pre_msg_id);
+    assert!(pre_msg_payload.len() < file_bytes.len());
+
+    assert_eq!(msg_id.get_state(alice).await?, MessageState::OutPending);
+    // Alice receives her own pre-message because of bcc_self
    // This should now mark the message as delivered,
    // because everything was sent by now.
-    receive_imf(alice, post_msg_payload.as_bytes(), false).await?;
+    receive_imf(alice, pre_msg_payload.as_bytes(), false).await?;
    assert_eq!(msg_id.get_state(alice).await?, MessageState::OutDelivered);

    Ok(())
--- a/src/smtp.rs
+++ b/src/smtp.rs
@@ -13,7 +13,7 @@ use crate::config::Config;
 use crate::contact::{Contact, ContactId};
 use crate::context::Context;
 use crate::events::EventType;
-use crate::log::warn;
+use crate::log::{LogExt, warn};
 use crate::message::Message;
 use crate::message::{self, MsgId};
 use crate::mimefactory::MimeFactory;
@@ -379,7 +379,7 @@ pub(crate) async fn send_msg_to_smtp(
    if retries > 6 {
        context
            .sql
-            .execute("DELETE FROM smtp WHERE id=?", (rowid,))
+            .execute("DELETE FROM smtp WHERE msg_id=?", (msg_id,))
            .await
            .context("Failed to remove message with exceeded retry limit from smtp table")?;
        if let Some(mut msg) = Message::load_from_db_optional(context, msg_id).await? {
@@ -590,77 +590,44 @@ async fn send_mdn_rfc724_mid(
    if context.get_config_bool(Config::BccSelf).await? {
        add_self_recipients(context, &mut recipients, encrypted).await?;
    }
-    #[cfg(not(test))]
-    {
-        use crate::log::LogExt;
+    let recipients: Vec<_> = recipients
+        .into_iter()
+        .filter_map(|addr| {
+            async_smtp::EmailAddress::new(addr.clone())
+                .with_context(|| format!("Invalid recipient: {addr}"))
+                .log_err(context)
+                .ok()
+        })
+        .collect();

-        let recipients: Vec<_> = recipients
-            .into_iter()
-            .filter_map(|addr| {
-                async_smtp::EmailAddress::new(addr.clone())
-                    .with_context(|| format!("Invalid recipient: {addr}"))
-                    .log_err(context)
-                    .ok()
-            })
-            .collect();
-
-        match smtp_send(context, &recipients, &body, smtp, None).await {
-            SendResult::Success => {
-                if !recipients.is_empty() {
-                    info!(context, "Successfully sent MDN for {rfc724_mid}.");
-                }
-                context
-                    .sql
-                    .transaction(|transaction| {
-                        let mut stmt =
-                            transaction.prepare("DELETE FROM smtp_mdns WHERE rfc724_mid = ?")?;
-                        stmt.execute((rfc724_mid,))?;
-                        for additional_rfc724_mid in additional_rfc724_mids {
-                            stmt.execute((additional_rfc724_mid,))?;
-                        }
-                        Ok(())
-                    })
-                    .await?;
-                Ok(true)
+    match smtp_send(context, &recipients, &body, smtp, None).await {
+        SendResult::Success => {
+            if !recipients.is_empty() {
+                info!(context, "Successfully sent MDN for {rfc724_mid}.");
            }
-            SendResult::Retry => {
-                info!(
-                    context,
-                    "Temporary SMTP failure while sending an MDN for {rfc724_mid}."
-                );
-                Ok(false)
-            }
-            SendResult::Failure(err) => Err(err),
+            context
+                .sql
+                .transaction(|transaction| {
+                    let mut stmt =
+                        transaction.prepare("DELETE FROM smtp_mdns WHERE rfc724_mid = ?")?;
+                    stmt.execute((rfc724_mid,))?;
+                    for additional_rfc724_mid in additional_rfc724_mids {
+                        stmt.execute((additional_rfc724_mid,))?;
+                    }
+                    Ok(())
+                })
+                .await?;
+            Ok(true)
        }
+        SendResult::Retry => {
+            info!(
+                context,
+                "Temporary SMTP failure while sending an MDN for {rfc724_mid}."
+            );
+            Ok(false)
+        }
+        SendResult::Failure(err) => Err(err),
    }
-    #[cfg(test)]
-    {
-        let _ = smtp;
-        context
-            .sql
-            .transaction(|t| {
-                t.execute(
-                    "INSERT INTO smtp (rfc724_mid, recipients, mime, msg_id)
-                    VALUES (?, ?, ?, ?)",
-                    (rfc724_mid, recipients.join(" "), body, u32::MAX),
-                )?;
-                let mut stmt = t.prepare("DELETE FROM smtp_mdns WHERE rfc724_mid = ?")?;
-                stmt.execute((rfc724_mid,))?;
-                for additional_rfc724_mid in additional_rfc724_mids {
-                    stmt.execute((additional_rfc724_mid,))?;
-                }
-                Ok(())
-            })
-            .await?;
-        Ok(true)
-    }
-}
-
-#[cfg(test)]
-pub(crate) async fn queue_mdn(context: &Context) -> Result<()> {
-    let queued = send_mdn(context, &mut Smtp::new()).await?;
-    assert!(queued);
-    Ok(())
 }

 /// Tries to send a single MDN. Returns true if more MDNs should be sent.
--- a/src/sql/migrations.rs
+++ b/src/sql/migrations.rs
@@ -2373,6 +2373,27 @@ ALTER TABLE contacts ADD COLUMN name_normalized TEXT;
        .await?;
    }

+    inc_and_check(&mut migration_version, 152)?;
+    if dbversion < migration_version {
+        sql.execute_migration(
+            "
+UPDATE msgs SET state=26 WHERE state=28; -- Change OutMdnRcvd to OutDelivered.
+UPDATE msgs SET state=19 WHERE state=24; -- Change OutPreparing to OutFailed.
+            ",
+            migration_version,
+        )
+        .await?;
+    }
+
+    inc_and_check(&mut migration_version, 153)?;
+    if dbversion < migration_version {
+        sql.execute_migration(
+            "CREATE INDEX smtp_index_msg_id ON smtp (msg_id, id)",
+            migration_version,
+        )
+        .await?;
+    }
+
    let new_version = sql
        .get_raw_config_int(VERSION_CFG)
        .await?
--- a/src/test_utils.rs
+++ b/src/test_utils.rs
@@ -722,12 +722,14 @@ ORDER BY id"
        })
    }

+    /// Returns `SentMessage` instances representing `smtp` rows for the given message. Returned
+    /// items go in reverse order for historical reasons.
    pub async fn get_smtp_rows_for_msg<'a>(&'a self, msg_id: MsgId) -> Vec<SentMessage<'a>> {
        let sent_msgs = self
            .ctx
            .sql
            .query_map_vec(
-                "SELECT id, msg_id, mime, recipients FROM smtp WHERE msg_id=?",
+                "SELECT id, msg_id, mime, recipients FROM smtp WHERE msg_id=? ORDER BY id DESC",
                (msg_id,),
                |row| {
                    let _id: MsgId = row.get(0)?;
@@ -1055,9 +1057,17 @@ ORDER BY id"
    /// This is not hooked up to any SMTP-IMAP pipeline, so the other account must call
    /// [`TestContext::recv_msg`] with the returned [`SentMessage`] if it wants to receive
    /// the message.
+    ///
+    /// Removes SMTP jobs existed before and marks the corresponding messages as delivered, as
+    /// tracking of these jobs is probably already lost by the test code.
    pub async fn send_msg(&self, chat_id: ChatId, msg: &mut Message) -> SentMessage<'_> {
+        while self.pop_sent_msg_opt(Duration::ZERO).await.is_some() {}
        let msg_id = chat::send_msg(self, chat_id, msg).await.unwrap();
-        let res = self.pop_sent_msg().await;
+        let rev_order = false;
+        let res = self
+            .pop_sent_msg_ex(rev_order, Duration::ZERO)
+            .await
+            .unwrap();
        assert_eq!(
            res.sender_msg_id, msg_id,
            "Apparently the message was not actually sent out"
--- a/src/tests/pre_messages/forward_and_save.rs
+++ b/src/tests/pre_messages/forward_and_save.rs
@@ -1,4 +1,6 @@
 //! Tests about forwarding and saving Pre-Messages
+use std::time::Duration;
+
 use anyhow::Result;
 use pretty_assertions::assert_eq;

@@ -8,6 +10,7 @@ use crate::chatlist::get_last_message_for_chat;
 use crate::download::{DownloadState, PRE_MSG_ATTACHMENT_SIZE_THRESHOLD};
 use crate::message::{Message, Viewtype};
 use crate::test_utils::TestContextManager;
+use crate::tests::pre_messages::util::send_large_file_message;

 /// Test that forwarding Pre-Message should forward additional text to not be empty
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -86,6 +89,43 @@ async fn test_forwarding_pre_message_empty_text() -> Result<()> {
    Ok(())
 }

+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_receive_both() -> Result<()> {
+    let mut tcm = TestContextManager::new();
+    let alice = &tcm.alice().await;
+    let bob = &tcm.bob().await;
+    let alice_chat_id = alice.create_group_with_members("", &[bob]).await;
+
+    let (pre_message, post_message, alice_msg_id) =
+        send_large_file_message(alice, alice_chat_id, Viewtype::File, &vec![0u8; 200_000]).await?;
+
+    let msg = bob.recv_msg(&pre_message).await;
+    let _ = bob.recv_msg_trash(&post_message).await;
+    let msg = Message::load_from_db(bob, msg.id).await?;
+    assert_eq!(msg.download_state(), DownloadState::Done);
+    assert_eq!(msg.text, "test".to_owned());
+
+    forward_msgs(alice, &[alice_msg_id], alice_chat_id).await?;
+    let rev_order = true;
+    let msg = bob
+        .recv_msg(
+            &alice
+                .pop_sent_msg_ex(rev_order, Duration::ZERO)
+                .await
+                .unwrap(),
+        )
+        .await;
+    assert_eq!(msg.download_state(), DownloadState::Available);
+    assert_eq!(msg.is_forwarded(), true);
+    assert_eq!(msg.text, "test".to_owned());
+    let _ = bob.recv_msg_trash(&alice.pop_sent_msg().await).await;
+    let msg = Message::load_from_db(bob, msg.id).await?;
+    assert_eq!(msg.download_state(), DownloadState::Done);
+    assert_eq!(msg.is_forwarded(), true);
+    assert_eq!(msg.text, "test".to_owned());
+    Ok(())
+}
+
 /// Test that forwarding Pre-Message should forward additional text to not be empty
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_saving_pre_message_empty_text() -> Result<()> {
--- a/src/tests/pre_messages/receiving.rs
+++ b/src/tests/pre_messages/receiving.rs
@@ -547,8 +547,8 @@ async fn test_webxdc_updates_in_post_message_after_pre_message() -> Result<()> {
        .await?;

    send_msg(alice, alice_chat_id, &mut alice_instance).await?;
-    let post_message = alice.pop_sent_msg().await;
    let pre_message = alice.pop_sent_msg().await;
+    let post_message = alice.pop_sent_msg().await;

    let bob_instance = bob.recv_msg(&pre_message).await;
    assert_eq!(bob_instance.download_state, DownloadState::Available);
@@ -588,8 +588,8 @@ async fn test_webxdc_updates_in_post_message_without_pre_message() -> Result<()>
        .await?;

    send_msg(alice, alice_chat_id, &mut alice_instance).await?;
-    let post_message = alice.pop_sent_msg().await;
    let pre_message = alice.pop_sent_msg().await;
+    let post_message = alice.pop_sent_msg().await;

    // Bob receives post-message first.
    let bob_instance = bob.recv_msg(&post_message).await;
--- a/src/transport.rs
+++ b/src/transport.rs
@@ -791,7 +791,18 @@ pub(crate) async fn sync_transports(
    context
        .sql
        .transaction(|transaction| {
+            let configured_addr = transaction.query_row(
+                "SELECT value FROM config WHERE keyname='configured_addr'",
+                (),
+                |row| {
+                    let addr: String = row.get(0)?;
+                    Ok(addr)
+                },
+            )?;
            for RemovedTransportData { addr, timestamp } in removed_transports {
+                if *addr == configured_addr {
+                    continue;
+                }
                modified |= transaction.execute(
                    "DELETE FROM transports
                     WHERE addr=? AND add_timestamp<=?",
--- a/src/webxdc.rs
+++ b/src/webxdc.rs
@@ -550,7 +550,7 @@ impl Context {

        let send_now = !matches!(
            instance.state,
-            MessageState::Undefined | MessageState::OutPreparing | MessageState::OutDraft
+            MessageState::Undefined | MessageState::OutDraft
        );

        status_update.uid = Some(create_id());
Author	SHA1	Message	Date
iequidoo	a18bf74620	fix: Send pre-message after successful sending of post-message (#8063 ) This isn't easy to test though because the `smtp` sending code requires an SMTP connection, so it's only tested (by already existing tests) that messages are queued in the right order. Another problem is that the `smtp` sending logic doesn't try to send any messages following a failed-to-send message until the retry limit is reached, so if there's smth wrong with a post-message, other unrelated messages are delayed, but this problem has already existed.	2026-05-08 08:37:12 -04:00
iequidoo	ca70fb9b3a	feat: Get rid of MessageState::{OutPreparing,OutMdnRcvd} in the db `OutPreparing` is deprecated since 2024-12-07, replace it with `OutFailed`, such messages are probably not interesting anymore. `OutMdnRcvd` is not used in the db for new messages since `a30c6ae1f7`, `OutDelivered` is stored instead.	2026-05-07 20:37:11 -03:00
iequidoo	045b586569	feat: Never remove primary transport when applying SyncTransports message If we missed a message changing the primary transport, we shouldn't remove it when applying a SyncTransports message, such a state doesn't look correct even if it's temporary.	2026-05-07 20:04:22 -03:00
iequidoo	18e1ecbb94	fix: Generate new pre-message Message-ID when forwarding Otherwise if it's forwarded to a device that already has the original message, the pre-message isn't received and this results in a message having no text and `Forwarded` param. Co-authored-by: Hocuri <hocuri@gmx.de>	2026-05-07 19:35:03 -03:00
iequidoo	6fdee2b92d	docs: Remove outdated comment about "quota warning" device message The device message was removed in `7de58f5329`.	2026-05-07 19:31:38 -03:00
dependabot[bot]	9ebd4769f5	chore(cargo): bump openssl from 0.10.78 to 0.10.79 Bumps [openssl](https://github.com/rust-openssl/rust-openssl) from 0.10.78 to 0.10.79. - [Release notes](https://github.com/rust-openssl/rust-openssl/releases) - [Commits](https://github.com/rust-openssl/rust-openssl/compare/openssl-v0.10.78...openssl-v0.10.79) --- updated-dependencies: - dependency-name: openssl dependency-version: 0.10.79 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2026-05-07 09:13:45 -03:00
dependabot[bot]	741d1beed8	chore(cargo): bump data-encoding from 2.10.0 to 2.11.0 Bumps [data-encoding](https://github.com/ia0/data-encoding) from 2.10.0 to 2.11.0. - [Commits](https://github.com/ia0/data-encoding/compare/v2.10.0...v2.11.0) --- updated-dependencies: - dependency-name: data-encoding dependency-version: 2.11.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2026-05-04 14:10:58 -03:00
dependabot[bot]	ac8b2d2fca	chore(cargo): bump colorutils-rs from 0.7.6 to 0.8.0 Bumps [colorutils-rs](https://github.com/awxkee/colorutils-rs) from 0.7.6 to 0.8.0. - [Release notes](https://github.com/awxkee/colorutils-rs/releases) - [Commits](https://github.com/awxkee/colorutils-rs/compare/0.7.6...0.8.0)	2026-05-04 13:42:52 -03:00
link2xt	d75c05e717	ci: do not store Rust cache from PRs <https://github.com/swatinem/rust-cache> caches only dependencies, and dependencies don't change most of the time, so PRs store the same cache as already stored by the main branch commit PRs are based on. Hash of Cargo.{toml,lock} is part of the cache key, so for dependency updating PRs the cache key is new. Such PRs rebuild everything from scratch, which is a separate problem. Storing such cache from PR is however not useful because most of the time dependency updating PR is going to be rebased again before merging as Dependabot PRs are opened in a batch and then merged one by one while Dependabot rebases remaining PRs.	2026-05-04 11:21:33 +00:00
dependabot[bot]	35ceb51ffc	chore(cargo): bump libc from 0.2.184 to 0.2.186 Bumps [libc](https://github.com/rust-lang/libc) from 0.2.184 to 0.2.186. - [Release notes](https://github.com/rust-lang/libc/releases) - [Changelog](https://github.com/rust-lang/libc/blob/0.2.186/CHANGELOG.md) - [Commits](https://github.com/rust-lang/libc/compare/0.2.184...0.2.186) --- updated-dependencies: - dependency-name: libc dependency-version: 0.2.186 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2026-05-04 04:16:07 +00:00
iequidoo	8492f84b13	refactor: Don't temporarily extend `signatures` for signed-only messages	2026-05-03 23:35:40 -03:00
dependabot[bot]	e713c231eb	chore(cargo): bump tokio from 1.50.0 to 1.52.1 Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.50.0 to 1.52.1. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.50.0...tokio-1.52.1) --- updated-dependencies: - dependency-name: tokio dependency-version: 1.52.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2026-05-04 00:06:32 +00:00
dependabot[bot]	80c9ca44ca	chore(cargo): bump hyper from 1.8.1 to 1.9.0 Bumps [hyper](https://github.com/hyperium/hyper) from 1.8.1 to 1.9.0. - [Release notes](https://github.com/hyperium/hyper/releases) - [Changelog](https://github.com/hyperium/hyper/blob/master/CHANGELOG.md) - [Commits](https://github.com/hyperium/hyper/compare/v1.8.1...v1.9.0) --- updated-dependencies: - dependency-name: hyper dependency-version: 1.9.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2026-05-03 21:46:04 +00:00
link2xt	6e04993e75	chore(deny.toml): add cpufeatures duplicate dependency exception	2026-05-03 20:13:23 +00:00
dependabot[bot]	4529ed2240	chore(cargo): bump blake3 from 1.8.3 to 1.8.5 Bumps [blake3](https://github.com/BLAKE3-team/BLAKE3) from 1.8.3 to 1.8.5. - [Release notes](https://github.com/BLAKE3-team/BLAKE3/releases) - [Commits](https://github.com/BLAKE3-team/BLAKE3/compare/1.8.3...1.8.5) --- updated-dependencies: - dependency-name: blake3 dependency-version: 1.8.5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2026-05-03 18:22:54 +00:00
link2xt	b5ebd6f686	chore: add exceptions for hickory-proto 0.25.2 in deny.toml Cannot be updated and nothing serious even if possible to trigger.	2026-05-03 18:22:23 +00:00