1 files changed, 5 insertions, 3 deletions
diff --git a/src/core/renderer/MCHTMLRendererCallback.cpp b/src/core/renderer/MCHTMLRendererCallback.cpp
index 194416ba..20c4873c 100644
--- a/src/core/renderer/MCHTMLRendererCallback.cpp
+++ b/src/core/renderer/MCHTMLRendererCallback.cpp
@@ -181,9 +181,11 @@ mailcore::HashMap * HTMLRendererTemplateCallback::templateValuesForPart(mailcore
     }
     else if (part->className()->isEqual(MCSTR("mailcore::Attachment"))) {
         mailcore::Attachment * attachment = (mailcore::Attachment *) part;
-        mailcore::String * value = mailcore::SizeFormatter::stringWithSize(attachment->data()->length());
-        result->setObjectForKey(MCSTR("SIZE"), value);
-        result->setObjectForKey(MCSTR("HASSIZE"), mailcore::HashMap::hashMap());
+        if (attachment->data() != NULL) {
+            mailcore::String * value = mailcore::SizeFormatter::stringWithSize(attachment->data()->length());
+            result->setObjectForKey(MCSTR("SIZE"), value);
+            result->setObjectForKey(MCSTR("HASSIZE"), mailcore::HashMap::hashMap());
+        }
     }
     else {
         result->setObjectForKey(MCSTR("NOSIZE"), mailcore::HashMap::hashMap());