--- a/emailuis/nmailui/inc/nmeditorcontent.h	Fri Jun 11 16:42:02 2010 +0300
+++ b/emailuis/nmailui/inc/nmeditorcontent.h	Thu Jun 24 14:32:18 2010 +0300
@@ -21,52 +21,59 @@
 #include <hbwidget.h>
 #include "nmuiviewids.h"
 
-enum MessageBodyType { PlainText, HTMLText };
-
 class HbAnchorLayout;
 class HbTextEdit;
 class HbDocumentLoader;
 class NmBaseViewScrollArea;
-class NmEditorView;
 class NmMessage;
 class NmMessageEnvelope;
 class NmEditorHeader;
 class NmEditorTextEdit;
 class QNetworkAccessManager;
+class NmApplication;
 
-class NmEditorContent : public HbWidget
+class NmEditorContent : public QObject
 {
 Q_OBJECT
 
 public:
-    NmEditorContent(QGraphicsItem *parent,
-                    NmEditorView *parentView,
+    NmEditorContent(QObject *parent,
                     HbDocumentLoader *documentLoader,
-                    QNetworkAccessManager &manager);
+                    QNetworkAccessManager &manager,
+                    NmApplication &application);
+
     virtual ~NmEditorContent();
 
     void setMessageData(const NmMessage &originalMessage,
-                        bool createReplyHeader = true);
+                        NmUiEditorStartMode &editorStartMode);
     NmEditorTextEdit* editor() const;
     NmEditorHeader* header() const;
 
 private:
     void createConnections();
+    void removeEmbeddedImages(QString &bodyContent);
 
 signals:
     void setPlainText(const QString&);
+
     void setHtml(const QString&);
 
 public slots:
     void setEditorContentHeight();
+    void setScrollPosition(int oldPos, int newPos);
+    void updateScrollPosition(const QPointF &newPosition);
+
+private:
+    enum MessageBodyType { NmPlainText, NmHTMLText };
 
 private:
-    NmEditorHeader *mHeaderWidget;   // Owned
-    NmEditorView *mParentView;       // Not owned
-    HbAnchorLayout *mEditorLayout;   // Not owned
+    NmEditorHeader *mHeaderWidget; // Not owned
     MessageBodyType mMessageBodyType;
     NmEditorTextEdit *mEditorWidget; // Not owned
-    NmBaseViewScrollArea *mBackgroundScrollArea;
+    NmBaseViewScrollArea *mScrollArea; // Not owned
+    HbWidget *mScrollAreaContents; // Not owned
+    QPointF mScrollPosition;
+    NmApplication &mApplication;
 };
 
 #endif /* NMEDITORCONTENT_H_ */