diff --git a/addons/email_template/wizard/mail_compose_message_view.xml b/addons/email_template/wizard/mail_compose_message_view.xml
index 96aaa1cfaae..8d5bc26b213 100644
--- a/addons/email_template/wizard/mail_compose_message_view.xml
+++ b/addons/email_template/wizard/mail_compose_message_view.xml
@@ -11,14 +11,14 @@
                     <xpath expr="//form/footer/button" position="before">
                         <field name="use_template" invisible="1"/>
                         <button icon="gtk-paste" type="object" name="toggle_template"
-                                string="" help="Use a message template" />
+                                string="" help="Use a message template" invisible="1"/>
                         <button icon="gtk-save" type="object" name="save_as_template"
-                                string="" help="Save as a new template"/>
+                                string="" help="Save as a new template" invisible="1"/>
                     </xpath>
                     <xpath expr="//form/notebook" position="after">
                         <group attrs="{'invisible':[('use_template','=',False)]}" colspan="4" col="4">
                             <field name="use_template" invisible="1"/>
-                            <field name="template_id" colspan="3"
+                            <field name="template_id" colspan="3" invisible="1"
                                 on_change="onchange_template_id(use_template, template_id, composition_mode, model, res_id, context)"/>
                         </group>
                     </xpath>