diff --git a/mail/templates/mobile/app.css b/mail/templates/mobile/app.css
index 3414921c47..58da5678fa 100644
--- a/mail/templates/mobile/app.css
+++ b/mail/templates/mobile/app.css
@@ -907,6 +907,9 @@ body {
 #mail-index div#mail-index_nm div.nextmatch_header div.filters input#mail-index_search {
   /*height: 20px !important;*/
 }
+#mail-index div#mail-index_nm .egwGridView_outer {
+  margin-right: 10px;
+}
 #mail-index div#mail-index_nm tr.mail td img {
   max-height: 50px;
   -webkit-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index d084b634ec..24a0b2e545 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -895,6 +895,9 @@ body {
 #mail-index div#mail-index_nm div.nextmatch_header div.filters input#mail-index_search {
   /*height: 20px !important;*/
 }
+#mail-index div#mail-index_nm .egwGridView_outer {
+  margin-right: 10px;
+}
 #mail-index div#mail-index_nm tr.mail td img {
   max-height: 50px;
   -webkit-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index 410a0b921d..c3b2a0fa73 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -114,6 +114,12 @@ body {
 
             } // Ende Header
 
+			
+
+			// Keeps the scrollbar in the window in Firefox
+			.egwGridView_outer {
+				margin-right: 10px;
+			}
 
             // Listenausgabe der Emails
             div {}