Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java,v
diff -u -r1.35 -r1.36
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	7 Apr 2014 19:05:25 -0000	1.35
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	8 Apr 2014 15:16:33 -0000	1.36
@@ -41,6 +41,7 @@
 import java.util.TimeZone;
 import java.util.TreeSet;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.dao.IBaseDAO;
@@ -1285,7 +1286,7 @@
 	    } else if (learnerProgress.getAttemptedActivities() != null
 		    && learnerProgress.getAttemptedActivities().size() > 0) {
 		status = "<img src='" + IMAGES_DIR + "/cog.png' title='"
-			+ learnerProgress.getCurrentActivity().getTitle() + "' />";
+			+ StringEscapeUtils.escapeHtml(learnerProgress.getCurrentActivity().getTitle()) + "' />";
 	    }
 	}
 	return status;
@@ -1305,7 +1306,7 @@
 	    byte statusByte = learnerProgress.getProgressState(activity);
 	    if (statusByte == LearnerProgress.ACTIVITY_ATTEMPTED) {
 		return "<img src='" + IMAGES_DIR + "/cog.png' title='"
-			+ learnerProgress.getCurrentActivity().getTitle() + "' />";
+			+ StringEscapeUtils.escapeHtml(learnerProgress.getCurrentActivity().getTitle()) + "' />";
 	    } else if (statusByte == LearnerProgress.ACTIVITY_COMPLETED) {
 		return "<img src='" + IMAGES_DIR + "/tick.png' />";
 	    }
Index: lams_monitoring/web/emailnotifications/lessonNotifications.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/emailnotifications/lessonNotifications.jsp,v
diff -u -r1.10 -r1.11
--- lams_monitoring/web/emailnotifications/lessonNotifications.jsp	6 Apr 2014 22:06:53 -0000	1.10
+++ lams_monitoring/web/emailnotifications/lessonNotifications.jsp	8 Apr 2014 15:25:11 -0000	1.11
@@ -222,7 +222,7 @@
 				</h3>
 				<select id="activityId" onchange="getUsers();">
 					<c:forEach var="activity" items="${activities}" varStatus="i">
-						<option <c:if test="${i.index==0}">selected="selected"</c:if> value="${activity.activityId}">${activity.title}</option>
+						<option <c:if test="${i.index==0}">selected="selected"</c:if> value="${activity.activityId}"><c:out value="${activity.title}"/></option>
 					</c:forEach>
 				</select>				
 			</div>