diff --git a/mozilla/calendar/base/content/calendar-common-sets.xul b/mozilla/calendar/base/content/calendar-common-sets.xul
index 0f01f0db51b..d99345b7049 100755
--- a/mozilla/calendar/base/content/calendar-common-sets.xul
+++ b/mozilla/calendar/base/content/calendar-common-sets.xul
@@ -46,7 +46,6 @@
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <stringbundleset id="calendar_stringbundles">
     <stringbundle id="bundle_branding" src="chrome://branding/locale/brand.properties"/>
-    <stringbundle id="bundle_calendar" src="chrome://calendar/locale/calendar.properties"/>
   </stringbundleset>
   <script type="application/x-javascript" src="chrome://calendar/content/calendar-common-sets.js"/>
 
diff --git a/mozilla/calendar/base/content/calendar-task-tree.xml b/mozilla/calendar/base/content/calendar-task-tree.xml
index d4286b28b7e..6b088f4ba9c 100644
--- a/mozilla/calendar/base/content/calendar-task-tree.xml
+++ b/mozilla/calendar/base/content/calendar-task-tree.xml
@@ -446,7 +446,7 @@
               switch (aCol.element.getAttribute("anonid")) {
                   case "calendar-task-tree-col-title":
                       // return title, or "Untitled" if empty/null
-                      return task.title || gCalendarBundle.getString("eventUntitled");
+                      return task.title || calGetString("calendar", "eventUntitled");
                   case "calendar-task-tree-col-startdate":
                       return this._formatDateTime(task.entryDate);
                   case "calendar-task-tree-col-duedate":
@@ -1077,7 +1077,7 @@
                       // No priority set (0) should be weighted as "normal" (5).
                       return compareNumber(a.priority || 5, b.priority || 5) * modifier;
                   case "calendar-task-tree-col-title":
-                      return compareString(a.title.toLowerCase(), b.title.toLowerCase()) * modifier;
+                      return compareString(a.title ? a.title.toLowerCase() : "", b.title ? b.title.toLowerCase() : "") * modifier;
                   case "calendar-task-tree-col-startdate":
                       return compareDate(a.entryDate, b.entryDate) * modifier;
                   case "calendar-task-tree-col-duedate":
diff --git a/mozilla/calendar/sunbird/base/content/calendar-sets.inc b/mozilla/calendar/sunbird/base/content/calendar-sets.inc
index 7925826685f..f0d437203e6 100644
--- a/mozilla/calendar/sunbird/base/content/calendar-sets.inc
+++ b/mozilla/calendar/sunbird/base/content/calendar-sets.inc
@@ -121,7 +121,3 @@
 </keyset>
 
 <keyset id="tasksKeys"/>
-
-<script type="application/x-javascript">
-  var gCalendarBundle = document.getElementById("bundle_calendar");
-</script>