diff --git a/calendar/resources/content/about.html b/calendar/resources/content/about.html
index 88b3d8442cd..ca0cbc87f28 100644
--- a/calendar/resources/content/about.html
+++ b/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 2002070410-cal</a>
+<a id="mozlink" href="http://www.mozilla.org/projects/calendar/" target="_new">Mozilla Calendar 2002071110-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/calendar/resources/content/alertDialog.js b/calendar/resources/content/alertDialog.js
index 395aed165c3..e5f3773e68e 100644
--- a/calendar/resources/content/alertDialog.js
+++ b/calendar/resources/content/alertDialog.js
@@ -146,7 +146,7 @@ function createAlarmBox( Event )
    var EventDescription = document.createTextNode( Event.description );
    OuterBox.getElementsByAttribute( "name", "Description" )[0].appendChild( EventDescription );
 
-   var startDate = new Date( Event.start.getTime() );
+   var startDate = getNextOrPreviousRecurrence( Event );
 
    var EventStartDate = document.createTextNode( getFormatedDate( startDate ) );
    OuterBox.getElementsByAttribute( "name", "StartDate" )[0].appendChild( EventStartDate );
diff --git a/calendar/resources/content/alertDialog.xul b/calendar/resources/content/alertDialog.xul
index 6e0b5cd5942..5d7e59d85a8 100644
--- a/calendar/resources/content/alertDialog.xul
+++ b/calendar/resources/content/alertDialog.xul
@@ -68,6 +68,7 @@
 <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
 <script type="application/x-javascript" src="chrome://calendar/content/dateUtils.js"/>
 <script type="application/x-javascript" src="chrome://calendar/content/calendarEventAlertDialog.js"/>
+<script type="application/x-javascript" src="chrome://calendar/content/calendarEvent.js"/>
 
 <!-- Picker popups -->
 
diff --git a/calendar/resources/content/calendarEventAlertDialog.js b/calendar/resources/content/calendarEventAlertDialog.js
index 395aed165c3..e5f3773e68e 100644
--- a/calendar/resources/content/calendarEventAlertDialog.js
+++ b/calendar/resources/content/calendarEventAlertDialog.js
@@ -146,7 +146,7 @@ function createAlarmBox( Event )
    var EventDescription = document.createTextNode( Event.description );
    OuterBox.getElementsByAttribute( "name", "Description" )[0].appendChild( EventDescription );
 
-   var startDate = new Date( Event.start.getTime() );
+   var startDate = getNextOrPreviousRecurrence( Event );
 
    var EventStartDate = document.createTextNode( getFormatedDate( startDate ) );
    OuterBox.getElementsByAttribute( "name", "StartDate" )[0].appendChild( EventStartDate );
diff --git a/calendar/resources/content/calendarEventAlertDialog.xul b/calendar/resources/content/calendarEventAlertDialog.xul
index 6e0b5cd5942..5d7e59d85a8 100644
--- a/calendar/resources/content/calendarEventAlertDialog.xul
+++ b/calendar/resources/content/calendarEventAlertDialog.xul
@@ -68,6 +68,7 @@
 <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
 <script type="application/x-javascript" src="chrome://calendar/content/dateUtils.js"/>
 <script type="application/x-javascript" src="chrome://calendar/content/calendarEventAlertDialog.js"/>
+<script type="application/x-javascript" src="chrome://calendar/content/calendarEvent.js"/>
 
 <!-- Picker popups -->
 
diff --git a/calendar/resources/content/calendarWindow.js b/calendar/resources/content/calendarWindow.js
index 827cd592b55..1245d5307c1 100644
--- a/calendar/resources/content/calendarWindow.js
+++ b/calendar/resources/content/calendarWindow.js
@@ -106,11 +106,11 @@ function CalendarWindow( calendarDataSource )
    {
       case "1":
          this.currentView = this.weekView;
-
+         document.getElementById( "week-tree-hour-0" ).focus();
          break;
       case "2":
          this.currentView = this.dayView;
-
+         document.getElementById( "day-tree-item-0" ).focus();
          break;
       default:
          this.currentView = this.monthView;