diff -r d2c4c66342f3 -r d51193d814ea messagingfw/msgsrvnstore/server/src/MTCLBASE.CPP
--- a/messagingfw/msgsrvnstore/server/src/MTCLBASE.CPP	Tue Aug 31 15:41:11 2010 +0300
+++ b/messagingfw/msgsrvnstore/server/src/MTCLBASE.CPP	Wed Sep 01 12:27:27 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1998-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -84,10 +84,7 @@
 	delete iParaFormatLayer;
 	iRegisteredMtmDll.ReleaseLibrary();
 	delete iAttachmentWaiter;
-	if(iExtensionData)
-  		{
-		delete iExtensionData;    
-  		}	
+	delete iExtensionData;
 	}