diff -r 238255e8b033 -r 84d9eb65b26f messagingapp/msgappfw/server/src/ccsconversationdeletehandler.cpp --- a/messagingapp/msgappfw/server/src/ccsconversationdeletehandler.cpp Fri Apr 16 14:56:15 2010 +0300 +++ b/messagingapp/msgappfw/server/src/ccsconversationdeletehandler.cpp Mon May 03 12:29:07 2010 +0300 @@ -110,11 +110,13 @@ // ---------------------------------------------------------------------------- // Delete a message // ---------------------------------------------------------------------------- -void CCsConversationDeleteHandler::DeleteOneMessageL() +void CCsConversationDeleteHandler::DeleteOneMessage() { CCsConversationEntry* entry = static_cast((*iConversationEntryList)[iDeletedCount]); + TInt id = entry->EntryId(); + if ( ECsSendStateSending != entry->GetSendState() ) { iSession->RemoveEntry(id); @@ -144,7 +146,7 @@ case EDeleteNext: iDeletedCount--; - DeleteOneMessageL(); + DeleteOneMessage(); if ( iDeletedCount > 0 ) { iState = EDeleteNext;