--- a/emailservices/emailstore/message_store/client/group/MessageStoreClient.mmp	Tue Aug 31 15:04:17 2010 +0300
+++ b/emailservices/emailstore/message_store/client/group/MessageStoreClient.mmp	Wed Sep 01 12:28:57 2010 +0100
@@ -17,10 +17,9 @@
 
 
 #include <platform_paths.hrh>
-//<qmail>
-//#include "../../../../../inc/emailversionnumbers.hrh" // KEmailBinaryVersionNumber
-//</qmail>
-#include "../../../inc/EmailStoreUids.hrh"
+
+#include "../../../../../inc/emailversionnumbers.hrh" // KEmailBinaryVersionNumber
+#include "../../../inc/emailstoreuids.hrh"
 
 TARGET        MessageStoreClient.dll
 TARGETTYPE    dll
@@ -29,9 +28,7 @@
 CAPABILITY    CAP_CLIENT_DLL
 VENDORID      VID_DEFAULT
 
-//<qmail>
-//VERSION       KEmailBinaryVersionNumber
-//</qmail>
+VERSION       KEmailBinaryVersionNumber
 KEmailBinaryDemandPaging
 
 MACRO DEBUG_USE_PROJECT_LOGGING_OPTIONS
@@ -45,7 +42,7 @@
 USERINCLUDE   ../../../inc
 USERINCLUDE   ../../common/inc
 
-// TEMPORARY MOVED STUFF FROM IsMsgStorePropertyKeys.h USED BY MSGSTORE TO MsgStorePropertyKeys.h
+// TEMPORARY MOVED STUFF FROM IsMsgStorePropertyKeys.h USED BY MSGSTORE TO msgstorepropertykeys.h
 //because of the IsMsgStorePropertyKeys.h there is now dependency and I'd rather keep it in its
 //original location because of the merges and the fact that it logically belongs there.
 //USERINCLUDE   ../../../../Intellisyncengine/client_symbian_s60_freestyle/sync/inc