Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rd72cf676b7ac9de46a6f6a9cdb96b2439ed6287f
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision d72cf676b7ac9de46a6f6a9cdb96b2439ed6287f)
@@ -177,6 +177,7 @@
 		ForumForm forumForm = (ForumForm)form;
 		forumForm.setSessionMapID(sessionMap.getSessionID());
 		forumForm.setContentFolderID(contentFolderID);
+		sessionMap.put(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID);
 		
 		//get back the topic list and display them on page
 		forumService = getForumManager();
Index: lams_tool_forum/web/jsps/authoring/message/create.jsp
===================================================================
diff -u -re32edf3f59266506e8fdbd10f7b61175111fc4dc -rd72cf676b7ac9de46a6f6a9cdb96b2439ed6287f
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision e32edf3f59266506e8fdbd10f7b61175111fc4dc)
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision d72cf676b7ac9de46a6f6a9cdb96b2439ed6287f)
@@ -14,6 +14,8 @@
 			<%@ include file="/common/messages.jsp"%>
 			<html:form action="/authoring/createTopic.do" focus="message.subject" enctype="multipart/form-data" styleId="topicFormId">
 				<html:hidden property="sessionMapID"/>
+				<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}"/>
 				<tr>
 					<td>
 						<b><bean:message key="message.label.subject" />*</b><BR>
@@ -24,7 +26,7 @@
 				<tr>
 					<td>
 						<b><bean:message key="message.label.body" />*</b><BR>
-						<lams:FCKEditor id="message.body" value="" toolbarSet="Default-Learner"></lams:FCKEditor>
+						<lams:FCKEditor id="message.body" value=""  contentFolderID="${sessionMap.contentFolderID}"></lams:FCKEditor>
 						<html:errors property="message.body" />
 					</td>
 				</tr>
Index: lams_tool_forum/web/jsps/authoring/message/edit.jsp
===================================================================
diff -u -re32edf3f59266506e8fdbd10f7b61175111fc4dc -rd72cf676b7ac9de46a6f6a9cdb96b2439ed6287f
--- lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision e32edf3f59266506e8fdbd10f7b61175111fc4dc)
+++ lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision d72cf676b7ac9de46a6f6a9cdb96b2439ed6287f)
@@ -20,6 +20,8 @@
 			<html:form action="/authoring/updateTopic.do" focus="message.subject" enctype="multipart/form-data" styleId="topicFormId">
 				<input type="hidden" name="topicIndex" value="<c:out value="${topicIndex}"/>">
 				<html:hidden property="sessionMapID"/>
+				<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}"/>
 
 				<tr>
 					<td>
@@ -33,7 +35,7 @@
 					<td>
 						<b><bean:message key="message.label.body" />*</b>
 						<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-						<lams:FCKEditor id="message.body" value="${formBean.message.body}" toolbarSet="Default-Learner"></lams:FCKEditor>
+						<lams:FCKEditor id="message.body" value="${formBean.message.body}" contentFolderID="${sessionMap.contentFolderID}"></lams:FCKEditor>
 						<html:errors property="message.body" />
 					</td>
 				</tr>