diff --git a/mozilla/calendar/lightning/chrome.manifest b/mozilla/calendar/lightning/chrome.manifest
index a712faaf33c..ee59a29243c 100644
--- a/mozilla/calendar/lightning/chrome.manifest
+++ b/mozilla/calendar/lightning/chrome.manifest
@@ -1,6 +1,7 @@
 content lightning	jar:chrome/lightning.jar!/content/lightning/
 locale  lightning en-US jar:chrome/en-US.jar!/locale/en-US/lightning/
 overlay chrome://messenger/content/messenger.xul chrome://lightning/content/messenger-overlay-sidebar.xul
+overlay chrome://lightning/content/lightning-standalone.xul chrome://lightning/content/messenger-overlay-sidebar.xul
 skin	lightning classic/1.0	jar:chrome/classic.jar!/skin/classic/lightning/
 # shared pieces for chrome://calendar/
 content calendar	jar:chrome/calendar.jar!/content/calendar/
diff --git a/mozilla/calendar/lightning/content/agenda-tree.js b/mozilla/calendar/lightning/content/agenda-tree.js
index 40c3c25834f..b7a517c1825 100644
--- a/mozilla/calendar/lightning/content/agenda-tree.js
+++ b/mozilla/calendar/lightning/content/agenda-tree.js
@@ -88,6 +88,7 @@ agendaTreeView.rebuildAgendaView =
 function rebuildAgendaView(invalidate)
 {
     this.rebuildEventsArray();
+/*
     dump("events:\n");
     this.events.forEach(function (e) {
         if (e instanceof Synthetic)
@@ -95,6 +96,7 @@ function rebuildAgendaView(invalidate)
         else
             dump("    " + e.item.title + " @ " + e.occurrenceStartDate + "\n");
     });
+*/
     this.forceTreeRebuild();
 };
 
@@ -213,6 +215,11 @@ function toggleOpenState(row)
     this.forceTreeRebuild();
 };
 
+agendaTreeView.hasNextSibling =
+function hasNextSibling(row, afterIndex)
+{
+};
+
 agendaTreeView.findPeriodForItem =
 function findPeriodForItem(item)
 {
diff --git a/mozilla/calendar/lightning/content/calendar-management.js b/mozilla/calendar/lightning/content/calendar-management.js
index 0d98cad8ce3..6717758a207 100644
--- a/mozilla/calendar/lightning/content/calendar-management.js
+++ b/mozilla/calendar/lightning/content/calendar-management.js
@@ -34,7 +34,6 @@ var ltnCalendarManagerObserver = {
 
     onCalendarDeleting: function(aCalendar) {
         removeCalendarFromTree(aCalendar); // XXX what else?
-        dump("deleted calendar " + aCalendar.name + "\n");
     },
 
     onCalendarPrefSet: function(aCalendar, aName, aValue) {
diff --git a/mozilla/calendar/lightning/content/lightning-standalone.xul b/mozilla/calendar/lightning/content/lightning-standalone.xul
new file mode 100644
index 00000000000..88760b9d2b3
--- /dev/null
+++ b/mozilla/calendar/lightning/content/lightning-standalone.xul
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+
+<!-- DOCTYPE window SYSTEM "chrome://lightning/locale/lightning.dtd" -->
+
+<?xml-stylesheet href="chrome://lightning/skin/lightning.css" type="text/css"?>
+
+<?xml-stylesheet href="chrome://calendar/content/calendar-multiday-view.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar/content/datetimepickers/minimonth.css" type="text/css"?>
+
+<window
+  id="lightning"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <!-- messenger-overlay-sidebar expects to overlay a vbox named "folderPaneBox" and a 
+     - deck named "displayDeck".  So we oblige.
+    -->
+  <hbox flex="1">
+    <vbox id="folderPaneBox" flex="1"/>
+    <splitter />
+    <deck id="displayDeck" flex="4"/>
+  </hbox>
+</window>
diff --git a/mozilla/calendar/lightning/content/messenger-overlay-sidebar.js b/mozilla/calendar/lightning/content/messenger-overlay-sidebar.js
index 76b898f158a..09108fca086 100644
--- a/mozilla/calendar/lightning/content/messenger-overlay-sidebar.js
+++ b/mozilla/calendar/lightning/content/messenger-overlay-sidebar.js
@@ -50,6 +50,7 @@ function ltnMinimonthPick(which, minimonth)
     var cdt = new CalDateTime();
     cdt.jsDate = minimonth.value;
     cdt.isDate = true;
+    cdt.timezone = calendarDefaultTimezone();
     currentView().showDate(cdt);
 
     showCalendar(false);
diff --git a/mozilla/calendar/lightning/content/messenger-overlay-sidebar.xul b/mozilla/calendar/lightning/content/messenger-overlay-sidebar.xul
index 0cedd4eadb8..1fd5bed3435 100644
--- a/mozilla/calendar/lightning/content/messenger-overlay-sidebar.xul
+++ b/mozilla/calendar/lightning/content/messenger-overlay-sidebar.xul
@@ -29,7 +29,7 @@
 
   <splitter id="folderpaneCalendarSplitter" collapse="after" persist="state"/>
 
-  <vbox>
+  <vbox flex="1">
     <hbox>
       <minimonth id="ltnMinimonthLeft" onchange="ltnMinimonthPick('left', this);"/>
       <minimonth id="ltnMinimonthRight" onchange="ltnMinimonthPick('right', this);"/>
diff --git a/mozilla/calendar/lightning/jar.mn b/mozilla/calendar/lightning/jar.mn
index ac1c696ef7a..2c13d7cf1b5 100644
--- a/mozilla/calendar/lightning/jar.mn
+++ b/mozilla/calendar/lightning/jar.mn
@@ -5,6 +5,7 @@ lightning.jar:
   content/lightning/calendar-management.js		(content/calendar-management.js)
   content/lightning/lightning-widgets.css		(content/lightning-widgets.css)
   content/lightning/agenda-tree.js			(content/agenda-tree.js)
+  content/lightning/lightning-standalone.xul		(content/lightning-standalone.xul)
 
 en-US.jar:
   locale/en-US/lightning/lightning.dtd				(locale/lightning.dtd)
diff --git a/mozilla/calendar/resources/content/calendarUtils.js b/mozilla/calendar/resources/content/calendarUtils.js
index 232c9631d86..926d76b34f2 100644
--- a/mozilla/calendar/resources/content/calendarUtils.js
+++ b/mozilla/calendar/resources/content/calendarUtils.js
@@ -172,6 +172,8 @@ function calendarDefaultTimezone() {
 const tzTable = {
     "GMT-0700 Pacific Daylight Time" : "/mozilla.org/20050126_1/America/Los_Angeles",
     "GMT-0800 Pacific Standard Time" : "/mozilla.org/20050126_1/America/Los_Angeles",
+    "GMT-0700 PDT" : "/mozilla.org/20050126_1/America/Los_Angeles",
+    "GMT-0800 PST" : "/mozilla.org/20050126_1/America/Los_Angeles",
     "GMT-0400 EDT" : "/mozilla.org/20050126_1/America/New_York",
     "GMT-0500 EST" : "/mozilla.org/20050126_1/America/New_York",
 };