6 files changed, 13 insertions, 1 deletions
diff --git a/skins/default/images/buttons/replyall_act.png b/skins/default/images/buttons/replyall_act.png
new file mode 100644
index 000000000..b6ad3fb18
--- /dev/null
+++ b/skins/default/images/buttons/replyall_act.png
diff --git a/skins/default/images/buttons/replyall_pas.png b/skins/default/images/buttons/replyall_pas.png
new file mode 100644
index 000000000..948072d9b
--- /dev/null
+++ b/skins/default/images/buttons/replyall_pas.png
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 739bfed10..5a362c197 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -26,7 +26,7 @@
 #messagetoolbar select.mboxlist
 {
   position: absolute;
-  left: 300px;
+  left: 335px;
   top: 10px;
 }
 
diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index dd392bdda..aa28098c8 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -105,6 +105,16 @@ function rcmail_toggle_display(id)
 
 <roundcube:object name="composeAttachmentForm" id="attachment-form" />
 
+<script type="text/javascript">
+<!--
+
+var cc_field = document.form._cc;
+if (cc_field && cc_field.value!='')
+  rcmail_toggle_display('compose-cc');
+
+//-->
+</script>
+
 <!--
 <div id="attachment-form">
 <roundcube:object name="composeAttachment" size="20" /><br />
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index 3eafad581..61d0e6d52 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -13,6 +13,7 @@
 <div id="messagetoolbar">
 <roundcube:button command="compose" imageAct="/images/buttons/compose_act.png" imagePas="/images/buttons/compose_pas.png" width="32" height="32" title="writenewmessage" />
 <roundcube:button command="reply" imageAct="/images/buttons/reply_act.png" imagePas="/images/buttons/reply_pas.png" width="32" height="32" title="replytomessage" />
+<roundcube:button command="reply-all" imageAct="/images/buttons/replyall_act.png" imagePas="/images/buttons/replyall_pas.png" width="32" height="32" title="replytoallmessage" />
 <roundcube:button command="forward" imageAct="/images/buttons/forward_act.png" imagePas="/images/buttons/forward_pas.png" width="32" height="32" title="forwardmessage" />
 <roundcube:button command="delete" imageAct="/images/buttons/delete_act.png" imagePas="/images/buttons/delete_pas.png" width="32" height="32" title="deletemessage" />
 <roundcube:button command="print" imageAct="/images/buttons/print_act.png" imagePas="/images/buttons/print_pas.png" width="32" height="32" title="printmessage" />
diff --git a/skins/default/templates/message.html b/skins/default/templates/message.html
index 4a4702afd..0ef9ef0bf 100644
--- a/skins/default/templates/message.html
+++ b/skins/default/templates/message.html
@@ -19,6 +19,7 @@
 <div id="messagetoolbar">
 <roundcube:button command="list" image="/images/buttons/back_act.png" width="32" height="32" title="backtolist" />
 <roundcube:button command="reply" imageAct="/images/buttons/reply_act.png" imagePas="/images/buttons/reply_pas.png" width="32" height="32" title="replytomessage" />
+<roundcube:button command="reply-all" imageAct="/images/buttons/replyall_act.png" imagePas="/images/buttons/replyall_pas.png" width="32" height="32" title="replytoallmessage" />
 <roundcube:button command="forward" imageAct="/images/buttons/forward_act.png" imagePas="/images/buttons/forward_pas.png" width="32" height="32" title="forwardmessage" />
 <roundcube:button command="delete" imageAct="/images/buttons/delete_act.png" imagePas="/images/buttons/delete_pas.png" width="32" height="32" title="deletemessage" />
 <roundcube:button command="print" imageAct="/images/buttons/print_act.png" imagePas="/images/buttons/print_pas.png" width="32" height="32" title="printmessage" />