Added toolbar button to move message in message view

2 files changed, 24 insertions, 13 deletions

diff --git a/skins/classic/includes/messagetoolbar.html b/skins/classic/includes/messagetoolbar.html
index 6936c7def..639557da6 100644
--- a/skins/classic/includes/messagetoolbar.html
+++ b/skins/classic/includes/messagetoolbar.html
@@ -20,6 +20,9 @@
 <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=" " />
+<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:endif />
 </div>
 
 <div id="forwardmenu" class="popupmenu">
diff --git a/skins/classic/mail.css b/skins/classic/mail.css
index 10efd350f..e80ad4e6a 100644
--- a/skins/classic/mail.css
+++ b/skins/classic/mail.css
@@ -116,51 +116,59 @@
 }
 
 #messagetoolbar a.markmessage {
-  background-position: -256px 0;
+  background-position: -288px 0;
 }
 
 #messagetoolbar a.messagemenu {
-  background-position: -288px 0;
+  background-position: -322px 0;
 }
 
 #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: -578px 0;
+}
+
+#messagetoolbar a.moveSel {
+  background-position: -578px -32px;
 }
 
 #messagetoolbar a.download {
@@ -172,7 +180,7 @@
 }
 
 #messagetoolbar a.responses {
-  background-position: -512px 0;
+  background-position: -548px 0;
 }
 
 #messagemenu li a.active:hover,