--- a/emailservices/emailstore/message_store/server/src/ContainerStoreContentManager.cpp	Fri Mar 12 15:41:14 2010 +0200
+++ b/emailservices/emailstore/message_store/server/src/ContainerStoreContentManager.cpp	Mon Mar 15 12:39:10 2010 +0200
@@ -564,19 +564,18 @@
 /**
  *
  */
-TInt CContainerStoreContentManager::TransferContentFile(
+void CContainerStoreContentManager::TransferContentFileL(
     TContainerId aId, 
     const TDesC& aContentPath )
     {
-    __LOG_ENTER( "TransferContentFile" )
+    __LOG_ENTER( "TransferContentFileL" )
     
     TFileName contentFilename;  
     ContentFilename( aId, contentFilename );
     
-    TInt err = iFs.Rename( aContentPath, contentFilename ); 
+    User::LeaveIfError( iFs.Replace( aContentPath, contentFilename ) );
     
     __LOG_EXIT
-    return err;
     }