--- a/emailservices/emailserver/cmailhandlerplugin/inc/cmailcpsif.h	Fri Feb 19 22:37:30 2010 +0200
+++ b/emailservices/emailserver/cmailhandlerplugin/inc/cmailcpsif.h	Fri Mar 12 15:41:14 2010 +0200
@@ -61,10 +61,7 @@
      */
     void PublishActiveMailboxNameL( const TInt aInstance, 
 									const TInt aRowNumber, 
-                                    const TDesC& aMailboxName,
-                                    const TInt aMailBoxCount,
-                                    TFSMailMsgId aMailBoxId,
-                                    TFSMailMsgId aFolderId );
+                                    const TDesC& aMailboxName);
 
     /**
      * Publishes mailbox name to widget and action related to widget
@@ -173,7 +170,7 @@
      * 
      */	
 	TInt GetWidgetInstanceCount();
-	
+
 private:
     
     CMailCpsIf( CMailCpsHandler* aMailCpsHandler );
@@ -214,10 +211,7 @@
         const TDesC& aContentId, 
         const TDesC& aTextToAdd,
         const TDesC& aKey,
-        const TDesC8& aTrigger,
-        const TInt aMailBoxCount,
-        TFSMailMsgId aMailBoxId,
-        TFSMailMsgId aFolderId );
+        const TDesC8& aTrigger);
 
     /**
      * Publishes image
@@ -234,7 +228,8 @@
          const TDesC8& aKey,
          TInt aBitmapId,
          TInt aBitmapMaskId,
-         TFSMailMsgId aMailBoxId );
+         TFSMailMsgId aMailBoxId,
+         const TDesC& aBrandId );
 
     /**
      * Removes a published entity from Content Publishing Service
@@ -246,7 +241,7 @@
      * 
      */	    
     TInt FindWidgetInstanceId(const TDesC& aContentId);
-    
+
     /**
      * Resets all the published content values on HomeScreen database
      */
@@ -275,8 +270,6 @@
     TUint 					iSetupUid;
 	// is content allowed to publish	
 	TBool 					iAllowedToPublish[KMaxMailboxCount];
-    // is widget inactive    
-    TBool                   iInactive[KMaxMailboxCount];	
 	// From configuration: are homescreen notifications observed or ignored
 	TBool                   iIgnoreHsNotifications;
     };