--- a/emailservices/emailframework/inc/CFSMailBrandManagerImpl.h	Tue Feb 02 00:02:40 2010 +0200
+++ b/emailservices/emailframework/inc/CFSMailBrandManagerImpl.h	Fri Apr 16 14:51:52 2010 +0300
@@ -37,7 +37,7 @@
  *  @lib FSFWCommonLib
  *  @since S60 v3.1
  */
-class CFSMailBrandManagerImpl : public CBase, public MFSMailBrandManager
+NONSHARABLE_CLASS ( CFSMailBrandManagerImpl ) : public CBase, public MFSMailBrandManager
 	{
 		public:
 			
@@ -67,12 +67,6 @@
 	                       const TFSMailMsgId& aMailboxId );
 
 	/**
-	 * @see MFSMailBrandManager::GetGraphicL, overloaded with brandid
-	 */
-	CGulIcon* GetGraphicL( TFSBrandElement aElement, const TDesC& aBrandId );
-	
-	
-	/**
 	 * @see MFSMailBrandManager::GetTextL
 	 */
 	TPtrC GetTextL( TFSBrandElement aElement,
@@ -140,16 +134,6 @@
 	 */
 	CFSMailBox* MailboxMatchingBrandIdL( const TDesC& aBrandId ) const;
 	
-// <gmail_brand_issue>
-    void GetMCCValueL( TDes& aMcc ) const;    
-
-    void GetMCCValueFromSIML( TDes& aMcc ) const;    
-
-    TUint8 GetCurrentCountryL() const;
-
-    void VerifyMailAccountName( TPtrC& aBrandedName ) const;
-// </gmail_brand_issue>
-
 private: // data
 
     /**