diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 540f7eece0..3d88c239ac 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -549,6 +549,9 @@ div.mail-compose_fileselector {
 	-moz-opacity:1;
 	filter: Alpha(opacity=100);
 }
+#mail-display_mailDisplayBodySrc {
+	height:100%;
+}
 #divGenTime_mail {
 	display: none;
 }
diff --git a/mail/templates/default/display.xet b/mail/templates/default/display.xet
index 040cd465e5..70512dfd58 100644
--- a/mail/templates/default/display.xet
+++ b/mail/templates/default/display.xet
@@ -48,7 +48,7 @@
 		</vbox>
 		<vbox class="mailDisplay">
 			<box class="$cont[mailDisplayContainerClass]">
-				<iframe frameborder="1" class="mail_displaybody" id="mailDisplayBodySrc" name="mailDisplayBodySrc" scrolling="auto" width="100%" height="100%"/>
+				<iframe frameborder="1" class="mail_displaybody" id="mailDisplayBodySrc" name="mailDisplayBodySrc" scrolling="auto" width="100%"/>
 			</box>
 			<box class="$cont[mailDisplayAttachmentsClass]">
 				<!-- <html id="mail_displayattachments"/> -->
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 80f0354c38..79228d3ed1 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -739,6 +739,7 @@ div.mailPreviewHeaders #mail-index_previewAttachmentArea.visible {
 */
 /*Border around iframe*/
 iframe#mail-display_mailDisplayBodySrc {
+  height: 99%;
   /*border: 4px solid yellow;*/
 }
 /*Border around iframe*/
@@ -2643,7 +2644,7 @@ div.mailPreviewHeaders div.mail_extraEmails img.et2_button_icon {
   overflow-y: auto;
   border: 0px solid silver;
   top: 120px;
-  bottom: 100px;
+  bottom: 110px;
 }
 .mailDisplayHeaders {
   overflow: hidden;
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index c7cdf6771b..5a9ca0a5fa 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -47,7 +47,7 @@
 
 /*Border around iframe*/
 iframe#mail-display_mailDisplayBodySrc{
-
+	height: 99%;
     /*border: 4px solid yellow;*/
 
 }
@@ -1842,7 +1842,7 @@ div.mailPreviewHeaders div.mail_extraEmails {
     overflow-y: auto;
     border: 0px solid silver;
     top: 120px;
-    bottom: 100px;
+    bottom: 110px;
 }
 
 .mailDisplayHeaders {
