Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
===================================================================
diff -u -rf86d00ef0e3fc17667feabcec9a04b4b3ca4d619 -r755036878445ffcbb4eae88f620229662e881fbb
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision f86d00ef0e3fc17667feabcec9a04b4b3ca4d619)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision 755036878445ffcbb4eae88f620229662e881fbb)
@@ -877,7 +877,13 @@
 
 	    } else if (questionType == QbQuestion.TYPE_ESSAY) {
 		String answer = request.getParameter(AssessmentConstants.ATTR_QUESTION_PREFIX + i);
-		answer = answer.replaceAll("[\n\r\f]", "");
+		if (questionDto.getCodeStyle() == null) {
+		    answer = answer.replaceAll("[\n\r\f]", "");
+		} else {
+		    // text coming from CodeMirror uses \n as separator
+		    answer = answer.replaceAll("\n", "<BR>");
+		}
+		
 		questionDto.setAnswer(answer);
 
 	    } else if (questionType == QbQuestion.TYPE_ORDERING) {
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -rf86d00ef0e3fc17667feabcec9a04b4b3ca4d619 -r755036878445ffcbb4eae88f620229662e881fbb
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision f86d00ef0e3fc17667feabcec9a04b4b3ca4d619)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 755036878445ffcbb4eae88f620229662e881fbb)
@@ -60,8 +60,6 @@
 	<c:if test="${not empty codeStyles}">
 		<script type="text/javascript" src="${lams}includes/javascript/codemirror.js"></script>
 		<script type="text/javascript">
-			// this line separator for consistency with regular essay questions
-			CodeMirror.defaults.lineSeparator = '<BR>';
 			CodeMirror.defaults.lineNumbers = true;
 			CodeMirror.defaults.readOnly = ${!hasEditRight};
 		</script>
Index: lams_tool_assessment/web/pages/learning/parts/essay.jsp
===================================================================
diff -u -rf86d00ef0e3fc17667feabcec9a04b4b3ca4d619 -r755036878445ffcbb4eae88f620229662e881fbb
--- lams_tool_assessment/web/pages/learning/parts/essay.jsp	(.../essay.jsp)	(revision f86d00ef0e3fc17667feabcec9a04b4b3ca4d619)
+++ lams_tool_assessment/web/pages/learning/parts/essay.jsp	(.../essay.jsp)	(revision 755036878445ffcbb4eae88f620229662e881fbb)
@@ -70,7 +70,9 @@
 								'text/x-python'
 							</c:when>
 						</c:choose>
-				});
+				}),
+				content = codeMirror.getValue().replaceAll('<BR>', '\n');
+			codeMirror.setValue(content);
 		});
 	</script>
 </c:if>