diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 3f33f1dbca5..b1f8f8b8734 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -150,6 +150,9 @@ class res_users(osv.Model):
             self.pool.get('res.partner').message_subscribe(cr, uid, [partner_id], partner_ids, subtype_ids=subtype_ids, context=context)
         return True
 
+    def message_create_partners_from_emails(self, cr, uid, emails, context=None):
+        return self.pool.get('res.partner').message_create_partners_from_emails(cr, uid, emails, context=context)
+
 
 class res_users_mail_group(osv.Model):
     """ Update of res.users class
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index e08afdad217..e3986a390d6 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -580,6 +580,9 @@ openerp.mail = function (session) {
                 }
             });
             var deferred_check = $.Deferred();
+            if (emails.length == 0) {
+                return deferred_check.resolve(partners_from);
+            }
             self.parent_thread.ds_thread._model.call('message_create_partners_from_emails', [emails]).then(function (partners) {
                 partners_from = _.clone(partners.partner_ids);
                 var deferreds = [];