Add profiler so that it gets disted properly

2005-05-13  Rodney Dawes  <dobey@novell.com>

	* plugins/Makefile.am (DIST_SUBDIRS): Add profiler so that it gets
	disted properly

2005-05-13  Rodney Dawes  <dobey@novell.com>

	* Makefile.am: Add new em-folder-utils.[ch] abstraction

	* em-folder-browser.c: Update for new menu layout
	Add new methods to handle the actions that were previously only
	available from the context menu when right-clicking on a folder

	* em-folder-selector.c (emfs_response): Just call emfu_folder_create
	if the user wants to create a new folder in the selector dialog
	(em_folder_selector_get_selected_path): Clean up the code to fix a
	couple potential crashes

	* em-folder-tree.[ch]: Add methods to get pointers to a CamelFolder or
	CamelFolderInfo object for the selected item in the tree
	Add a method to get a pointer to an EMFolderTreeModelStoreInfo object
	for the selected store in the tree
	Move folder operations out into em-folder-utils.[ch] so that they
	are abstracted from the tree and can be used by methods other than
	the internal context menu

	* em-folder-utils.[ch]: Move the folder operations code to here

	* em-folder-view.c: Update for the new menu layout
	Fix Mark as Read/Unread in the context menu to only show up in the list

	* mail-component.c (create_item): Just call emfu_folder_create here
	when the user requests to create a new folder from the New toolbar item

2005-05-13  Rodney Dawes  <dobey@novell.com>

	* org-gnome-mailing-list-actions.xml: Update for the new menu layout

2005-05-13  Rodney Dawes  <dobey@novell.com>

	* org-gnome-plugin-manager.xml: Update for new menu layout

2005-05-13  Rodney Dawes  <dobey@novell.com>

	* org-gnome-save-attachments.xml: Update for new menu layout

2005-05-13  Rodney Dawes  <dobey@novell.com>

	* e-shell-window.c (setup_widgets): Update for the new menu layout by
	putting the "component" switching items under the "Tools" menu

2005-05-13  Rodney Dawes  <dobey@novell.com>

	* *.xml: Update to the new menu layout

2005-05-13  Rodney Dawes  <dobey@novell.com>

	* e-filter-bar.[ch]: Update for the new menu layout

svn path=/trunk/; revision=29354

9 files changed, 300 insertions, 203 deletions

diff --git a/ui/ChangeLog b/ui/ChangeLog
index 478e2ffe74..243551ce2f 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-13  Rodney Dawes  <dobey@novell.com>
+
+	* *.xml: Update to the new menu layout
+
 2005-05-06  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #301459
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
index 5e90d9f01c..4ba98187fa 100644
--- a/ui/evolution-addressbook.xml
+++ b/ui/evolution-addressbook.xml
@@ -105,9 +105,8 @@
       </placeholder>
     </submenu>
 
+    <placeholder name="ActionsPlaceholder">
     <submenu name="Actions" _label="_Actions">
-      <placeholder name="ComponentActionsPlaceholder">
-	<separator f="" name="eadbk4"/>
 	<menuitem name="ContactsSendContactToOther"
 		  _label="_Forward Contact..." verb=""/>
 
@@ -119,8 +118,8 @@
 
 	<menuitem name="ContactsCopyToFolder" _label="_Copy to Folder..." verb=""/>
 	<menuitem name="ContactsMoveToFolder" _label="_Move to Folder..." verb=""/>
-      </placeholder>
     </submenu>
+    </placeholder>
 
   </menu>
 
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
index fa0ad0a63a..046c84144f 100644
--- a/ui/evolution-calendar.xml
+++ b/ui/evolution-calendar.xml
@@ -67,13 +67,12 @@
 
      </submenu>
 
+    <placeholder name="ActionsPlaceholder">
     <submenu name="Actions" _label="_Actions">
-      <placeholder name="ComponentActionsPlaceholder">
-        <separator/>
 	<menuitem name="PublishFreeBusy" verb="" _label="_Publish Free/Busy Information"/>
 	<menuitem name="CalendarPurge" verb=""/>
-      </placeholder>
     </submenu>
+    </placeholder>
   </menu>
 
   <dockitem name="Toolbar">
diff --git a/ui/evolution-mail-global.xml b/ui/evolution-mail-global.xml
index 532fcc7b9e..1f1bda2498 100644
--- a/ui/evolution-mail-global.xml
+++ b/ui/evolution-mail-global.xml
@@ -5,11 +5,6 @@
     <cmd name="EmptyTrash"
      _tip="Permanently remove all deleted messages from all folders"/>
 
-    <cmd name="MailCompose"
-     _tip="Open a window for composing a mail message"
-     pixtype="pixbuf"
-     accel="*Control**Shift*m"/>
-
     <cmd name="MailPost"
      _tip="Post a message to a Public folder"
      accel="*Control**Alt*m"/>
@@ -18,6 +13,19 @@
      _tip="Cancel the current mail operation"
      pixtype="stock" pixname="gtk-stop"/>
 
+    <cmd name="FolderCreate"
+     _tip="Create a new folder for storing mail"
+     accel="*Control**Shift*f"
+     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"/>
 
@@ -29,17 +37,39 @@
 
     <cmd name="ViewPreview"
      _tip="Show message preview window"
-     accel="*Control*grave"
+     accel="*Control*m"
      type="toggle"/>
 
   </commands>
 
   <menu>
 
+    <submenu name="File">
+      <placeholder name="EmptyTrashPlaceholder">
+      <menuitem name="EmptyTrash" verb="" _label="Empty _Trash" pixtype="stock" pixname="gtk-delete"/>
+      </placeholder>
+    </submenu>
+
     <submenu name="View" _label="_View">
-      <menuitem name="ViewPreview" verb="" _label="_Preview Pane"/>
+      <placeholder name="ViewPreview">
+        <menuitem name="ViewPreview" verb="" _label="Message _Preview"/>
+      </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>
 
@@ -49,47 +79,45 @@
         <placeholder name="MailMessageEdit"/>
         <placeholder name="MailListEditFlags"/>
       </placeholder>
-    </submenu>
-
-    <submenu name="Actions" _label="_Actions">
-      <placeholder name="ComponentActionsPlaceholder">
-        <menuitem name="ActionCompose" verb="MailCompose" _label="Compose _New Message"/>
-        <menuitem name="ActionPost" verb="MailPost" _label="Post Ne_w Message"/>
-	<menuitem name="ActionStop" verb="MailStop" _label="Cancel"/>
-
-	<separator f="" name="emailglobal"/>
-
-        <placeholder name="MailMessageActions"/>
 
-        <placeholder name="MailListActions"/>
+      <placeholder name="MailFilterTools">
+        <menuitem name="ToolsFilters" verb="" _label="Message F_ilters"/>
+      </placeholder>
 
-        <menuitem name="EmptyTrash" verb="" _label="Empty _Trash"/>
+      <placeholder name="MailVFolderTools">
+        <menuitem name="ToolsVFolders" verb="" _label="Search F_olders"/>
       </placeholder>
     </submenu>
 
-    <submenu name="Tools">
+    <placeholder name="FolderPlaceholder">
+      <submenu name="Folder" _label="F_older">
 
-      <placeholder name="ComponentPlaceholder">
+        <menuitem name="FolderCreate" verb="" _label="_New..." pixtype="pixbuf"/>
+<!--
+        <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
+-->
+        <menuitem name="ToolsSubscriptions" verb="" _label="_Subscriptions"/>
 
-        <placeholder name="MailFilterTools">
-          <menuitem name="ToolsFilters" verb="" _label="_Filters..."/>
-        </placeholder>
+ 	<separator f="" name="Folder1"/>
 
-	<separator f="" name="emailglobal2"/>
+        <menuitem name="FolderCopy" verb="" _label="_Copy Folder To..."/>
+        <menuitem name="FolderMove" verb="" _label="_Move Folder To..."/>
 
-        <placeholder name="MailVFolderTools">
-          <menuitem name="ToolsVFolders" verb="" _label="vFolder _Editor..."/>
-        </placeholder>
+ 	<separator f="" name="Folder2"/>
 
-	<separator f="" name="emailglobal3"/>
+        <placeholder name="MessagesInFolder"/>
 
-        <menuitem name="ToolsSubscriptions" verb="" _label="S_ubscribe to Folders..."/>
+ 	<separator f="" name="Folder3"/>
 
-	<separator f="" name="emailglobal4"/>
+ 	<placeholder name="FolderOps"/>        
 
-      </placeholder>
+      </submenu>
+    </placeholder>
 
+    <submenu name="Tools">
+      <placeholder name="ComponentPlaceholder"/>
     </submenu>
+
   </menu>
 
   <dockitem name="Toolbar">
diff --git a/ui/evolution-mail-list.xml b/ui/evolution-mail-list.xml
index 072350a65b..bfb8757e02 100644
--- a/ui/evolution-mail-list.xml
+++ b/ui/evolution-mail-list.xml
@@ -28,30 +28,30 @@
 
     <cmd name="ChangeFolderProperties"
      _tip="Change the properties of this folder"
-     pixtype="stock" pixname="gtk-properties"/>
+     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"/>
+
+    <cmd name="FolderRename"
+     _tip="Change the name of this folder"/>
+
     <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="ViewHideRead"  _tip="Temporarily hide all messages that have already been read"
+     type="radio" group="Message_Filter"/>
 
-    <cmd name="ViewHideSelected"
-     _tip="Temporarily hide the selected messages"
-     pixtype="pixbuf"/>
+    <cmd name="ViewHideSelected" _tip="Temporarily hide the selected messages"
+     type="radio" group="Message_Filter"/>
 
-    <cmd name="ViewShowAll"
-     _tip="Show messages that have been temporarily hidden"
-     pixtype="pixbuf"/>
+    <cmd name="ViewShowAll" _tip="Show messages that have been temporarily hidden"
+     type="radio" group="Message_Filter"/>
 
     <cmd name="ViewThreaded"
      _tip="Threaded Message list"
@@ -66,54 +66,76 @@
 
   <menu>
 
-    <submenu name="File">
-      <placeholder name="ComponentPlaceholder">
-        <separator name="mail-list-folder"/>
-        <submenu name="Folder" _label="_Folder">
-           <menuitem name="ChangeFolderProperties" verb="" _label="_Properties"/>
-        </submenu>
-      </placeholder>
-    </submenu>
+    <submenu name="View">
 
-    <submenu name="Edit" _label="_Edit">
-      <placeholder name="EditPlaceholder">
-        <placeholder name="MailListEdit">
-          <menuitem name="EditSelectAll" verb="" _label="Select _All"/>
-          <menuitem name="EditSelectThread" verb="" _label="Select _Thread"/>
-          <menuitem name="EditInvertSelection" verb="" _label="_Invert Selection"/>
+      <placeholder name="MailMessageFilter">
+<!--
+        <submenu name="FilterMessages" _label="Show _Messages">
 
-	  <separator f="" name="emaillist2"/>
-        </placeholder>
+          <menuitem name="ViewShowAll" verb="" _label="_All"/>
+	  <menuitem name="ViewHideSelected" verb="" _label="_Selected Messages"/>
+          <menuitem name="ViewHideRead" verb="" _label="Un_read Messages"/>
 
-        <placeholder name="MailListEditFlags">
-          <menuitem name="MessageMarkAllAsRead" verb="" _label="Mark All as _Read"/>
-        </placeholder>
+	</submenu>
+-->
       </placeholder>
-    </submenu>
 
-    <submenu name="View">
       <placeholder name="MailMessageView">
-        <menuitem name="ViewThreaded" verb="" _label="_Threaded Message List"/>
+        <menuitem name="ViewThreaded" verb="" _label="Group By _Threads"/>
         <menuitem name="HideDeleted" verb="" _label="Hide _Deleted Messages"/>
-
-  	<separator f="" name="emaillist"/>
       </placeholder>
 
       <placeholder name="MailListView">
 	<separator f="" name="emaillist"/>
-        <menuitem name="ViewHideSelected" verb="" _label="Hide S_elected Messages"/>
-        <menuitem name="ViewHideRead" verb="" _label="Hide _Read Messages"/>
-        <menuitem name="ViewShowAll" verb="" _label="Sh_ow Hidden 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="MessageMarkAllAsRead" verb="" _label="Mark Me_ssages as Read"/>
+          <menuitem name="FolderExpunge" verb="" _label="E_xpunge"/>
+        </placeholder>
+
+ 	<placeholder name="FolderOps">
+	  <menuitem name="FolderRename" verb="" _label="_Rename..."/>
+	  <menuitem name="FolderDelete" verb="" _label="_Delete" pixtype="stock" pixname="gtk-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">
-          <menuitem name="FolderExpunge" verb="" _label="E_xpunge"/>
         </placeholder>
       </placeholder>
     </submenu>
+-->
+
   </menu>
 
 </Root>
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index 1d36d45a63..4bfe46ad71 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -7,7 +7,7 @@
 
     <cmd name="CaretMode"
     _tip="Show a blinking cursor in the body of displayed messages"
-    type = "toggle" state = "0" accel="F7"/>
+    type="toggle" state="0" accel="F7"/>
 
     <cmd name="EditCut"
      _tip="Cut selected message(s) to the clipboard"
@@ -49,10 +49,6 @@
      accel="*Control*y"
      pixtype="pixbuf"/>
 
-    <cmd name="MessageFilterJunk"
-     _tip="Filter the selected messages for junk status"
-     pixtype="pixbuf"/>
-
     <cmd name="MessageCopy"
      _tip="Copy selected messages to another folder"
      accel="*Control**Shift*y"
@@ -109,6 +105,15 @@
      _tip="Mark the selected message(s) as not being junk"
      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 message(s) to another folder"
      accel="*Control**Shift*v"
@@ -146,17 +151,17 @@
 
     <cmd name="MessageSaveAs"
      _tip="Save the message as a text file"
-     accel="*Control**Alt*s"
+     accel="*Control*s"
      pixtype="stock" pixname="gtk-save-as"/>
 
     <cmd name="MessageSearch"
      _tip="Search for text in the body of the displayed message"
-     accel="*Control*s"
+     accel="*Control**Alt*f"
      pixtype="stock" pixname="gtk-find"/>
 
     <cmd name="MessageUndelete"
      _tip="Un-delete the selected messages"
-     accel="*Control*u"
+     accel="*Control**Shift*d"
      pixtype="stock" pixname="gtk-undelete"/>
 
     <cmd name="PrintMessage"
@@ -166,12 +171,17 @@
 
     <cmd name="PrintPreviewMessage"
      _tip="Preview the message to be printed"
+     accel="*Control**Shift*p"
      pixtype="stock" pixname="gtk-print-preview"/>
 
     <cmd name="PrintSetup"
      _tip="Set up the page settings for your current printer"
      pixtype="pixbuf"/>
 
+    <cmd name="SelectAllText"
+     _tip="Select all the text in a message"
+     accel="*Control**Alt*a"/>
+
     <cmd name="ToolsFilterMailingList"
      _tip="Create a rule to filter messages to this mailing list"/>
 
@@ -198,10 +208,11 @@
 
     <cmd name="ViewFullHeaders"
      _tip="Show message with all email headers"
-     type="radio" group="message_display"/>
+     type="toggle" state="0"/>
 
     <cmd name="ViewLoadImages"
-     _tip="Force images in HTML mail to be loaded"/>
+     _tip="Force images in HTML mail to be loaded"
+     accel="*Control*i" pixtype="pixbuf"/>
 
     <cmd name="ViewNormal"
      _tip="Show message in the normal style"
@@ -209,19 +220,19 @@
 
     <cmd name="ViewSource"
      _tip="Show the raw email source of the message"
-     type="radio" group="message_display"/>
+     accel="*Control*u"/>
 
     <cmd name="TextZoomIn"
     _tip="Increase the text size"
-    accel="*Control*8"/>
+    accel="*Control*plus"/>
 
     <cmd name="TextZoomOut"
     _tip="Decrease the text size"
-    accel="*Control*0"/>
+    accel="*Control*minus"/>
 
     <cmd name="TextZoomReset"
     _tip="Reset the text to its original size"
-    accel="*Control*9"/>
+    accel="*Control*0"/>
 
   </commands>
 
@@ -240,8 +251,7 @@
 
     <submenu name="File">
       <placeholder name="FileOps">
-        <menuitem name="MessageOpen" verb="" _label="_Open Message"/>
-        <menuitem name="MessageSaveAs" verb="" _label="_Save As..."/>
+        <menuitem name="MessageSaveAs" verb="" _label="_Save Message..."/>
       </placeholder>
 
       <placeholder name="Print">
@@ -253,92 +263,77 @@
     <submenu name="Edit">
       <placeholder name="EditPlaceholder">
         <placeholder name="MailMessageEdit">
-          <menuitem name="EditCut" verb="" _label="Cu_t"/>
           <menuitem name="EditCopy" verb="" _label="_Copy"/>
-          <menuitem name="EditPaste" verb="" _label="_Paste"/>
 
 	  <separator f="" name="emaillist1"/>
 
-	  <menuitem name="MessageSearch" verb="" _label="S_earch in Message..."/>
+          <menuitem name="SelectAllText" verb="" _label="Select _All Text"/>
 
-	  <separator f="" name="emaillist2"/>
+ 	  <separator f="" name="emaillist2"/>
 
-          <menuitem name="MessageDelete" verb="" _label="_Delete"/>
-          <menuitem name="MessageUndelete" verb="" _label="_Undelete"/>
+          <menuitem name="MessageDelete" verb="" _label="_Delete Message"/>
+          <menuitem name="MessageUndelete" verb="" _label="_Undelete Message"/>
 
 	  <separator f="" name="emaillist3"/>
 
-          <menuitem name="MessageMarkAsRead" verb="" _label="Mar_k as Read"/>
-          <menuitem name="MessageMarkAsUnRead" verb="" _label="Mark as U_nread"/>
-          <menuitem name="MessageMarkAsImportant" verb="" _label="Mark as I_mportant"/>
-          <menuitem name="MessageMarkAsUnimportant" verb="" _label="Mark as Unimp_ortant"/>
-          <menuitem name="MessageMarkAsJunk" verb="" _label="Mark as _Junk"/>
-          <menuitem name="MessageMarkAsNotJunk" verb="" _label="Mark as _Not Junk"/>
+          <menuitem name="MessageSearch" verb="" _label="_Find in Message..."/>
         </placeholder>
       </placeholder>
     </submenu>
 
     <submenu name="View">
-      <placeholder name="MailMessageView">
-        <submenu name="GoTo" _label="_Go To">
-          <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"/>
+       <placeholder name="MailMessageZoom">
 	  <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>
-
-	<separator f="" name="emaillist"/>
-
-	<submenu name="TextSize" _label="Text Si_ze">
-	  <menuitem name="TextZoomOut" verb="" _label="S_maller"
-           pixtype="stock" pixname="gtk-zoom-out"/>
-	  <menuitem name="TextZoomIn" verb="" _label="_Larger"
-           pixtype="stock" pixname="gtk-zoom-in"/>
-	  
-	  <separator f="" name="emaillist"/>
-	  
-	  <menuitem name="TextZoomReset" verb="" _label="Original Si_ze"
-           pixtype="stock" pixname="gtk-zoom-100"/>
-	</submenu>
-        <submenu name="MessageDisplay" _label="_Message Display">
-          <menuitem name="ViewLoadImages" verb="" _label="Load _Images"/>
-          <menuitem name="CaretMode" verb="" _label="Caret _Mode"/>
+ 	  <menuitem name="TextZoomIn" verb="" _label="_Zoom In"
+		    pixtype="stock" pixname="gtk-zoom-in"/>
+ 	  <menuitem name="TextZoomOut" verb="" _label="Zoom _Out"
+		    pixtype="stock" pixname="gtk-zoom-out"/>
 
-	  <separator f="" name="emaillist"/>
+ 	  <menuitem name="TextZoomReset" verb="" _label="_Normal Size"
+		    pixtype="stock" pixname="gtk-zoom-100"/>
+
+       </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>
 
-          <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" _label="_Actions">
-      <placeholder name="ComponentActionsPlaceholder">
-        <placeholder name="MailMessageActions">
-          <menuitem name="MessageFollowUpFlag" verb="" _label="Follow _Up..."/>
+    <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">
+            <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>
 
-	  <separator f="" name="emaillist2"/>
+        <placeholder name="MailMessageActions">
 
+          <menuitem name="MessageReplyAll" verb="" _label="Reply"/>
+<!--          <menuitem name="MessagePostReply" verb="" _label="Post a Repl_y"/> -->
           <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>
-
-          <menuitem name="MessagePostReply" verb="" _label="Post a Repl_y"/>
-
-          <menuitem name="MessageEdit" verb="" _label="_Edit as New Message..."/>
 
 	  <separator f="" name="emaillist3"/>
 
@@ -347,36 +342,47 @@
 
 	  <separator f="" name="emaillist4"/>
 
-          <menuitem name="AddSenderToAddressbook" verb="" _label="A_dd Sender to Address Book"/>
+          <submenu name="MessageMarkAs" _label="Mar_k as">
+            <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="emaillist5"/>
+      	    <separator f="" name="emaillist2"/>
 
+            <menuitem name="MessageFollowUpFlag" verb="" _label="Follow _Up..."/>
+
+          </submenu>
           <menuitem name="MessageApplyFilters" verb="" _label="A_pply Filters"/>
-          <menuitem name="MessageFilterJunk" verb="" _label="Filter _Junk"/>
+          <menuitem name="MessageFilterJunk" verb="" _label="Check for _Junk"/>
         </placeholder>
-      </placeholder>
-    </submenu>
 
-    <submenu name="Tools" _label="_Tools">
-      <placeholder name="ComponentPlaceholder">
-        <placeholder name="MailFilterTools">
-          <submenu name="ToolsFilterFromMessage" _label="_Create Filter from Message">
+        <placeholder name="MessageRuleCreate">
+          <submenu name="CreateRule" _label="Create R_ule">
             <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..."/>
+
+            <separator f="" name="RuleSeparator"/>
+
+            <menuitem name="ToolsVFolderSubject" verb="" _label="VFolder on S_ubject..."/>
+            <menuitem name="ToolsVFolderSender" verb="" _label="VFolder on Sen_der..."/>
+            <menuitem name="ToolsVFolderRecipient" verb="" _label="VFolder on Recipients..."/>
+            <menuitem name="ToolsVFolderMailingList" verb="" _label="VFolder on _Mailing _List..."/>
+
           </submenu>
         </placeholder>
-        <placeholder name="MailVFolderTools">
-          <submenu name="ToolsVFolderFromMessage" _label="Create _vFolder 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>
+      </submenu>
+    </placeholder>
   </menu>
 
   <dockitem name="Toolbar">
diff --git a/ui/evolution-mail-messagedisplay.xml b/ui/evolution-mail-messagedisplay.xml
index c21b218cfc..7e4fcf30a9 100644
--- a/ui/evolution-mail-messagedisplay.xml
+++ b/ui/evolution-mail-messagedisplay.xml
@@ -24,21 +24,42 @@
     </submenu>
 
     <submenu name="View" _label="_View">
-      <placeholder name="MailMessageView"/>
+      <placeholder name="MailViewType"/>
+
+      <placeholder name="MailMessageZoom"/>
+      <separator f="" name="CharsetSeparator"/>
     </submenu>
 
-    <submenu name="Actions" _label="_Actions">
-      <placeholder name="ComponentActionsPlaceholder">
+    <placeholder name="MessagePlaceholder">
+      <submenu name="Message" _label="_Message">
+        <placeholder name="MessageTopActions"/>
+
+        <separator f="" name="emailglobal"/>
+
+        <placeholder name="MessageNavigation"/>
+
+        <placeholder name="MailListActions"/>
+
         <placeholder name="MailMessageActions"/>
-      </placeholder>
+
+        <separator f="" name="emaillist5"/>
+
+        <placeholder name="MessageRuleCreate"/>
+
     </submenu>
+    </placeholder>
+
+
+<!--
+    <placeholder name="MessagePlaceholder">
+      <submenu name="Message" _label="_Message">
 
-    <submenu name="Tools">
-      <placeholder name="ComponentPlaceholder">
-	<placeholder name="MailFilterTools"/>
-	<placeholder name="MailVFolderTools"/>
+        <placeholder name="ComponentActionsPlaceholder">
+          <placeholder name="MailMessageActions"/>
       </placeholder>
     </submenu>
+    </placeholder>
+-->
 
   </menu>
 
diff --git a/ui/evolution-tasks.xml b/ui/evolution-tasks.xml
index 1287c5e30c..c2cf160669 100644
--- a/ui/evolution-tasks.xml
+++ b/ui/evolution-tasks.xml
@@ -44,12 +44,11 @@
       </placeholder>
     </submenu>
 
+    <placeholder name="ActionsPlaceholder">
     <submenu name="Actions" _label="_Actions">
-      <placeholder name="ComponentActionsPlaceholder">
-        <separator/>
 	<menuitem name="TasksPurge" verb=""/>
-      </placeholder>
     </submenu>
+    </placeholder>
 
   </menu>
 
diff --git a/ui/evolution.xml b/ui/evolution.xml
index d8ab6065a5..a9fc5dabab 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -4,10 +4,10 @@
       _tip="Create a new window displaying this folder"
       accel="*Control**Shift*w"/>
 
-    <cmd name="FileClose" _label="Close" _tip="Close this window"
+    <cmd name="FileClose" _label="_Close Window" _tip="Close this window"
       pixtype="stock" pixname="gtk-close" accel="*Control*w"/>
 
-    <cmd name="FileExit" _label="E_xit" _tip="Exit the program"
+    <cmd name="FileExit" _label="_Quit" _tip="Exit the program"
       pixtype="stock" pixname="gtk-quit" accel="*Control*q"/>
 
     <cmd name="ViewButtonsIconText" _label="Icons _and text" 
@@ -57,27 +57,38 @@
 
       <menuitem name="OpenNewWindow" verb="" pixtype="pixbuf"/>
 
+      <separator f="" name="eshell4"/>
+      
+      <menuitem name="SendReceive" verb="" _label="_Send / Receive" accel="F9"/>
+
       <placeholder name="FileOps"/>
 
-      <separator f="" name="eshell4"/>
+      <separator f="" name="eshell1"/>
       
       <menuitem name="FileImporter" verb=""
 	_label="_Import..."
-	_tip="Import data from other programs" accel="*Control*i"
+	_tip="Import data from other programs"
 	pixtype="pixbuf"/>
 
       <placeholder name="Print" delimit="top"/>
 
+<!--
       <placeholder name="ComponentPlaceholder"/>
+-->
 
       <separator f="" name="eshell5"/>
 
+      <placeholder name="EmptyTrashPlaceholder"/>
+
+
+      <menuitem name="ForgetPasswords" verb="" _label="Forget _Passwords"/>
+
       <menuitem name="ToggleOffline" verb=""
-	_label="Work Offline"
+	_label="_Work Offline"
 	pixtype="pixbuf"/>
       
       <menuitem name="FileClose" verb=""
-	_label="_Close"/>
+	_label="_Close Window"/>
 
       <menuitem name="FileExit" verb="FileExit"/>
     </submenu>
@@ -85,33 +96,41 @@
     <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"/>
     </submenu>
 
     <submenu name="View" _label="_View">
       <placeholder name="ViewBegin"/>
-      <submenu name="Window" _label="_Window"/>
-      <submenu name="Buttons" _label="Window B_uttons">
+      <menuitem name="ViewToolbar" id="ViewToolbar" verb="" accel="*Control**Shift*o"/>
+      <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/>
+            <separator f="" name="Switcher1"/>
             <menuitem name="ViewButtonsHide" id="ViewButtonsHide" verb=""/>
       </submenu>
-      <menuitem name="ViewToolbar" id="ViewToolbar" verb="" accel="*Control**Shift*o"/>
       <placeholder name="ViewAfterControl"/>
     </submenu>
 
-    <submenu name="Actions" _label="_Actions">
-      <menuitem name="SendReceive" verb="" _label="_Send / Receive" accel="F9"/>
-      <menuitem name="ForgetPasswords" verb="" _label="Forget _Passwords"/>
-      <placeholder name="ComponentActionsPlaceholder"/>
-    </submenu>
+    <placeholder name="FolderPlaceholder">
+    </placeholder>
+
+    <placeholder name="MessagePlaceholder">
+    </placeholder>
+
+    <placeholder name="ActionsPlaceholder">
+    </placeholder>
 
     <submenu name="Tools" _label="_Tools">
       <placeholder name="ComponentPlaceholder"/>
-      <menuitem name="PilotSettings" verb="" _label="Pi_lot Settings..." _tip="Set up Pilot configuration"/>
     </submenu>
 
     <placeholder name="SearchPlaceholder">