diff --git a/mozilla/calendar/resources/content/pref/alarmPrefs.xul b/mozilla/calendar/resources/content/pref/alarmPrefs.xul
new file mode 100644
index 00000000000..79cd7b4205e
--- /dev/null
+++ b/mozilla/calendar/resources/content/pref/alarmPrefs.xul
@@ -0,0 +1,74 @@
+<?xml version="1.0"?> 
+<!-- ***** 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 Calendar Code.
+   -
+   - The Initial Developer of the Original Code is Mike Potter.
+   - Portions created by the Initial Developer are Copyright (C) 2002
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -  Mike Potter <mikep@oeone.com>
+   -
+   - 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://communicator/skin/" type="text/css"?>
+
+<!-- DTD File with all strings specific to the file -->
+<!DOCTYPE page 
+[
+    <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/prefs.dtd" > %dtd1;
+]>
+
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel('chrome://calendar/content/pref/publishPrefs.xul');"
+      headertitle="&calendarPanel.label;">
+
+   <script type="application/x-javascript" src="chrome://calendar/content/dateUtils.js"/>
+   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+   
+   <script type="application/x-javascript">
+      var _elementIDs = [
+         "alarmplaysound", "alarmshow", "alarmemailaddress"
+      ];
+   </script>
+
+   <groupbox>
+      <caption label="Alarms"/>
+      <description>&pref.alarmgoesoff.label;</description>
+      <checkbox id="alarmplaysound" prefstring="calendar.alarms.playsound"
+          label="&pref.playasound;" />
+          
+      <checkbox id="alarmshow" prefstring="calendar.alarms.show" label="&pref.showalarmbox;" />
+          
+      <hbox>
+         <description>Default address to send alarms to:</description>
+         <textbox id="alarmemailaddress" prefstring="calendar.alarms.emailaddress" flex="1"/>      
+      </hbox>
+
+   </groupbox>
+</page>
diff --git a/mozilla/calendar/resources/content/pref/calendarPref.xul b/mozilla/calendar/resources/content/pref/calendarPref.xul
index 88b2689456a..068d1c13d7d 100644
--- a/mozilla/calendar/resources/content/pref/calendarPref.xul
+++ b/mozilla/calendar/resources/content/pref/calendarPref.xul
@@ -82,7 +82,7 @@
       */
        
       var _elementIDs = [
-         "alarmplaysound", "alarmshow", "alarmemailaddress", "dateformat", "weekstarts", "defaultlength", "defaultsnoozelength",
+         "dateformat", "weekstarts", "defaultlength", "defaultsnoozelength",
          "reloadonlaunch", "categories", "daystarthour", "dayendhour"
        ];
    </script>
@@ -136,21 +136,6 @@
       
       <checkbox id="reloadonlaunch" preftype="bool" prefstring="calendar.servers.reloadonlaunch" label="&pref.reloadonlaunch;" />
    </groupbox>
-   <groupbox>
-      <caption label="Alarms"/>
-      <description>&pref.alarmgoesoff.label;</description>
-      <checkbox id="alarmplaysound" prefstring="calendar.alarms.playsound"
-          label="&pref.playasound;" />
-          
-      <checkbox id="alarmshow" prefstring="calendar.alarms.show" label="&pref.showalarmbox;" />
-          
-      <hbox>
-         <description>Default address to send alarms to:</description>
-         <textbox id="alarmemailaddress" prefstring="calendar.alarms.emailaddress" flex="1"/>      
-      </hbox>
-
-   </groupbox>
-   
    <groupbox>
       <caption label="&pref.categories.label;"/>
          <vbox>
diff --git a/mozilla/calendar/resources/content/pref/prefOverlay.xul b/mozilla/calendar/resources/content/pref/prefOverlay.xul
index b53904c04ba..70bf318c96e 100644
--- a/mozilla/calendar/resources/content/pref/prefOverlay.xul
+++ b/mozilla/calendar/resources/content/pref/prefOverlay.xul
@@ -68,6 +68,11 @@
       </treerow>
       <treechildren id="panelChildren">
        <treeitem id="calendarPublishPanel" container="false">
+         <treerow>
+           <treecell class="treecell-indent" url="chrome://calendar/content/pref/alarmPrefs.xul" label="&calendar.alarms.label;" id="calendarAlarm"/>
+         </treerow>
+       </treeitem>
+		 <treeitem id="calendarPublishPanel" container="false">
          <treerow>
            <treecell class="treecell-indent" url="chrome://calendar/content/pref/publishPrefs.xul" label="&calendar.publish.label;" id="calendarPublish"/>
          </treerow>
diff --git a/mozilla/calendar/resources/content/pref/publishPrefs.xul b/mozilla/calendar/resources/content/pref/publishPrefs.xul
index 66a8a72034b..741c831f6e5 100644
--- a/mozilla/calendar/resources/content/pref/publishPrefs.xul
+++ b/mozilla/calendar/resources/content/pref/publishPrefs.xul
@@ -75,7 +75,7 @@
       </hbox>
       <hbox>
          <description>&pref.publish.password.label;</description>
-         <textbox flex="1" id="publishPassword" prefstring="calendar.publish.password"/>
+         <textbox flex="1" type="password" id="publishPassword" prefstring="calendar.publish.password"/>
       </hbox>
    </groupbox>
 </page>