diff -r b13141f05c3d -r b5fbb9b25d57 emailuis/emailui/data/html/header.js
--- a/emailuis/emailui/data/html/header.js	Tue Apr 27 16:20:14 2010 +0300
+++ b/emailuis/emailui/data/html/header.js	Tue May 11 15:57:15 2010 +0300
@@ -4,48 +4,48 @@
 var setScrollPositionInterval;
 
 function collapseHeader(sendEvent) {
-	if (sendEvent) {
-    	location.href = "cmail://collapseHeader/";
-    	}
+    if (sendEvent) {
+        location.href = "cmail://collapseHeader/";
+        }
     collapsed = true;
-	handleHeaderDisplay( "header_table", "table_initial" );
-	updateHeader();
-	}
+    handleHeaderDisplay('expanded_header', 'collapsed_header');
+    updateHeader();
+    }
 
 function expandHeader(sendEvent) {
-	if (sendEvent) {
-	    location.href = "cmail://expandHeader/";
-    	}
-	collapsed = false;
-	handleHeaderDisplay( "table_initial", "header_table" )
-	parent.document.getElementById('email_frameSet').rows = "40%, *";
-	}
+    if (sendEvent) {
+        location.href = "cmail://expandHeader/";
+        }
+    collapsed = false;
+    handleHeaderDisplay('collapsed_header', 'expanded_header');
+    updateHeader();
+    }
 
 function updateHeader() {
     var rows = "40%, *";
-	if (collapsed) {
-    	if (displayImagesHidden || (parent.header_frame.g_autoLoadImages != 0) || (parent.hiddenCount == 0)) {
+    if (collapsed) {
+        if (displayImagesHidden || (parent.header_frame.g_autoLoadImages != 0) || (parent.hiddenCount == 0)) {
             rows = "10%, *";
         } else {
             rows = "17%, *";
-	    }
-	}
+            }
+        }
     parent.document.getElementById('email_frameSet').rows = rows;
     }
 
 function handleHeaderDisplay( tableToHide, tableToShow ) {
-	document.getElementById(tableToShow).style.display = "";
-	document.getElementById(tableToHide).style.display = "none";
-	}
+    document.getElementById(tableToHide).style.display = 'none';
+    document.getElementById(tableToShow).style.display = '';
+    }
 
 function init(scrollPos) {
-	if (document.getElementById("table_initial").style.display != "none") {
-    	    collapseHeader(false);
-	} else {
-	    expandHeader(false);
-	}
+    if (document.getElementById('collapsed_header').style.display != 'none') {
+        collapseHeader(false);
+    } else {
+        expandHeader(false);
+    }
     window.scrollTo(0, scrollPos);
-	setScrollPositionInterval = setInterval("updateScrollPosition()", 500);
+    setScrollPositionInterval = setInterval("updateScrollPosition()", 500);
     }
 
 function displayImagesButtonPressed() {