diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 58b71c3e011..9de027cb4b2 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -68,25 +68,26 @@
                                 <field name="reply_to"/>
                             </group>
                             <group col="2" colspan="2">
-                                <separator string="Email Data" colspan="2"/>
-                                <field name="def_subject" colspan="4" required="1" />
-                                <field name="use_sign" colspan="4" />
+                                <separator string="Options" colspan="2"/>
                                 <field name="lang" colspan="4" />
+                                <field name="use_sign" colspan="4" />
                                 <field name="track_campaign_item" colspan="4"/>
                             </group>
-                            <separator colspan="3" string="Standard Body" />
-                            <separator colspan="1" string="Expression Builder" />
-
-                            <notebook>
-                                <page string="Body (Text)">
-                                    <field name="def_body_text" colspan="4" nolabel="1" />
-                                </page>
-                                <page string="Body (Raw HTML)">
-                                    <field name="def_body_html" colspan="4" nolabel="1" />
-                                    <label string="Note: This is Raw HTML." colspan="4" />
-                                </page>
-                            </notebook>
-                            <group col="4">
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Email Content  " />
+                                <field name="def_subject" colspan="4" required="1" />
+                                <notebook>
+                                    <page string="Body (Text)">
+                                        <field name="def_body_text" colspan="4" nolabel="1" />
+                                    </page>
+                                    <page string="Body (Raw HTML)">
+                                        <field name="def_body_html" colspan="4" nolabel="1" />
+                                        <label string="Note: This is Raw HTML." colspan="4" />
+                                    </page>
+                                </notebook>
+                            </group>
+                            <group col="4" colspan="2">
+                                <separator colspan="4" string="Expression Builder" />
                                 <field name="template_language"
                                     on_change="onchange_null_value(model_object_field,sub_model_object_field,null_value,template_language,context)" />
                                 <notebook>
@@ -113,17 +114,23 @@
                         </page>
                         <page string="Advanced">
                             <group colspan="2" col="2">
-                                <separator string="Actions" colspan="2"/>
-                                <button name="create_action" string="Create Action" type="object" colspan="2" attrs="{'invisible':[('ref_ir_act_window','!=',False), ('ref_ir_value','!=',False)]}"/>
-                                <field name="ref_ir_act_window"/>
-                                <field name="ref_ir_value"/>
-                                <button name="delete_action" string="Delete Action" type="object" colspan="2" attrs="{'invisible':[('ref_ir_act_window','=',False), ('ref_ir_value','=',False)]}"/>
+                                <group colspan="2" col="2">
+                                    <separator string="Actions" colspan="2"/>
+                                    <button name="create_action" string="Create Action" type="object" colspan="2" attrs="{'invisible':[('ref_ir_act_window','!=',False), ('ref_ir_value','!=',False)]}"/>
+                                    <field name="ref_ir_act_window"/>
+                                    <field name="ref_ir_value"/>
+                                    <button name="delete_action" string="Delete Action" type="object" colspan="2" attrs="{'invisible':[('ref_ir_act_window','=',False), ('ref_ir_value','=',False)]}"/>
+                                </group>
+                                <group colspan="2" col="2">
+                                    <separator string="Advanced Options" colspan="2"/>
+                                    <field name="message_id"/>
+                                </group>
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Attachments" colspan="2"/>
                                 <notebook>
                                     <page string="Existing files">
-                                        <field name="attachment_ids" colspan="4" nolabel="1"/>
+                                        <field name="attachment_ids" colspan="4" nolabel="1" height="350"/>
                                     </page>
                                     <page string="Report">
                                         <field name="file_name" colspan="4" />