diff --git a/crates/smtp/src/scripts/event_loop.rs b/crates/smtp/src/scripts/event_loop.rs
index a13609de..e3e9ce8a 100644
--- a/crates/smtp/src/scripts/event_loop.rs
+++ b/crates/smtp/src/scripts/event_loop.rs
@@ -265,7 +265,7 @@ impl SMTP {
                         } else {
                             instance.message().raw_message().into()
                         };
-                        if let Some(raw_message) = raw_message {
+                        if let Some(raw_message) = raw_message.filter(|m| !m.is_empty()) {
                             let headers = if !params.sign.is_empty() {
                                 let mut headers = Vec::new();