4 files changed, 10 insertions, 4 deletions
diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
index f38fa2e7d3..8bd41d4bb1 100644
--- a/ui/evolution-calendars.ui
+++ b/ui/evolution-calendars.ui
@@ -56,10 +56,15 @@
     <toolitem action='calendar-view-list'/>
 #endif
 #if EXPRESS
+    <separator/>
+    <toolitem action='preferences'/>
+#endif
+  </toolbar>
+  <toolbar name='close-toolbar'>
+#if EXPRESS
     <separator expand="true"/>
     <toolitem action='quit-calendar'/>
 #endif
-
   </toolbar>
   <popup name='calendar-popup'>
     <menuitem action='calendar-new'/>
diff --git a/ui/evolution-mail-reader.ui b/ui/evolution-mail-reader.ui
index ad0b401676..53cb8845d3 100644
--- a/ui/evolution-mail-reader.ui
+++ b/ui/evolution-mail-reader.ui
@@ -82,7 +82,7 @@
           <menuitem action="mail-mark-unimportant"/>
           <separator/>
           <menuitem action="mail-mark-junk"/>
-          <menuitem action="mail-mark-notjunk"/>
+          <menuitem action="mail-mark-not-junk"/>
           <separator/>
           <menuitem action="mail-flag-for-followup"/>
           <menuitem action="mail-flag-clear"/>
@@ -127,7 +127,7 @@
 #endif
       <toolitem action='mail-delete'/>
       <toolitem action='mail-mark-junk'/>
-      <toolitem action='mail-mark-notjunk'/>
+      <toolitem action='mail-mark-not-junk'/>
     </placeholder>
     <separator/>
     <placeholder name='mail-toolbar-navigation'>
diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui
index 7c4db78b85..cc1b9b5fd8 100644
--- a/ui/evolution-mail.ui
+++ b/ui/evolution-mail.ui
@@ -108,7 +108,7 @@
     <menuitem action='mail-popup-mark-important'/>
     <menuitem action='mail-popup-mark-unimportant'/>
     <menuitem action='mail-popup-mark-junk'/>
-    <menuitem action='mail-popup-mark-notjunk'/>
+    <menuitem action='mail-popup-mark-not-junk'/>
     <menuitem action='mail-popup-flag-for-followup'/>
     <menuitem action="mail-popup-flag-clear"/>
     <menuitem action="mail-popup-flag-completed"/>
diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
index 5e249daa2e..c051668290 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -94,4 +94,5 @@
     <placeholder name='toolbar-actions'/>
   </toolbar>
   <toolbar name='search-toolbar'/>
+  <toolbar name='close-toolbar'/>
 </ui>