diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index a015ef81418..0ca89a5bbb8 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -232,7 +232,7 @@ class email_template(osv.osv):
         template_obj = self.browse(cr, uid, ids)[0]
         src_obj = template_obj.object_name.model
         vals['ref_ir_act_window'] = self.pool.get('ir.actions.act_window').create(cr, uid, {
-             'name': _("%s Mail Form") % template_obj.name,
+             'name': template_obj.name,
              'type': 'ir.actions.act_window',
              'res_model': 'email_template.send.wizard',
              'src_model': src_obj,
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index c6eb3757604..3346c6c6162 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -108,15 +108,18 @@
                             </group>
                         </page>
                         <page string="Advanced">
-                            <field name="ref_ir_act_window" />
-                            <field name="ref_ir_value" />
-                            <separator string="Attachments (Report to attach)" colspan="4"/>
-                            <field name="file_name" colspan="2" />
-                            <field name="report_template" colspan="2"
+                            <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="Attachments (Report to attach)" colspan="4"/>
+                                <field name="file_name" colspan="2" />
+                                <field name="report_template" colspan="2"
                                     domain="[('model','=',model_int_name)]" />
-                            <group colspan="2">
-                                <button name="create_action" string="Create Action" type="object" colspan="1" attrs="{'invisible':[('ref_ir_act_window','!=',False), ('ref_ir_value','!=',False)]}"/>
-                                <button name="delete_action" string="Delete Action" type="object" colspan="1" attrs="{'invisible':[('ref_ir_act_window','=',False), ('ref_ir_value','=',False)]}"/>
                             </group>
                         </page>
                     </notebook>