Merge branch 'master' of github.com:roundcube/roundcubemail

3 files changed, 28 insertions, 15 deletions

diff --git a/skins/classic/images/mail_toolbar.png b/skins/classic/images/mail_toolbar.png
index 3ef003f23..357357795 100644
--- a/skins/classic/images/mail_toolbar.png
+++ b/skins/classic/images/mail_toolbar.png
diff --git a/skins/classic/includes/messagetoolbar.html b/skins/classic/includes/messagetoolbar.html
index 6936c7def..b6b16d635 100644
--- a/skins/classic/includes/messagetoolbar.html
+++ b/skins/classic/includes/messagetoolbar.html
@@ -17,6 +17,10 @@
 <span id="forwardmenulink" onclick="rcmail_ui.show_popup('forwardmenu');return false"></span>
 </span>
 <roundcube:button command="delete" type="link" class="buttonPas delete" classAct="button delete" classSel="button deleteSel" title="deletemessage" content=" " />
+<roundcube:if condition="template:name == 'message'" />
+    <roundcube:button command="move" type="link" class="buttonPas move" classAct="button move" classSel="button moveSel" label="move" title="moveto" content=" " data-menu-pos="bottom" />
+    <roundcube:button command="print" type="link" class="buttonPas print" classAct="button print" classSel="button printSel" label="print" title="printmessage" content=" " />
+<roundcube:endif />
 <roundcube:container name="toolbar" id="messagetoolbar" />
 <roundcube:button name="markmenulink" id="markmenulink" type="link" class="button markmessage" title="markmessages" onclick="rcmail_ui.show_popup('markmenu');return false" content=" " />
 <roundcube:button name="messagemenulink" id="messagemenulink" type="link" class="button messagemenu" title="moreactions" onclick="rcmail_ui.show_popup('messagemenu');return false" content=" " />
diff --git a/skins/classic/mail.css b/skins/classic/mail.css
index 10efd350f..b1c8a0ea9 100644
--- a/skins/classic/mail.css
+++ b/skins/classic/mail.css
@@ -108,59 +108,68 @@
 }
 
 #messagetoolbar a.print {
-  background-position: -224px 0;
+  background-position: -256px 0;
 }
 
 #messagetoolbar a.printSel {
-  background-position: -224px -32px;
+  background-position: -256px -32px;
 }
 
 #messagetoolbar a.markmessage {
-  background-position: -256px 0;
+  background-position: -288px 0;
 }
 
 #messagetoolbar a.messagemenu {
-  background-position: -288px 0;
+  background-position: -320px 0;
+  width: 34px;
 }
 
 #messagetoolbar a.spellcheck {
-  background-position: -384px 0;
+  background-position: -418px 0;
 }
 
 #messagetoolbar a.spellcheckSel {
-  background-position: -384px -32px;
+  background-position: -418px -32px;
 }
 
 #messagetoolbar a.attach {
-  background-position: -352px 0;
+  background-position: -386px 0;
 }
 
 #messagetoolbar a.attachSel {
-  background-position: -352px -32px;
+  background-position: -386px -32px;
 }
 
 #messagetoolbar a.insertsig {
-  background-position: -448px 0;
+  background-position: -482px 0;
 }
 
 #messagetoolbar a.insertsigSel {
-  background-position: -448px -32px;
+  background-position: -482px -32px;
 }
 
 #messagetoolbar a.savedraft {
-  background-position: -322px 0;
+  background-position: -354px 0;
 }
 
 #messagetoolbar a.savedraftSel {
-  background-position: -322px -32px;
+  background-position: -354px -32px;
 }
 
 #messagetoolbar a.send {
-  background-position: -416px 0;
+  background-position: -450px 0;
 }
 
 #messagetoolbar a.sendSel {
-  background-position: -416px -32px;
+  background-position: -450px -32px;
+}
+
+#messagetoolbar a.move {
+  background-position: -580px 0;
+}
+
+#messagetoolbar a.moveSel {
+  background-position: -580px -32px;
 }
 
 #messagetoolbar a.download {
@@ -172,7 +181,7 @@
 }
 
 #messagetoolbar a.responses {
-  background-position: -512px 0;
+  background-position: -548px 0;
 }
 
 #messagemenu li a.active:hover,