diff -r 4ce476e64c59 -r 8592a65ad3fb emailservices/emailserver/cmailhandlerplugin/inc/cmailcpsif.h
--- a/emailservices/emailserver/cmailhandlerplugin/inc/cmailcpsif.h	Wed Mar 31 21:08:33 2010 +0300
+++ b/emailservices/emailserver/cmailhandlerplugin/inc/cmailcpsif.h	Wed Apr 14 15:42:15 2010 +0300
@@ -25,6 +25,10 @@
 #include <liwgenericparam.h>
 #include <fbs.h>
 #include <data_caging_path_literals.hrh>
+#include <hsccapiclient.h>
+#include <hscontentcontrol.h>
+#include <hscontentinfo.h>
+#include <hscontentinfoarray.h>
 
 #include "cmailcpshandler.h"
 #include "cmailcpsifconsts.h"
@@ -36,7 +40,9 @@
  *  @lib fsmailserver.exe
  *  @since S60 v5.1
  */
-NONSHARABLE_CLASS( CMailCpsIf ) : public CBase, public MLiwNotifyCallback
+NONSHARABLE_CLASS( CMailCpsIf ) : public CBase,
+                                  public MHsContentControl,
+                                  public MLiwNotifyCallback
     {
 public:
     /**
@@ -170,6 +176,11 @@
      * 
      */	
 	TInt GetWidgetInstanceCount();
+	
+    /**
+     * 
+     */	
+	void AddWidgetToHomescreenL( const TFSMailMsgId aMailbox );
 
 private:
     
@@ -247,6 +258,13 @@
      */
     void ResetPublishedDataL( const TDesC& aContentId );
 
+    //
+    // -------------------------- from base classes-----------------------------
+    //
+    virtual void NotifyWidgetListChanged(); // MHsContentControl
+    virtual void NotifyViewListChanged(); // MHsContentControl
+    virtual void NotifyAppListChanged(); // MHsContentControl
+    
 public:
 	//
     RPointerArray<HBufC>    iInstIdList;
@@ -272,6 +290,8 @@
 	TBool 					iAllowedToPublish[KMaxMailboxCount];
 	// From configuration: are homescreen notifications observed or ignored
 	TBool                   iIgnoreHsNotifications;
+	
+	CHsCcApiClient*         iContentControlClient;
     };
 
 #endif /*CMAILCPSIF_H_*/