diff -up evolution-2.24.1/shell/e-shell-window-commands.c.switcher evolution-2.24.1/shell/e-shell-window-commands.c
--- evolution-2.24.1/shell/e-shell-window-commands.c.switcher	2008-10-13 10:32:56.000000000 +0200
+++ evolution-2.24.1/shell/e-shell-window-commands.c	2008-11-11 19:44:31.000000000 +0100
@@ -1215,11 +1215,11 @@ shell_line_status_changed_cb (EShell *sh
 }
 
 static void
-view_buttons_icontext_item_toggled_handler (BonoboUIComponent           *ui_component,
-					    const char                  *path,
-					    Bonobo_UIComponent_EventType type,
-					    const char                  *state,
-					    EShellWindow                *shell_window)
+switcher_buttons_icontext_item_toggled_handler (BonoboUIComponent           *ui_component,
+						const char                  *path,
+						Bonobo_UIComponent_EventType type,
+						const char                  *state,
+						EShellWindow                *shell_window)
 {
 	ESidebar *sidebar;
 
@@ -1228,11 +1228,11 @@ view_buttons_icontext_item_toggled_handl
 }
 
 static void
-view_buttons_icon_item_toggled_handler (BonoboUIComponent           *ui_component,
-					const char                  *path,
-					Bonobo_UIComponent_EventType type,
-					const char                  *state,
-					EShellWindow                *shell_window)
+switcher_buttons_icon_item_toggled_handler (BonoboUIComponent           *ui_component,
+					    const char                  *path,
+					    Bonobo_UIComponent_EventType type,
+					    const char                  *state,
+					    EShellWindow                *shell_window)
 {
 	ESidebar *sidebar;
 
@@ -1241,11 +1241,11 @@ view_buttons_icon_item_toggled_handler (
 }
 
 static void
-view_buttons_text_item_toggled_handler (BonoboUIComponent           *ui_component,
-					const char                  *path,
-					Bonobo_UIComponent_EventType type,
-					const char                  *state,
-					EShellWindow                *shell_window)
+switcher_buttons_text_item_toggled_handler (BonoboUIComponent           *ui_component,
+					    const char                  *path,
+					    Bonobo_UIComponent_EventType type,
+					    const char                  *state,
+					    EShellWindow                *shell_window)
 {
 	ESidebar *sidebar;
 
@@ -1254,11 +1254,11 @@ view_buttons_text_item_toggled_handler (
 }
 
 static void
-view_buttons_toolbar_item_toggled_handler (BonoboUIComponent           *ui_component,
-					   const char                  *path,
-					   Bonobo_UIComponent_EventType type,
-					   const char                  *state,
-					   EShellWindow                *shell_window)
+switcher_buttons_toolbar_item_toggled_handler (BonoboUIComponent           *ui_component,
+					       const char                  *path,
+					       Bonobo_UIComponent_EventType type,
+					       const char                  *state,
+					       EShellWindow                *shell_window)
 {
 	ESidebar *sidebar;
 
@@ -1267,18 +1267,18 @@ view_buttons_toolbar_item_toggled_handle
 }
 
 static void
-view_buttons_hide_item_toggled_handler (BonoboUIComponent           *ui_component,
-					const char                  *path,
-					Bonobo_UIComponent_EventType type,
-					const char                  *state,
-					EShellWindow                *shell_window)
+view_switcher_item_toggled_handler (BonoboUIComponent           *ui_component,
+				    const char                  *path,
+				    Bonobo_UIComponent_EventType type,
+				    const char                  *state,
+				    EShellWindow                *shell_window)
 {
 	ESidebar *sidebar;
 	gboolean is_visible;
 
 	sidebar = e_shell_window_peek_sidebar (shell_window);
 
-	is_visible = state[0] == '0';
+	is_visible = state[0] == '1';
 
 	e_sidebar_set_show_buttons (sidebar, is_visible);
 }
@@ -1359,20 +1359,20 @@ e_shell_window_commands_setup (EShellWin
 	bonobo_ui_component_add_verb_list_with_data (uic, actions_verbs, shell_window);
 	bonobo_ui_component_add_verb_list_with_data (uic, tools_verbs, shell_window);
 	bonobo_ui_component_add_verb_list_with_data (uic, help_verbs, shell_window);
-	bonobo_ui_component_add_listener (uic, "ViewButtonsIconText",
-					  (BonoboUIListenerFn)view_buttons_icontext_item_toggled_handler,
+	bonobo_ui_component_add_listener (uic, "SwitcherButtonsIconText",
+					  (BonoboUIListenerFn)switcher_buttons_icontext_item_toggled_handler,
 					  (gpointer)shell_window);
-	bonobo_ui_component_add_listener (uic, "ViewButtonsIcon",
-					  (BonoboUIListenerFn)view_buttons_icon_item_toggled_handler,
+	bonobo_ui_component_add_listener (uic, "SwitcherButtonsIcon",
+					  (BonoboUIListenerFn)switcher_buttons_icon_item_toggled_handler,
 					  (gpointer)shell_window);
-	bonobo_ui_component_add_listener (uic, "ViewButtonsText",
-					  (BonoboUIListenerFn)view_buttons_text_item_toggled_handler,
+	bonobo_ui_component_add_listener (uic, "SwitcherButtonsText",
+					  (BonoboUIListenerFn)switcher_buttons_text_item_toggled_handler,
 					  (gpointer)shell_window);
-	bonobo_ui_component_add_listener (uic, "ViewButtonsToolbar",
-					  (BonoboUIListenerFn)view_buttons_toolbar_item_toggled_handler,
+	bonobo_ui_component_add_listener (uic, "SwitcherButtonsToolbar",
+					  (BonoboUIListenerFn)switcher_buttons_toolbar_item_toggled_handler,
 					  (gpointer)shell_window);
-	bonobo_ui_component_add_listener (uic, "ViewButtonsHide",
-					  (BonoboUIListenerFn)view_buttons_hide_item_toggled_handler,
+	bonobo_ui_component_add_listener (uic, "ViewSwitcher",
+					  (BonoboUIListenerFn)view_switcher_item_toggled_handler,
 					  (gpointer)shell_window);
 	bonobo_ui_component_add_listener (uic, "ViewToolbar",
 					  (BonoboUIListenerFn)view_toolbar_item_toggled_handler,
diff -up evolution-2.24.1/shell/e-shell-window.c.switcher evolution-2.24.1/shell/e-shell-window.c
--- evolution-2.24.1/shell/e-shell-window.c.switcher	2008-10-13 10:32:56.000000000 +0200
+++ evolution-2.24.1/shell/e-shell-window.c	2008-11-11 19:47:56.000000000 +0100
@@ -674,14 +674,14 @@ setup_widgets (EShellWindow *window)
 	gtk_paned_set_position (GTK_PANED (priv->paned),
 				gconf_client_get_int (gconf_client, "/apps/evolution/shell/view_defaults/folder_bar/width", NULL));
 
-	/* The buttons */
+	/* The switcher */
 	visible = gconf_client_get_bool (gconf_client,
 						 "/apps/evolution/shell/view_defaults/buttons_visible",
 						 NULL);
 	bonobo_ui_component_set_prop (e_shell_window_peek_bonobo_ui_component (window),
-				      "/commands/ViewButtonsHide",
+				      "/commands/ViewSwitcher",
 				      "state",
-				      visible ? "0" : "1",
+				      visible ? "1" : "0",
 				      NULL);
 
 	e_sidebar_set_show_buttons (E_SIDEBAR (priv->sidebar), visible);
@@ -694,23 +694,23 @@ setup_widgets (EShellWindow *window)
 		switch (mode) {
 		case E_SIDEBAR_MODE_TEXT:
 			bonobo_ui_component_set_prop (e_shell_window_peek_bonobo_ui_component (window),
-						      "/commands/ViewButtonsText",
+						      "/commands/SwitcherButtonsText",
 						      "state", "1", NULL);
 			break;
 		case E_SIDEBAR_MODE_ICON:
 			bonobo_ui_component_set_prop (e_shell_window_peek_bonobo_ui_component (window),
-						      "/commands/ViewButtonsIcon",
+						      "/commands/SwitcherButtonsIcon",
 						      "state", "1", NULL);
 			break;
 		case E_SIDEBAR_MODE_BOTH:
 			bonobo_ui_component_set_prop (e_shell_window_peek_bonobo_ui_component (window),
-						      "/commands/ViewButtonsIconText",
+						      "/commands/SwitcherButtonsIconText",
 						      "state", "1", NULL);
 			break;
 
 		case E_SIDEBAR_MODE_TOOLBAR:
 			bonobo_ui_component_set_prop (e_shell_window_peek_bonobo_ui_component (window),
-						      "/commands/ViewButtonsToolbar",
+						      "/commands/SwitcherButtonsToolbar",
 						      "state", "1", NULL);
 			break;
 		}
@@ -1163,13 +1163,13 @@ e_shell_window_save_defaults (EShellWind
 				       style, NULL);
 	}
 
-	/* Button hiding setting */
+	/* Switcher hiding setting */
 	prop = bonobo_ui_component_get_prop (e_shell_window_peek_bonobo_ui_component (window),
-					     "/commands/ViewButtonsHide",
+					     "/commands/ViewSwitcher",
 					     "state",
 					     NULL);
 	if (prop) {
-		visible = prop[0] == '0';
+		visible = prop[0] == '1';
 		gconf_client_set_bool (client,
 				       "/apps/evolution/shell/view_defaults/buttons_visible",
 				       visible,
diff -up evolution-2.24.1/ui/evolution.xml.switcher evolution-2.24.1/ui/evolution.xml
--- evolution-2.24.1/ui/evolution.xml.switcher	2008-10-13 10:44:04.000000000 +0200
+++ evolution-2.24.1/ui/evolution.xml	2008-11-11 17:51:36.000000000 +0100
@@ -12,20 +12,20 @@
     <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="ViewSwitcher" _label="Show _Switcher" 
+      type="toggle" _tip="Show or Hide the Component Switcher"/>
 
-    <cmd name="ViewButtonsIcon" _label="_Icons Only" 
-      type="radio" group="button_display" _tip="Display window buttons with icons only"/>
+    <cmd name="SwitcherButtonsIconText" _label="Icons _and Text" 
+      type="radio" group="button_display" _tip="Display Component buttons with icons and text"/>
 
-    <cmd name="ViewButtonsText" _label="_Text Only" 
-      type="radio" group="button_display" _tip="Display window buttons with text only"/>
+    <cmd name="SwitcherButtonsIcon" _label="_Icons Only" 
+      type="radio" group="button_display" _tip="Display Component buttons with icons only"/>
 
-    <cmd name="ViewButtonsToolbar" _label="Tool_bar Style" 
-      type="radio" group="button_display" _tip="Display window buttons using the desktop toolbar setting"/>
+    <cmd name="SwitcherButtonsText" _label="_Text Only" 
+      type="radio" group="button_display" _tip="Display Component buttons with text only"/>
 
-    <cmd name="ViewButtonsHide" _label="_Hide Buttons" 
-      type="toggle" _tip="Hide window buttons"/>
+    <cmd name="SwitcherButtonsToolbar" _label="Tool_bar Style" 
+      type="radio" group="button_display" _tip="Display Component buttons using the desktop toolbar setting"/>
 
     <cmd name="ViewToolbar" _label="Show _Toolbar" type="toggle"
       _tip="Change the visibility of the toolbar" state="1"/>
@@ -130,13 +130,13 @@
       <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=""/>
+      <submenu name="Switcher" _label="_Switcher">
+            <menuitem name="ViewSwitcher" id="ViewSwitcher" verb=""/>
             <separator f="" name="Switcher1"/>
-            <menuitem name="ViewButtonsHide" id="ViewButtonsHide" verb=""/>
+            <menuitem name="SwitcherButtonsIconText" id="SwitcherButtonsIconText" verb=""/>
+            <menuitem name="SwitcherButtonsIcon" id="SwitcherButtonsIcon" verb=""/>
+            <menuitem name="SwitcherButtonsText" id="SwitcherButtonsText" verb=""/>
+            <menuitem name="SwitcherButtonsGnome" id="SwitcherButtonsToolbar" verb=""/>
       </submenu>
       <placeholder name="ViewAfterControl"/>
     </submenu>
