diff -r 6f4453afd006 -r 6c34d0baa0b1 messagingfw/msgsrvnstore/server/src/CMsvMimeHeaders.cpp
--- a/messagingfw/msgsrvnstore/server/src/CMsvMimeHeaders.cpp	Tue Oct 05 13:50:47 2010 +0530
+++ b/messagingfw/msgsrvnstore/server/src/CMsvMimeHeaders.cpp	Tue Oct 19 11:59:06 2010 +0530
@@ -282,6 +282,7 @@
 EXPORT_C void CMsvMimeHeaders::SetContentDescriptionL(const TDesC8& aContentDescription)
 	{
 	delete iContentDescription;
+	iContentDescription = NULL;
 	iContentDescription = aContentDescription.AllocL();
 	}
 	
@@ -311,6 +312,7 @@
 EXPORT_C void CMsvMimeHeaders::SetContentBaseL(const TDesC8& aContentBase)
 	{
 	delete iContentBase;
+	iContentBase = NULL;
 	iContentBase = aContentBase.AllocL();
 	}
 
@@ -340,6 +342,7 @@
 EXPORT_C void CMsvMimeHeaders::SetContentLocationL(const TDesC16& aContentLocation)
 	{
 	delete iContentLocation;
+	iContentLocation = NULL;
 	iContentLocation = aContentLocation.AllocL();
 	}
 
@@ -369,6 +372,7 @@
 EXPORT_C void CMsvMimeHeaders::SetContentIdL(const TDesC8& aContentId)
 	{
 	delete iContentId;
+	iContentId = NULL;
 	iContentId = aContentId.AllocL();
 	}
 
@@ -399,6 +403,7 @@
 EXPORT_C void CMsvMimeHeaders::SetContentTypeL(const TDesC8& aContentType)
 	{
 	delete iContentType;
+	iContentType = NULL;
 	iContentType = aContentType.AllocL();
 	}
 
@@ -430,6 +435,7 @@
 EXPORT_C void CMsvMimeHeaders::SetContentSubTypeL(const TDesC8& aContentSubType)
 	{
 	delete iContentSubType;
+	iContentSubType = NULL;
 	iContentSubType = aContentSubType.AllocL();
 	}
 
@@ -460,6 +466,7 @@
 EXPORT_C void CMsvMimeHeaders::SetContentDispositionL(const TDesC8& aContentDisposition)
 	{
 	delete iContentDisposition;
+	iContentDisposition = NULL;
 	iContentDisposition = aContentDisposition.AllocL();
 	}
 
@@ -571,6 +578,7 @@
 EXPORT_C void CMsvMimeHeaders::SetSuggestedFilenameL(const TDesC16& aSuggestedFilename)
 	{
 	delete iSuggestedFilename;
+	iSuggestedFilename = NULL;
 	iSuggestedFilename = aSuggestedFilename.AllocL();
 	}
 
@@ -600,6 +608,7 @@
 EXPORT_C void CMsvMimeHeaders::SetRelativePathL(const TDesC8& aRelativePath)
 	{
 	delete iRelativePath;
+	iRelativePath = NULL;
 	iRelativePath = aRelativePath.AllocL();
 	}