Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java
===================================================================
diff -u -r6a5d35ec57dde95eae93fb628d669af257d36949 -r12085431903d9ea39d8b405bb70c7f01c936c409
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 6a5d35ec57dde95eae93fb628d669af257d36949)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 12085431903d9ea39d8b405bb70c7f01c936c409)
@@ -240,8 +240,6 @@
 	 */
 	private ActionForward newItemlInit(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
 		QuestionForm questionForm = (QuestionForm)form;
-		String sessionMapID = WebUtil.readStrParam(request, SurveyConstants.ATTR_SESSION_MAP_ID);
-		questionForm.setSessionMapID(sessionMapID);
 		
 		List instructionList = new ArrayList(INIT_INSTRUCTION_COUNT);
 		for(int idx=0;idx<INIT_INSTRUCTION_COUNT;idx++){
@@ -294,6 +292,7 @@
 		}
 		//set session map ID so that itemlist.jsp can get sessionMAP
 		request.setAttribute(SurveyConstants.ATTR_SESSION_MAP_ID, itemForm.getSessionMapID());
+		request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, itemForm.getContentFolderID());
 		//return null to close this window
 		return mapping.findForward(SurveyConstants.SUCCESS);
 	}
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/QuestionForm.java
===================================================================
diff -u -rf0c3f41d54ef4f390ef3f93f28c0679c46b6730c -r12085431903d9ea39d8b405bb70c7f01c936c409
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/QuestionForm.java	(.../QuestionForm.java)	(revision f0c3f41d54ef4f390ef3f93f28c0679c46b6730c)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/QuestionForm.java	(.../QuestionForm.java)	(revision 12085431903d9ea39d8b405bb70c7f01c936c409)
@@ -41,6 +41,7 @@
 	//1: single or multiple choice question;3:open text question
 	private short itemType;
 	private String sessionMapID;
+	private String contentFolderID;
 	
 	//tool access mode;
 	private String mode;
@@ -87,4 +88,10 @@
 	public void setItemType(short itemType) {
 		this.itemType = itemType;
 	}
+	public String getContentFolderID() {
+		return contentFolderID;
+	}
+	public void setContentFolderID(String contentFolderID) {
+		this.contentFolderID = contentFolderID;
+	}
 }
Index: lams_tool_survey/web/pages/authoring/basic.jsp
===================================================================
diff -u -rec918a1f6fa717d59f8074f508fe798eb3cbdf41 -r12085431903d9ea39d8b405bb70c7f01c936c409
--- lams_tool_survey/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision ec918a1f6fa717d59f8074f508fe798eb3cbdf41)
+++ lams_tool_survey/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 12085431903d9ea39d8b405bb70c7f01c936c409)
@@ -25,9 +25,9 @@
 	}
 
 	
-	function editItem(idx,itemType,sessionMapID){
+	function editItem(idx,itemType,sessionMapID,contentFolderID){
 		 var reqIDVar = new Date();
-		var url = "<c:url value="/authoring/editItemInit.do?itemIndex="/>" + idx +"&itemType="+itemType+"&reqID="+reqIDVar.getTime()+"&sessionMapID="+sessionMapID;;
+		var url = "<c:url value="/authoring/editItemInit.do?itemIndex="/>" + idx +"&itemType="+itemType+"&reqID="+reqIDVar.getTime()+"&sessionMapID="+sessionMapID+"&contentFolderID="+contentFolderID;
 		showMessage(url);
 	}
 	//The panel of survey list panel
@@ -89,12 +89,12 @@
 				<table class="forms">
 					<tr>
 						<td>
-							<a href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?itemType=1&sessionMapID=${formBean.sessionMapID}"/>');">
+							<a href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?itemType=1&contentFolderID=${formBean.contentFolderID}&sessionMapID=${formBean.sessionMapID}"/>');">
 								<fmt:message key="label.authoring.basic.add.survey.question" />
 							</a>
 						</td>
 						<td>
-							<a href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?itemType=3&sessionMapID=${formBean.sessionMapID}"/>');">
+							<a href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?itemType=3&contentFolderID=${formBean.contentFolderID}&sessionMapID=${formBean.sessionMapID}"/>');">
 								<fmt:message key="label.authoring.basic.add.survey.open.question" />
 							</a>
 						</td>
Index: lams_tool_survey/web/pages/authoring/parts/addchoicequestion.jsp
===================================================================
diff -u -rec918a1f6fa717d59f8074f508fe798eb3cbdf41 -r12085431903d9ea39d8b405bb70c7f01c936c409
--- lams_tool_survey/web/pages/authoring/parts/addchoicequestion.jsp	(.../addchoicequestion.jsp)	(revision ec918a1f6fa717d59f8074f508fe798eb3cbdf41)
+++ lams_tool_survey/web/pages/authoring/parts/addchoicequestion.jsp	(.../addchoicequestion.jsp)	(revision 12085431903d9ea39d8b405bb70c7f01c936c409)
@@ -39,6 +39,7 @@
 						<input type="hidden" name="instructionList" id="instructionList" />
 						<html:hidden property="sessionMapID" />
 						<html:hidden property="itemIndex" />
+						<html:hidden property="contentFolderID" />
 						<%-- This value should be 1 or 2 --%>
 						<html:hidden property="itemType" value="1" />
 						<table >
@@ -61,21 +62,9 @@
 							</tr>
 							<tr>
 								<td colspan="3">
-									<c:set var="language">
-										<lams:user property="localeLanguage" />
-									</c:set>
-									<fck:editor id="question.description" basePath="/lams/fckeditor/"
-										imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector"
-										linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector"
-										flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector"
-										imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image"
-										linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File"
-										flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash"
-										toolbarSet="Default-Learner" defaultLanguage="${language}"
-										autoDetectLanguage="false">
-										<c:out value="${formBean.question.description}"
-											escapeXml="false" />
-									</fck:editor>
+									<lams:FCKEditor id="question.description"
+										value="${formBean.question.description}"
+										contentFolderID="${formBean.contentFolderID}"></lams:FCKEditor>
 								</td>
 							</tr>
 							<tr>
Index: lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp
===================================================================
diff -u -rec918a1f6fa717d59f8074f508fe798eb3cbdf41 -r12085431903d9ea39d8b405bb70c7f01c936c409
--- lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp	(.../addopenquestion.jsp)	(revision ec918a1f6fa717d59f8074f508fe798eb3cbdf41)
+++ lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp	(.../addopenquestion.jsp)	(revision 12085431903d9ea39d8b405bb70c7f01c936c409)
@@ -36,6 +36,7 @@
 					<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="surveyItemForm">
 						<c:set var="formBean"	value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 						<html:hidden property="sessionMapID" />
+						<html:hidden property="contentFolderID" />
 						<html:hidden property="itemIndex" />
 						<html:hidden property="itemType" value="3" />
 						<table >
@@ -58,21 +59,9 @@
 							</tr>
 							<tr>
 								<td colspan="2">
-									<c:set var="language">
-										<lams:user property="localeLanguage" />
-									</c:set>
-									<fck:editor id="question.description" basePath="/lams/fckeditor/"
-										imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector"
-										linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector"
-										flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector"
-										imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image"
-										linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File"
-										flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash"
-										toolbarSet="Default-Learner" defaultLanguage="${language}"
-										autoDetectLanguage="false">
-										<c:out value="${formBean.question.description}"
-											escapeXml="false" />
-									</fck:editor>
+								<lams:FCKEditor id="question.description"
+									value="${formBean.question.description}"
+									contentFolderID="${formBean.contentFolderID}"></lams:FCKEditor>
 								</td>
 							</tr>
 						</table>
Index: lams_tool_survey/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -ra2c091a27056e7b41531ca140012603bf027d5b8 -r12085431903d9ea39d8b405bb70c7f01c936c409
--- lams_tool_survey/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
+++ lams_tool_survey/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 12085431903d9ea39d8b405bb70c7f01c936c409)
@@ -29,7 +29,7 @@
 			</c:if>
 		</td>
 		<td width="80px" align="center">
-			<a href="#" onclick="editItem(${status.index},${question.type},'${sessionMapID}')" class="button">
+			<a href="#" onclick="editItem(${status.index},${question.type},'${sessionMapID}','${contentFolderID}')" class="button">
 				<fmt:message key="label.authoring.basic.survey.edit" />
 			</a>
 		</td>