diff --git a/mozilla/calendar/resources/content/contents.rdf b/mozilla/calendar/resources/content/contents.rdf
index 850b86b38f9..29626ee0867 100644
--- a/mozilla/calendar/resources/content/contents.rdf
+++ b/mozilla/calendar/resources/content/contents.rdf
@@ -52,13 +52,21 @@
   <RDF:Seq about="urn:mozilla:overlays">
     <RDF:li resource="chrome://communicator/content/tasksOverlay.xul"/>
     <RDF:li resource="chrome://communicator/content/pref/preftree.xul"/>
+    <RDF:li resource="chrome://communicator/content/pref/pref-appearance.xul"/>
   </RDF:Seq>
 
+  <!-- calendar tasks -->
   <RDF:Seq about="chrome://communicator/content/tasksOverlay.xul">
     <RDF:li>chrome://calendar/content/calendarOverlay.xul</RDF:li>
   </RDF:Seq>
    
+  <!-- calendar pref page -->
   <RDF:Seq about="chrome://communicator/content/pref/preftree.xul">
     <RDF:li>chrome://calendar/content/pref/calendarPrefOverlay.xul</RDF:li>
   </RDF:Seq>
+  
+  <!-- calendar startup pref -->
+  <RDF:Seq about="chrome://communicator/content/pref/pref-appearance.xul">
+    <RDF:li>chrome://calendar/content/pref/calendarPrefOverlay.xul</RDF:li>
+  </RDF:Seq>
 </RDF:RDF>
diff --git a/mozilla/calendar/resources/content/pref/calendarPrefOverlay.xul b/mozilla/calendar/resources/content/pref/calendarPrefOverlay.xul
index 17e73597a1a..e282c9f431b 100644
--- a/mozilla/calendar/resources/content/pref/calendarPrefOverlay.xul
+++ b/mozilla/calendar/resources/content/pref/calendarPrefOverlay.xul
@@ -35,13 +35,36 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
+<!DOCTYPE window [
+   <!ENTITY % calendarPrefsOverlayDTD SYSTEM "chrome://calendar/locale/calendarPrefs.dtd" >
+   %calendarPrefsOverlayDTD;
+]>
+
 <overlay id="calendarPrefOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
+   <script type="application/x-javascript">
+   <![CDATA[
+    var panel;
+    if ((panel != undefined)&&(panel == "chrome://communicator/content/pref/pref-appearance.xul"))
+    {
+        _elementIDs.push("generalStartupCalendar");
+    }
+   ]]>
+   </script>         
+   
+   <!-- calendar startup toggle -->
+   <groupbox id="generalStartupPreferences">           
+      <checkbox id="generalStartupCalendar" wsm_persist="true" position="4"
+              label="&calendar.label;" accesskey="&calendar.accesskey;"
+              pref="true" preftype="bool" prefstring="general.startup.calendar"
+              prefattribute="checked"/>         
+   </groupbox>
+   
    <treechildren id="advancedChildren">
     <treeitem id="calendarPanel" container="false">
       <treerow>
-        <treecell class="treecell-indent" url="chrome://calendar/content/pref/calendarPref.xul" label="Calendar" id="calendar"/>
+        <treecell class="treecell-indent" url="chrome://calendar/content/pref/calendarPref.xul" label="&calendar.label;" id="calendar"/>
       </treerow>
     </treeitem>
   </treechildren>
diff --git a/mozilla/calendar/resources/content/pref/prefOverlay.xul b/mozilla/calendar/resources/content/pref/prefOverlay.xul
index 17e73597a1a..e282c9f431b 100644
--- a/mozilla/calendar/resources/content/pref/prefOverlay.xul
+++ b/mozilla/calendar/resources/content/pref/prefOverlay.xul
@@ -35,13 +35,36 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
+<!DOCTYPE window [
+   <!ENTITY % calendarPrefsOverlayDTD SYSTEM "chrome://calendar/locale/calendarPrefs.dtd" >
+   %calendarPrefsOverlayDTD;
+]>
+
 <overlay id="calendarPrefOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
+   <script type="application/x-javascript">
+   <![CDATA[
+    var panel;
+    if ((panel != undefined)&&(panel == "chrome://communicator/content/pref/pref-appearance.xul"))
+    {
+        _elementIDs.push("generalStartupCalendar");
+    }
+   ]]>
+   </script>         
+   
+   <!-- calendar startup toggle -->
+   <groupbox id="generalStartupPreferences">           
+      <checkbox id="generalStartupCalendar" wsm_persist="true" position="4"
+              label="&calendar.label;" accesskey="&calendar.accesskey;"
+              pref="true" preftype="bool" prefstring="general.startup.calendar"
+              prefattribute="checked"/>         
+   </groupbox>
+   
    <treechildren id="advancedChildren">
     <treeitem id="calendarPanel" container="false">
       <treerow>
-        <treecell class="treecell-indent" url="chrome://calendar/content/pref/calendarPref.xul" label="Calendar" id="calendar"/>
+        <treecell class="treecell-indent" url="chrome://calendar/content/pref/calendarPref.xul" label="&calendar.label;" id="calendar"/>
       </treerow>
     </treeitem>
   </treechildren>
diff --git a/mozilla/calendar/resources/locale/en-US/calendarPrefs.dtd b/mozilla/calendar/resources/locale/en-US/calendarPrefs.dtd
index 216fada649d..7de7bd7d5e6 100644
--- a/mozilla/calendar/resources/locale/en-US/calendarPrefs.dtd
+++ b/mozilla/calendar/resources/locale/en-US/calendarPrefs.dtd
@@ -35,6 +35,9 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
+<!ENTITY calendar.label             "Calendar" >
+<!ENTITY calendar.accesskey         "c" >
+
 <!ENTITY pref.mainbox.caption  "General Settings" >
 <!ENTITY pref.alarmgoesoff.label "When an alarm goes off:">
 <!ENTITY pref.playasound  "Play a sound" >
diff --git a/mozilla/calendar/resources/locale/en-US/prefs.dtd b/mozilla/calendar/resources/locale/en-US/prefs.dtd
index 216fada649d..7de7bd7d5e6 100644
--- a/mozilla/calendar/resources/locale/en-US/prefs.dtd
+++ b/mozilla/calendar/resources/locale/en-US/prefs.dtd
@@ -35,6 +35,9 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
+<!ENTITY calendar.label             "Calendar" >
+<!ENTITY calendar.accesskey         "c" >
+
 <!ENTITY pref.mainbox.caption  "General Settings" >
 <!ENTITY pref.alarmgoesoff.label "When an alarm goes off:">
 <!ENTITY pref.playasound  "Play a sound" >