diff --git a/src/mimefactory.rs b/src/mimefactory.rs
index 5c0781f0f..d8cb56c87 100644
--- a/src/mimefactory.rs
+++ b/src/mimefactory.rs
@@ -347,7 +347,7 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
                         self.context,
                     );
                     let mut lines = raw.lines();
-                    let raw_subject = if let Some(line) = lines.next() {
+                    let raw_subject = raw.lines().next().unwrap_or_default();
                         line
                     } else {
                         ""