diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index d371f232963..e928edc391f 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -31,17 +31,17 @@ class res_users(osv.osv):
     _inherit = ['res.users', 'mail.thread']
     
     _columns = {
-        'message_email_pref': fields.selection([
+        'notification_email_pref': fields.selection([
                         ('all', 'All feeds'),
                         ('comments', 'Only comments'),
                         ('to_me', 'Only when sent directly to me'),
-                        ('none', 'Never'),
-                        ], string='Receive feeds by email', required=True,
+                        ('none', 'Never')
+                        ], 'Receive feeds by email', required=True,
                         help="Choose whether you want to receive an email when you receive new feeds."),
     }
     
     _default = {
-        'message_email_pref': 'all',
+        'notification_email_pref': 'all',
     }
     
     def create(self, cr, uid, data, context=None):
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index d359fdb7d34..4ace3f9f2d2 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
             <data>
                 <xpath expr="/form/group/group[@name='preferences']/field[@name='menu_tips']" position="after">
-                    <field name="message_email_pref"/>
+                    <field name="notification_email_pref"/>
                 </xpath>
             </data>
             </field>
@@ -24,7 +24,7 @@
             <field name="arch" type="xml">
             <data>
                 <xpath expr="/form/notebook/page[@string='User']/group/group/group[@name='preferences']/field[@name='menu_tips']" position="after">
-                    <field name="message_email_pref"/>
+                    <field name="notification_email_pref"/>
                 </xpath>
                 <xpath expr="/form/notebook" position="after">
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>