diff --git a/src/message.rs b/src/message.rs
index 99c4694ca7..fb6a23be4b 100644
--- a/src/message.rs
+++ b/src/message.rs
@@ -2752,6 +2752,25 @@ mod tests {
         let contact = Contact::get_by_id(&alice, msg.from_id).await?;
         assert!(!contact.is_bot());
 
+        // Alice receives an auto-generated non-chat message.
+        receive_imf(
+            &alice,
+            b"From: Claire <claire@example.com>\n\
+                    To: alice@example.org\n\
+                    Message-ID: <789@example.com>\n\
+                    Auto-Submitted: auto-generated\n\
+                    Date: Fri, 29 Jan 2021 21:37:55 +0000\n\
+                    \n\
+                    hello\n",
+            false,
+        )
+        .await?;
+        let msg = alice.get_last_msg().await;
+        assert_eq!(msg.get_text(), "hello".to_string());
+        assert!(!msg.is_bot());
+        let contact = Contact::get_by_id(&alice, msg.from_id).await?;
+        assert!(!contact.is_bot());
+
         Ok(())
     }