diff -r dcf0eedfc1a3 -r d189ee25cf9d emailservices/emailclientapi/inc/emailmailbox.h
--- a/emailservices/emailclientapi/inc/emailmailbox.h	Thu Aug 19 09:38:05 2010 +0300
+++ b/emailservices/emailclientapi/inc/emailmailbox.h	Tue Aug 31 15:04:17 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -18,10 +18,10 @@
 #ifndef EMAILMAILBOX_H
 #define EMAILMAILBOX_H
 
-#include "cfsmailcommon.h"
+#include "CFSMailCommon.h"
 #include <memailmailbox.h>
-#include "mfsmaileventobserver.h"
-#include "mfsmailrequestobserver.h"
+#include "MFSMailEventObserver.h"
+#include "MFSMailRequestObserver.h"
 #include "mmailboxcontentobserver.h"
 
 using namespace EmailInterface;
@@ -45,62 +45,62 @@
     ~CEmailMailbox();           
 
 public: // from MEmailInterface
-    virtual TEmailTypeId InterfaceId() const;
+    TEmailTypeId InterfaceId() const;
     
-    virtual void Release();
+    void Release();
     
 public:    // from MEmailMailbox
     /**@see MEmailMailbox */
-    virtual TMailboxId MailboxId() const;
+    TMailboxId MailboxId() const;
     
     /**@see MEmailMailbox */
-    virtual MEmailAddress* AddressL() const;
+    MEmailAddress* AddressL() const;
     
     /**@see MEmailMailbox */
-    virtual TPtrC MailboxName() const;
+    TPtrC MailboxName() const;
     
     /**@see MEmailMailbox */
-    virtual  TInt GetFoldersL( RFolderArray& aFolders ) const;
+    TInt GetFoldersL( RFolderArray& aFolders ) const;
 
     /**@see MEmailMailbox */
-    virtual MEmailFolder* FolderL( const TFolderId& aFolderId ) const;
+    MEmailFolder* FolderL( const TFolderId& aFolderId ) const;
     
     /**@see MEmailMailbox */
-    virtual MEmailFolder* FolderByTypeL( 
+    MEmailFolder* FolderByTypeL( 
         const TFolderType aFolderType ) const;
         
     /**@see MEmailMailbox */
-    virtual MEmailMessage* MessageL( const TMessageId& aMessageId );
+    MEmailMessage* MessageL( const TMessageId& aMessageId );
     
     /**@see MEmailMailbox */
-    virtual MEmailMessage* CreateDraftMessageL() const;
+    MEmailMessage* CreateDraftMessageL() const;
     
     /**@see MEmailMailbox */
-    virtual MEmailMessage* CreateReplyMessageL( const TMessageId& aMessageId, const TBool aReplyToAll = ETrue ) const;
+    MEmailMessage* CreateReplyMessageL( const TMessageId& aMessageId, const TBool aReplyToAll = ETrue ) const;
     
     /**@see MEmailMailbox */
-    virtual MEmailMessage* CreateForwardMessageL( const TMessageId& aMessageId ) const;
+    MEmailMessage* CreateForwardMessageL( const TMessageId& aMessageId ) const;
     
     /**@see MEmailMailbox */
-    virtual void SynchroniseL( MMailboxSyncObserver& aObserver );
+    void SynchroniseL( MMailboxSyncObserver& aObserver );
         
     /**@see MEmailMailbox */
-    virtual void CancelSynchronise();
+    void CancelSynchronise();
     
     /**@see MEmailMailbox */
-    virtual void RegisterObserverL( MMailboxContentObserver& aObserver );
+    void RegisterObserverL( MMailboxContentObserver& aObserver );
         
     /**@see MEmailMailbox */
-    virtual void UnregisterObserver( MMailboxContentObserver& aObserver );
+    void UnregisterObserver( MMailboxContentObserver& aObserver );
     
     /**@see MEmailMailbox */
-    virtual MEmailMessageSearchAsync* MessageSearchL();
+    MEmailMessageSearchAsync* MessageSearchL();
 
     /**@see MEmailMailbox */
-    virtual void ShowInboxL();
+    void ShowInboxL();
 
     /**@see MEmailMailbox */
-    virtual void EditNewMessageL();
+    void EditNewMessageL();
     
 
 public: // new methods
@@ -122,27 +122,26 @@
         void AddObserverL( MMailboxContentObserver& aObserver );
         void RemoveObserver( MMailboxContentObserver& aObserver );
     public: // from MFSMailEventObserver
-        virtual void EventL(TFSMailEvent aEvent, TFSMailMsgId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
-        typedef void (CEmailMailbox::TObserverEventMapper::*TEventMapFunc)( TMailboxId, TAny*, TAny*, TAny* );
+        virtual void EventL( TFSMailEvent aEvent, TFSMailMsgId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
+        typedef void ( CEmailMailbox::TObserverEventMapper::*TEventMapFunc)( TMailboxId, TAny*, TAny*, TAny* );
     private: // mappers, so say we all!
         void ConvertParamsL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, REmailMessageIdArray& aMessageIds, TFolderId& aFolderId );
-        void IgnoreEventL( TMailboxId     aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
-        void NewMessageL( TMailboxId     aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
-        void MessageChangedL( TMailboxId     aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
-        void MessageDeletedL( TMailboxId     aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
-        void MessageMoved( TMailboxId     aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
-        void MessageCopiedL( TMailboxId     aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
-        void NewFolderL( TMailboxId     aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
-        void FolderChangeL( TMailboxId     aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
-        void FoldersDeletedL( TMailboxId     aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
-        void FoldersMovedL( TMailboxId     aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
-        void ExceptionL( TMailboxId     aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
+        void IgnoreEventL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
+        void NewMessageL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
+        void MessageChangedL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
+        void MessageDeletedL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
+        void MessageMoved( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
+        void MessageCopiedL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
+        void NewFolderL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
+        void FolderChangeL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
+        void FoldersDeletedL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
+        void FoldersMovedL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
+        void ExceptionL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
     
     private:                                                                                                                         
         static TBool Equals( const MMailboxContentObserver& a1, const MMailboxContentObserver& a2 );
     private:
         CFSMailPlugin*  iPlugin;
-        //const TUid      iUid;
         TFSMailMsgId    iFsMailboxId;
         RPointerArray<MMailboxContentObserver> iClientObservers;
     };
@@ -152,7 +151,7 @@
     public:
         CEmailRequestObserver();
         
-        virtual void RequestResponseL( TFSProgress aEvent, TInt aRequestId );
+        void RequestResponseL( TFSProgress aEvent, TInt aRequestId );
         void SetObserverL( MMailboxSyncObserver* aObserver );
     private:
         MMailboxSyncObserver* iObserver;