Index: lams_learning/web/branching/preview.jsp
===================================================================
diff -u -r2c88a58cea84c582b35d0c7218ce97cec312f66e -r21f82ef5c6ab672a3ad2848d330824c97b877738
--- lams_learning/web/branching/preview.jsp	(.../preview.jsp)	(revision 2c88a58cea84c582b35d0c7218ce97cec312f66e)
+++ lams_learning/web/branching/preview.jsp	(.../preview.jsp)	(revision 21f82ef5c6ab672a3ad2848d330824c97b877738)
@@ -55,7 +55,7 @@
 					return true;
 				}
 			
-				alert("<fmt:message key="message.activity.options.noActivitySelected" />");
+				alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key='message.activity.options.noActivitySelected' /></spring:escapeBody>");
 				return false;
 			}
 		</script>
Index: lams_learning/web/common/taglibs.jsp
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -r21f82ef5c6ab672a3ad2848d330824c97b877738
--- lams_learning/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_learning/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 21f82ef5c6ab672a3ad2848d330824c97b877738)
@@ -3,4 +3,4 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
- 
\ No newline at end of file
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
\ No newline at end of file
Index: lams_learning/web/discussion/monitor.jsp
===================================================================
diff -u -r47dddf6db4afaba99d8f3f88fc50b16df9251a76 -r21f82ef5c6ab672a3ad2848d330824c97b877738
--- lams_learning/web/discussion/monitor.jsp	(.../monitor.jsp)	(revision 47dddf6db4afaba99d8f3f88fc50b16df9251a76)
+++ lams_learning/web/discussion/monitor.jsp	(.../monitor.jsp)	(revision 21f82ef5c6ab672a3ad2848d330824c97b877738)
@@ -173,8 +173,8 @@
 												  ],
 								borderWidth : 0,
 							} ],
-							labels : [ '<fmt:message key="label.discussion.stay.header" />',
-									   '<fmt:message key="label.discussion.move.header" />']
+							labels : [ '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.discussion.stay.header" /></spring:escapeBody>',
+									   '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.discussion.move.header" /></spring:escapeBody>']
 						},
 						options : {
 							layout : {
Index: lams_learning/web/discussion/monitor5.jsp
===================================================================
diff -u -rac1bc5dc42645586cf573699676b6f73fcf59d09 -r21f82ef5c6ab672a3ad2848d330824c97b877738
--- lams_learning/web/discussion/monitor5.jsp	(.../monitor5.jsp)	(revision ac1bc5dc42645586cf573699676b6f73fcf59d09)
+++ lams_learning/web/discussion/monitor5.jsp	(.../monitor5.jsp)	(revision 21f82ef5c6ab672a3ad2848d330824c97b877738)
@@ -167,8 +167,8 @@
 												  ],
 								borderWidth : 0,
 							} ],
-							labels : [ '<fmt:message key="label.discussion.stay.header" />',
-									   '<fmt:message key="label.discussion.move.header" />']
+							labels : [ '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.discussion.stay.header" /></spring:escapeBody>',
+									   '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.discussion.move.header" /></spring:escapeBody>']
 						},
 						options : {
 							layout : {
Index: lams_learning/web/kumalive/kumalive.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r21f82ef5c6ab672a3ad2848d330824c97b877738
--- lams_learning/web/kumalive/kumalive.jsp	(.../kumalive.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_learning/web/kumalive/kumalive.jsp	(.../kumalive.jsp)	(revision 21f82ef5c6ab672a3ad2848d330824c97b877738)
@@ -28,27 +28,16 @@
 			LAMS_URL = '<lams:LAMSURL/>',
 			LEARNING_URL = LAMS_URL + 'learning/',
 			KUMALIVE_URL = LEARNING_URL + 'kumalive.jsp?organisationID='+ orgId,
-				
-			decoderDiv = $('<div />'),
 			LABELS = {
-				<fmt:message key="label.kumalive.title" var="KUMALIVE_TITLE_VAR"/>
-				KUMALIVE_TITLE : '<c:out value="${KUMALIVE_TITLE_VAR}" />',
-				<fmt:message key="message.kumalive.finish.kumalive" var="FINISH_KUMALIVE_MESSAGE_VAR"/>
-				FINISH_KUMALIVE_MESSAGE : decoderDiv.html('<c:out value="${FINISH_KUMALIVE_MESSAGE_VAR}" />').text(),
-				<fmt:message key="message.kumalive.finish.kumalive.confirm" var="FINISH_KUMALIVE_CONFIRM_VAR"/>
-				FINISH_KUMALIVE_CONFIRM : decoderDiv.html('<c:out value="${FINISH_KUMALIVE_CONFIRM_VAR}" />').text(),
-				<fmt:message key="message.kumalive.speak.not.raised.hand" var="SPEAK_CONFIRM_VAR"/>
-				SPEAK_CONFIRM : decoderDiv.html('<c:out value="${SPEAK_CONFIRM_VAR}" />').text(),
-				<fmt:message key="label.kumalive.finish.speak" var="SPEAK_FINISH_VAR"/>
-				SPEAK_FINISH : '<c:out value="${SPEAK_FINISH_VAR}" />',
-				<fmt:message key="message.kumalive.poll.finish.confirm" var="POLL_FINISH_CONFIRM_VAR"/>
-				POLL_FINISH_CONFIRM : decoderDiv.html('<c:out value="${POLL_FINISH_CONFIRM_VAR}" />').text(),
-				<fmt:message key="message.kumalive.poll.release.votes.confirm" var="POLL_RELEASE_VOTES_CONFIRM_VAR"/>
-				POLL_RELEASE_VOTES_CONFIRM : decoderDiv.html('<c:out value="${POLL_RELEASE_VOTES_CONFIRM_VAR}" />').text(),
-				<fmt:message key="message.kumalive.poll.release.voters.confirm" var="POLL_RELEASE_VOTERS_CONFIRM_VAR"/>
-				POLL_RELEASE_VOTERS_CONFIRM : decoderDiv.html('<c:out value="${POLL_RELEASE_VOTERS_CONFIRM_VAR}" />').text(),
-				<fmt:message key="label.kumalive.poll.missing.voters" var="MISSING_VOTERS_VAR"/>
-				MISSING_VOTERS : '<c:out value="${MISSING_VOTERS_VAR}" />'
+				KUMALIVE_TITLE: '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.kumalive.title" /></spring:escapeBody>',
+				FINISH_KUMALIVE_MESSAGE: '<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.kumalive.finish.kumalive" /></spring:escapeBody>',
+				FINISH_KUMALIVE_CONFIRM: '<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.kumalive.finish.kumalive.confirm" /></spring:escapeBody>',
+				SPEAK_CONFIRM: '<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.kumalive.speak.not.raised.hand" /></spring:escapeBody>',
+				SPEAK_FINISH: '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.kumalive.finish.speak" /></spring:escapeBody>',
+				POLL_FINISH_CONFIRM: '<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.kumalive.poll.finish.confirm" /></spring:escapeBody>',
+				POLL_RELEASE_VOTES_CONFIRM: '<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.kumalive.poll.release.votes.confirm" /></spring:escapeBody>',
+				POLL_RELEASE_VOTERS_CONFIRM: '<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.kumalive.poll.release.voters.confirm" /></spring:escapeBody>',
+				MISSING_VOTERS: '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.kumalive.poll.missing.voters" /></spring:escapeBody>'
 			};
 			
 	</script>
Index: lams_learning/web/kumalive/kumaliveReport.jsp
===================================================================
diff -u -r47dddf6db4afaba99d8f3f88fc50b16df9251a76 -r21f82ef5c6ab672a3ad2848d330824c97b877738
--- lams_learning/web/kumalive/kumaliveReport.jsp	(.../kumaliveReport.jsp)	(revision 47dddf6db4afaba99d8f3f88fc50b16df9251a76)
+++ lams_learning/web/kumalive/kumaliveReport.jsp	(.../kumaliveReport.jsp)	(revision 21f82ef5c6ab672a3ad2848d330824c97b877738)
@@ -42,7 +42,7 @@
 			    rowNum			   : 10,
 				colNames : [
 					'#',
-					'<fmt:message key="label.kumalive.report.full.name"/>'
+					'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.kumalive.report.full.name"/></spring:escapeBody>'
 				],
 			    colModel : [
 					{
@@ -60,9 +60,9 @@
 				gridComplete : unblockExportButtons,
 			    loadError : function(xhr,st,err) {
 			    	$("#organisationGrid").clearGridData();
-			    	$.jgrid.info_dialog('<fmt:message key="error.title"/>', 
-	    					'<fmt:message key="message.kumalive.report.load.error"/>',
-	    					'<fmt:message key="button.kumalive.ok"/>');
+			    	$.jgrid.info_dialog('<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.title"/></spring:escapeBody>', 
+	    					'<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.kumalive.report.load.error"/></spring:escapeBody>',
+	    					'<spring:escapeBody javaScriptEscape="true"><fmt:message key="button.kumalive.ok"/></spring:escapeBody>');
 			    },
 			    // subgrid for learners who replied to questions during Kumalive
 			    subGrid: true,
@@ -96,7 +96,7 @@
 				                datatype 	: 'json',
 				                url 		: "<lams:LAMSURL />learning/kumalive/getReportKumaliveData.do?kumaliveId="
 					                			+ kumaliveId,
-				                colNames 	: ['<fmt:message key="label.kumalive.report.full.name"/>'].concat(columnNames),
+				                colNames 	: ['<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.kumalive.report.full.name"/></spring:escapeBody>'].concat(columnNames),
 				                colModel 	: [
 								      		   {
 												'name'  : 'name', 
@@ -113,9 +113,9 @@
 								sortname 	: "name", 
 								loadError 	: function(xhr,st,err) {
 						    		$("#" + user_subgrid_table_id).clearGridData();
-						    		$.jgrid.info_dialog('<fmt:message key="error.title"/>', 
-								    					'<fmt:message key="message.kumalive.report.load.error"/>',
-								    					'<fmt:message key="button.kumalive.ok"/>');
+						    		$.jgrid.info_dialog('<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.title"/></spring:escapeBody>', 
+								    					'<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.kumalive.report.load.error"/></spring:escapeBody>',
+								    					'<spring:escapeBody javaScriptEscape="true"><fmt:message key="button.kumalive.ok"/></spring:escapeBody>');
 						    	},
 						    	// subgrid of scores (marks) for the given learner
 						    	subGrid: true,
@@ -145,9 +145,9 @@
 									    shrinkToFit : true,
 										loadError 	: function(xhr,st,err) {
 								    		$("#" + score_subgrid_table_id).clearGridData();
-								    		$.jgrid.info_dialog('<fmt:message key="error.title"/>', 
-							    					'<fmt:message key="message.kumalive.report.load.error"/>',
-							    					'<fmt:message key="button.kumalive.ok"/>');
+								    		$.jgrid.info_dialog('<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.title"/></spring:escapeBody>', 
+							    					'<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.kumalive.report.load.error"/></spring:escapeBody>',
+							    					'<spring:escapeBody javaScriptEscape="true"><fmt:message key="button.kumalive.ok"/></spring:escapeBody>');
 								    	}
 						            });
 								}
Index: lams_learning/web/lessonComplete.jsp
===================================================================
diff -u -r495d8ba0d70ac286d4e8aaa40dd390669cf59e99 -r21f82ef5c6ab672a3ad2848d330824c97b877738
--- lams_learning/web/lessonComplete.jsp	(.../lessonComplete.jsp)	(revision 495d8ba0d70ac286d4e8aaa40dd390669cf59e99)
+++ lams_learning/web/lessonComplete.jsp	(.../lessonComplete.jsp)	(revision 21f82ef5c6ab672a3ad2848d330824c97b877738)
@@ -61,7 +61,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/free.jquery.jqgrid.min.js"></script>
 	<script type="text/javascript">
 		function restartLesson(){
-			if (confirm('<fmt:message key="message.learner.progress.restart.confirm"/>')) {
+			if (confirm('<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.learner.progress.restart.confirm"/></spring:escapeBody>')) {
 				window.location.href = "<lams:WebAppURL/>learner/restartLesson.do?lessonID=${lessonID}";
 			}
 		}
@@ -103,10 +103,10 @@
 				    iconSet 		   : 'fontAwesome',
 				    autoencode		   : false,
 					colNames : [
-						'<fmt:message key="gradebook.columntitle.activity"/>',
-						'<fmt:message key="gradebook.columntitle.progress"/>',
-						'<fmt:message key="gradebook.columntitle.averageMark"/>',
-						'<fmt:message key="gradebook.columntitle.mark"/>'
+						'<spring:escapeBody javaScriptEscape="true"><fmt:message key="gradebook.columntitle.activity"/></spring:escapeBody>',
+						'<spring:escapeBody javaScriptEscape="true"><fmt:message key="gradebook.columntitle.progress"/></spring:escapeBody>',
+						'<spring:escapeBody javaScriptEscape="true"><fmt:message key="gradebook.columntitle.averageMark"/></spring:escapeBody>',
+						'<spring:escapeBody javaScriptEscape="true"><fmt:message key="gradebook.columntitle.mark"/></spring:escapeBody>'
 					],
 				    colModel : [
 				        {
@@ -152,9 +152,9 @@
 					},
 				    loadError : function(xhr,st,err) {
 				    	$("#userGradebookGrid").clearGridData();
-				    	$.jgrid.info_dialog('<fmt:message key="error.title"/>', 
-		    					'<fmt:message key="message.lesson.finished.report.load.error"/>',
-		    					'<fmt:message key="message.lesson.finished.ok"/>');
+				    	$.jgrid.info_dialog('<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.title"/></spring:escapeBody>', 
+		    					'<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.lesson.finished.report.load.error"/></spring:escapeBody>',
+		    					'<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.lesson.finished.ok"/></spring:escapeBody>');
 				    }
 				});
 			});
Index: lams_learning/web/optionsActivity.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r21f82ef5c6ab672a3ad2848d330824c97b877738
--- lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision 21f82ef5c6ab672a3ad2848d330824c97b877738)
@@ -54,7 +54,7 @@
 				}
 			}
 			if (!validated) {
-				alert("<fmt:message key="message.activity.options.noActivitySelected" />");
+				alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key='message.activity.options.noActivitySelected' /></spring:escapeBody>");
 				return false;
 			} else {
 				return true;
Index: lams_learning/web/presenceChat.jsp
===================================================================
diff -u -r47dddf6db4afaba99d8f3f88fc50b16df9251a76 -r21f82ef5c6ab672a3ad2848d330824c97b877738
--- lams_learning/web/presenceChat.jsp	(.../presenceChat.jsp)	(revision 47dddf6db4afaba99d8f3f88fc50b16df9251a76)
+++ lams_learning/web/presenceChat.jsp	(.../presenceChat.jsp)	(revision 21f82ef5c6ab672a3ad2848d330824c97b877738)
@@ -28,10 +28,10 @@
 			presenceShown = ${param.presenceShown eq 'true' or presenceShown},
 			nickname = '<lams:user property="firstName"/>' + ' ' + '<lams:user property="lastName"/>',
 			// labels used in JS file
-			labelSend = '<fmt:message key="learner.im.send"/>',
-			labelUsers = '<fmt:message key="learner.im.users"/>',
+			labelSend = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="learner.im.send"/></spring:escapeBody>',
+			labelUsers = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="learner.im.users"/></spring:escapeBody>',
 			groupChatInfo = {
-							 nick : '<fmt:message key="learner.im.group.chat"/>',
+							 nick : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="learner.im.group.chat"/></spring:escapeBody>',
 							 tag  : "groupchat"
 							};
 	</script>