--- a/emailservices/emailframework/src/CFSMailBrand.cpp	Fri Apr 16 14:51:52 2010 +0300
+++ b/emailservices/emailframework/src/CFSMailBrand.cpp	Mon May 03 12:23:15 2010 +0300
@@ -15,19 +15,29 @@
 *
 */
 
+//<qmail>
+#include <nmcommonheaders.h>
+//</qmail>
 
-#include <nmcommonheaders.h>
 #include "emailtrace.h"
 #include <barsread.h>
+//<qmail> Commented out in Qmail
+//#include <AknIconUtils.h>
+//</qmail>
 #include <gulicon.h>
 #include <centralrepository.h>
 //<cmail>
+//<qmail> Commented out in Qmail
 //#include "freestyleemailcenrepkeys.h"
+//</qmail>
 //</cmail>
 
 #include "CFSMailBrand.h"
 
 const TInt KElementArrayGranularity = 5;
+//<qmail> Commented out in Qmail
+//const TInt KMaxStringLenFromCenrep = 256;
+//</qmail>
 const TInt KMaxDesLen = 256;
 _LIT(KSpace, " ");
 // -----------------------------------------------------------------------------
@@ -66,9 +76,9 @@
 // -----------------------------------------------------------------------------
 void CFSMailBrand::ConstructFromCenrepL( )
     {
-    /*
     FUNC_LOG;
     
+	/*
     TBuf<KMaxStringLenFromCenrep> tBuf; // Temporary buffer
     HBufC*    mailboxName;
 
@@ -126,7 +136,7 @@
         CleanupStack::PopAndDestroy( mailboxName );
         CleanupStack::PopAndDestroy( repository );
         }
-        */
+		*/
    }
 
 // -----------------------------------------------------------------------------
@@ -304,9 +314,15 @@
 		 	TParse parse;
 		    User::LeaveIfError( parse.Set( *iIconFilePath, &dllFileName, NULL) );
 		    TFileName iconFileName( parse.FullName() );
-                
+             
+//<qmail>
             // Get icon and mask with above info
-		    
+            /*AknIconUtils::CreateIconLC( icon,
+                                        mask,
+                                        iconFileName,
+                                        element.iIconId,
+                                        element.iMaskId );*/
+//</qmail>
             CGulIcon* gulIcon = CGulIcon::NewL( icon, mask );
 
             CleanupStack::Pop( 2 ); // icon, mask