Index: lams_tool_scratchie/web/pages/authoring/basic.jsp
===================================================================
diff -u -rd578cfde655760533b6ede422e7cf675a8c4ca6d -r79123cc650a4028c6dfa0e931d9a074b07234be3
--- lams_tool_scratchie/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision d578cfde655760533b6ede422e7cf675a8c4ca6d)
+++ lams_tool_scratchie/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 79123cc650a4028c6dfa0e931d9a074b07234be3)
@@ -26,7 +26,7 @@
 
 	var itemTargetDiv = "#itemArea";
 	function removeItem(idx){
-		var	deletionConfirmed = confirm("<fmt:message key="warning.msg.authoring.do.you.want.to.delete"></fmt:message>");
+		var	deletionConfirmed = confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='warning.msg.authoring.do.you.want.to.delete'/></spring:escapeBody>");
 		
 		if (deletionConfirmed) {
 			var url = "<c:url value="/authoring/removeItem.do"/>?<csrf:token/>";
Index: lams_tool_scratchie/web/pages/authoring/parts/addItemFooter.jsp
===================================================================
diff -u -r70a326811aab339193f6031102dfde367b21cc5c -r79123cc650a4028c6dfa0e931d9a074b07234be3
--- lams_tool_scratchie/web/pages/authoring/parts/addItemFooter.jsp	(.../addItemFooter.jsp)	(revision 70a326811aab339193f6031102dfde367b21cc5c)
+++ lams_tool_scratchie/web/pages/authoring/parts/addItemFooter.jsp	(.../addItemFooter.jsp)	(revision 79123cc650a4028c6dfa0e931d9a074b07234be3)
@@ -20,7 +20,7 @@
 					previouslySelectedOption = $('option[selected]', collectionSelect);
 			if (newValue == -1) {
 				// create a new collection on the fly
-				let newCollectionName = prompt('<fmt:message key="label.questions.choice.collection.new.prompt" />'),
+				let newCollectionName = prompt('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.questions.choice.collection.new.prompt" /></spring:escapeBody>'),
 						newCollectionUid = -1;
 				if (newCollectionName) {
 					newCollectionName = newCollectionName.trim();
Index: lams_tool_scratchie/web/pages/authoring/parts/addMcq.jsp
===================================================================
diff -u -r21555f88fd0c63a4a9eb3ae288a2e1d48452aa4b -r79123cc650a4028c6dfa0e931d9a074b07234be3
--- lams_tool_scratchie/web/pages/authoring/parts/addMcq.jsp	(.../addMcq.jsp)	(revision 21555f88fd0c63a4a9eb3ae288a2e1d48452aa4b)
+++ lams_tool_scratchie/web/pages/authoring/parts/addMcq.jsp	(.../addMcq.jsp)	(revision 79123cc650a4028c6dfa0e931d9a074b07234be3)
@@ -27,7 +27,7 @@
     			//check maximum number of options
     			var numberOfAnswers = $("textarea[name^=optionName]").length;
     			if (numberOfAnswers >= 10) {
-    				alert("<fmt:message key="label.authoring.maximum.answers.warning" />");
+    				alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.maximum.answers.warning' /></spring:escapeBody>");
     				return;
     			}
     			
@@ -166,16 +166,16 @@
 	    			    }
 		    		},
 		    		messages: {
-		    			title: "<fmt:message key='label.authoring.title.required'/>",
-		    			hasAnswerFilled: "<fmt:message key='label.authoring.error.possible.answer'/>",
-		    			hasFilledCorrectAnswer: "<fmt:message key='label.authoring.error.correct.answer'/>"
+		    			title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.title.required'/></spring:escapeBody>",
+		    			hasAnswerFilled: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.error.possible.answer'/></spring:escapeBody>",
+		    			hasFilledCorrectAnswer: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.error.correct.answer'/></spring:escapeBody>"
 		    		},
 		    	    invalidHandler: function(form, validator) {
 		    		      var errors = validator.numberOfInvalids();
 		    		      if (errors) {
 		    		          var message = errors == 1
-		    		          	  ? "<fmt:message key='error.form.validation.error'/>"
-		    		          	  : "<fmt:message key='error.form.validation.errors'><fmt:param >" + errors + "</fmt:param></fmt:message>";
+		    		          	  ? "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.form.validation.error'/></spring:escapeBody>"
+		    		          	  : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.form.validation.errors'><fmt:param >" + errors + "</fmt:param></fmt:message></spring:escapeBody>";
 	    		          	  
 		    		          $("div.error span").html(message);
 		    		          $("div.error").show();
Index: lams_tool_scratchie/web/pages/authoring/parts/addVsa.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r79123cc650a4028c6dfa0e931d9a074b07234be3
--- lams_tool_scratchie/web/pages/authoring/parts/addVsa.jsp	(.../addVsa.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_scratchie/web/pages/authoring/parts/addVsa.jsp	(.../addVsa.jsp)	(revision 79123cc650a4028c6dfa0e931d9a074b07234be3)
@@ -20,8 +20,8 @@
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
 		<script type="text/javascript">
 			const QUESTION_TYPE = 3;
-			const VALIDATION_ERROR_LABEL = "<fmt:message key='error.form.validation.error'/>";
-			const VALIDATION_ERRORS_LABEL = "<fmt:message key='error.form.validation.errors'><fmt:param >{errors_counter}</fmt:param></fmt:message>";
+			const VALIDATION_ERROR_LABEL = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.form.validation.error'/></spring:escapeBody>";
+			const VALIDATION_ERRORS_LABEL = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.form.validation.errors'><fmt:param >{errors_counter}</fmt:param></fmt:message></spring:escapeBody>";
 			const isNewQuestion = true;
 		</script>
 		<lams:JSImport src="includes/javascript/qb-question.js" />
@@ -43,8 +43,8 @@
 	    			    }
 		    		},
 		    		messages: {
-		    			title: "<fmt:message key='label.authoring.choice.field.required'/>",
-		    			hasTwoOptionsFilled: "<fmt:message key='label.error.two.answers.required'/>"
+		    			title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.field.required'/></spring:escapeBody>",
+		    			hasTwoOptionsFilled: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.error.two.answers.required'/></spring:escapeBody>"
 		    		},
      			    submitHandler: function(form) {
      			    	prepareOptionEditorsForAjaxSubmit();     			    
Index: lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -ra6c72500acfa886335a31596e162cafce8341db4 -r79123cc650a4028c6dfa0e931d9a074b07234be3
--- lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision a6c72500acfa886335a31596e162cafce8341db4)
+++ lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 79123cc650a4028c6dfa0e931d9a074b07234be3)
@@ -11,7 +11,7 @@
 		qbMessage = null;
 	switch (qbQuestionModified) {
 		case <%= IQbService.QUESTION_MODIFIED_UPDATE %>: 
-			qbMessage = '<fmt:message key="message.qb.modified.update" />';
+			qbMessage = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.qb.modified.update" /></spring:escapeBody>';
 		case <%= IQbService.QUESTION_MODIFIED_VERSION_BUMP %>: 
 			let showMessage = true;
 		
@@ -28,12 +28,12 @@
 			}
 
 			if (showMessage) {
-				qbMessage = '<fmt:message key="message.qb.modified.version" />';
+				qbMessage = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.qb.modified.version" /></spring:escapeBody>';
 			}
 
 			break;
 		case <%= IQbService.QUESTION_MODIFIED_ID_BUMP %>: 
-			qbMessage = '<fmt:message key="message.qb.modified.new" />';
+			qbMessage = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.qb.modified.new" /></spring:escapeBody>';
 			break;
 	}
 	if (qbMessage) {
Index: lams_tool_scratchie/web/pages/learning/learning.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r79123cc650a4028c6dfa0e931d9a074b07234be3
--- lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 79123cc650a4028c6dfa0e931d9a074b07234be3)
@@ -291,7 +291,7 @@
             var numberOfAvailableScratches = $("[id^=imageLink-][onclick]").length;
 			if (numberOfAvailableScratches > 0) {
 	            $('#finishButton').prop('disabled', true).css('pointer-events', 'none')
-	            				  .parent().attr('data-title', '<fmt:message key="label.learning.require.all.answers" />')
+	            				  .parent().attr('data-title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.learning.require.all.answers" /></spring:escapeBody>')
 				  				  		   .tooltip();
 			} else {
 				$('#finishButton').prop('disabled', false)
@@ -357,7 +357,7 @@
 						}
 					},
 					onExpiry: function(periods) {
-				        $.blockUI({ message: '<h1 id="timelimit-expired"><i class="fa fa-refresh fa-spin fa-1x fa-fw"></i> <fmt:message key="label.time.is.over" /></h1>' }); 
+				        $.blockUI({ message: '<h1 id="timelimit-expired"><i class="fa fa-refresh fa-spin fa-1x fa-fw"></i> <spring:escapeBody javaScriptEscape="true"><fmt:message key="label.time.is.over" /></spring:escapeBody></h1>' }); 
 				        
 				        setTimeout(function() { 
 					        if (${isUserLeader}) {
@@ -367,7 +367,7 @@
 						    }
 				        }, 4000);
 					},
-					description: "<div id='countdown-label'><fmt:message key='label.countdown.time.left' /></div>"
+					description: "<div id='countdown-label'><spring:escapeBody javaScriptEscape='true'><fmt:message key='label.countdown.time.left' /></spring:escapeBody></div>"
 				});
 			}
 	
@@ -475,7 +475,7 @@
 					url: "<lams:WebAppURL/>learning/autosaveBurningQuestions.do?sessionMapID=${sessionMapID}&date=" + new Date().getTime(),
 	                success: function() {
 		                $.jGrowl(
-		                	"<i class='fa fa-lg fa-floppy-o'></i> <fmt:message key="label.burning.questions.autosaved" />",
+		                	"<i class='fa fa-lg fa-floppy-o'></i> <spring:escapeBody javaScriptEscape='true'><fmt:message key='label.burning.questions.autosaved' /></spring:escapeBody>",
 		                	{ life: 2000, closeTemplate: '' }
 		                );
 	                }
@@ -491,7 +491,7 @@
 			if (!isTimelimitExpired) {
 				var numberOfAvailableScratches = $("[id^=imageLink-][onclick], [id^=type-your-answer-]:visible").length;
 				proceed = numberOfAvailableScratches == 0 || 
-						  confirm("<fmt:message key="label.one.or.more.questions.not.completed"></fmt:message>");	
+						  confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.one.or.more.questions.not.completed'/></spring:escapeBody>");	
 			}
 			
 			if (proceed) {
Index: lams_tool_scratchie/web/pages/learning/results.jsp
===================================================================
diff -u -r0c2664b4727d894371762bc6a6e0fcc7ff6e94d2 -r79123cc650a4028c6dfa0e931d9a074b07234be3
--- lams_tool_scratchie/web/pages/learning/results.jsp	(.../results.jsp)	(revision 0c2664b4727d894371762bc6a6e0fcc7ff6e94d2)
+++ lams_tool_scratchie/web/pages/learning/results.jsp	(.../results.jsp)	(revision 79123cc650a4028c6dfa0e931d9a074b07234be3)
@@ -141,10 +141,10 @@
 				   	colNames:[
 						'#',
 						'isUserAuthor',
-						"<fmt:message key='label.monitoring.summary.user.name' />",
-						"<fmt:message key='label.burning.questions' />",
-						"<fmt:message key='label.like' />",
-						"<fmt:message key='label.count' />"
+						"<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.monitoring.summary.user.name' /></spring:escapeBody>",
+						"<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.burning.questions' /></spring:escapeBody>",
+						"<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.like' /></spring:escapeBody>",
+						"<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.count' /></spring:escapeBody>"
 					],
 				   	colModel:[
 				   		{name:'id', index:'id', width:0, sorttype:"int", hidden: true},
@@ -187,7 +187,7 @@
 									<c:choose>
 										<%-- If we hide titles, we just display a link for "Question 1)" --%>
 										<c:when test="${sessionMap.hideTitles}">
-										 	"<a href='#questionTitle${i.count}' class='bq-title'><fmt:message key='label.question'/>&nbsp;${i.count})</a>"
+										 	"<a href='#questionTitle${i.count}' class='bq-title'><spring:escapeBody javaScriptEscape='true'><fmt:message key='label.question'/></spring:escapeBody>&nbsp;${i.count})</a>"
 										</c:when>
 										<%-- If we show titles, we display question number and then a link with question title --%>
 										<c:otherwise>
@@ -241,11 +241,11 @@
 				   				like:'',
 				   			</c:when>
 							<c:when test="${burningQuestionDto.userLiked}">
-								like:'<span class="fa fa-thumbs-up fa-2x" title="<fmt:message key="label.unlike"/>"' +
+								like:'<span class="fa fa-thumbs-up fa-2x" title="<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.unlike'/></spring:escapeBody>"' +
 										'onclick="javascript:likeEntry(${scratchieItemUid}, ${i.index + 1}, ${burningQuestionDto.burningQuestion.uid});" />',
 							</c:when>
 							<c:otherwise>
-								like:'<span class="fa fa-thumbs-o-up fa-2x" title="<fmt:message key="label.like"/>"' +
+								like:'<span class="fa fa-thumbs-o-up fa-2x" title="<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.like'/></spring:escapeBody>"' +
 										'onclick="javascript:likeEntry(${scratchieItemUid}, ${i.index + 1}, ${burningQuestionDto.burningQuestion.uid});" />',
 							</c:otherwise>
 						</c:choose>
@@ -267,15 +267,15 @@
 				iconSet: 'fontAwesome',
 			   	colNames:[
 				   	'#',
-					"<fmt:message key='label.monitoring.summary.user.name' />",
-					"<fmt:message key='label.learners.feedback' />"
+					"<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.monitoring.summary.user.name' /></spring:escapeBody>",
+					"<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.learners.feedback' /></spring:escapeBody>"
 				],
 			   	colModel:[
 			   		{name:'id', index:'id', width:0, sorttype:"int", hidden: true},
 			   		{name:'groupName', index:'groupName', width:140},
 			   		{name:'feedback', index:'feedback', width:568}
 			   	],
-			   	caption: "<fmt:message key='label.other.groups' />"
+			   	caption: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.other.groups' /></spring:escapeBody>"
 			});
 		    <c:forEach var="reflectDTO" items="${reflections}" varStatus="i">
 		    		jQuery("#reflections").addRowData(${i.index + 1}, {
@@ -321,7 +321,7 @@
 				});
 
 				//change button label
-				var newButtonLabel = isExpanded ? "<fmt:message key='label.expand.all' />" : "<fmt:message key='label.collapse.all' />";
+				var newButtonLabel = isExpanded ? "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.expand.all' /></spring:escapeBody>" : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.collapse.all' /></spring:escapeBody>";
 				$(".hidden-xs", $(this)).text(newButtonLabel);
 
 				//change button icon
Index: lams_tool_scratchie/web/pages/monitoring/parts/burningQuestions.jsp
===================================================================
diff -u -rca273b5530c1fead65c271da891dcdd3cb5709f7 -r79123cc650a4028c6dfa0e931d9a074b07234be3
--- lams_tool_scratchie/web/pages/monitoring/parts/burningQuestions.jsp	(.../burningQuestions.jsp)	(revision ca273b5530c1fead65c271da891dcdd3cb5709f7)
+++ lams_tool_scratchie/web/pages/monitoring/parts/burningQuestions.jsp	(.../burningQuestions.jsp)	(revision 79123cc650a4028c6dfa0e931d9a074b07234be3)
@@ -34,7 +34,7 @@
 			}
 
 			//change button label
-			var newButtonLabel = isExpanded ? "<fmt:message key='label.expand.all' />" : "<fmt:message key='label.collapse.all' />";
+			var newButtonLabel = isExpanded ? "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.expand.all' /></spring:escapeBody>" : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.collapse.all' /></spring:escapeBody>";
 			$(".hidden-xs", $(this)).text(newButtonLabel);
 
 			//change button icon
Index: lams_tool_scratchie/web/pages/monitoring/parts/burningQuestionsTable.jsp
===================================================================
diff -u -r9f492696f38c9395dada7fabc7c0f2332847fcf8 -r79123cc650a4028c6dfa0e931d9a074b07234be3
--- lams_tool_scratchie/web/pages/monitoring/parts/burningQuestionsTable.jsp	(.../burningQuestionsTable.jsp)	(revision 9f492696f38c9395dada7fabc7c0f2332847fcf8)
+++ lams_tool_scratchie/web/pages/monitoring/parts/burningQuestionsTable.jsp	(.../burningQuestionsTable.jsp)	(revision 79123cc650a4028c6dfa0e931d9a074b07234be3)
@@ -26,7 +26,7 @@
 			}
 
 			//change button label
-			var newButtonLabel = isExpanded ? "<fmt:message key='label.expand.all' />" : "<fmt:message key='label.collapse.all' />";
+			var newButtonLabel = isExpanded ? "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.expand.all' /></spring:escapeBody>" : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.collapse.all' /></spring:escapeBody>";
 			$(".hidden-xs", $(this)).text(newButtonLabel);
 
 			//change button icon
Index: lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp
===================================================================
diff -u -re4ab7517268533520c11b8cb076abd74d7721d89 -r79123cc650a4028c6dfa0e931d9a074b07234be3
--- lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp	(.../itemSummary.jsp)	(revision e4ab7517268533520c11b8cb076abd74d7721d89)
+++ lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp	(.../itemSummary.jsp)	(revision 79123cc650a4028c6dfa0e931d9a074b07234be3)
@@ -48,9 +48,9 @@
 	  					guiStyle: "bootstrap",
 	  					iconSet: 'fontAwesome',
 	  				   	colNames:[
-		  				   	"<fmt:message key="label.monitoring.summary.answer" />"
+		  				   	"<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.monitoring.summary.answer' /></spring:escapeBody>"
 		  			  	   	<c:forEach var="i" begin="0" end="${summary.numberColumns-1}">
-		  			  	   		,"<fmt:message key="label.monitoring.summary.choice" />&nbsp;${i+1}"
+		  			  	   		,"<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.monitoring.summary.choice' /></spring:escapeBody>&nbsp;${i+1}"
 					  		</c:forEach>
 	  					],
 	  				   	colModel:[
@@ -64,7 +64,7 @@
 	  				
 	  	   	        <c:forEach var="optionDto" items="${summary.optionDtos}" varStatus="i">
 	  	   	     		jQuery("#session${summary.sessionId}").addRowData(${i.index + 1}, {
-	  	   	     			option:"<c:out value='${optionDto.answer}' escapeXml='${!optionDto.mcqType}' /><c:if test='${optionDto.correct}'> (<fmt:message key='label.monitoring.item.summary.correct' />)</c:if>"
+	  	   	     			option:"<c:out value='${optionDto.answer}' escapeXml='${!optionDto.mcqType}' /><c:if test='${optionDto.correct}'> (<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.monitoring.item.summary.correct' /></spring:escapeBody>)</c:if>"
 	  	   	     			<c:forEach var="j" begin="0" end="${summary.numberColumns-1}">
 	  	   	     				,choice${j}:"${optionDto.attempts[j]}"
 	  	   	     			</c:forEach>
Index: lams_tool_scratchie/web/pages/monitoring/parts/statisticpart.jsp
===================================================================
diff -u -re96141f945611c4c619dc27b0b2e65edcd6d0150 -r79123cc650a4028c6dfa0e931d9a074b07234be3
--- lams_tool_scratchie/web/pages/monitoring/parts/statisticpart.jsp	(.../statisticpart.jsp)	(revision e96141f945611c4c619dc27b0b2e65edcd6d0150)
+++ lams_tool_scratchie/web/pages/monitoring/parts/statisticpart.jsp	(.../statisticpart.jsp)	(revision 79123cc650a4028c6dfa0e931d9a074b07234be3)
@@ -10,7 +10,7 @@
 	   	// must display charts after screen is visible or cannot calculate widths.
 		drawHistogram('chartDiv', 
 					'<c:url value="/monitoring/getMarkChartData.do?sessionMapID=${sessionMapID}"/>', 
-					'<fmt:message key="label.marks"/>', '<fmt:message key="label.number.groups.in.mark.range"/>');
+					'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.marks"/></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.number.groups.in.mark.range"/></spring:escapeBody>');
 	});		
 </script>
 
Index: lams_tool_scratchie/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rf05bad0f63a5e9515f10dc19d40bfdd26195ff9f -r79123cc650a4028c6dfa0e931d9a074b07234be3
--- lams_tool_scratchie/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision f05bad0f63a5e9515f10dc19d40bfdd26195ff9f)
+++ lams_tool_scratchie/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 79123cc650a4028c6dfa0e931d9a074b07234be3)
@@ -73,9 +73,9 @@
 				   	'#',
 					'userId',
 					'sessionId',
-					"<fmt:message key="label.monitoring.summary.user.name" />",
-					"<fmt:message key="label.monitoring.summary.attempts" />",
-					"<fmt:message key="label.monitoring.summary.mark" />",
+					"<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.monitoring.summary.user.name' /></spring:escapeBody>",
+					"<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.monitoring.summary.attempts' /></spring:escapeBody>",
+					"<spring:escapeBody javaScriptEscape='true'><xage key='label.monitoring.summary.mark' /></spring:escapeBody>",
 					'portraitId',
 					'isLeader',
 					'reachedActivity'
@@ -163,9 +163,9 @@
 				guiStyle: "bootstrap",
 				iconSet: 'fontAwesome',
 			   	colNames:['#',
-						"<fmt:message key='label.team' />",
-					    "<fmt:message key='label.burning.questions' />",
-						"<fmt:message key='label.count' />"
+						"<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.team' /></spring:escapeBody>",
+					    "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.burning.questions' /></spring:escapeBody>",
+						"<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.count' /></spring:escapeBody>"
 				],
 			   	colModel:[
 			   		{name:'id', index:'id', width:0, sorttype:"int", hidden: true},
@@ -196,15 +196,15 @@
 			autowidth: true,
 			shrinkToFit: false,
 		   	colNames:['#',
-					"<fmt:message key="label.monitoring.summary.user.name" />",
-				    "<fmt:message key='label.learners.feedback' />"
+					"<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.monitoring.summary.user.name' /></spring:escapeBody>",
+				    "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.learners.feedback' /></spring:escapeBody>"
 			],
 		   	colModel:[
 		   		{name:'id', index:'id', width:0, sorttype:"int", hidden: true},
 		   		{name:'groupName', index:'groupName', width:200},
 		   		{name:'feedback', index:'feedback', width:570}
 		   	],
-		   	//caption: "<fmt:message key='label.learners.feedback' />"
+		   	//caption: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.learners.feedback' /></spring:escapeBody>"
 		});
 	    <c:forEach var="reflectDTO" items="${sessionMap.reflections}" varStatus="i">
 	    	jQuery("#reflections").addRowData(${i.index + 1}, {
@@ -238,7 +238,7 @@
     		var icon = '';
     		
     		if (rowObject.isLeader == 'true') {
-    			icon = '&nbsp;<i title="<fmt:message key="label.monitoring.team.leader"/>" class="text-primary fa fa-star"></i>';
+    			icon = '&nbsp;<i title="<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.monitoring.team.leader"/></spring:escapeBody>" class="text-primary fa fa-star"></i>';
     		} else if (rowObject.reachedActivity == 'true') {
     			icon = '&nbsp;<i class="text-primary fa fa-check"></i>';
     		}
@@ -258,7 +258,7 @@
 			if (rdata.isLeader == 'true') {
 				return 'class="info"';
 			} else if (rdata.reachedActivity == 'true') {
-				return 'title="<fmt:message key="label.summary.reached.activity"/>"';
+				return 'title="<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.summary.reached.activity"/></spring:escapeBody>"';
 			}
 		}
     	
@@ -304,7 +304,7 @@
 	
 	function exportExcel(){
 		var url = "<c:url value='/monitoring/exportExcel.do'/>?<csrf:token/>&sessionMapID=${sessionMapID}&reqID=" + (new Date()).getTime();
-		return downloadFile(url, 'messageArea_Busy', '<fmt:message key="label.summary.downloaded"/>', 'messageArea', 'btn-disable-on-submit');
+		return downloadFile(url, 'messageArea_Busy', '<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.summary.downloaded"/></spring:escapeBody>', 'messageArea', 'btn-disable-on-submit');
 	};
 
 	function showChangeLeaderModal(toolSessionId) {
@@ -326,16 +326,16 @@
     				'<csrf:tokenname/>' : '<csrf:tokenvalue/>'
     			},
     			success : function(){
-    				alert("<fmt:message key='label.monitoring.leader.successfully.changed'/>");
+    				alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.monitoring.leader.successfully.changed'/></spring:escapeBody>");
     				location.reload();
     			},
     			error : function(){
-    				alert("<fmt:message key='label.monitoring.leader.not.changed'/>");
+    				alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.monitoring.leader.not.changed'/></spring:escapeBody>");
         		}
             });
         	
 		} else {
-			alert("<fmt:message key='label.monitoring.leader.not.changed'/>");
+			alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.monitoring.leader.not.changed'/></spring:escapeBody>");
 		}
 	}
 	
@@ -346,9 +346,9 @@
 		submissionDateString: '${submissionDateString}',
 		setSubmissionDeadlineUrl: '<c:url value="/monitoring/setSubmissionDeadline.do"/>?<csrf:token/>',
 		toolContentID: '${scratchie.contentId}',
-		messageNotification: '<fmt:message key="monitor.summary.notification" />',
-		messageRestrictionSet: '<fmt:message key="monitor.summary.date.restriction.set" />',
-		messageRestrictionRemoved: '<fmt:message key="monitor.summary.date.restriction.removed" />'
+		messageNotification: '<spring:escapeBody javaScriptEscape='true'><fmt:message key="monitor.summary.notification" /></spring:escapeBody>',
+		messageRestrictionSet: '<spring:escapeBody javaScriptEscape='true'><fmt:message key="monitor.summary.date.restriction.set" /></spring:escapeBody>',
+		messageRestrictionRemoved: '<spring:escapeBody javaScriptEscape='true'><fmt:message key="monitor.summary.date.restriction.removed" /></spring:escapeBody>'
 	};