diff --git a/OpenPop/Mime/Message.cs b/OpenPop/Mime/Message.cs
index c3789bb..049be97 100644
--- a/OpenPop/Mime/Message.cs
+++ b/OpenPop/Mime/Message.cs
@@ -173,6 +173,10 @@ public MailMessage ToMailMessage()
 			foreach (MessagePart attachmentMessagePart in attachments)
 			{
 				MemoryStream stream = new MemoryStream(attachmentMessagePart.Body);
+				if (attachmentMessagePart.ContentType != null && string.IsNullOrEmpty(attachmentMessagePart.ContentType.Name))
+				{
+					attachmentMessagePart.ContentType.Name = Path.GetFileName(attachmentMessagePart.FileName);
+				}
 				Attachment attachment = new Attachment(stream, attachmentMessagePart.ContentType);
 				attachment.ContentId = attachmentMessagePart.ContentId;
 				message.Attachments.Add(attachment);