Index: lams_tool_scribe/web/pages/learning/scribe.jsp
===================================================================
diff -u -rba26022844a236a533f7cba6041cb7e4018989fa -r2c5b4d48beb07aaf5f39402b8ed8efc5f04033cd
--- lams_tool_scribe/web/pages/learning/scribe.jsp	(.../scribe.jsp)	(revision ba26022844a236a533f7cba6041cb7e4018989fa)
+++ lams_tool_scribe/web/pages/learning/scribe.jsp	(.../scribe.jsp)	(revision 2c5b4d48beb07aaf5f39402b8ed8efc5f04033cd)
@@ -58,11 +58,11 @@
 <div id="content">
 
 	<h1>
-		<c:out value="${scribeDTO.title}" escapeXml="false" />
+		<c:out value="${scribeDTO.title}" escapeXml="true" />
 	</h1>
 
 	<p>
-		${scribeDTO.instructions}
+		<c:out value="${scribeDTO.instructions}" escapeXml="false"/>
 	</p>
 
 	<html:form action="learning">
@@ -80,22 +80,25 @@
 		<c:forEach var="reportDTO" items="${scribeSessionDTO.reportDTOs}">
 			<div class="shading-bg">
 				<p>
-					${reportDTO.headingDTO.headingText}
+					<c:out value="${reportDTO.headingDTO.headingText}" escapeXml="false"/>
 				</p>
 
 
 				<c:if test="${not empty reportDTO.entryText}">
 					<ul>
 						<li>
 							<p>
-								<lams:out value="${reportDTO.entryText}" />
+								<c:set var="entry">
+									<lams:out value="${reportDTO.entryText}" escapeHtml="true"/>
+								</c:set>
+								<c:out value="${entry}" escapeXml="false"/>
 							</p>
 						</li>
 					</ul>
 				</c:if>
 
 				<c:if test="${not scribeUserDTO.finishedActivity}">
-					<html:textarea property="report(${reportDTO.uid})" rows="4"
+					<html:textarea property="report(${reportDTO.uid})" rows="7"
 						cols="20" value="${reportDTO.entryText}" style="width: 100%;"></html:textarea>
 				</c:if>
 			</div>