diff --git a/UI/WebServerResources/MailerUI.css b/UI/WebServerResources/MailerUI.css
index 1997ee89d..f10b370af 100644
--- a/UI/WebServerResources/MailerUI.css
+++ b/UI/WebServerResources/MailerUI.css
@@ -72,6 +72,13 @@ DIV#messageContent
   background: #fff;
 }
 
+DIV#messageContent P IMG
+{
+  border: 0px;
+  vertical-align: middle;
+  margin-right: 1em;
+}
+
 DIV#folderTreeContent
 {
   position: absolute;
@@ -84,18 +91,6 @@ DIV#folderTreeContent
   border: 1px solid #fff;
 }
 
-DIV#messageContent P
-{
-  line-height: 3em;
-}
-
-DIV#messageContent P IMG
-{
-  border: 0px;
-  vertical-align: middle;
-  margin-right: 1em;
-}
-
 .aptview_title
 {
   color: #000000;
@@ -378,6 +373,23 @@ DIV.mailer_plaincontent
   padding: 0px;
 }
 
+DIV.mailer_plaincontent P
+{
+  line-height: 3em;
+  height: auto;
+  margin: 0px;
+  padding: 0px;
+}
+
+DIV.mailer_htmlcontent P
+{ 
+  white-space: normal;
+  font-family: serif;
+  font-size: inherit;
+  margin: 0px;
+  padding: 0px;
+}
+
 /* attachment editor */
 
 form#attachment_form