Index: lams_tool_chat/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r940a6f2d936bab8d06f1bebd4f1e86955eb55190 -rd741f4e3c8fc4c9a31d9be8cf7f15416b3ef638a
--- lams_tool_chat/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 940a6f2d936bab8d06f1bebd4f1e86955eb55190)
+++ lams_tool_chat/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision d741f4e3c8fc4c9a31d9be8cf7f15416b3ef638a)
@@ -94,7 +94,7 @@
 button.finish  =Next Activity
 message.alertContentEdit  =Warning: One of more students have accessed this activity. Changing this content will result in students getting different information.
 message.contentInUseSet  =The modification of content is not allowed since one or more students has attempted the activity.
-message.warnLockOnFinish = Note: After you click on "Next Activity" and you come back to this Chat, you wont be able to continue posting.
+message.warnLockOnFinish = Note: After you click on "Next Activity" and you come back to this Chat, you won't be able to continue posting.
 message.activityLocked = The instructor has set this activity not to allow postings after you have finished it. As you are returning to this Chat, you are able to see all messages but not allowed to post anymore.
 
 #======= End labels: Exported 88 labels for en AU =====
Index: lams_tool_chat/web/pages/learning/learning.jsp
===================================================================
diff -u -r9887abadafe6e61ebad32ceec4e5f757a3baed94 -rd741f4e3c8fc4c9a31d9be8cf7f15416b3ef638a
--- lams_tool_chat/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 9887abadafe6e61ebad32ceec4e5f757a3baed94)
+++ lams_tool_chat/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision d741f4e3c8fc4c9a31d9be8cf7f15416b3ef638a)
@@ -44,6 +44,22 @@
 		<c:out value="${chatDTO.instructions}" escapeXml="false" />
 	</p>
 
+
+	<c:if test="${chatDTO.lockOnFinish and MODE == 'learner'}">
+		<div class="info">
+			<c:choose>
+				<c:when test="${chatUserDTO.finishedActivity}">
+					<fmt:message key="message.activityLocked"/> 
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="message.warnLockOnFinish" />
+				</c:otherwise>
+			</c:choose>
+		</div>
+	</c:if>
+
+	&nbsp;	
+	
 	<div id="chat_content">
 
 		<form name="sendForm" action="" onSubmit="return sendMsg(this);">
@@ -78,8 +94,6 @@
 								<input id="sendButton" class="button" type="submit"
 									value='<fmt:message>button.send</fmt:message>' />
 
-
-
 							</td>
 						</tr>