Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java
===================================================================
diff -u -rb71c9cb2f96eb891545d32aaca8904051d1e00d5 -r9a66ee651d79f26996ac722785f9701a67b3eb6a
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java	(.../LearningController.java)	(revision b71c9cb2f96eb891545d32aaca8904051d1e00d5)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java	(.../LearningController.java)	(revision 9a66ee651d79f26996ac722785f9701a67b3eb6a)
@@ -169,7 +169,7 @@
 	sessionMap.put(ForumConstants.ATTR_FORUM_ID, forumId);
 	sessionMap.put(ForumConstants.ATTR_FORUM_UID, forum.getUid());
 	sessionMap.put(ForumConstants.ATTR_USER_UID, forumUser.getUid());
-	sessionMap.put(ForumConstants.ATTR_FINISHED_LOCK, new Boolean(lock));
+	sessionMap.put(ForumConstants.ATTR_FINISHED_LOCK, lock);
 	sessionMap.put(ForumConstants.ATTR_LOCK_WHEN_FINISHED, forum.getLockWhenFinished());
 	sessionMap.put(ForumConstants.ATTR_USER_FINISHED, forumUser.isSessionFinished());
 	sessionMap.put(ForumConstants.ATTR_ALLOW_EDIT, forum.isAllowEdit());
Index: lams_tool_forum/web/jsps/learning/message/msgview.jsp
===================================================================
diff -u -rb71c9cb2f96eb891545d32aaca8904051d1e00d5 -r9a66ee651d79f26996ac722785f9701a67b3eb6a
--- lams_tool_forum/web/jsps/learning/message/msgview.jsp	(.../msgview.jsp)	(revision b71c9cb2f96eb891545d32aaca8904051d1e00d5)
+++ lams_tool_forum/web/jsps/learning/message/msgview.jsp	(.../msgview.jsp)	(revision 9a66ee651d79f26996ac722785f9701a67b3eb6a)
@@ -179,20 +179,22 @@
 				·
 			</c:if>
 
-			<!--  Reply Button -->
+			<%--  Reply Button. Must have class replybutton so that the button is hidden when the user reaches the maximum number of posts. See $('#messageForm').submit() --%>
 			<c:if test="${(not sessionMap.finishedLock) && (not noMorePosts)}">
+				<c:set var="replyShown" value="true"/>
 				<c:set var="replytopic">
 					<lams:WebAppURL />learning/newReplyTopic.do?sessionMapID=${sessionMapID}&parentID=${msgDto.message.uid}&rootUid=${sessionMap.rootUid}&hideReflection=${sessionMap.hideReflection}
 				</c:set>
 				<a href="#${msgDto.message.uid}" onClick="javascript:createReply(${msgDto.message.uid},'${replytopic}',${msgLevel})"
-					class="comment"><fmt:message key="label.reply" /></a>
-				&middot;
+					class="comment replybutton"><fmt:message key="label.reply" /></a>
 			</c:if>
 
+
 			<!--  Edit Button -->
 			<c:if test="${not hidden}">
 				<c:if
 					test='${(sessionMap.mode == "teacher") || (msgDto.isAuthor && not sessionMap.finishedLock && sessionMap.allowEdit && (empty msgDto.mark))}'>
+					<c:if test="${replyShown}"><span class="replybutton">&middot; </span>	</c:if>		
 					<c:set var="edittopic">
 						<lams:WebAppURL />learning/editTopic.do?sessionMapID=${sessionMapID}&topicID=${msgDto.message.uid}&rootUid=${sessinoMap.rootUid}&create=${msgDto.message.created.time}&hideReflection=${sessionMap.hideReflection}
 					</c:set>
Index: lams_tool_forum/web/jsps/learning/message/topiclist.jsp
===================================================================
diff -u -rb71c9cb2f96eb891545d32aaca8904051d1e00d5 -r9a66ee651d79f26996ac722785f9701a67b3eb6a
--- lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(.../topiclist.jsp)	(revision b71c9cb2f96eb891545d32aaca8904051d1e00d5)
+++ lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(.../topiclist.jsp)	(revision 9a66ee651d79f26996ac722785f9701a67b3eb6a)
@@ -14,7 +14,7 @@
 			<a href="javascript:location.href='${refresh}';" type="button" class="btn btn-xs btn-default"><i class="fa fa-xm fa-refresh"></i>
 				<fmt:message key="label.refresh" /></a>
 
-			<c:if test='${sessionMap.allowNewTopics}'>
+			<c:if test='${(not sessionMap.finishedLock) && (sessionMap.allowNewTopics)}'>
 				<a href="javascript:location.href='${newtopic}';" type="button" class="btn btn-xs btn-default"> <i
 					class="fa fa-xm fa-plus"></i> <fmt:message key="label.newtopic" /></a>
 			</c:if>