--- a/emailuis/nmframeworkadapter/src/nmfwamessagecreationoperation.cpp	Mon May 03 12:23:15 2010 +0300
+++ b/emailuis/nmframeworkadapter/src/nmfwamessagecreationoperation.cpp	Fri May 14 15:41:10 2010 +0300
@@ -16,7 +16,6 @@
  */
 #include "nmframeworkadapterheaders.h"
 
-#include "nmfwamessagecreationoperation.h"
 
 /*!
     \class NmFwaMessageCreationOperation
@@ -50,6 +49,7 @@
 {
     doCancelOperation();
     delete mMessage;
+    NMLOG("NmFwaMessageCreationOperation::~NmFwaMessageCreationOperation --->");
 }
 
 /*!
@@ -144,7 +144,7 @@
     NmId messageId;
     
     if (mMessage) {
-        messageId = mMessage->envelope().id();
+        messageId = mMessage->envelope().messageId();
     }
     
     return messageId;
@@ -176,10 +176,11 @@
             completeOperation(NmNoError);
         }
         else if (status == TFSProgress::EFSStatus_RequestCancelled) {
-            operationCancelled();
+            completeOperation(NmCancelError);
         }
         else {
             completeOperation(NmGeneralError);
         }
     }
 }
+