Index: lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java
===================================================================
diff -u -r46bcb6ea758a272250071d1a571d008c6745e593 -r000998cbc63b12bffb4959d5012679f80796823a
--- lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java	(.../CommentAction.java)	(revision 46bcb6ea758a272250071d1a571d008c6745e593)
+++ lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java	(.../CommentAction.java)	(revision 000998cbc63b12bffb4959d5012679f80796823a)
@@ -429,7 +429,7 @@
     }
 
     private boolean validateText(String commentText) {
-	return commentText != null & commentText.length() > 0 && commentText.length() < CommentConstants.MAX_BODY_LENGTH;
+	return commentText != null && commentText.length() > 0 && commentText.length() < CommentConstants.MAX_BODY_LENGTH;
     }
     
     private JSONObject getFailedValidationJSON() throws JSONException {
Index: lams_central/web/comments/msgview.jsp
===================================================================
diff -u -rd8be0fc2c13bfb38ac7239cf7185895a31845e2b -r000998cbc63b12bffb4959d5012679f80796823a
--- lams_central/web/comments/msgview.jsp	(.../msgview.jsp)	(revision d8be0fc2c13bfb38ac7239cf7185895a31845e2b)
+++ lams_central/web/comments/msgview.jsp	(.../msgview.jsp)	(revision 000998cbc63b12bffb4959d5012679f80796823a)
@@ -43,7 +43,7 @@
 					<span id="msgBody">
 					<c:if
 						test='${(not hidden) || (hidden && sessionMap.mode == "teacher")}'>
-						<c:out value="${commentDto.comment.body}" escapeXml="true" />
+						<lams:out value="${commentDto.comment.body}" escapeHtml="true" />
 					</c:if>
 					<c:if test='${hidden}'>
 						<i><fmt:message key="label.hidden" /></i>