From 143ba6d5e7c48e41bc62eb1e2a26230cd7761c8c Mon Sep 17 00:00:00 2001
From: Nico de Haen <ndh@deltachat.de>
Date: Tue, 2 Sep 2025 14:32:25 +0200
Subject: [PATCH] fix: Mark message as failed if it can't be send (#7143)

resolves #6849
---
 src/chat.rs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/chat.rs b/src/chat.rs
index e9d63e609..92a5180e3 100644
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -3003,7 +3003,16 @@ pub(crate) async fn create_send_msg_jobs(context: &Context, msg: &mut Message) -
     }
 
     let needs_encryption = msg.param.get_bool(Param::GuaranteeE2ee).unwrap_or_default();
-    let mimefactory = MimeFactory::from_msg(context, msg.clone()).await?;
+    let mimefactory = match MimeFactory::from_msg(context, msg.clone()).await {
+        Ok(mf) => mf,
+        Err(err) => {
+            // Mark message as failed
+            message::set_msg_failed(context, msg, &err.to_string())
+                .await
+                .ok();
+            return Err(err);
+        }
+    };
     let attach_selfavatar = mimefactory.attach_selfavatar;
     let mut recipients = mimefactory.recipients();