diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c
index f479de3..b07a53a 100644
--- a/libnautilus-private/nautilus-global-preferences.c
+++ b/libnautilus-private/nautilus-global-preferences.c
@@ -462,6 +462,10 @@ static const PreferenceDefault preference_defaults[] = {
 	  NULL, NULL,
 	  "default_zoom_level"
 	},
+	{ NAUTILUS_PREFERENCES_LIST_VIEW_SHOW_EXPANDERS,
+	  PREFERENCE_BOOLEAN,
+	  GINT_TO_POINTER (TRUE)
+	},
 
 	/* Desktop Preferences */
 	{ NAUTILUS_PREFERENCES_DESKTOP_HOME_VISIBLE,
diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h
index 4386b35..f4b8a6b 100644
--- a/libnautilus-private/nautilus-global-preferences.h
+++ b/libnautilus-private/nautilus-global-preferences.h
@@ -165,8 +165,9 @@ enum
 #define NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_IN_REVERSE_ORDER	"list_view/default_sort_in_reverse_order"
 #define NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_ORDER		"list_view/default_sort_order"
 #define NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL		"list_view/default_zoom_level"
-#define NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_VISIBLE_COLUMNS	        "list_view/default_visible_columns"
-#define NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_COLUMN_ORDER	        "list_view/default_column_order"
+#define NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_VISIBLE_COLUMNS		"list_view/default_visible_columns"
+#define NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_COLUMN_ORDER		"list_view/default_column_order"
+#define NAUTILUS_PREFERENCES_LIST_VIEW_SHOW_EXPANDERS			"list_view/show_expanders"
 
 /* News panel */
 #define NAUTILUS_PREFERENCES_NEWS_MAX_ITEMS				"news/max_items"
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index 3143612..08e6cca 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -131,6 +131,7 @@ static gboolean			default_sort_reversed_auto_value;
 static NautilusZoomLevel        default_zoom_level_auto_value;
 static char **                  default_visible_columns_auto_value;
 static char **                  default_column_order_auto_value;
+static gboolean			list_view_show_expanders_auto_value;
 static GdkCursor *              hand_cursor = NULL;
 
 static GtkTargetList *          source_target_list = NULL;
@@ -583,7 +584,7 @@ button_press_callback (GtkWidget *widget, GdkEventButton *event, gpointer callba
 	static int click_count = 0;
 	int double_click_time;
 	int expander_size, horizontal_separator;
-	gboolean on_expander;
+	gboolean show_expanders, on_expander;
 
 	view = FM_LIST_VIEW (callback_data);
 	tree_view = GTK_TREE_VIEW (widget);
@@ -628,13 +629,15 @@ button_press_callback (GtkWidget *widget, GdkEventButton *event, gpointer callba
 		gtk_widget_style_get (widget,
 				      "expander-size", &expander_size,
 				      "horizontal-separator", &horizontal_separator,
+				      "show-expanders", &show_expanders,
 				      NULL);
 		/* TODO we should not hardcode this extra padding. It is
 		 * EXPANDER_EXTRA_PADDING from GtkTreeView.
 		 */
 		expander_size += 4;
-		on_expander = (event->x <= horizontal_separator / 2 +
-			       gtk_tree_path_get_depth (path) * expander_size);
+		on_expander = show_expanders ? (event->x <= horizontal_separator / 2 +
+					       gtk_tree_path_get_depth (path) * expander_size) :
+					       FALSE;
 
 		/* Keep track of path of last click so double clicks only happen
 		 * on the same item */
@@ -1670,6 +1673,13 @@ set_zoom_level_from_metadata_and_preferences (FMListView *list_view)
 }
 
 static void
+set_show_expanders_from_preferences (FMListView *list_view)
+{
+	gtk_tree_view_set_show_expanders (list_view->details->tree_view,
+					  list_view_show_expanders_auto_value);
+}
+
+static void
 fm_list_view_begin_loading (FMDirectoryView *view)
 {
 	FMListView *list_view;
@@ -1679,6 +1689,7 @@ fm_list_view_begin_loading (FMDirectoryView *view)
 	set_sort_order_from_metadata_and_preferences (list_view);
 	set_zoom_level_from_metadata_and_preferences (list_view);
 	set_columns_settings_from_metadata_and_preferences (list_view);
+	set_show_expanders_from_preferences (list_view);
 }
 
 static void
@@ -2585,6 +2596,16 @@ default_visible_columns_changed_callback (gpointer callback_data)
 }
 
 static void
+show_expanders_changed_callback (gpointer callback_data)
+{
+	FMListView *list_view;
+	
+	list_view = FM_LIST_VIEW (callback_data);
+
+	set_show_expanders_from_preferences (list_view);
+}
+
+static void
 default_column_order_changed_callback (gpointer callback_data)
 {
 	FMListView *list_view;
@@ -2828,6 +2849,8 @@ fm_list_view_class_init (FMListViewClass *class)
 					       &default_visible_columns_auto_value);
 	eel_preferences_add_auto_string_array (NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_COLUMN_ORDER,
 					       &default_column_order_auto_value);
+	eel_preferences_add_auto_boolean (NAUTILUS_PREFERENCES_LIST_VIEW_SHOW_EXPANDERS,
+					  &list_view_show_expanders_auto_value);
 }
 
 static const char *
@@ -2872,6 +2895,9 @@ fm_list_view_init (FMListView *list_view)
 	eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_COLUMN_ORDER,
 						  default_column_order_changed_callback,
 						  list_view, G_OBJECT (list_view));
+	eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_LIST_VIEW_SHOW_EXPANDERS,
+						  show_expanders_changed_callback,
+						  list_view, G_OBJECT (list_view));
 
 	fm_list_view_click_policy_changed (FM_DIRECTORY_VIEW (list_view));
 	
diff --git a/src/nautilus-file-management-properties.c b/src/nautilus-file-management-properties.c
index a3be385..8738343 100644
--- a/src/nautilus-file-management-properties.c
+++ b/src/nautilus-file-management-properties.c
@@ -61,6 +61,7 @@
 #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_COMPACT_LAYOUT_WIDGET "compact_layout_checkbutton"
 #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_LABELS_BESIDE_ICONS_WIDGET "labels_beside_icons_checkbutton"
 #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ALL_COLUMNS_SAME_WIDTH "all_columns_same_width_checkbutton"
+#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SHOW_EXPANDERS "show_expanders_in_list_checkbutton"
 #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ALWAYS_USE_BROWSER_WIDGET "always_use_browser_checkbutton"
 #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ALWAYS_USE_LOCATION_ENTRY_WIDGET "always_use_location_entry_checkbutton"
 #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TRASH_CONFIRM_WIDGET "trash_confirm_checkbutton"
@@ -700,6 +701,9 @@ nautilus_file_management_properties_dialog_setup (GtkBuilder *builder, GtkWindow
 					      NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ALL_COLUMNS_SAME_WIDTH,
 					      NAUTILUS_PREFERENCES_COMPACT_VIEW_ALL_COLUMNS_SAME_WIDTH);
 	eel_preferences_builder_connect_bool (builder,
+					      NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SHOW_EXPANDERS,
+					      NAUTILUS_PREFERENCES_LIST_VIEW_SHOW_EXPANDERS);
+	eel_preferences_builder_connect_bool (builder,
 					      NAUTILUS_FILE_MANAGEMENT_PROPERTIES_FOLDERS_FIRST_WIDGET,
 					      NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST); 
 	eel_preferences_builder_connect_bool (builder,
diff --git a/src/nautilus-file-management-properties.ui b/src/nautilus-file-management-properties.ui
index 3e1820a..288f2d4 100644
--- a/src/nautilus-file-management-properties.ui
+++ b/src/nautilus-file-management-properties.ui
@@ -913,6 +913,24 @@
                                 <property name="fill">True</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkCheckButton" id="show_expanders_in_list_checkbutton">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Folders in list can be expanded</property>
+                                <property name="use_underline">True</property>
+                                <property name="relief">GTK_RELIEF_NORMAL</property>
+                                <property name="focus_on_click">True</property>
+                                <property name="active">False</property>
+                                <property name="inconsistent">False</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
                           </object>
                         </child>
                       </object>
