diff -r 12c456ceeff2 -r 5253a20d2a1e emailservices/emailserver/cmailhandlerplugin/inc/cmailcpshandler.h
--- a/emailservices/emailserver/cmailhandlerplugin/inc/cmailcpshandler.h	Thu Jan 07 12:38:38 2010 +0200
+++ b/emailservices/emailserver/cmailhandlerplugin/inc/cmailcpshandler.h	Mon Jan 18 20:08:26 2010 +0200
@@ -93,13 +93,18 @@
     /**
      *
      */		
-    void DissociateWidgetFromSetting( const TDesC& aContentId );    
+    void DissociateWidgetFromSettingL( const TDesC& aContentId );    
 
     /**
      *
      */     
     TInt GetMailboxCount();    
 
+    /**
+     *
+     */    
+    void ManualAccountSelectionL( const TDesC& aContentId );
+    
 protected:
     /**
      * From CFSNotificationHandlerBase
@@ -327,7 +332,12 @@
      * @return ETrue if duplicate, EFalse if new message
      */
     TBool IsDuplicate( const CMailMailboxDetails& aMailbox, const TFSMailMsgId& aMsgId );
-
+    
+    /**
+     *
+     */
+    TBool FirstBootL();
+    
 private: // data
     CEikonEnv* iEnv;
     // pointer to liw wrapper that handles actual publishing