Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rf50903db417c658ce7f49580001c058e012b7f13
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision f50903db417c658ce7f49580001c058e012b7f13)
@@ -557,6 +557,10 @@
 	private ActionForward viewActivity(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
 		Long toolContentID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
+		//set back tool content ID
+    	String contentFolderID = WebUtil.readStrParam(request,AttributeNames.PARAM_CONTENT_FOLDER_ID);
+    	request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID);
+    	
 		forumService = getForumService();
 		Forum forum = forumService.getForumByContentId(toolContentID);
 		// if can not find out forum, echo back error message
Index: lams_tool_forum/web/common/messages.jsp
===================================================================
diff -u -ra94fb5f2dbf4851004e8b0be5fb21218b55155f4 -rf50903db417c658ce7f49580001c058e012b7f13
--- lams_tool_forum/web/common/messages.jsp	(.../messages.jsp)	(revision a94fb5f2dbf4851004e8b0be5fb21218b55155f4)
+++ lams_tool_forum/web/common/messages.jsp	(.../messages.jsp)	(revision f50903db417c658ce7f49580001c058e012b7f13)
@@ -2,8 +2,8 @@
 <logic:messagesPresent>
 	<p>&nbsp;</p>
 	<p class="warning">
-	        <html:messages id="error">
-	            <c:out value="${error}" escapeXml="false"/><br/>
-	        </html:messages>
+        <html:messages id="error">
+            <c:out value="${error}" escapeXml="false"/><br/>
+        </html:messages>
 	</p>
 </logic:messagesPresent>
\ No newline at end of file
Index: lams_tool_forum/web/jsps/authoring/definelater.jsp
===================================================================
diff -u -r7edc98d2bd39271f55fdde6980e1ad9c165c3f8a -rf50903db417c658ce7f49580001c058e012b7f13
--- lams_tool_forum/web/jsps/authoring/definelater.jsp	(.../definelater.jsp)	(revision 7edc98d2bd39271f55fdde6980e1ad9c165c3f8a)
+++ lams_tool_forum/web/jsps/authoring/definelater.jsp	(.../definelater.jsp)	(revision f50903db417c658ce7f49580001c058e012b7f13)
@@ -13,6 +13,7 @@
 	<html:hidden property="toolContentID" />
 	<html:hidden property="sessionMapID"/>
 	<html:hidden property="mode" value="teacher" />
+	<html:hidden property="contentFolderID" />
 	
 	<div id="header">
 		<lams:Tabs collection="${tabs}" useKey="true" control="true" />
@@ -27,6 +28,6 @@
 		<!-- Button Row -->
 		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" 
 			toolSignature="<%=ForumConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.toolContentID}" 
-			accessMode="teacher" defineLater="yes" customiseSessionID="${formBean.sessionMapID}" />
+			accessMode="teacher" defineLater="yes" customiseSessionID="${formBean.sessionMapID}"  contentFolderID="${formBean.contentFolderID}"/>
 	</div>
 </html:form>
Index: lams_tool_forum/web/jsps/monitoring/editactivity.jsp
===================================================================
diff -u -r3713058c6b00a5ea73f4b3eff667aba0c9d41534 -rf50903db417c658ce7f49580001c058e012b7f13
--- lams_tool_forum/web/jsps/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 3713058c6b00a5ea73f4b3eff667aba0c9d41534)
+++ lams_tool_forum/web/jsps/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision f50903db417c658ce7f49580001c058e012b7f13)
@@ -27,6 +27,7 @@
 			<c:choose>
 				<c:when test='${isPageEditable == "true"}'>
 					<c:url value="/defineLater.do" var="authoringUrl">
+						<c:param name="contentFolderID" value="${contentFolderID}" />
 						<c:param name="toolContentID" value="${toolContentID}" />
 					</c:url>
 					<html:link href="${authoringUrl}" styleClass="button" target="_blank">
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rf50903db417c658ce7f49580001c058e012b7f13
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision f50903db417c658ce7f49580001c058e012b7f13)
@@ -86,6 +86,7 @@
 
 	private ActionForward hideitem(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
+		
 		Long itemUid = WebUtil.readLongParam(request, ResourceConstants.PARAM_RESOURCE_ITEM_UID);
 		IResourceService service = getResourceService();
 		service.setItemVisible(itemUid,false);
@@ -141,7 +142,9 @@
 		SessionMap sessionMap = new SessionMap();
 		request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 		request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
-		
+//		save contentFolderID into session
+		sessionMap.put(AttributeNames.PARAM_CONTENT_FOLDER_ID,WebUtil.readStrParam(request,AttributeNames.PARAM_CONTENT_FOLDER_ID));
+
 		Long contentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 		IResourceService service = getResourceService();
 		List<List<Summary>> groupList = service.getSummary(contentId);
Index: lams_tool_larsrc/web/pages/authoring/definelater.jsp
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -rf50903db417c658ce7f49580001c058e012b7f13
--- lams_tool_larsrc/web/pages/authoring/definelater.jsp	(.../definelater.jsp)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_larsrc/web/pages/authoring/definelater.jsp	(.../definelater.jsp)	(revision f50903db417c658ce7f49580001c058e012b7f13)
@@ -76,8 +76,6 @@
 			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=ResourceConstants.TOOL_SIGNATURE%>" 
 				toolContentID="${formBean.resource.contentId}"  accessMode="teacher" defineLater="yes"  
 				customiseSessionID="${formBean.sessionMapID}" contentFolderID="${formBean.contentFolderID}"/>
-
-			<lams:HTMLEditor />
 		</div>
 
 
Index: lams_tool_larsrc/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u -r71cccb6c7558909803c2886472385427cdc4a281 -rf50903db417c658ce7f49580001c058e012b7f13
--- lams_tool_larsrc/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 71cccb6c7558909803c2886472385427cdc4a281)
+++ lams_tool_larsrc/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision f50903db417c658ce7f49580001c058e012b7f13)
@@ -30,6 +30,7 @@
 				<c:when test='${isPageEditable == "true"}'>
 					<c:url  var="authoringUrl" value="/definelater.do">
 						<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
+						<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
 					</c:url>
 					<html:link href="${authoringUrl}" styleClass="button" target="_blank">
 						<fmt:message key="label.monitoring.edit.activity.edit" />
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rf50903db417c658ce7f49580001c058e012b7f13
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision f50903db417c658ce7f49580001c058e012b7f13)
@@ -117,9 +117,12 @@
             HttpServletRequest request,
             HttpServletResponse response)
     {
+    	String contentFolderID = WebUtil.readStrParam(request,AttributeNames.PARAM_CONTENT_FOLDER_ID);
     	Long contentID =new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
     	submitFilesService = getSubmitFilesService();
     	
+    	request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID);
+    	
 //    	List userList = submitFilesService.getUsers(sessionID);
         List submitFilesSessionList = submitFilesService.getSubmitFilesSessionByContentID(contentID);
         summary(request, submitFilesSessionList);
Index: lams_tool_sbmt/web/monitoring/parts/activity.jsp
===================================================================
diff -u -r843aa271bd7b90368cc12ce6547069eaedffa066 -rf50903db417c658ce7f49580001c058e012b7f13
--- lams_tool_sbmt/web/monitoring/parts/activity.jsp	(.../activity.jsp)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
+++ lams_tool_sbmt/web/monitoring/parts/activity.jsp	(.../activity.jsp)	(revision f50903db417c658ce7f49580001c058e012b7f13)
@@ -29,6 +29,7 @@
 					<c:url value="/definelater.do" var="authoringUrl">
 						<c:param name="mode" value="teacher" />
 						<c:param name="toolContentID" value="${authoring.contentID}" />
+						<c:param name="contentFolderID" value="${contentFolderID}" />
 					</c:url>
 					<html:link href="${authoringUrl}" styleClass="button" target="_blank">
 						<fmt:message key="label.monitoring.edit.activity.edit" />