diff -r e5b3a2155e1a -r d2c4c66342f3 messagingfw/msgsrvnstore/server/src/msvcacheindextableentry.Cpp
--- a/messagingfw/msgsrvnstore/server/src/msvcacheindextableentry.Cpp	Thu Aug 19 10:24:00 2010 +0300
+++ b/messagingfw/msgsrvnstore/server/src/msvcacheindextableentry.Cpp	Tue Aug 31 15:41:11 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 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"
@@ -192,11 +192,11 @@
 				{
 				if(!aReplace)
 					{
-					CMsvEntryFreePool::Instance()->ReleaseEntry(aEntry);
+					CMsvEntryFreePool::Instance()->ReleaseEntryL(aEntry);
 					aEntry = (*iBlockPtr)[blockIndex];
 					return;
 					}
-				CMsvEntryFreePool::Instance()->ReleaseEntry((*iBlockPtr)[blockIndex]);
+				CMsvEntryFreePool::Instance()->ReleaseEntryL((*iBlockPtr)[blockIndex]);
 				iBlockPtr->Remove(blockIndex);
 				iBlockPtr->Insert(aEntry, blockIndex);
 				return;
@@ -296,9 +296,9 @@
 				{
 				if(aEntries[listCount+aInitIndex]->GetId() == (*iBlockPtr)[blockIndex]->GetId())
 					{
-					CMsvEntryFreePool::Instance()->ReleaseEntry(aEntries[listCount+aInitIndex]);
+					CMsvEntryFreePool::Instance()->ReleaseEntryL(aEntries[listCount+aInitIndex]);
 					aEntries.Remove(listCount+aInitIndex);
-					aEntries.Insert((*iBlockPtr)[blockIndex], listCount+aInitIndex);
+					aEntries.InsertL((*iBlockPtr)[blockIndex], listCount+aInitIndex);
 					entryFound = ETrue;
 					break;
 					}
@@ -433,7 +433,7 @@
 			if(aForceDelete || (*iBlockPtr)[index]->IsEntryLocked())
 				{
 				aParentIdOfEntry = (*iBlockPtr)[index]->Entry().Parent();
-				CMsvEntryFreePool::Instance()->ReleaseEntry((*iBlockPtr)[index]);
+				CMsvEntryFreePool::Instance()->ReleaseEntryL((*iBlockPtr)[index]);
 				iBlockPtr->Remove(index);
 				// 2.1.1. If the entry deleted was the last entry in the block,
 				//        delete the block.
@@ -728,7 +728,7 @@
 	for(TInt index=0; index<blockSize; ++index)
 		{
 		RBuf text;
-		text.Create(150);
+		text.CreateL(150);
 		text.Append(KId);
 		text.AppendNum((*iBlockPtr)[index]->Entry().Id());
 		text.Append(KParentId);