diff --git a/UI/Templates/MailerUI/UIxMailSearch.wox b/UI/Templates/MailerUI/UIxMailSearch.wox
index 2691ec54a..9e5707420 100644
--- a/UI/Templates/MailerUI/UIxMailSearch.wox
+++ b/UI/Templates/MailerUI/UIxMailSearch.wox
@@ -53,28 +53,22 @@
     </tbody>
   </table>
   <div id="searchFiltersList">
-    <table>
-    </table>
+    <table><!-- filters --></table>
   </div>
   <div id="resultsTable">
     <table id="searchMailFooter" class="sortable messageList" cellspacing="0">
       <thead>
-        <tr>
-          <td id="subjectSearchHeader" class="td_header">
-            <var:string label:value="Subject" /></td>
-          <td id="fromSearchHeader" class="td_header">
-            <var:string label:value="From"/></td>
-          <td id="toSearchHeader" class="td_header">
-            <var:string label:value="To" /></td>
-          <td id="dateSearchHeader" class="td_header">
-            <var:string label:value="Date" /></td>
-          <td id="locationSearchHeader" class="td_header">
-            <var:string label:value="Location" /></td>
-          <td id="buttonExpandHeader" class="td_header">
-            <div id="imgPosition">
-              <a href="#" id="listCollapse">
-                <img rsrc:src="collapse.png" class="collapse" onclick="onResizeClick()" />
-              </a></div></td>
+        <tr class="tableview">
+          <td id="subjectSearchHeader" class="td_header"><var:string label:value="Subject" /></td>
+          <td id="fromSearchHeader" class="td_header"><var:string label:value="From"/></td>
+          <td id="toSearchHeader" class="td_header"><var:string label:value="To" /></td>
+          <td id="dateSearchHeader" class="td_header"><var:string label:value="Date" /></td>
+          <td id="locationSearchHeader" class="td_header"><var:string label:value="Location" /></td>
+          <td id="buttonExpandHeader" class="td_header"
+              ><a href="#" id="listCollapse"
+                  ><img rsrc:src="collapse.png" class="collapse" onclick="onResizeClick()"
+              /></a
+          ></td>
         </tr>
       </thead>
       <tbody>
diff --git a/UI/WebServerResources/UIxMailSearch.css b/UI/WebServerResources/UIxMailSearch.css
index c513b760f..37302c61e 100644
--- a/UI/WebServerResources/UIxMailSearch.css
+++ b/UI/WebServerResources/UIxMailSearch.css
@@ -26,9 +26,6 @@ DIV#resultsTable
    width:100%;
 }
 
-TABLE.messageList TD
-{ white-space: normal !important; }
-
 TD#mailAccountsCell {
   overflow:hidden;
   white-space: nowrap;
@@ -90,15 +87,7 @@ TD.sortdesc {
 {text-decoration: underline; }
 
 #buttonExpandHeader {
-  width:10px;
-}
-
-@-moz-document url-prefix() {
-  #buttonExpandHeader {
-    width:1.5%;
-    border-right:0;
-  }
-
+  width: 20px;
 }
 
 /*************** Button adjustment *****************/
@@ -156,60 +145,33 @@ A#deleteButton, A#openButton
   right:10px;
 }
 
-DIV#imgPosition
-{ z-index: 1;
-  position:relative; }
+#listCollapse
+{ position: relative;
+  border: 1px solid transparent; }
 
-A#listCollapse > img
+#listCollapse img
 { position: absolute; }
 
-A#listCollapse > img.collapse
+#listCollapse img.collapse
 { clip: rect(0 18px 18px 0);
-  top: -9px;
-  right: -22px; }
+  top: 0;
+  left: 0; }
 
-A#listCollapse > img.collapse:hover
+#listCollapse img.collapse:hover
 { clip: rect(0 36px 18px 18px);
-  top: -9px;
-  right: -4px; }
+  top: 0;
+  left: -18px; }
 
-A#listCollapse > img.rise
+#listCollapse img.rise
 { clip: rect(18px 18px 36px 0);
-  top: -27px;
-  right:-22px;
-  }
+  top: -18px;
+  left: 0; }
 
-A#listCollapse > img.rise:hover
+#listCollapse img.rise:hover
 { clip: rect(18px 36px 36px 18px);
-  top: -27px;
-  right:-4px; }
+  top: -18px;
+  left: -18px; }
 
-@-moz-document url-prefix() {
-  #listCollapse img
-  { position: absolute; }
-
-  #listCollapse img.collapse
-  { clip: rect(0 18px 18px 0);
-    top: 2px;
-    right: -16px; }
-
-  #listCollapse img.collapse:hover
-  { clip: rect(0 36px 18px 18px);
-    top: 2px;
-    right: 2px; }
-
-  #listCollapse img.rise
-  { clip: rect(18px 18px 36px 0);
-    top: -16px;
-    right:-16px;
-    }
-
-  #listCollapse img.rise:hover
-  { clip: rect(18px 36px 36px 18px);
-    top: -16px;
-    right:2px; }
-}
-  
 #filterButtons 
 {
   width:40px;
diff --git a/UI/WebServerResources/UIxMailSearch.js b/UI/WebServerResources/UIxMailSearch.js
index 4aa9a8790..c0196a6ad 100644
--- a/UI/WebServerResources/UIxMailSearch.js
+++ b/UI/WebServerResources/UIxMailSearch.js
@@ -450,14 +450,13 @@ function onResizeClick() {
     var state = "collapse";
   
     if (searchFiltersList[0].visible()) {
-        var state = "rise";
+        state = "rise";
         searchFiltersList.fadeOut(300, function() {
             adjustResultsTable(state);
             img.removeClassName('collapse').addClassName('rise');
         });
     }
     else {
-        state = "collapse"
         adjustResultsTable(state);
         searchFiltersList.fadeIn();
         img.removeClassName('rise').addClassName('collapse');
@@ -490,4 +489,4 @@ function initSearchMailView () {
                   var state = ($("searchFiltersList").visible() ? "collapse": "rise");
                   adjustResultsTable(state);
                   });
-}
\ No newline at end of file
+}