--- a/emailservices/emailserver/cmailhandlerplugin/src/cmailcpsif.cpp	Thu Jan 07 12:38:38 2010 +0200
+++ b/emailservices/emailserver/cmailhandlerplugin/src/cmailcpsif.cpp	Mon Jan 18 20:08:26 2010 +0200
@@ -768,11 +768,8 @@
                              else
                                  {
                                  iInstIdList.AppendL( contentid.AllocL() );
+                                 iMailCpsHandler->ManualAccountSelectionL(cid->Des());                                 
                                  }
-/*                             if (!alreadyAssociated)
-                                {
-                                iMailCpsHandler->LaunchWidgetSettingsL(cid->Des());
-                                }*/
                              CleanupStack::PopAndDestroy( cid );
                              }
                          else if (trigger.Compare(KDeActive16) == 0)
@@ -782,7 +779,7 @@
                              TInt widgetInstance = FindWidgetInstanceId(cid->Des());                            
                              if (!iInactive[widgetInstance])
                                  {
-                                 iMailCpsHandler->DissociateWidgetFromSetting( cid->Des() );                                 
+                                 iMailCpsHandler->DissociateWidgetFromSettingL( cid->Des() );                                 
                                  iInstIdList.Remove(widgetInstance);                                 
                                  }
                              iAllowedToPublish[widgetInstance] = EFalse;
@@ -800,7 +797,7 @@
                              // If no accounts are created launch email wizard
                              // otherwice launch widget settings app                             
                              if (iMailCpsHandler->GetMailboxCount())
-                                 {                                
+                                 {
                                  HBufC* cid = contentid.AllocLC();
                                  iMailCpsHandler->LaunchWidgetSettingsL(cid->Des());
                                  CleanupStack::PopAndDestroy( cid );