Index: lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java,v
diff -u -r1.1 -r1.2
--- lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java	15 Dec 2015 10:18:12 -0000	1.1
+++ lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java	17 Dec 2015 13:54:57 -0000	1.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/comments/msgview.jsp,v
diff -u -r1.2 -r1.3
--- lams_central/web/comments/msgview.jsp	16 Dec 2015 05:53:52 -0000	1.2
+++ lams_central/web/comments/msgview.jsp	17 Dec 2015 13:54:46 -0000	1.3
@@ -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>