diff -r ecf6a73a9186 -r 60a8a215b0ec messagingapp/msgui/unifiededitor/inc/msgunieditoraddress.h
--- a/messagingapp/msgui/unifiededitor/inc/msgunieditoraddress.h	Tue Oct 05 13:58:47 2010 +0530
+++ b/messagingapp/msgui/unifiededitor/inc/msgunieditoraddress.h	Tue Oct 19 11:30:16 2010 +0530
@@ -38,8 +38,7 @@
     /**
      * Constructor
      */
-    MsgUnifiedEditorAddress(const QString& label,
-                            QGraphicsItem *parent = 0);
+    MsgUnifiedEditorAddress(const QString& label, QGraphicsItem *parent = 0);
 
     /**
      * Destructor
@@ -62,7 +61,7 @@
      * setter method to set address
      * @param addrlist, list of addresses to be set in address editor
      */
-    void setAddresses(ConvergedMessageAddressList addrlist,bool aSkipCheck=FALSE);
+    void setAddresses(ConvergedMessageAddressList addrlist,bool aSkipCheck=false);
 
     /**
      * Get amount of digits to be used in contact matching
@@ -85,17 +84,6 @@
      */
     void setFocus();
 
-signals:
-    /**
-     * Emitted when send button from virtual ITUT is pressed.
-     */
-    void sendMessage();
-
-    /**
-     * Emitted when content is added or removed
-     */
-    void contentChanged();
-
 private slots:
 
     /**
@@ -158,6 +146,16 @@
      * Reset the addresslist to previous list
      */
     void resetToPrevious();
+    
+    /**
+     * emits contentsChanged signal on address count change.
+     */
+    void emitContentsChanged();
+    
+    /**
+     * Checks if address field has a valid email id.
+     */
+    bool hasValidEmailAddress();
 
 private:
 
@@ -205,6 +203,14 @@
      * limit e.g. multiple selection from contact selection dialog
      */
     int mExceedsMaxMmsRecipientsBy;
+    
+    /**
+     * Number of addresses present.
+     */
+    int mAddressCount;
+#ifdef UNIEDITOR_UNIT_TEST
+    friend class TestMsgUnifiedEditorAddress;
+#endif
     };
 
 #endif //MSG_UNIFIED_EDITOR_ADDRESS_H