Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r139523bb20c86ecde4601e198801a737d96d7556 -rc9ee8888bc8e0b0af2de906c3f60d3172d431e5e
--- lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 139523bb20c86ecde4601e198801a737d96d7556)
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision c9ee8888bc8e0b0af2de906c3f60d3172d431e5e)
@@ -272,6 +272,11 @@
 		    parameter="statistic" >
 			<forward name="success" path="/jsps/monitoring/statisticpart.jsp"/>	        
 		</action>
+		<action path="/monitoring/releaseMark" 
+			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
+		    scope="request"
+		    parameter="releaseMark" >
+		</action>
 		<action path="/monitoring/downloadMarks"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
 			input="tiles:/monitoring/forum/listContentUsers"
@@ -287,7 +292,7 @@
 			scope="request"
 			validate="false"
 			parameter="viewAllMarks" >
-			<forward name="success" path="tiles:/monitoring/forum/viewAllMarks" />
+			<forward name="success" path="tiles:/monitoring/forum/viewMark" />
 		</action>
 		<!--  EDIT MARK		 -->
 		<action path="/monitoring/viewUserMark"
@@ -296,7 +301,7 @@
 			scope="request"
 			validate="false"
 			parameter="viewUserMark" >
-			<forward name="success" path="tiles:/monitoring/forum/viewUserMark" />
+			<forward name="success" path="tiles:/monitoring/forum/viewMark" />
 		</action>
 		<action path="/monitoring/editMark"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
@@ -313,7 +318,7 @@
 			scope="request"
 			validate="false"
 			parameter="updateMark" >
-			<forward name="success" path="tiles:/monitoring/forum/viewUserMark" />
+			<forward name="success" path="tiles:/monitoring/forum/viewMark" />
 		</action>
 		<action path="/monitoring/viewTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
Index: lams_tool_forum/web/jsps/learning/message/topicview.jsp
===================================================================
diff -u -r9719695d2ad2c0dbe06c93d032eef994f634b9d5 -rc9ee8888bc8e0b0af2de906c3f60d3172d431e5e
--- lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision 9719695d2ad2c0dbe06c93d032eef994f634b9d5)
+++ lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision c9ee8888bc8e0b0af2de906c3f60d3172d431e5e)
@@ -50,7 +50,29 @@
 					</td>
 				</tr>
 			</c:if>
-
+			<c:if test="${(msgDto.released || mode=='teacher') && (not empty msgDto.mark)}">
+				<tr>
+					<td>
+						<span class="field-name" ><fmt:message key="lable.topic.title.mark"/></span>
+						<BR>
+							${msgDto.mark}
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<span class="field-name" ><fmt:message key="lable.topic.title.comment"/></span>
+						<BR>
+						<c:choose>
+							<c:when test="${empty msgDto.comment}">
+								<fmt:message key="message.not.avaliable"/>
+							</c:when>
+							<c:otherwise>
+								<c:out value="${msgDto.comment}" escapeXml="false" />
+							</c:otherwise>
+						</c:choose>
+					</td>
+				</tr>
+			</c:if>
 			<tr>
 				<td>
 					<div class="right-buttons">
@@ -81,7 +103,7 @@
 
 						<!--  Edit Button -->
 						<c:if test="${not hidden}">
-							<c:if test='${(mode == "teacher") || (msgDto.isAuthor && not finishedLock && sessionScope.allowEdit)}'>
+							<c:if test='${(mode == "teacher") || (msgDto.isAuthor && not finishedLock && sessionScope.allowEdit && (empty msgDto.mark))}'>
 								<c:set var="edittopic">
 									<html:rewrite page="/learning/editTopic.do?topicId=${msgDto.message.uid}&rootUid=${rootUid}&create=${msgDto.message.created.time}" />
 								</c:set>
Index: lams_tool_forum/web/jsps/learning/viewtopic.jsp
===================================================================
diff -u -rf9aaec09edda9ba93963c5eeb4e216eaf9e2f447 -rc9ee8888bc8e0b0af2de906c3f60d3172d431e5e
--- lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision f9aaec09edda9ba93963c5eeb4e216eaf9e2f447)
+++ lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision c9ee8888bc8e0b0af2de906c3f60d3172d431e5e)
@@ -26,7 +26,7 @@
 			<fmt:message key="label.back.to.forum" />
 		</html:button>
 	</p>
-	<%@ include file="/jsps/learning/message/topicview.jsp"%>
+	<%@ include file="message/topicview.jsp"%>
 	<div class="left-buttons">
 		<c:set var="refreshTopicURL">