--- a/emailuis/widget/emailwidgetsettings/src/emailwidgetsettingsmailboxes.cpp	Thu Dec 17 08:39:21 2009 +0200
+++ b/emailuis/widget/emailwidgetsettings/src/emailwidgetsettingsmailboxes.cpp	Thu Jan 07 12:38:38 2010 +0200
@@ -110,12 +110,38 @@
 
     TDesC& mailboxName( mailBoxes[aNum]->GetName() );
 
+    TBuf<3>iconIndex;
+    iconIndex.AppendNum(aNum+1);
+    
+    aMailboxName.Append(iconIndex);
     aMailboxName.Append(_L("\t"));
     aMailboxName.Append(mailboxName);
     aMailboxName.Append(_L("\t"));
     aMailboxName.Append(_L("\t"));    
        
-    // Release allocated memory
+    mailBoxes.ResetAndDestroy();
+    }
+
+// ---------------------------------------------------------------------------
+// CEmailWidgetSettingsMailboxes::GetDomainL
+// ---------------------------------------------------------------------------
+//
+void CEmailWidgetSettingsMailboxes::GetDomainL(TInt aNum, TDes& aDomain)
+    {
+    FUNC_LOG;
+    // Mailboxes will be fetched to this array
+    RPointerArray<CFSMailBox> mailBoxes;
+
+    // List all mailboxes
+    TFSMailMsgId plugin;
+    iMailClient->ListMailBoxes( plugin, mailBoxes );
+
+    CFSMailAddress& ownMailAddress( mailBoxes[aNum]->OwnMailAddress( ) );
+    TDesC& mailAddress( ownMailAddress.GetEmailAddress());
+
+    aDomain.Append(mailAddress.Right(mailAddress.Length() - 
+                                     mailAddress.FindC(_L("@"))-1));
+
     mailBoxes.ResetAndDestroy();
     }