- Fix 'Empty' link visibility for some languages e.g. Slovak (#1485489)

- Fix messages count bar overlapping (#1485270)

1 files changed, 16 insertions, 9 deletions

diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index 71bad46c4..6a6347932 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -75,29 +75,36 @@
 
 </div>
 
-<div id="mailboxcontrols">
+<div id="mailfooter">
+<table cellpadding="1" cellspacing="0">
+<tr>
+<td width="99%">
+<span id="mailboxcontrols">
 <roundcube:label name="folder" />:&nbsp;
 <roundcube:button command="expunge" label="compact" classAct="active" />&nbsp;
 <roundcube:button command="purge" label="empty" classAct="active" />&nbsp;
-</div>
-
-
-<div id="listcontrols">
+</span>
+<span id="listcontrols">
 <roundcube:label name="select" />:&nbsp;
 <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;&nbsp;&nbsp;
+<roundcube:button command="select-none" label="none" classAct="active" /> &nbsp;
 <roundcube:if condition="env:quota" />
 <roundcube:label name="quota" />: <roundcube:object name="quotaDisplay" display="image" width="100" id="quotadisplay" />
 <roundcube:endif />
-</div>
-
-<div id="messagecountbar">
+</span>
+</td>
+<td width="1%">
+<span id="countcontrols">
 <roundcube:button command="firstpage" imageSel="/images/buttons/first_sel.png" imageAct="/images/buttons/first_act.png" imagePas="/images/buttons/first_pas.png" width="11" height="11" title="firstmessages" />
 <roundcube:button command="previouspage" imageSel="/images/buttons/previous_sel.png" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previousmessages" />
 &nbsp;<roundcube:object name="messageCountDisplay" />&nbsp;
 <roundcube:button command="nextpage" imageSel="/images/buttons/next_sel.png" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextmessages" />
 <roundcube:button command="lastpage" imageSel="/images/buttons/last_sel.png" imageAct="/images/buttons/last_act.png" imagePas="/images/buttons/last_pas.png" width="11" height="11" title="lastmessages" />
+</span>
+</td>
+</tr>
+</table>
 </div>
 
 <div id="messagetoolbar">