diff --git a/www/calendar/inner.js b/www/calendar/inner.js
index e21438746..18b381b22 100644
--- a/www/calendar/inner.js
+++ b/www/calendar/inner.js
@@ -149,7 +149,7 @@ Messages.calendar_dateTimeRange = "{0} {1} - {2}";
             if (!md) { return void console.error('Ignore calendar without metadata'); }
             return {
                 id: id,
-                name: Util.fixHTML(md.title),
+                name: md.title,
                 color: getContrast(md.color),
                 bgColor: md.color,
                 dragBgColor: md.color,
@@ -165,8 +165,8 @@ Messages.calendar_dateTimeRange = "{0} {1} - {2}";
             var data = c.content || {};
             Object.keys(data.content || {}).forEach(function (uid) {
                 var obj = data.content[uid];
-                obj.title = Util.fixHTML(obj.title || "");
-                obj.location = Util.fixHTML(obj.location || "");
+                obj.title = obj.title || "";
+                obj.location = obj.location || "";
                 if (c.readOnly) {
                     obj.isReadOnly = true;
                 }
@@ -223,6 +223,9 @@ Messages.calendar_dateTimeRange = "{0} {1} - {2}";
         popupSave: function () {
             return Messages.settings_save;
         },
+        popupDetailLocation: function(schedule) {
+            return 'Location : ' + Util.fixHTML(schedule.location); // XXX
+        },
         timegridDisplayTime: getTime,
         timegridDisplayPrimaryTime: getTime,
         popupDetailDate: function(isAllDay, start, end) {