--- a/emailservices/emailcommon/src/CFSMailMessagePart.cpp	Fri Sep 17 08:27:21 2010 +0300
+++ b/emailservices/emailcommon/src/CFSMailMessagePart.cpp	Mon Oct 04 00:05:37 2010 +0300
@@ -493,7 +493,7 @@
 // -----------------------------------------------------------------------------
 // CFSMailMessagePart::GetContentFileL
 // -----------------------------------------------------------------------------
-EXPORT_C RFile CFSMailMessagePart::GetContentFileL()
+EXPORT_C RFile CFSMailMessagePart::GetContentFileL( TBool aForWriting )
 	{
     NM_FUNCTION;
 	
@@ -501,7 +501,7 @@
 		{
 		TInt rcode = plugin->GetMessagePartFileL( GetMailBoxId(), GetFolderId(),
 					                            GetMessageId(), GetPartId(),
-					                            iFile );
+					                            iFile, aForWriting);
 		// if content is encrypted, use temp dir files
 		if(rcode == KErrNotSupported)
 		    {
@@ -960,7 +960,7 @@
 	        {
             buffer->Des().Append(KFSMailContentDispInline);
 	        }
-	    else
+	    else if (ContentDisposition().FindF(KFSMailContentDispAttachment) != KErrNotFound)
 	        {
             buffer->Des().Append(KFSMailContentDispAttachment);
 	        }