--- a/emailservices/emailcommon/src/CFSMailMessagePart.cpp	Mon May 03 12:23:15 2010 +0300
+++ b/emailservices/emailcommon/src/CFSMailMessagePart.cpp	Fri May 14 15:41:10 2010 +0300
@@ -91,8 +91,8 @@
 	
 	iNmPrivateMessagePart = new NmMessagePartPrivate();
 	
-	iNmPrivateMessagePart->mOwnId.setId32(aMessagePartId.Id());
-	iNmPrivateMessagePart->mOwnId.setPluginId32((quint32)aMessagePartId.PluginId().iUid);
+	iNmPrivateMessagePart->mPartId.setId32(aMessagePartId.Id());
+	iNmPrivateMessagePart->mPartId.setPluginId32((quint32)aMessagePartId.PluginId().iUid);
 		
 	iMessagePartsStatus = EFSDefault;
 
@@ -231,7 +231,7 @@
 {
     FUNC_LOG;
 //<qmail>
-    return TFSMailMsgId(iNmPrivateMessagePart->mOwnId);
+    return TFSMailMsgId(iNmPrivateMessagePart->mPartId);
 //</qmail>	
 }
 
@@ -1030,7 +1030,15 @@
 		
 //<qmail>
 	    buffer = HBufC::NewL(length);
-	    buffer->Des().Append(KFSMailContentDispAttachment);
+	    if (ContentDisposition().FindF(KFSMailContentDispInline) != KErrNotFound)
+	        {
+            buffer->Des().Append(KFSMailContentDispInline);
+	        }
+	    else
+	        {
+            buffer->Des().Append(KFSMailContentDispAttachment);
+	        }
+	    
 	    buffer->Des().Append(_L("; "));
 	    buffer->Des().Append(KFSMailContentDispParamFilename);
 	    buffer->Des().Append('"');