diff --git a/skins/elastic/styles/widgets/mail.less b/skins/elastic/styles/widgets/mail.less
index e94949240..b52be21a2 100644
--- a/skins/elastic/styles/widgets/mail.less
+++ b/skins/elastic/styles/widgets/mail.less
@@ -58,6 +58,7 @@
                 color: #aaa;
                 font-size: 90%;
                 padding-right: .25rem;
+                text-decoration: none;
 
                 &:before {
                     &:extend(.font-icon-class);
@@ -72,6 +73,14 @@
                 &.headers:before {
                     content: @fa-var-wrench;
                 }
+
+                &.html:before {
+                    content: @fa-var-code;
+                }
+
+                &.plain:before {
+                    content: @fa-var-align-justify;
+                }
             }
         }
     }
diff --git a/skins/elastic/templates/message.html b/skins/elastic/templates/message.html
index fb44979df..b8e642cf8 100644
--- a/skins/elastic/templates/message.html
+++ b/skins/elastic/templates/message.html
@@ -30,7 +30,15 @@
 						<a href="#all-headers" class="headers" onclick="return UI.headers_dialog()"><roundcube:label name="arialabelmessageheaders" /></a>
 						<roundcube:add_label name="arialabelmessageheaders" />
 						<roundcube:if condition="!env:message_context">
-							<roundcube:button command="extwin" type="link" class="extwin" innerClass="inner" title="openinextwin" label="openinextwin" data-hidden="small" />
+							<roundcube:button command="extwin" type="link" class="extwin" innerClass="inner"
+								title="openinextwin" label="openinextwin" data-hidden="small" />
+						<roundcube:endif />
+						<roundcube:if condition="env:optional_format=='text'" />
+							<roundcube:button command="change-format" prop="text" type="link" class="plain" innerClass="inner"
+								title="changeformattext" label="plaintoggle" />
+						<roundcube:elseif condition="env:optional_format=='html'" />
+							<roundcube:button command="change-format" prop="html" type="link" class="html" innerClass="inner"
+								title="changeformathtml" label="htmltoggle" />
 						<roundcube:endif />
 					</div>
 				</div>