diff -r d2c4c66342f3 -r d51193d814ea messagingfw/msgsrvnstore/server/src/MSVDELET.CPP
--- a/messagingfw/msgsrvnstore/server/src/MSVDELET.CPP	Tue Aug 31 15:41:11 2010 +0300
+++ b/messagingfw/msgsrvnstore/server/src/MSVDELET.CPP	Wed Sep 01 12:27:27 2010 +0100
@@ -310,11 +310,6 @@
 	CDir* dir=NULL;
 	TBool partiallyDeleted=EFalse;
 	TInt error = iServer.GetFileDirectoryListing(id, filename, dir);
-	if(dir)
-        {
-	    CleanupStack::PushL(dir);
-        }
-	
 	if (error==KErrNone)
 		{
 		User::LeaveIfError(iServer.FileSession().SetSessionPath(filename));
@@ -391,10 +386,7 @@
 	// deletion was successful
 	iDeletedEntries->AppendL(id); // will not leave, space has been reserved
 	iMovedEntries->AppendL(id);   // will not leave, space has been reserved
-	if(dir)
-        {
-	    CleanupStack::PopAndDestroy(dir);
-        }
+	delete dir;
 	return;
 
 failed:
@@ -432,11 +424,7 @@
 	// we have failed, move onto next state
 	iState = iPCSynced ? EIndexIndividually : EIndex;
 	iError=error;
-	if(dir)
-        {
-	    CleanupStack::PopAndDestroy(dir);
-        }
-	    
+	delete dir;
 	}