diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 74966c176a..3416e7c330 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -235,6 +235,7 @@ pre {
 .containerTableStyle {
 	width: 100%;
 	overflow: hidden;
+	overflow-y: auto;
 }
 .dtree {
 	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
@@ -714,7 +715,7 @@ div.mailPreviewHeaders #mail-index_previewAttachmentArea.visible {
 #mail-folder_management table.et2_grid tr td {
   padding: 0px;
 }
-#mail-subscribe table.et2_grid tr td div.et2_box,
+#mail-subscribe table.et2_grid tr td et2-box,
 #mail-folder_management table.et2_grid tr td .mail_subscription_header {
   height: 500px;
   overflow: auto;
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 10928ed62b..b1e315b31b 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -226,6 +226,7 @@ pre {
 .containerTableStyle {
   width: 100%;
   overflow: hidden;
+  overflow-y: auto;
 }
 .dtree {
   font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
@@ -709,7 +710,7 @@ div.mailPreviewHeaders #mail-index_previewAttachmentArea.visible {
 #mail-folder_management table.et2_grid tr td {
   padding: 0px;
 }
-#mail-subscribe table.et2_grid tr td div.et2_box,
+#mail-subscribe table.et2_grid tr td et2-box,
 #mail-folder_management table.et2_grid tr td .mail_subscription_header {
   height: 500px;
   overflow: auto;
@@ -1350,8 +1351,8 @@ div#displayToolbar-menulist img {
   font-size: 150%;
   padding-bottom: 20px;
 }
-#mail-subscribe table.et2_grid tr td div.et2_box,
-#mail-folder_management table.et2_grid tr td div.et2_box {
+#mail-subscribe table.et2_grid tr td et2-box,
+#mail-folder_management table.et2_grid tr td et2-box {
   margin-top: 16px;
   height: 484px;
   overflow: auto;
@@ -1620,6 +1621,7 @@ pre {
 .containerTableStyle {
   width: 100%;
   overflow: hidden;
+  overflow-y: auto;
 }
 .dtree {
   font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index cd0b84cd86..4383141e1d 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -458,7 +458,7 @@ div#displayToolbar-menulist {
 
 		}
 		// Folder List
-		div.et2_box {
+		et2-box {
 		 margin-top: 16px;
 		 height: 484px;
 		 overflow: auto;
@@ -747,6 +747,7 @@ pre {
 .containerTableStyle {
 	width: 100%;
 	overflow: hidden;
+	overflow-y: auto;
 }