Merge commit 'origin/kill-bonobo'

17 files changed, 747 insertions, 1448 deletions

diff --git a/ui/Makefile.am b/ui/Makefile.am
index 40a5ad2d3e..a57b470dca 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -1,18 +1,16 @@
-XML_FILES =					\
-	evolution.xml				\
-	evolution-addressbook.xml		\
-	evolution-calendar.xml			\
-	evolution-mail-message.xml		\
-	evolution-mail-list.xml			\
-	evolution-mail-global.xml		\
-	evolution-mail-messagedisplay.xml	\
-	evolution-memos.xml			\
-	evolution-tasks.xml
+UI_FILES =					\
+	evolution-calendars.ui			\
+	evolution-contacts.ui			\
+	evolution-mail.ui			\
+	evolution-mail-reader.ui		\
+	evolution-memos.ui			\
+	evolution-shell.ui			\
+	evolution-tasks.ui
 
-evolutionui_DATA = $(XML_FILES)
+evolutionui_DATA = $(UI_FILES)
 
 EXTRA_DIST =					\
-	$(XML_FILES)				\
+	$(UI_FILES)				\
 	ChangeLog.pre-1-4
 
 -include $(top_srcdir)/git.mk
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
deleted file mode 100644
index f28172e436..0000000000
--- a/ui/evolution-addressbook.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<Root>
-  <commands>
-
-    <cmd name="ContactDelete"
-	 _tip="Delete selected contacts"
-	 accel="*Control*d" pixtype="pixbuf"/>
-
-    <cmd name="ContactsPrint"
-	 _tip="Print selected contacts"
-	 accel="*Control*p" pixtype="pixbuf"/>
-
-    <cmd name="ContactsPrintPreview"
-	 _tip="Previews the contacts to be printed"
-         pixtype="pixbuf"/>
-
-    <cmd name="ContactsView"
-	 _tip="View the current contact"
-	 accel="*Control*o"/>
-
-    <cmd name="ContactStop"
-	 _tip="Stop Loading"
-	 pixtype="stock" pixname="gtk-stop"/>
-
-    <cmd name="ContactsCut" _label="Cut"
-	 _tip="Cut the selection"
-	 accel="*Control*x" pixtype="pixbuf"/>
-
-    <cmd name="ContactsCopy" _label="Copy"
-	 _tip="Copy the selection"
-	 accel="*Control*c" pixtype="pixbuf"/>
-
-    <cmd name="ContactsPaste" _label="Paste"
-	 _tip="Paste the clipboard"
-	 accel="*Control*v" pixtype="pixbuf"/>
-
-    <cmd name="ContactsSelectAll" _label="Select All"
-	 _tip="Select all contacts" accel="*Control*a"
-	 pixtype="stock" pixname="gtk-select-all"/>
-
-    <cmd name="ContactsSaveAsVCard" _label="Save as VCard..."
-	 _tip="Save selected contacts as a VCard"
-	 accel="*Control*s" pixtype="pixbuf"/>
-
-    <cmd name="ContactsSendContactToOther" _label="Forward Contact"
-	 _tip="Send selected contacts to another person"
-	 pixtype="pixbuf"/>
-
-    <cmd name="ContactsSendMessageToContact" _label="Send message to contact"
-	 _tip="Send a message to the selected contacts"
-	 pixtype="pixbuf"/>
-
-    <cmd name="ContactsCopyToFolder" _label="Copy to Folder..."
-	 _tip="Copy selected contacts to another folder"
-	 accel="*Control**Shift*y"/>
-
-    <cmd name="ContactsMoveToFolder" _label="Move to Folder..."
-	 _tip="Move selected contacts to another folder"
-	 accel="*Control**Shift*v"/>
-
-    <cmd name="ContactsViewPreview" _label="Contact _Preview"
-	 _tip="Show contact preview window"
-	 accel="*Control*m"
-	 type="toggle"/>
- 
-    <cmd name="FolderCreate" _label="_New"
-         _tip="Create a new address book folder"
-	 pixtype="pixbuf"/>
-
-    <cmd name="FolderCopy" _label="_Copy Folder Contacts To"
-	 _tip="Copy the contacts of the selected folder into another folder" 
-	 pixtype="pixbuf"/>  
- 
-    <cmd name="FolderMove" _label="_Move Folder Contacts To"
-	 _tip="Move the contacts of the selected folder into another folder" 
-	 pixtype="pixbuf"/>  
-
-    <cmd name="FolderSave" _label="_Save Folder Contacts As VCard"
-	 _tip="Save the contacts of the selected folder as VCard"
-	 pixtype="pixbuf"/>   
-
-    <cmd name="FolderDelete" _label="_Delete"
-	 _tip="Delete the selected folder"
-	 pixtype="pixbuf"/>
-
-    <cmd name="FolderRename" _label="_Rename"
-	 _tip="Rename the selected folder"
-	 pixtype="pixbuf"
-	 accel="F2"/>   
-
-    <cmd name="ChangeFolderProperties" _label="_Properties"
-	 _tip="Change the properties of the selected folder"
-	 pixtype="pixbuf"/>   
-
-  </commands>
-
-  <menu>
-    <submenu name="File">
-      <placeholder name="FileOps">
-	<menuitem name="ContactsView"
-		  verb="" _label="_Open"/>
-	<menuitem name="ContactsSaveAsVCard"
-		  verb="" _label="_Save Contact as VCard..."/>
-	<menuitem name="FolderSave" 
-		  verb="" _label="S_ave Address Book As VCard"/>
-      </placeholder>
-
-      <placeholder name="Print">
-	<menuitem name="ContactsPrintPreview" verb="" _label="Print Pre_view"/>
-	<menuitem name="ContactsPrint" verb="" _label="_Print..."/>
-      </placeholder>
-
-    </submenu>
-
-    <submenu name="View" _label="_View">
-      <menuitem name="ContactsViewPreview" verb="" _label="Contact _Preview"/>
-    </submenu>
-
-    <submenu name="Edit" _label="_Edit">
-      <placeholder name="EditPlaceholder">
-	<menuitem name="ContactsSelectAll" verb="" _label="Select _All"/>
-
-	<separator f="" name="eadbk2"/>
-
-	<menuitem name="ContactsCut" verb="" _label="C_ut"/>
-	
-	<menuitem name="ContactsCopy" verb="" _label="_Copy"/>
-	
-	<menuitem name="ContactsPaste" verb="" _label="_Paste"/>
-
-	<separator f="" name="eadbk6"/>
-
-	<menuitem name="ContactDelete" verb="" _label="_Delete Contact"/>
-	
-	<menuitem name="FolderDelete" verb="" _label="Del_ete Address Book"/>
-      </placeholder>
-    </submenu>
-
-    <placeholder name="FolderPlaceholder">
-    </placeholder>      
-
-    <placeholder name="ActionsPlaceholder">
-      <submenu name="Actions" _label="_Actions">
-	<menuitem name="ContactsSendContactToOther"
-		  _label="_Forward Contact..." verb=""/>
-
-	<menuitem name="ContactsSendMessageToContact"
-		  _label="_Send Message to Contact..." verb=""/>
-	<menuitem name="ContactActionStop" verb="ContactStop" _label="St_op"/>
-
-	<separator f="" name="eadbk5"/>
-
-	<menuitem name="ContactsCopyToFolder" _label="_Copy Contact to..." verb=""/>
-	<menuitem name="ContactsMoveToFolder" _label="_Move Contact to..." verb=""/>
-	
-	<separator f="" name="eadbk4"/>
-
-	<menuitem name="FolderCopy" verb="" _label="Co_py All Contacts To..."/>
-
-	<menuitem name="FolderMove" verb="" _label="Mo_ve All Contacts To..."/>
-
-	<separator f="" name="eadbk3"/>
-
-	<menuitem name="ChangeFolderProperties" verb="" _label="Address _Book Properties"/>
-
-      </submenu>
-    </placeholder>
-
-  </menu>
-
-  <dockitem name="Toolbar">
-    <toolitem name="ContactsPrint" verb=""
-	      _label="Print" pixtype="pixbuf"/>
-
-    <toolitem name="ContactDelete" verb=""
-	      _label="Delete" pixtype="pixbuf"/>
-
-    <toolitem name="ContactStop" verb=""
-	      _label="Stop"/>
-
-  </dockitem>
-
-  <keybindings>
-    <accel name="Delete" verb="ContactDelete"/>
-    <accel name="BackSpace" verb="ContactDelete"/>
-    <accel name="F16" verb="ContactsCopy"/>
-    <accel name="F18" verb="ContactsPaste"/>
-    <accel name="F20" verb="ContactsCut"/>
-  </keybindings>
-
-</Root>
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
deleted file mode 100644
index 36aa0df0ef..0000000000
--- a/ui/evolution-calendar.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<Root>
-  <commands>
-    <cmd name="EventOpen" _tip="View the current appointment" accel="*Control*o"/>
-    <cmd name="CalendarPrint" _tip="Print this calendar" pixtype="pixbuf"
-	 accel="*Control*p"/>
-    <cmd name="CalendarPrintPreview" _tip="Previews the calendar to be printed" pixtype="pixbuf"/>
-
-    <cmd name="CalendarPrev" _tip="Go back" pixtype="pixbuf"/>
-    <cmd name="CalendarToday" _tip="Select today" pixtype="pixbuf"/>
-    <cmd name="CalendarNext" _tip="Go forward" pixtype="pixbuf"/>
-    <cmd name="CalendarGoto" _tip="Select a specific date" pixtype="pixbuf"/>
-
-    <cmd name="ShowDayView" _tip="Show one day" pixtype="pixbuf"/>
-    <cmd name="ShowWorkWeekView" _tip="Show the working week" pixtype="pixbuf"/>
-    <cmd name="ShowWeekView" _tip="Show one week" pixtype="pixbuf"/>
-    <cmd name="ShowMonthView" _tip="Show one month" pixtype="pixbuf"/>
-    <cmd name="ShowListView" _tip="Show as list" pixtype="pixbuf"/>
-
-    <cmd name="Cut" _tip="Cut the selection" accel="*Control*x" pixtype="pixbuf"/>
-    <cmd name="Copy" _tip="Copy the selection" accel="*Control*c" pixtype="pixbuf"/>
-    <cmd name="Paste" _tip="Paste the clipboard" accel="*Control*v" pixtype="pixbuf"/>
-
-    <cmd name="Delete" _tip="Delete the appointment" accel="*Control*d" pixtype="pixbuf"/>
-    <cmd name="DeleteOccurrence" _tip="Delete this occurrence" pixtype="pixbuf"/>
-    <cmd name="DeleteAllOccurrences" _tip="Delete all occurrences" pixtype="pixbuf"/>
-    
-    <cmd name="CalendarPurge" _label="Purg_e" _tip="Purge old appointments and meetings" accel="*Control*e"/>
-    <cmd name="HelpDebug" _tip="View the debug console for log messages"/>
-  </commands>
-
-  <menu>
-    <submenu name="File">
-      <placeholder name="FileOps">
-        <menuitem name="EventOpen" verb="EventOpen" _label="_Open Appointment"/>
-      </placeholder>
-      <placeholder name="Print">
-	<menuitem name="PrintPreview" verb="CalendarPrintPreview"
-		  _label="Print Pre_view"/>
-
-	<menuitem name="Print" verb="CalendarPrint" accel="*Control*p"
-		  _label="_Print..."/>
-      </placeholder>
-
-    </submenu>
-
-    <submenu name="Edit" _label="_Edit">
-      <placeholder name="EditPlaceholder">
-      	<menuitem name="Cut" verb="" _label="C_ut"/>
-      	<menuitem name="Copy" verb="" _label="_Copy"/>
-      	<menuitem name="Paste" verb="" _label="_Paste"/>
-
-      	<separator/>
-
-      	<menuitem name="Delete" verb="" _label="_Delete"/>
-	<menuitem name="DeleteOccurrence" verb="" _label="Delete this _Occurrence"/>
-	<menuitem name="DeleteAllOccurrences" verb="" _label="Delete _all Occurrences"/>
-      </placeholder>
-    </submenu>
-
-    <submenu name="View">
-      <placeholder name="ViewBegin">
-	<menuitem name="Today" verb="CalendarToday" _label="Select _Today"
-                  accel="*Control*t"/>
-	<menuitem name="Goto" verb="CalendarGoto" _label="Select _Date" accel="*Control*g"/>
-	<separator f="" name="ecal"/>
-      </placeholder>
-
-     </submenu>
-
-    <placeholder name="ActionsPlaceholder">
-    <submenu name="Actions" _label="_Actions">
-	<menuitem name="CalendarPurge" verb=""/>
-    </submenu>
-    </placeholder>
-    <submenu name="Help" _label="_Help">
-            <placeholder name="PlaceHolderDebug">
-                    <menuitem name="HelpDebug" verb="" _label="_Debug Logs"/>
-            </placeholder>
-   </submenu>
-  </menu>
-
-  <dockitem name="Toolbar">
-  
-    <toolitem name="Print" verb="CalendarPrint" _label="Print" pixtype="pixbuf"/>
-    <toolitem name="Delete" verb="" _label="Delete" pixtype="pixbuf"/>
-
-    <separator f="" name="ecal2"/>
-
-    <toolitem name="Prev" verb="CalendarPrev" _label="Previous" pixtype="pixbuf"/> 
-    <toolitem name="Today" verb="CalendarToday" _label="Today" pixtype="pixbuf"/>
-    <toolitem name="Next" verb="CalendarNext" _label="Next" pixtype="pixbuf"/>
-
-    <separator f="" name="ecal3"/>
-
-    <toolitem name="Goto" verb="CalendarGoto" _label="Go To" priority="1" pixtype="pixbuf"/>
-
-    <separator f="" name="ecal4"/>
-
-    <toolitem name="DayView" verb="ShowDayView" _label="Day" priority="1" pixtype="pixbuf"/>
-    <toolitem name="WorkWeekView" verb="ShowWorkWeekView" _label="Work Week" priority="1" pixtype="pixbuf"/>
-    <toolitem name="WeekView" verb="ShowWeekView" _label="Week" priority="1" pixtype="pixbuf"/>
-    <toolitem name="MonthView" verb="ShowMonthView" _label="Month" priority="1" pixtype="pixbuf"/>
-    <toolitem name="ListView" verb="ShowListView" _label="List" priority="1" pixtype="pixbuf"/>
-
-  </dockitem>
-
-</Root>
diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
new file mode 100644
index 0000000000..267d6f07b1
--- /dev/null
+++ b/ui/evolution-calendars.ui
@@ -0,0 +1,137 @@
+<ui>
+  <menubar name='main-menu'>
+    <menu action='file-menu'>
+      <placeholder name='file-actions'>
+        <menuitem action='event-open'/>
+      </placeholder>
+      <placeholder name='print-actions'>
+        <menuitem action='calendar-print-preview'/>
+        <menuitem action='calendar-print'/>
+      </placeholder>
+    </menu>
+    <menu action='edit-menu'>
+      <placeholder name='edit-actions'>
+        <menuitem action='event-clipboard-cut'/>
+        <menuitem action='event-clipboard-copy'/>
+        <menuitem action='event-clipboard-paste'/>
+        <separator/>
+        <menuitem action='event-delete'/>
+        <menuitem action='event-delete-occurrence'/>
+        <menuitem action='event-delete-occurrence-all'/>
+      </placeholder>
+    </menu>
+    <menu action='view-menu'>
+      <menuitem action='calendar-go-today'/>
+      <menuitem action='calendar-jump-to'/>
+    </menu>
+    <placeholder name='custom-menus'>
+      <menu action='calendar-actions-menu'>
+        <menuitem action='calendar-purge'/>
+      </menu>
+    </placeholder>
+  </menubar>
+  <toolbar name='main-toolbar'>
+    <toolitem action='calendar-print'/>
+    <toolitem action='event-delete'/>
+    <separator/>
+    <toolitem action='calendar-go-back'/>
+    <toolitem action='calendar-go-today'/>
+    <toolitem action='calendar-go-forward'/>
+    <separator/>
+    <toolitem action='calendar-jump-to'/>
+    <separator/>
+    <toolitem action='calendar-view-day'/>
+    <toolitem action='calendar-view-workweek'/>
+    <toolitem action='calendar-view-week'/>
+    <toolitem action='calendar-view-month'/>
+    <toolitem action='calendar-view-list'/>
+  </toolbar>
+  <popup name='calendar-popup'>
+    <menuitem action='calendar-new'/>
+    <menuitem action='calendar-popup-copy'/>
+    <menuitem action='calendar-popup-rename'/>
+    <separator/>
+    <menuitem action='calendar-popup-delete'/>
+    <menuitem action='calendar-popup-select-one'/>
+    <separator/>
+    <menuitem action='calendar-popup-properties'/>
+  </popup>
+  <popup name='calendar-empty-popup'>
+    <menuitem action='event-new'/>
+    <menuitem action='event-all-day-new'/>
+    <menuitem action='event-meeting-new'/>
+    <menuitem action='task-new'/>
+    <separator/>
+    <menuitem action='event-popup-print'/>
+    <separator/>
+    <menuitem action='event-popup-clipboard-paste'/>
+    <separator/>
+    <menuitem action='gal-view-menu'/>
+    <menuitem action='calendar-popup-go-today'/>
+    <menuitem action='calendar-popup-jump-to'/>
+  </popup>
+  <popup name='calendar-event-popup'>
+    <menuitem action='event-popup-open'/>
+    <menuitem action='event-popup-save-as'/>
+    <menuitem action='event-popup-print'/>
+    <separator/>
+    <menuitem action='event-popup-clipboard-cut'/>
+    <menuitem action='event-popup-clipboard-copy'/>
+    <menuitem action='event-popup-clipboard-paste'/>
+    <separator/>
+    <menuitem action='event-popup-copy'/>
+    <menuitem action='event-popup-move'/>
+    <menuitem action='event-popup-delegate'/>
+    <menuitem action='event-popup-schedule'/>
+    <menuitem action='event-popup-forward'/>
+    <menuitem action='event-popup-reply'/>
+    <menuitem action='event-popup-reply-all'/>
+    <separator/>
+    <menuitem action='event-popup-occurrence-movable'/>
+    <menuitem action='event-popup-delete'/>
+    <menuitem action='event-popup-delete-occurrence'/>
+    <menuitem action='event-popup-delete-occurrence-all'/>
+  </popup>
+  <popup name='calendar-memopad-popup'>
+    <menuitem action='calendar-memopad-new'/>
+    <separator/>
+    <menuitem action='calendar-memopad-open'/>
+    <menuitem action='calendar-memopad-open-url'/>
+    <menuitem action='calendar-memopad-save-as'/>
+    <menuitem action='calendar-memopad-print'/>
+    <separator/>
+    <menuitem action='calendar-memopad-clipboard-cut'/>
+    <menuitem action='calendar-memopad-clipboard-copy'/>
+    <menuitem action='calendar-memopad-clipboard-paste'/>
+    <separator/>
+    <menuitem action='calendar-memopad-forward'/>
+    <separator/>
+    <menuitem action='calendar-memopad-delete'/>
+  </popup>
+  <popup name='calendar-taskpad-popup'>
+    <menuitem action='calendar-taskpad-new'/>
+    <separator/>
+    <menuitem action='calendar-taskpad-open'/>
+    <menuitem action='calendar-taskpad-open-url'/>
+    <menuitem action='calendar-taskpad-save-as'/>
+    <menuitem action='calendar-taskpad-print'/>
+    <separator/>
+    <menuitem action='calendar-taskpad-clipboard-cut'/>
+    <menuitem action='calendar-taskpad-clipboard-copy'/>
+    <menuitem action='calendar-taskpad-clipboard-paste'/>
+    <separator/>
+    <menuitem action='calendar-taskpad-assign'/>
+    <menuitem action='calendar-taskpad-forward'/>
+    <menuitem action='calendar-taskpad-mark-complete'/>
+    <menuitem action='calendar-taskpad-mark-incomplete'/>
+    <separator/>
+    <menuitem action='calendar-taskpad-delete'/>
+  </popup>
+  <popup name='calendar-search-options'>
+    <menuitem action='calendar-search-summary-contains'/>
+    <menuitem action='calendar-search-description-contains'/>
+    <menuitem action='calendar-search-any-field-contains'/>
+    <separator/>
+    <menuitem action='search-advanced'/>
+  </popup>
+</ui>
diff --git a/ui/evolution-contacts.ui b/ui/evolution-contacts.ui
new file mode 100644
index 0000000000..cf95acd4a0
--- /dev/null
+++ b/ui/evolution-contacts.ui
@@ -0,0 +1,92 @@
+<ui>
+  <menubar name='main-menu'>
+    <menu action='file-menu'>
+      <placeholder name='file-actions'>
+        <menuitem action='contact-open'/>
+        <menuitem action='contact-save-as'/>
+        <menuitem action='address-book-save-as'/>
+      </placeholder>
+      <placeholder name='print-actions'>
+        <menuitem action='contact-print-preview'/>
+        <menuitem action='contact-print'/>
+      </placeholder>
+    </menu>
+    <menu action='edit-menu'>
+      <placeholder name='edit-actions'>
+        <menuitem action='contact-select-all'/>
+        <separator/>
+        <menuitem action='contact-clipboard-cut'/>
+        <menuitem action='contact-clipboard-copy'/>
+        <menuitem action='contact-clipboard-paste'/>
+        <separator/>
+        <menuitem action='contact-delete'/>
+        <menuitem action='address-book-delete'/>
+      </placeholder>
+    </menu>
+    <menu action='view-menu'>
+      <placeholder name='view-custom-menus'>
+        <menu action='contact-preview-menu'>
+          <menuitem action='contact-preview'/>
+          <separator/>
+          <menuitem action='contact-view-classic'/>
+          <menuitem action='contact-view-vertical'/>
+        </menu>
+      </placeholder>
+    </menu>
+    <placeholder name='custom-menus'>
+      <menu action='contact-actions-menu'>
+        <menuitem action='contact-forward'/>
+        <menuitem action='contact-send-message'/>
+        <menuitem action='address-book-stop'/>
+        <separator/>
+        <menuitem action='contact-copy'/>
+        <menuitem action='contact-move'/>
+        <separator/>
+        <menuitem action='address-book-copy'/>
+        <menuitem action='address-book-move'/>
+        <separator/>
+        <menuitem action='address-book-properties'/>
+      </menu>
+    </placeholder>
+  </menubar>
+  <toolbar name='main-toolbar'>
+    <toolitem action='contact-print'/>
+    <toolitem action='contact-delete'/>
+    <toolitem action='address-book-stop'/>
+  </toolbar>
+  <popup name='address-book-popup'>
+    <menuitem action='address-book-new'/>
+    <menuitem action='address-book-popup-rename'/>
+    <menuitem action='address-book-popup-save-as'/>
+    <separator/>
+    <menuitem action='address-book-popup-delete'/>
+    <separator/>
+    <menuitem action='address-book-popup-properties'/>
+  </popup>
+  <popup name='contact-popup'>
+    <menuitem action='contact-popup-open'/>
+    <separator/>
+    <menuitem action='contact-new'/>
+    <menuitem action='contact-new-list'/>
+    <separator/>
+    <menuitem action='contact-popup-save-as'/>
+    <menuitem action='contact-popup-forward'/>
+    <menuitem action='contact-popup-send-message'/>
+    <menuitem action='contact-popup-print'/>
+    <separator/>
+    <menuitem action='contact-popup-copy'/>
+    <menuitem action='contact-popup-move'/>
+    <separator/>
+    <menuitem action='contact-popup-clipboard-cut'/>
+    <menuitem action='contact-popup-clipboard-copy'/>
+    <menuitem action='contact-popup-clipboard-paste'/>
+    <menuitem action='contact-popup-delete'/>
+  </popup>
+  <popup name='contact-search-options'>
+    <menuitem action='contact-search-name-contains'/>
+    <menuitem action='contact-search-email-begins-with'/>
+    <menuitem action='contact-search-any-field-contains'/>
+    <separator/>
+    <menuitem action='search-advanced'/>
+  </popup>
+</ui>
diff --git a/ui/evolution-mail-global.xml b/ui/evolution-mail-global.xml
deleted file mode 100644
index c582cd6b62..0000000000
--- a/ui/evolution-mail-global.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<Root>
-
-  <commands>   <!-- Alphabetical by name, yo -->
-
-    <cmd name="EmptyTrash"
-     _tip="Permanently remove all deleted messages from all folders"/>
-
-    <cmd name="MailStop"
-     _tip="Cancel the current mail operation"
-     pixtype="stock" pixname="gtk-stop"/>
-
-    <cmd name="FolderCreate"
-     _tip="Create a new folder for storing mail"
-     pixtype="pixbuf"/>
-
-    <cmd name="FolderCopy"
-     _tip="Copy the selected folder into another folder"
-     pixtype="pixbuf"/>
-
-    <cmd name="FolderMove"
-     _tip="Move the selected folder into another folder"
-     pixtype="pixbuf"/>
-
-    <cmd name="ToolsFilters"
-     _tip="Create or edit rules for filtering new mail"/>
-
-    <cmd name="ToolsSubscriptions"
-     _tip="Subscribe or unsubscribe to folders on remote servers"/>
-
-    <cmd name="ToolsVFolders"
-     _tip="Create or edit Search Folder definitions"/>
-
-    <cmd name="ViewPreview"
-     _tip="Show message preview window"
-     accel="*Control*m"
-     type="toggle"/>
-
-    <cmd name="ViewBelow" _label="_Classic View" 
-      type="radio" group="preview_display" _tip="Show message preview below the message list"/>
-
-    <cmd name="ViewAfter" _label="_Vertical View" 
-     type="radio" group="preview_display" _tip="Show message preview side-by-side with the message list"/>
-
-    <cmd name="PrepareForOffline" _label="_Download Messages for Offline Usage" _tip="Download messages of accounts/folders marked for offline"/>
-    <cmd name="HelpDebug" _tip="View the debug console for log messages"/>
-
-  </commands>
-
-  <keybindings>
-	  <accel name="slash" id="FocusSearch"/>
-  </keybindings>
-
-  <menu>
-
-    <submenu name="File">
-      <placeholder name="EmptyTrashPlaceholder">
-      <menuitem name="EmptyTrash" verb="" _label="Empty _Trash"/>
-      <menuitem name="PrepareForOffline" verb="" _label="_Download Messages for Offline Usage"/>
-     </placeholder>
-    </submenu>
-
-    <submenu name="View" _label="_View">
-      <placeholder name="ViewPreview">	    
-      <submenu name="Preview" _label="_Preview">	    
-        <menuitem name="ViewPreview" verb="" _label="Show Message _Preview"/>
-	<separator name="previewsep"/>
-	<menuitem name="ViewBelow" id="ViewBelow" _label="_Classic View"/>
-	<menuitem name="ViewAfter" id="ViewAfter" _label="_Vertical View"/>
-      </submenu>
-      </placeholder>
-      <separator f="" name="emailglobal"/>
-      <placeholder name="MailMessageFilter"/>
-      <placeholder name="MailMessageView"/>
-
-<!-- This is the menu we want to replace "Current View" with
-      <submenu name="ViewAs" _label="Message _List As">
-        <placeholder name="CurrentView"/>
-      </submenu>
--->
-      
-      <placeholder name="MailViewType">
-        <separator f="" name="MailViewOps"/>
-      </placeholder>
-
-      <placeholder name="MailMessageZoom"/>
-      <placeholder name="MailListView"/>
-    </submenu>
-
-    <submenu name="Edit">
-      <placeholder name="EditPlaceholder">
-        <placeholder name="MailListEdit"/>
-        <placeholder name="MailMessageEdit"/>
-        <placeholder name="MailListEditFlags"/>
-      </placeholder>
-
-      <placeholder name="MailFilterTools">
-        <menuitem name="ToolsFilters" verb="" _label="_Message Filters"/>
-      </placeholder>
-
-      <placeholder name="MailVFolderTools">
-        <menuitem name="ToolsVFolders" verb="" _label="Search F_olders"/>
-      </placeholder>
-    </submenu>
-
-    <placeholder name="FolderPlaceholder">
-      <submenu name="Folder" _label="F_older">
-
-        <menuitem name="FolderCreate" verb="" _label="_New..."/>
-<!--
-        <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
--->
-        <menuitem name="ToolsSubscriptions" verb="" _label="_Subscriptions..."/>
-
- 	<separator f="" name="Folder1"/>
-
-        <menuitem name="FolderCopy" verb="" _label="_Copy Folder To..."/>
-        <menuitem name="FolderMove" verb="" _label="_Move Folder To..."/>
-
- 	<separator f="" name="Folder2"/>
-
-        <placeholder name="MessagesInFolder"/>
-
- 	<separator f="" name="Folder3"/>
-
- 	<placeholder name="FolderOps"/>        
-
-      </submenu>
-    </placeholder>
-    <submenu name="Help" _label="_Help">
-	    <placeholder name="PlaceHolderDebug">
-		    <menuitem name="HelpDebug" verb="" _label="_Debug Logs"/>
-	    </placeholder>
-   </submenu>
-  </menu>
-
-  <dockitem name="Toolbar">
-
-    <placeholder name="MailMessageToolbar"/>
-
-    <toolitem name="MailStop" verb=""
-     _label="Cancel"/>
-
-    <separator f="" name="emailglobal1"/>
-
-    <placeholder name="MailNextButtons"/>
-
-  </dockitem>
-
-</Root>
diff --git a/ui/evolution-mail-list.xml b/ui/evolution-mail-list.xml
deleted file mode 100644
index 95b62eb996..0000000000
--- a/ui/evolution-mail-list.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<Root>
-
-  <commands>   <!-- Alphabetical by name, yo -->
-
-    <cmd name="EditCut"
-     _tip="Cut selected message(s) to the clipboard"
-     accel="*Control*x" pixtype="pixbuf"/>
-
-    <cmd name="EditCopy"
-     _tip="Copy selected message(s) to the clipboard"
-     accel="*Control*c" pixtype="pixbuf"/>
-
-    <cmd name="EditPaste"
-     _tip="Paste message(s) from the clipboard"
-     accel="*Control*v" pixtype="pixbuf"/>
-
-    <cmd name="EditInvertSelection"
-     _tip="Select all and only the messages that are not currently selected"
-     accel="*Control**Shift*i"/>
-
-    <cmd name="EditSelectAll"
-     _tip="Select all visible messages"
-     accel="*Control*a"/>
-
-    <cmd name="EditSelectSubthread"
-     _tip="Select all replies to the currently selected message"
-     accel="*Control**Shift*h"/>
-
-    <cmd name="EditSelectThread"
-     _tip="Select all messages in the same thread as the selected message"
-     accel="*Control*h"/>
-
-    <cmd name="MessageMarkAllAsRead"
-     _tip="Mark all messages in the folder as read" accel="*Control*slash"
-     pixtype="pixbuf"/>
-
-    <cmd name="ChangeFolderProperties"
-     _tip="Change the properties of this folder"
-     pixtype="pixbuf"/>
-
-    <cmd name="FolderExpunge"
-     _tip="Permanently remove all deleted messages from this folder"
-     accel="*Control*e"/>
-
-    <cmd name="FolderDelete"
-     _tip="Permanently remove this folder"
-     pixtype="stock" pixname="gtk-delete"/>
-
-    <cmd name="FolderRename"
-     _tip="Change the name of this folder" accel="F2"/>
-     
-     <cmd name="FolderRefresh"
-     _tip="Refresh the folder" accel="F5"
-     pixtype="stock" pixname="gtk-refresh"/>
-
-
-    <cmd name="HideDeleted" _tip="Hide deleted messages rather than displaying them with a line through them"
-     type="toggle" />
-
-    <cmd name="ViewHideRead" _tip="Temporarily hide all messages that have already been read"
-     pixtype="pixbuf" />
-
-    <cmd name="ViewHideSelected" _tip="Temporarily hide the selected messages"
-     pixtype="pixbuf" />
-
-    <cmd name="ViewShowAll" _tip="Show messages that have been temporarily hidden"
-     pixtype="pixbuf" />
-
-    <cmd name="ViewThreaded"
-     _tip="Threaded Message list"
-     accel="*Control*t"
-     type="toggle" />
-
-    <cmd name="ViewThreadsCollapseAll"
-    _tip="Collapse all message threads" accel="*Control**Shift*b"/>
-
-    <cmd name="ViewThreadsExpandAll"
-    _tip="Expand all message threads"/>
-
-  </commands>
-
-  <keybindings>
-
-  </keybindings>
-
-  <menu>
-
-    <submenu name="View">
-
-      <placeholder name="MailMessageView">
-	      <menuitem name="ViewThreaded" verb="" _label="_Group By Threads"/>
-        <menuitem name="ViewThreadsExpandAll" verb="" _label="E_xpand All Threads"/>
-        <menuitem name="ViewThreadsCollapseAll" verb="" _label="Collapse All _Threads"/>
- 	<separator f="" name="emaillist"/>
-        <menuitem name="HideDeleted" verb="" _label="Hide _Deleted Messages"/>
-	<menuitem name="ViewHideSelected" verb="" _label="Hide S_elected Messages"/>
-	<menuitem name="ViewHideRead" verb="" _label="Hide _Read Messages"/>
-	<menuitem name="ViewShowAll" verb="" _label="Show Hidde_n Messages"/>
-      </placeholder>
-
-    </submenu>
-
-    <placeholder name="MessagePlaceholder">
-      <submenu name="Message" _label="_Message">
-        <placeholder name="MessageTopActions"/>
-
-        <separator f="" name="emailglobal"/>
-
-        <placeholder name="MessageNavigation"/>
-	<placeholder name="MailListActions"/>
-        <placeholder name="MailMessageActions"/>
-
-        <separator f="" name="emaillist5"/>
-
-        <placeholder name="MessageRuleCreate"/>
-
-      </submenu>
-    </placeholder>
-
-    <placeholder name="FolderPlaceholder">
-      <submenu name="Folder" _label="F_older">
-
-        <placeholder name="MessagesInFolder">
-          <menuitem name="EditSelectAll" verb="" _label="Select _All Messages"/>
-          <menuitem name="EditSelectThread" verb="" _label="Select Message _Thread"/>
-          <menuitem name="EditSelectSubthread" verb="" _label="Select Message S_ubthread"/>
-          <menuitem name="MessageMarkAllAsRead" verb="" _label="Mar_k All Messages as Read"/>
-          <menuitem name="FolderExpunge" verb="" _label="E_xpunge"/>
-        </placeholder>
-
- 	<placeholder name="FolderOps">
-	  <menuitem name="FolderRename" verb="" _label="_Rename..."/>
-          <menuitem name="FolderRefresh" verb="" _label="Re_fresh"/>
-	  <menuitem name="FolderDelete" verb="" _label="_Delete"/>
-
- 	  <separator f="" name="FolderOps1"/>
-          <menuitem name="ChangeFolderProperties" verb="" _label="_Properties"/>
- 	</placeholder>
-
-      </submenu>
-    </placeholder>
-
-<!--
-    <submenu name="Actions" _label="_Actions">
-      <placeholder name="ComponentActionsPlaceholder">
-        <placeholder name="MailListActions">
-        </placeholder>
-      </placeholder>
-    </submenu>
--->
-
-  </menu>
-
-</Root>
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
deleted file mode 100644
index f90e737c24..0000000000
--- a/ui/evolution-mail-message.xml
+++ /dev/null
@@ -1,426 +0,0 @@
-<Root>
-
-  <commands>   <!-- Alphabetical by name, yo -->
-
-    <cmd name="AddSenderToAddressbook"
-     _tip="Add Sender to Address Book"/>
-
-    <cmd name="CaretMode"
-    _tip="Show a blinking cursor in the body of displayed messages"
-    type="toggle" state="0" accel="F7"/>
-
-    <cmd name="EditCut"
-     _tip="Cut selected messages to the clipboard"
-     accel="*Control*x" pixtype="pixbuf"/>
-
-    <cmd name="EditCopy"
-     _tip="Copy selected messages to the clipboard"
-     accel="*Control*c" pixtype="pixbuf"/>
-
-    <cmd name="EditPaste"
-     _tip="Paste messages from the clipboard"
-     accel="*Control*v" pixtype="pixbuf"/>
-
-    <cmd name="MailNext"
-     _tip="Display the next message"
-     accel="*Control*Page_Down"/>
-
-    <cmd name="MailNextFlagged"
-     _tip="Display the next important message"/>
-
-    <cmd name="MailNextUnread"
-     _tip="Display the next unread message"
-     accel="*Control*bracketright"/>
-
-    <cmd name="MailNextThread"
-     _tip="Display the next thread"/>
-
-    <cmd name="MailPrevious"
-     _tip="Display the previous message"
-     accel="*Control*Page_Up"/>
-
-    <cmd name="MailPreviousFlagged"
-     _tip="Display the previous important message"/>
-
-    <cmd name="MailPreviousUnread"
-     _tip="Display the previous unread message"
-     accel="*Control*bracketleft"/>
-
-    <cmd name="MessageApplyFilters"
-     _tip="Apply filter rules to the selected messages"
-     accel="*Control*y"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageCopy"
-     _tip="Copy selected messages to another folder"
-     accel="*Control**Shift*y"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageDelete"
-     _tip="Mark the selected messages for deletion"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageFollowUpFlag"
-     _tip="Flag selected messages for follow-up"
-     accel="*Control**Shift*G"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageForward"
-     _tip="Forward the selected message to someone"
-     accel="*Control*f"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageForwardAttached"
-     _tip="Forward the selected message to someone as an attachment"/>
-
-    <cmd name="MessageForwardInline"
-     _tip="Forward the selected message in the body of a new message"/>
-
-    <cmd name="MessageForwardQuoted"
-     _tip="Forward the selected message quoted like a reply"/>
-
-    <cmd name="MessageMarkAsRead"
-     _tip="Mark the selected messages as having been read"
-     accel="*Control*k"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageMarkAsUnRead"
-     _tip="Mark the selected messages as not having been read"
-     accel="*Control**Shift*k"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageMarkAsImportant"
-     _tip="Mark the selected messages as important"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageMarkAsUnimportant"
-     _tip="Mark the selected messages as unimportant"/>
-
-    <cmd name="MessageMarkAsJunk"
-     _tip="Mark the selected messages as junk"
-     accel="*Control*j"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageMarkAsNotJunk"
-     _tip="Mark the selected messages as not being junk"
-     accel="*Control**Shift*j"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageFilterJunk"
-     _tip="Filter the selected messages for junk status"
-     pixtype="pixbuf"/>
-
-    <cmd name="MailCompose"
-     _tip="Open a window for composing a mail message"
-     pixtype="pixbuf"
-     accel="*Control**Shift*m"/>
-
-    <cmd name="MessageMove"
-     _tip="Move selected messages to another folder"
-     accel="*Control**Shift*v"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageEdit"
-     _tip="Open the selected messages in the composer for editing"/>
-
-    <cmd name="MessageOpen"
-     _tip="Open the selected messages in a new window"
-     accel="*Control*o"/>
-
-    <cmd name="MessageRedirect"
-     _tip="Redirect (bounce) the selected message to someone"
-     accel=""/>
-
-    <cmd name="MessageReplyAll"
-     _tip="Compose a reply to all of the recipients of the selected message"
-     accel="*Control**Shift*r"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageReplyList"
-     _tip="Compose a reply to the mailing list of the selected message"
-     accel="*Control*l"/>
-
-    <cmd name="MessageReplySender"
-     _tip="Compose a reply to the sender of the selected message"
-     accel="*Control*r"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageSaveAs"
-     _tip="Save the selected messages as a text file"
-     accel="*Control*s"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageSearch"
-     _tip="Search for text in the body of the displayed message"
-     accel="*Control**Shift*f"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageUndelete"
-     _tip="Undelete the selected messages"
-     accel="*Control**Shift*d"/>
-
-    <cmd name="PrintMessage"
-     _tip="Print this message"
-     accel="*Control*p"
-     pixtype="pixbuf"/>
-
-    <cmd name="PrintPreviewMessage"
-     _tip="Preview the message to be printed"
-     pixtype="pixbuf"/>
-
-    <cmd name="PrintSetup"
-     _tip="Set up the page settings for your current printer"/>
-
-    <cmd name="SelectAllText"
-     _tip="Select all the text in a message"
-     accel="*Control**Shift*x"/>
-
-    <cmd name="ToolsFilterMailingList"
-     _tip="Create a rule to filter messages to this mailing list"/>
-
-    <cmd name="ToolsFilterRecipient"
-     _tip="Create a rule to filter messages to these recipients"/>
-
-    <cmd name="ToolsFilterSender"
-     _tip="Create a rule to filter messages from this sender"/>
-
-    <cmd name="ToolsFilterSubject"
-     _tip="Create a rule to filter messages with this subject"/>
-
-    <cmd name="ToolsVFolderMailingList"
-     _tip="Create a Search Folder for this mailing list"/>
-
-    <cmd name="ToolsVFolderRecipient"
-     _tip="Create a Search Folder for these recipients"/>
-
-    <cmd name="ToolsVFolderSender"
-     _tip="Create a Search Folder for this sender"/>
-
-    <cmd name="ToolsVFolderSubject"
-     _tip="Create a Search Folder for this subject"/>
-
-    <cmd name="ViewFullHeaders"
-     _tip="Show messages with all email headers"
-     type="toggle" state="0"/>
-
-    <cmd name="ViewLoadImages"
-     _tip="Force images in HTML mail to be loaded"
-     accel="*Control*i" pixtype="pixbuf"/>
-
-    <cmd name="ViewSource"
-     _tip="Show the raw email source of the message"
-     accel="*Control*u"/>
-
-    <cmd name="TextZoomIn"
-    _tip="Increase the text size"
-    accel="*Control*plus" pixtype="pixbuf"/>
-
-    <cmd name="TextZoomOut"
-    _tip="Decrease the text size"
-    accel="*Control*minus" pixtype="pixbuf"/>
-
-    <cmd name="TextZoomReset"
-    _tip="Reset the text to its original size"
-    accel="*Control*0" pixtype="pixbuf"/>
-
-  </commands>
-
-  <keybindings>
-    <accel verb="MailPreviousUnread" name="*Control*comma"/>
-    <accel verb="MailPreviousUnread" name="comma"/>
-    <accel verb="MailPreviousUnread" name="bracketleft"/>
-    <accel verb="MailNextUnread"     name="*Control*period"/>
-    <accel verb="MailNextUnread"     name="period"/>
-    <accel verb="MailNextUnread"     name="bracketright"/>
-    <accel verb="MessageDeleteKey"   name="Delete"/>
-    <accel verb="MessageDeleteKey"   name="KP_Delete"/>
-    <accel verb="MessageDeleteKey"   name="*Control*d"/>
-  </keybindings>
-
-  <menu>
-
-    <submenu name="File">
-      <placeholder name="FileOps">
-        <menuitem name="MessageSaveAs" verb="" _label="_Save Message..."/>
-      </placeholder>
-
-      <placeholder name="Print">
-        <menuitem name="PrintPreviewMessage" verb="" _label="Print Pre_view"/>
-        <menuitem name="PrintMessage" verb="" _label="_Print..."/>
-      </placeholder>
-    </submenu>
-
-    <submenu name="Edit">
-      <placeholder name="EditPlaceholder">
-        <placeholder name="MailMessageEdit">
-          <menuitem name="EditCopy" verb="" _label="_Copy"/>
-
-	  <separator f="" name="emaillist1"/>
-
-          <menuitem name="SelectAllText" verb="" _label="Select _All Text"/>
-
- 	  <separator f="" name="emaillist2"/>
-
-          <menuitem name="MessageDelete" verb="" _label="_Delete Message"/>
-          <menuitem name="MessageUndelete" verb="" _label="_Undelete Message"/>
-
-	  <separator f="" name="emaillist3"/>
-
-          <menuitem name="MessageSearch" verb="" _label="_Find in Message..."/>
-        </placeholder>
-      </placeholder>
-    </submenu>
-
-    <submenu name="View">
-       <placeholder name="MailMessageZoom">
-          <submenu name="zoom" _label="_Zoom">
- 	  <menuitem name="TextZoomIn" verb="" _label="_Zoom In"/>
- 	  <menuitem name="TextZoomOut" verb="" _label="Zoom _Out"/>
- 	  <menuitem name="TextZoomReset" verb="" _label="_Normal Size"/>
-	  </submenu>
-       </placeholder>
-
-       <placeholder name="MailViewType">
-         <menuitem name="ViewLoadImages" verb="" _label="_Load Images"/>
-         <menuitem name="ViewFullHeaders" verb="" _label="All Message _Headers"/>
-           <menuitem name="CaretMode" verb="" _label="_Caret Mode"/>
-           <menuitem name="ViewSource" verb="" _label="_Message Source"/>
-
-       </placeholder>
-
-    </submenu>
-
-    <placeholder name="MessagePlaceholder">
-      <submenu name="Message" _label="_Message">
-        <placeholder name="MessageTopActions">
-          <menuitem name="ActionCompose" verb="MailCompose" _label="Compose _New Message"/>
-          <menuitem name="MessageOpen" verb="" _label="_Open in New Window"/>
-          <menuitem name="MessageEdit" verb="" _label="_Edit as New Message..."/>
-          <menuitem name="AddSenderToAddressbook" verb="" _label="A_dd Sender to Address Book"/>
-        </placeholder>
-
-        <placeholder name="MessageNavigation">
-          <submenu name="GoTo" _label="_Go To" pixtype="pixbuf">
-            <menuitem name="MailNext" verb="" _label="_Next Message"/>
-            <menuitem name="MailNextUnread" verb="" _label="Next _Unread Message"/>
-            <menuitem name="MailNextFlagged" verb="" _label="Next _Important Message"/>
-            <menuitem name="MailNextThread" verb="" _label="Next _Thread"/>
-	    <separator f="" name="emaillist"/>
-            <menuitem name="MailPrevious" verb="" _label="_Previous Message"/>
-            <menuitem name="MailPreviousUnread" verb="" _label="P_revious Unread Message"/>
-            <menuitem name="MailPreviousFlagged" verb="" _label="Pr_evious Important Message"/>
-          </submenu>
-	</placeholder>
-
-        <placeholder name="MailMessageActions">
-
-          <menuitem name="MessageReplySender" verb="" _label="_Reply to Sender"/>
-          <menuitem name="MessageReplyList" verb="" _label="Reply to _List"/>
-          <menuitem name="MessageReplyAll" verb="" _label="Reply to _All"/>
-          <menuitem name="MessageForward" verb="" _label="_Forward"/>
-          <submenu name="ForwardAs" _label="F_orward As...">
-            <menuitem verb="MessageForwardAttached" _label="_Attached"/>
-            <menuitem verb="MessageForwardInline" _label="_Inline"/>
-            <menuitem verb="MessageForwardQuoted" _label="_Quoted"/>
-            <separator f="" name="forwardlist1"/>
-            <menuitem verb="MessageRedirect" _label="Re_direct"/>
-          </submenu>
-
-	  <separator f="" name="emaillist3"/>
-
-          <menuitem name="MessageMove" verb="" _label="_Move to Folder"/>
-          <menuitem name="MessageCopy" verb="" _label="_Copy to Folder"/>
-
-	  <separator f="" name="emaillist4"/>
-
-          <submenu name="MessageMarkAs" _label="Mar_k as">
-	    <!-- Translators: "Read" as in "has been read" (evolution-mail-message.xml) -->
-            <menuitem name="MessageMarkAsRead" verb="" _label="_Read"/>
-            <menuitem name="MessageMarkAsUnRead" verb="" _label="_Unread"/>
-
-            <separator f="" name="emailmark1"/>
-
-            <menuitem name="MessageMarkAsImportant" verb="" _label="_Important"/>
-            <menuitem name="MessageMarkAsUnimportant" verb="" _label="Uni_mportant"/>
-
-            <separator f="" name="emailmark2"/>
-
-            <menuitem name="MessageMarkAsJunk" verb="" _label="_Junk"/>
-            <menuitem name="MessageMarkAsNotJunk" verb="" _label="_Not Junk"/>
-
-      	    <separator f="" name="emaillist2"/>
-
-            <menuitem name="MessageFollowUpFlag" verb="" _label="Follow _Up..."/>
-            <menuitem name="MessageFollowUpClear" verb="" _label="_Clear Flag"/>
-            <menuitem name="MessageFollowUpComplete" verb="" _label="_Flag Completed"/>
-
-          </submenu>
-          <menuitem name="MessageApplyFilters" verb="" _label="A_pply Filters"/>
-          <menuitem name="MessageFilterJunk" verb="" _label="Check for _Junk"/>
-        </placeholder>
-
-        <placeholder name="MessageRuleCreate">
-          <submenu name="CreateRule" _label="Create R_ule">
-            <menuitem name="ToolsVFolderSubject" verb="" _label="Search Folder from S_ubject..."/>
-            <menuitem name="ToolsVFolderSender" verb="" _label="Search Folder from Sen_der..."/>
-            <menuitem name="ToolsVFolderRecipient" verb="" _label="Search Folder from Recipien_ts..."/>
-            <menuitem name="ToolsVFolderMailingList" verb="" _label="Search Folder from Mailing _List..."/>
-
-            <separator f="" name="RuleSeparator"/>
-
-            <menuitem name="ToolsFilterSubject" verb="" _label="Filter on _Subject..."/>
-            <menuitem name="ToolsFilterSender" verb="" _label="Filter on Se_nder..."/>
-            <menuitem name="ToolsFilterRecipient" verb="" _label="Filter on _Recipients..."/>
-            <menuitem name="ToolsFilterMailingList" verb="" _label="Filter on Mailing _List..."/>
-
-          </submenu>
-        </placeholder>
-      </submenu>
-    </placeholder>
-  </menu>
-
-  <dockitem name="Toolbar">
-
-    <placeholder name="MailMessageToolbar">
-      <toolitem name="MessageReplySender" verb=""
-       _label="Reply" priority="1"
-       pixtype="pixbuf"/>
-
-      <toolitem name="MessageReplyAll" verb=""
-       _label="Reply to All" priority="1"
-       pixtype="pixbuf"/>
-
-      <toolitem name="MessageForward" verb=""
-       _label="Forward" priority="1"
-       pixtype="pixbuf"/>
-
-      <separator f="" name="emaillist2"/>
-
-      <toolitem name="PrintMessage" verb=""
-       _label="Print"
-       pixtype="pixbuf"/>
-
-      <toolitem name="MessageDelete" verb=""
-       _label="Delete"
-       pixtype="pixbuf"/>
-
-      <toolitem name="MessageMarkAsJunk" verb=""
-       _label="Junk"
-       pixtype="pixbuf"/>
-      <toolitem name="MessageMarkAsNotJunk" verb=""
-       _label="Not Junk"
-       pixtype="pixbuf"/>
-    </placeholder>
-
-    <placeholder name="MailNextButtons">
-      <toolitem name="MailPrevious" verb=""
-       _label="Previous"
-       pixtype="pixbuf"/>
-
-      <toolitem name="MailNext" verb=""
-       _label="Next"
-       pixtype="pixbuf"/>
-    </placeholder>
-  </dockitem>
-
-</Root>
diff --git a/ui/evolution-mail-messagedisplay.xml b/ui/evolution-mail-messagedisplay.xml
deleted file mode 100644
index 7e4fcf30a9..0000000000
--- a/ui/evolution-mail-messagedisplay.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<Root>
-  <commands>
-    <cmd name="MessageBrowserClose" _label="Close" _tip="Close this window"
-	 pixtype="stock" pixname="Close" accel="*Control*w"/>
-  </commands>
-
-  <menu>
-    <submenu name="File" _label="_File">
-      <placeholder name="FileOps"/>
-
-      <separator f="" name="emailmessage1"/>
-
-      <placeholder name="Print"/>
-
-      <separator f="" name="emailmessage2"/>
-
-      <menuitem name="MessageBrowserClose" verb=""
-		_label="_Close"/>
-
-    </submenu>
-
-    <submenu name="Edit" _label="_Edit">
-      <placeholder name="EditPlaceholder"/>
-    </submenu>
-
-    <submenu name="View" _label="_View">
-      <placeholder name="MailViewType"/>
-
-      <placeholder name="MailMessageZoom"/>
-      <separator f="" name="CharsetSeparator"/>
-    </submenu>
-
-    <placeholder name="MessagePlaceholder">
-      <submenu name="Message" _label="_Message">
-        <placeholder name="MessageTopActions"/>
-
-        <separator f="" name="emailglobal"/>
-
-        <placeholder name="MessageNavigation"/>
-
-        <placeholder name="MailListActions"/>
-
-        <placeholder name="MailMessageActions"/>
-
-        <separator f="" name="emaillist5"/>
-
-        <placeholder name="MessageRuleCreate"/>
-
-    </submenu>
-    </placeholder>
-
-
-<!--
-    <placeholder name="MessagePlaceholder">
-      <submenu name="Message" _label="_Message">
-
-        <placeholder name="ComponentActionsPlaceholder">
-          <placeholder name="MailMessageActions"/>
-      </placeholder>
-    </submenu>
-    </placeholder>
--->
-
-  </menu>
-
-  <dockitem name="Toolbar" 
-            relief="none" 
-            behavior="exclusive"
-	    _tip="Main toolbar">
-    <placeholder name="MailMessageToolbar"/>
-    <separator f="" name="emailmessage"/>
-    <placeholder name="MailNextButtons"/>
-  </dockitem>
-</Root>
diff --git a/ui/evolution-mail-reader.ui b/ui/evolution-mail-reader.ui
new file mode 100644
index 0000000000..374db8f8e4
--- /dev/null
+++ b/ui/evolution-mail-reader.ui
@@ -0,0 +1,138 @@
+<ui>
+  <menubar name='main-menu'>
+    <menu action='file-menu'>
+      <placeholder name='file-actions'>
+        <menuitem action='mail-save-as'/>
+      </placeholder>
+      <placeholder name='print-actions'>
+        <menuitem action='mail-print-preview'/>
+        <menuitem action='mail-print'/>
+      </placeholder>
+    </menu>
+    <menu action='edit-menu'>
+      <placeholder name='edit-actions'>
+        <menuitem action='mail-clipboard-copy'/>
+        <separator/>
+        <menuitem action='mail-select-all'/>
+        <separator/>
+        <menuitem action='mail-delete'/>
+        <menuitem action='mail-undelete'/>
+        <separator/>
+        <menuitem action='mail-find'/>
+      </placeholder>
+    </menu>
+    <menu action='view-menu'>
+      <separator/>
+      <placeholder name='mail-message-list-actions'/>
+      <separator/>
+      <placeholder name='mail-message-view-actions'>
+        <menuitem action='mail-load-images'/>
+        <menuitem action='mail-show-all-headers'/>
+        <menuitem action='mail-caret-mode'/>
+        <menuitem action='mail-show-source'/>
+        <menu action='mail-zoom-menu'>
+          <menuitem action='mail-zoom-in'/>
+          <menuitem action='mail-zoom-out'/>
+          <menuitem action='mail-zoom-100'/>
+        </menu>
+        <separator/>
+        <menu action='mail-encoding-menu'>
+          <menuitem action='mail-charset-default'/>
+          <separator/>
+        </menu>
+      </placeholder>
+    </menu>
+    <placeholder name='custom-menus'>
+      <menu action='mail-message-menu'>
+        <menuitem action='mail-message-new'/>
+        <menuitem action='mail-message-open'/>
+        <menuitem action='mail-message-edit'/>
+        <menuitem action='mail-add-sender'/>
+        <separator/>
+        <menu action='mail-goto-menu'>
+          <menuitem action='mail-next'/>
+          <menuitem action='mail-next-unread'/>
+          <menuitem action='mail-next-important'/>
+          <menuitem action='mail-next-thread'/>
+          <separator/>
+          <menuitem action='mail-previous'/>
+          <menuitem action='mail-previous-unread'/>
+          <menuitem action='mail-previous-important'/>
+        </menu>
+        <menuitem action='mail-reply-sender'/>
+        <menuitem action='mail-reply-list'/>
+        <menuitem action='mail-reply-all'/>
+        <menuitem action='mail-forward'/>
+        <menu action='mail-forward-as-menu'>
+          <menuitem action='mail-forward-attached'/>
+          <menuitem action='mail-forward-inline'/>
+          <menuitem action='mail-forward-quoted'/>
+          <separator/>
+          <menuitem action='mail-redirect'/>
+        </menu>
+        <separator/>
+        <menuitem action='mail-copy'/>
+        <menuitem action='mail-move'/>
+        <separator/>
+        <menu action='mail-mark-as-menu'>
+          <menuitem action="mail-mark-read"/>
+          <menuitem action="mail-mark-unread"/>
+          <separator/>
+          <menuitem action="mail-mark-important"/>
+          <menuitem action="mail-mark-unimportant"/>
+          <separator/>
+          <menuitem action="mail-mark-junk"/>
+          <menuitem action="mail-mark-notjunk"/>
+          <separator/>
+          <menuitem action="mail-flag-for-followup"/>
+          <menuitem action="mail-flag-clear"/>
+          <menuitem action="mail-flag-completed"/>
+        </menu>
+        <menuitem action='mail-filters-apply'/>
+        <menuitem action='mail-check-for-junk'/>
+        <separator/>
+        <menu action='mail-create-rule-menu'>
+          <menuitem action='mail-filter-on-subject'/>
+          <menuitem action='mail-filter-on-sender'/>
+          <menuitem action='mail-filter-on-recipients'/>
+          <menuitem action='mail-filter-on-mailing-list'/>
+          <separator/>
+          <menuitem action='mail-search-folder-from-subject'/>
+          <menuitem action='mail-search-folder-from-sender'/>
+          <menuitem action='mail-search-folder-from-recipients'/>
+          <menuitem action='mail-search-folder-from-mailing-list'/>
+        </menu>
+        <separator/>
+        <placeholder name='mail-message-actions'/>
+      </menu>
+    </placeholder>
+  </menubar>
+  <toolbar name='main-toolbar'>
+    <placeholder name='mail-toolbar-common'>
+      <toolitem action='mail-reply-sender'/>
+      <toolitem action='mail-reply-all'/>
+      <toolitem action='mail-forward'/>
+      <separator/>
+      <toolitem action='mail-print'/>
+      <toolitem action='mail-delete'/>
+      <toolitem action='mail-mark-junk'/>
+      <toolitem action='mail-mark-notjunk'/>
+    </placeholder>
+    <separator/>
+    <placeholder name='mail-toolbar-navigation'>
+      <toolitem action='mail-previous'/>
+      <toolitem action='mail-next'/>
+    </placeholder>
+  </toolbar>
+  <popup name='mail-message-popup'>
+    <placeholder name='mail-message-popup-common-actions'>
+      <menuitem action='mail-popup-reply-sender'/>
+      <menuitem action='mail-popup-reply-all'/>
+      <menuitem action='mail-popup-forward'/>
+      <separator/>
+      <menuitem action='mail-popup-message-edit'/>
+      <menuitem action='mail-popup-save-as'/>
+      <menuitem action='mail-popup-print'/>
+    </placeholder>
+  </popup>
+</ui>
diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui
new file mode 100644
index 0000000000..4c607c9fa5
--- /dev/null
+++ b/ui/evolution-mail.ui
@@ -0,0 +1,127 @@
+<ui>
+  <menubar name='main-menu'>
+    <menu action='file-menu'>
+      <placeholder name='long-running-actions'>
+        <menuitem action='mail-empty-trash'/>
+        <menuitem action='mail-download'/>
+      </placeholder>
+    </menu>
+    <menu action='edit-menu'>
+      <placeholder name='administrative-actions'>
+        <menuitem action='mail-tools-filters'/>
+        <menuitem action='mail-tools-search-folders'/>
+      </placeholder>
+    </menu>
+    <menu action='view-menu'>
+      <placeholder name='view-custom-menus'>
+        <menu action='mail-preview-menu'>
+          <menuitem action='mail-preview'/>
+          <separator/>
+          <menuitem action='mail-view-classic'/>
+          <menuitem action='mail-view-vertical'/>
+        </menu>
+      </placeholder>
+      <separator/>
+      <placeholder name='mail-message-list-actions'>
+        <menuitem action='mail-threads-group-by'/>
+        <menuitem action='mail-threads-expand-all'/>
+        <menuitem action='mail-threads-collapse-all'/>
+        <separator/>
+        <menuitem action='mail-hide-deleted'/>
+        <menuitem action='mail-hide-selected'/>
+        <menuitem action='mail-hide-read'/>
+        <menuitem action='mail-show-hidden'/>
+      </placeholder>
+    </menu>
+    <placeholder name='custom-menus'>
+      <menu action='mail-folder-menu'>
+        <menuitem action='mail-folder-new'/>
+        <menuitem action='mail-tools-subscriptions'/>
+        <menuitem action='mail-folder-unsubscribe'/>
+        <separator/>
+        <menuitem action='mail-folder-copy'/>
+        <menuitem action='mail-folder-move'/>
+        <separator/>
+        <menuitem action='mail-folder-select-all'/>
+        <menuitem action='mail-folder-select-thread'/>
+        <menuitem action='mail-folder-select-subthread'/>
+        <menuitem action='mail-folder-mark-all-as-read'/>
+        <menuitem action='mail-folder-expunge'/>
+        <separator/>
+        <menuitem action='mail-folder-rename'/>
+        <menuitem action='mail-folder-refresh'/>
+        <menuitem action='mail-folder-delete'/>
+        <separator/>
+        <menuitem action='mail-folder-properties'/>
+      </menu>
+    </placeholder>
+    <menu action='search-menu'>
+      <placeholder name='search-actions'>
+        <menuitem action='mail-create-search-folder'/>
+      </placeholder>
+    </menu>
+  </menubar>
+  <toolbar name='main-toolbar'>
+    <placeholder name='mail-toolbar-common'/>
+    <toolitem action='mail-stop'/>
+    <separator/>
+    <placeholder name='mail-toolbar-navigation'/>
+  </toolbar>
+  <popup name='mail-folder-popup'>
+    <placeholder name='mail-folder-popup-actions'/>
+    <separator/>
+    <menuitem action='mail-popup-folder-new'/>
+    <menuitem action='mail-popup-folder-copy'/>
+    <menuitem action='mail-popup-folder-move'/>
+    <separator/>
+    <menuitem action='mail-popup-folder-delete'/>
+    <separator/>
+    <menuitem action='mail-popup-folder-rename'/>
+    <menuitem action='mail-popup-folder-refresh'/>
+    <menuitem action='mail-popup-flush-outbox'/>
+    <menuitem action='mail-popup-empty-trash'/>
+    <menuitem action='mail-popup-account-disable'/>
+    <separator/>
+    <menuitem action='mail-popup-folder-unsubscribe'/>
+    <separator/>
+    <menuitem action='mail-popup-folder-properties'/>
+  </popup>
+  <popup name='mail-message-popup'>
+    <placeholder name='mail-message-popup-common-actions'/>
+    <separator/>
+    <menuitem action='mail-popup-delete'/>
+    <menuitem action='mail-popup-undelete'/>
+    <menuitem action='mail-popup-copy'/>
+    <menuitem action='mail-popup-move'/>
+    <separator/>
+    <menuitem action='mail-popup-mark-read'/>
+    <menuitem action='mail-popup-mark-unread'/>
+    <menuitem action='mail-popup-mark-important'/>
+    <menuitem action='mail-popup-mark-unimportant'/>
+    <menuitem action='mail-popup-mark-junk'/>
+    <menuitem action='mail-popup-mark-notjunk'/>
+    <menuitem action='mail-popup-flag-for-followup'/>
+    <menu action='mail-label-menu'>
+      <menuitem action='mail-label-none'/>
+      <separator/>
+      <placeholder name='mail-label-actions'/>
+      <separator/>
+      <menuitem action='mail-label-new'/>
+    </menu>
+    <separator/>
+    <placeholder name='mail-message-templates'/>
+    <separator/>
+    <placeholder name='mail-message-popup-actions'/>
+  </popup>
+  <popup name='mail-search-options'>
+    <menuitem action='mail-search-subject-or-sender-contains'/>
+    <menuitem action='mail-search-subject-or-recipients-contains'/>
+    <menuitem action='mail-search-recipients-contain'/>
+    <menuitem action='mail-search-message-contains'/>
+    <menuitem action='mail-search-subject-contains'/>
+    <menuitem action='mail-search-sender-contains'/>
+    <menuitem action='mail-search-body-contains'/>
+    <separator/>
+    <menuitem action='search-advanced'/>
+  </popup>
+</ui>
diff --git a/ui/evolution-memos.ui b/ui/evolution-memos.ui
new file mode 100644
index 0000000000..f4d4129371
--- /dev/null
+++ b/ui/evolution-memos.ui
@@ -0,0 +1,75 @@
+<ui>
+  <menubar name='main-menu'>
+    <menu action='file-menu'>
+      <placeholder name='file-actions'>
+        <menuitem action='memo-open'/>
+      </placeholder>
+      <placeholder name='print-actions'>
+        <menuitem action='memo-list-print-preview'/>
+        <menuitem action='memo-list-print'/>
+      </placeholder>
+    </menu>
+    <menu action='edit-menu'>
+      <placeholder name='edit-actions'>
+        <menuitem action='memo-clipboard-cut'/>
+        <menuitem action='memo-clipboard-copy'/>
+        <menuitem action='memo-clipboard-paste'/>
+        <separator/>
+        <menuitem action='memo-delete'/>
+      </placeholder>
+    </menu>
+    <menu action='view-menu'>
+      <placeholder name='view-custom-menus'>
+        <menu action='memo-preview-menu'>
+          <menuitem action='memo-preview'/>
+          <separator/>
+          <menuitem action='memo-view-classic'/>
+          <menuitem action='memo-view-vertical'/>
+        </menu>
+      </placeholder>
+    </menu>
+  </menubar>
+  <toolbar name='main-toolbar'>
+    <placeholder name='toolbar-actions'>
+      <toolitem action='memo-clipboard-cut'/>
+      <toolitem action='memo-clipboard-copy'/>
+      <toolitem action='memo-clipboard-paste'/>
+      <separator/>
+      <toolitem action='memo-list-print'/>
+      <toolitem action='memo-delete'/>
+    </placeholder>
+  </toolbar>
+  <popup name='memo-popup'>
+    <menuitem action='memo-new'/>
+    <separator/>
+    <menuitem action='memo-popup-open'/>
+    <menuitem action='memo-popup-open-url'/>
+    <menuitem action='memo-popup-save-as'/>
+    <menuitem action='memo-popup-print'/>
+    <separator/>
+    <menuitem action='memo-popup-clipboard-cut'/>
+    <menuitem action='memo-popup-clipboard-copy'/>
+    <menuitem action='memo-popup-clipboard-paste'/>
+    <separator/>
+    <menuitem action='memo-popup-forward'/>
+    <separator/>
+    <menuitem action='memo-popup-delete'/>
+  </popup>
+  <popup name='memo-list-popup'>
+    <menuitem action='memo-list-new'/>
+    <menuitem action='memo-list-popup-copy'/>
+    <menuitem action='memo-list-popup-rename'/>
+    <separator/>
+    <menuitem action='memo-list-popup-delete'/>
+    <menuitem action='memo-list-popup-select-one'/>
+    <separator/>
+    <menuitem action='memo-list-popup-properties'/>
+  </popup>
+  <popup name='memo-search-options'>
+    <menuitem action='memo-search-summary-contains'/>
+    <menuitem action='memo-search-description-contains'/>
+    <menuitem action='memo-search-any-field-contains'/>
+    <separator/>
+    <menuitem action='search-advanced'/>
+  </popup>
+</ui>
diff --git a/ui/evolution-memos.xml b/ui/evolution-memos.xml
deleted file mode 100644
index 9a132d2add..0000000000
--- a/ui/evolution-memos.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<Root>
-  <commands>
-    <cmd name="MemosOpenMemo" _tip="View the selected memo" accel="*Control*o"/>
-    <cmd name="MemosPrint" _tip="Print the list of memos" pixtype="pixbuf"
-	 accel="*Control*p"/>
-    <cmd name="MemosPrintPreview" _tip="Previews the list of memos to be printed" pixtype="pixbuf"/>
-
-    <cmd name="MemosCut" _tip="Cut selected memo" accel="*Control*x" pixtype="pixbuf"/>
-    <cmd name="MemosCopy" _tip="Copy selected memo" accel="*Control*c" pixtype="pixbuf"/>
-    <cmd name="MemosPaste" _tip="Paste memo from the clipboard" accel="*Control*v" pixtype="pixbuf"/>
-    <cmd name="MemosDelete" _tip="Delete selected memos" accel="*Control*d" sensitive="0"
-         pixtype="pixbuf"/>
-
-  </commands>
-  
-  <menu>
-    <submenu name="File">
-      <placeholder name="FileOps">
-        <menuitem name="OpenMemo" verb="MemosOpenMemo" _label="_Open Memo"/>
-      </placeholder>
-      <placeholder name="Print">
-	<menuitem name="PrintPreview" verb="MemosPrintPreview" _label="Print Pre_view"/>
-
-	<menuitem name="Print" verb="MemosPrint" accel="*Control*p" _label="_Print..."/>
-      </placeholder>
-
-    </submenu>
-
-    <submenu name="Edit" _label="_Edit">
-      <placeholder name="EditPlaceholder">
-        <menuitem name="MemosCut" verb="" _label="C_ut"/>
-        <menuitem name="MemosCopy" verb="" _label="_Copy"/>
-        <menuitem name="MemosPaste" verb="" _label="_Paste"/>
-        
-		<separator/>
-        
-		<menuitem name="MemosDelete" verb="" _label="_Delete"/>
-      </placeholder>
-    </submenu>
-
-  </menu>
-
-  <dockitem name="Toolbar">
-    <toolitem name="Cut" _label="Cut" verb="MemosCut" pixtype="pixbuf"/>
-    <toolitem name="Copy" _label="Copy" verb="MemosCopy" pixtype="pixbuf"/>
-    <toolitem name="Paste" _label="Paste" verb="MemosPaste" pixtype="pixbuf"/>
-
-    <separator/>
-
-    <toolitem name="Print" _label="Print" verb="MemosPrint" pixtype="pixbuf"/>
-
-    <toolitem name="Delete" _label="Delete" verb="MemosDelete" pixtype="pixbuf"/>
-
-  </dockitem>
-
-</Root>
diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
new file mode 100644
index 0000000000..7a89e11adc
--- /dev/null
+++ b/ui/evolution-shell.ui
@@ -0,0 +1,82 @@
+<ui>
+  <menubar name='main-menu'>
+    <menu action='file-menu'>
+      <menu action='new-menu'/>
+      <menuitem action='new-window'/>
+      <separator/>
+      <menuitem action='send-receive'/>
+      <placeholder name='file-actions'/>
+      <separator/>
+      <menuitem action='import'/>
+      <separator/>
+      <menuitem action='page-setup'/>
+      <placeholder name='print-actions'/>
+      <separator/>
+      <placeholder name='long-running-actions'/>
+      <menuitem action='forget-passwords'/>
+      <menuitem action='work-online'/>
+      <menuitem action='work-offline'/>
+      <menuitem action='close'/>
+      <menuitem action='quit'/>
+    </menu>
+    <menu action='edit-menu'>
+      <placeholder name='edit-actions'/>
+      <separator/>
+      <menuitem action='sync-options'/>
+      <placeholder name='administrative-actions'/>
+      <menuitem action='preferences'/>
+    </menu>
+    <menu action='view-menu'>
+      <menu action='gal-view-menu'>
+        <placeholder name='gal-view-list'/>
+        <separator/>
+        <menuitem action='gal-custom-view'/>
+        <menuitem action='gal-save-custom-view'/>
+        <separator/>
+        <menuitem action='gal-define-views'/>
+      </menu>
+      <menu action='window-menu'/>
+      <menu action='layout-menu'>
+        <menuitem action='show-toolbar'/>
+        <menuitem action='show-statusbar'/>
+        <menuitem action='show-sidebar'/>
+      </menu>
+      <placeholder name='view-custom-menus'/>
+      <menu action='switcher-menu'>
+        <menuitem action='switcher-style-both'/>
+        <menuitem action='switcher-style-icons'/>
+        <menuitem action='switcher-style-text'/>
+        <menuitem action='switcher-style-user'/>
+        <separator/>
+        <menuitem action='show-switcher'/>
+      </menu>
+    </menu>
+    <placeholder name='custom-menus'/>
+    <menu action='search-menu'>
+      <menuitem action='search-execute'/>
+      <menuitem action='search-clear'/>
+      <menuitem action='search-advanced'/>
+      <separator/>
+      <menuitem action='search-save'/>
+      <menuitem action='search-edit'/>
+      <separator/>
+      <placeholder name='search-actions'/>
+      <separator/>
+      <placeholder name='custom-rules'/>
+    </menu>
+    <menu action='help-menu'>
+      <menuitem action='contents'/>
+      <menuitem action='quick-reference'/>
+      <separator/>
+      <menuitem action='faq'/>
+      <menuitem action='submit-bug'/>
+      <separator/>
+      <menuitem action='about'/>
+    </menu>
+  </menubar>
+  <toolbar name='main-toolbar'>
+    <toolitem action='send-receive'/>
+    <separator/>
+    <placeholder name='toolbar-actions'/>
+  </toolbar>
+</ui>
diff --git a/ui/evolution-tasks.ui b/ui/evolution-tasks.ui
new file mode 100644
index 0000000000..e8d6f768eb
--- /dev/null
+++ b/ui/evolution-tasks.ui
@@ -0,0 +1,86 @@
+<ui>
+  <menubar name='main-menu'>
+    <menu action='file-menu'>
+      <placeholder name='file-actions'>
+        <menuitem action='task-open'/>
+      </placeholder>
+      <placeholder name='print-actions'>
+        <menuitem action='task-list-print-preview'/>
+        <menuitem action='task-list-print'/>
+      </placeholder>
+    </menu>
+    <menu action='edit-menu'>
+      <placeholder name='edit-actions'>
+        <menuitem action='task-clipboard-cut'/>
+        <menuitem action='task-clipboard-copy'/>
+        <menuitem action='task-clipboard-paste'/>
+        <separator/>
+        <menuitem action='task-delete'/>
+        <separator/>
+        <menuitem action='task-mark-complete'/>
+        <menuitem action='task-mark-incomplete'/>
+      </placeholder>
+    </menu>
+    <menu action='view-menu'>
+      <placeholder name='view-custom-menus'>
+        <menu action='task-preview-menu'>
+          <menuitem action='task-preview'/>
+          <separator/>
+          <menuitem action='task-view-classic'/>
+          <menuitem action='task-view-vertical'/>
+        </menu>
+      </placeholder>
+    </menu>
+    <placeholder name='custom-menus'>
+      <menu action='task-actions-menu'>
+        <menuitem action='task-purge'/>
+        <menuitem action='task-assign'/>
+        <menuitem action='task-forward'/>
+      </menu>
+    </placeholder>
+  </menubar>
+  <toolbar name='main-toolbar'>
+    <toolitem action='task-clipboard-cut'/>
+    <toolitem action='task-clipboard-copy'/>
+    <toolitem action='task-clipboard-paste'/>
+    <separator/>
+    <toolitem action='task-print'/>
+    <toolitem action='task-delete'/>
+  </toolbar>
+  <popup name='task-popup'>
+    <menuitem action='task-new'/>
+    <separator/>
+    <menuitem action='task-popup-open'/>
+    <menuitem action='task-popup-open-url'/>
+    <menuitem action='task-popup-save-as'/>
+    <menuitem action='task-popup-print'/>
+    <separator/>
+    <menuitem action='task-popup-clipboard-cut'/>
+    <menuitem action='task-popup-clipboard-copy'/>
+    <menuitem action='task-popup-clipboard-paste'/>
+    <separator/>
+    <menuitem action='task-popup-assign'/>
+    <menuitem action='task-popup-forward'/>
+    <menuitem action='task-popup-mark-complete'/>
+    <menuitem action='task-popup-mark-incomplete'/>
+    <separator/>
+    <menuitem action='task-popup-delete'/>
+  </popup>
+  <popup name='task-list-popup'>
+    <menuitem action='task-list-new'/>
+    <menuitem action='task-list-popup-copy'/>
+    <menuitem action='task-list-popup-rename'/>
+    <separator/>
+    <menuitem action='task-list-popup-delete'/>
+    <menuitem action='task-list-popup-select-one'/>
+    <separator/>
+    <menuitem action='task-list-popup-properties'/>
+  </popup>
+  <popup name='task-search-options'>
+    <menuitem action='task-search-summary-contains'/>
+    <menuitem action='task-search-description-contains'/>
+    <menuitem action='task-search-any-field-contains'/>
+    <separator/>
+    <menuitem action='search-advanced'/>
+  </popup>
+</ui>
diff --git a/ui/evolution-tasks.xml b/ui/evolution-tasks.xml
deleted file mode 100644
index e0902b6806..0000000000
--- a/ui/evolution-tasks.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<Root>
-  <commands>
-    <cmd name="TasksOpenTask" _tip="View the selected task" accel="*Control*o"/>
-    <cmd name="TasksPrint" _tip="Print the list of tasks" pixtype="pixbuf"
-	 accel="*Control*p"/>
-    <cmd name="TasksPrintPreview" _tip="Previews the list of tasks to be printed" pixtype="pixbuf"/>
-
-    <cmd name="TasksCut" _tip="Cut selected tasks" accel="*Control*x" pixtype="pixbuf"/>
-    <cmd name="TasksCopy" _tip="Copy selected tasks" accel="*Control*c" pixtype="pixbuf"/>
-    <cmd name="TasksPaste" _tip="Paste tasks from the clipboard" accel="*Control*v" pixtype="pixbuf"/>
-    <cmd name="TasksDelete" _tip="Delete selected tasks" accel="*Control*d" sensitive="0"
-         pixtype="pixbuf"/>
-    <cmd name="TasksMarkComplete" _tip="Mark selected tasks as complete" accel="*Control*k" sensitive="0"/>
-
-    <cmd name="TasksPurge" _label="Purg_e" _tip="Delete completed tasks" accel="*Control*e"/>
-    <cmd name="TasksAssign" _label="_Assign Task"/>
-    <cmd name="TasksForward" _label="_Forward as iCalendar" accel="*Control*f" pixtype="pixbuf"/>
-
-    <cmd name="ViewPreview" _tip="Show task preview window" accel="*Control*m" type="toggle"/>
-
-  </commands>
-  
-  <menu>
-    <submenu name="File">
-      <placeholder name="FileOps">
-        <menuitem name="OpenTask" verb="TasksOpenTask" _label="_Open Task"/>
-      </placeholder>
-      <placeholder name="Print">
-	<menuitem name="PrintPreview" verb="TasksPrintPreview" _label="Print Pre_view"/>
-
-	<menuitem name="Print" verb="TasksPrint" accel="*Control*p" _label="_Print..."/>
-      </placeholder>
-
-    </submenu>
-
-    <submenu name="Edit" _label="_Edit">
-      <placeholder name="EditPlaceholder">
-	<menuitem name="TasksCut" verb="" _label="C_ut"/>
-	<menuitem name="TasksCopy" verb="" _label="_Copy"/>
-	<menuitem name="TasksPaste" verb="" _label="_Paste"/>
-
-	<separator/>
-
-	<menuitem name="TasksDelete" verb="" _label="_Delete"/>
-
-	<separator/>
-
-	<menuitem name="TasksMarkComplete" verb="" _label="Mar_k as Complete"/>
-      </placeholder>
-    </submenu>
-
-    <submenu name="View" _label="_View">
-      <placeholder name="ViewPreview">
-        <menuitem name="ViewPreview" verb="" _label="Task _Preview"/>
-      </placeholder>
-    </submenu>
-
-    <placeholder name="ActionsPlaceholder">
-    <submenu name="Actions" _label="_Actions">
-	<menuitem name="TasksPurge" verb=""/>
-	<menuitem name="TasksAssign" verb=""/>
-	<menuitem name="TasksForward" verb=""/>
-    </submenu>
-    </placeholder>
-
-  </menu>
-
-  <dockitem name="Toolbar">
-    <toolitem name="Cut" _label="Cut" verb="TasksCut" pixtype="pixbuf"/>
-    <toolitem name="Copy" _label="Copy" verb="TasksCopy" pixtype="pixbuf"/>
-    <toolitem name="Paste" _label="Paste" verb="TasksPaste" pixtype="pixbuf"/>
-
-    <separator/>
-
-    <toolitem name="Print" _label="Print" verb="TasksPrint" pixtype="pixbuf"/>
-
-    <toolitem name="Delete" _label="Delete" verb="TasksDelete" pixtype="pixbuf"/>
-
-  </dockitem>
-
-</Root>
diff --git a/ui/evolution.xml b/ui/evolution.xml
deleted file mode 100644
index 2b4ee71d3b..0000000000
--- a/ui/evolution.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-<Root>
-  <commands>
-    <cmd name="OpenNewWindow" _label="New _Window"
-      _tip="Create a new window displaying this folder"
-      accel="*Control**Shift*w"/>
-
-    <cmd name="FilePageSetup" _label="Page Set_up..." _tip="Set up the page settings for your current printer"/>
-
-    <cmd name="FileClose" _label="_Close Window" _tip="Close this window"
-      accel="*Control*w"/>
-
-    <cmd name="FileExit" _label="_Quit" _tip="Exit the program"
-      accel="*Control*q"/>
-
-    <cmd name="ViewButtonsIconText" _label="Icons _and Text" 
-      type="radio" group="button_display" _tip="Display window buttons with icons and text"/>
-
-    <cmd name="ViewButtonsIcon" _label="_Icons Only" 
-      type="radio" group="button_display" _tip="Display window buttons with icons only"/>
-
-    <cmd name="ViewButtonsText" _label="_Text Only" 
-      type="radio" group="button_display" _tip="Display window buttons with text only"/>
-
-    <cmd name="ViewButtonsToolbar" _label="Tool_bar Style" 
-      type="radio" group="button_display" _tip="Display window buttons using the desktop toolbar setting"/>
-
-    <cmd name="ViewButtonsHide" _label="_Hide Buttons" 
-      type="toggle" _tip="Hide window buttons"/>
-
-    <cmd name="ViewToolbar" _label="Show _Toolbar" type="toggle"
-      _tip="Change the visibility of the toolbar" state="1"/>
-
-    <cmd name="ViewStatusBar" _label="Show _Status Bar" type="toggle"
-      _tip="View/Hide the Status Bar" state="1"/>
-
-    <cmd name="ViewSideBar" _label="Show Side _Bar" type="toggle"
-      _tip="View/Hide the Side Bar" state="1"/>
-
-    <cmd name="HelpSubmitBug" _label="Submit Bug Report"
-      _tip="Submit a bug report using Bug Buddy"/>
-
-    <cmd name="HelpOpenFAQ" _label="_Frequently Asked Questions" 
-      _tip="Open the Frequently Asked Questions webpage"/>
-
-    <cmd name="SendReceive"
-     _tip="Send queued items and retrieve new items"
-     pixtype="pixbuf"/>
-
-    <cmd name="ForgetPasswords"
-     _tip="Forget remembered passwords so you will be prompted for them again"/>
-
-    <cmd name="Settings" pixtype="stock" pixname="gtk-preferences"/>
-
-    <cmd name="ToggleOffline" 
-      _label="Work _Offline"
-      _tip="Toggle whether we are working offline."/>
-
-    <cmd name="HelpAbout" _label="About Evolution..."
-      _tip="Show information about Evolution"
-      pixtype="stock" pixname="gtk-about"/>
-  </commands>
-
-  <menu>
-    <submenu name="File" _label="_File">
-      <submenu name="New" _label="_New" pixtype="stock" pixname="gtk-new">
-	<placeholder name="ComponentItems"/>
-      </submenu>
-
-      <menuitem name="OpenNewWindow" verb="" pixtype="pixbuf"/>
-
-      <separator f="" name="eshell4"/>
-      
-      <menuitem name="SendReceive" verb="" _label="Send / _Receive"
-	pixtype="pixbuf" accel="F9"/>
-
-      <placeholder name="FileOps"/>
-
-      <separator f="" name="eshell1"/>
-      
-      <menuitem name="FileImporter" verb=""
-	_label="I_mport..."
-	_tip="Import data from other programs"
-	pixtype="pixbuf"/>
-
-      <placeholder name="Print" delimit="top">
-        <menuitem name="FilePageSetup" verb="" pixtype="pixbuf"/>
-      </placeholder>
-
-<!--
-      <placeholder name="ComponentPlaceholder"/>
--->
-
-      <separator f="" name="eshell5"/>
-
-      <placeholder name="EmptyTrashPlaceholder"/>
-
-
-      <menuitem name="ForgetPasswords" verb="" _label="_Forget Passwords"/>
-
-      <menuitem name="ToggleOffline" verb=""
-	_label="_Work Offline"
-	pixtype="pixbuf"/>
-      
-      <menuitem name="FileClose" verb=""
-	_label="_Close Window"
-        pixtype="pixbuf"/>
-
-      <menuitem name="FileExit" verb="FileExit"
-	pixtype="pixbuf"/>
-    </submenu>
-
-    <submenu name="Edit" _label="_Edit">
-      <placeholder name="EditPlaceholder"/>
-      <separator/>
-      <menuitem name="PilotSettings" verb="" _label="_Synchronization Options..." _tip="Set up Pilot configuration"/>
-      <placeholder name="MailFilterTools"/>
-      <placeholder name="MailVFolderTools"/>
-
-      <placeholder name="PluginManagerPlaceholder"/>
-
-      <menuitem name="Settings" verb="" _label="Prefere_nces" _tip="Change Evolution's settings" accel="*Control**Shift*s"/>
-    </submenu>
-
-    <submenu name="View" _label="_View">
-      <placeholder name="ViewBegin"/>
-      <submenu name="Window" _label="_Window"/>
-      <submenu name="layout" _label="Lay_out">
-      <menuitem name="ViewToolbar" id="ViewToolbar" verb=""/>
-      <menuitem name="ViewStatusBar" id="ViewStatusBar"/>
-      <menuitem name="ViewSideBar" id="ViewSideBar"/>
-      </submenu>
-      <placeholder name="ViewPreview"/>
-      <submenu name="Buttons" _label="_Switcher Appearance">
-            <menuitem name="ViewButtonsIconText" id="ViewButtonsIconText" verb=""/>
-            <menuitem name="ViewButtonsIcon" id="ViewButtonsIcon" verb=""/>
-            <menuitem name="ViewButtonsText" id="ViewButtonsText" verb=""/>
-            <menuitem name="ViewButtonsGnome" id="ViewButtonsToolbar" verb=""/>
-            <separator f="" name="Switcher1"/>
-            <menuitem name="ViewButtonsHide" id="ViewButtonsHide" verb=""/>
-      </submenu>
-      <placeholder name="ViewAfterControl"/>
-    </submenu>
-
-    <placeholder name="FolderPlaceholder">
-    </placeholder>
-
-    <placeholder name="MessagePlaceholder">
-    </placeholder>
-
-    <placeholder name="ActionsPlaceholder">
-    </placeholder>
-
-    <placeholder name="SearchPlaceholder">
-    </placeholder>
-
-    <submenu name="Help" _label="_Help">
-
-      <placeholder name="BuiltMenuItems"/>
-
-      <menuitem name="QuickReference" verb=""
-        _label="_Quick Reference"/>
-
-      <separator f="" name="eshell2"/>
-      <placeholder name="PlaceHolderDebug"/>
-
-      <menuitem name="HelpOpenFAQ" verb=""
-	_label="Evolution _FAQ"
-	pixtype="pixbuf"/> 
-
-      <menuitem name="HelpSubmitBug" verb=""
-	_label="Submit _Bug Report"/>
-
-      <separator f="" name="eshell4"/>
-
-      <menuitem name="HelpAbout" verb=""
-	_label="_About"/>
-
-    </submenu>
-  </menu>
-
-  <dockitem name="Toolbar" relief="none" behavior="exclusive" config="0" _tip="Main toolbar" look="system">
-    <control name="NewComboButton"/>
-    <separator f="" name="eshell4"/>
-
-    <toolitem name="SendReceive" verb="SendReceive"
-     _label="Send / Receive" priority="1"
-     pixtype="pixbuf"/>
-
-    <separator f="" name="global1"/>
-
-  </dockitem>
-
-  <popups>
-    <popup name="NewPopup">
-    	<placeholder name="ComponentItems"/>
-    </popup>
-  </popups>
-
-</Root>