--- a/emailservices/emailstore/message_store/server/group/MessageStoreServer.mmp	Tue Feb 02 00:02:40 2010 +0200
+++ b/emailservices/emailstore/message_store/server/group/MessageStoreServer.mmp	Fri Apr 16 14:51:52 2010 +0300
@@ -17,8 +17,9 @@
 
 
 #include <platform_paths.hrh>
-
-#include "../../../../../inc/emailversionnumbers.hrh" // KEmailBinaryVersionNumber
+//<qmail>
+//#include "../../../../../inc/emailversionnumbers.hrh" // KEmailBinaryVersionNumber
+//</qmail>
 #include "../../../inc/EmailStoreUids.hrh"
 
 TARGET        MessageStoreServer.dll
@@ -27,8 +28,9 @@
 SECUREID      KUidMessageStoreServer
 VENDORID      VID_DEFAULT
 CAPABILITY    CAP_CLIENT_DLL
-
-VERSION       KEmailBinaryVersionNumber
+//<qmail>
+//VERSION       KEmailBinaryVersionNumber
+//</qmail>
 KEmailBinaryDemandPaging
 
 MACRO DEBUG_USE_PROJECT_LOGGING_OPTIONS
@@ -73,7 +75,7 @@
 SOURCE        ContainerStoreSortingTable.cpp
 SOURCE		  ContainerStoreSearchResultTable.cpp
 SOURCE        MessageStoreEncryptHandler.cpp
-SOURCE        ContainerStoreMRUAddressTable.cpp
+SOURCE        ContainerStoreMruAddressTable.cpp
 SOURCE        MsgStoreInMemorySortRowSet.cpp
 SOURCE        bufferedmessagecreator.cpp
 SOURCE        messagestoreutils.cpp