--- a/emailuis/nmailui/inc/nmeditorcontent.h	Thu Jun 24 14:32:18 2010 +0300
+++ b/emailuis/nmailui/inc/nmeditorcontent.h	Tue Jun 29 17:12:28 2010 +0300
@@ -46,9 +46,11 @@
 
     void setMessageData(const NmMessage &originalMessage,
                         NmUiEditorStartMode &editorStartMode);
+
     NmEditorTextEdit* editor() const;
+
     NmEditorHeader* header() const;
-
+    
 private:
     void createConnections();
     void removeEmbeddedImages(QString &bodyContent);
@@ -60,14 +62,13 @@
 
 public slots:
     void setEditorContentHeight();
-    void setScrollPosition(int oldPos, int newPos);
-    void updateScrollPosition(const QPointF &newPosition);
+    void ensureCursorVisibility();
 
 private:
     enum MessageBodyType { NmPlainText, NmHTMLText };
 
 private:
-    NmEditorHeader *mHeaderWidget; // Not owned
+    NmEditorHeader *mHeader; // Not owned
     MessageBodyType mMessageBodyType;
     NmEditorTextEdit *mEditorWidget; // Not owned
     NmBaseViewScrollArea *mScrollArea; // Not owned