diff --git a/src/dc_mimeparser.rs b/src/dc_mimeparser.rs
index f43acaf7b..8a39fd568 100644
--- a/src/dc_mimeparser.rs
+++ b/src/dc_mimeparser.rs
@@ -127,12 +127,7 @@ impl<'a> MimeParser<'a> {
             if let Some(field) = self.lookup_field("Subject") {
                 if (*field).fld_type == MAILIMF_FIELD_SUBJECT as libc::c_int {
                     let subj = (*(*field).fld_data.fld_subject).sbj_value;
-                    let subj = to_opt_string_lossy(subj);
-                    self.subject = if subj.is_some() {
-                        Some(dc_decode_header_words(&subj.unwrap()))
-                    } else {
-                        None
-                    };
+                    self.subject = to_opt_string_lossy(subj).map(|x| dc_decode_header_words(&x));
                 }
             }