Index: lams_tool_forum/web/jsps/learning/message/topiceditform.jsp
===================================================================
diff -u -rc92604358056844c7736f2779398bbc38512928a -r12a2076e0c88d7b56fb6fd66fa4e64db1c376c4f
--- lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision c92604358056844c7736f2779398bbc38512928a)
+++ lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision 12a2076e0c88d7b56fb6fd66fa4e64db1c376c4f)
@@ -30,17 +30,17 @@
 
 <div class="space-bottom-top">
 	<div class="right-buttons">
-		<html:submit styleClass="button">
-			<fmt:message key="button.submit" />
-		</html:submit>
-		<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>
 	</div>
 </div>
Index: lams_tool_forum/web/jsps/learning/message/topicform.jsp
===================================================================
diff -u -rc92604358056844c7736f2779398bbc38512928a -r12a2076e0c88d7b56fb6fd66fa4e64db1c376c4f
--- lams_tool_forum/web/jsps/learning/message/topicform.jsp	(.../topicform.jsp)	(revision c92604358056844c7736f2779398bbc38512928a)
+++ lams_tool_forum/web/jsps/learning/message/topicform.jsp	(.../topicform.jsp)	(revision 12a2076e0c88d7b56fb6fd66fa4e64db1c376c4f)
@@ -27,15 +27,15 @@
 
 	<tr class="right-buttons">
 		<td>
-			<html:submit styleClass="button">
-				<fmt:message key="button.submit" />
-			</html:submit>
-			<c:set var="backToForum">
-				<html:rewrite page="/learning/viewForum.do?toolSessionID=${sessionMap.toolSessionID}&hideReflection=${sessionMap.hideReflection}" />
-			</c:set>
 			<html:button property="goback" onclick="javascript:location.href='${backToForum}';" styleClass="button">
 				<fmt:message key="button.cancel" />
 			</html:button>
+			<c:set var="backToForum">
+				<html:rewrite page="/learning/viewForum.do?toolSessionID=${sessionMap.toolSessionID}&hideReflection=${sessionMap.hideReflection}" />
+			</c:set>
+			<html:submit styleClass="button">
+				<fmt:message key="button.submit" />
+			</html:submit>
 		</td>
 	</tr>
 
Index: lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp
===================================================================
diff -u -rc92604358056844c7736f2779398bbc38512928a -r12a2076e0c88d7b56fb6fd66fa4e64db1c376c4f
--- lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(.../topicreplyform.jsp)	(revision c92604358056844c7736f2779398bbc38512928a)
+++ lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(.../topicreplyform.jsp)	(revision 12a2076e0c88d7b56fb6fd66fa4e64db1c376c4f)
@@ -31,17 +31,17 @@
 </c:if>
 <div class="space-bottom-top">
 	<div class="right-buttons">
-		<html:submit styleClass="button">
-			<fmt:message key="button.submit" />
-		</html:submit>
-		<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>
 	</div>
 </div>