Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
diff -u -rae99578f8522d8aed4f2afc395f9f44c4645c9e9 -rb648e82f0ebdc0178aec9d47c90209b4816c0584
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision ae99578f8522d8aed4f2afc395f9f44c4645c9e9)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision b648e82f0ebdc0178aec9d47c90209b4816c0584)
@@ -140,6 +140,7 @@
 		request.getSession().setAttribute(ForumConstants.ALLOW_RICH_EDITOR, allowRichEditor);
 		request.getSession().setAttribute(ForumConstants.LIMITED_CHARS, new Integer(allowNumber));
 		boolean lock = session.getForum().getLockWhenFinished();
+		lock = lock && (session.getStatus() == ForumConstants.SESSION_STATUS_FINISHED ? true:false);
 		request.getSession().setAttribute(ForumConstants.FINISHEDLOCK,new Boolean(lock));
 
 		//get all root topic to display on init page
Index: lams_tool_forum/web/jsps/learning/message/topicview.jsp
===================================================================
diff -u -r6847f3627bbb8393b88988cae6c3cd8ad97f1600 -rb648e82f0ebdc0178aec9d47c90209b4816c0584
--- lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision 6847f3627bbb8393b88988cae6c3cd8ad97f1600)
+++ lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision b648e82f0ebdc0178aec9d47c90209b4816c0584)
@@ -40,22 +40,24 @@
 			<tr>
 				<td align="right">
 					<br>
-					<c:if test="${topic.isAuthor}">
-					<c:if test="${sessionScope.allowEdit}">
-						<c:set var="edittopic">
-							<html:rewrite page="/learning/editTopic.do?topicId=${topic.message.uid}&create=${topic.message.created.time}" />
+					<c:if test="${topic.isAuthor &&  (not finishedLock)}">
+						<c:if test="${sessionScope.allowEdit}">
+							<c:set var="edittopic">
+								<html:rewrite page="/learning/editTopic.do?topicId=${topic.message.uid}&create=${topic.message.created.time}" />
+							</c:set> 
+							<html:link href="${edittopic}">
+								<b><fmt:message key="label.edit" /></b>
+							</html:link>
+						</c:if>
+					</c:if>
+					<c:if test="${not finishedLock}">
+						<c:set var="replytopic">
+							<html:rewrite page="/learning/newReplyTopic.do?parentId=${topic.message.uid}" />
 						</c:set> 
-						<html:link href="${edittopic}">
-							<b><fmt:message key="label.edit" /></b>
+						<html:link href="${replytopic}">
+							<b><fmt:message key="label.reply" /></b>
 						</html:link>
 					</c:if>
-					</c:if>
-					<c:set var="replytopic">
-						<html:rewrite page="/learning/newReplyTopic.do?parentId=${topic.message.uid}" />
-					</c:set> 
-					<html:link href="${replytopic}">
-						<b><fmt:message key="label.reply" /></b>
-					</html:link>
 				</td>
 			</tr>
 		</table>
Index: lams_tool_forum/web/jsps/learning/viewforum.jsp
===================================================================
diff -u -r5cf73c3c3892579e89ad206d4d04c97bda7fd949 -rb648e82f0ebdc0178aec9d47c90209b4816c0584
--- lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
+++ lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision b648e82f0ebdc0178aec9d47c90209b4816c0584)
@@ -15,12 +15,12 @@
 	<html:rewrite page="/learning/finish.do?toolSessionID=${param.toolSessionID}" />
 </c:set> 
 	
-<html:button property="newtopic" onclick="javascript:location.href='${newtopic}';">
+<html:button property="newtopic" onclick="javascript:location.href='${newtopic}';" disabled="${finishedLock}" >
 	<fmt:message key="label.newtopic"/>
 </html:button>
-<html:button property="refresh" onclick="javascript:location.href='${refresh}';" >
+<html:button property="refresh" onclick="javascript:location.href='${refresh}';" disabled="${finishedLock}" >
 	<fmt:message key="label.refresh"/>
 </html:button>
-<html:button property="finish" onclick="javascript:location.href='${finish}';">
+<html:button property="finish" onclick="javascript:location.href='${finish}';" disabled="${finishedLock}" >
 	<fmt:message key="label.finish"/>
 </html:button>
\ No newline at end of file