diff -r ae34e1715e21 -r a8c646b56683 emailuis/nmailui/inc/nmeditorcontent.h
--- a/emailuis/nmailui/inc/nmeditorcontent.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailui/inc/nmeditorcontent.h	Mon Aug 23 23:32:31 2010 +0300
@@ -44,8 +44,9 @@
 
     virtual ~NmEditorContent();
 
-    void setMessageData(const NmMessage &originalMessage,
-                        NmUiEditorStartMode &editorStartMode);
+    void setBodyContent(NmUiEditorStartMode editorStartMode,
+                        const NmMessage *originalMessage,
+                        const QString *signature);
 
     NmEditorTextEdit* editor() const;
 
@@ -64,13 +65,10 @@
     void setEditorContentHeight();
     void setEditorContentWidth();
     void ensureCursorVisibility();
-
-private:
-    enum MessageBodyType { NmPlainText, NmHTMLText };
+    void repositHeader(const QPointF &scrollPosition);
 
 private:
     NmEditorHeader *mHeader; // Not owned
-    MessageBodyType mMessageBodyType;
     NmEditorTextEdit *mEditorWidget; // Not owned
     NmBaseViewScrollArea *mScrollArea; // Not owned
     HbWidget *mScrollAreaContents; // Not owned