diff --git a/mozilla/calendar/resources/content/about.html b/mozilla/calendar/resources/content/about.html
index 5842622752e..003ede9ff8b 100644
--- a/mozilla/calendar/resources/content/about.html
+++ b/mozilla/calendar/resources/content/about.html
@@ -78,7 +78,7 @@ h1 {
 
 <td id="mozver">
 <h1>
-<a id="mozlink" href="http://www.mozilla.org/projects/calendar/" target="_new">Mozilla Calendar 2002103116-cal</a>
+<a id="mozlink" href="http://www.mozilla.org/projects/calendar/" target="_new">Mozilla Calendar 2002111311-cal</a>
 </h1>
 <script type="application/x-javascript">
   // using try..catch to handle empty useragents and other cases where the regex fails to apply
diff --git a/mozilla/calendar/resources/content/calendar.xul b/mozilla/calendar/resources/content/calendar.xul
index 63eb981f517..38ad5352e7a 100644
--- a/mozilla/calendar/resources/content/calendar.xul
+++ b/mozilla/calendar/resources/content/calendar.xul
@@ -312,16 +312,16 @@
                      <listitem uri="rdf:*" 
                         calendarPath="rdf:http://home.netscape.com/NC-rdf#path"
                         onclick="switchCalendar( event );">
-                        <listcell id="calendar-list-item-^rdf://http://home.netscape.com/NC-rdf#serverNumber"
-                           class="calendar-list-item-class"
+                        <listcell class="calendar-list-item-class"
                            label="rdf:http://home.netscape.com/NC-rdf#name"
                            flex="1"
                            type="checkbox"
                            checked="rdf:http://home.netscape.com/NC-rdf#active"
                            />
+                        <!-- If you add something between the above listcell and this listcell,
+                           or between the next listcell and the image tag, you have to modify calendarManager.js -->
                         <listcell>
-                           <image id="calendar-list-image-^rdf://http://home.netscape.com/NC-rdf#serverNumber"
-                              class="calendar-list-item-class"/>
+                           <image class="calendar-list-item-class"/>
                         </listcell>
                      </listitem>
                   </rule>
diff --git a/mozilla/calendar/resources/content/calendarManager.js b/mozilla/calendar/resources/content/calendarManager.js
index d83dcb6f363..83aa74067b0 100644
--- a/mozilla/calendar/resources/content/calendarManager.js
+++ b/mozilla/calendar/resources/content/calendarManager.js
@@ -312,8 +312,7 @@ calendarManager.prototype.getSelectedCalendar = function calMan_getSelectedCalen
 calendarManager.prototype.retrieveAndSaveRemoteCalendar = function calMan_retrieveAndSaveRemoteCalendar( ThisCalendarObject )
 {
    //the image doesn't always exist. If it doesn't exist, it causes problems, so check for it here
-   if( document.getElementById( "calendar-list-image-"+ThisCalendarObject.getAttribute( "http://home.netscape.com/NC-rdf#serverNumber" ) ) )
-      document.getElementById( "calendar-list-image-"+ThisCalendarObject.getAttribute( "http://home.netscape.com/NC-rdf#serverNumber" ) ).setAttribute( "synching", "true" );
+   document.getElementById( ThisCalendarObject.getSubject() ).childNodes[1].childNodes[0].setAttribute( "synching", "true" );
 
    var ioService = Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService);
    
@@ -339,7 +338,7 @@ calendarManager.prototype.retrieveAndSaveRemoteCalendar = function calMan_retrie
       
       CalendarManager.CalendarWindow.currentView.refreshEvents();
    
-      //document.getElementById( "calendar-list-image-"+calendarToGet.getAttribute( "http://home.netscape.com/NC-rdf#serverNumber" ) ).removeAttribute( "synching" );
+      document.getElementById( ThisCalendarObject.getSubject() ).childNodes[1].childNodes[0].removeAttribute( "synching" );
    }
 
    var CalendarData = this.getRemoteCalendarText( Channel, onResponse, null );