diff --git a/skins/elastic/styles/widgets/buttons.less b/skins/elastic/styles/widgets/buttons.less
index 8c4b64924..ab763ba0c 100644
--- a/skins/elastic/styles/widgets/buttons.less
+++ b/skins/elastic/styles/widgets/buttons.less
@@ -72,7 +72,8 @@ button.btn {
     &.restore:before {
         content: @fa-var-undo;
     }
-    &.send:before {
+    &.send:before,
+    &.bounce:before {
         content: @fa-var-paper-plane;
     }
     &.attach:before {
diff --git a/skins/elastic/templates/bounce.html b/skins/elastic/templates/bounce.html
new file mode 100644
index 000000000..ddde91fd1
--- /dev/null
+++ b/skins/elastic/templates/bounce.html
@@ -0,0 +1,66 @@
+<roundcube:include file="includes/layout.html" />
+
+<h1 class="voice"><roundcube:object name="pagetitle" /></h1>
+
+<div>
+	<roundcube:object name="composeFormHead" role="main" />
+	<div id="bounceheaders" role="region" aria-labelledby="aria-label-composeheaders">
+		<h2 id="aria-label-composeheaders" class="voice"><roundcube:label name="arialabelmessageheaders" /></h2>
+		<div class="compose-headers">
+			<div id="compose_from" class="form-group row">
+				<label for="_from" class="col-2 col-form-label"><roundcube:label name="from" /></label>
+				<div class="col-10">
+					<div class="input-group">
+						<roundcube:object name="composeHeaders" part="from" id="_from" form="form" tabindex="1" class="form-control" />
+						<a href="#identities" onclick="return rcmail.command('identities')" class="input-group-addon icon edit" title="<roundcube:label name="editidents" />" tabindex="1"><span class="inner"><roundcube:label name="editidents" /></span></a>
+					</div>
+				</div>
+			</div>
+			<div id="compose_to" class="form-group row">
+				<label for="_to" class="col-2 col-form-label"><roundcube:label name="to" /></label>
+				<div class="col-10">
+					<div class="input-group">
+						<roundcube:object name="composeHeaders" part="to" id="_to" form="form" tabindex="1" aria-required="true" data-recipient-input="true" />
+						<a href="#add-header" data-popup="headers-menu" class="input-group-addon icon add" title="<roundcube:label name="addheader" />" tabindex="1"><span class="inner"><roundcube:label name="addheader" /></span></a>
+					</div>
+				</div>
+			</div>
+			<div id="compose_cc" class="hidden form-group row">
+				<label for="_cc" class="col-2 col-form-label"><roundcube:label name="cc" /></label>
+				<div class="col-10">
+					<div class="input-group">
+						<roundcube:object name="composeHeaders" part="cc" id="_cc" form="form" tabindex="1" data-recipient-input="true" />
+						<a href="#delete" onclick="$('#_cc').val('').change()" class="input-group-addon icon cancel" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
+					</div>
+				</div>
+			</div>
+			<div id="compose_bcc" class="hidden form-group row">
+				<label for="_bcc" class="col-2 col-form-label"><roundcube:label name="bcc" /></label>
+				<div class="col-10">
+					<div class="input-group">
+						<roundcube:object name="composeHeaders" part="bcc" id="_bcc" form="form" tabindex="1" data-recipient-input="true" />
+						<a href="#delete" onclick="$('#_bcc').val('').change()" class="input-group-addon icon cancel" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
+					</div>
+				</div>
+			</div>
+		</div>
+		<roundcube:if condition="!config:no_save_sent_messages" />
+		<div class="form-group row">
+			<label for="compose-store-target" class="col-form-label col-6"><roundcube:label name="savesentmessagein" /></label>
+			<div class="col-6">
+				<roundcube:object name="storetarget" id="compose-store-target" noform="true" tabindex="2" class="form-control" />
+			</div>
+		</div>
+		<roundcube:endif />
+	</form>
+</div>
+
+<div id="headers-menu" class="popupmenu" data-popup-init="headersmenu">
+	<h3 id="aria-label-headersmenu" class="voice"><roundcube:label name="arialabelheadersmenu" /></h3>
+	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-headersmenu">
+		<li role="menuitem"><a data-target="cc" href="#" role="button" tabindex="-1"><roundcube:label name="cc" /></a></li>
+		<li role="menuitem"><a data-target="bcc" href="#" role="button" tabindex="-1"><roundcube:label name="bcc" /></a></li>
+	</ul>
+</div>
+
+<roundcube:include file="includes/footer.html" />
diff --git a/skins/elastic/templates/includes/mail-menu.html b/skins/elastic/templates/includes/mail-menu.html
index ce829638b..1d1905219 100644
--- a/skins/elastic/templates/includes/mail-menu.html
+++ b/skins/elastic/templates/includes/mail-menu.html
@@ -44,6 +44,7 @@
 	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-forward-menu">
 		<roundcube:button type="link-menuitem" command="forward-inline" label="forwardinline" prop="sub" classAct="forward active" class="forward" />
 		<roundcube:button type="link-menuitem" command="forward-attachment" label="forwardattachment" prop="sub" classAct="forwardattachment active" class="forwardattachment" />
+		<roundcube:button type="link-menuitem" command="bounce" label="bouncemsg" classAct="bounce active" class="bounce" />
 		<roundcube:container name="forwardmenu" id="forward-menu" />
 	</ul>
 </div>