diff --git a/mail/js/app.js b/mail/js/app.js
index 2b32ed99fe..89bd22ee82 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -607,7 +607,8 @@ app.classes.mail = AppJS.extend(
 		//this.et2.getWidgetById('mailPreviewHeadersDate').set_disabled(_value);
 		//this.et2.getWidgetById('mailPreviewHeadersSubject').set_disabled(_value);
 		this.et2.getWidgetById('mailPreview').set_disabled(_value);
-		if (_value==true)
+		//Dock the splitter always if we are browsing with mobile
+		if (_value==true || egwIsMobile())
 		{
 			if (this.mail_previewAreaActive) splitter.dock();
 			this.mail_previewAreaActive = false;
diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 08cde7c87e..7aee5f3f83 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -798,9 +798,6 @@ blockquote blockquote blockquote blockquote blockquote blockquote{
 
 /* MOBILE and tablets (Portrait & Landscape) View --------------*/
 @media only screen and (max-device-width:1024px) {
-	div#mail-index_nm {
-		height: 100% !important;
-	}
 	/*Disable the preview spliter*/
 	div#mail-index_mailPreview, div.splitter-bar {
 		display: none !important;
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index f6204299c4..62614bc353 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -791,9 +791,6 @@ blockquote blockquote blockquote blockquote blockquote blockquote {
 }
 /* MOBILE and tablets (Portrait & Landscape) View --------------*/
 @media only screen and (max-device-width: 1024px) {
-  div#mail-index_nm {
-    height: 100% !important;
-  }
   /*Disable the preview spliter*/
   div#mail-index_mailPreview,
   div.splitter-bar {