diff -r 35b64624a9e7 -r 36f374c67aa8 messagingapp/msgui/conversationview/resources/layouts/msgconversationwidget.widgetml
--- a/messagingapp/msgui/conversationview/resources/layouts/msgconversationwidget.widgetml	Wed Jun 23 18:09:17 2010 +0300
+++ b/messagingapp/msgui/conversationview/resources/layouts/msgconversationwidget.widgetml	Tue Jul 06 14:12:40 2010 +0300
@@ -2,8 +2,7 @@
 
   <layout name="layout-msg-portrait" type="mesh">
 
-    <meshitem src="subject" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="subject" srcEdge="BOTTOM" dst="preview" dstEdge="TOP" />
+    <meshitem src="subject" srcEdge="TOP" dst="" dstEdge="TOP" />   
     <meshitem src="subject" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="subject" srcEdge="RIGHT" dst="priority" dstEdge="LEFT"  spacer="rightSpacer"  />
 
@@ -13,13 +12,14 @@
     <meshitem src="attachment" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
     <meshitem src="attachment" srcEdge="CENTERV" dst="subject" dstEdge="CENTERV" />
 
-    <meshitem src="preview" srcEdge="BOTTOM" dst="bodyText" dstEdge="TOP" />
-    <meshitem src="preview" srcEdge="CENTERH" dst="" dstEdge="CENTERH"/>
+    <meshitem src="preview" srcEdge="TOP" dst="subject" dstEdge="BOTTOM" />
+    <meshitem src="preview" srcEdge="LEFT" dst="" dstEdge="LEFT" />
 
+    <meshitem src="bodyText" srcEdge="TOP" dst="preview" dstEdge="BOTTOM" />
     <meshitem src="bodyText" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="bodyText" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="bodyText" srcEdge="BOTTOM" dst="timeStamp" dstEdge="TOP" />
 
+    <meshitem src="timeStamp" srcEdge="TOP" dst="bodyText" dstEdge="BOTTOM" />
     <meshitem src="timeStamp" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="timeStamp" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
     <meshitem src="timeStamp" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
@@ -33,8 +33,8 @@
     <meshitem src="bubble" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
     <meshitem src="bubble" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
 
-    <meshitem src="playIcon" srcEdge="CENTERV" dst="preview" dstEdge="CENTERV" />
-    <meshitem src="playIcon" srcEdge="CENTERH" dst="preview" dstEdge="CENTERH" />
+    <meshitem src="playIcon" srcEdge="TOP" dst="subject" dstEdge="BOTTOM"/>
+    <meshitem src="playIcon" srcEdge="LEFT" dst="preview" dstEdge="RIGHT" />
 
   </layout>
 
@@ -43,9 +43,8 @@
     <meshitem src="preview" srcEdge="TOP" dst="" dstEdge="TOP" />
     <meshitem src="preview" srcEdge="LEFT" dst="" dstEdge="LEFT" />
 
-    <meshitem src="subject" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="subject" srcEdge="BOTTOM" dst="bodyText" dstEdge="TOP" />
-    <meshitem src="subject" srcEdge="LEFT" dst="preview" dstEdge="RIGHT" />
+    <meshitem src="subject" srcEdge="TOP" dst="" dstEdge="TOP" />    
+    <meshitem src="subject" srcEdge="LEFT" dst="playIcon" dstEdge="RIGHT" />
     <meshitem src="subject" srcEdge="RIGHT" dst="priority" dstEdge="LEFT" />
 
     <meshitem src="priority" srcEdge="RIGHT" dst="attachment" dstEdge="LEFT" />
@@ -54,11 +53,12 @@
     <meshitem src="attachment" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
     <meshitem src="attachment" srcEdge="CENTERV" dst="subject" dstEdge="CENTERV" />
 
-    <meshitem src="bodyText" srcEdge="LEFT" dst="preview" dstEdge="RIGHT" />
+    <meshitem src="bodyText" srcEdge="TOP" dst="subject" dstEdge="BOTTOM" />
+    <meshitem src="bodyText" srcEdge="LEFT" dst="playIcon" dstEdge="RIGHT" />
     <meshitem src="bodyText" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="bodyText" srcEdge="BOTTOM" dst="timeStamp" dstEdge="TOP" />
-
-    <meshitem src="timeStamp" srcEdge="LEFT" dst="preview" dstEdge="RIGHT" />
+ 
+    <meshitem src="timeStamp" srcEdge="TOP" dst="bodyText" dstEdge="BOTTOM" />
+    <meshitem src="timeStamp" srcEdge="LEFT" dst="playIcon" dstEdge="RIGHT" />
     <meshitem src="timeStamp" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
     <meshitem src="timeStamp" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"/>
 
@@ -71,8 +71,8 @@
     <meshitem src="bubble" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
     <meshitem src="bubble" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
 
-    <meshitem src="playIcon" srcEdge="CENTERV" dst="preview" dstEdge="CENTERV" />
-    <meshitem src="playIcon" srcEdge="CENTERH" dst="preview" dstEdge="CENTERH" />
+    <meshitem src="playIcon" srcEdge="TOP" dst="" dstEdge="TOP" />
+    <meshitem src="playIcon" srcEdge="LEFT" dst="preview" dstEdge="RIGHT" />
 
   </layout>