Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java
===================================================================
diff -u -ra34124084b91153f8cbe0720a88be1a8e0ae1e88 -r9f9856694477e89825d83841398b3571c8e90607
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java	(.../LearningController.java)	(revision a34124084b91153f8cbe0720a88be1a8e0ae1e88)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java	(.../LearningController.java)	(revision 9f9856694477e89825d83841398b3571c8e90607)
@@ -668,19 +668,19 @@
 
 	// notify learners and teachers
 	forumService.sendNotificationsOnNewPosting(forumId, sessionId, message);
-
+	request.setAttribute("formBean", messageForm);
 	return "jsps/learning/viewforum";
     }
 
     /**
      * Display replay topic page. Message form subject will include parent topics same subject.
      */
     @RequestMapping("/newReplyTopic")
-    public String newReplyTopic(@ModelAttribute("replyForm") MessageForm replyForm, HttpServletRequest request) {
+    public String newReplyTopic(@ModelAttribute MessageForm messageForm, HttpServletRequest request) {
 
 	String sessionMapID = request.getParameter(ForumConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = getSessionMap(request, replyForm);
-	replyForm.setSessionMapID(sessionMapID);
+	SessionMap sessionMap = getSessionMap(request, messageForm);
+	messageForm.setSessionMapID(sessionMapID);
 
 	Long parentId = WebUtil.readLongParam(request, ForumConstants.ATTR_PARENT_TOPIC_ID);
 	sessionMap.put(ForumConstants.ATTR_PARENT_TOPIC_ID, parentId);
@@ -696,9 +696,9 @@
 
 	    // echo back current topic subject to web page
 	    if (reTitle != null && !reTitle.trim().startsWith("Re:")) {
-		replyForm.getMessage().setSubject("Re:" + reTitle);
+		messageForm.getMessage().setSubject("Re:" + reTitle);
 	    } else {
-		replyForm.getMessage().setSubject(reTitle);
+		messageForm.getMessage().setSubject(reTitle);
 	    }
 	}
 
@@ -709,22 +709,21 @@
 	// as it has a link from the view topic screen back to View Forum screen.
 	boolean hideReflection = WebUtil.readBooleanParam(request, ForumConstants.ATTR_HIDE_REFLECTION, false);
 	sessionMap.put(ForumConstants.ATTR_HIDE_REFLECTION, hideReflection);
-
 	return "jsps/learning/reply";
     }
 
     /**
      * Create a replayed topic for a parent topic.
      */
     @RequestMapping("/replyTopic")
-    public String replyTopic(@ModelAttribute("replyForm") MessageForm replyForm, HttpServletRequest request,
+    public String replyTopic(@ModelAttribute MessageForm messageForm, HttpServletRequest request,
 	    HttpServletResponse response) throws InterruptedException {
 
-	SessionMap sessionMap = getSessionMap(request, replyForm);
+	SessionMap sessionMap = getSessionMap(request, messageForm);
 	Long parentId = (Long) sessionMap.get(ForumConstants.ATTR_PARENT_TOPIC_ID);
 	Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 
-	Message message = replyForm.getMessage();
+	Message message = messageForm.getMessage();
 	boolean isTestHarness = Boolean.valueOf(request.getParameter("testHarness"));
 	if (isTestHarness) {
 	    message.setBody(request.getParameter("message.body__textarea"));
@@ -736,7 +735,7 @@
 	ForumUser forumUser = getCurrentUser(request, sessionId);
 	message.setCreatedBy(forumUser);
 	message.setModifiedBy(forumUser);
-	setAttachment(replyForm, message);
+	setAttachment(messageForm, message);
 	setMonitorMode(sessionMap, message);
 
 	// save message into database
@@ -751,7 +750,7 @@
 	ForumToolSession session = forumService.getSessionBySessionId(sessionId);
 	Forum forum = session.getForum();
 
-	setupViewTopicPagedDTOList(request, rootTopicId, replyForm.getSessionMapID(), forumUser, forum, null, null);
+	setupViewTopicPagedDTOList(request, rootTopicId, messageForm.getSessionMapID(), forumUser, forum, null, null);
 
 	// notify learners and teachers
 	Long forumId = (Long) sessionMap.get(ForumConstants.ATTR_FORUM_ID);
@@ -765,14 +764,14 @@
      */
     @RequestMapping("/replyTopicInline")
     @ResponseBody
-    public String replyTopicInline(@ModelAttribute("replyForm") MessageForm replyForm, HttpServletRequest request,
+    public String replyTopicInline(@ModelAttribute MessageForm messageForm, HttpServletRequest request,
 	    HttpServletResponse response) throws InterruptedException, IOException {
 
-	SessionMap sessionMap = getSessionMap(request, replyForm);
+	SessionMap sessionMap = getSessionMap(request, messageForm);
 	Long parentId = (Long) sessionMap.get(ForumConstants.ATTR_PARENT_TOPIC_ID);
 	Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 
-	Message message = replyForm.getMessage();
+	Message message = messageForm.getMessage();
 	boolean isTestHarness = Boolean.valueOf(request.getParameter("testHarness"));
 	if (isTestHarness) {
 	    message.setBody(request.getParameter("message.body__textarea"));
@@ -784,7 +783,7 @@
 	ForumUser forumUser = getCurrentUser(request, sessionId);
 	message.setCreatedBy(forumUser);
 	message.setModifiedBy(forumUser);
-	setAttachment(replyForm, message);
+	setAttachment(messageForm, message);
 	setMonitorMode(sessionMap, message);
 
 	// save message into database
@@ -805,7 +804,7 @@
 	ObjectNode.put(ForumConstants.ATTR_NO_MORE_POSTS, noMorePosts);
 	ObjectNode.put(ForumConstants.ATTR_NUM_OF_POSTS, numOfPosts);
 	ObjectNode.put(ForumConstants.ATTR_THREAD_ID, newMessageSeq.getThreadMessage().getUid());
-	ObjectNode.put(ForumConstants.ATTR_SESSION_MAP_ID, replyForm.getSessionMapID());
+	ObjectNode.put(ForumConstants.ATTR_SESSION_MAP_ID, messageForm.getSessionMapID());
 	ObjectNode.put(ForumConstants.ATTR_ROOT_TOPIC_UID, rootTopicId);
 	ObjectNode.put(ForumConstants.ATTR_PARENT_TOPIC_ID, newMessageSeq.getMessage().getParent().getUid());
 
@@ -821,20 +820,20 @@
      * Display a editable form for a special topic in order to update it.
      */
     @RequestMapping("/editTopic")
-    public String editTopic(@ModelAttribute("editForm") MessageForm editForm, HttpServletRequest request)
+    public String editTopic(@ModelAttribute MessageForm messageForm, HttpServletRequest request)
 	    throws PersistenceException {
 	Long topicId = WebUtil.readLongParam(request, ForumConstants.ATTR_TOPIC_ID);
 
 	MessageDTO topic = getTopic(topicId);
 
 	// echo current topic content to web page
 	if (topic != null) {
-	    editForm.setMessage(topic.getMessage());
+	    messageForm.setMessage(topic.getMessage());
 	    request.setAttribute(ForumConstants.AUTHORING_TOPIC, topic);
 	}
 
 	// cache this topicID, using in Update topic
-	SessionMap sessionMap = getSessionMap(request, editForm);
+	SessionMap sessionMap = getSessionMap(request, messageForm);
 	sessionMap.put(ForumConstants.ATTR_TOPIC_ID, topicId);
 
 	// Should we show the reflection or not? We shouldn't show it when the View Forum screen is accessed
@@ -844,7 +843,6 @@
 	// as it has a link from the view topic screen back to View Forum screen.
 	boolean hideReflection = WebUtil.readBooleanParam(request, ForumConstants.ATTR_HIDE_REFLECTION, false);
 	sessionMap.put(ForumConstants.ATTR_HIDE_REFLECTION, hideReflection);
-
 	return "jsps/learning/edit";
     }
 
@@ -885,7 +883,6 @@
 	ForumUser forumUser = getCurrentUser(request, (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID));
 	Forum forum = forumUser.getSession().getForum();
 	setupViewTopicPagedDTOList(request, rootTopicId, messageForm.getSessionMapID(), forumUser, forum, null, null);
-
 	return "jsps/learning/viewtopic";
     }
 
Index: lams_tool_forum/web/jsps/learning/edit.jsp
===================================================================
diff -u -r82bfa2d1d62378051c32cff20a826607fdf7a8e5 -r9f9856694477e89825d83841398b3571c8e90607
--- lams_tool_forum/web/jsps/learning/edit.jsp	(.../edit.jsp)	(revision 82bfa2d1d62378051c32cff20a826607fdf7a8e5)
+++ lams_tool_forum/web/jsps/learning/edit.jsp	(.../edit.jsp)	(revision 9f9856694477e89825d83841398b3571c8e90607)
@@ -50,14 +50,14 @@
 		<script type="text/javascript">
 			// The treetable code uses the clicks to expand and collapse the replies but then 
 			// the buttons will not work. So stop the event propogating up the event chain. 
-			$("#editForm").click(function (e) {
+			$("#messageForm").click(function (e) {
 		    	e.stopPropagation();
 			});
-			$("#editForm").keydown(function (e) {
+			$("#messageForm").keydown(function (e) {
 		    	e.stopPropagation();
 			});
 			
-			$('#editForm').submit(function() { // catch the form's submit event
+			$('#messageForm').submit(function() { // catch the form's submit event
 				disableSubmitButton();
 				if ( validateForm() ) {
 		
@@ -116,10 +116,10 @@
 		</script>
 		
 		<form:form action="updateTopicInline.do"
-				focus="message.subject" enctype="multipart/form-data" id="editForm" modelAttribute="editForm">
+				focus="message.subject" enctype="multipart/form-data" id="messageForm" modelAttribute="messageForm">
 				
 			<form:hidden path="sessionMapID"/>	
-			<c:set var="sessionMapID" value="${editForm.sessionMapID}"/>
+			<c:set var="sessionMapID" value="${messageForm.sessionMapID}"/>
 			<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 		
 			<div class="container-fluid">
Index: lams_tool_forum/web/jsps/learning/message/bodyarea.jsp
===================================================================
diff -u -r9f988c0cf9ce45c8812158692f38e74688b96ea4 -r9f9856694477e89825d83841398b3571c8e90607
--- lams_tool_forum/web/jsps/learning/message/bodyarea.jsp	(.../bodyarea.jsp)	(revision 9f988c0cf9ce45c8812158692f38e74688b96ea4)
+++ lams_tool_forum/web/jsps/learning/message/bodyarea.jsp	(.../bodyarea.jsp)	(revision 9f9856694477e89825d83841398b3571c8e90607)
@@ -5,14 +5,14 @@
 
 	<c:choose>
 		<c:when test="${sessionMap.allowRichEditor}">
-			<lams:CKEditor id="message.body" value="${message.body}" 
+			<lams:CKEditor id="message.body" value="${messageForm.message.body}" 
 					contentFolderID="${sessionMap.learnerContentFolder}" toolbarSet="DefaultLearner">
 			</lams:CKEditor>
 		</c:when>
 		
 		<c:otherwise>
 			<%-- Does not user general tag because this field need keep compatible with CKEditor's content --%>
-			<textarea rows="10" class="form-control" tabindex="2" name="message.body" id="messageBody">${message.body}</textarea> 
+			<textarea rows="10" class="form-control" tabindex="2" name="message.body" id="messageBody">${messageForm.message.body}</textarea> 
 		</c:otherwise>
 	</c:choose>
  
Index: lams_tool_forum/web/jsps/learning/message/topicform.jsp
===================================================================
diff -u -r98901fbfc777fa7907f4643646147c0c0286fa20 -r9f9856694477e89825d83841398b3571c8e90607
--- lams_tool_forum/web/jsps/learning/message/topicform.jsp	(.../topicform.jsp)	(revision 98901fbfc777fa7907f4643646147c0c0286fa20)
+++ lams_tool_forum/web/jsps/learning/message/topicform.jsp	(.../topicform.jsp)	(revision 9f9856694477e89825d83841398b3571c8e90607)
@@ -2,7 +2,7 @@
 
 <div class="form-group">
     <label><fmt:message key="message.label.subject" />&nbsp;</label>
-	<input type="text" size="50" tabindex="1" value="${message.subject}" name="message.subject" maxlength="60"/> &nbsp;
+    <form:input size="50" tabindex="1" value="${message.subject}" path="message.subject" maxlength="60"/> &nbsp;
 	<form:errors path="message.subject" />
 </div>
 
Index: lams_tool_forum/web/jsps/learning/reply.jsp
===================================================================
diff -u -r1561968992b7d31789fc5d8db45d72282adc1dc5 -r9f9856694477e89825d83841398b3571c8e90607
--- lams_tool_forum/web/jsps/learning/reply.jsp	(.../reply.jsp)	(revision 1561968992b7d31789fc5d8db45d72282adc1dc5)
+++ lams_tool_forum/web/jsps/learning/reply.jsp	(.../reply.jsp)	(revision 9f9856694477e89825d83841398b3571c8e90607)
@@ -50,14 +50,14 @@
 		<script type="text/javascript">
 			// The treetable code uses the clicks to expand and collapse the replies but then 
 			// the buttons will not work. So stop the event propogating up the event chain. 
-			$("#replyForm").click(function (e) {
+			$("#messageForm").click(function (e) {
 				e.stopPropagation();
 			});
-			$("#replyForm").keydown(function (e) {
+			$("#messageForm").keydown(function (e) {
 		    	e.stopPropagation();
 			});
 		
-			$('#replyForm').submit(function() { // catch the form's submit event
+			$('#messageForm').submit(function() { // catch the form's submit event
 				disableSubmitButton();
 				if ( validateForm() ) {
 		
@@ -134,7 +134,7 @@
 		</script>
 		
 		<form:form action="replyTopicInline.do"
-				focus="textarea#messageBody" enctype="multipart/form-data" modelAttribute="replyForm" id="replyForm" >
+				focus="textarea#messageBody" enctype="multipart/form-data" modelAttribute="messageForm" id="messageForm" >
 				
 			<c:set var="sessionMapID" value="${messageForm.sessionMapID}"/>
 			<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>