--- a/emailservices/emailstore/preinstall/group/EmailStorePreInstall.mmp	Tue Aug 31 15:04:17 2010 +0300
+++ b/emailservices/emailstore/preinstall/group/EmailStorePreInstall.mmp	Wed Sep 01 12:28:57 2010 +0100
@@ -17,10 +17,9 @@
 
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh> //needed for APP_LAYER_SYSTEMINCLUDE
-//<qmail>
-//#include "../../../../inc/emailversionnumbers.hrh" // KEmailBinaryVersionNumber
-//</qmail>
-#include "../../inc/EmailStoreUids.hrh"
+
+#include "../../../../inc/emailversionnumbers.hrh" // KEmailBinaryVersionNumber
+#include "../../inc/emailstoreuids.hrh"
 
 TARGET          EmailStorePreInstall.exe
 TARGETTYPE      exe
@@ -29,9 +28,8 @@
 CAPABILITY      WriteUserData ReadDeviceData WriteDeviceData PowerMgmt
 
 VENDORID        VID_DEFAULT
-//<qmail>
-//VERSION         KEmailBinaryVersionNumber
-//</qmail>
+
+VERSION         KEmailBinaryVersionNumber
 KEmailBinaryDemandPaging
 
 EPOCPROCESSPRIORITY background
@@ -43,16 +41,17 @@
 MACRO DEBUG_LOG_OPTION_ERRORS
 MACRO DEBUG_LOG_OPTION_INFO
 
-SOURCEPATH		../src
+SOURCEPATH      ../src
 SOURCE          EmailStorePreInstall.cpp ProcessTimer.cpp
 
 USERINCLUDE     ../inc
 USERINCLUDE     ../../inc
+USERINCLUDE     ../../../../inc   
+
 
 APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   ../../../../inc   
 
-LIBRARY   		euser.lib 
+LIBRARY         euser.lib 
 LIBRARY         efsrv.lib
 LIBRARY         ws32.lib
 LIBRARY         apparc.lib      //TApaAppInfo