diff -r 16ed8d08d0b1 -r 478bc57ad291 emailuis/nmframeworkadapter/src/nmfwamessagesendingoperation.cpp --- a/emailuis/nmframeworkadapter/src/nmfwamessagesendingoperation.cpp Wed Aug 18 09:37:47 2010 +0300 +++ b/emailuis/nmframeworkadapter/src/nmfwamessagesendingoperation.cpp Thu Sep 02 20:15:00 2010 +0300 @@ -214,11 +214,10 @@ TFSMailMsgId mailboxId = NmConverter::nmIdToMailMsgId(mMessage->envelope().mailboxId()); CFSMailBox *currentMailbox( NULL ); currentMailbox = mMailClient.GetMailBoxByUidL(mailboxId); - CleanupStack::PushL(currentMailbox); if (!currentMailbox) { User::Leave( KErrNotFound ); } - + CleanupStack::PushL(currentMailbox); CFSMailMessage *msg = CFSMailMessage::NewL(*mMessage); // no leave -> msg != NULL CleanupStack::PushL(msg);