diff -r 502e5d91ad42 -r 15e4dd19031c idlefw/plugins/mcsplugin/settings/inc/mcspluginsettingsmodel.h
--- a/idlefw/plugins/mcsplugin/settings/inc/mcspluginsettingsmodel.h	Mon Mar 15 12:41:53 2010 +0200
+++ b/idlefw/plugins/mcsplugin/settings/inc/mcspluginsettingsmodel.h	Wed Mar 31 22:04:35 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009 - 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"
@@ -22,18 +22,16 @@
 // External includes
 #include <e32base.h>
 #include <bamdesca.h>               // For MDesCArray
-#include <badesca.h>
 #include <hspluginsettings.h>
 #include <propertymap.h>
 
-// Internal includes
-#include "mcspluginsettingsapplist.h"
-#include "mcspluginsettingsbkmlist.h"
-
 // Forward declaration
 class CCoeEnv;
+class CMenuItem;
+class CMCSPluginSettingsAppList;
+class CMCSPluginSettingsBkmList;
+class CMCSPluginSettings;
 class CMCSPluginSettingsContainer;
-class CMCSPluginSettings;
 class HSPluginSettingsIf::CItemMap;
 
 /**
@@ -42,7 +40,8 @@
 enum TSettingType
     {
     EApplication,
-    EBookmark
+    EBookmark,
+    EMailbox
     };
 
 /**
@@ -165,14 +164,12 @@
      * 
      * @param aPluginId
      */
-    void UpdateSettingsContainerL( const TDesC8& aPluginId );
-
+    void SetPluginIdL( const TDesC8& aPluginId );
+    
     /**
-       * Update settings model
-       * 
-       * @param aPluginId
-       */
-    void UpdateSettingModelL( const TDesC8& aPluginId );
+     * Read settings from HSPS and update settings list
+     */
+    void UpdateSettingsL();
 
 private:
 
@@ -190,7 +187,7 @@
     void ConstructL();
 
     /**
-     * ListBoxLineL
+     * ListBoxLine for list
      * 
      * @param aCaption
      * @param aIndex
@@ -199,7 +196,7 @@
     TPtrC ListBoxLineL( const TDesC& aCaption, TInt aIndex ) const;
 
     /**
-     * ItemL
+     * Returns setting item based on properties.
      * 
      * @param aProperties
      * @return TSettingItem
@@ -225,15 +222,10 @@
     TBool SettingLockedL( 
         RPointerArray<HSPluginSettingsIf::CPropertyMap>& aProperties );
 
-    /**
-     * Update settings
-     * 
-     * @param aPluginId
-     */
-    void UpdateSettingsL( const TDesC8& aPluginId );
+    
 
     /**
-     * Save settings
+     * Save settings into HSPS
      * 
      * @param aIndex
      * @param aMenuItem
@@ -248,13 +240,20 @@
      */
     RArray<TSettingItem> iSettings;
 
-    // Homescreen settings API. NOT OWNED!
+    /**
+    * Homescreen settings API. Not owned.
+    */
     HSPluginSettingsIf::CHomescreenSettings* iPluginSettings;
 
+    /**
+     * HSPS settings id.
+     */
     HBufC8* iPluginId;
 
-    // Stores the text which is drawn by listbox
-    // Listbox takes only reference
+    /**
+     * Stores the text which is drawn by listbox
+     * Listbox takes only reference, own.
+     */
     mutable HBufC* iListBoxLine;
 
     /**