diff --git a/mail/templates/mobile/app.css b/mail/templates/mobile/app.css
index 5a9bea6579..4cd8d712d4 100644
--- a/mail/templates/mobile/app.css
+++ b/mail/templates/mobile/app.css
@@ -127,10 +127,17 @@
   }
   body #popupMainDiv div#mail-view {
     height: 100%;
+    box-sizing: border-box;
+  }
+  body #popupMainDiv div#mail-view div > et2-vbox {
+    height: 100%;
   }
   body #popupMainDiv div#mail-view #mail-view_subject {
     font-size: 12pt;
   }
+  body #popupMainDiv div#mail-view .mailContent {
+    flex-grow: 1;
+  }
   body #popupMainDiv #mail-view_toaddressdetails {
     color: #26537c;
     float: right;
@@ -354,4 +361,3 @@
     position: inherit;
   }
 }
-/*# sourceMappingURL=app.css.map */
\ No newline at end of file
diff --git a/mail/templates/mobile/app.less b/mail/templates/mobile/app.less
index baec3d91f7..1de9b91b0f 100644
--- a/mail/templates/mobile/app.less
+++ b/mail/templates/mobile/app.less
@@ -137,10 +137,19 @@
 			}
 			div#mail-view {
 				height: 100%;
+				box-sizing: border-box;
+
+				div > et2-vbox {
+				  height: 100%
+				}
 				#mail-view_subject
 				{
 					.mob-fontsize-l;
 				}
+
+			  .mailContent {
+				flex-grow: 1;
+			  }
 			}
 			#mail-view_toaddressdetails {
 				color: #26537c;
diff --git a/mail/templates/mobile/view.xet b/mail/templates/mobile/view.xet
index 9fec876556..63454f98b7 100644
--- a/mail/templates/mobile/view.xet
+++ b/mail/templates/mobile/view.xet
@@ -2,7 +2,7 @@
 <!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.view" template="" lang="" group="0" version="1.9.001" height="100%">
-		<et2-vbox  width="100%" height="100%">
+        <et2-vbox width="100%">
 			<et2-hbox  class="dialogHeadbar">
 				<et2-hbox>
 					<toolbar id="toolbar"  class="et2_head_toolbar" width="100%" view_range="1" flat_list="true"/>
@@ -91,7 +91,7 @@
 					</et2-details>
 				</et2-vbox>
 			</et2-hbox>
-			<et2-box  height="100%">
+            <et2-box class="mailContent">
 				<iframe id="iframe" width="100%" height="100%" scrolling="auto"/>
 			</et2-box>
 		</et2-vbox>