diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 3c6cc536731..a3bfdc1be02 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -187,13 +187,13 @@
                                             <field name="date"/>
                                             <field name="email_to" widget="char" size="512"/>
                                             <field name="email_cc" widget="char" size="512"/>
-                                            <field name="name" colspan="4" widget="char" size="512"/>
+                                            <field name="subject" colspan="4" widget="char" size="512"/>
                                             <field name="history" invisible="1"/>
                                         </group>
                                         <notebook colspan="4">
                                             <page string="Details">
                                                 <group attrs="{'invisible': [('history', '!=', True)]}">
-                                                    <field name="description" colspan="4" nolabel="1" height="250"/>
+                                                    <field name="body" colspan="4" nolabel="1" height="250"/>
 			                                        <button colspan="4" string="Reply"
 			                                            name="%(mail.action_email_compose_message_wizard)d"
 			                                            context="{'mail':'reply', 'message_id':active_id}"
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index b4c5fceb6e7..8c22caca178 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -178,13 +178,13 @@
                                         <field name="date"/>
                                         <field name="email_to" widget="char" size="512"/>
                                         <field name="email_cc" widget="char" size="512"/>
-                                        <field name="name" colspan="4" widget="char" size="512"/>
+                                        <field name="subject" colspan="4" widget="char" size="512"/>
                                         <field name="history" invisible="1"/>
                                     </group>
                                     <notebook colspan="4">
                                         <page string="Details">
                                             <group attrs="{'invisible': [('history', '!=', True)]}">
-                                                <field name="description" colspan="4" nolabel="1" height="250"/>
+                                                <field name="body" colspan="4" nolabel="1" height="250"/>
 		                                        <button colspan="4" string="Reply"
 		                                            name="%(mail.action_email_compose_message_wizard)d"
 		                                            context="{'mail':'reply', 'message_id':active_id}"
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index fc9a6dc68f6..1479ae78356 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -112,13 +112,13 @@
                                         <field name="date"/>
                                         <field name="email_to" widget="char" size="512"/>
                                         <field name="email_cc" widget="char" size="512"/>
-                                        <field name="name" colspan="4" widget="char" size="512"/>
+                                        <field name="subject" colspan="4" widget="char" size="512"/>
                                         <field name="history" invisible="1"/>
                                     </group>
                                     <notebook colspan="4">
                                         <page string="Details">
                                             <group attrs="{'invisible': [('history', '!=', True)]}">
-                                                <field name="description" colspan="4" nolabel="1" height="250"/>
+                                                <field name="body" colspan="4" nolabel="1" height="250"/>
 		                                        <button colspan="4" string="Reply"
 		                                            name="%(mail.action_email_compose_message_wizard)d"
 		                                            context="{'mail':'reply', 'message_id':active_id}"
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index 3e30d435025..d47ed3625ba 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -31,12 +31,12 @@
                         <field name="email_cc" colspan="4"/>
                         <field name="email_bcc" colspan="4"/>
                         <field name="reply_to" colspan="4"/>
-                        <field name="name" colspan="4" widget="char" size="512"/>
+                        <field name="subject" colspan="4" widget="char" size="512"/>
                     </group>
                     <separator string="" colspan="4"/>
                     <notebook colspan="4">
                         <page string="Body">
-                            <field name="description" colspan="4" nolabel="1"/>
+                            <field name="body" colspan="4" nolabel="1"/>
                         </page>
                         <page string="Attachments">
                             <label string="Add here all attachments of the current document you want to include in the Email." colspan="4"/>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index c89be32a049..00289183e3a 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -403,13 +403,13 @@
                                         <field name="date"/>
                                         <field name="email_to" widget="char" size="512"/>
                                         <field name="email_cc" widget="char" size="512"/>
-                                        <field name="name" colspan="4" widget="char" size="512"/>
+                                        <field name="subject" colspan="4" widget="char" size="512"/>
                                         <field name="history" invisible="1"/>
                                     </group>
                                     <notebook colspan="4">
                                         <page string="Details">
                                             <group attrs="{'invisible': [('history', '!=', True)]}">
-                                                <field name="description" colspan="4" nolabel="1" height="250"/>
+                                                <field name="body" colspan="4" nolabel="1" height="250"/>
 		                                        <button colspan="4" string="Reply"
 		                                            name="%(mail.action_email_compose_message_wizard)d"
 		                                            context="{'mail':'reply', 'message_id':active_id}"
diff --git a/addons/hr_evaluation/wizard/email_compose_message.py b/addons/hr_evaluation/wizard/email_compose_message.py
index 40f679f4f53..b5c5b9b49dc 100644
--- a/addons/hr_evaluation/wizard/email_compose_message.py
+++ b/addons/hr_evaluation/wizard/email_compose_message.py
@@ -27,24 +27,6 @@ from tools.translate import _
 class email_compose_message(osv.osv_memory):
     _inherit = 'email.compose.message'
 
-    def _get_records(self, cr, uid, context=None):
-        """
-        Return Records of particular  Model
-        """
-        if context is None:
-            context = {}
-        record_ids = []
-        if context.get('email_model',False) and context.get('email_model') == 'hr.evaluation.interview':
-            model_pool =  self.pool.get(context.get('email_model'))
-            record_ids = model_pool.search(cr, uid, [('state','=','waiting_answer')])
-            return model_pool.name_get(cr, uid, record_ids, context)
-        else:
-            return super(email_compose_message, self)._get_records(cr, uid, context=context)
-
-    _columns = {
-        'res_id':fields.selection(_get_records, 'Referred Document'),
-    }
-
     def get_value(self, cr, uid, model, resource_id, context=None):
         if context is None:
             context = {}
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index a3be7c60263..4e09a965e65 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -157,13 +157,13 @@
                                     <field name="date"/>
                                     <field name="email_to" widget="char" size="512"/>
                                     <field name="email_cc" widget="char" size="512"/>
-                                    <field name="name" colspan="4" widget="char" size="512"/>
+                                    <field name="subject" colspan="4" widget="char" size="512"/>
                                     <field name="history" invisible="1"/>
                                 </group>
                                 <notebook colspan="4">
                                     <page string="Details">
                                         <group attrs="{'invisible': [('history', '!=', True)]}">
-                                            <field name="description" colspan="4" nolabel="1" height="250"/>
+                                            <field name="body" colspan="4" nolabel="1" height="250"/>
 	                                        <button colspan="4" string="Reply"
 	                                            name="%(mail.action_email_compose_message_wizard)d"
 	                                            context="{'mail':'reply', 'message_id':active_id}"