Index: lams_central/web/questionChoice.jsp
===================================================================
diff -u -ra1e990f3ee5ec7091752683571061da802f58bb2 -r9375ad2403d36eb4af0ddd61ad395765f15e2e67
--- lams_central/web/questionChoice.jsp	(.../questionChoice.jsp)	(revision a1e990f3ee5ec7091752683571061da802f58bb2)
+++ lams_central/web/questionChoice.jsp	(.../questionChoice.jsp)	(revision 9375ad2403d36eb4af0ddd61ad395765f15e2e67)
@@ -83,10 +83,12 @@
 		
 		$(document).ready(function(){
 			$('.question').change(function(){
-				var checked = $(this).is(':checked');
-				var selector = '#' + $(this).attr('id');
-				var answerDiv = $(selector + 'answerDiv');
-				var answersVisible = answerDiv.find('input[type="checkbox"]').length > 0;
+				var checked = $(this).is(':checked'),
+					selector = '#' + $(this).attr('id'),
+					answerDiv = $(selector + 'answerDiv'),
+					answersVisible = answerDiv.find('input[type="checkbox"]').length > 0;
+					
+				$(this).attr('checked', checked);
 				// enable/disable answers and feedback fields
 				// so they do not get posted when not needed
 				if (answersVisible) {
@@ -124,6 +126,11 @@
 					   .find('input').attr('disabled', 'disabled');
 				}
 			});
+			
+			$('.answer').change(function(){
+				// FF does not seem to do it right
+				$(this).attr('checked', $(this).is(':checked'));
+			});
 		});
 	</script>
 </lams:head>
@@ -196,7 +203,7 @@
 						<c:choose>
 							<c:when test="${question.type eq 'mc' or question.type eq 'mr' or question.type eq 'fb'}">
 								<input name="question${questionStatus.index}answer${answerStatus.index}"
-					       			   value="<c:out value='${answer.text}' />"
+					       			   value="<c:out value='${answer.text}' />" class="answer"
 					       			   type="checkbox" checked="checked" disabled="disabled" />${answer.text}<br />
 			       			</c:when>
 			       			<c:otherwise>
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r9375ad2403d36eb4af0ddd61ad395765f15e2e67
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision 9375ad2403d36eb4af0ddd61ad395765f15e2e67)
@@ -468,7 +468,8 @@
 	    if (question.getAnswers() != null) {
 		for (Answer answer : question.getAnswers()) {
 		    McCandidateAnswersDTO mcCandidateAnswersDTO = new McCandidateAnswersDTO();
-		    String answerText = QuestionParser.processHTMLField(answer.getText(), true, null, null);
+		    String answerText = QuestionParser.processHTMLField(answer.getText(), false, contentFolderID,
+				question.getResourcesFolderPath());
 		    if (answerText == null) {
 			LamsDispatchAction.log.warn("Skipping a blank answer");
 			continue;