diff --git a/UI/Templates/MailerUI/UIxMailView.wox b/UI/Templates/MailerUI/UIxMailView.wox
index e211cd644..fd454765f 100644
--- a/UI/Templates/MailerUI/UIxMailView.wox
+++ b/UI/Templates/MailerUI/UIxMailView.wox
@@ -12,9 +12,7 @@
     <table class="mailer_fieldtable">
       <tr class="mailer_fieldrow">
         <td class="mailer_fieldname" ><var:string label:value="Subject"/>:</td>
-        <td class="mailer_subjectfieldvalue">
-          <var:string value="messageSubject"/>
-        </td>
+        <td class="mailer_subjectfieldvalue"><var:string value="messageSubject"/></td>
       </tr>
       <tr class="mailer_fieldrow">
         <td class="mailer_fieldname" ><var:string label:value="From"/>:</td>
diff --git a/UI/WebServerResources/MailerUI.css b/UI/WebServerResources/MailerUI.css
index e81a05d57..9e6d1fdc1 100644
--- a/UI/WebServerResources/MailerUI.css
+++ b/UI/WebServerResources/MailerUI.css
@@ -407,6 +407,12 @@ TD.mailer_fieldvalue
 TD.mailer_subjectfieldvalue
 {
   font-weight: bold;
+  white-space: pre;
+  white-space: pre-wrap;                  /* css-3 */
+  white-space: -moz-pre-wrap !important;  /* Mozilla, since 1999 */
+  white-space: -pre-wrap;                 /* Opera 4-6 */
+  white-space: -o-pre-wrap;               /* Opera 7 */
+  white-space: pre-wrap;
 }
 
 TD.mailer_fieldvalue a
@@ -427,7 +433,6 @@ DIV.mailer_plaincontent
 { 
   position: relative;
   font-family: monospace, fixed;
-  white-space: pre;
   white-space: pre-wrap;                  /* css-3 */
   white-space: -moz-pre-wrap !important;  /* Mozilla, since 1999 */
   white-space: -pre-wrap;                 /* Opera 4-6 */
@@ -557,6 +562,9 @@ TABLE#messageList TH
 TABLE#messageList TH
 { white-space: pre; }
 
+TABLE#messageList TBODY TD
+{ white-space: pre; }
+
 TD#messageFlagHeader,
 TABLE#messageList TD.messageFlagColumn
 { width: 22px;