Index: lams_learning/web/lessonComplete.jsp
===================================================================
diff -u -r4523b2002a805bb8ad7528f18e9693a2c84c2a64 -r7cb4c24f3bd88110fbb593255cfc4ec05d2a821c
--- lams_learning/web/lessonComplete.jsp	(.../lessonComplete.jsp)	(revision 4523b2002a805bb8ad7528f18e9693a2c84c2a64)
+++ lams_learning/web/lessonComplete.jsp	(.../lessonComplete.jsp)	(revision 7cb4c24f3bd88110fbb593255cfc4ec05d2a821c)
@@ -42,7 +42,7 @@
 	<p>
 		<fmt:message key="message.lesson.finishedCont">
 			<fmt:param>
-				<b>${learnerprogress.lesson.lessonName}</b>
+				<b><c:out value="${learnerprogress.lesson.lessonName}" escape="true"/></b>
 			</fmt:param>
 			<fmt:param>
 				 <lams:Date value="${learnerprogress.finishDate}" style="short"/>
Index: lams_learning/web/mobile/lessonComplete.jsp
===================================================================
diff -u -r606581007abbdaee5483777096f32ffac1c3e3eb -r7cb4c24f3bd88110fbb593255cfc4ec05d2a821c
--- lams_learning/web/mobile/lessonComplete.jsp	(.../lessonComplete.jsp)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
+++ lams_learning/web/mobile/lessonComplete.jsp	(.../lessonComplete.jsp)	(revision 7cb4c24f3bd88110fbb593255cfc4ec05d2a821c)
@@ -44,7 +44,7 @@
 	<p>
 		<fmt:message key="message.lesson.finishedCont">
 			<fmt:param>
-				<b>${learnerprogress.lesson.lessonName}</b>
+				<b><c:out value="${learnerprogress.lesson.lessonName}" escapeXml="true"/></b>
 			</fmt:param>
 			<fmt:param>
 				 <lams:Date value="${learnerprogress.finishDate}" style="short"/>
Index: lams_tool_notebook/web/pages/export/exportPortfolio.jsp
===================================================================
diff -u -r18e5e690d2e1a7c3d918759f7a2827c8205feaac -r7cb4c24f3bd88110fbb593255cfc4ec05d2a821c
--- lams_tool_notebook/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac)
+++ lams_tool_notebook/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision 7cb4c24f3bd88110fbb593255cfc4ec05d2a821c)
@@ -5,7 +5,7 @@
 
 <html>
 	<lams:head>
-		<title><c:out value="${notebookDTO.title}" escapeXml="false" />
+		<title><c:out value="${notebookDTO.title}" escapeXml="true" />
 		</title>
 		<lams:css localLinkPath="../" />
 	</lams:head>
@@ -15,7 +15,7 @@
 			<div id="content">
 
 			<h1>
-				<c:out value="${notebookDTO.title}" escapeXml="false" />
+				<c:out value="${notebookDTO.title}" escapeXml="true" />
 			</h1>
 
 				<p>
Index: lams_tool_notebook/web/pages/learning/mobile/notebook.jsp
===================================================================
diff -u -r5695ca755c8352ddceb596c451ef283943885295 -r7cb4c24f3bd88110fbb593255cfc4ec05d2a821c
--- lams_tool_notebook/web/pages/learning/mobile/notebook.jsp	(.../notebook.jsp)	(revision 5695ca755c8352ddceb596c451ef283943885295)
+++ lams_tool_notebook/web/pages/learning/mobile/notebook.jsp	(.../notebook.jsp)	(revision 7cb4c24f3bd88110fbb593255cfc4ec05d2a821c)
@@ -45,14 +45,14 @@
 
 <div data-role="header" data-theme="b" data-nobackbtn="true">
 	<h1>
-		${notebookDTO.title}
+		<c:out value="${notebookDTO.title}" escapeXml="true"/>
 	</h1>
 </div>
 
 <html:form action="/learning" method="post" onsubmit="return validateForm();" styleId="messageForm">
 	<div data-role="content">
 		<p>
-			${notebookDTO.instructions}
+			<c:out value="${notebookDTO.instructions}" escapeXml="false"/>
 		</p>
 	
 		<c:if test="${not empty notebookDTO.submissionDeadline}">
Index: lams_tool_notebook/web/pages/learning/mobile/submissionDeadline.jsp
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r7cb4c24f3bd88110fbb593255cfc4ec05d2a821c
--- lams_tool_notebook/web/pages/learning/mobile/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_notebook/web/pages/learning/mobile/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 7cb4c24f3bd88110fbb593255cfc4ec05d2a821c)
@@ -12,7 +12,7 @@
 
 <div data-role="header" data-theme="b" data-nobackbtn="true">
 	<h1>
-		${notebookDTO.title}
+		<c:out value="${notebookDTO.title}" escapeXml="true"/>
 	</h1>
 </div>
 
Index: lams_tool_notebook/web/pages/learning/notebook.jsp
===================================================================
diff -u -r1db6d7173ac57f97493f84da903508f6a7c41918 -r7cb4c24f3bd88110fbb593255cfc4ec05d2a821c
--- lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 1db6d7173ac57f97493f84da903508f6a7c41918)
+++ lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 7cb4c24f3bd88110fbb593255cfc4ec05d2a821c)
@@ -45,11 +45,11 @@
 
 <div id="content">
 	<h1>
-		${notebookDTO.title}
+		<c:out value="${notebookDTO.title}" escapeXml="true"/>
 	</h1>
 
 	<p>
-		${notebookDTO.instructions}
+		<c:out value="${notebookDTO.instructions}" escapeXml="false"/>
 	</p>
 
 	<c:if test="${not empty notebookDTO.submissionDeadline}">
@@ -120,4 +120,4 @@
 			</html:link>
 		</div>
 	</html:form>
-</div>
\ No newline at end of file
+</div>
Index: lams_tool_notebook/web/pages/learning/submissionDeadline.jsp
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r7cb4c24f3bd88110fbb593255cfc4ec05d2a821c
--- lams_tool_notebook/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_notebook/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 7cb4c24f3bd88110fbb593255cfc4ec05d2a821c)
@@ -12,7 +12,7 @@
 
 <div id="content">
 	<h1>
-		${notebookDTO.title}
+		<c:out value="${notebookDTO.title}" escapeXml="true"/>
 	</h1>
 
 	<div class="warning">
Index: lams_tool_notebook/web/pages/monitoring/editActivity.jsp
===================================================================
diff -u -rb36a6edc0f97f2bc2ddb50eaed092d607ac2a5b8 -r7cb4c24f3bd88110fbb593255cfc4ec05d2a821c
--- lams_tool_notebook/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision b36a6edc0f97f2bc2ddb50eaed092d607ac2a5b8)
+++ lams_tool_notebook/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 7cb4c24f3bd88110fbb593255cfc4ec05d2a821c)
@@ -15,7 +15,7 @@
 				<fmt:message key="label.authoring.basic.title" />
 			</td>
 			<td>
-				<c:out value="${dto.title}" escapeXml="false" />
+				<c:out value="${dto.title}" escapeXml="true" />
 			</td>
 		</tr>
 		<tr>
