diff -r 238255e8b033 -r 84d9eb65b26f messagingapp/msgappfw/msghistory/src/msghistoryprivate.cpp
--- a/messagingapp/msgappfw/msghistory/src/msghistoryprivate.cpp	Fri Apr 16 14:56:15 2010 +0300
+++ b/messagingapp/msgappfw/msghistory/src/msghistoryprivate.cpp	Mon May 03 12:29:07 2010 +0300
@@ -106,10 +106,8 @@
     clientConversation->SetConversationEntryL(entry);
 
     handler->RequestConversationChangeEventL(this, clientConversation);
-    if ( clientConversation )
-        delete clientConversation;
-    if( entry )
-        delete entry;        
+    delete clientConversation;
+    delete entry;        
     if ( err == KErrNone )
         return ETrue;
 
@@ -132,10 +130,9 @@
     clientConversation->SetConversationEntryL(entry);
 
     handler->RemoveConversationChangeEventL(this, clientConversation);
-    if ( clientConversation )
-        delete clientConversation;
-    if( entry )
-        delete entry;
+    delete clientConversation;
+		
+	delete entry;
     if ( err == KErrNone )
         return ETrue;