diff --git a/app/views/issues/_list.rhtml b/app/views/issues/_list.rhtml
index 1a2953bf5..7d3a03c2e 100644
--- a/app/views/issues/_list.rhtml
+++ b/app/views/issues/_list.rhtml
@@ -20,6 +20,7 @@
     	<td colspan="<%= query.columns.size + 2 %>">
     		<span class="expander" onclick="toggleRowGroup(this); return false;">&nbsp;</span>
       	<%= group.blank? ? 'None' : column_content(@query.group_by_column, issue) %> <span class="count">(<%= @issue_count_by_group[group] %>)</span>
+        <%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}", "toggleAllRowGroups(this)", :class => 'toggle-all') %>
     	</td>
 		</tr>
 		<% previous_group = group %>
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 1e789dd91..1e9402eb7 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -941,3 +941,5 @@ bg:
   enumeration_activities: Дейности (time tracking)
   enumeration_system_activity: Системна активност
 
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 24bde9160..00df00aca 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -955,3 +955,5 @@ bs:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 452c25a47..acd8dbe83 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -944,3 +944,5 @@ ca:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index dae695cf8..cc76d1f39 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -945,3 +945,5 @@ cs:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 2b9370e60..115ffe582 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -957,3 +957,5 @@ da:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/de.yml b/config/locales/de.yml
index b856c22f4..8917a776a 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -958,3 +958,5 @@ de:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 77ab14aae..0cd930708 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -941,3 +941,5 @@ el:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 7883395bd..8753e7ec4 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -945,3 +945,5 @@ en-GB:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c4126061c..277a46100 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -802,6 +802,8 @@ en:
   button_save: Save
   button_check_all: Check all
   button_uncheck_all: Uncheck all
+  button_collapse_all: Collapse all
+  button_expand_all: Expand all
   button_delete: Delete
   button_create: Create
   button_create_and_continue: Create and continue
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 97ecaea71..0a1081ca3 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -978,3 +978,5 @@ es:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index cfdb81380..e7bc80c1c 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -945,3 +945,5 @@ eu:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index b4dea5344..3f06a9e55 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -944,3 +944,5 @@ fa:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 50b2d6d70..e1df44f53 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -962,3 +962,5 @@ fi:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 86c04af38..5e02bd351 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -793,6 +793,8 @@ fr:
   button_save: Sauvegarder
   button_check_all: Tout cocher
   button_uncheck_all: Tout décocher
+  button_collapse_all: Plier tout
+  button_expand_all: Déplier tout
   button_delete: Supprimer
   button_create: Créer
   button_create_and_continue: Créer et continuer
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index e4bc11e1e..ed18b088b 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -953,3 +953,5 @@ gl:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/he.yml b/config/locales/he.yml
index c99e1a2ea..d4018b8b3 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -946,3 +946,5 @@ he:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index c2c49aa0e..dfdfe9d69 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -948,3 +948,5 @@ hr:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index c979c834f..450b2a4cf 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -960,3 +960,5 @@
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 9e9566f0e..0b3f8af8d 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -949,3 +949,5 @@ id:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 8175b86d9..b5a13ee7a 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -942,3 +942,5 @@ it:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 10b76fafd..d137bd79f 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -962,3 +962,5 @@ ja:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 104ac7cfa..a394708fb 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -993,3 +993,5 @@ ko:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 158d226ea..2100266d9 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1001,3 +1001,5 @@ lt:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 944087b75..be481cc17 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -936,3 +936,5 @@ lv:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 812b33664..3dfdfe38d 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -941,3 +941,5 @@ mk:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/mn.yml b/config/locales/mn.yml
index 49ef7b466..9aa6876c1 100644
--- a/config/locales/mn.yml
+++ b/config/locales/mn.yml
@@ -942,3 +942,5 @@ mn:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 2dbe4f2e9..72ab538a2 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -923,3 +923,5 @@ nl:
   label_my_queries: Mijn aangepaste zoekopdrachten
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Commentaar toegevoegd aan een nieuwsitem
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 429c026a0..903ddddab 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -928,3 +928,5 @@
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index bc8a43817..9867f0482 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -958,3 +958,5 @@ pl:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index eed076320..a8c2b8593 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -964,3 +964,5 @@ pt-BR:
   label_my_queries: Minhas consultas personalizadas
   text_journal_changed_no_detail: "%{label} atualizado(a)"
   label_news_comment_added: Notícia recebeu um comentário
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 3819dcd0a..ec58345ee 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -945,3 +945,5 @@ pt:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index bc267f896..21713e7f3 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -934,3 +934,5 @@ ro:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 9a2b2239a..91c5cd2c4 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1054,3 +1054,5 @@ ru:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 90f7cee8a..40fde4271 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -936,3 +936,5 @@ sk:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index bfb5b5c09..bc9e02964 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -937,3 +937,5 @@ sl:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml
index 25ade4402..afbbf19f6 100644
--- a/config/locales/sr-YU.yml
+++ b/config/locales/sr-YU.yml
@@ -941,3 +941,5 @@ sr-YU:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 87868ab1e..733c96b04 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -942,3 +942,5 @@ sr:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index c265ea659..2c30f5672 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -982,3 +982,5 @@ sv:
   enumeration_activities: Aktiviteter (tidsuppföljning)
   enumeration_system_activity: Systemaktivitet
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 3e1a02434..5a72100e5 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -938,3 +938,5 @@ th:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 67707176d..55ba92b04 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -960,3 +960,5 @@ tr:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index e58373f7a..4da5cdf1b 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -937,3 +937,5 @@ uk:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 74d434684..5caee5e60 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -992,3 +992,5 @@ vi:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 0de64ac61..20a241458 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1023,3 +1023,5 @@
   enumeration_system_activity: 系統活動
 
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 08264a9d2..4700cb947 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -955,3 +955,5 @@ zh:
   label_my_queries: My custom queries
   text_journal_changed_no_detail: "%{label} updated"
   label_news_comment_added: Comment added to a news
+  button_expand_all: Expand all
+  button_collapse_all: Collapse all
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 3996404bb..7e307b61f 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -40,6 +40,37 @@ function toggleRowGroup(el) {
 	}
 }
 
+function collapseAllRowGroups(el) {
+  var tbody = Element.up(el, 'tbody');
+  tbody.childElements('tr').each(function(tr) {
+    if (tr.hasClassName('group')) {
+      tr.removeClassName('open');
+    } else {
+      tr.hide();
+    }
+  })
+}
+
+function expandAllRowGroups(el) {
+  var tbody = Element.up(el, 'tbody');
+  tbody.childElements('tr').each(function(tr) {
+    if (tr.hasClassName('group')) {
+      tr.addClassName('open');
+    } else {
+      tr.show();
+    }
+  })
+}
+
+function toggleAllRowGroups(el) {
+	var tr = Element.up(el, 'tr');
+  if (tr.hasClassName('open')) {
+    collapseAllRowGroups(el);
+  } else {
+    expandAllRowGroups(el);
+  }
+}
+
 function toggleFieldset(el) {
 	var fieldset = Element.up(el, 'fieldset');
 	fieldset.toggleClassName('collapsed');
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index e45863417..333fbc65f 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -194,6 +194,9 @@ table.plugins span.url { display: block; font-size: 0.9em; }
 
 table.list tbody tr.group td { padding: 0.8em 0 0.5em 0.3em; font-weight: bold; border-bottom: 1px solid #ccc; }
 table.list tbody tr.group span.count { color: #aaa; font-size: 80%; }
+tr.group a.toggle-all { color: #aaa; font-size: 80%; font-weight: normal; display:none;}
+tr.group:hover a.toggle-all { display:inline;}
+a.toggle-all:hover {text-decoration:none;}
 
 table.list tbody tr:hover { background-color:#ffffdd; }
 table.list tbody tr.group:hover { background-color:inherit; }