diff --git a/UI/Templates/MailerUI/UIxMailSearch.wox b/UI/Templates/MailerUI/UIxMailSearch.wox
index cb728c681..2691ec54a 100644
--- a/UI/Templates/MailerUI/UIxMailSearch.wox
+++ b/UI/Templates/MailerUI/UIxMailSearch.wox
@@ -57,7 +57,7 @@
     </table>
   </div>
   <div id="resultsTable">
-    <table id="searchMailFooter" class="sortable messageList">
+    <table id="searchMailFooter" class="sortable messageList" cellspacing="0">
       <thead>
         <tr>
           <td id="subjectSearchHeader" class="td_header">
@@ -79,7 +79,7 @@
       </thead>
       <tbody>
         <tr>
-          <td colspan="4" id="noSearchResults"><var:string label:value="No matches found" /></td>
+          <td colspan="6" id="noSearchResults"><var:string label:value="No matches found" /></td>
         </tr>
       </tbody>
     </table>
diff --git a/UI/WebServerResources/UIxMailSearch.css b/UI/WebServerResources/UIxMailSearch.css
index 0bf6e49b7..c513b760f 100644
--- a/UI/WebServerResources/UIxMailSearch.css
+++ b/UI/WebServerResources/UIxMailSearch.css
@@ -26,12 +26,15 @@ DIV#resultsTable
    width:100%;
 }
 
+TABLE.messageList TD
+{ white-space: normal !important; }
+
 TD#mailAccountsCell {
   overflow:hidden;
   white-space: nowrap;
 }
 
-TR.filterRow
+TR.filterRow, DIV#searchFiltersList > TABLE
 {
   width:100%;
 }
@@ -44,12 +47,12 @@ TR.filterRow > TD
 
 TR.filterRow > TD.buttonsCell 
 {
-  width:7%;
+  width:5%;
 }
 
 TR.filterRow > TD.inputsCell
 {
-  width:70%;
+  width:55%;
 }
 
 .td_table_1, .td_table_2, .td_table_3, .td_table_4 {
@@ -113,7 +116,9 @@ TD.sortdesc {
 
 .searchByList, .searchArgumentsList, .searchInput
 {
-  width:100%;
+  width:98%;
+  paddin:0;
+  margin:0;
 }
 
 DIV#optionsButtons
diff --git a/UI/WebServerResources/UIxMailSearch.js b/UI/WebServerResources/UIxMailSearch.js
index fbd3ffa86..4aa9a8790 100644
--- a/UI/WebServerResources/UIxMailSearch.js
+++ b/UI/WebServerResources/UIxMailSearch.js
@@ -298,6 +298,7 @@ function onAddFilter() {
     
     var cell4 = row.insertCell(3);
     Element.addClassName(cell4, "buttonsCell");
+    cell4.setAttribute("align", "center");
     
     var buttonsDiv = document.createElement("div");
     var imageAddFilter = document.createElement("img");
@@ -465,12 +466,13 @@ function onResizeClick() {
 
 function adjustResultsTable(state) {
     var resultsTable = $("resultsTable");
-    var height = $("searchMailView").getHeight();
-    if (state == "collapse")
-        height = height - 266;
+    var height = "innerHeight" in $("searchMailView") ? $("searchMailView").innerHeight : $("searchMailView").offsetHeight;
+    if (state == "collapse") {
+        height -= 266;
+    }
     else
-        height = height - 152;
-    resultsTable.style.height = height + "px";
+        height -= 152;
+    $(resultsTable).style.height = height + "px";
 }
 
 /*************** Init ********************/
diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css
index dfd2aecfb..4b7a87351 100644
--- a/UI/WebServerResources/generic.css
+++ b/UI/WebServerResources/generic.css
@@ -668,7 +668,7 @@ DIV.dialog.searchMail {
 }
 
 DIV.dialog.searchMail > DIV {
-  min-height:467px;
+  min-height:500px;
 }
 
 DIV.dialog.none
diff --git a/UI/WebServerResources/iefixes.css b/UI/WebServerResources/iefixes.css
index be993817a..aaf871494 100644
--- a/UI/WebServerResources/iefixes.css
+++ b/UI/WebServerResources/iefixes.css
@@ -54,6 +54,9 @@ DIV.colorBox
 IMG.dragMessage
 { filter: alpha(opacity=70); }
 
+TABLE.messageList TD
+{ white-space: pre; }
+
 TABLE.messageList TR._selected TD
 { border-right: 1px solid #9ABCD8 !important; }