diff -r 578830873419 -r ecc8def7944a emailuis/nmailui/inc/nmeditorcontent.h
--- a/emailuis/nmailui/inc/nmeditorcontent.h	Fri Apr 16 14:51:52 2010 +0300
+++ b/emailuis/nmailui/inc/nmeditorcontent.h	Mon May 03 12:23:15 2010 +0300
@@ -19,6 +19,7 @@
 #define NMEDITORCONTENT_H_
 
 #include <hbwidget.h>
+#include "nmuiviewids.h"
 
 enum MessageBodyType { PlainText, HTMLText };
 
@@ -28,8 +29,10 @@
 class NmBaseViewScrollArea;
 class NmEditorView;
 class NmMessage;
+class NmMessageEnvelope;
 class NmEditorHeader;
 class NmEditorTextEdit;
+class QNetworkAccessManager;
 
 class NmEditorContent : public HbWidget
 {
@@ -38,10 +41,12 @@
 public:
     NmEditorContent(QGraphicsItem *parent,
                     NmEditorView *parentView,
-                    HbDocumentLoader *documentLoader);
+                    HbDocumentLoader *documentLoader,
+                    QNetworkAccessManager &manager);
     virtual ~NmEditorContent();
 
-    void setMessageData(NmMessage *message);
+    void setMessageData(const NmMessage &message, 
+                        NmMessageEnvelope *replyMsgEnvelope=0);
     NmEditorTextEdit* editor() const;
     NmEditorHeader* header() const;
 
@@ -59,7 +64,6 @@
     NmEditorHeader *mHeaderWidget;   // Owned
     NmEditorView *mParentView;       // Not owned
     HbAnchorLayout *mEditorLayout;   // Not owned
-    NmMessage *mMessage;             // Not Owned
     MessageBodyType mMessageBodyType;
     NmEditorTextEdit *mEditorWidget; // Not owned
     NmBaseViewScrollArea *mBackgroundScrollArea;