--- a/emailservices/emailcommon/src/CFSMailMessage.cpp	Mon May 03 12:23:15 2010 +0300
+++ b/emailservices/emailcommon/src/CFSMailMessage.cpp	Fri May 14 15:41:10 2010 +0300
@@ -487,8 +487,7 @@
 // -----------------------------------------------------------------------------
 EXPORT_C NmMessage* CFSMailMessage::GetNmMessage()
 {
-	NmMessage* message = new NmMessage(iNmPrivateMessagePart);
-	message->setEnvelope(iNmPrivateMessageEnvelope);
+	NmMessage* message = new NmMessage(iNmPrivateMessageEnvelope, iNmPrivateMessagePart);
 	return message;
 }
 //</qmail>