Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java,v
diff -u -r1.143.2.4 -r1.143.2.5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	11 May 2016 07:36:13 -0000	1.143.2.4
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	30 Sep 2016 01:06:50 -0000	1.143.2.5
@@ -21,7 +21,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.mc.web;
 
 import java.io.IOException;
@@ -399,7 +398,7 @@
 			LamsDispatchAction.log.warn("Skipping a blank answer");
 			continue;
 		    }
-		    if (correctAnswer != null && correctAnswer.equals(answerText)) {
+		    if ((correctAnswer != null) && correctAnswer.equals(answerText)) {
 			LamsDispatchAction.log
 				.warn("Skipping an answer with same text as the correct answer: " + answerText);
 
@@ -823,15 +822,15 @@
 	String editQuestionBoxRequest = request.getParameter("editQuestionBoxRequest");
 
 	String newQuestion = request.getParameter("newQuestion");
-
+	String feedback = request.getParameter("feedback");
 	// if ((editQuestionBoxRequest != null) && (editQuestionBoxRequest.equals("false")))
 	if ((requestNewEditableQuestionBox != null) && requestNewEditableQuestionBox.equals("true")) {
 	    // String newQuestion=request.getParameter("newQuestion");
 	    // logger.debug("newQuestion: " + newQuestion);
 	    mcGeneralAuthoringDTO.setEditableQuestionText(newQuestion);
+	    mcGeneralAuthoringDTO.setEditableQuestionFeedback(feedback);
 
-	    String feedback = request.getParameter("feedback");
-	    mcAuthoringForm.setFeedback(feedback);
+	    //  mcAuthoringForm.setFeedback(feedback);
 	}
 
 	request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
Index: lams_tool_lamc/web/authoring/editQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/editQuestionBox.jsp,v
diff -u -r1.18.2.5 -r1.18.2.6
--- lams_tool_lamc/web/authoring/editQuestionBox.jsp	14 Sep 2016 21:17:58 -0000	1.18.2.5
+++ lams_tool_lamc/web/authoring/editQuestionBox.jsp	30 Sep 2016 01:04:22 -0000	1.18.2.6
@@ -12,7 +12,7 @@
 			
 			function submitMethod(actionMethod) {
 				document.McAuthoringForm.dispatch.value=actionMethod;
-				$("textarea[name^=ca]").each(function() {
+				$("textarea[name^=ca],textarea[name=feedback]").each(function() {
 					var name = $(this).attr("name");
 					var value = CKEDITOR.instances[name].getData();
 					$(this).val(value);
@@ -28,7 +28,7 @@
 			function addItem() {
 				document.McAuthoringForm.dispatch.value="saveSingleQuestion"; 
 				$("#newQuestion").val(CKEDITOR.instances.newQuestion.getData());
-				$("textarea[name^=ca]").each(function() {
+				$("textarea[name^=ca],textarea[name=feedback]").each(function() {
 					var name = $(this).attr("name");
 					var value = CKEDITOR.instances[name].getData();
 					$(this).val(value);
@@ -176,6 +176,14 @@
 			</div>
 
 			<%@ include file="/authoring/candidateAnswersList.jsp"%>
+			
+			<div class="form-group">
+				<label for="feedback"><fmt:message key="label.feedback"></fmt:message></label>
+				<lams:CKEditor id="feedback"
+				value="${mcGeneralAuthoringDTO.editableQuestionFeedback}"
+				contentFolderID="${mcGeneralAuthoringDTO.contentFolderID}">
+			</lams:CKEditor>
+			</div>
 
 			<div class="form-group">
 				<html:button property="newCandidate" onclick="javascript:submitMethod('newCandidateBox');" styleClass="btn btn-default btn-sm">