--- a/messagingapp/msgui/msgapp/src/msgactivityhandler.cpp	Tue Oct 05 13:58:47 2010 +0530
+++ b/messagingapp/msgui/msgapp/src/msgactivityhandler.cpp	Tue Oct 19 11:30:16 2010 +0530
@@ -18,17 +18,18 @@
 
 #include "msgactivityhandler.h"
 
+#include <QVariantHash>
+#include <afactivitystorage.h>
+#include <afactivation.h>
+#include <QServiceManager>
+
 #include "msgviewmanager.h"
 #include "msgbaseview.h"
 #include "msgmainwindow.h"
-#include <QVariantHash>
-#include <afactivitystorage.h>
+
+QTM_USE_NAMESPACE
 
 const int INVALID_MSGID = -1;
-// Activity Names 
-const QString ListViewActivityName("MsgConversationsList");
-const QString EditorActivityName("MsgCreate");
-
 //-----------------------------------------------------------------------------
 // MsgActivityHandler::MsgActivityHandler
 // Constructor
@@ -36,7 +37,15 @@
 MsgActivityHandler::MsgActivityHandler(QObject* parent):
     QObject(parent)
 {
-    mActivityStorage = new AfActivityStorage();
+    QServiceManager serviceManager;
+    mActivityStorage = static_cast<AfActivityStorage *>
+    (serviceManager.loadInterface("com.nokia.qt.activities.Storage"));
+    mActivation = static_cast<AfActivation *>
+    (serviceManager.loadInterface("com.nokia.qt.activities.Activation"));
+    
+    connect(mActivation, 
+         SIGNAL(activated(Af::ActivationReason, QString, QVariantHash)), 
+         this, SIGNAL(activated(Af::ActivationReason, QString, QVariantHash)));
 }
 
 //-----------------------------------------------------------------------------
@@ -49,6 +58,10 @@
        delete mActivityStorage;
        mActivityStorage = NULL;
    }
+   if(mActivation) {
+      delete mActivation;
+      mActivation = NULL;
+   }
 }
 
 //-----------------------------------------------------------------------------
@@ -137,3 +150,13 @@
 {
     return mActivityStorage;
 }
+
+//-----------------------------------------------------------------------------
+// MsgActivityHandler::activitiyStorage
+// @see header
+//-----------------------------------------------------------------------------
+AfActivation*  MsgActivityHandler::activation()
+{
+    return mActivation;
+}
+