diff --git a/skins/elastic/templates/includes/mail-menu.html b/skins/elastic/templates/includes/mail-menu.html
index b50d7810..03a4e8a6 100644
--- a/skins/elastic/templates/includes/mail-menu.html
+++ b/skins/elastic/templates/includes/mail-menu.html
@@ -1,5 +1,11 @@
 <roundcube:add_label name="viewsource" />
 <div id="mailtoolbar" class="toolbar menu" role="toolbar">
+<!--------   YetiForce Sp. z o.o.   -------->
+<roundcube:if condition="template:name == 'message'" />
+	<roundcube:button command="mail" label="mail" type="link" innerClass="inner" class="mail" title="mail" tabindex="2" />
+<roundcube:endif />
+<!--------   YetiForce Sp. z o.o.   -------->
+			
 	<roundcube:button command="compose" type="link" class="compose hidden"
 		label="compose" title="writenewmessage" innerclass="inner" />
 	<roundcube:button command="reply" type="link" class="reply disabled" classAct="reply"