diff --git a/calendar/resources/content/dayView.js b/calendar/resources/content/dayView.js
index cb51a8b19b9..614a4344d4b 100644
--- a/calendar/resources/content/dayView.js
+++ b/calendar/resources/content/dayView.js
@@ -532,12 +532,12 @@ DayView.prototype.refreshDisplay = function dayview_refreshDisplay( )
 
    var dateString = weekViewStringBundle.GetStringFromName( "Week" )+" "+weekNumber+ ": " + this.calendarWindow.dateFormater.getFormatedDate( this.calendarWindow.getSelectedDate() ) ;
    
-   var dayTextItemPrev2 = document.getElementById( "-2-day-title" );
-   var dayTextItemPrev1 = document.getElementById( "-1-day-title" );
-   var dayTextItem = document.getElementById( "0-day-title" );
-   var dayTextItemNext1 = document.getElementById( "1-day-title" );
-   var dayTextItemNext2 = document.getElementById( "2-day-title" );
-	var daySpecificTextItem = document.getElementById( "0-day-specific-title" );
+   var dayTextItemPrev2 = document.getElementById( "d-2-day-title" );
+   var dayTextItemPrev1 = document.getElementById( "d-1-day-title" );
+   var dayTextItem = document.getElementById( "d0-day-title" );
+   var dayTextItemNext1 = document.getElementById( "d1-day-title" );
+   var dayTextItemNext2 = document.getElementById( "d2-day-title" );
+	var daySpecificTextItem = document.getElementById( "d0-day-specific-title" );
    dayTextItemPrev2.setAttribute( "value" , dayNamePrev2 );
    dayTextItemPrev1.setAttribute( "value" , dayNamePrev1 );
    dayTextItem.setAttribute( "value" , dayName );
diff --git a/calendar/resources/content/dayView.xul b/calendar/resources/content/dayView.xul
index c4fb6a08bbf..51e398c8469 100644
--- a/calendar/resources/content/dayView.xul
+++ b/calendar/resources/content/dayView.xul
@@ -73,24 +73,24 @@
          <vbox id="day-title-container" flex="1">
             <hbox id="day-title-box" flex="1">
                <vbox class="day-title-label-box" flex="1">
-                  <label id="-2-day-title" onclick="gCalendarWindow.goToPrevious( 2 )" value="" />
+                  <label id="d-2-day-title" onclick="gCalendarWindow.goToPrevious( 2 )" value="" />
                </vbox>
                <vbox class="day-title-label-box" flex="1">
-                  <label id="-1-day-title" onclick="gCalendarWindow.goToPrevious( 1 )" value="" />
+                  <label id="d-1-day-title" onclick="gCalendarWindow.goToPrevious( 1 )" value="" />
                </vbox>
                <vbox class="day-title-label-box" flex="1">
-                  <label id="0-day-title"  value="" />
+                  <label id="d0-day-title"  value="" />
                </vbox>
                <vbox class="day-title-label-box" flex="1">
-                  <label id="1-day-title" onclick="gCalendarWindow.goToNext( 1 )" value="" />
+                  <label id="d1-day-title" onclick="gCalendarWindow.goToNext( 1 )" value="" />
                </vbox>
                <vbox class="day-title-label-box" flex="1">
-                  <label id="2-day-title" onclick="gCalendarWindow.goToNext( 2 )" value="" />
+                  <label id="d2-day-title" onclick="gCalendarWindow.goToNext( 2 )" value="" />
                </vbox>
             </hbox>
             <hbox id="day-specific-title-box" flex="1">
                <vbox class="day-title-label-box" flex="1">
-                  <label id="0-day-specific-title" value="" />
+                  <label id="d0-day-specific-title" value="" />
                </vbox>
             </hbox>
          </vbox>
diff --git a/calendar/resources/content/monthView.js b/calendar/resources/content/monthView.js
index abb86b83c5b..38892bd6f11 100644
--- a/calendar/resources/content/monthView.js
+++ b/calendar/resources/content/monthView.js
@@ -453,11 +453,11 @@ MonthView.prototype.refreshDisplay = function monthView_refreshDisplay( )
       titleMonthArray[i] = newMonth + i;
       titleMonthArray[i] = (titleMonthArray[i] >= 0)? titleMonthArray[i] % 12 : titleMonthArray[i] + 12;
       titleMonthArray[i] = this.calendarWindow.dateFormater.getMonthName( titleMonthArray[i] );
-      var idName = i + "-month-title";
+      var idName = "m"+ i + "-month-title";
       document.getElementById( idName ).setAttribute( "value" , titleMonthArray[i] );
    }
    
-   document.getElementById( "0-month-title" ).setAttribute( "value" , titleMonthArray[0] + " " + newYear );
+   document.getElementById( "m0-month-title" ).setAttribute( "value" , titleMonthArray[0] + " " + newYear );
    
    var categoriesStringBundle = srGetStrBundle("chrome://calendar/locale/calendar.properties");
    var defaultWeekStart = categoriesStringBundle.GetStringFromName("defaultWeekStart" );
diff --git a/calendar/resources/content/monthView.xul b/calendar/resources/content/monthView.xul
index 3695b99e7b2..1b1a4ce58d2 100644
--- a/calendar/resources/content/monthView.xul
+++ b/calendar/resources/content/monthView.xul
@@ -79,25 +79,25 @@
 	    <vbox id="month-title-container" flex="1">
 		<hbox id="month-title-box" flex="1">
 		    <vbox class="month-title-label-box" flex="1">
-			<label id="-2-month-title" onclick="gCalendarWindow.goToPrevious( 2 )"/>
+			<label id="m-2-month-title" onclick="gCalendarWindow.goToPrevious( 2 )"/>
 		    </vbox>
 		    <vbox class="month-title-label-box" flex="1">
-			<label id="-1-month-title" onclick="gCalendarWindow.goToPrevious( 1 )"/>
+			<label id="m-1-month-title" onclick="gCalendarWindow.goToPrevious( 1 )"/>
 		    </vbox>
 		    <vbox class="month-title-label-box" flex="1">
-			<label id="0-month-title" />
+			<label id="m0-month-title" />
 		    </vbox>
 		    <vbox class="month-title-label-box" flex="1">
-			<label id="1-month-title" onclick="gCalendarWindow.goToNext( 1 )"/>
+			<label id="m1-month-title" onclick="gCalendarWindow.goToNext( 1 )"/>
 		    </vbox>
 		    <vbox class="month-title-label-box" flex="1">
-			<label id="2-month-title" onclick="gCalendarWindow.goToNext( 2 )"/>
+			<label id="m2-month-title" onclick="gCalendarWindow.goToNext( 2 )"/>
 		    </vbox>
 	        </hbox>
 <!-- Eric modification : the year is now included in the 0-month-title by the JS file
 		<hbox id="year-title-box" flex="1">
 		    <vbox class="month-title-label-box" flex="1">
-   			<label id="0-year-title"/>
+   			<label id="m0-year-title"/>
 		    </vbox>
 		</hbox>
 -->
diff --git a/calendar/resources/skin/classic/calendar.css b/calendar/resources/skin/classic/calendar.css
index 67ced582c16..f3edd75ee79 100644
--- a/calendar/resources/skin/classic/calendar.css
+++ b/calendar/resources/skin/classic/calendar.css
@@ -483,7 +483,7 @@
     margin: 0px 15px 0px 15px;
 }
 
-#2-month-title, #-2-month-title
+#m2-month-title, #m-2-month-title
 {
     font-size:1.2em;
     color: #9FBEC8;
@@ -491,14 +491,14 @@
     padding:0px;
     cursor:pointer;
 }
-#1-month-title, #-1-month-title
+#m1-month-title, #m-1-month-title
 {
     font-size:1.5em;
     color: #9FBEC8;
     cursor:pointer;
 }
 
-#0-month-title, #0-year-title
+#m0-month-title, #m0-year-title
 {
     font-size:2.0em;
     color: #3f7d91;
@@ -809,7 +809,7 @@
     margin: 0px 15px 0px 15px;
 }
 
-#2-day-title, #-2-day-title, #1-day-specific-title, #-1-day-specific-title
+#d2-day-title, #d-2-day-title, #d1-day-specific-title, #d-1-day-specific-title
 {
     font-size:1.2em;
     color: #9FBEC8;
@@ -818,20 +818,20 @@
     cursor:pointer;
 }
 
-#1-day-title, #-1-day-title
+#d1-day-title, #d-1-day-title
 {
     font-size:1.5em;
     color: #9FBEC8;
     cursor:pointer;
 }
 
-#0-day-specific-title
+#d0-day-specific-title
 {
     font-size:1.2em;
     color: #3f7d91;
 }
 
-#0-day-title
+#d0-day-title
 {
     font-size:2.0em;
     color: #3f7d91;
diff --git a/calendar/resources/skin/modern/calendar.css b/calendar/resources/skin/modern/calendar.css
index 39bd8479fb4..090e9aa5bb9 100644
--- a/calendar/resources/skin/modern/calendar.css
+++ b/calendar/resources/skin/modern/calendar.css
@@ -476,7 +476,7 @@
     margin: 0px 15px 0px 15px;
 }
 
-#2-month-title, #-2-month-title
+#m2-month-title, #m-2-month-title
 {
     font-size:1.2em;
     color: #9FBEC8;
@@ -484,14 +484,14 @@
     padding:0px;
     cursor:pointer;
 }
-#1-month-title, #-1-month-title
+#m1-month-title, #m-1-month-title
 {
     font-size:1.5em;
     color: #9FBEC8;
     cursor:pointer;
 }
 
-#0-month-title, #0-year-title
+#m0-month-title, #m0-year-title
 {
     font-size:2.0em;
     color: #3f7d91;
@@ -802,7 +802,7 @@
     margin: 0px 15px 0px 15px;
 }
 
-#2-day-title, #-2-day-title, #1-day-specific-title, #-1-day-specific-title
+#d2-day-title, #d-2-day-title, #d1-day-specific-title, #d-1-day-specific-title
 {
     font-size:1.2em;
     color: #9FBEC8;
@@ -811,20 +811,20 @@
     cursor:pointer;
 }
 
-#1-day-title, #-1-day-title
+#d1-day-title, #d-1-day-title
 {
     font-size:1.5em;
     color: #9FBEC8;
     cursor:pointer;
 }
 
-#0-day-specific-title
+#d0-day-specific-title
 {
     font-size:1.2em;
     color: #3f7d91;
 }
 
-#0-day-title
+#d0-day-title
 {
     font-size:2.0em;
     color: #3f7d91;