Index: lams_tool_chat/web/chat_client/chat_app.js
===================================================================
diff -u -r6b63bb5d8724c2bd120e62b48b99894dc030a1c1 -rde8021aaecd7e02c31b9297045f028992d903c80
--- lams_tool_chat/web/chat_client/chat_app.js	(.../chat_app.js)	(revision 6b63bb5d8724c2bd120e62b48b99894dc030a1c1)
+++ lams_tool_chat/web/chat_client/chat_app.js	(.../chat_app.js)	(revision de8021aaecd7e02c31b9297045f028992d903c80)
@@ -72,10 +72,15 @@
     var userName;
     if (MODE == "teacher" && !(selectedIndex == -1)) {
         var userName = rosterList.options[rosterList.selectedIndex].value;
+        document.getElementById("sendToUser").innerHTML = userName;
+        
+        document.getElementById("sendToEveryone").style.display="none";
+        document.getElementById("sendToUser").style.display="";
+        
     } else {
-        userName = "*..*Everyone*..*";
+        document.getElementById("sendToUser").style.display="none";
+        document.getElementById("sendToEveryone").style.display="";
     }
-    document.getElementById("sendTo").innerHTML = userName;
 }
 function generateMessageHTML(nick, message, type) {
     return "<div class='" + type + "'><span class='messageFrom'>" + nick + ":</span>" + message + "<div/>";
Index: lams_tool_chat/web/chat_client/chat_ui.jsp
===================================================================
diff -u -r6b63bb5d8724c2bd120e62b48b99894dc030a1c1 -rde8021aaecd7e02c31b9297045f028992d903c80
--- lams_tool_chat/web/chat_client/chat_ui.jsp	(.../chat_ui.jsp)	(revision 6b63bb5d8724c2bd120e62b48b99894dc030a1c1)
+++ lams_tool_chat/web/chat_client/chat_ui.jsp	(.../chat_ui.jsp)	(revision de8021aaecd7e02c31b9297045f028992d903c80)
@@ -1,3 +1,5 @@
+<%@ include file="/common/taglibs.jsp"%>
+
 <!--  JsJaC Library -->
 <script type="text/javascript" src="${tool}includes/javascript/jsjac/sha1.js"></script>
 <script type="text/javascript" src="${tool}includes/javascript/jsjac/xmlextras.js"></script>
@@ -25,30 +27,31 @@
 <div id="login_pane">
 	<div id="login_err"></div>
 	<p>
-		Please wait, loading chat activity.
+		<fmt:message>message.loading</fmt:message>
 	</p>
 </div>
 
 <div id="chat_pane" style="display:none;">
 	<form name="sendForm" action="" onSubmit="return sendMsg(this);">
-		<h2>
-			Incoming:
-		</h2>
 		<div id="presence">
 			<select id="roster_user_selector" size="2" onchange="updateSendDisplay();">
 				<%--  options dynamically updated as users join/leave --%>
 				<option>
-					dummy
+					-
 				</option>
 			</select>
 		</div>
 		<div id="iResp"></div>
 
-		<h2>Send Message To: <span id="sendTo"> </span> </h2>
+		<h3>
+			<fmt:message>label.sendMessageTo</fmt:message>
+			<span id="sendToEveryone"><fmt:message>label.everyone</fmt:message></span><span id="sendToUser" style="display: none"></span>
+		</h3>
+		
 		<div id="msgAreaDiv">
 			<textarea name="msg" id='msgArea' rows="3" cols="80"></textarea>
-			<input type="submit" value="Send"/>
-			<input type="button" value="Clear" onclick="resetInputs();"/>
+			<input type="submit" value='<fmt:message>button.send</fmt:message>' />
+			<input type="button" onclick="resetInputs();" value='<fmt:message>button.clear</fmt:message>' />
 		</div>
 	</form>
 </div>