diff -r 16ed8d08d0b1 -r 478bc57ad291 emailuis/nmframeworkadapter/src/nmfwaforwardmessagecreationoperation.cpp --- a/emailuis/nmframeworkadapter/src/nmfwaforwardmessagecreationoperation.cpp Wed Aug 18 09:37:47 2010 +0300 +++ b/emailuis/nmframeworkadapter/src/nmfwaforwardmessagecreationoperation.cpp Thu Sep 02 20:15:00 2010 +0300 @@ -38,7 +38,7 @@ const TFSMailMsgId mailMsgId(mMailboxId.pluginId32(), mMailboxId.id32()); - CFSMailBox *mailBox = NULL; + CFSMailBox *mailBox(NULL); TRAP_IGNORE(mailBox = mMailClient.GetMailBoxByUidL(mailMsgId)); if (mailBox) { @@ -46,22 +46,21 @@ if (err == KErrFSMailPluginNotSupported) { CFSMailMessage *fsMessage = mailBox->CreateForwardMessage(mOriginalMessageId); - - mMessage = fsMessage->GetNmMessage(); - - delete fsMessage; - fsMessage = NULL; - - completeOperation(NmNoError); + if (fsMessage) { + mMessage = fsMessage->GetNmMessage(); + delete fsMessage; + fsMessage = NULL; + completeOperation(NmNoError); + } else { + completeOperation(NmGeneralError); + } } else if (err != KErrNone) { completeOperation(NmGeneralError); } - delete mailBox; mailBox = NULL; - } - else { + } else { completeOperation(NmNotFoundError); } }