Mail:

001-06-26  Peter Williams  <peterw@ximian.com>

	* folder-browser-ui.c: New file derived from folder-browser-factory.c.
	Contains the Bonobo UI code, split into three groups as described in
	ui/ChangeLog. Also contains the GalView stuff and the hookups into
	the Bonobo UI stuff.

	* folder-browser-factory.c: Move most of the UI stuff to folder-browser-ui.c.
	(control_activate): Add all three kinds of UI element to this folderbrowser.
	(control_deactivate): Remove all three kinds.

	* folder-browser-ui.h: New file. Prototypes functions to add UI elements
	to a FolderBrowser.

	* Makefile.am: Add folder-browser-ui.{c,h}

	* message-browser.c (PARENT_TYPE): Change to BONOBO_TYPE_WINDOW
	(message_browser_destroy): Chain to parent destroy function.
	(set_bonobo_ui): New function. Add the 'message' functions from the folder
	browser to our UI.
	(message_browser_close): BonoboVerbify this.

	* message-browser.h: Convert to BonoboWindow.

UI:

6-26  Peter Williams  <peterw@ximian.com>

	* evolution-mail-global.xml:
	* evolution-mail-list.xml:
	* evolution-mail-message.xml: New files. These are the result
	of splitting evolution-mail.xml into three pieces: one for the
	global mailer operations, one for the operations on a messagelist,
	and one for the operations on one or more messages.

	* evolution-mail-messagedisplay: New file. UI for the standalone
	message browser that you get when you double-click. Very skeleton.

	* evolution-mail.xml: Removed.

	* Makefile.am: Updated to install new files.

svn path=/trunk/; revision=10514

7 files changed, 650 insertions, 468 deletions

diff --git a/ui/ChangeLog b/ui/ChangeLog
index 95e4389829..f37db02e55 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,19 @@
+2001-06-26  Peter Williams  <peterw@ximian.com>
+
+	* evolution-mail-global.xml:
+	* evolution-mail-list.xml:
+	* evolution-mail-message.xml: New files. These are the result
+	of splitting evolution-mail.xml into three pieces: one for the
+	global mailer operations, one for the operations on a messagelist,
+	and one for the operations on one or more messages.
+
+	* evolution-mail-messagedisplay: New file. UI for the standalone
+	message browser that you get when you double-click. Very skeleton.
+	
+	* evolution-mail.xml: Removed.
+
+	* Makefile.am: Updated to install new files.
+	
 2001-06-25  jacob berkman  <jacob@ximian.com>
 
 	* evolution-mail.xml: add a preview toggle item
diff --git a/ui/Makefile.am b/ui/Makefile.am
index 2fc5d2f392..bae9374006 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -7,7 +7,10 @@ XML_FILES =				\
 	evolution-comp-editor.xml	\
 	evolution-event-editor.xml	\
 	evolution-executive-summary.xml	\
-	evolution-mail.xml		\
+	evolution-mail-message.xml	\
+	evolution-mail-list.xml		\
+	evolution-mail-global.xml	\
+	evolution-mail-messagedisplay.xml	\
 	evolution-message-composer.xml	\
 	evolution-subscribe.xml		\
 	evolution-task-editor.xml	\
diff --git a/ui/evolution-mail-global.xml b/ui/evolution-mail-global.xml
new file mode 100644
index 0000000000..70aa517a4d
--- /dev/null
+++ b/ui/evolution-mail-global.xml
@@ -0,0 +1,139 @@
+<Root>
+
+  <commands>   <!-- Alphabetical by name, yo -->
+
+    <cmd name="EmptyTrash"
+     _tip="Permanently remove all deleted messages from all folders"/>
+
+    <cmd name="ForgetPasswords"
+     _tip="Forget remembered passwords so you will be prompted for them again"/>
+
+    <cmd name="MailCompose"
+     _tip="Open a window for composing a mail message"
+     pixtype="pixbuf"/>
+
+    <cmd name="MailGetSend"
+     _tip="Send queued mail and retrieve new mail"
+     pixtype="pixbuf"/>
+
+    <cmd name="MailStop"
+     _tip="Cancel the current mail operation"
+     pixtype="stock" pixname="Stop"/>
+
+    <cmd name="ToolsFilters"
+     _tip="Create or edit rules for filtering new mail"/>
+
+    <cmd name="ToolsSettings"
+     _tip="Create or edit mail accounts and other preferences"
+     pixtype="pixbuf"/>
+
+    <cmd name="ToolsSubscriptions"
+     _tip="Subscribe or unsubscribe to folders on remote servers"/>
+
+    <cmd name="ToolsVFolders"
+     _tip="Create or edit virtual folder definitions"/>
+
+    <cmd name="ViewPreview"
+     _tip="Show message preview window"
+     type="toggle"  />
+
+  </commands>
+
+  <keybindings>
+
+  </keybindings>
+
+  <menu>
+
+    <submenu name="File">
+      <submenu name="New">
+        <placeholder name="NewFirstItem">
+          <menuitem name="MessageNew" verb="MailCompose"
+           accel="*Control*n" _label="_Mail Message"
+           pixtype="pixbuf"/>
+
+          <separator/>
+        </placeholder>
+      </submenu>
+    </submenu>
+
+    <submenu name="View">
+      <menuitem name="ViewPreview" verb="" _label="_Preview Pane"/>
+      <separator/>
+      <placeholder name="MailMessageView"/>
+      <placeholder name="MailListView"/>
+    </submenu>
+
+    <submenu name="Edit">
+      <placeholder name="MailListEdit"/>
+      <placeholder name="MailMessageEdit"/>
+      <placeholder name="MailListEditFlags"/>
+    </submenu>
+
+    <submenu name="Actions">
+      <placeholder name="Component">
+        <menuitem name="MailGetSend" verb="" _label="_Send / Receive"/>
+
+        <separator/>
+
+        <placeholder name="MailMessageActions"/>
+
+        <menuitem name="ForgetPasswords" verb="" _label="Forget _Passwords"/>
+
+        <placeholder name="MailListActions"/>
+
+        <menuitem name="EmptyTrash" verb="" _label="Empty _Trash"/>
+      </placeholder>
+    </submenu>
+
+    <submenu name="Tools">
+      <placeholder name="Component">
+
+        <menuitem name="ToolsSettings" verb="" _label="_Mail Settings..."/>
+
+        <separator/>
+
+        <placeholder name="MailFilterTools">
+          <menuitem name="ToolsFilters" verb="" _label="_Filters..."/>
+        </placeholder>
+
+        <separator/>
+
+        <placeholder name="MailVFolderTools">
+          <menuitem name="ToolsVFolders" verb="" _label="Virtual Folder _Editor..."/>
+        </placeholder>
+
+        <separator/>
+
+        <menuitem name="ToolsSubscriptions" verb="" _label="Manage _Subscriptions..."/>
+
+        <separator/>
+
+      </placeholder>
+    </submenu>
+  </menu>
+
+  <dockitem name="Toolbar">
+
+    <toolitem name="MailGetSend" verb=""
+     _label="Send / Receive" priority="1"
+     pixtype="pixbuf"/>
+
+    <toolitem name="MailCompose" verb=""
+     _label="Compose" priority="1"
+     pixtype="pixbuf"/>
+
+    <separator/>
+
+    <placeholder name="MailMessageToolbar"/>
+
+    <toolitem name="MailStop" verb=""
+     _label="Cancel"/>
+
+    <separator/>
+
+    <placeholder name="MailNextButtons"/>
+
+  </dockitem>
+
+</Root>
diff --git a/ui/evolution-mail-list.xml b/ui/evolution-mail-list.xml
new file mode 100644
index 0000000000..ed2111bdbe
--- /dev/null
+++ b/ui/evolution-mail-list.xml
@@ -0,0 +1,124 @@
+<Root>
+
+  <commands>   <!-- Alphabetical by name, yo -->
+
+    <cmd name="EditCut"
+     _tip="Cut selected messages"
+     accel="*Control*x"/>
+
+    <cmd name="EditCopy"
+     _tip="Copy selected messages"
+     accel="*Control*c"/>
+
+    <cmd name="EditPaste"
+     _tip="Paste message in the clipboard"
+     accel="*Control*v"/>
+
+    <cmd name="EditInvertSelection"
+     _tip="Select all and only the messages that are not currently selected"
+     accel="*Control*i"/>
+
+    <cmd name="EditSelectAll"
+     _tip="Select all visible messages"
+     accel="*Control*a"/>
+
+    <cmd name="EditSelectThread"
+     _tip="Select all messages in the same thread as the selected message"
+     accel="*Control*h"/>
+
+    <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*x"/>
+
+    <cmd name="HideDeleted"
+     _tip="Hide deleted messages rather than displaying them with a line through them"
+     type="toggle" />
+
+    <cmd name="MessageMarkAllAsRead"
+     _tip="Mark all visible messages as read"/>
+
+    <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" />
+
+  </commands>
+
+  <keybindings>
+
+  </keybindings>
+
+  <menu>
+
+<!--
+This already exists in evolution.xml. We merely provide
+the verb.
+
+    <submenu name="File">
+      <submenu name="Folder" _label="_Folder">
+         <menuitem name="FolderConfig" verb="" _label="_Properties..."/>
+      </submenu>
+    </submenu>
+-->
+
+    <submenu name="Edit">
+      <placeholder name="MailListEdit">
+        <menuitem name="EditCut" verb="" _label="Cut"/>
+        <menuitem name="EditCopy" verb="" _label="Copy"/>
+        <menuitem name="EditPaste" verb="" _label="Paste"/>
+
+        <separator/>
+
+        <menuitem name="EditSelectAll" verb="" _label="Select _All"/>
+        <menuitem name="EditSelectThread" verb="" _label="Select _Thread"/>
+        <menuitem name="EditInvertSelection" verb="" _label="_Invert Selection"/>
+
+        <separator/>
+      </placeholder>
+
+      <placeholder name="MailListEditFlags">
+        <menuitem name="MessageMarkAllAsRead" verb="" _label="Mark All as R_ead"/>
+      </placeholder>
+
+    </submenu>
+
+    <submenu name="View">
+      <placeholder name="MailMessageView">
+        <menuitem name="ViewThreaded" verb="" _label="_Threaded Message List"/>
+        <menuitem name="HideDeleted" verb="" _label="Hide _Deleted Messages"/>
+      </placeholder>
+
+      <placeholder name="MailListView">
+        <separator/>
+        <menuitem name="ViewShowAll" verb="" _label="Show _All"/>
+        <menuitem name="ViewHideSelected" verb="" _label="Hide S_elected Messages"/>
+        <menuitem name="ViewHideRead" verb="" _label="Hide _Read messages"/>
+      </placeholder>
+    </submenu>
+
+    <submenu name="Actions">
+      <placeholder name="Component">
+        <placeholder name="MailListActions">
+          <menuitem name="FolderExpunge" verb="" _label="_Expunge"/>
+        </placeholder>
+      </placeholder>
+    </submenu>
+  </menu>
+
+</Root>
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
new file mode 100644
index 0000000000..7602683a91
--- /dev/null
+++ b/ui/evolution-mail-message.xml
@@ -0,0 +1,308 @@
+<Root>
+
+  <commands>   <!-- Alphabetical by name, yo -->
+
+    <cmd name="MailNext"
+     _tip="Display the next message"
+     accel="f"/>
+
+    <cmd name="MailNextFlagged"
+     _tip="Display the next important message"/>
+
+    <cmd name="MailNextUnread"
+     _tip="Display the next unread message"
+     accel="n"/>
+
+    <cmd name="MailNextThread"
+     _tip="Display the next unread thread"
+     accel="t"/>
+
+    <cmd name="MailPrevious"
+     _tip="Display the previous message"
+     accel="b"/>
+
+    <cmd name="MailPreviousFlagged"
+     _tip="Display the previous important message"/>
+
+    <cmd name="MailPreviousUnread"
+     _tip="Display the previous unread message"
+     accel="p"/>
+
+    <cmd name="MessageApplyFilters"
+     _tip="Apply filter rules to the selected messages"
+     accel="*Control*y"/>
+
+    <cmd name="MessageCopy"
+     _tip="Copy selected messages to another folder"
+     accel="*Control*c"
+     pixtype="pixbuf" />
+
+    <cmd name="MessageDelete"
+     _tip="Mark the selected messages for deletion"
+     accel="*Control*d"/>
+
+    <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"
+     accel="*Control*j"/>
+
+    <cmd name="MessageForwardInline"
+     _tip="Forward the selected message in the body of a new message"
+     accel="*Control**Shift*j"/>
+
+    <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"/>
+
+    <cmd name="MessageMarkAsUnRead"
+     _tip="Mark the selected messages as not having been read"
+     accel="*Control**Shift*k"/>
+
+    <cmd name="MessageMove"
+     _tip="Move selected messages to another folder"
+     accel="*Control*m"
+     pixtype="pixbuf"/>
+
+    <cmd name="MessageOpen"
+     _tip="Open the selected message in a new window"
+     accel="*Control*o"/>
+
+    <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=""
+     pixtype="pixbuf"/>
+
+    <cmd name="MessageReplySender"
+     _tip="Compose a reply to the sender of the selected message"
+     accel="*Control*r"
+     pixtype="pixbuf"/>
+
+    <cmd name="MessageResend"
+     _tip="Open the selected message in the composer to re-send it"/>
+
+    <cmd name="MessageSaveAs"
+     _tip="Save the message as a text file"
+     accel="*Control**Alt*s"
+     pixtype="stock" pixname="Save"/>
+
+    <cmd name="MessageSearch"
+     _tip="Search for text in the body of the displayed message"
+     accel="*Control*e"/>
+
+    <cmd name="MessageUndelete"
+     _tip="Un-delete the selected messages"
+     accel="*Control*u"/>
+
+    <cmd name="PrintMessage"
+     _tip="Print message to the printer"
+     accel="*Control*p"
+     pixtype="pixbuf"/>
+
+    <cmd name="PrintPreviewMessage"
+     _tip="Previews the message to be printed"
+     pixtype="pixbuf"/>
+
+    <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 virtual folder for this mailing list"/>
+
+    <cmd name="ToolsVFolderRecipient"
+     _tip="Create a virtual folder for these recipients"/>
+
+    <cmd name="ToolsVFolderSender"
+     _tip="Create a virtual folder for this sender"/>
+
+    <cmd name="ToolsVFolderSubject"
+     _tip="Create a virtual folder for this subject"/>
+
+    <cmd name="ViewFullHeaders"
+     _tip="Show message with all email headers"
+     type="radio" group="message_display"/>
+
+    <cmd name="ViewLoadImages"
+     _tip="Force images in HTML mail to be loaded"/>
+
+    <cmd name="ViewNormal"
+     _tip="Show message in the normal style"
+     type="radio" group="message_display"/>
+
+    <cmd name="ViewSource"
+     _tip="Show the raw email source of the message"
+     type="radio" group="message_display"/>
+
+  </commands>
+
+  <keybindings>
+
+  </keybindings>
+
+  <menu>
+
+    <submenu name="File">
+      <placeholder name="FileOps">
+        <menuitem name="MessageOpen" verb="" _label="_Open Message"/>
+        <menuitem name="MessageResend" verb="" _label="_Re-send Message"/>
+        <menuitem name="MessageSaveAs" verb="" _label="_Save As..."/>
+      </placeholder>
+
+      <placeholder name="Print">
+        <menuitem name="PrintPreviewMessage" verb="" _label="Print Preview..."/>
+        <menuitem name="PrintMessage" verb="" _label="Print Message..."/>
+      </placeholder>
+    </submenu>
+
+    <submenu name="Edit">
+      <placeholder name="MailMessageEdit">
+        <menuitem name="MessageSearch" verb="" _label="S_earch Message"/>
+
+        <separator/>
+
+        <menuitem name="MessageDelete" verb="" _label="_Delete"/>
+        <menuitem name="MessageUndelete" verb="" _label="_Undelete"/>
+
+        <separator/>
+
+        <menuitem name="MessageMarkAsRead" verb="" _label="Mar_k As Read"/>
+        <menuitem name="MessageMarkAsUnRead" verb="" _label="Mark As U_nread"/>
+      </placeholder>
+    </submenu>
+
+    <submenu name="View">
+      <placeholder name="MailMessageView">
+        <submenu name="MessageDisplay" _label="_Message Display">
+          <menuitem name="ViewLoadImages" verb="" _label="Load _Images"/>
+
+          <separator/>
+
+          <menuitem name="ViewNormal" verb="" _label="_Normal Display"/>
+	  <menuitem name="ViewFullHeaders" verb="" _label="Show Full _Headers"/>
+	  <menuitem name="ViewSource" verb="" _label="Show Email _Source"/>
+        </submenu>
+      </placeholder>
+    </submenu>
+
+    <submenu name="Actions">
+      <placeholder name="Component">
+        <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 Message"/>
+          <submenu name="ForwardAs" _label="Forward As">
+            <menuitem verb="MessageForwardAttached" _label="Forward _Attached"/>
+            <menuitem verb="MessageForwardInline" _label="Forward _Inline"/>
+            <menuitem verb="MessageForwardQuoted" _label="Forward _Quoted"/>
+
+            <separator/>
+
+            <menuitem name="Redirect" verb=""
+  	   _label="Redirect (FIXME: implement me)"/>
+          </submenu>
+
+          <separator/>
+
+          <menuitem name="MessageMove" verb="" _label="_Move to Folder"/>
+          <menuitem name="MessageCopy" verb="" _label="_Copy to Folder"/>
+
+          <separator/>
+
+          <menuitem name="MessageApplyFilters" verb="" _label="_Apply Filters"/>
+        </placeholder>
+      </placeholder>
+    </submenu>
+
+    <submenu name="Tools">
+      <placeholder name="Component">
+
+        <placeholder name="MailFilterTools">
+          <submenu name="ToolsFilterFromMessage" _label="_Create Filter From Message">
+            <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>
+
+        <placeholder name="MailVFolderTools">
+          <submenu name="ToolsVFolderFromMessage" _label="Create _Virtual Folder From Message">
+            <menuitem name="ToolsVFolderSubject" verb="" _label="VFolder on _Subject..."/>
+            <menuitem name="ToolsVFolderSender" verb="" _label="VFolder on Se_nder..."/>
+            <menuitem name="ToolsVFolderRecipient" verb="" _label="VFolder on _Recipients..."/>
+            <menuitem name="ToolsVFolderMailingList" verb="" _label="VFolder on Mailing _List..."/>
+          </submenu>
+        </placeholder>
+      </placeholder>
+    </submenu>
+  </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/>
+
+      <toolitem name="MessageMove" verb=""
+       _label="Move"
+       pixtype="pixbuf"/>
+ 
+      <toolitem name="MessageCopy" verb=""
+       _label="Copy"
+       pixtype="pixbuf"/>
+
+      <separator/>
+
+      <toolitem name="PrintMessage" verb=""
+       _label="Print"
+       pixtype="stock" pixname="Print"/>
+
+      <toolitem name="MessageDelete" verb=""
+       _label="Delete"
+       pixtype="stock" pixname="Trash"/>
+    </placeholder>
+
+    <placeholder name="MailNextButtons">
+      <toolitem name="MailPrevious" verb=""
+       _label="Previous"
+       pixtype="stock" pixname="Back"/>
+
+      <toolitem name="MailNext" verb=""
+       _label="Next"
+       pixtype="stock" pixname="Forward"/>
+    </placeholder>
+  </dockitem>
+
+</Root>
diff --git a/ui/evolution-mail-messagedisplay.xml b/ui/evolution-mail-messagedisplay.xml
new file mode 100644
index 0000000000..6cbc0e82ee
--- /dev/null
+++ b/ui/evolution-mail-messagedisplay.xml
@@ -0,0 +1,59 @@
+<Root>
+  <commands>
+    <cmd name="MessageBrowserClose" _label="Close" _tip="Close this window"
+	 pixtype="stock" pixname="Close" accel="*Control*w"/>
+
+    <cmd name="BonoboCustomize" _label="Customize"
+	 _tip="Customize toolbars"
+	 pixtype="stock" pixname="Preferences"/>
+  </commands>
+
+  <menu>
+    <submenu name="File" _label="_File">
+      <placeholder name="FileOps"/>
+
+      <separator/>
+
+      <placeholder name="Print"/>
+
+      <separator/>
+
+      <menuitem name="MessageBrowserClose" verb=""
+		_label="_Close"/>
+
+    </submenu>
+
+    <submenu name="Edit" _label="_Edit">
+    </submenu>
+
+    <submenu name="View" _label="_View">
+      <placeholder name="MailMessageView"/>
+    </submenu>
+
+    <placeholder name="Component"/>
+
+    <submenu name="Actions" _label="_Actions">
+      <placeholder name="Component">
+        <placeholder name="MailMessageActions"/>
+      </placeholder>
+    </submenu>
+
+    <submenu name="Tools" _label="_Tools">
+      <placeholder name="Component">
+        <placeholder name="MailFilterTools"/>
+        <placeholder name="MailVFolderTools"/>
+      </placeholder>
+
+      <menuitem name="BonoboCustomize" verb=""
+		_label="Customi_ze Toolbars..." pos="bottom"/>
+    </submenu>
+
+  </menu>
+
+  <dockitem name="Toolbar" relief="none" behavior="exclusive"
+	    _tip="Main toolbar" hlook="text" vlook="icon">
+    <placeholder name="MailMessageToolbar"/>
+    <separator/>
+    <placeholder name="MailNextButtons"/>
+  </dockitem>
+</Root>
diff --git a/ui/evolution-mail.xml b/ui/evolution-mail.xml
deleted file mode 100644
index cf8851accc..0000000000
--- a/ui/evolution-mail.xml
+++ /dev/null
@@ -1,467 +0,0 @@
-<Root>
-
-  <commands>   <!-- Alphabetical by name, yo -->
-
-    <cmd name="EditCut"
-     _tip="Cut selected messages"
-     accel="*Control*x"/>
-
-    <cmd name="EditCopy"
-     _tip="Copy selected messages"
-     accel="*Control*c"/>
-
-    <cmd name="EditPaste"
-     _tip="Paste message in the clipboard"
-     accel="*Control*v"/>
-
-    <cmd name="EditInvertSelection"
-     _tip="Select all and only the messages that are not currently selected"
-     accel="*Control*i"/>
-
-    <cmd name="EditSelectAll"
-     _tip="Select all visible messages"
-     accel="*Control*a"/>
-
-    <cmd name="EditSelectThread"
-     _tip="Select all messages in the same thread as the selected message"
-     accel="*Control*h"/>
-
-    <cmd name="EmptyTrash"
-     _tip="Permanently remove all deleted messages from all folders"/>
-
-    <cmd name="FolderConfig"
-     _tip="Change the properties of this folder"
-     pixtype="pixbuf"/>
-
-    <cmd name="FolderExpunge"
-     _tip="Permanently remove all deleted messages from this folder"
-     accel="*Control*x"/>
-
-    <cmd name="ForgetPasswords"
-     _tip="Forget remembered passwords so you will be prompted for them again"/>
-
-    <cmd name="HideDeleted"
-     _tip="Hide deleted messages rather than displaying them with a line through them"
-     type="toggle" />
-
-    <cmd name="MailCompose"
-     _tip="Open a window for composing a mail message"
-     pixtype="pixbuf"/>
-
-    <cmd name="MailGetSend"
-     _tip="Send queued mail and retrieve new mail"
-     pixtype="pixbuf"/>
-
-    <cmd name="MailNext"
-     _tip="Display the next message"
-     accel="f"/>
-
-    <cmd name="MailNextUnread"
-     _tip="Display the next unread message"
-     accel="n"/>
-
-    <cmd name="MailNextFlagged"
-     _tip="Display the next important message"/>
-
-    <cmd name="MailNextThread"
-     _tip="Display the next unread thread"
-     accel="t"/>
-
-    <cmd name="MailPrevious"
-     _tip="Display the previous message"
-     accel="b"/>
-
-    <cmd name="MailPreviousUnread"
-     _tip="Display the previous unread message"
-     accel="p"/>
-
-    <cmd name="MailPreviousFlagged"
-     _tip="Display the previous important message"/>
-
-    <cmd name="MailStop"
-     _tip="Cancel the current mail operation"
-     pixtype="stock" pixname="Stop"/>
-
-    <cmd name="MessageApplyFilters"
-     _tip="Apply filter rules to the selected messages"
-     accel="*Control*y"/>
-
-    <cmd name="MessageCopy"
-     _tip="Copy selected messages to another folder"
-     accel="*Control*c"
-     pixtype="pixbuf" />
-
-    <cmd name="MessageDelete"
-     _tip="Mark the selected messages for deletion"
-     accel="*Control*d"/>
-
-    <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"
-     accel="*Control*j"/>
-
-    <cmd name="MessageForwardInline"
-     _tip="Forward the selected message in the body of a new message"
-     accel="*Control**Shift*j"/>
-
-    <cmd name="MessageForwardQuoted"
-     _tip="Forward the selected message quoted like a reply"/>
-
-    <cmd name="MessageMarkAllAsRead"
-     _tip="Mark all visible messages as read"/>
-
-    <cmd name="MessageMarkAsRead"
-     _tip="Mark the selected messages as having been read"
-     accel="*Control*k"/>
-
-    <cmd name="MessageMarkAsUnRead"
-     _tip="Mark the selected messages as not having been read"
-     accel="*Control**Shift*k"/>
-
-    <cmd name="MessageMove"
-     _tip="Move selected messages to another folder"
-     accel="*Control*m"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageOpen"
-     _tip="Open the selected message in a new window"
-     accel="*Control*o"/>
-
-    <cmd name="MessageReplyAll"
-     _tip="Compose a reply to all of the recipients of the selected message"
-     accel="*Control**Shift*r"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageReplySender"
-     _tip="Compose a reply to the sender of the selected message"
-     accel="*Control*r"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageReplyList"
-     _tip="Compose a reply to the mailing list of the selected message"
-     accel=""
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageResend"
-     _tip="Open the selected message in the composer to re-send it"/>
-
-    <cmd name="MessageSaveAs"
-     _tip="Save the message as a text file"
-     accel="*Control**Alt*s"
-     pixtype="stock" pixname="Save"/>
-
-    <cmd name="MessageSearch"
-     _tip="Search for text in the body of the displayed message"
-     accel="*Control*e"/>
-
-    <cmd name="MessageUndelete"
-     _tip="Un-delete the selected messages"
-     accel="*Control*u"/>
-
-    <cmd name="PrintMessage"
-     _tip="Print message to the printer"
-     accel="*Control*p"
-     pixtype="pixbuf"/>
-
-    <cmd name="PrintPreviewMessage"
-     _tip="Previews the message to be printed"
-     pixtype="pixbuf"/>
-
-    <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="ToolsFilters"
-     _tip="Create or edit rules for filtering new mail"/>
-
-    <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="ToolsSettings"
-     _tip="Create or edit mail accounts and other preferences"
-     pixtype="pixbuf"/>
-
-    <cmd name="ToolsSubscriptions"
-     _tip="Subscribe or unsubscribe to folders on remote servers"/>
-
-    <cmd name="ToolsVFolderMailingList"
-     _tip="Create a virtual folder for this mailing list"/>
-
-    <cmd name="ToolsVFolderRecipient"
-     _tip="Create a virtual folder for these recipients"/>
-
-    <cmd name="ToolsVFolders"
-     _tip="Create or edit virtual folder definitions"/>
-
-    <cmd name="ToolsVFolderSender"
-     _tip="Create a virtual folder for this sender"/>
-
-    <cmd name="ToolsVFolderSubject"
-     _tip="Create a virtual folder for this subject"/>
-
-    <cmd name="ViewFullHeaders"
-     _tip="Show message with all email headers"
-     type="radio" group="message_display"/>
-
-    <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="ViewLoadImages"
-     _tip="Force images in HTML mail to be loaded"/>
-
-    <cmd name="ViewNormal"
-     _tip="Show message in the normal style"
-     type="radio" group="message_display"/>
-
-    <cmd name="ViewPreview"
-     _tip="Show message preview window"
-     type="toggle"  />
-
-    <cmd name="ViewShowAll"
-     _tip="Show messages that have been temporarily hidden"
-     pixtype="pixbuf"/>
-
-    <cmd name="ViewSource"
-     _tip="Show the raw email source of the message"
-     type="radio" group="message_display"/>
-
-    <cmd name="ViewThreaded"
-     _tip="Threaded Message list"
-     accel="*Control*t"
-     type="toggle" />
-
-  </commands>
-
-  <keybindings>
-
-  </keybindings>
-
-  <menu>
-
-    <submenu name="File">
-      <submenu name="New">
-        <placeholder name="NewFirstItem">
-          <menuitem name="MessageNew" verb="MailCompose"
-           accel="*Control*n" _label="_Mail Message"
-           pixtype="pixbuf"/>
-
-          <separator/>
-        </placeholder>
-      </submenu>
-
-      <placeholder name="FileOps">
-        <menuitem name="MessageOpen" verb="" _label="_Open Message"/>
-        <menuitem name="MessageResend" verb="" _label="_Re-send Message"/>
-        <menuitem name="MessageSaveAs" verb="" _label="_Save As..."/>
-      </placeholder>
-
-      <separator/>
-
-      <submenu name="Folder" _label="_Folder">
-        <menuitem name="FolderConfig" verb="" _label="_Properties..."/>
-      </submenu>
-
-      <placeholder name="Print">
-        <menuitem name="PrintPreviewMessage" verb="" _label="Print Preview..."/>
-        <menuitem name="PrintMessage" verb="" _label="Print Message..."/>
-      </placeholder>
-    </submenu>
-
-    <submenu name="Edit">
-      <menuitem name="EditCut" verb="" _label="Cut"/>
-      <menuitem name="EditCopy" verb="" _label="Copy"/>
-      <menuitem name="EditPaste" verb="" _label="Paste"/>
-
-      <separator/>
-
-      <menuitem name="EditSelectAll" verb="" _label="Select _All"/>
-      <menuitem name="EditSelectThread" verb="" _label="Select _Thread"/>
-      <menuitem name="EditInvertSelection" verb="" _label="_Invert Selection"/>
-
-      <separator/>
-
-      <menuitem name="MessageSearch" verb="" _label="S_earch Message"/>
-
-      <separator/>
-
-      <menuitem name="MessageDelete" verb="" _label="_Delete"/>
-      <menuitem name="MessageUndelete" verb="" _label="_Undelete"/>
-
-      <separator/>
-
-      <menuitem name="MessageMarkAsRead" verb="" _label="Mar_k As Read"/>
-      <menuitem name="MessageMarkAsUnRead" verb="" _label="Mark As U_nread"/>
-      <menuitem name="MessageMarkAllAsRead" verb="" _label="Mark All as R_ead"/>
-    </submenu>
-
-    <submenu name="View">
-      <menuitem name="ViewPreview" verb="" _label="_Preview Pane"/>
-      <separator/>
-
-      <menuitem name="ViewThreaded" verb="" _label="_Threaded Message List"/>
-      <menuitem name="HideDeleted" verb="" _label="Hide _Deleted Messages"/>
-
-      <submenu name="MessageDisplay" _label="_Message Display">
-        <menuitem name="ViewLoadImages" verb="" _label="Load _Images"/>
-
-	<separator/>
-
-	<menuitem name="ViewNormal" verb="" _label="_Normal Display"/>
-	<menuitem name="ViewFullHeaders" verb="" _label="Show Full _Headers"/>
-	<menuitem name="ViewSource" verb="" _label="Show Email _Source"/>
-      </submenu>
-
-      <separator/>
-
-      <menuitem name="ViewShowAll" verb="" _label="Show _All"/>
-      <menuitem name="ViewHideSelected" verb="" _label="Hide S_elected Messages"/>
-      <menuitem name="ViewHideRead" verb="" _label="Hide _Read messages"/>
-    </submenu>
-
-    <submenu name="Actions">
-      <placeholder name="Component">
-        <menuitem name="MailGetSend" verb="" _label="_Send / Receive"/>
-
-        <separator/>
-
-        <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 Message"/>
-        <submenu name="ForwardAs" _label="Forward As">
-          <menuitem verb="MessageForwardAttached" _label="Forward _Attached"/>
-          <menuitem verb="MessageForwardInline" _label="Forward _Inline"/>
-          <menuitem verb="MessageForwardQuoted" _label="Forward _Quoted"/>
-
-          <separator/>
-
-          <menuitem name="Redirect" verb=""
-	   _label="Redirect (FIXME: implement me)"/>
-        </submenu>
-
-        <separator/>
-
-        <menuitem name="MessageMove" verb="" _label="_Move to Folder"/>
-        <menuitem name="MessageCopy" verb="" _label="_Copy to Folder"/>
-
-        <separator/>
-
-        <menuitem name="MessageApplyFilters" verb="" _label="_Apply Filters"/>
-        <menuitem name="ForgetPasswords" verb="" _label="Forget _Passwords"/>
-        <menuitem name="FolderExpunge" verb="" _label="_Expunge"/>
-
-        <menuitem name="EmptyTrash" verb="" _label="Empty _Trash"/>
-      </placeholder>
-    </submenu>
-
-    <submenu name="Tools">
-      <placeholder name="Component">
-
-        <menuitem name="ToolsSettings" verb="" _label="_Mail Settings..."/>
-
-        <separator/>
-
-        <menuitem name="ToolsFilters" verb="" _label="_Filters..."/>
-
-        <submenu name="ToolsFilterFromMessage" _label="_Create Filter From Message">
-          <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>
-
-        <separator/>
-
-        <menuitem name="ToolsVFolders" verb="" _label="Virtual Folder _Editor..."/>
-
-        <submenu name="ToolsVFolderFromMessage" _label="Create _Virtual Folder From Message">
-          <menuitem name="ToolsVFolderSubject" verb="" _label="VFolder on _Subject..."/>
-          <menuitem name="ToolsVFolderSender" verb="" _label="VFolder on Se_nder..."/>
-          <menuitem name="ToolsVFolderRecipient" verb="" _label="VFolder on _Recipients..."/>
-          <menuitem name="ToolsVFolderMailingList" verb="" _label="VFolder on Mailing _List..."/>
-        </submenu>
-
-        <separator/>
-
-        <menuitem name="ToolsSubscriptions" verb="" _label="Manage _Subscriptions..."/>
-
-        <separator/>
-
-      </placeholder>
-    </submenu>
-  </menu>
-
-  <dockitem name="Toolbar">
-
-    <toolitem name="MailGetSend" verb=""
-     _label="Send / Receive" priority="1"
-     pixtype="pixbuf"/>
-
-    <toolitem name="MailCompose" verb=""
-     _label="Compose" priority="1"
-     pixtype="pixbuf"/>
-
-    <separator/>
-
-    <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/>
-
-    <toolitem name="MessageMove" verb=""
-     _label="Move"
-     pixtype="pixbuf"/>
-
-    <toolitem name="MessageCopy" verb=""
-     _label="Copy"
-     pixtype="pixbuf"/>
-
-    <separator/>
-
-    <toolitem name="PrintMessage" verb=""
-     _label="Print"
-     pixtype="stock" pixname="Print"/>
-
-    <toolitem name="MessageDelete" verb=""
-     _label="Delete"
-     pixtype="stock" pixname="Trash"/>
-
-    <toolitem name="MailStop" verb=""
-     _label="Cancel"/>
-
-    <separator/>
-
-    <toolitem name="MailPrevious" verb=""
-     _label="Previous"
-     pixtype="stock" pixname="Back"/>
-
-    <toolitem name="MailNext" verb=""
-     _label="Next"
-     pixtype="stock" pixname="Forward"/>
-
-  </dockitem>
-
-</Root>