diff -r 578830873419 -r ecc8def7944a emailservices/emailcommon/src/CFSMailFolderBase.cpp
--- a/emailservices/emailcommon/src/CFSMailFolderBase.cpp	Fri Apr 16 14:51:52 2010 +0300
+++ b/emailservices/emailcommon/src/CFSMailFolderBase.cpp	Mon May 03 12:23:15 2010 +0300
@@ -15,12 +15,16 @@
 *
 */
 
-
+// <qmail>
 #include <nmcommonheaders.h>
+// </qmail>
+
 #include "emailtrace.h"
+
+// <qmail>
 #include "CFSMailFolderBase.h"
 #include "nmfolder.h"
-
+// </qmail>
 
 // ================= MEMBER FUNCTIONS ==========================================
 // -----------------------------------------------------------------------------
@@ -29,14 +33,11 @@
 CFSMailFolderBase::CFSMailFolderBase()
 {
     FUNC_LOG;
-    // <qmail>
-    //iFolderName = HBufC::New(1);
-    //iFolderName->Des().Copy(KNullDesC());
-    // </qmail>
-    iMoveOfflineBlocked.Reset();
-    iMoveOnlineBlocked.Reset();
-    iCopyOfflineBlocked.Reset();
-    iCopyOnlineBlocked.Reset();
+// <qmail> unnecessary iFolderName initialization removed </qmail>
+	iMoveOfflineBlocked.Reset();
+	iMoveOnlineBlocked.Reset();
+	iCopyOfflineBlocked.Reset();
+	iCopyOnlineBlocked.Reset();
 }
 
 // -----------------------------------------------------------------------------
@@ -45,17 +46,11 @@
 EXPORT_C CFSMailFolderBase::~CFSMailFolderBase()
 {
     FUNC_LOG;
-    // <qmail>
-    //if(iFolderName)
-    //    {
-    //    delete iFolderName;
-    //    iFolderName = NULL;
-    //    }
-    // </qmail>
-    iMoveOfflineBlocked.Reset();
-    iMoveOnlineBlocked.Reset();
-    iCopyOfflineBlocked.Reset();
-    iCopyOnlineBlocked.Reset();
+// <qmail> unnecessary iFolderName destruction removed </qmail>
+	iMoveOfflineBlocked.Reset();
+	iMoveOnlineBlocked.Reset();
+	iCopyOfflineBlocked.Reset();
+	iCopyOnlineBlocked.Reset();
 }
 
 // -----------------------------------------------------------------------------
@@ -64,9 +59,10 @@
 EXPORT_C void CFSMailFolderBase::ConstructL( TFSMailMsgId aFolderId )
 {
     FUNC_LOG;
-    iFolderId = aFolderId;
+// <qmail>
     iNmPrivateFolder = new NmFolderPrivate();
     iNmPrivateFolder->mFolderId = aFolderId.GetNmId();
+// <qmail>
 }
 
 // -----------------------------------------------------------------------------
@@ -75,21 +71,21 @@
 EXPORT_C CFSMailFolderBase* CFSMailFolderBase::NewLC( TFSMailMsgId aFolderId )
 {
     FUNC_LOG;
-    CFSMailFolderBase* folder = new (ELeave) CFSMailFolderBase();
-    CleanupStack:: PushL(folder);
-    folder->ConstructL(aFolderId);
-    return folder;
+  CFSMailFolderBase* folder = new (ELeave) CFSMailFolderBase();
+  CleanupStack:: PushL(folder);
+  folder->ConstructL(aFolderId);
+  return folder;
 } 
 
 // -----------------------------------------------------------------------------
 // CFSMailFolderBase::NewL
 // -----------------------------------------------------------------------------
-EXPORT_C CFSMailFolderBase* CFSMailFolderBase::NewL( const TFSMailMsgId aFolderId )
+EXPORT_C CFSMailFolderBase* CFSMailFolderBase::NewL(const TFSMailMsgId aFolderId)
 {
     FUNC_LOG;
-    CFSMailFolderBase* folder =  CFSMailFolderBase::NewLC(aFolderId);
-    CleanupStack:: Pop(folder);
-    return folder;
+  CFSMailFolderBase* folder =  CFSMailFolderBase::NewLC(aFolderId);
+  CleanupStack:: Pop(folder);
+  return folder;
 }
 
 // -----------------------------------------------------------------------------
@@ -98,7 +94,9 @@
 EXPORT_C TFSMailMsgId CFSMailFolderBase::GetFolderId() const
 {
     FUNC_LOG;
+// <qmail>
 	return TFSMailMsgId(iNmPrivateFolder->mFolderId);
+// </qmail>
 }
 
 
@@ -108,16 +106,20 @@
 EXPORT_C TFSMailMsgId CFSMailFolderBase::GetParentFolderId() const
 {
     FUNC_LOG;
+// <qmail>
     return TFSMailMsgId(iNmPrivateFolder->mParentFolderId);
+// </qmail>
 }
 
 // -----------------------------------------------------------------------------
 // CFSMailFolderBase::SetParentFolderId
 // -----------------------------------------------------------------------------
-EXPORT_C void CFSMailFolderBase::SetParentFolderId( TFSMailMsgId aFolderId )
+EXPORT_C void CFSMailFolderBase::SetParentFolderId(TFSMailMsgId aFolderId)
 {
     FUNC_LOG;
+// <qmail>
     iNmPrivateFolder->mParentFolderId = aFolderId.GetNmId();
+// </qmail>
 }
 
 // -----------------------------------------------------------------------------
@@ -126,16 +128,20 @@
 EXPORT_C TFSMailMsgId CFSMailFolderBase::GetMailBoxId() const
 {
     FUNC_LOG;
+// <qmail>
 	return TFSMailMsgId(iNmPrivateFolder->mMailboxId);
+// </qmail>
 }
 
 // -----------------------------------------------------------------------------
 // CFSMailFolderBase::SetMailBoxId
 // -----------------------------------------------------------------------------
-EXPORT_C void CFSMailFolderBase::SetMailBoxId( TFSMailMsgId aMailBoxId )
+EXPORT_C void CFSMailFolderBase::SetMailBoxId(TFSMailMsgId aMailBoxId)
 {
     FUNC_LOG;
+// <qmail>
     iNmPrivateFolder->mMailboxId = aMailBoxId.GetNmId();
+// </qmail>
 }
 
 
@@ -145,16 +151,20 @@
 EXPORT_C TFSFolderType CFSMailFolderBase::GetFolderType() const
 {
     FUNC_LOG;
+// <qmail>
     return static_cast<TFSFolderType>(iNmPrivateFolder->mFolderType);
+// </qmail>
 }
 
 // -----------------------------------------------------------------------------
 // CFSMailFolderBase::SetFolderType
 // -----------------------------------------------------------------------------
-EXPORT_C void CFSMailFolderBase::SetFolderType( const TFSFolderType aFolderType )
+EXPORT_C void CFSMailFolderBase::SetFolderType(const TFSFolderType aFolderType)
 {
     FUNC_LOG;
+// <qmail>
     iNmPrivateFolder->mFolderType = static_cast<NmFolderType>(aFolderType);
+// </qmail>
 }
 
 // -----------------------------------------------------------------------------
@@ -163,21 +173,24 @@
 EXPORT_C TDesC& CFSMailFolderBase::GetFolderName() const
 {
     FUNC_LOG;
+// <qmail>
     iTextPtr.Set(
         reinterpret_cast<const TUint16*> (iNmPrivateFolder->mName.utf16()),
         iNmPrivateFolder->mName.length());
     return iTextPtr;
+// </qmail>
 }
 
 // -----------------------------------------------------------------------------
 // CFSMailFolderBase::SetFolderName
 // -----------------------------------------------------------------------------
-EXPORT_C void CFSMailFolderBase::SetFolderName( const TDesC& aFolderName )
+EXPORT_C void CFSMailFolderBase::SetFolderName(const TDesC& aFolderName)
 {
     FUNC_LOG;
-  
+// <qmail>
     QString qtName = QString::fromUtf16(aFolderName.Ptr(), aFolderName.Length());
     iNmPrivateFolder->mName = qtName;
+// </qmail>
 }
 
 // -----------------------------------------------------------------------------
@@ -186,7 +199,9 @@
 EXPORT_C TUint CFSMailFolderBase::GetMessageCount() const
 {
     FUNC_LOG;
+// <qmail>
     return (TUint)iNmPrivateFolder->mMessageCount;
+// </qmail>
 }
 
 // -----------------------------------------------------------------------------
@@ -195,7 +210,9 @@
 EXPORT_C TUint CFSMailFolderBase::GetUnreadCount() const
 {
     FUNC_LOG;
+// <qmail>
     return (TUint)iNmPrivateFolder->mUnreadMessageCount;
+// </qmail>
 }
 
 // -----------------------------------------------------------------------------
@@ -204,7 +221,9 @@
 EXPORT_C TUint CFSMailFolderBase::GetUnseenCount() const
 {
     FUNC_LOG;
+// <qmail>
     return (TUint)iNmPrivateFolder->mUnseenCount;
+// </qmail>
 }
 
 // -----------------------------------------------------------------------------
@@ -213,7 +232,9 @@
 EXPORT_C TUint CFSMailFolderBase::GetSubFolderCount() const
 {
     FUNC_LOG;
+// <qmail>
     return (TUint)iNmPrivateFolder->mSubFolderCount;
+// </qmail>
 }
 // -----------------------------------------------------------------------------
 // CFSMailFolderBase::SetMessageCount
@@ -221,7 +242,9 @@
 EXPORT_C void CFSMailFolderBase::SetMessageCount( TUint aMessageCount )
 {
     FUNC_LOG;
+// <qmail>
     iNmPrivateFolder->mMessageCount = aMessageCount;
+// </qmail>
 }
 
 // -----------------------------------------------------------------------------
@@ -230,7 +253,9 @@
 EXPORT_C void CFSMailFolderBase::SetUnreadCount( TUint aMessageCount )
 {
     FUNC_LOG;
+// <qmail>
     iNmPrivateFolder->mUnreadMessageCount = aMessageCount;
+// </qmail>
 }
 
 // -----------------------------------------------------------------------------
@@ -239,73 +264,86 @@
 EXPORT_C void CFSMailFolderBase::SetUnseenCount( TUint aMessageCount )
 {
     FUNC_LOG;
+// <qmail>
     iNmPrivateFolder->mUnseenCount = aMessageCount;
+// </qmail>
 }
 
 // -----------------------------------------------------------------------------
 // CFSMailFolderBase::SetSubFolderCount
 // -----------------------------------------------------------------------------
-EXPORT_C void CFSMailFolderBase::SetSubFolderCount( TUint aFolderCount )
+EXPORT_C void CFSMailFolderBase::SetSubFolderCount(TUint aFolderCount)
 {
     FUNC_LOG;
+// <qmail>
     iNmPrivateFolder->mSubFolderCount = aFolderCount;
+// </qmail>
 }
 
 // -----------------------------------------------------------------------------
 // CFSMailFolder::BlockCopyFromL
 // -----------------------------------------------------------------------------
 EXPORT_C void CFSMailFolderBase::BlockCopyFromL( RArray<TFSFolderType> aFolderTypes, 
-                          TFSMailBoxStatus aMailBoxStatus )
-{
+													TFSMailBoxStatus aMailBoxStatus )
+	{
     FUNC_LOG;
-    switch(aMailBoxStatus)
-        {
-        case EFSMailBoxOnline:
-            for(TInt i=0;i<aFolderTypes.Count();i++)
-                {
-                iCopyOnlineBlocked.Append(aFolderTypes[i]);       
-                }
-            break;
-        case EFSMailBoxOffline:
-            for(TInt i=0;i<aFolderTypes.Count();i++)
-                {
-                iCopyOfflineBlocked.Append(aFolderTypes[i]);        
-                }
-            break;
-      
-        default:
-            break;
-    }
-}
+	switch(aMailBoxStatus)
+		{
+			case EFSMailBoxOnline:
+			for(TInt i=0;i<aFolderTypes.Count();i++)
+				{
+				iCopyOnlineBlocked.Append(aFolderTypes[i]);				
+				}
+			break;
+
+			case EFSMailBoxOffline:
+			for(TInt i=0;i<aFolderTypes.Count();i++)
+				{
+				iCopyOfflineBlocked.Append(aFolderTypes[i]);				
+				}
+			break;
+			
+			default:
+			break;
+		}
+	}
 
 // -----------------------------------------------------------------------------
 // CFSMailFolder::BlockMoveFromL
 // -----------------------------------------------------------------------------
 EXPORT_C void CFSMailFolderBase::BlockMoveFromL( RArray<TFSFolderType> aFolderTypes, 
-                          TFSMailBoxStatus aMailBoxStatus )
-{
+													TFSMailBoxStatus aMailBoxStatus )
+	{
     FUNC_LOG;
-    switch(aMailBoxStatus)
-        {
-        case EFSMailBoxOnline:
-            for(TInt i=0;i<aFolderTypes.Count();i++)
-                {
-                iMoveOnlineBlocked.Append(aFolderTypes[i]);       
-                }
-            break;
-        case EFSMailBoxOffline:
-            for(TInt i=0;i<aFolderTypes.Count();i++)
-                {
-                iMoveOfflineBlocked.Append(aFolderTypes[i]);        
-                }
-            break;
-        default:
-            break;
-    } 
-}
+	switch(aMailBoxStatus)
+		{
+			case EFSMailBoxOnline:
+			for(TInt i=0;i<aFolderTypes.Count();i++)
+				{
+				iMoveOnlineBlocked.Append(aFolderTypes[i]);				
+				}
+			break;
 
+			case EFSMailBoxOffline:
+			for(TInt i=0;i<aFolderTypes.Count();i++)
+				{
+				iMoveOfflineBlocked.Append(aFolderTypes[i]);				
+				}
+			break;
+			
+			default:
+			break;
+		}
+	}
+
+// <qmail>
+// -----------------------------------------------------------------------------
+// CFSMailFolderBase::GetNmFolder
+// -----------------------------------------------------------------------------
 EXPORT_C NmFolder* CFSMailFolderBase::GetNmFolder()
 {
     NmFolder* nmFolder = new NmFolder(iNmPrivateFolder);
     return nmFolder;
 }
+// </qmail>
+