diff -r 8592a65ad3fb -r b13141f05c3d emailservices/emailserver/cmailhandlerplugin/inc/cmailcpssettings.h
--- a/emailservices/emailserver/cmailhandlerplugin/inc/cmailcpssettings.h	Wed Apr 14 15:42:15 2010 +0300
+++ b/emailservices/emailserver/cmailhandlerplugin/inc/cmailcpssettings.h	Tue Apr 27 16:20:14 2010 +0300
@@ -83,6 +83,7 @@
      * Gets array of external mailboxes from widget settings
      * @param aAccounts on completion, contains the necessary information of
      * external mailboxes that currently should have a widget
+     * transfers ownership of accounts to caller
      */
     void GetExtMailboxesL( RPointerArray<CMailExternalAccount>& aAccounts );
 
@@ -132,6 +133,11 @@
     
     /**
      * 
+     */    
+    TInt WidgetCountByMailbox( TInt aMailboxId );
+    
+    /**
+     * 
      */	
 	TBool IsSelected( TInt aId );
 	
@@ -180,7 +186,7 @@
     /**
      *
      */    
-    TBool GetNewMailState( const TFSMailMsgId& aMailBox );
+    TBool GetNewMailStateL( const TFSMailMsgId& aMailBox, TInt aUnreadCount );
 
     /**
      * Find next free CenRep key to store setting.
@@ -244,6 +250,15 @@
     TInt ResolveMailbox( const TInt aMailboxId, TFSMailMsgId& aMsg ); 
 
     /**
+     * Finds mailbox if plugin id is set - more efficient than Resolve mailbox
+     * 
+     * @param aMsg      mailbox both PluginId and Id is checked
+     * @return KErrNone if mailbox exists  
+     * @return KErrNotFound aMsg.Id() points to non-existent mailbox
+     **/
+    TInt CheckMailboxExistence( TFSMailMsgId& aMsg );
+
+    /**
      * Gets array of CenRep keys representing mailboxes configured to widget
      * @param aKeys array of keys
      */
@@ -263,6 +278,7 @@
     TInt GetSettingToAssociate( const TDesC& aContentId );
 
     /**
+     * Returns CMailExternalAccount::NewL() according to cenrep key aKey
      * @param aKey
      */
     CMailExternalAccount* GetExtMailboxL( TInt aKey );