Index: lams_tool_forum/web/jsps/learning/message/topiceditform.jsp
===================================================================
diff -u -rd5fee901f5527e516add11b0ec872521de171133 -r80cfd81a864da36f134b18b403a6f8b06ab2d013
--- lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
+++ lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision 80cfd81a864da36f134b18b403a6f8b06ab2d013)
@@ -39,7 +39,7 @@
 	</div>		
 </c:if>
 
-<div class="btn-group-xs voffset5">
+<div class="btn-group-xs voffset5 pull-right">
 <html:button property="goback" styleId="cancelButton" onclick="javascript:cancelEdit();" styleClass="btn btn-default">
 	<fmt:message key="button.cancel" />
 </html:button>
Index: lams_tool_forum/web/jsps/learning/message/topicform.jsp
===================================================================
diff -u -rd5fee901f5527e516add11b0ec872521de171133 -r80cfd81a864da36f134b18b403a6f8b06ab2d013
--- lams_tool_forum/web/jsps/learning/message/topicform.jsp	(.../topicform.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
+++ lams_tool_forum/web/jsps/learning/message/topicform.jsp	(.../topicform.jsp)	(revision 80cfd81a864da36f134b18b403a6f8b06ab2d013)
@@ -22,9 +22,10 @@
 <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="btn btn-default voffset5 pull-left" styleId="cancelButton">
-	<fmt:message key="button.cancel" />
-</html:button>&nbsp;
 <html:submit styleClass="btn btn-primary voffset5 pull-right" styleId="submitButton">
 	<fmt:message key="button.submit" />
 </html:submit>
+<html:button property="goback" onclick="javascript:location.href='${backToForum}';" styleClass="btn btn-default voffset5 pull-right" styleId="cancelButton">
+	<fmt:message key="button.cancel" />
+</html:button>&nbsp;
+
Index: lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp
===================================================================
diff -u -rd3a9876dc1ffb96feebcd861473dd3339e83966e -r80cfd81a864da36f134b18b403a6f8b06ab2d013
--- lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(.../topicreplyform.jsp)	(revision d3a9876dc1ffb96feebcd861473dd3339e83966e)
+++ lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(.../topicreplyform.jsp)	(revision 80cfd81a864da36f134b18b403a6f8b06ab2d013)
@@ -25,7 +25,7 @@
 	</div>
 </c:if>
 
-<div class="btn-group-xs voffset5">
+<div class="btn-group-xs voffset5 pull-right">
 	<html:button property="goback" styleId="cancelButton" onclick="javascript:cancelReply();"
 		styleClass="btn btn-default roffset5">
 		<fmt:message key="button.cancel" />