diff --git a/src/imap/mod.rs b/src/imap/mod.rs
index 6b3c250b3..3bb0bf249 100644
--- a/src/imap/mod.rs
+++ b/src/imap/mod.rs
@@ -1458,7 +1458,7 @@ pub(crate) async fn prefetch_should_download(
     let is_reply_to_chat_message = prefetch_is_reply_to_chat_message(context, &headers).await;
 
     let maybe_ndn = if let Some(from) = headers.get_header_value(HeaderDef::From_) {
-        from.to_ascii_lowercase().contains("daemon")
+        from.to_ascii_lowercase().contains("mailer-daemon")
     } else {
         false
     };
diff --git a/src/mimeparser.rs b/src/mimeparser.rs
index 79c313044..1ac3e67c7 100644
--- a/src/mimeparser.rs
+++ b/src/mimeparser.rs
@@ -911,7 +911,7 @@ impl MimeMessage {
             && self
                 .get(HeaderDef::From_)?
                 .to_ascii_lowercase()
-                .contains("daemon")
+                .contains("mailer-daemon")
             && self.failure_report.is_none()
         {
             lazy_static! {