5 files changed, 26 insertions, 17 deletions
diff --git a/skins/default/includes/messagemenu.html b/skins/default/includes/messagemenu.html
new file mode 100644
index 000000000..81a1c5d4f
--- /dev/null
+++ b/skins/default/includes/messagemenu.html
@@ -0,0 +1,10 @@
+<div id="messagemenu">
+    <ul class="toolbarmenu">
+	<li><roundcube:button command="print" label="printmessage" classAct="active" /></li>
+	<li><roundcube:button command="download" label="emlsave" classAct="active" /></li>
+	<li><roundcube:button command="viewsource" label="viewsource" classAct="active" /></li>
+	<li><hr></li>
+	<li><roundcube:button command="open" label="openinextwin" target="_blank" classAct="active" /></li>
+	<roundcube:container name="messagemenu" id="messagemenu" />
+    </ul>
+</div>
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 00f8ca327..7ab2e340e 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -46,7 +46,8 @@
 }
 
 #markmessagemenu,
-#searchmenu
+#searchmenu,
+#messagemenu
 {
   position: absolute;
   top: 32px;
@@ -100,6 +101,12 @@ ul.toolbarmenu li input
   vertical-align: middle;
 }
 
+ul.toolbarmenu li hr
+{
+  width: 90%;
+  margin: 2px 10px;
+}
+
 #searchfilter
 {
   position: absolute;
@@ -905,16 +912,6 @@ div.message-htmlpart div.rcmBody
   color: #333333;
 }
 
-#messageviewlink
-{
-  position: absolute;
-  top: 8px;
-  right: 10px;
-  width: 15px;
-  height: 15px;
-  border: 0;
-}
-
 /** message compose styles */
 
 #compose-toolbar
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index 735144646..bc931ca27 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -27,6 +27,7 @@
 
 <roundcube:include file="/includes/taskbar.html" />
 <roundcube:include file="/includes/header.html" />
+<roundcube:include file="/includes/messagemenu.html" />
 
 <div id="mainscreen">
 
@@ -113,12 +114,12 @@
 <div id="messagetoolbar">
 <roundcube:button command="checkmail" imageSel="/images/buttons/inbox_sel.png" imageAct="/images/buttons/inbox_act.png" imagePas="/images/buttons/inbox_pas.png" width="32" height="32" title="checkmail" />
 <roundcube:button command="compose" imageSel="/images/buttons/compose_sel.png" imageAct="/images/buttons/compose_act.png" imagePas="/images/buttons/compose_pas.png" width="32" height="32" title="writenewmessage" />
-<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 command="reply" imageSel="/images/buttons/reply_sel.png" imageAct="/images/buttons/reply_act.png" imagePas="/images/buttons/reply_pas.png" width="32" height="32" title="replytomessage" />
 <roundcube:button command="reply-all" imageSel="/images/buttons/replyall_sel.png" imageAct="/images/buttons/replyall_act.png" imagePas="/images/buttons/replyall_pas.png" width="32" height="32" title="replytoallmessage" />
 <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 command="print" imageSel="/images/buttons/print_sel.png" imageAct="/images/buttons/print_act.png" imagePas="/images/buttons/print_pas.png" width="32" height="32" title="printmessage" />
+<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/icons/extwin.png" width="32" height="32" title="messagemenu" onclick="rcmail_ui.show_messagemenu();return false" />
 <roundcube:container name="toolbar" id="messagetoolbar" />
 
 <div id="markmessagemenu">
diff --git a/skins/default/templates/message.html b/skins/default/templates/message.html
index 7d42ef73f..6786080c8 100644
--- a/skins/default/templates/message.html
+++ b/skins/default/templates/message.html
@@ -5,6 +5,7 @@
 <roundcube:include file="/includes/links.html" />
 <link rel="stylesheet" type="text/css" href="/mail.css" />
 <script type="text/javascript" src="/splitter.js"></script>
+<script type="text/javascript" src="/functions.js"></script>
 <style type="text/css">
 #mailboxlist-container { width: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv-5 : 160" />px; }
 #messageframe {
@@ -13,10 +14,11 @@
 }
 </style>
 </head>
-<body>
+<body onload="rcube_init_mail_ui()">
 
 <roundcube:include file="/includes/taskbar.html" />
 <roundcube:include file="/includes/header.html" />
+<roundcube:include file="/includes/messagemenu.html" />
 
 <div id="messagecountbar">
 <roundcube:button command="firstmessage" imageSel="/images/buttons/first_sel.png" imageAct="/images/buttons/first_act.png" imagePas="/images/buttons/first_pas.png" width="11" height="11" title="firstmessage" />
@@ -33,8 +35,7 @@
 <roundcube:button command="reply-all" imageSel="/images/buttons/replyall_sel.png" imageAct="/images/buttons/replyall_act.png" imagePas="/images/buttons/replyall_pas.png" width="32" height="32" title="replytoallmessage" />
 <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 command="print" imageSel="/images/buttons/print_sel.png" imageAct="/images/buttons/print_act.png" imagePas="/images/buttons/print_pas.png" width="32" height="32" title="printmessage" />
-<roundcube:button command="viewsource" imageSel="/images/buttons/source_sel.png" imageAct="/images/buttons/source_act.png" imagePas="/images/buttons/source_pas.png" width="32" height="32" title="viewsource" />
+<roundcube:button name="messagemenulink" image="/images/icons/extwin.png" width="32" height="32" title="messagemenu" onclick="rcmail_ui.show_messagemenu();return false" id="messagemenulink" />
 <roundcube:object name="mailboxlist" type="select" noSelection="moveto" maxlength="25" onchange="rcmail.command('moveto', this.options[this.selectedIndex].value)" class="mboxlist" />
 <roundcube:container name="toolbar" id="messagetoolbar" />
 </div>
diff --git a/skins/default/templates/messagepreview.html b/skins/default/templates/messagepreview.html
index 24848bbe7..9cd25f60b 100644
--- a/skins/default/templates/messagepreview.html
+++ b/skins/default/templates/messagepreview.html
@@ -8,7 +8,7 @@
 <body class="iframe">
 
 <div class="messageheaderbox">
-<roundcube:button command="permaurl" image="/images/icons/extwin.png" width="15" height="15" title="openinextwin" id="messageviewlink" target="_blank" />
+<roundcube:button command="messagemenu" image="/images/icons/extwin.png" width="15" height="15" title="messageactions" id="messagemenulink" />
 <roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/plus.gif" summary="Message headers" />
 <roundcube:object name="messageAttachments" id="attachment-list" />
 </div>