From d6ad0c22a24fd871f31db3edff98b83765ce32ad Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Wed, 20 Jun 2012 22:04:39 -0400
Subject: Bug 678397 - Move "mail-to-task" actions to a submenu

Shortens the Message menu a little for low screen resolutions.
---
 ui/evolution-mail-reader.ui | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'ui/evolution-mail-reader.ui')

diff --git a/ui/evolution-mail-reader.ui b/ui/evolution-mail-reader.ui
index ffc16a980d..4096b8cd10 100644
--- a/ui/evolution-mail-reader.ui
+++ b/ui/evolution-mail-reader.ui
@@ -96,14 +96,16 @@
         </menu>
         <menuitem action='mail-filters-apply'/>
         <menuitem action='mail-check-for-junk'/>
-	<menuitem action='mail-remove-attachments'/>
+        <menuitem action='mail-remove-attachments'/>
         <menuitem action='mail-remove-duplicates'/>
         <separator/>
-        <menu action='mail-create-rule-menu'>
-          <menuitem action='mail-filter-on-subject'/>
-          <menuitem action='mail-filter-on-sender'/>
-          <menuitem action='mail-filter-on-recipients'/>
-          <menuitem action='mail-filter-on-mailing-list'/>
+        <menu action='mail-create-menu'>
+          <placeholder action='mail-conversion-actions'/>
+          <separator/>
+          <menuitem action='mail-filter-rule-for-subject'/>
+          <menuitem action='mail-filter-rule-for-sender'/>
+          <menuitem action='mail-filter-rule-for-recipients'/>
+          <menuitem action='mail-filter-rule-for-mailing-list'/>
           <separator/>
           <menuitem action='mail-search-folder-from-subject'/>
           <menuitem action='mail-search-folder-from-sender'/>
@@ -111,8 +113,6 @@
           <menuitem action='mail-search-folder-from-mailing-list'/>
         </menu>
         <placeholder name='mail-message-custom-menus'/>
-        <separator/>
-        <placeholder name='mail-message-actions'/>
       </menu>
     </placeholder>
   </menubar>
-- 
cgit v1.2.3