--- a/emailservices/emailstore/base_plugin/group/BasePlugin.mmp	Thu Aug 19 09:38:05 2010 +0300
+++ b/emailservices/emailstore/base_plugin/group/BasePlugin.mmp	Tue Aug 31 15:04:17 2010 +0300
@@ -19,9 +19,12 @@
 
 #include <platform_paths.hrh>
 
-#include "../../../../inc/emailversionnumbers.hrh" // KEmailBinaryVersionNumber
+//<qmail>
+// Removed from 10.1
+//#include "../../../../inc/emailversionnumbers.hrh" // KEmailBinaryVersionNumber
+//</qmail>
 #include "../../../../inc/emailtraceconfig.hrh"
-#include "../../inc/emailstoreuids.hrh"
+#include "../../inc/EmailStoreUids.hrh"
 
 TARGET            baseplugin.dll
 TARGETTYPE        dll
@@ -29,7 +32,10 @@
 CAPABILITY        CAP_GENERAL_DLL
 VENDORID          VID_DEFAULT
 
-VERSION           KEmailBinaryVersionNumber
+//<qmail>
+// Removed from 10.1
+//VERSION           KEmailBinaryVersionNumber
+//</qmail>
 KEmailBinaryDemandPaging
 
 
@@ -46,6 +52,7 @@
 USERINCLUDE ../inc
 
 USERINCLUDE ../../../../inc
+SYSTEMINCLUDE /epoc32/include/ecom
 
 APP_LAYER_SYSTEMINCLUDE
 
@@ -61,7 +68,7 @@
 SOURCE basepluginfetch.cpp
 SOURCE baseplugindelayedops.cpp
 SOURCE basepluginresourceloader.cpp
-
+SOURCE nestedao.cpp
 
 // *************************************
 // OTHER STUFF