--- a/emailservices/emailserver/cmailhandlerplugin/inc/cmailcpssettings.h	Fri Feb 19 22:37:30 2010 +0200
+++ b/emailservices/emailserver/cmailhandlerplugin/inc/cmailcpssettings.h	Fri Mar 12 15:41:14 2010 +0200
@@ -124,7 +124,8 @@
      * 
      * @return
      */
-    TBool AssociateWidgetToSetting( const TDesC& aContentId );
+    void AssociateWidgetToSetting( const TDesC& aContentId,
+                                   const TFSMailMsgId aMailbox  );
 
     /**
      * 
@@ -256,16 +257,14 @@
     void GetExtMailboxNonZeroKeysL( RArray<TUint32>& aKeys );
 
     /**
-     * 
-     * @param aContentId
+     * Find next free CenRep key to store setting.
+     * @param aContentId Id of widget instance
+     */	
+    TInt GetSettingToAssociate( const TDesC& aContentId );
+
+    /**
+     * @param aKey
      */
-    TBool IsAlreadyAssociated( const TDesC& aContentId );
-	
-    /**
-     * 
-     */	
-    TUint32 GetSettingToAssociate();
-    
     CMailExternalAccount* GetExtMailboxL( TInt aKey );
     
 private: // data