--- a/messagingapp/msgui/msgapp/inc/msgviewmanager.h	Tue Oct 05 13:58:47 2010 +0530
+++ b/messagingapp/msgui/msgapp/inc/msgviewmanager.h	Tue Oct 19 11:30:16 2010 +0530
@@ -22,6 +22,7 @@
 #include <QObject>
 #include <QVariantList>
 #include <QVariant>
+#include <afactivities_global.h>
 
 class HbMainWindow;
 class MsgUnifiedEditorView;
@@ -33,6 +34,8 @@
 class MsgSettingsView;
 class HbAction;
 class HbView;
+class MsgActivityHandler;
+class TsTaskSettings;
 
 class MsgViewManager: public QObject
 {
@@ -103,6 +106,12 @@
      */
     bool handleKeyEvent(int key);
 
+    /**
+     * Sets the activity handler
+     * @param activityHandler
+     */
+    void setActivityHandler(MsgActivityHandler* activityHandler);        
+
 private:
     /**
      * swiches back to last view after service request is complete.
@@ -177,12 +186,6 @@
 	* Appends the views to be deleted into a QList to be deleted when view is ready
 	*/
     void appendViewToBeDeleted(HbView* view);
-
-	 /**
-	  * Save the editor data to be populated
-	  * @param editorData QVariantList
-	  */    
-    void populateUniEditorAfterViewReady(const QVariantList& editorData);
     
     /**
 	 * opens unieditor as activity.
@@ -230,9 +233,23 @@
     void onDialogSaveTone(HbAction* action);
     
     /**
-     * When this slot is called the saved editor data is set to the editor
+     * Send the app to background
+     */
+    void handleSendToBackGround();
+   
+public slots:
+
+    /**
+     * Set the view for the app
      */
-    void populateUniEditorView();
+    void handleApplicationActive();
+
+    /**
+     * Handler for activated signal
+     */
+    void handleActivated(Af::ActivationReason reason, 
+            QString name, 
+            QVariantHash parameters);    
 	
 private:
     /**
@@ -251,7 +268,11 @@
     MsgSettingsView* mSettingsView;
     
     HbAction* mBackAction;
-
+	/**
+	 * Not owned
+	 */
+    MsgActivityHandler* mActivityHandler;
+    TsTaskSettings* mClient;
     int mPreviousView;
     int mCurrentView;
     int mViewAtServiceRequest;
@@ -262,8 +283,12 @@
     HbView* mDummyview;
     int mMessageId;
     
-    QVariantList mEditorData;
     QVariantList mViewerData;
+    /*
+     * Keeps track of the app background status
+     * if set then it means app is in background
+     */
+    bool mBringtoForground;
 };
 
 #endif /* MSGVIEWMANAGER_H_ */