diff -r 84d9eb65b26f -r e4592d119491 messagingapp/msgui/unifiededitor/inc/msgunieditorsubject.h
--- a/messagingapp/msgui/unifiededitor/inc/msgunieditorsubject.h	Mon May 03 12:29:07 2010 +0300
+++ b/messagingapp/msgui/unifiededitor/inc/msgunieditorsubject.h	Fri May 14 15:49:35 2010 +0300
@@ -17,7 +17,7 @@
 #ifndef UNIFIED_EDITOR_SUBJECT_H
 #define UNIFIED_EDITOR_SUBJECT_H
 
-#include <hbwidget.h>
+#include <msgunifiededitorbasewidget.h>
 
 #include "convergedmessage.h"
 
@@ -25,7 +25,7 @@
 class UniEditorGenUtils;
 class MsgUnifiedEditorLineEdit;
 
-class MsgUnifiedEditorSubject : public HbWidget
+class MsgUnifiedEditorSubject : public MsgUnifiedEditorBaseWidget
     {
     Q_OBJECT
 
@@ -34,7 +34,7 @@
     /**
      * Constructor
      */
-    MsgUnifiedEditorSubject(const QString& pluginPath, QGraphicsItem *parent = 0);
+    MsgUnifiedEditorSubject(QGraphicsItem *parent = 0);
 
     /**
      * Destructor
@@ -67,6 +67,11 @@
      * @param text
      */
     void setText(const QString& text);
+    
+    /**
+     * To set focus on editable field.
+     */
+    void setFocus();
 
 signals:
     /**
@@ -78,13 +83,7 @@
     /**
      * called when contentsChanged signal is emitted by the line edit
      */
-    void onContentsAdded(const QString&);
-    
-    /**
-     * Called when contentsChanged signal is emitted by the line edit
-     * Checks for empty text content 
-     */
-    void onContentsRemoved(const QString& text);
+    void onContentsChanged(const QString&);
     
 private:
     /**
@@ -96,11 +95,6 @@
 private:
     
     /**
-     * plug in path.
-     */
-    QString mPluginPath;
-    
-    /**
      * line edit to input subject.
      */
     MsgUnifiedEditorLineEdit* mSubjectEdit;
@@ -119,6 +113,11 @@
      * general utilities
      */
     UniEditorGenUtils* mGenUtils;
+    
+    /**
+     * Holds the previous buffer inside subject field
+     */
+    QString mPrevBuffer;
     };
 
 #endif //UNIFIED_EDITOR_SUBJECT_H