diff --git a/addons/email_template/wizard/mail_compose_message_view.xml b/addons/email_template/wizard/mail_compose_message_view.xml
index a56820a1e06..46ed49e6627 100644
--- a/addons/email_template/wizard/mail_compose_message_view.xml
+++ b/addons/email_template/wizard/mail_compose_message_view.xml
@@ -24,10 +24,11 @@
                     </div>
                 </xpath>
                 <xpath expr="//footer" position="inside">
-                    <group class="oe_right" col="1">
+                    <group class="oe_right oe_form" col="1">
                         <div>Use template
-                            <field name="template_id" nolabel="1" 
-                                on_change="onchange_template_id(template_id, composition_mode, model, res_id, context)" domain="[('model_id','=',context.get('default_model'))]" colspan='4'/>
+                            <!--FIX: To avoid css issue of many2one field in footer temporary used oe_form (BUG:1152464)-->
+                            <field name="template_id" nolabel="1" class='oe_inline'
+                                on_change="onchange_template_id(template_id, composition_mode, model, res_id, context)" domain="[('model_id','=',context.get('default_model'))]"/>
                         </div>
                         <button icon="/email_template/static/src/img/email_template_save.png"
                             type="object" name="save_as_template" string="Save as new template" class="oe_link"