--- a/emailuis/nmailui/inc/nmeditorview.h	Mon May 03 12:23:15 2010 +0300
+++ b/emailuis/nmailui/inc/nmeditorview.h	Fri May 14 15:41:10 2010 +0300
@@ -18,6 +18,8 @@
 #ifndef NMEDITORVIEW_H_
 #define NMEDITORVIEW_H_
 
+#include <QPointer>
+
 #include "nmbaseview.h"
 #include "nmactionobserver.h"
 #include "nmactionresponse.h"
@@ -63,6 +65,7 @@
     HbWidget* scrollAreaContents();
     bool okToExitView();
     void aboutToExitView();
+    void viewReady();
 
 public slots:
 
@@ -119,6 +122,7 @@
     void sendMouseReleaseEventToScroll(QGraphicsSceneMouseEvent *event);
     void sendMouseMoveEventToScroll(QGraphicsSceneMouseEvent *event);
     void sendLongPressGesture(const QPointF &point);
+    void contextButton(NmActionResponse &result);
 
 
 private: // Data
@@ -137,10 +141,10 @@
     HbMenu *mAttachmentListContextMenu; // Owned
     NmId mSelectedAttachment;
 
-    NmMessageCreationOperation *mMessageCreationOperation;  // Owned
-    NmAddAttachmentsOperation *mAddAttachmentOperation;     // Owned
-    NmOperation *mRemoveAttachmentOperation;                // Owned
-    NmCheckOutboxOperation *mCheckOutboxOperation;          // Owned
+    QPointer<NmMessageCreationOperation> mMessageCreationOperation;  // Not owned
+    QPointer<NmAddAttachmentsOperation> mAddAttachmentOperation;     // Not owned 
+    QPointer<NmOperation> mRemoveAttachmentOperation;                // Not owned 
+    QPointer<NmCheckOutboxOperation> mCheckOutboxOperation;          // Not owned 
 
     HbProgressDialog *mWaitDialog; // Owned.