diff -r e1b6206813b4 -r f5907b1a1053 emailservices/emailserver/cmailhandlerplugin/inc/cmailcpshandler.h
--- a/emailservices/emailserver/cmailhandlerplugin/inc/cmailcpshandler.h	Fri Feb 19 22:37:30 2010 +0200
+++ b/emailservices/emailserver/cmailhandlerplugin/inc/cmailcpshandler.h	Fri Mar 12 15:41:14 2010 +0200
@@ -78,12 +78,6 @@
     void UpdateMailboxesL(TInt aInstance, const TDesC& aContentId);
 
     /**
-     * Updates external (3rd party) account based on contentId
-     * @param aContentId specifies the widget and account related to it
-     */
-    void UpdateExtAccountL( const TDesC& aContentId );
-
-    /**
      *
      */
     void LaunchWidgetSettingsL( const TDesC& aContentId );
@@ -96,7 +90,7 @@
     /**
      *
      */    
-    void LaunchEmailWizardL();
+    void LaunchEmailWizardL( const TDesC& aContentId );
     /**
      * Launches an application based on the given contentId
      * This method is for external (3rd party) accounts
@@ -106,11 +100,6 @@
 
     /**
      *
-     */	
-    TBool AssociateWidgetToSetting( const TDesC& aContentId );
-	
-    /**
-     *
      */		
     void DissociateWidgetFromSettingL( const TDesC& aContentId );    
 
@@ -128,11 +117,6 @@
      * Return total number of 3rd party mailboxes in the system
      */
     TInt TotalExtMailboxCountL();
-
-    /**
-     *
-     */    
-    void ManualAccountSelectionL( const TDesC& aContentId );
     
 	/**
      * Gets correct localised format for time (or date) string
@@ -142,6 +126,16 @@
     // From MEmailObserverListener
     void EmailObserverEvent( EmailInterface::MEmailData& aData );
 
+    /**
+     *
+     */
+    void SetWaitingForNewMailbox( const TDesC& aContentId );
+    
+    /**
+     *
+     */    
+    void CleanWaitingForNewMailbox();
+
 protected:
     /**
      * From CFSNotificationHandlerBase
@@ -228,11 +222,6 @@
 	                           const TInt aFirstRow );
 
     /**
-     * Handles publishing of connection state icon
-     */
-    void UpdateConnectStateL( const TInt aMailBoxNumber, const TInt aRowNumber );       
-
-    /**
      * Handles publishing of mailbox icon
      */
     void UpdateMailBoxIconL( const TInt aMailBoxNumber,
@@ -245,11 +234,6 @@
     void UpdateIndicatorIconL( const TInt aMailBoxNumber, 
                                const TInt aWidgetInstance,
                                const TInt aRowNumber );
-    
-    /**
-     * Handles publishing of empty message time string
-     */
-// void ClearMessageTimeL( const TInt aRowNumber );
 
     // Event handling subroutines
     /**
@@ -287,22 +271,6 @@
     void HandleMailDeletedEventL( TFSMailMsgId aMailbox, TAny* aParam1, TAny* aParam2 );
 
     /**
-     * handles mail changed event
-     * @param aMailbox mailbox id
-     * @param aParam1 contains event specific parameters
-     * @param aParam2 contains event specific parameters
-     */
-    void HandleMailChangedEventL( TFSMailMsgId aMailbox, TAny* aParam1, TAny* aParam2 );
-
-    /**
-     * handles new folder event
-     * @param aMailbox mailbox id
-     * @param aParam1 contains event specific parameters
-     * @param aParam2 contains event specific parameters
-     */
-    void HandleNewFolderEventL( TFSMailMsgId aMailbox, TAny* aParam1, TAny* aParam2 );
-	
-    /**
      * get count of unread messages in inbox
      * @param aMailbox mailbox id
      */    
@@ -366,7 +334,9 @@
      *
      */     
     void PublishMessageL( TInt aWidgetInstance, CFSMailMessage& aMessage,
-                           const TDesC& aSenderName, const TDesC& aTime, TInt aFirstRow);
+                          const TDesC& aSenderName,
+                          const TDesC& aSubject,
+                          const TDesC& aTime, TInt aFirstRow);
    
     /**
      * Checks if the given message is already know/published
@@ -403,8 +373,6 @@
      */
     void SelectAndUpdateExtAccountsL( RPointerArray<CMailExternalAccount>& aAccounts );
     
-    TBool FirstBootL();
-    
     /**
      * Checks whether aAccounts array has entries relating to plugin with id aPluginId
      * @param aPluginId 3rd party plugin identifier (implementation uid)
@@ -438,7 +406,10 @@
     // local cache of mailbox details
     RPointerArray<CMailMailboxDetails> iAccountsArray;
     // array of plugin proxies. One plugin proxy handles one 3rd party plugin and its accounts
-    RPointerArray<CMailPluginProxy> iExternalPlugins;
+    RPointerArray<CMailPluginProxy>    iExternalPlugins;
+    // tells if email wizard is started from widget and it is still running
+    // and to which widget next added account is added.
+    HBufC*                             iWaitingForNewMailbox;
     };
 
 #endif  //__CMAILCPSHANDLER_H__