--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdialog/hbdialog.css	Thu Sep 02 20:44:51 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdialog/hbdialog.css	Fri Sep 17 08:32:10 2010 +0300
@@ -1,19 +1,19 @@
 HbDialog {
     max-width:expr(var(hb-param-screen-width)-2*var(hb-param-margin-gene-screen));
     max-height:expr(var(hb-param-screen-height)-2*var(hb-param-margin-gene-screen));
-	layout:default;
+    layout:default;
 }
 
 HbDialog[heading_layout] {
-	layout:content_header;
+    layout:content_header;
 }
 
 HbDialog[controls_layout] {
-	layout:content_controls;
+    layout:content_controls;
 }
 
 HbDialog[heading_layout][controls_layout] {
-	layout:content_header_controls;
+    layout:content_header_controls;
 }
 
 HbDialog::heading {
@@ -22,16 +22,25 @@
     top:-var(hb-param-margin-gene-popup);
     bottom:var(hb-param-margin-gene-popup);
     text-height:var(hb-param-text-height-primary);
+    text-line-count-min:1;
+    text-line-count-max:1;
+    text-wrap-mode:no-wrap;
     text-align:left;
     font-variant:primary;
     max-height:expr(var(hb-param-text-height-primary)+2*var(hb-param-margin-gene-popup));
-	bottom:var(hb-param-margin-gene-popup);
 }
 
-HbDialog::controls {	
-    top:-var(hb-param-margin-gene-popup);
+HbDialog::background {
+    left:0un;
+    right:0un;
+    top:0un;
+    bottom:0un;
+    max-height:expr(var(hb-param-text-height-primary)+2*var(hb-param-margin-gene-popup));	
+}
+
+HbDialog::controls {
     min-width:expr(var(hb-param-screen-short-edge)-2*var(hb-param-margin-gene-screen));
-	fixed-height:var(hb-param-widget-popup-softkey-height);
+    fixed-height:var(hb-param-widget-popup-softkey-height);
 }
 
 HbDialog::content {
@@ -39,10 +48,9 @@
     right:var(hb-param-margin-gene-popup);
     top:-var(hb-param-margin-gene-popup);
     bottom:var(hb-param-margin-gene-popup);
-
 }
 
-HbDialog > HbListWidget {
+HbDialog[list_content]::content {
     left:-var(hb-param-margin-gene-popup-list);
     right:var(hb-param-margin-gene-popup-list);
     top:-var(hb-param-margin-gene-popup-list);