Index: lams_tool_forum/web/jsps/learning/message/topiceditform.jsp
===================================================================
diff -u -r12a2076e0c88d7b56fb6fd66fa4e64db1c376c4f -rcbc01332a107c7c01b2d70888b22e2a576bcac65
--- lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision 12a2076e0c88d7b56fb6fd66fa4e64db1c376c4f)
+++ lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision cbc01332a107c7c01b2d70888b22e2a576bcac65)
@@ -30,15 +30,15 @@
 
 <div class="space-bottom-top">
 	<div class="right-buttons">
+		<c:set var="backToTopic">
+			<html:rewrite
+				page="/learning/viewTopic.do?sessionMapID=${sessionMapID}&topicID=${sessionMap.rootUid}&create=${topic.message.created.time}&hideReflection=${sessionMap.hideReflection}" />
+		</c:set>
 		<html:button property="goback"
 			onclick="javascript:location.href='${backToTopic}';"
 			styleClass="button">
 			<fmt:message key="button.cancel" />
 		</html:button>
-		<c:set var="backToTopic">
-			<html:rewrite
-				page="/learning/viewTopic.do?sessionMapID=${sessionMapID}&topicID=${sessionMap.rootUid}&create=${topic.message.created.time}&hideReflection=${sessionMap.hideReflection}" />
-		</c:set>
 		<html:submit styleClass="button">
 			<fmt:message key="button.submit" />
 		</html:submit>
Index: lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp
===================================================================
diff -u -r12a2076e0c88d7b56fb6fd66fa4e64db1c376c4f -rcbc01332a107c7c01b2d70888b22e2a576bcac65
--- lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(.../topicreplyform.jsp)	(revision 12a2076e0c88d7b56fb6fd66fa4e64db1c376c4f)
+++ lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(.../topicreplyform.jsp)	(revision cbc01332a107c7c01b2d70888b22e2a576bcac65)
@@ -31,15 +31,15 @@
 </c:if>
 <div class="space-bottom-top">
 	<div class="right-buttons">
+		<c:set var="backToTopic">
+			<html:rewrite
+				page="/learning/viewTopic.do?sessionMapID=${sessionMapID}&topicID=${sessionMap.rootUid}&create=${message.created.time}&hideReflection=${sessionMap.hideReflection}" />
+		</c:set>
 		<html:button property="goback"
 			onclick="javascript:location.href='${backToTopic}';"
 			styleClass="button">
 			<fmt:message key="button.cancel" />
 		</html:button>
-		<c:set var="backToTopic">
-			<html:rewrite
-				page="/learning/viewTopic.do?sessionMapID=${sessionMapID}&topicID=${sessionMap.rootUid}&create=${message.created.time}&hideReflection=${sessionMap.hideReflection}" />
-		</c:set>
 		<html:submit styleClass="button">
 			<fmt:message key="button.submit" />
 		</html:submit>