Kill EMMenu and EMPopup.

Also finish adapting Templates plugin to EPluginUI.
It was still leaning pretty hard on EMPopup.

7 files changed, 3 insertions, 1011 deletions

diff --git a/ui/Makefile.am b/ui/Makefile.am
index ebae928dee..a57b470dca 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -1,10 +1,3 @@
-XML_FILES =					\
-	evolution.xml				\
-	evolution-mail-message.xml		\
-	evolution-mail-list.xml			\
-	evolution-mail-global.xml		\
-	evolution-mail-messagedisplay.xml
-
 UI_FILES =					\
 	evolution-calendars.ui			\
 	evolution-contacts.ui			\
@@ -14,11 +7,10 @@ UI_FILES =					\
 	evolution-shell.ui			\
 	evolution-tasks.ui
 
-evolutionui_DATA = $(UI_FILES) $(XML_FILES)
+evolutionui_DATA = $(UI_FILES)
 
 EXTRA_DIST =					\
 	$(UI_FILES)				\
-	$(XML_FILES)				\
 	ChangeLog.pre-1-4
 
 -include $(top_srcdir)/git.mk
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.ui b/ui/evolution-mail.ui
index c676cf524e..4c607c9fa5 100644
--- a/ui/evolution-mail.ui
+++ b/ui/evolution-mail.ui
@@ -109,6 +109,8 @@
       <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'>
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>