diff --git a/addons/email_template/wizard/email_compose_message_view.xml b/addons/email_template/wizard/email_compose_message_view.xml
index 96ea55da9e5..d80a86fed23 100644
--- a/addons/email_template/wizard/email_compose_message_view.xml
+++ b/addons/email_template/wizard/email_compose_message_view.xml
@@ -25,5 +25,29 @@
                 </data>
             </field>
         </record>
+
+        <record model="ir.ui.view" id="email_compose_message_wizard_inherit_form_chatter">
+            <field name="name">mail.compose.message.form</field>
+            <field name="model">mail.compose.message</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="mail.email_compose_message_wizard_form_chatter"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//field[@name='dest_partner_ids']" position="after">
+                        <field name="use_template" colspan="1" nolabel="1" invisible="1"/>
+                        <field name="template_id" colspan="4" nolabel="1"
+                            attrs="{'invisible':[('use_template','=',False)]}"
+                            on_change="on_change_template(use_template, template_id, False, False, context)"/>
+                    </xpath>
+                    <xpath expr="//a[@class='oe_mail_compose_message_checklist']" position="before">
+                        <button icon="gtk-paste" type="object" name="template_toggle"
+                                string="" help="Use a message template" />
+                        <button icon="gtk-save" type="object" name="save_as_template"
+                                string="" help="Save as a new template"/>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
     </data>
 </openerp>