1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/abstract/MCMessageHeader.cpp b/src/core/abstract/MCMessageHeader.cpp
index e16f27af..d5a152f5 100644
--- a/src/core/abstract/MCMessageHeader.cpp
+++ b/src/core/abstract/MCMessageHeader.cpp
@@ -527,7 +527,9 @@ void MessageHeader::importIMFFields(struct mailimf_fields * fields)
             
             fieldValue = field->fld_data.fld_optional_field->fld_value;
             fieldValueStr = String::stringByDecodingMIMEHeaderValue(fieldValue);
-            setExtraHeader(fieldNameStr, fieldValueStr);
+            if (fieldValueStr != NULL) {
+                setExtraHeader(fieldNameStr, fieldValueStr);
+            }
         }
     }
 }