From 6dcda4ad42897aa27f6bc647d8d41e2d3b7441fe Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Mon, 18 May 2015 11:42:29 +0200
Subject: [PATCH] Ensure that roster contact's jids are bare

---
 converse.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/converse.js b/converse.js
index 7aebbe14a..68bbadf84 100644
--- a/converse.js
+++ b/converse.js
@@ -3483,9 +3483,12 @@
         this.RosterContact = Backbone.Model.extend({
             initialize: function (attributes, options) {
                 var jid = attributes.jid;
+                var bare_jid = Strophe.getBareJidFromJid(jid);
+                attributes.jid = bare_jid;
                 this.set(_.extend({
-                    'id': Strophe.getBareJidFromJid(jid),
-                    'fullname': jid,
+                    'id': bare_jid,
+                    'jid': bare_jid,
+                    'fullname': bare_jid,
                     'chat_status': 'offline',
                     'user_id': Strophe.getNodeFromJid(jid),
                     'resources': [Strophe.getResourceFromJid(jid)],