diff -r d189ee25cf9d -r 3533d4323edc emailservices/emailframework/src/CFSMailBrandManagerImpl.cpp
--- a/emailservices/emailframework/src/CFSMailBrandManagerImpl.cpp	Tue Aug 31 15:04:17 2010 +0300
+++ b/emailservices/emailframework/src/CFSMailBrandManagerImpl.cpp	Wed Sep 01 12:28:57 2010 +0100
@@ -15,12 +15,8 @@
 *
 */
 
+
 #include "emailtrace.h"
-
-//<qmail>
-#include <nmcommonheaders.h>
-//</qmail>
-
 #include <fsmailbrandmanager.rsg>
 #include <barsread.h>
 #include <bautils.h>
@@ -33,11 +29,11 @@
 #include <centralrepository.h>
 // </gmail_brand_issue>
 //<cmail>
-#include "CFSMailClient.h"
+#include "cfsmailclient.h"
 //</cmail>
 
-#include "CFSMailBrandManagerImpl.h"
-#include "CFSMailBrand.h"
+#include "cfsmailbrandmanagerimpl.h"
+#include "cfsmailbrand.h"
 
 
 const TInt KBrandArrayGranularity = 5;
@@ -62,8 +58,6 @@
 #ifdef __WINS__
 LOCAL_C void RetrieveNextToken( TDes8& aContent, TDes& aToken )	
 	{
-    NM_FUNCTION;
-    
 	_LIT8( KComma, "," );
 	TInt pos = aContent.Find( KComma );
 	if ( pos != KErrNotFound ) 
@@ -83,7 +77,8 @@
     CFSMailClient& aMailClient ) :
     iMailClient( aMailClient )
 	{
-    NM_FUNCTION;
+    FUNC_LOG;
+
 	}
 
 // -----------------------------------------------------------------------------
@@ -91,7 +86,7 @@
 // -----------------------------------------------------------------------------
 void CFSMailBrandManagerImpl::ConstructL()
     {
-    NM_FUNCTION;
+    FUNC_LOG;
 
     // Read resource file, get the drive letter according to the DLL drive
     TFileName dllFileName;
@@ -128,7 +123,7 @@
 // -----------------------------------------------------------------------------
 CFSMailBrandManagerImpl::~CFSMailBrandManagerImpl()
 	{
-    NM_FUNCTION;
+    FUNC_LOG;
 	
 	iResourceFile.Close();
     iFsSession.Close();
@@ -146,8 +141,7 @@
 CFSMailBrandManagerImpl* CFSMailBrandManagerImpl::NewL(
     CFSMailClient& aMailClient )
     {
-    NM_FUNCTION;
-    
+    FUNC_LOG;
     CFSMailBrandManagerImpl* self =
         CFSMailBrandManagerImpl::NewLC( aMailClient );
     CleanupStack::Pop( self );
@@ -160,8 +154,7 @@
 CFSMailBrandManagerImpl* CFSMailBrandManagerImpl::NewLC(
     CFSMailClient& aMailClient )
     {
-    NM_FUNCTION;
-    
+    FUNC_LOG;
     CFSMailBrandManagerImpl* self =
         new( ELeave ) CFSMailBrandManagerImpl( aMailClient );
     CleanupStack::PushL( self );
@@ -174,7 +167,7 @@
 // -----------------------------------------------------------------------------
 void CFSMailBrandManagerImpl::UpdateMailboxNamesL( const TFSMailMsgId aMailBoxId )
     {
-    NM_FUNCTION;
+    FUNC_LOG;
     
     // list all mailboxes
     RPointerArray<CFSMailBox> mailBoxes;
@@ -224,8 +217,7 @@
     TFSBrandElement aElement, 
 	const TFSMailMsgId& aMailboxId )
 	{
-    NM_FUNCTION;
-    
+    FUNC_LOG;
 	CFSMailBox* mailBox( NULL );
 	TRAPD( mailboxError,
 	       mailBox = iMailClient.GetMailBoxByUidL( aMailboxId ) );
@@ -255,8 +247,7 @@
     TFSBrandElement aElement, 
     const TDesC& aBrandId )
     {
-    NM_FUNCTION;
-    
+    FUNC_LOG;
     CFSMailBrand* brand = FindMatchingBrandL( aBrandId );
     if ( brand == NULL )
         {
@@ -273,8 +264,7 @@
 	const TFSMailMsgId& aMailboxId,
     TDes& aIconIds  )
 	{
-    NM_FUNCTION;
-    
+    FUNC_LOG;
 	CFSMailBox* mailBox( NULL );
 	TRAPD( mailboxError,
 	       mailBox = iMailClient.GetMailBoxByUidL( aMailboxId ) );
@@ -305,7 +295,7 @@
     const TDesC& aBrandId,
     TDes& aIconIds  )
     {
-    NM_FUNCTION;
+    FUNC_LOG;
 
     CFSMailBrand* brand = FindMatchingBrandL( aBrandId );
     if ( brand == NULL )
@@ -322,8 +312,7 @@
     TFSBrandElement aElement,
     const TFSMailMsgId& aMailboxId )
 	{
-    NM_FUNCTION;
-    
+    FUNC_LOG;
 	CFSMailBox* mailBox( NULL );
 	TRAPD( mailboxError,
 	       mailBox = iMailClient.GetMailBoxByUidL( aMailboxId ) );
@@ -353,7 +342,7 @@
 	TFSBrandElement aElement,
 	const TDesC& aBrandId )
 	{
-    NM_FUNCTION;
+    FUNC_LOG;
 
 	CFSMailBrand* brand = FindMatchingBrandL( aBrandId );
 	if ( brand == NULL )
@@ -372,8 +361,7 @@
     const TFSMailMsgId& aMailboxId,
     TRgb& aColor )
 	{
-    NM_FUNCTION;
-    
+    FUNC_LOG;
 	CFSMailBox* mailBox = iMailClient.GetMailBoxByUidL( aMailboxId );
 	User::LeaveIfNull( mailBox );
     CleanupStack::PushL( mailBox );    
@@ -394,8 +382,7 @@
 // -----------------------------------------------------------------------------
 void CFSMailBrandManagerImpl::ConstructFromResourceL( TResourceReader& aReader )
 	{
-    NM_FUNCTION;
-    
+    FUNC_LOG;
 	iBrands = new ( ELeave )
 				CArrayPtrSeg< CFSMailBrand >( KBrandArrayGranularity );
 						
@@ -421,8 +408,7 @@
 // -----------------------------------------------------------------------------
 CFSMailBrand* CFSMailBrandManagerImpl::FindMatchingBrandL( const TDesC& aBrandId )
     {
-    NM_FUNCTION;
-    
+    FUNC_LOG;
     if( aBrandId.Length() )
         {
         TInt brandCount( iBrands->Count() );
@@ -441,8 +427,6 @@
 CFSMailBox* CFSMailBrandManagerImpl::MailboxMatchingBrandIdL(
     const TDesC& aBrandId ) const
     {    
-    NM_FUNCTION;
-    
     RPointerArray<CFSMailBox> mailboxes;
 
     CleanupResetAndDestroyPushL( mailboxes );
@@ -484,8 +468,6 @@
 // -----------------------------------------------------------------------------
 void CFSMailBrandManagerImpl::GetMCCValueL( TDes& aMcc ) const
     {
-    NM_FUNCTION;
-    
     aMcc.Zero();
     
     TInt err = KErrNone;
@@ -576,8 +558,6 @@
 // 
 void CFSMailBrandManagerImpl::GetMCCValueFromSIML( TDes& aMcc ) const
     {
-    NM_FUNCTION;
-    
     RTelServer telServer;
 
     CleanupClosePushL( telServer );
@@ -618,8 +598,6 @@
 // 
 TUint8 CFSMailBrandManagerImpl::GetCurrentCountryL() const
     {
-    NM_FUNCTION;
-    
     CTzLocalizer* localizer = CTzLocalizer::NewLC();
 
     CTzLocalizedCity* city = localizer->GetFrequentlyUsedZoneCityL(
@@ -646,8 +624,6 @@
 void CFSMailBrandManagerImpl::VerifyMailAccountName(
         TPtrC& aBrandedName ) const
     {
-    NM_FUNCTION;
-    
     // Due to legal reasons we don't show brand name "Gmail" in Germany and UK
     if ( !aBrandedName.CompareF( KBrandNameGmail ) )
         {