diff --git a/Makefile.win b/Makefile.win
index 1082d6842..e0e72990a 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -1,11 +1,11 @@
 # You can set these variables from the command line.
 GRUNT   		?= node_modules\.bin\grunt.cmd
-BOWER           ?= node_modules\.bin\bower
-PHANTOMJS       ?= node_modules\.bin\phantomjs
+BOWER                   ?= node_modules\.bin\bower.cmd
+PHANTOMJS               ?= node_modules\.bin\phantomjs.cmd
 SASS 			?= sass 
 RMRF 			?= rmdir /q /s 
 RMF 			?= del /q 
-HTTPSERVE		?= ./node_modules/.bin/http-server
+HTTPSERVE		?= ./node_modules/.bin/http-server.cmd
 
 .PHONY: all help clean css minjs build
 
diff --git a/converse.js b/converse.js
index e6f326326..b25621704 100644
--- a/converse.js
+++ b/converse.js
@@ -924,7 +924,7 @@
                         $message.find(INACTIVE).length && INACTIVE ||
                         $message.find(ACTIVE).length && ACTIVE ||
                         $message.find(GONE).length && GONE,
-                    stamp, time, sender, from, createMessage;
+                    stamp, time, sender, from;
 
                 if (is_groupchat) {
                     from = Strophe.unescapeNode(Strophe.getResourceFromJid($message.attr('from')));
@@ -943,11 +943,6 @@
                 } else {
                     sender = 'them';
                 }
-                if (!body) {
-                    createMessage = this.messages.add;
-                } else {
-                    createMessage = this.messages.create;
-                }
                 this.messages.create({
                     chat_state: chat_state,
                     delayed: delayed,
@@ -3488,11 +3483,11 @@
             initialize: function (attributes, options) {
                 var jid = attributes.jid;
                 this.set(_.extend({
-                    'id': jid,
+                    'id': Strophe.getBareJidFromJid(jid),
                     'fullname': jid,
                     'chat_status': 'offline',
                     'user_id': Strophe.getNodeFromJid(jid),
-                    'resources': [],
+                    'resources': [Strophe.getResourceFromJid(jid)],
                     'groups': [],
                     'image_type': 'image/png',
                     'image': "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",
@@ -5689,16 +5684,17 @@
     };
 
     var getWrappedChatBox = function (jid) {
-        var chatbox = converse.chatboxes.get(jid);
+        var bare_jid = Strophe.getBareJidFromJid(jid);
+        var chatbox = converse.chatboxes.get(bare_jid);
         if (!chatbox) {
-            var roster_item = converse.roster.get(jid);
+            var roster_item = converse.roster.get(bare_jid);
             if (roster_item === undefined) {
-                converse.log('Could not get roster item for JID '+jid, 'error');
+                converse.log('Could not get roster item for JID '+bare_jid, 'error');
                 return null;
             }
             chatbox = converse.chatboxes.create({
-                'id': jid,
-                'jid': jid,
+                'id': bare_jid,
+                'jid': bare_jid,
                 'fullname': _.isEmpty(roster_item.get('fullname'))? jid: roster_item.get('fullname'),
                 'image_type': roster_item.get('image_type'),
                 'image': roster_item.get('image'),