From 4ab6f28181e46265d3ca2998e65ad30be45bd41d Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Thu, 12 Sep 2013 15:24:56 +0200
Subject: [PATCH] Bugfix. Messages were stored against buddy JID and not own
 JID

---
 CHANGES.rst | 6 +++++-
 converse.js | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index d8f696af2..912318846 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,10 +1,14 @@
 Changelog
 =========
 
-0.6.2 (Unreleased)
+0.6.3 (Unreleased)
 ------------------
 
+NB: This release contains an important security fix. Please don't use older
+versions of the 0.6.x branch.
+
 - French translations. [tdesvenain]
+- Bugfix: Messages were stored against buddy JID and not own JID. [jcbrand]
 
 0.6.2 (2013-08-29)
 ------------------
diff --git a/converse.js b/converse.js
index db5e326a5..a870668e5 100644
--- a/converse.js
+++ b/converse.js
@@ -277,7 +277,7 @@
                 if (this.get('box_id') !== 'controlbox') {
                     this.messages = new converse.Messages();
                     this.messages.localStorage = new Backbone.LocalStorage(
-                        hex_sha1('converse.messages'+this.get('jid')));
+                        hex_sha1('converse.messages'+converse.bare_jid));
                     this.set({
                         'user_id' : Strophe.getNodeFromJid(this.get('jid')),
                         'box_id' : hex_sha1(this.get('jid')),
@@ -2686,7 +2686,7 @@
             // Set up the roster
             this.roster = new this.RosterItems();
             this.roster.localStorage = new Backbone.LocalStorage(
-                hex_sha1('converse.rosteritems-'+this.bare_jid));
+                hex_sha1('converse.rosteritems-'+converse.bare_jid));
             this.connection.roster.registerCallback(
                 $.proxy(this.roster.rosterHandler, this.roster),
                 null, 'presence', null);