diff -r ebfee66fde93 -r 84197e66a4bd messagingapp/msgui/conversationview/resources/layouts/msgconversationviewitem.widgetml
--- a/messagingapp/msgui/conversationview/resources/layouts/msgconversationviewitem.widgetml	Fri Jun 04 10:25:39 2010 +0100
+++ b/messagingapp/msgui/conversationview/resources/layouts/msgconversationviewitem.widgetml	Fri Jun 11 13:35:48 2010 +0300
@@ -1,24 +1,14 @@
 <hbwidget version="0.1">
-  <layout name="layout-incoming" type="mesh">
-    <meshitem src="msgStateIcon" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
-    <meshitem src="msgStateIcon" srcEdge="CENTERV" dst="" dstEdge="CENTERV"/>
+  <layout name="layout-conversation" type="mesh">
+    <meshitem src="msgStateIconIncoming" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
+    <meshitem src="msgStateIconIncoming" srcEdge="CENTERV" dst="" dstEdge="CENTERV"/>
+
+    <meshitem src="msgStateIconOutgoing" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
+    <meshitem src="msgStateIconOutgoing" srcEdge="CENTERV" dst="" dstEdge="CENTERV"/>
     
-    <meshitem src="msgconvwidget" srcEdge="RIGHT" dst="msgStateIcon" dstEdge="LEFT" />
+    <meshitem src="msgconvwidget" srcEdge="RIGHT" dst="msgStateIconIncoming" dstEdge="LEFT" />
     <meshitem src="msgconvwidget" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="msgconvwidget" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+    <meshitem src="msgconvwidget" srcEdge="LEFT" dst="msgStateIconOutgoing" dstEdge="RIGHT"/>
     <meshitem src="msgconvwidget" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
   </layout>
-
-  <layout name="layout-outgoing" type="mesh">
-
-    <meshitem src="msgStateIcon" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
-    <meshitem src="msgStateIcon" srcEdge="CENTERV" dst="" dstEdge="CENTERV"/>
-
-    <meshitem src="msgconvwidget" srcEdge="LEFT" dst="msgStateIcon" dstEdge="RIGHT"/>
-    <meshitem src="msgconvwidget" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="msgconvwidget" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="msgconvwidget" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
-  </layout>
-
 </hbwidget>