Index: /trunk/roundcubemail/skins/default/mail.css
===================================================================
--- /trunk/roundcubemail/skins/default/mail.css	(revision 2530)
+++ /trunk/roundcubemail/skins/default/mail.css	(revision 2531)
@@ -32,5 +32,4 @@
 {
   position: absolute;
-  left: 375px;
   top: 8px;
 }
Index: /trunk/roundcubemail/skins/default/templates/mail.html
===================================================================
--- /trunk/roundcubemail/skins/default/templates/mail.html	(revision 2530)
+++ /trunk/roundcubemail/skins/default/templates/mail.html	(revision 2531)
@@ -119,6 +119,6 @@
 <roundcube:button command="forward" imageSel="/images/buttons/forward_sel.png" imageAct="/images/buttons/forward_act.png" imagePas="/images/buttons/forward_pas.png" width="32" height="32" title="forwardmessage" />
 <roundcube:button command="delete" imageSel="/images/buttons/delete_sel.png" imageAct="/images/buttons/delete_act.png" imagePas="/images/buttons/delete_pas.png" width="32" height="32" title="deletemessage" />
+<roundcube:button name="messagemenulink" id="messagemenulink" image="/images/buttons/messagemenu.png" width="32" height="32" title="messagemenu" onclick="rcmail_ui.show_messagemenu();return false" />
 <roundcube:button name="markreadbutton" id="markreadbutton" image="/images/buttons/markread_act.png" width="32" height="32" title="markmessages" onclick="rcmail_ui.show_markmenu();return false" />
-<roundcube:button name="messagemenulink" id="messagemenulink" image="/images/buttons/messagemenu.png" width="32" height="32" title="messagemenu" onclick="rcmail_ui.show_messagemenu();return false" />
 <roundcube:container name="toolbar" id="messagetoolbar" />
 
@@ -129,4 +129,5 @@
     <li><roundcube:button command="mark" prop="flagged" label="markflagged" classAct="flaggedlink active" class="flaggedlink" /></li>
     <li><roundcube:button command="mark" prop="unflagged" label="markunflagged" classAct="unflaggedlink active" class="unflaggedlink" /></li>
+    <roundcube:container name="markmenu" id="markmessagemenu" />
   </ul>
 </div>
