3 files changed, 12 insertions, 1 deletions
diff --git a/src/core/rfc822/MCAttachment.cc b/src/core/rfc822/MCAttachment.cc
index 6df46937..4d92acba 100644
--- a/src/core/rfc822/MCAttachment.cc
+++ b/src/core/rfc822/MCAttachment.cc
@@ -161,7 +161,9 @@ Attachment * Attachment::attachmentWithData(String * filename, Data * data)
 	if (mimeType != NULL) {
         attachment->setMimeType(mimeType);
 	}
-	attachment->setFilename(filename->lastPathComponent());
+    if (filename != NULL) {
+        attachment->setFilename(filename->lastPathComponent());
+    }
     attachment->setData(data);
 	
 	return (Attachment *) attachment->autorelease();
diff --git a/src/objc/rfc822/MCOAttachment.h b/src/objc/rfc822/MCOAttachment.h
index 560f4590..a308ffd3 100644
--- a/src/objc/rfc822/MCOAttachment.h
+++ b/src/objc/rfc822/MCOAttachment.h
@@ -24,6 +24,9 @@
 /** Returns a file attachment with the content of the given file.*/
 + (MCOAttachment *) attachmentWithContentsOfFile:(NSString *)filename;
 
+/** Returns a file attachment with the given data and filename.*/
++ (MCOAttachment *) attachmentWithData:(NSData *)data filename:(NSString *)filename;
+
 /** Returns a part with an HTML content.*/
 + (MCOAttachment *) attachmentWithHTMLString:(NSString *)htmlString;
 
diff --git a/src/objc/rfc822/MCOAttachment.mm b/src/objc/rfc822/MCOAttachment.mm
index 5b20e583..afaf96af 100644
--- a/src/objc/rfc822/MCOAttachment.mm
+++ b/src/objc/rfc822/MCOAttachment.mm
@@ -58,6 +58,12 @@
     return MCO_TO_OBJC(result);
 }
 
++ (MCOAttachment *) attachmentWithData:(NSData *)data filename:(NSString *)filename
+{
+    mailcore::Attachment * result = mailcore::Attachment::attachmentWithData([filename mco_mcString], [data mco_mcData]);
+    return MCO_TO_OBJC(result);
+}
+
 + (MCOAttachment *) attachmentWithHTMLString:(NSString *)htmlString
 {
     mailcore::Attachment * result = mailcore::Attachment::attachmentWithHTMLString([htmlString mco_mcString]);