diff --git a/skins/default/mail.css b/skins/default/mail.css
index aa35b6927..50b111186 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -120,6 +120,12 @@ td.formlinks a:visited
   text-decoration: underline;
 }
 
+#listcontrols,
+#mailboxcontrols
+{
+  padding-right: 2em;
+}
+
 #messagecountbar
 {
   position: absolute;
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index 10c17f0ae..43ff43bb3 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -89,10 +89,12 @@
 <roundcube:button command="select-all" label="all" classAct="active" />&nbsp;
 <roundcube:button command="select-all" prop="unread" label="unread" classAct="active" />&nbsp;
 <roundcube:button command="select-none" label="none" classAct="active" /> &nbsp;
+</span>
 <roundcube:if condition="env:quota" />
+<span id="quotabox">
 <roundcube:label name="quota" />: <roundcube:object name="quotaDisplay" display="image" width="100" id="quotadisplay" />
-<roundcube:endif />
 </span>
+<roundcube:endif />
 </td>
 <td width="1%">
 <span id="countcontrols">