diff --git a/NEWS b/NEWS
index 5268a45be..46fe84f39 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ Enchancements
 
 Bug fixes
  - fixed crasher when subscribing users to resources (#2892)
+ - fixed encoding of new calendars and new subscriptions (JavaScript only)
 
 2.2.7 (2014-07-30)
 ------------------
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index be9014c14..33804677a 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -3331,7 +3331,7 @@ function updateCalendarProperties(calendarID, calendarName, calendarColor) {
     //   log("nodeID: " + nodeID);
     var calendarNode = $(nodeID);
     var displayNameNode = calendarNode.childNodesWithTag("span")[0];
-    displayNameNode.innerHTML = calendarName;
+    displayNameNode.innerHTML = calendarName.escapeHTML();
 
     appendStyleElement(nodeID, calendarColor);
 }
@@ -3515,7 +3515,7 @@ function appendCalendar(folderName, folderPath) {
         li.appendChild(colorBox);
 
         var displayName = document.createElement("span");
-        displayName.appendChild(document.createTextNode(folderName));
+        displayName.appendChild(document.createTextNode(folderName.escapeHTML()));
         li.appendChild(displayName);
 
         $(colorBox).addClassName("colorBox");