Index: lams_tool_chat/web/includes/javascript/learning.js
===================================================================
diff -u -re6dc08d4e3bdf70a806b22b080344386da604043 -re24fa562fed15fd26604a918d478608a155bafe7
--- lams_tool_chat/web/includes/javascript/learning.js	(.../learning.js)	(revision e6dc08d4e3bdf70a806b22b080344386da604043)
+++ lams_tool_chat/web/includes/javascript/learning.js	(.../learning.js)	(revision e24fa562fed15fd26604a918d478608a155bafe7)
@@ -130,20 +130,22 @@
 		var toNick = roster.users[roster.currentIndex].nick;
 		aMsg.setTo(CONFERENCEROOM + "/" + toNick);
 		aMsg.setType("chat");
+		var message = "[" + toNick + "] " + aForm.msg.value;
+		aMsg.setBody(message);
   		// apending the private message to the incoming window,
   		// since the jabber server will not echo sent private messages.
   		// TODO: need to check if this is correct behaviour
 		if (!(NICK == toNick)) {
-			updateMessageDisplay(generateMessageHTML(NICK, aForm.msg.value, PRIVATE_MSG));
+			updateMessageDisplay(generateMessageHTML(NICK, message, PRIVATE_MSG));
 		}
 	} else {
 		aMsg.setTo(CONFERENCEROOM);
 		aMsg.setType("groupchat");
+		aMsg.setBody(aForm.msg.value);
 	}
   		
   // }
 	aMsg.setFrom(USERNAME + "@" + XMPPDOMAIN + "/" + RESOURCE);
-	aMsg.setBody(aForm.msg.value);
 	con.send(aMsg);
 	aForm.msg.value = "";
 	return false;