--- a/emailservices/emailframework/src/CFSMailBrand.cpp	Tue Feb 02 00:02:40 2010 +0200
+++ b/emailservices/emailframework/src/CFSMailBrand.cpp	Fri Apr 16 14:51:52 2010 +0300
@@ -16,19 +16,18 @@
 */
 
 
+#include <nmcommonheaders.h>
 #include "emailtrace.h"
 #include <barsread.h>
-#include <AknIconUtils.h>
 #include <gulicon.h>
 #include <centralrepository.h>
 //<cmail>
-#include "FreestyleEmailCenRepKeys.h"
+//#include "freestyleemailcenrepkeys.h"
 //</cmail>
 
 #include "CFSMailBrand.h"
 
 const TInt KElementArrayGranularity = 5;
-const TInt KMaxStringLenFromCenrep = 256;
 const TInt KMaxDesLen = 256;
 _LIT(KSpace, " ");
 // -----------------------------------------------------------------------------
@@ -67,6 +66,7 @@
 // -----------------------------------------------------------------------------
 void CFSMailBrand::ConstructFromCenrepL( )
     {
+    /*
     FUNC_LOG;
     
     TBuf<KMaxStringLenFromCenrep> tBuf; // Temporary buffer
@@ -126,6 +126,7 @@
         CleanupStack::PopAndDestroy( mailboxName );
         CleanupStack::PopAndDestroy( repository );
         }
+        */
    }
 
 // -----------------------------------------------------------------------------
@@ -304,12 +305,8 @@
 		    User::LeaveIfError( parse.Set( *iIconFilePath, &dllFileName, NULL) );
 		    TFileName iconFileName( parse.FullName() );
                 
-                
-            AknIconUtils::CreateIconLC( icon,
-                                        mask,
-                                        iconFileName,
-                                        element.iIconId,
-                                        element.iMaskId );
+            // Get icon and mask with above info
+		    
             CGulIcon* gulIcon = CGulIcon::NewL( icon, mask );
 
             CleanupStack::Pop( 2 ); // icon, mask