Index: lams_learning/web/includes/javascript/presence.js
===================================================================
diff -u -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7 -r876e644c066e81c2721ffa085fd12f386e2f3bb6
--- lams_learning/web/includes/javascript/presence.js	(.../presence.js)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
+++ lams_learning/web/includes/javascript/presence.js	(.../presence.js)	(revision 876e644c066e81c2721ffa085fd12f386e2f3bb6)
@@ -88,14 +88,11 @@
 			// update presenceTabLabel
 			$("#presenceUserCount").html(labelUsers + " (" + users.length + ")");
 		}
-	},
-	presenceWebsocket = initWebsocket('presence' + lessonId,
-		APP_URL.replace('http', 'ws') + 'presenceChatWebsocket?lessonID=' + lessonId);
+	};
 
-	if (presenceWebsocket) {
-		// when the server pushes new inputs
-		presenceWebsocket.onmessage = function (e) {
-
+	initWebsocket('presence' + lessonId,
+		APP_URL.replace('http', 'ws') + 'presenceChatWebsocket?lessonID=' + lessonId,
+		function (e) {
 			// create JSON object
 			var input = JSON.parse(e.data);
 			if (input.roster) {
@@ -149,8 +146,7 @@
 
 			// reset ping timer
 			websocketPing('presence' + lessonId, true);
-		};
-	}
+		});
 });
 
 
@@ -215,9 +211,8 @@
 		 'type'     : 'fetchConversation',
 		 'to'       : nick
 		};
-	
-	presenceWebsocket.send(JSON.stringify(data));
-	
+	sendToWebsocket('presence' + lessonId, JSON.stringify(data));
+
 	return tab;
 }
 
@@ -276,9 +271,8 @@
 		 'to'       : tag == groupChatInfo.tag ? '' : receiver,
 		 'message'  : message
 		};
-	
-	presenceWebsocket.send(JSON.stringify(data));
-	
+	sendToWebsocket('presence' + lessonId, JSON.stringify(data));
+
 	// reset ping timer
 	websocketPing('presence' + lessonId, true);
 }