--- a/messagingapp/msgui/conversationview/resources/layouts/msgconversationwidget.css	Tue Aug 03 21:34:40 2010 +0530
+++ b/messagingapp/msgui/conversationview/resources/layouts/msgconversationwidget.css	Fri Aug 06 23:19:50 2010 +0530
@@ -44,9 +44,8 @@
 MsgConversationWidget::bodyText
 {
   left:-var(hb-param-margin-gene-left);
-  top:-var(hb-param-margin-gene-top);
+  top:-var(hb-param-margin-gene-middle-vertical);
   right:1.0un;
-  bottom:var(hb-param-margin-gene-middle-vertical);
   text-height:var(hb-param-text-height-secondary);
   font-variant:primary;
   text-line-count-min:1;
@@ -68,13 +67,22 @@
 	left:-var(hb-param-margin-gene-middle-horizontal);
 }
 
+
+MsgConversationWidget::headerItem
+{
+    top:-var(hb-param-margin-gene-top);
+    left:-var(hb-param-margin-gene-left);
+}
+
+MsgConversationWidget::headerItem:landscape
+{
+    left:-var(hb-param-margin-gene-middle-horizontal);
+}
+
 /********************************** SUBJECT ***********************************/
 
 MsgConversationWidget::subject
 {
-  left:-var(hb-param-margin-gene-left);
-  top:-var(hb-param-margin-gene-top);
-  bottom:var(hb-param-margin-gene-middle-vertical);
   right:var(hb-param-margin-gene-middle-horizontal);
   text-align:left;
   text-height:var(hb-param-text-height-primary);
@@ -83,22 +91,6 @@
   text-line-count-max:1;
 }
 
-MsgConversationWidget[isMMS="false"]::subject
-{
-  text-line-count-max:30;
-  text-height:var(hb-param-text-height-secondary);
-}
-
-MsgConversationWidget[hasImage="true"]::subject:landscape
-{
-  left:-var(hb-param-margin-gene-middle-horizontal);
-}
-
-MsgConversationWidget[hasImage="false"][hasAudio="true"]::subject:landscape
-{
-  left:-var(hb-param-margin-gene-middle-horizontal);
-}
-
 
 /******************************* ATTACHMENT ICON ******************************/
 
@@ -129,10 +121,18 @@
 MsgConversationWidget::preview
 {
   left:-var(hb-param-margin-gene-left);
+  top:-var(hb-param-margin-gene-middle-vertical);
   size-policy:fixed fixed;
   aspect-ratio:ignore;
 }
 
+MsgConversationWidget[hasImage="false"][hasAudio="true"]::preview
+{
+  zvalue:1;
+  pref-width:var(hb-param-graphic-size-primary-small);
+  pref-height:var(hb-param-graphic-size-primary-small);
+}
+
 MsgConversationWidget::preview:landscape
 {
   left:-var(hb-param-margin-gene-left);
@@ -149,6 +149,7 @@
   left:-var(hb-param-margin-gene-left);
   right:1.0un;
   bottom:var(hb-param-margin-gene-bottom);
+  top:-var(hb-param-margin-gene-middle-vertical);
   text-align:left;
   text-height:var(hb-param-text-height-tiny);
   font-variant:primary;
@@ -172,6 +173,7 @@
 {
   zvalue:1;
   left:-var(hb-param-margin-gene-middle-horizontal);
+  top:-var(hb-param-margin-gene-middle-vertical);
   aspect-ratio:ignore;
   size-policy:fixed fixed;
   pref-width:var(hb-param-graphic-size-primary-small);