--- a/email/email/smtp/src/Local_imcvrecv.cpp	Fri Mar 05 09:11:09 2010 +0000
+++ b/email/email/smtp/src/Local_imcvrecv.cpp	Fri Mar 05 11:15:10 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
@@ -13,8 +13,6 @@
 // Description:
 //
 
-
-
 /**
  @file
 */
@@ -36,7 +34,7 @@
 #include <pop3set.h>	// For including KUidMsgTypePOP3
 #include <barsread.h>	// TResourceReader
 
-#include <cmsvbodytext.h>
+#include "cmsvbodytext.h"
 
 #ifdef __WINS__
 #include <e32wins.h>    // for maxfilename lengths
@@ -1660,7 +1658,7 @@
 	if (addExtension)
 		AddFileExtension();
 
-	CMsvStore* store = iServerEntry->EditStoreL(); 
+	CMsvStore* store = iServerEntry->EditStoreL();	
 	CleanupStack::PushL(store);
 	CMsvAttachment* attachment = CMsvAttachment::NewL(CMsvAttachment::EMsvFile);
 	RFile file; 
@@ -1748,7 +1746,8 @@
 			RECVLOG(KDeletingAttachFile)
 			{ 
 			// NOTE - need the braces to stop error for re-definition of store
-			CMsvStore* store = iServerEntry->EditStoreL(); 
+
+			CMsvStore* store = iServerEntry->EditStoreL();	
 			CleanupStack::PushL(store);
 		
 			// Remove the attachment and commit the store.	
@@ -1784,7 +1783,7 @@
 			RECVLOG(KDeletingAttachFile)
 			{ 
 			// NOTE - need the braces to stop error for re-definition of store
-			CMsvStore* store = iServerEntry->EditStoreL(); 
+			CMsvStore* store = iServerEntry->EditStoreL();	
 			CleanupStack::PushL(store);
 		
 			// Remove the attachment and commit the store.	
@@ -2251,8 +2250,7 @@
 		{
 		CMsvStore* entryStore = NULL;
 		TBool commitStore = EFalse;
-
-		TRAPD(error, entryStore = iServerEntry->EditStoreL());
+		TRAPD(error, entryStore = iServerEntry->EditStoreL());	
 		if(error==KErrNone) // if store does not exist then the entry is the wrong type
 			{
 			CleanupStack::PushL(entryStore);
@@ -2274,9 +2272,9 @@
 				}
 
 			StoreEntryDataL();
-			CleanupStack::PopAndDestroy(); //entryStore		
+			CleanupStack::PopAndDestroy(); //entryStore	
 			}
-
+		
 		}
 	RECVLOG(KDoneStoringEntryStream);
 	}
@@ -2506,7 +2504,8 @@
 				iOutputBody->InsertL(length,*msg);
 				CleanupStack::PopAndDestroy(msg);
 				store=NULL;
-				store = iServerEntry->EditStoreL();
+				store = iServerEntry->EditStoreL();	
+				
 				CleanupStack::PushL(store);
 				store->StoreBodyTextL(*iOutputBody);
 				store->Commit();
@@ -4018,3 +4017,4 @@
 		return iServerEntry->Entry().Id();
 		}
 	}
+