Index: mail/ChangeLog
===================================================================
--- mail/ChangeLog	(revision 34990)
+++ mail/ChangeLog	(working copy)
@@ -1,3 +1,10 @@
+2008-02-11  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #515686
+
+	* message-list.etspec: State in ETableSpecification that we do not
+	allow grouping in message list.
+
 2008-02-11  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #515054
Index: mail/message-list.etspec
===================================================================
--- mail/message-list.etspec	(revision 34990)
+++ mail/message-list.etspec	(working copy)
@@ -1,4 +1,4 @@
-<ETableSpecification cursor-mode="line" draw-grid="false" draw-focus="true" selection-mode="browse">
+<ETableSpecification cursor-mode="line" draw-grid="false" draw-focus="true" selection-mode="browse" allow-grouping="false">
   <ETableColumn model_col="0" _title="Status" pixbuf="status" expansion="0.0" minimum_width="18" resizable="false" cell="render_message_status" compare="integer" />
 
   <ETableColumn model_col="1" _title="Flagged" pixbuf="flagged" expansion="0.0" minimum_width="18" resizable="false" cell="render_flagged" compare="integer"/>
Index: widgets/table/ChangeLog
===================================================================
--- widgets/table/ChangeLog	(revision 34990)
+++ widgets/table/ChangeLog	(working copy)
@@ -1,3 +1,10 @@
+2008-02-11  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #515686
+
+	* e-table-config.c: (setup_gui):
+	Allow grouping only if both specification and sort info allow it.
+
 2008-02-01  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #512623
Index: widgets/table/e-table-config.c
===================================================================
--- widgets/table/e-table-config.c	(revision 34990)
+++ widgets/table/e-table-config.c	(working copy)
@@ -1203,7 +1203,7 @@
 
 	create_global_store (config);
 
-	can_group = e_table_sort_info_get_can_group (config->state->sort_info);
+	can_group = config->source_spec->allow_grouping && e_table_sort_info_get_can_group (config->state->sort_info);
 	filename = g_build_filename (EVOLUTION_GLADEDIR,
 					  "e-table-config.glade",
 					  NULL);
