diff --git a/UI/WebServerResources/MailerUI.css b/UI/WebServerResources/MailerUI.css
index abd9a6ec1..7de9b5825 100644
--- a/UI/WebServerResources/MailerUI.css
+++ b/UI/WebServerResources/MailerUI.css
@@ -336,16 +336,14 @@ TABLE.mailer_fieldtable
   width: 100%; }
 
 DIV.mailer_mailcontent
-{
-  background-color: #fff;
-  position: absolute;
+{ background-color: #fff;
   padding: .5em;
+  position: absolute;
   top: 7.5em;
-  overflow: auto;
   left: 0px;
   right: 0px;
   bottom: 0px;
-}
+  overflow: auto; }
 
 TD.mailer_fieldname
 {
@@ -379,7 +377,7 @@ img.mailer_imagecontent
 }
 
 DIV.mailer_plaincontent
-{
+{ 
   position: relative;
   font-family: monospace, fixed;
   white-space: pre;
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index fe7fe3aa8..85cbeb013 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -694,6 +694,7 @@ function loadMessage(idx) {
     cachedMessage['time'] = (new Date()).getTime();
     document.messageAjaxRequest = null;
     configureLinksInMessage();
+    resizeMailContent();
   }
 }
 
@@ -720,6 +721,13 @@ function configureLinksInMessage() {
     Event.observe(editDraftButton, "click", onMessageEditDraft);
 }
 
+function resizeMailContent() {
+  var headerTable = document.getElementsByClassName('mailer_fieldtable')[0];
+  var contentDiv = document.getElementsByClassName('mailer_mailcontent')[0];
+  
+  contentDiv.setStyle({ 'top': (Element.getHeight(headerTable) + headerTable.offsetTop) + 'px' });
+}
+
 function onMessageContentMenu(event) {
   popupMenu(event, 'messageContentMenu', this);
 }
@@ -745,7 +753,8 @@ function messageCallback(http) {
     document.messageAjaxRequest = null;
     div.update(http.responseText);
     configureLinksInMessage();
-      
+    resizeMailContent();
+    
     if (http.callbackData) {
       var cachedMessage = new Array();
       cachedMessage['idx'] = currentMailbox + '/' + http.callbackData;
diff --git a/UI/WebServerResources/UIxMailPopupView.js b/UI/WebServerResources/UIxMailPopupView.js
index 98e8eb71b..bfbed7db0 100644
--- a/UI/WebServerResources/UIxMailPopupView.js
+++ b/UI/WebServerResources/UIxMailPopupView.js
@@ -4,11 +4,4 @@ function onPrintCurrentMessage(event) {
   preventDefault(event);
 }
 
-function initMailerPopup(event) {
-  var headerTable = document.getElementsByClassName('mailer_fieldtable')[0];
-  var contentDiv = document.getElementsByClassName('mailer_mailcontent')[0];
-
-  contentDiv.setStyle({ 'top': (Element.getHeight(headerTable) + headerTable.offsetTop) + 'px' });
-}
-
-addEvent(window, 'load', initMailerPopup);
+addEvent(window, 'load', resizeMailContent);