diff -r 011f79704660 -r cdd802add233 emailservices/nmutilities/src/emailmailboxinfo_p.cpp
--- a/emailservices/nmutilities/src/emailmailboxinfo_p.cpp	Fri Jun 11 16:23:29 2010 +0100
+++ b/emailservices/nmutilities/src/emailmailboxinfo_p.cpp	Thu Jul 22 16:30:28 2010 +0100
@@ -15,6 +15,8 @@
  *
  */
 
+#include "emailtrace.h"
+
 #include "emailmailboxinfo_p.h"
 #include "nmutilitiescommonheaders.h"
 #include "nmcenrepkeys.h"
@@ -44,28 +46,23 @@
      private constructor
  */
 EmailMailboxInfoPrivate::EmailMailboxInfoPrivate() :
-    QObject(NULL), 
-	mIsResourceLoaded(false)
+    QObject(NULL)
 {
+    NM_FUNCTION;
+    
     XQSettingsManager manager;
     XQCentralRepositorySettingsKey rccKey(EMAIL_CENREP, RCC_PATH);
 
     XQCentralRepositorySettingsKey wlbKey(EMAIL_CENREP, WLB_BRAND_NAME);
 
-    mWlbDomainName = manager.readItemValue(wlbKey, XQSettingsManager::TypeString).value<QString> ();
-
-    QString pathToRcc =
-        manager.readItemValue(rccKey, XQSettingsManager::TypeString).value<QString> ();
-    if (!mIsResourceLoaded) {
-        mIsResourceLoaded = QResource::registerResource(pathToRcc);
-    }
+    mWlbDomainName = manager.readItemValue(wlbKey, XQSettingsManager::TypeString).value<QString> ();    
 }
 /*!
      private destructor
  */
 EmailMailboxInfoPrivate::~EmailMailboxInfoPrivate()
 {
-
+    NM_FUNCTION;
 }
 
 /*!
@@ -74,6 +71,8 @@
  */
 EmailMailboxInfoPrivate* EmailMailboxInfoPrivate::getInstance()
 {
+    NM_FUNCTION;
+    
     if (!mSelf) {
         mSelf = new EmailMailboxInfoPrivate();
     }
@@ -87,6 +86,8 @@
  */
 void EmailMailboxInfoPrivate::releaseInstance(EmailMailboxInfoPrivate *&instance)
 {
+    NM_FUNCTION;
+    
     if (instance) {
         mReferenceCount--;
         instance = NULL;
@@ -104,6 +105,8 @@
  */
 QString EmailMailboxInfoPrivate::name(const QVariant &identifier)
 {
+    NM_FUNCTION;
+    
     QString returnValue = "";
     QString domainName = "";
     if (identifier.canConvert<QString> ()) {
@@ -127,10 +130,16 @@
  */
 QString EmailMailboxInfoPrivate::icon(const QVariant &identifier)
 {
+    NM_FUNCTION;
+    
     QString returnValue = "";
     QString domainName = "";
     if (identifier.canConvert<QString> ()) {
         domainName = identifier.value<QString> ();
+        int delimIndex = domainName.lastIndexOf('@');
+        if(delimIndex >= 0) {
+            domainName = domainName.mid(delimIndex + 1);
+        }
     }
 
     if (domainName.length() > 0){
@@ -147,6 +156,8 @@
  */
 void EmailMailboxInfoPrivate::processCenRepRecords(const QString &brandingId)
 {
+    NM_FUNCTION;
+    
     bool found = false;
     QString name;
     QString icon;
@@ -198,13 +209,13 @@
 
             if (regExp.exactMatch(brandingId)) { //match
                 found = true;
-                icon = ":/" + cenRepRecord.at(3);
+                icon = "z:/resource/apps/" + cenRepRecord.at(3) + ".svg";
                 name = cenRepRecord.at(2);
                 break;
             }
         }
     }
-    if (!found || !mIsResourceLoaded) {
+    if (!found ) { 
         //get default icon and name
         icon = "qtg_large_email";
         QStringList domain = brandingId.split(".");
@@ -222,6 +233,8 @@
  */
 quint8 EmailMailboxInfoPrivate::getCurrentCountryL() const
 {
+    NM_FUNCTION;
+    
     CTzLocalizer* localizer = CTzLocalizer::NewLC();
 
     CTzLocalizedCity* city = localizer->GetFrequentlyUsedZoneCityL(
@@ -246,6 +259,8 @@
  */
 bool EmailMailboxInfoPrivate::verifyTimeZone() const
 {
+    NM_FUNCTION;
+    
     quint8 timeZone = 0;
     bool retVal = false;
     TRAPD(err, timeZone = getCurrentCountryL());
@@ -262,6 +277,8 @@
  */
 void EmailMailboxInfoPrivate::verifyMailAccountName(QString &brandingName) const
 {
+    NM_FUNCTION;
+    
     QSystemNetworkInfo *networkInfo = new QSystemNetworkInfo();
     QString currentMCC = networkInfo->currentMobileCountryCode();