Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
===================================================================
diff -u -r755036878445ffcbb4eae88f620229662e881fbb -rdd99c1d583bd232580ad63be5cb0d1e93b1f53dc
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision 755036878445ffcbb4eae88f620229662e881fbb)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision dd99c1d583bd232580ad63be5cb0d1e93b1f53dc)
@@ -412,6 +412,10 @@
 	sessionMap.put(AssessmentConstants.CONFIG_KEY_HIDE_TITLES,
 		Boolean.valueOf(service.getConfigValue(AssessmentConstants.CONFIG_KEY_HIDE_TITLES)));
 
+	if (!codeStyles.isEmpty()) {
+	    request.setAttribute(AssessmentConstants.ATTR_CODE_STYLES, codeStyles);
+	}
+
 	if (showResults) {
 
 	    // display results page
@@ -438,10 +442,6 @@
 		request.setAttribute(AssessmentConstants.ATTR_ALL_GROUP_USERS, allGroupUsers);
 	    }
 
-	    if (!codeStyles.isEmpty()) {
-		request.setAttribute(AssessmentConstants.ATTR_CODE_STYLES, codeStyles);
-	    }
-
 	    return "pages/learning/learning";
 	}
     }
@@ -883,7 +883,7 @@
 		    // 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/results.jsp
===================================================================
diff -u -r79db1b495adba49dd54a6250c1221a326f153633 -rdd99c1d583bd232580ad63be5cb0d1e93b1f53dc
--- lams_tool_assessment/web/pages/learning/results.jsp	(.../results.jsp)	(revision 79db1b495adba49dd54a6250c1221a326f153633)
+++ lams_tool_assessment/web/pages/learning/results.jsp	(.../results.jsp)	(revision dd99c1d583bd232580ad63be5cb0d1e93b1f53dc)
@@ -7,6 +7,10 @@
 	<title><fmt:message key="label.learning.title" /></title>
 	<%@ include file="/common/header.jsp"%>
 	<lams:css suffix="jquery.jRating"/>
+	<c:if test="${not empty codeStyles}">
+		<link rel="stylesheet" type="text/css" href="${lams}css/codemirror.css" />
+		<link rel="stylesheet" type="text/css" href="${lams}css/codemirror_simplescrollbars.css" />
+	</c:if>
 	
 	<%-- param has higher level for request attribute --%>
 	<c:if test="${not empty param.sessionMapID}">
@@ -23,6 +27,34 @@
 	<c:set var="isUserLeader" value="${sessionMap.isUserLeader}"/>
 	<c:set var="isLeadershipEnabled" value="${assessment.useSelectLeaderToolOuput}"/>
 		
+	<c:if test="${not empty codeStyles}">
+		<script type="text/javascript" src="${lams}includes/javascript/codemirror/addon/runmode/runmode-standalone.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/codemirror/addon/runmode/colorize.js"></script>
+	</c:if>
+	<%-- codeStyles is a set, so each code style will be listed only once --%>
+	<c:forEach items="${codeStyles}" var="codeStyle">
+		<c:choose>
+			<c:when test="${codeStyle == 1}">
+				<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/clike.js"></script>
+			</c:when>
+			<c:when test="${codeStyle == 2}">
+				<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/javascript.js"></script>
+			</c:when>
+			<c:when test="${codeStyle == 3}">
+				<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/python.js"></script>
+			</c:when>
+		</c:choose>
+	</c:forEach>
+	
+	<c:if test="${not empty codeStyles}">
+		<script type="text/javascript">
+			// initialise syntax highlighter depending on programming language in data-lang attribute
+			$(document).ready(function() {
+				CodeMirror.colorize($('.code-style'));
+			});
+		</script>
+	</c:if>
+	
 	<script type="text/javascript">
 		function disableButtons() {
 			$('.btn').prop('disabled',true);
Index: lams_tool_assessment/web/pages/learning/results/essay.jsp
===================================================================
diff -u -rbdd3abc4e8371ce227cb000d5aac58fdb45077a5 -rdd99c1d583bd232580ad63be5cb0d1e93b1f53dc
--- lams_tool_assessment/web/pages/learning/results/essay.jsp	(.../essay.jsp)	(revision bdd3abc4e8371ce227cb000d5aac58fdb45077a5)
+++ lams_tool_assessment/web/pages/learning/results/essay.jsp	(.../essay.jsp)	(revision dd99c1d583bd232580ad63be5cb0d1e93b1f53dc)
@@ -6,10 +6,23 @@
 	</div>
 	
 	<div class="table-responsive">
-		<table class="table table-hover table-condensed">
+		<table class="table table-condensed ${empty question.codeStyle ? 'table-hover' : ''}">
 			<tr>
 				<td>
-					${question.answer}
+					<c:choose>
+						<c:when test="${empty question.codeStyle}">
+							${question.answer}
+						</c:when>
+						<c:when test="${question.codeStyle == 1}">
+							<pre class="code-style" data-lang="text/x-java">${question.answer}</pre>
+						</c:when>
+						<c:when test="${question.codeStyle == 2}">
+							<pre class="code-style" data-lang="text/javascript">${question.answer}</pre>
+						</c:when>
+						<c:when test="${question.codeStyle == 3}">
+							<pre class="code-style" data-lang="text/x-python">${question.answer}</pre>
+						</c:when>
+					</c:choose>
 				</td>
 			</tr>
 		</table>