From c18c35b500874f427846fdb52ad798ec934981cb Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Tue, 28 Mar 2017 12:22:51 +0200
Subject: [PATCH] Fix attachments-box in mail display dialog does not get
 scrollbar

---
 mail/templates/default/app.css  |  9 ++++++---
 mail/templates/mobile/app.css   | 23 +++++++++++++++++++----
 mail/templates/pixelegg/app.css |  9 ++++++---
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index eaf9a775bb..c04e00ccc6 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -533,6 +533,8 @@ div.mail-compose_fileselector {
 
 #mail-display {
 	min-height: 768px;
+	margin: 0;
+    padding: 5px;
 }
 .mailDisplayContainer, .mailDisplayAttachments {
 	display: block;
@@ -554,7 +556,7 @@ div.mail-compose_fileselector {
 	overflow: hidden;
 }
 .mailDisplayContainerFullHeight {
-	bottom: .1em;
+	bottom: 108px;
 }
 .mailDisplayBody {
 	height:100%;
@@ -564,13 +566,14 @@ div.mail-compose_fileselector {
 	margin:0px;
 }
 .mailDisplayAttachments {
-	height: 121px;
+	height: 114px;
 	position: fixed;
-	bottom: .1em;
+	bottom: 8px;
 	border-top: 1px solid grey;
 	opacity: 1;
 	-moz-opacity:1;
 	filter: Alpha(opacity=100);
+	overflow-y: auto;
 }
 #mail-display_mailDisplayBodySrc {
 	height:100%;
diff --git a/mail/templates/mobile/app.css b/mail/templates/mobile/app.css
index 8948ca0f94..b2dce31187 100644
--- a/mail/templates/mobile/app.css
+++ b/mail/templates/mobile/app.css
@@ -303,6 +303,18 @@ pre {
 .mail-index_vacation > div > span {
   color: red;
 }
+#mail-index_blank {
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  background-color: white;
+  z-index: 10;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  font-size: 200%;
+}
 .mail_DisplayNone {
   display: none !important;
 }
@@ -534,6 +546,8 @@ div.mail-compose_fileselector {
 }
 #mail-display {
   min-height: 768px;
+  margin: 0;
+  padding: 5px;
 }
 .mailDisplayContainer,
 .mailDisplayAttachments {
@@ -556,7 +570,7 @@ div.mail-compose_fileselector {
   overflow: hidden;
 }
 .mailDisplayContainerFullHeight {
-  bottom: .1em;
+  bottom: 108px;
 }
 .mailDisplayBody {
   height: 100%;
@@ -566,13 +580,14 @@ div.mail-compose_fileselector {
   margin: 0px;
 }
 .mailDisplayAttachments {
-  height: 121px;
+  height: 114px;
   position: fixed;
-  bottom: .1em;
+  bottom: 8px;
   border-top: 1px solid grey;
   opacity: 1;
   -moz-opacity: 1;
   filter: alpha(opacity=100);
+  overflow-y: auto;
 }
 #mail-display_mailDisplayBodySrc {
   height: 100%;
@@ -814,7 +829,7 @@ blockquote blockquote blockquote blockquote blockquote blockquote {
     display: inline-block;
   }
   div.mail_extraEmails + img.et2_button.et2_button_icon.ui-button.et2_clickable {
-    display: none;
+    display: none !important;
   }
   .et2_email:after {
     content: " | ";
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 1f89a259fe..1a43818329 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -534,6 +534,8 @@ div.mail-compose_fileselector {
 }
 #mail-display {
   min-height: 768px;
+  margin: 0;
+  padding: 5px;
 }
 .mailDisplayContainer,
 .mailDisplayAttachments {
@@ -556,7 +558,7 @@ div.mail-compose_fileselector {
   overflow: hidden;
 }
 .mailDisplayContainerFullHeight {
-  bottom: .1em;
+  bottom: 108px;
 }
 .mailDisplayBody {
   height: 100%;
@@ -566,13 +568,14 @@ div.mail-compose_fileselector {
   margin: 0px;
 }
 .mailDisplayAttachments {
-  height: 121px;
+  height: 114px;
   position: fixed;
-  bottom: .1em;
+  bottom: 8px;
   border-top: 1px solid grey;
   opacity: 1;
   -moz-opacity: 1;
   filter: alpha(opacity=100);
+  overflow-y: auto;
 }
 #mail-display_mailDisplayBodySrc {
   height: 100%;