diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py
index 64339fcb9c0..2474c321946 100644
--- a/addons/mail/__init__.py
+++ b/addons/mail/__init__.py
@@ -23,6 +23,7 @@ import mail_message
 import mail_thread
 import mail_group
 import mail_subscription
+import res_users
 import res_partner
 import wizard
 
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
new file mode 100644
index 00000000000..1c650ab1a34
--- /dev/null
+++ b/addons/mail/res_users.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2009-Today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import osv
+
+class res_users(osv.osv):
+    _name = 'res.users'
+    _inherit = ['res.users', 'mail.thread']
+    
+    def create(self, cr, uid, data, context=None):
+        user_id = super(res_users, self).create(cr, uid, data, context=context)
+        # make user follow itself
+        self.message_subscribe(cr, uid, [user_id], [user_id], context=context)
+        return user_id
+