diff --git a/calendar/resources/content/calendar.js b/calendar/resources/content/calendar.js
index ffd89f3842a..7bde38c3f98 100644
--- a/calendar/resources/content/calendar.js
+++ b/calendar/resources/content/calendar.js
@@ -679,3 +679,15 @@ function selectAllEvents()
 {
    gCalendarWindow.EventSelection.setArrayToSelection( gCalendarWindow.eventSource.getCurrentEvents() );
 }
+
+
+function deleteToDoCommand( event )
+{
+   alert( event.originalTarget.getAttribute( "id" ) );
+}
+
+
+function closeCalendar()
+{
+   self.close();
+}
diff --git a/calendar/resources/content/calendar.xul b/calendar/resources/content/calendar.xul
index 80c21222568..54e066559de 100644
--- a/calendar/resources/content/calendar.xul
+++ b/calendar/resources/content/calendar.xul
@@ -82,7 +82,6 @@
  
 <commandset id="calendar_commands">
    <command id="new_command" oncommand="newEventCommand()"/>
-   <command id="new_todo_command" oncommand="newToDoCommand()"/>
    <command id="delete_command" oncommand="unifinderDeleteCommand( true )" disabled="true"/>
    <command id="modify_command" oncommand="unifinderEditCommand()" disabled="true"/>
    <command id="send_event_command" oncommand="sendEvent()" disabled="true"/>
@@ -91,6 +90,9 @@
    <command id="paste_command" oncommand="pasteFromClipboard()"/>
    <command id="select_all_command" oncommand="selectAllEvents()"/>
    
+   <command id="new_todo_command" oncommand="newToDoCommand()"/>
+   <command id="delete_todo_command" oncommand="deleteToDoCommand( event )"/>
+
    <command id="next_command" oncommand="gCalendarWindow.currentView.goToNext()"/>
    <command id="previous_command" oncommand="gCalendarWindow.currentView.goToPrevious()"/>
    <command id="go_today_command" oncommand="gCalendarWindow.goToToday()"/>
@@ -101,6 +103,8 @@
    
    <command id="import_command" oncommand="loadEventsFromFile()"/>
    <command id="export_command" oncommand="saveEventsToFile()"/>
+   
+   <command id="close_calendar_command" oncommand="closeCalendar()"/>
 </commandset>
 
 <keyset>
@@ -237,8 +241,8 @@
             </box>
             <listbox id="unifinder-search-results-listbox" seltype="multiple" onselect="unifinderClickEvent( this )" 
                class="unifinder-tree-class" flex="1" ondragover="return( false );"/>
-         <splitter collapse="after" persist="state hidden collapsed left"
-          class="chromeclass-extrachrome" orient="vertical">
+            <splitter collapse="after" persist="state hidden collapsed left"
+               class="chromeclass-extrachrome" orient="vertical">
                <grippy/>
             </splitter>
             <vbox flex="1">
diff --git a/calendar/resources/content/calendarMenuOverlay.xul b/calendar/resources/content/calendarMenuOverlay.xul
index 6eeb8368333..c7c11bcf263 100644
--- a/calendar/resources/content/calendarMenuOverlay.xul
+++ b/calendar/resources/content/calendarMenuOverlay.xul
@@ -104,6 +104,8 @@
          <menuitem id="unifinder-modify-menu"   key="modify_event_key" label="&event.edit.event;" observes="modify_command"/>
          <menuseparator/>
          <menuitem id="calendar-mail-event" observes="send_event_command" label="&event.mail.event;"/>
+         <menuseparator/>
+         <menuitem id="calendar-close" observes="close_calendar_command" label="&calendar.menu.options.close;"/>
       </menupopup>
    </menu>
 
diff --git a/calendar/resources/content/menuOverlay.xul b/calendar/resources/content/menuOverlay.xul
index 6eeb8368333..c7c11bcf263 100644
--- a/calendar/resources/content/menuOverlay.xul
+++ b/calendar/resources/content/menuOverlay.xul
@@ -104,6 +104,8 @@
          <menuitem id="unifinder-modify-menu"   key="modify_event_key" label="&event.edit.event;" observes="modify_command"/>
          <menuseparator/>
          <menuitem id="calendar-mail-event" observes="send_event_command" label="&event.mail.event;"/>
+         <menuseparator/>
+         <menuitem id="calendar-close" observes="close_calendar_command" label="&calendar.menu.options.close;"/>
       </menupopup>
    </menu>
 
diff --git a/calendar/resources/locale/en-US/calendar.dtd b/calendar/resources/locale/en-US/calendar.dtd
index 44141a53917..e7c05749fd0 100644
--- a/calendar/resources/locale/en-US/calendar.dtd
+++ b/calendar/resources/locale/en-US/calendar.dtd
@@ -159,8 +159,9 @@
 <!ENTITY calendar.weekview.button.label         "Week View" >
 <!ENTITY calendar.monthview.button.label        "Month View" >
 
-<!ENTITY calendar.menu.options.modify        "Edit" >
-<!ENTITY calendar.menu.options.remove        "Delete" >
+<!ENTITY calendar.menu.options.modify       "Edit" >
+<!ENTITY calendar.menu.options.remove       "Delete" >
+<!ENTITY calendar.menu.options.close        "Close Calendar" >
 
 <!ENTITY calendar.main.tab.label        "Events" >
 <!ENTITY calendar.search.tab.label			        "Search">