diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index 4a7163fdd3..a38c7ba437 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -7,6 +7,16 @@
 <div class="autoscroll">
 <table class="list issues odd-even <%= query.css_classes %>">
   <thead>
+    <% if query.grouped? %>
+      <tr class="group open">
+        <th colspan="<%= query.inline_columns.count + 2 %>" class="group_label">
+          <span class="expander icon icon-expended" onclick="toggleAllGroupedIssues(this);">&nbsp;</span>
+          <span class="name"><%= l(:field_group_by) %>: <%= query.group_by_column.caption %></span>
+          <%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}",
+                               "toggleAllRowGroups(this)", :class => 'toggle-all') %>
+        </th>
+      </tr>
+    <% end %>
     <tr>
       <th class="checkbox hide-when-print">
         <%= check_box_tag 'check_all', '', false, :class => 'toggle-selection',
@@ -55,3 +65,16 @@
 </table>
 </div>
 <% end -%>
+<%= javascript_tag do %>
+function toggleAllGroupedIssues(el){
+  var tr = $(el).parents('tr').first();
+  tr.toggleClass('open');
+  tr.find('.expander').toggleClass('icon-expended icon-collapsed');
+  var td_tr = $(el).parents('table').children('tbody').children('tr').first();
+  if (tr.hasClass('open')) {
+    expandAllRowGroups(td_tr);
+  } else {
+    collapseAllRowGroups(td_tr);
+  }
+}
+<% end %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 9f6b4dc3d7..a3f87b321c 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -248,6 +248,7 @@ div + .drdn-items {border-top:1px solid #ccc;}
 /***** Tables *****/
 table.list, .table-list { border: 1px solid #e4e4e4; width: 100%; margin-bottom: 4px; border-radius: 3px; border-spacing: 0; overflow: hidden;}
 table.list th, .table-list-header { background-color:#EEEEEE; padding: 4px; white-space:nowrap; font-weight:bold; }
+table.list th.group_label { text-align: left }
 table.list td {text-align:center; vertical-align:middle; padding-right:10px;}
 table.list td.id { width: 2%; text-align: center;}
 table.list td.name, table.list td.description, table.list td.subject, table.list td.parent-subject, table.list td.comments, table.list td.roles, table.list td.attachments, table.list td.text,  table.list td.short_description {text-align: left;}