Index: lams_tool_forum/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r5b3d4f5da53c310a16fe0498fc1e95261569c67b -r3f65546d337cbe98aea623132d1835a770e6d1c8
--- lams_tool_forum/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 5b3d4f5da53c310a16fe0498fc1e95261569c67b)
+++ lams_tool_forum/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 3f65546d337cbe98aea623132d1835a770e6d1c8)
@@ -241,4 +241,8 @@
 label.show.replies=Show Replies
 label.hide.replies=Hide Replies
 label.showhide.prompt=Show/Hide Replies
+message.complete.or.cancel.reply=Please complete or cancel the current reply before starting a new reply.
+message.complete.or.cancel.edit=Please complete or cancel the current edit before starting a new edit.
+error.cannot.redisplay.please.refresh=Your changes have been saved but cannot be redisplayed. Please select refresh to reload the forum messages.
+
 #======= End labels: Exported 232 labels for en AU =====
Index: lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r5b3d4f5da53c310a16fe0498fc1e95261569c67b -r3f65546d337cbe98aea623132d1835a770e6d1c8
--- lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 5b3d4f5da53c310a16fe0498fc1e95261569c67b)
+++ lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 3f65546d337cbe98aea623132d1835a770e6d1c8)
@@ -241,6 +241,9 @@
 label.show.replies=Show Replies
 label.hide.replies=Hide Replies
 label.showhide.prompt=Show/Hide Replies
+message.complete.or.cancel.reply=Please complete or cancel the current reply before starting a new reply.
+message.complete.or.cancel.edit=Please complete or cancel the current edit before starting a new edit.
+error.cannot.redisplay.please.refresh=Your changes have been saved but cannot be redisplayed. Please select refresh to reload the forum messages.
 
 
 #======= End labels: Exported 232 labels for en AU =====
Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -refef5787566da02898fc3cb31a876749d3a0f368 -r3f65546d337cbe98aea623132d1835a770e6d1c8
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision efef5787566da02898fc3cb31a876749d3a0f368)
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 3f65546d337cbe98aea623132d1835a770e6d1c8)
@@ -187,6 +187,11 @@
 			parameter="viewTopicThread" scope="request">
 			<forward name="success" path="tiles:/learning/forum/viewTopicNext" />
 		</action>
+		<action path="/learning/viewMessage"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
+			parameter="viewMessage" scope="request">
+			<forward name="success" path="tiles:/learning/forum/viewMessage" />
+		</action>
 		<action path="/learning/newTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
 			name="messageForm" 
@@ -227,7 +232,7 @@
 			input="tiles:/learning/forum/replyTopic" 
 			parameter="replyTopicInline" 
 			scope="request">
-			<forward name="success" path="tiles:/learning/forum/viewTopic" />
+			<!--  JSON response on success -->
 		</action>
 		<action path="/learning/editTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
@@ -246,6 +251,15 @@
 			scope="request">
 			<forward name="success" path="tiles:/learning/forum/viewTopic" />
 		</action>
+		<action path="/learning/updateTopicInline"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
+			name="messageForm" 
+			validate="true" 
+			input="tiles:/learning/forum/editTopic"
+			parameter="updateTopicInline" 
+			scope="request">
+			<!--  JSON response on success -->
+		</action>
 		
 		<action path="/learning/deleteAttachment"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageSeqDao.java
===================================================================
diff -u -refef5787566da02898fc3cb31a876749d3a0f368 -r3f65546d337cbe98aea623132d1835a770e6d1c8
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageSeqDao.java	(.../MessageSeqDao.java)	(revision efef5787566da02898fc3cb31a876749d3a0f368)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageSeqDao.java	(.../MessageSeqDao.java)	(revision 3f65546d337cbe98aea623132d1835a770e6d1c8)
@@ -28,6 +28,7 @@
 import java.util.Date;
 import java.util.List;
 
+import org.apache.log4j.Logger;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.lamsfoundation.lams.tool.Tool;
@@ -46,17 +47,34 @@
 	    + " where root_message_uid = ? and thread_message_uid = ? and message_level > 1";
     private static final String SQL_QUERY_GET_COMPLETE_THREAD = "from " + MessageSeq.class.getName()
 	    + " where thread_message_uid = ?";
+    private static final String SQL_QUERY_GET_SEQ_BY_MESSAGE = "from " + MessageSeq.class.getName()
+	    + " where message_uid = ?";
 
     private static final String SQL_QUERY_NUM_POSTS_BY_TOPIC = "select count(*) from " + MessageSeq.class.getName()
 	    + " ms where ms.message.createdBy.userId=? and ms.message.isAuthored = false and ms.rootMessage.uid=?";
 
     private static final String SQL_QUERY_NUM_POSTS_BY_ROOT_MESSAGE_AND_DATE = "SELECT count(*) FROM "
 	    + MessageSeq.class.getName() + " seq WHERE seq.rootMessage.uid = ? AND seq.message.updated > ?";
 
+    private static final Logger log = Logger.getLogger(MessageSeqDao.class);
+    
     public MessageSeq getById(Long messageSeqId) {
 	return (MessageSeq) getHibernateTemplate().get(MessageSeq.class, messageSeqId);
     }
 
+    public MessageSeq getByMessageId(Long messageId) {
+	HibernateTemplate template = this.getHibernateTemplate();
+	List list = template.find(SQL_QUERY_GET_SEQ_BY_MESSAGE, messageId);	
+	if (list != null ) {
+	    if ( list.size() > 1) {
+		log.warn("Looking up message seq by message id="+messageId+". More than one message seq found!"+list.toString());
+	    }
+	    return (MessageSeq) list.get(0);
+	} else {
+	    return null;
+	}
+    }
+
     public List getCompleteTopic(Long rootTopicId) {
 	return this.getHibernateTemplate().find(SQL_QUERY_FIND_COMPLETE_TOPIC, rootTopicId);
     }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -refef5787566da02898fc3cb31a876749d3a0f368 -r3f65546d337cbe98aea623132d1835a770e6d1c8
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision efef5787566da02898fc3cb31a876749d3a0f368)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 3f65546d337cbe98aea623132d1835a770e6d1c8)
@@ -26,7 +26,6 @@
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -46,6 +45,8 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.upload.FormFile;
+import org.apache.tomcat.util.json.JSONException;
+import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.contentrepository.AccessDeniedException;
 import org.lamsfoundation.lams.contentrepository.ICredentials;
 import org.lamsfoundation.lams.contentrepository.ITicket;
@@ -272,6 +273,15 @@
 	return message;
     }
 
+
+    public List<MessageDTO> getMessageAsDTO(Long messageUid) throws PersistenceException {
+
+	MessageSeq msgSeq = messageSeqDao.getByMessageId(messageUid);
+	List<MessageDTO> msgDtoList = new ArrayList<MessageDTO>();
+	msgDtoList.add(makeDTOSetRating(msgSeq, msgSeq.getMessage()));
+	return msgDtoList;
+    }
+
     public void updateContainedReport(Message message) {
 	messageDao.saveOrUpdate(message);
     }
@@ -685,22 +695,25 @@
 	    Map.Entry entry = (Entry) iter.next();
 	    msgSeq = (MessageSeq) entry.getKey();
 	    message = (Message) entry.getValue();
-	    MessageDTO dto = MessageDTO.getMessageDTO(message);
-	    dto.setLevel(msgSeq.getMessageLevel());
-	    
-	    //set averageRating 
-	    if (message.getForum().isAllowRateMessages()) {
-		AverageRatingDTO averageRating = getAverageRatingDTOByMessage(message.getUid());
-		dto.setAverageRating(averageRating.getRating());
-		dto.setNumberOfVotes(averageRating.getNumberOfVotes());
-	    }
-	    
-	    msgDtoList.add(dto);
+	    msgDtoList.add(makeDTOSetRating(msgSeq, message));
 	}
 	return msgDtoList;
     }
 
+    private MessageDTO makeDTOSetRating(MessageSeq msgSeq, Message message) {
+	MessageDTO dto = MessageDTO.getMessageDTO(message);
+	dto.setLevel(msgSeq.getMessageLevel());
+	
+	//set averageRating 
+	if (message.getForum().isAllowRateMessages()) {
+	AverageRatingDTO averageRating = getAverageRatingDTOByMessage(message.getUid());
+	dto.setAverageRating(averageRating.getRating());
+	dto.setNumberOfVotes(averageRating.getNumberOfVotes());
+	}
+	return dto;
+    }
 
+
     /**
      * Process an uploaded file.
      * 
@@ -1572,4 +1585,7 @@
     public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) {
 	return getForumOutputFactory().getSupportedDefinitionClasses(definitionType);
     }
+    
+    // ****************** REST methods *************************
+
 }
\ No newline at end of file
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
===================================================================
diff -u -refef5787566da02898fc3cb31a876749d3a0f368 -r3f65546d337cbe98aea623132d1835a770e6d1c8
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision efef5787566da02898fc3cb31a876749d3a0f368)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision 3f65546d337cbe98aea623132d1835a770e6d1c8)
@@ -237,6 +237,15 @@
     Message getMessage(Long messageUid) throws PersistenceException;
 
     /**
+     * Get message by given message UID, wrapped up in the usual DTO list that is used for the view code in learner.
+     * 
+     * @param messageUid
+     * @return Message
+     * @throws PersistenceException
+     */
+    List<MessageDTO> getMessageAsDTO(Long messageUid) throws PersistenceException;
+    
+    /**
      * Get message list posted by given user. Note that the return type is DTO.
      * 
      * @param userId
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
diff -u -refef5787566da02898fc3cb31a876749d3a0f368 -r3f65546d337cbe98aea623132d1835a770e6d1c8
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision efef5787566da02898fc3cb31a876749d3a0f368)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 3f65546d337cbe98aea623132d1835a770e6d1c8)
@@ -116,6 +116,9 @@
 	if (param.equals("viewTopicThread")) {
 	    return viewTopicThread(mapping, form, request, response);
 	}
+	if (param.equals("viewMessage")) {
+	    return viewMessage(mapping, form, request, response);
+	}
 	if (param.equals("newTopic")) {
 	    return newTopic(mapping, form, request, response);
 	}
@@ -137,6 +140,9 @@
 	if (param.equals("updateTopic")) {
 	    return updateTopic(mapping, form, request, response);
 	}
+	if (param.equals("updateTopicInline")) {
+	    return updateTopicInline(mapping, form, request, response);
+	}
 	if (param.equals("deleteAttachment")) {
 	    return deleteAttachment(mapping, form, request, response);
 	}
@@ -584,6 +590,52 @@
     }
 
     /**
+     * Display a single message.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    private ActionForward viewMessage(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+
+	forumService = getForumManager();
+
+	Long rootTopicId = WebUtil.readLongParam(request, ForumConstants.ATTR_TOPIC_ID);
+	Long messageUid = WebUtil.readLongParam(request, ForumConstants.ATTR_MESS_ID, true);
+
+	String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	sessionMap.put(ForumConstants.ATTR_ROOT_TOPIC_UID, rootTopicId);
+
+	// get forum user and forum
+	ForumUser forumUser = getCurrentUser(request, (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID));
+	Forum forum = forumUser.getSession().getForum();
+
+	List<MessageDTO> msgDtoList = forumService.getMessageAsDTO(messageUid);
+	updateMesssageFlag(msgDtoList);
+	request.setAttribute(ForumConstants.AUTHORING_TOPIC_THREAD, msgDtoList);
+
+	// check if we can still make posts in this topic 
+	int numOfPosts = forumService.getNumOfPostsByTopic(forumUser.getUserId(), rootTopicId);
+	boolean noMorePosts = forum.getMaximumReply() != 0 && numOfPosts >= forum.getMaximumReply()
+		&& !forum.isAllowNewTopic() ? Boolean.TRUE : Boolean.FALSE;
+	request.setAttribute(ForumConstants.ATTR_NO_MORE_POSTS, noMorePosts);
+	request.setAttribute(ForumConstants.ATTR_NUM_OF_POSTS, numOfPosts);
+	request.setAttribute(ForumConstants.ATTR_NO_MORE_PAGES, true);
+	
+	if ( messageUid != null ) {
+	    request.setAttribute(ForumConstants.ATTR_MESS_ID, messageUid);
+	}
+	// transfer SessionMapID as well
+	request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+
+	return mapping.findForward("success");
+    }
+
+    /**
      * Display empty page for a new topic in forum
      * 
      * @param mapping
@@ -908,6 +960,19 @@
 	Long topicId = (Long) sessionMap.get(ForumConstants.ATTR_TOPIC_ID);
 	Message message = messageForm.getMessage();
 
+	doUpdateTopic(request, messageForm, sessionMap, topicId, message);
+
+	// echo back this topic thread into page
+	Long rootTopicId = forumService.getRootTopicId(topicId);
+	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 mapping.findForward("success");
+    }
+
+    private void doUpdateTopic(HttpServletRequest request, MessageForm messageForm, SessionMap sessionMap,
+	    Long topicId, Message message) {
 	boolean makeAuditEntry = ToolAccessMode.TEACHER.equals(sessionMap.get(AttributeNames.ATTR_MODE));
 	String oldMessageString = null;
 
@@ -936,14 +1001,40 @@
 	// save message into database
 	// if we are in monitoring then we are probably editing some else's entry so log the change.
 	forumService.updateTopic(messagePO);
+    }
 
-	// echo back this topic thread into page
+    /**
+     * Update a topic.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws PersistenceException
+     * @throws JSONException 
+     * @throws IOException 
+     */
+    public ActionForward updateTopicInline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws PersistenceException, JSONException, IOException {
+
+	forumService = getForumManager();
+
+	MessageForm messageForm = (MessageForm) form;
+	SessionMap sessionMap = getSessionMap(request, messageForm);
+	Long topicId = (Long) sessionMap.get(ForumConstants.ATTR_TOPIC_ID);
+	Message message = messageForm.getMessage();
+
+	doUpdateTopic(request, messageForm, sessionMap, topicId, message);
+
+	JSONObject JSONObject = new JSONObject();
+	JSONObject.put(ForumConstants.ATTR_MESS_ID, topicId);
+	JSONObject.put(ForumConstants.ATTR_SESSION_MAP_ID, messageForm.getSessionMapID());
 	Long rootTopicId = forumService.getRootTopicId(topicId);
-	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 mapping.findForward("success");
+	JSONObject.put(ForumConstants.ATTR_ROOT_TOPIC_UID, rootTopicId);
+	response.setContentType("application/json;charset=utf-8");
+	response.getWriter().print(JSONObject);
+	return null;
     }
 
     /**
Index: lams_tool_forum/web/WEB-INF/tiles-defs.xml
===================================================================
diff -u -r72a3c5dbc0b2b0f1b3304d50cdd8798d6616aef8 -r3f65546d337cbe98aea623132d1835a770e6d1c8
--- lams_tool_forum/web/WEB-INF/tiles-defs.xml	(.../tiles-defs.xml)	(revision 72a3c5dbc0b2b0f1b3304d50cdd8798d6616aef8)
+++ lams_tool_forum/web/WEB-INF/tiles-defs.xml	(.../tiles-defs.xml)	(revision 3f65546d337cbe98aea623132d1835a770e6d1c8)
@@ -76,6 +76,7 @@
 	
 	<definition name="tiles:/learning/forum/viewTopic" path="/jsps/learning/viewtopic.jsp" />
 	<definition name="tiles:/learning/forum/viewTopicNext" path="/jsps/learning/message/topicviewwrapper.jsp" />
+	<definition name="tiles:/learning/forum/viewMessage" path="/jsps/learning/message/msgviewwrapper.jsp" />
 	
     <definition name="tiles:/learning/forum/newTopic" extends="tiles:learner:layout">
     	<put name="pageTitleKey" value="title.message.add"/>
Index: lams_tool_forum/web/jsps/learning/edit.jsp
===================================================================
diff -u -rc4854959d539a3b2d18dc30be9a11f7c127050aa -r3f65546d337cbe98aea623132d1835a770e6d1c8
--- lams_tool_forum/web/jsps/learning/edit.jsp	(.../edit.jsp)	(revision c4854959d539a3b2d18dc30be9a11f7c127050aa)
+++ lams_tool_forum/web/jsps/learning/edit.jsp	(.../edit.jsp)	(revision 3f65546d337cbe98aea623132d1835a770e6d1c8)
@@ -1,6 +1,64 @@
 <%@ include file="/common/taglibs.jsp"%>
-<html:form action="/learning/updateTopic.do" onsubmit="return validateForm()"
-		focus="message.subject" enctype="multipart/form-data">
+
+<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) {
+    	e.stopPropagation();
+	});
+	
+	// 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').submit(function() { // catch the form's submit event
+
+		if ( validateForm() ) {
+
+			if ( typeof CKEDITOR !== 'undefined' ) {
+				for ( instance in CKEDITOR.instances )
+    				CKEDITOR.instances[instance].updateElement();
+    		}
+    		
+			var formData = new FormData(this);
+			
+		    $.ajax({ // create an AJAX call...
+		        data: formData, 
+		        processData: false, // tell jQuery not to process the data
+		        contentType: false, // tell jQuery not to set contentType
+		        type: $(this).attr('method'), // GET or POST
+		        url: $(this).attr('action'), // the file to call
+		        success: function (response) {
+        			var messageUid = response.messageUid;
+					if ( messageUid ) {
+	        			var rootUid = response.rootUid;
+	        			var messDiv = document.getElementById('msg'+messageUid);
+	        			if ( ! messDiv) {
+	        				alert('<fmt:message key="error.cannot.redisplay.please.refresh"/>');
+        				} else {
+        					// make sure the old edit form is gone, so if something goes wrong 
+        					// the user won't try to submit it again
+							$('#edit').remove();
+	        				var loadString = '<html:rewrite page="/learning/viewMessage.do?topicID="/>' + rootUid + "&sessionMapID=" + response.sessionMapID + "&messageUid="+messageUid;
+							$(messDiv).load(loadString);
+						}
+
+		    		} else {
+		    			// No valid id? Validation failed! Assume it is the form coming back.
+						$('#edit').html(response);
+		    		} 
+		    	} 
+		    });
+		} // end validateForm()
+		return false;
+	});
+
+	function cancelEdit() {
+		$('#edit').remove();
+	}
+	
+</script>
+
+<html:form action="/learning/updateTopicInline.do"
+		focus="message.subject" enctype="multipart/form-data" styleId="editForm">
 		
 	<html:hidden property="sessionMapID"/>	
 	<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
Index: lams_tool_forum/web/jsps/learning/message/msgview.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/learning/message/msgview.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/learning/message/msgview.jsp	(revision 3f65546d337cbe98aea623132d1835a770e6d1c8)
@@ -0,0 +1,186 @@
+<%@ page import="org.lamsfoundation.lams.tool.forum.util.ForumConstants"%>
+<%@ include file="/common/taglibs.jsp"%>
+
+<!--  msgDto, messageUid, msgLevel needs to be in the session elsewhere -->
+
+	<c:set var="hidden" value="${msgDto.message.hideFlag}" />
+	
+	<c:choose>
+	<c:when test='${(msgDto.level <= 1)}'>
+		<c:set var="indentSize" value="0" />
+	</c:when>
+	<c:otherwise>
+		<c:set var="indentSize" value="${(msgDto.level-1)*indent}" />
+	</c:otherwise>
+	</c:choose>
+	
+	<c:choose>
+	<c:when test='${msgDto.message.uid == messageUid}'>
+	<div id="msg${msgDto.message.uid}" style="margin-left:<c:out value="${indentSize}"/>px;" class="highlight" >
+	</c:when>
+	<c:otherwise>	
+	<div id="msg${msgDto.message.uid}" style="margin-left:<c:out value="${indentSize}"/>px;" >
+	</c:otherwise>
+	</c:choose>
+		<table cellspacing="0" class="forum">
+			<tr>
+				<th id="subject">
+					<c:choose>
+						<c:when test='${(sessionMap.mode == "teacher") || (not hidden)}'>
+							<c:out value="${msgDto.message.subject}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="topic.message.subject.hidden" />
+						</c:otherwise>
+					</c:choose>
+				</th>
+			</tr>
+			<tr>
+				<td class="posted-by">
+					<c:if test='${(sessionMap.mode == "teacher") || (not hidden)}'>
+						<fmt:message key="lable.topic.subject.by" />
+						<c:set var="author" value="${msgDto.author}" />
+						<c:if test="${empty author}">
+							<c:set var="author">
+								<fmt:message key="label.default.user.name" />
+							</c:set>
+						</c:if>
+						<span id="author"><c:out value="${author}" escapeXml="true"/></span>						
+								-
+						<span id="date"><lams:Date value="${msgDto.message.updated}" /></span>
+					</c:if>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<span id="msgBody">
+					<c:if
+						test='${(not hidden) || (hidden && sessionMap.mode == "teacher")}'>
+						<c:out value="${msgDto.message.body}" escapeXml="false" />
+					</c:if>
+					<c:if test='${hidden}'>
+						<i><fmt:message key="topic.message.body.hidden" /> </i>
+					</c:if>
+					</span>
+				</td>
+			</tr>
+
+			<c:if test="${not empty msgDto.message.attachments}">
+				<tr>
+					<td>
+						<div id="attachments">
+						<img src="<html:rewrite page="/images/paperclip.gif"/>" class="space-left float-left">
+						<c:if
+							test='${(not hidden) || (hidden && sessionMap.mode == "teacher")}'> 
+							<c:forEach var="file" items="${msgDto.message.attachments}">
+								<c:set var="downloadURL">
+									<html:rewrite
+										page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
+								</c:set>
+								<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+									<c:out value="${file.fileName}" /> </a>
+							</c:forEach>
+						</c:if>
+						<c:if test='${hidden}'>
+							<fmt:message key="topic.message.attachment.hidden" />
+						</c:if>
+						</div>
+					</td>
+				</tr>
+			</c:if>
+			<c:if
+				test="${((msgDto.released && msgDto.isAuthor) || sessionMap.mode=='teacher') && (not empty msgDto.mark)}">
+				<tr>
+					<td>
+						<span class="field-name"><fmt:message
+								key="lable.topic.title.mark" />
+						</span>
+						<BR>
+						<fmt:formatNumber value="${msgDto.mark}"  maxFractionDigits="2"/>
+					</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">
+						<!--  Rating stars -->
+						<%@ include file="/jsps/learning/ratingStars.jsp"%>
+					
+						<!--  Hide/Unhide Button -->
+						<c:if test='${sessionMap.mode == "teacher"}'>
+							<c:set var="updateMark">
+								<html:rewrite
+									page="/monitoring/editMark.do?sessionMapID=${sessionMapID}&topicID=${msgDto.message.uid}&updateMode=viewForum&hideReflection=${sessionMap.hideReflection}" />
+							</c:set>
+							<html:link href="${updateMark}" styleClass="button">
+								<fmt:message key="lable.topic.title.mark" />
+							</html:link>
+							
+							<!--  call the hide action -->
+							<c:choose>
+								<c:when test="${hidden}">
+									<!--  display a show link  -->
+									<c:set var="hidetopic">
+										<html:rewrite
+											page="/learning/updateMessageHideFlag.do?sessionMapID=${sessionMapID}&topicID=${msgDto.message.uid}&hideFlag=false" />
+									</c:set>
+									<html:link href="${hidetopic}" styleClass="button">
+										<fmt:message key="label.show" />
+									</html:link>
+								</c:when>
+								<c:otherwise>
+									<!--  display a hide link -->
+									<c:set var="hidetopic">
+										<html:rewrite
+											page="/learning/updateMessageHideFlag.do?sessionMapID=${sessionMapID}&topicID=${msgDto.message.uid}&hideFlag=true" />
+									</c:set>
+									<html:link href="${hidetopic}" styleClass="button">
+										<fmt:message key="label.hide" />
+									</html:link>
+								</c:otherwise>
+							</c:choose>
+						</c:if>
+
+						<!--  Edit Button -->
+						<c:if test="${not hidden}">
+							<c:if
+								test='${(sessionMap.mode == "teacher") || (msgDto.isAuthor && not sessionMap.finishedLock && sessionMap.allowEdit && (empty msgDto.mark))}'>
+								<c:set var="edittopic">
+									<html:rewrite
+										page="/learning/editTopic.do?sessionMapID=${sessionMapID}&topicID=${msgDto.message.uid}&rootUid=${sessinoMap.rootUid}&create=${msgDto.message.created.time}&hideReflection=${sessionMap.hideReflection}" />
+								</c:set>
+								<a href="#${msgDto.message.uid}" onClick="javascript:createEdit(${msgDto.message.uid},'${edittopic}',${msgLevel})" class="button"><fmt:message key="label.edit" /></a>
+							</c:if>
+					
+							<!--  Reply Button -->
+							<c:if
+								test="${(not sessionMap.finishedLock) && (not noMorePosts)}">
+								<c:set var="replytopic">
+									<html:rewrite
+										page="/learning/newReplyTopic.do?sessionMapID=${sessionMapID}&parentID=${msgDto.message.uid}&rootUid=${sessionMap.rootUid}&hideReflection=${sessionMap.hideReflection}" />
+								</c:set>
+								<a href="#${msgDto.message.uid}" onClick="javascript:createReply(${msgDto.message.uid},'${replytopic}',${msgLevel})" class="button replybutton"><fmt:message key="label.reply" /></a>
+							</c:if>
+						</c:if>
+					</div>
+				</td>
+			</tr>
+		</table>
+	</div>
+
Index: lams_tool_forum/web/jsps/learning/message/msgviewwrapper.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/learning/message/msgviewwrapper.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/learning/message/msgviewwrapper.jsp	(revision 3f65546d337cbe98aea623132d1835a770e6d1c8)
@@ -0,0 +1,30 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+
+<!-- Wraps up msgview.jsp for returning a single message - called when an edit is performed. It needs to do all the setup that topicview.jsp normally does. -->
+
+<%@ include file="/common/taglibs.jsp"%>
+
+<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. 
+	$(".button").click(function (e) {
+		e.stopPropagation();
+	});
+	$(".rating-stars-div").click(function (e) {
+		e.stopPropagation();
+	});
+	$("#attachments").click(function (e) {
+    	e.stopPropagation();
+	});
+
+
+</script>
+
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:forEach var="msgDto" items="${topicThread}">
+
+	<c:set var="msgLevel" value="${msgDto.level}" />
+	<%@ include file="msgview.jsp"%>
+
+</c:forEach>
Index: lams_tool_forum/web/jsps/learning/message/topiceditform.jsp
===================================================================
diff -u -r0bcc23651fc301918c997e707e5e28e604db70ac -r3f65546d337cbe98aea623132d1835a770e6d1c8
--- lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision 0bcc23651fc301918c997e707e5e28e604db70ac)
+++ lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision 3f65546d337cbe98aea623132d1835a770e6d1c8)
@@ -30,13 +30,7 @@
 
 <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" styleId="cancelButton" 
-			onclick="javascript:location.href='${backToTopic}';"
-			styleClass="button">
+		<html:button property="goback" styleId="cancelButton" onclick="javascript:cancelEdit();"	styleClass="button">
 			<fmt:message key="button.cancel" />
 		</html:button>
 		<html:submit styleClass="button" styleId="submitButton">
Index: lams_tool_forum/web/jsps/learning/message/topicview.jsp
===================================================================
diff -u -r946e908eb73ec1bd60053456ceeec557bdf02980 -r3f65546d337cbe98aea623132d1835a770e6d1c8
--- lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision 946e908eb73ec1bd60053456ceeec557bdf02980)
+++ lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision 3f65546d337cbe98aea623132d1835a770e6d1c8)
@@ -22,30 +22,49 @@
 
 <script type="text/javascript">
 
-// The treetable code uses the clicks to expand and collapse the replies but then 
+	// 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. 
 	$(".button").click(function (e) {
-		e.stopPropagation();
+    	e.stopPropagation();
 	});
 	$(".rating-stars-div").click(function (e) {
-		e.stopPropagation();
+    	e.stopPropagation();
 	});
+	$("#attachments").click(function (e) {
+    	e.stopPropagation();
+	});
 
-	function createReply(messageUid, url) {
+	function createReply(messageUid, url, level) {
 		if ( document.getElementById('reply') ) {
-// I18N
-			alert("Please complete or cancel the current reply before starting a new reply.");
+			alert('<fmt:message key="message.complete.or.cancel.reply"/>');
 		} else {
 			// set up the new reply area
-			var parentDiv = document.getElementById('msg'+messageUid);
 			var replyDiv = document.createElement("div");
 			replyDiv.id = 'reply';
-			$(replyDiv).addClass('replydiv');
-			parentDiv.appendChild(replyDiv);
+
+			if ( level == 0 ) {
+				$('#msg'+messageUid).after(replyDiv);
+			} else {				
+				var parentDiv = document.getElementById('msg'+messageUid);
+				parentDiv.appendChild(replyDiv);
+			}
+			
 			$(replyDiv).load(url);
 		}
 	}
 
+	function createEdit(messageUid, url, level) {
+		if ( document.getElementById('edit') ) {
+			alert('<fmt:message key="message.complete.or.cancel.edit"/>');
+		} else {
+			// set up the new edit area
+			var parentDiv = document.getElementById('msg'+messageUid);
+			var editDiv = document.createElement("div");
+			editDiv.id = 'edit';
+			parentDiv.appendChild(editDiv);
+			$(editDiv).load(url);
+		}
+	}
 
 
 </script>
@@ -59,10 +78,7 @@
 	</c:if>
 
 	<c:choose>
-	<c:when test='${(msgLevel == 0)}'>
-		<c:set var="indentSize" value="0" />
-	</c:when>
-	<c:when test='${(msgLevel <= 1)}'>
+	<c:when test='${(msgLevel == 1)}'>
 		<%-- same test & command appears at bottom of script --%>
 		<c:if test='${messageTablename != ""}'>
 			</table>
@@ -72,189 +88,17 @@
 			</div>
 		</c:if>
 		<c:set var="messageTablename" value="tree${msgDto.message.uid}"/>
-		<c:set var="indentSize" value="0" />
-		<div id="thread${msgDto.message.uid}"/>
+		<div id="thread${msgDto.message.uid}">
 		<table id="${messageTablename}">
 		<tr data-tt-id="${msgDto.message.uid}"><td>	
 	</c:when>
 	<c:otherwise>
-	<c:set var="indentSize" value="${(msgDto.level-1)*indent}" />
 		<tr data-tt-id="${msgDto.message.uid}" data-tt-parent-id="${msgDto.message.parent.uid}"><td>	
 	</c:otherwise>
 	</c:choose>
 	
-	<c:choose>
-	<c:when test='${msgDto.message.uid == messageUid}'>
-	<div id="msg${msgDto.message.uid}" style="margin-left:<c:out value="${indentSize}"/>px;" class="highlight" >
-	</c:when>
-	<c:otherwise>	
-	<div id="msg${msgDto.message.uid}" style="margin-left:<c:out value="${indentSize}"/>px;" >
-	</c:otherwise>
-	</c:choose>
-		<table cellspacing="0" class="forum">
-			<tr>
-				<th id="subject">
-					<c:choose>
-						<c:when test='${(sessionMap.mode == "teacher") || (not hidden)}'>
-							<c:out value="${msgDto.message.subject}" />
-						</c:when>
-						<c:otherwise>
-							<fmt:message key="topic.message.subject.hidden" />
-						</c:otherwise>
-					</c:choose>
-				</th>
-			</tr>
-			<tr>
-				<td class="posted-by">
-					<c:if test='${(sessionMap.mode == "teacher") || (not hidden)}'>
-						<fmt:message key="lable.topic.subject.by" />
-						<c:set var="author" value="${msgDto.author}" />
-						<c:if test="${empty author}">
-							<c:set var="author">
-								<fmt:message key="label.default.user.name" />
-							</c:set>
-						</c:if>
-						<span id="author"><c:out value="${author}" escapeXml="true"/></span>						
-								-
-						<span id="date"><lams:Date value="${msgDto.message.updated}" /></span>
-					</c:if>
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<span id="msgBody">
-					<c:if
-						test='${(not hidden) || (hidden && sessionMap.mode == "teacher")}'>
-						<c:out value="${msgDto.message.body}" escapeXml="false" />
-					</c:if>
-					<c:if test='${hidden}'>
-						<i><fmt:message key="topic.message.body.hidden" /> </i>
-					</c:if>
-					</span>
-				</td>
-			</tr>
-
-			<c:if test="${not empty msgDto.message.attachments}">
-				<tr>
-					<td>
-						<div id="attachments">
-						<img src="<html:rewrite page="/images/paperclip.gif"/>" class="space-left float-left">
-						<c:if
-							test='${(not hidden) || (hidden && sessionMap.mode == "teacher")}'> 
-							<c:forEach var="file" items="${msgDto.message.attachments}">
-								<c:set var="downloadURL">
-									<html:rewrite
-										page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
-								</c:set>
-								<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-									<c:out value="${file.fileName}" /> </a>
-							</c:forEach>
-						</c:if>
-						<c:if test='${hidden}'>
-							<fmt:message key="topic.message.attachment.hidden" />
-						</c:if>
-						</div>
-					</td>
-				</tr>
-			</c:if>
-			<c:if
-				test="${((msgDto.released && msgDto.isAuthor) || sessionMap.mode=='teacher') && (not empty msgDto.mark)}">
-				<tr>
-					<td>
-						<span class="field-name"><fmt:message
-								key="lable.topic.title.mark" />
-						</span>
-						<BR>
-						<fmt:formatNumber value="${msgDto.mark}"  maxFractionDigits="2"/>
-					</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">
-						<!--  Rating stars -->
-						<%@ include file="/jsps/learning/ratingStars.jsp"%>
-					
-						<!--  Hide/Unhide Button -->
-						<c:if test='${sessionMap.mode == "teacher"}'>
-							<c:set var="updateMark">
-								<html:rewrite
-									page="/monitoring/editMark.do?sessionMapID=${sessionMapID}&topicID=${msgDto.message.uid}&updateMode=viewForum&hideReflection=${sessionMap.hideReflection}" />
-							</c:set>
-							<html:link href="${updateMark}" styleClass="button">
-								<fmt:message key="lable.topic.title.mark" />
-							</html:link>
-							
-							<!--  call the hide action -->
-							<c:choose>
-								<c:when test="${hidden}">
-									<!--  display a show link  -->
-									<c:set var="hidetopic">
-										<html:rewrite
-											page="/learning/updateMessageHideFlag.do?sessionMapID=${sessionMapID}&topicID=${msgDto.message.uid}&hideFlag=false" />
-									</c:set>
-									<html:link href="${hidetopic}" styleClass="button">
-										<fmt:message key="label.show" />
-									</html:link>
-								</c:when>
-								<c:otherwise>
-									<!--  display a hide link -->
-									<c:set var="hidetopic">
-										<html:rewrite
-											page="/learning/updateMessageHideFlag.do?sessionMapID=${sessionMapID}&topicID=${msgDto.message.uid}&hideFlag=true" />
-									</c:set>
-									<html:link href="${hidetopic}" styleClass="button">
-										<fmt:message key="label.hide" />
-									</html:link>
-								</c:otherwise>
-							</c:choose>
-						</c:if>
-
-						<!--  Edit Button -->
-						<c:if test="${not hidden}">
-							<c:if
-								test='${(sessionMap.mode == "teacher") || (msgDto.isAuthor && not sessionMap.finishedLock && sessionMap.allowEdit && (empty msgDto.mark))}'>
-								<c:set var="edittopic">
-									<html:rewrite
-										page="/learning/editTopic.do?sessionMapID=${sessionMapID}&topicID=${msgDto.message.uid}&rootUid=${sessinoMap.rootUid}&create=${msgDto.message.created.time}&hideReflection=${sessionMap.hideReflection}" />
-								</c:set>
-								<html:link href="${edittopic}" styleClass="button" styleId="editButton">
-									<fmt:message key="label.edit" />
-								</html:link>
-							</c:if>
-					
-							<!--  Reply Button -->
-							<c:if
-								test="${(not sessionMap.finishedLock) && (not noMorePosts)}">
-								<c:set var="replytopic">
-									<html:rewrite
-										page="/learning/newReplyTopic.do?sessionMapID=${sessionMapID}&parentID=${msgDto.message.uid}&rootUid=${sessionMap.rootUid}&hideReflection=${sessionMap.hideReflection}" />
-								</c:set>
-								<a href="#${msgDto.message.uid}" onClick="javascript:createReply(${msgDto.message.uid},'${replytopic}')" class="button replybutton"><fmt:message key="label.reply" /></a>
-							</c:if>
-						</c:if>
-					</div>
-				</td>
-			</tr>
-		</table>
-	</div>
-
+	<%@ include file="msgview.jsp"%>
+	
 	<c:if test='${(msgLevel >= 1)}'>
 		</td></tr>	
 	</c:if>
Index: lams_tool_forum/web/jsps/learning/reply.jsp
===================================================================
diff -u -r946e908eb73ec1bd60053456ceeec557bdf02980 -r3f65546d337cbe98aea623132d1835a770e6d1c8
--- lams_tool_forum/web/jsps/learning/reply.jsp	(.../reply.jsp)	(revision 946e908eb73ec1bd60053456ceeec557bdf02980)
+++ lams_tool_forum/web/jsps/learning/reply.jsp	(.../reply.jsp)	(revision 3f65546d337cbe98aea623132d1835a770e6d1c8)
@@ -35,7 +35,6 @@
         			if ( rootUid ) {
 	        			if ( ! threadDiv) {
     	    				// must have replied to the top level, so show the posting at the top.
-        					// even if it was an actual error, the top is as good a place as any to show it!
 							var threadDiv = document.getElementById('reply');
 							threadDiv.id = 'thread'+messageUid;
         				} else {
@@ -45,8 +44,7 @@
 						}
         			
 	        			if ( ! threadDiv) {
-// I18N
-    	    				alert("Your reply is saved but we cannot redisplay it. Please select refresh to reload the forum messages.");
+	        				alert('<fmt:message key="error.cannot.redisplay.please.refresh"/>');
         				} else {
 	        				var loadString = '<html:rewrite page="/learning/viewTopicThread.do?topicID="/>' + rootUid + "&sessionMapID=" + response.sessionMapID + "&threadUid=" + threadUid+"&messageUid="+messageUid;
 							$(threadDiv).load(loadString, function() {
@@ -75,7 +73,7 @@
 	});
 
 	function cancelReply() {
-		$('.replydiv').remove();
+		$('#reply').remove();
 	}
 	
 </script>
Index: lams_tool_forum/web/jsps/learning/viewtopic.jsp
===================================================================
diff -u -rbc38faacb837ce6243961a3ca13f61b62ca0e594 -r3f65546d337cbe98aea623132d1835a770e6d1c8
--- lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision bc38faacb837ce6243961a3ca13f61b62ca0e594)
+++ lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision 3f65546d337cbe98aea623132d1835a770e6d1c8)
@@ -47,7 +47,11 @@
 		<script type="text/javascript" src="${tool}includes/javascript/message.js"></script>
 		<script type="text/javascript">
 			$(document).ready(function(){
-				$(".rating-stars").jRating({
+				setupJRating();
+			});
+	
+			function setupJRating() {
+				$(".rating-stars-new").filter($(".rating-stars")).jRating({
 				    phpPath : "<c:url value='/learning/rateMessage.do'/>?toolSessionID=${sessionMap.toolSessionID}&sessionMapID=${sessionMapID}",
 				    rateMax : 5,
 				    decimalLength : 1,
@@ -67,17 +71,17 @@
 					    jError('Error : please retry');
 					}
 				});
-			    $(".rating-stars-disabled").jRating({
+			    $(".rating-stars-new").filter($(".rating-stars-disabled")).jRating({
 			    	rateMax : 5,
 			    	isDisabled : true
 				});
-			});
-	
+				$(".rating-stars-new").removeClass("rating-stars-new");
+			}
+			
 			function refreshTopic(){
 				var reqIDVar = new Date();
 				location.href= "<html:rewrite page="/learning/viewTopic.do?sessionMapID=${sessionMapID}&topicID=${sessionMap.rootUid}&hideReflection=${sessionMap.hideReflection}&pageLastId=0&size=${pageSize}&reqUid=" />"+reqIDVar.getTime();;
 			}
-		
 		</script>		
 		
 	</lams:head>
@@ -191,7 +195,7 @@
 			<script>
 				<c:set var="loading_animation">${lams}images/ajax-loader.gif</c:set>
 				<c:set var="loading_words"><fmt:message key="label.loading.messages" /></c:set>
-				$('.scroll' ).jscroll({loadingHtml: '<img src="${loading_animation}" alt="${loading_words}" />${loading_words}',padding:30,autoTrigger:true});
+				$('.scroll' ).jscroll({loadingHtml: '<img src="${loading_animation}" alt="${loading_words}" />${loading_words}',padding:30,autoTrigger:true,callback:setupJRating});
 			</script>
 			
 			<c:set var="refreshTopicURL">