--- a/emailservices/emailstore/base_plugin/inc/BasePlugin.h	Wed Sep 15 17:47:19 2010 +0300
+++ b/emailservices/emailstore/base_plugin/inc/BasePlugin.h	Thu Sep 30 11:43:07 2010 +0300
@@ -462,6 +462,9 @@
          virtual void SetMailboxName(
             const TFSMailMsgId& /*aMailboxId*/,
             const TDesC& /*aMailboxName*/ );
+        // <qmail>
+        virtual TUid Id( ) const;
+        // </qmail>
 
     // MMsgStoreObserver //
     public:
@@ -496,9 +499,9 @@
         void GetMailboxDisplayNameL(
             TMsgStoreId aId,
             RBuf& aDisplayName );
-
-         virtual TUint GetPluginId();
-
+         // <qmail>
+         virtual TUint GetPluginId() const;
+         // </qmail>
         /**
          * Get signature string from protocol specific subclass.
          * Caller is responsible for memory of returned string.