diff -r 84d9eb65b26f -r 518b245aa84c messagingapp/msgui/conversationview/inc/msgconversationviewitem.h
--- a/messagingapp/msgui/conversationview/inc/msgconversationviewitem.h	Mon May 03 12:29:07 2010 +0300
+++ b/messagingapp/msgui/conversationview/inc/msgconversationviewitem.h	Fri Jun 25 15:47:40 2010 +0530
@@ -20,6 +20,7 @@
 
 // INCLUDES
 #include <HbListViewItem>
+#include "convergedmessage.h"
 
 //Forward Declarations
 class MsgConversationWidget;
@@ -89,7 +90,32 @@
      * Set the Icon that displays the message notification state.
      */
     void setNotificationStateIcon(int notificationState);
+    
+    /*
+     * Update item with sms content
+     */
+    void updateSmsTypeItem(const QModelIndex& index, int messageSubType =
+            ConvergedMessage::None);
 
+    /*
+     * Update item with mms type content
+     */
+    void updateMmsTypeItem(const QModelIndex& index, int messageType,
+        int messageSubType);
+
+    /*
+     * Initializes the msgconverstionviewitem
+     */
+    void init();
+
+private slots:    
+
+    /*
+     * Handler for orientation changed
+     * @param orientation Qt::Orientation
+     */
+    void orientationchanged(Qt::Orientation orientation);
+    
 protected:
 
     /**
@@ -114,10 +140,17 @@
     MsgConversationWidget *mConversation;
 
     /**
+     * Graphics Item to hold message incoming state. 
+     * Applicable for notification
+     * Owned
+     */
+    HbIconItem *mIncomingMsgStateIconItem;
+
+    /**
      * Graphics Item to hold message sending state.
      * Owned
      */
-    HbIconItem *mMessageStateIconItem;
+    HbIconItem *mOutgoingMsgStateIconItem;
 };
 
 #endif // MSG_CONVERSATION_VIEW_ITEM_H