diff --git a/mozilla/calendar/resources/content/aboutDialog.xul b/mozilla/calendar/resources/content/aboutDialog.xul
new file mode 100644
index 00000000000..55a79d78776
--- /dev/null
+++ b/mozilla/calendar/resources/content/aboutDialog.xul
@@ -0,0 +1,83 @@
+<?xml version="1.0"?> <!-- -*- Mode: HTML -*- --> 
+<!--
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla Firebird about dialog.
+#
+# The Initial Developer of the Original Code is
+# Blake Ross (blaker@netscape.com).
+# Portions created by the Initial Developer are Copyright (C) 2002
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the LGPL or the GPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK ***** -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
+
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % aboutDialogDTD SYSTEM "chrome://browser/locale/aboutDialog.dtd" >
+%aboutDialogDTD;
+]>
+
+<dialog xmlns:html="http://www.w3.org/1999/xhtml"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        buttons="accept"
+        onload="onLoad();"
+        title="&aboutDialog.title;"
+        width="300" height="435"> 
+    
+    <script type="application/x-javascript">
+      <![CDATA[
+        function onLoad() {
+          var userAgentField = document.getElementById("userAgent");
+          userAgentField.value = navigator.userAgent;
+        }
+      ]]>
+    </script>
+
+    <vbox align="center" flex="1">
+      <image src="chrome://calendar/content/sunbird.png"/>
+      <separator class="thin"/>
+      <hbox>
+        <label value="&brandShortName;" style="font-weight: bold;"/>
+        <label value="&version;"/>
+      </hbox>
+      <spacer flex="1"/>
+      <textbox id="userAgent" multiline="true" readonly="true" cols="60"/>
+      <spacer flex="1"/>
+      /* XXXBlake This is a workaround.  I find that if I try to use href and I open
+                  About as a modal dialog, a new browser window opens when I click the link
+                  but the page doesn't load in it. */
+      <html:a onclick="window.openDialog('chrome://browser/content', 'Mozilla Sunbird', 'chrome,all,dialog=no', '&copyrightLink;');"
+              href=""
+              style="display: block; color: blue; text-decoration: underline;">&copyright;</html:a>
+      <spacer flex="1"/>
+    </vbox>
+    <separator class="groove"/>
+</dialog>
diff --git a/mozilla/calendar/resources/content/calendar.js b/mozilla/calendar/resources/content/calendar.js
index 363cb881e68..783a6b6c072 100644
--- a/mozilla/calendar/resources/content/calendar.js
+++ b/mozilla/calendar/resources/content/calendar.js
@@ -1452,3 +1452,14 @@ function changeDisplayToDoInViewCheckbox( menuindex ) {
   }
   gCalendarWindow.currentView.refreshEvents( );
 }
+
+function openAboutDialog()
+{
+  window.openDialog("chrome://calendar/content/aboutDialog.xul", "About", "modal,centerscreen,chrome,resizable=no");
+}
+
+function openPreferences()
+{
+  openDialog("chrome://calendar/content/pref/pref.xul","PrefWindow",
+             "chrome,titlebar,resizable,modal");
+}
diff --git a/mozilla/calendar/resources/content/pref/pref.xul b/mozilla/calendar/resources/content/pref/pref.xul
new file mode 100644
index 00000000000..5500747f8f7
--- /dev/null
+++ b/mozilla/calendar/resources/content/pref/pref.xul
@@ -0,0 +1,110 @@
+<?xml version="1.0"?> 
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
+<?xml-stylesheet href="chrome://browser/skin/pref/pref.css"?>
+
+<!DOCTYPE window [
+   <!ENTITY % prefDTD SYSTEM "chrome://browser/locale/pref/pref.dtd" >
+   %prefDTD;
+   <!ENTITY % calendarPrefsOverlayDTD SYSTEM "chrome://calendar/locale/prefs.dtd" >
+   %calendarPrefsOverlayDTD;
+]>
+
+<dialog id="prefDialog" 
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="&prefWindow.title;" 
+        style="&prefWindow.size;"
+        buttons="accept,cancel"
+        onload="Startup();" onunload="Shutdown();"
+        ondialogaccept="return hPrefWindow.onOK(event);"
+        ondialogcancel="return hPrefWindow.onCancel(event);"
+        persist="screenX screenY"> 
+
+  <script>
+  <![CDATA[
+
+  var hPrefWindow = null;
+
+  /** General startup routine for preferences dialog. 
+   *  Place all necessary modifications to pref tree here. 
+   **/
+  function Startup()
+  {
+    hPrefWindow = new nsPrefWindow("panelFrame");  
+    
+    if(!hPrefWindow)
+      throw "failed to create prefwindow";
+
+    hPrefWindow.init();
+
+    var prefsCategories = document.getElementById("prefsCategories");
+    var index = prefsCategories.getAttribute("lastpanel") || 0;
+    var button = prefsCategories.childNodes[index];
+    button.click();
+    button.focus();
+  }
+    
+  function Shutdown ()
+  {
+    var prefsCategories = document.getElementById("prefsCategories");
+    for (var i = 0; i < prefsCategories.childNodes.length; ++i) {
+      if (prefsCategories.childNodes[i].checked) {
+        prefsCategories.setAttribute("lastpanel", i);
+        document.persist("prefsCategories", "lastpanel");
+        break;
+      }
+    }
+    
+    document.persist("prefsDialog", "screenX screenY");
+  } 
+   
+  function switchPage(aEvent)
+  {
+    var url = aEvent.target.getAttribute("url");
+    if( url == "pref-extensions.xul" || url == "pref-themes.xul" )
+        var newURL = "chrome://browser/content/pref/" + aEvent.target.getAttribute("url");
+    else
+        var newURL = "chrome://calendar/content/pref/" + aEvent.target.getAttribute("url");
+    var newTag = aEvent.target.getAttribute("tag");
+    if (hPrefWindow)
+      hPrefWindow.switchPage(newURL, newTag);
+  }    
+
+  function visitLink(aEvent)
+  {
+    var node = aEvent.target;
+    while (node.nodeType != Node.ELEMENT_NODE)
+      node = node.parentNode;
+
+    var url = node.getAttribute("link");
+    if (url != "")
+      window.opener.openNewWindowWith(url, null, false);
+  }
+
+  ]]>
+  </script>        
+        
+  <stringbundle id="bundle_prefutilities"
+               src="chrome://browser/locale/pref/prefutilities.properties"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsWidgetStateManager.js"/>
+  <script type="application/x-javascript" src="chrome://browser/content/pref/nsPrefWindow.js"/>
+
+  <hbox flex="1">
+    <vbox id="prefsCategories" class="listBox buttonBox" oncommand="switchPage(event);" orient="vertical" lastpanel="0" persist="lastpanel">
+      <button id="catGeneralButton"   orient="vertical" class="buttonBoxButton" type="radio" group="categories" label="&general.label;"   url="calendarPref.xul"/>
+      <button id="catPrivacyButton"     orient="vertical" class="buttonBoxButton" type="radio" group="categories" label="&calendar.alarms.label;" url="alarmPrefs.xul"/>
+      <button id="catFeaturesbutton"  orient="vertical" class="buttonBoxButton" type="radio" group="categories" label="&calendar.publish.label;"  url="publishPrefs.xul"/>
+      <button id="catThemesButton"    orient="vertical" class="buttonBoxButton" type="radio" group="categories" label="&themes.label;"    url="pref-themes.xul"/>
+      <button id="catExtButton"       orient="vertical" class="buttonBoxButton" type="radio" group="categories" label="&ext.label;"       url="pref-extensions.xul"/>
+      <button id="catFontsButton"     orient="vertical" class="buttonBoxButton" type="radio" group="categories" label="&calendar.views.label;"     url="viewPrefs.xul"/>
+      <button id="catProxiesButton"   orient="vertical" class="buttonBoxButton" type="radio" group="categories" label="&calendar.timezone.label;"   url="timezonePrefs.xul"/>
+    </vbox>
+    
+    <vbox flex="1">
+      <dialogheader id="header"/>
+      <iframe id="panelFrame" name="panelFrame" style="width: 0px" flex="1"/>
+    </vbox>
+  </hbox>
+
+  <separator/>
+     
+</dialog>
diff --git a/mozilla/calendar/resources/content/sunbird.png b/mozilla/calendar/resources/content/sunbird.png
new file mode 100644
index 00000000000..8de68d08aab
Binary files /dev/null and b/mozilla/calendar/resources/content/sunbird.png differ
diff --git a/mozilla/calendar/resources/content/sunbird_small.png b/mozilla/calendar/resources/content/sunbird_small.png
new file mode 100644
index 00000000000..c3c29e921b0
Binary files /dev/null and b/mozilla/calendar/resources/content/sunbird_small.png differ
diff --git a/mozilla/calendar/resources/jar.mn b/mozilla/calendar/resources/jar.mn
index 65fa46683ba..d613ae61a3f 100644
--- a/mozilla/calendar/resources/jar.mn
+++ b/mozilla/calendar/resources/jar.mn
@@ -1,6 +1,9 @@
 calendar.jar:
     content/calendar/about.html (content/about.html)
     content/calendar/about.xul (content/about.xul)
+    content/calendar/aboutDialog.xul (content/aboutDialog.xul)
+    content/calendar/sunbird.png (content/sunbird.png)
+    content/calendar/sunbird_small.png (content/sunbird_small.png)
     content/calendar/alertDialog.js (content/alertDialog.js)
     content/calendar/alertDialog.xul (content/alertDialog.xul)
     content/calendar/attachFile.js (content/attachFile.js)
@@ -74,6 +77,7 @@ calendar.jar:
     content/calendar/jslib/rdf/rdfContainer.js (content/jslib/rdf/rdfContainer.js)
     content/calendar/jslib/rdf/rdfFile.js (content/jslib/rdf/rdfFile.js)
     content/calendar/jslib/rdf/rdfResource.js (content/jslib/rdf/rdfResource.js)
+    content/calendar/pref/pref.xul (content/pref/pref.xul)
     content/calendar/pref/alarmPrefs.xul (content/pref/alarmPrefs.xul)
 	 content/calendar/pref/calendarPref.xul (content/pref/calendarPref.xul)
     content/calendar/pref/prefOverlay.xul (content/pref/prefOverlay.xul)