diff -r 84d9eb65b26f -r 518b245aa84c messagingapp/msgui/unifiedviewer/inc/univiewerheadercontainer.h
--- a/messagingapp/msgui/unifiedviewer/inc/univiewerheadercontainer.h	Mon May 03 12:29:07 2010 +0300
+++ b/messagingapp/msgui/unifiedviewer/inc/univiewerheadercontainer.h	Fri Jun 25 15:47:40 2010 +0530
@@ -22,11 +22,13 @@
 
 #include <convergedmessageaddress.h>
 
+class QGraphicsLinearLayout;
 class UniViewerDetailsWidget;
 class HbGroupBox;
+class HbFrameItem;
 class UniViewerAddressContainer;
-class UniViewerAttachmentContainer;
 class UniViewerFeeder;
+class UniViewerAttachmentWidget;
 
 class UniViewerHeaderContainer: public HbWidget
 {
@@ -83,9 +85,27 @@
      */
     QString createAddressList(const ConvergedMessageAddressList &addressList);
 
+private slots:
+
+    /**
+     * Slot to know address box state.
+     */
+    void addressBoxToggled(bool state);
+
+signals:
+    /**
+     * this signal is emitted when send message is triggered form UniViewerAddressWidget
+     */
+    void sendMessage(const QString& phoneNumber,const QString& alias);
+
 private:
 
     /**
+     * Main layout.
+     */
+    QGraphicsLinearLayout *mMainLayout;
+
+    /**
      * UniViewerFeeder object
      * Not Owned
      */
@@ -104,16 +124,21 @@
     HbGroupBox *mHeaderGroupBox;
 
     /**
+     * Separator line
+     * Owned.
+     */
+    HbFrameItem *mSeparator;
+
+    /**
      * UniViewerAddressContainer object
      * owned.
      */
     UniViewerAddressContainer *mAddressContainer;
 
     /**
-     * UniViewerAttachmentContainer object
-     * owned.
+     * List of attachment widgets.
      */
-    UniViewerAttachmentContainer *mAttachmentContainer;
+    QList<UniViewerAttachmentWidget *> mUniViewerAttachmentstList;
 };
 
 #endif /* UNIVIEWER_HEADER_CONTAINER_H */