Index: lams_tool_assessment/web/includes/javascript/assessmentoption.js
===================================================================
diff -u -r77d2710d1ff3feb6b54ea159f3aa83cfb243c218 -r12bd98959d5ca06fa9f5034ace954fb8aee07786
--- lams_tool_assessment/web/includes/javascript/assessmentoption.js	(.../assessmentoption.js)	(revision 77d2710d1ff3feb6b54ea159f3aa83cfb243c218)
+++ lams_tool_assessment/web/includes/javascript/assessmentoption.js	(.../assessmentoption.js)	(revision 12bd98959d5ca06fa9f5034ace954fb8aee07786)
@@ -79,7 +79,7 @@
 	//in order to be able to use option's value, copy it from CKEditor to textarea
 	function prepareOptionEditorsForAjaxSubmit(){
 		if ((questionType == 1) || (questionType == 7) || (questionType == 8)) {
-			$("textarea[name^=optionString]").each(function() {
+			$("textarea[name^=optionString], textarea[name^=optionFeedback]").each(function()  {
 				prepareOptionEditorForAjaxSubmit(this);
 			});
 			
Index: lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -r12bd98959d5ca06fa9f5034ace954fb8aee07786
--- lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp	(.../optionhedgingmark.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp	(.../optionhedgingmark.jsp)	(revision 12bd98959d5ca06fa9f5034ace954fb8aee07786)
@@ -28,6 +28,6 @@
     	<fmt:message key="label.authoring.basic.option.feedback"/>
     </label>
     
-    <lams:STRUTS-textarea property="optionFeedback${status.index}" rows="3" value="${option.feedback}" styleClass="form-control"/>
+     <lams:CKEditor id="optionFeedback${status.index}" value="${option.feedback}" contentFolderID="${contentFolderID}" />
 </div>