diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.java
index 3b67d157d0..6e41588b00 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.java
@@ -250,6 +250,18 @@ public class ChangeScreen2 extends Screen {
         }
       }
     });
+    keysAction.add(new KeyCommand(0, 'x', Util.C.keyExpandAllMessages()) {
+      @Override
+      public void onKeyPress(KeyPressEvent event) {
+        onExpandAll(null);
+      }
+    });
+    keysAction.add(new KeyCommand(0, 'z', Util.C.keyCollapseAllMessages()) {
+      @Override
+      public void onKeyPress(KeyPressEvent event) {
+        onCollapseAll(null);
+      }
+    });
     if (Gerrit.isSignedIn()) {
       keysAction.add(new KeyCommand(0, 's', Util.C.changeTableStar()) {
         @Override
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeConstants.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeConstants.java
index 2d959150da..5164251d21 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeConstants.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeConstants.java
@@ -62,6 +62,8 @@ public interface ChangeConstants extends Constants {
   String keyEditTopic();
   String keyEditMessage();
   String keyAddReviewers();
+  String keyExpandAllMessages();
+  String keyCollapseAllMessages();
 
   String patchTableColumnName();
   String patchTableColumnComments();
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeConstants.properties
index 60fc214fdc..c7f72d76c4 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeConstants.properties
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeConstants.properties
@@ -42,6 +42,8 @@ keyPublishComments = Review and publish comments
 keyEditTopic = Edit change topic
 keyEditMessage = Edit commit message
 keyAddReviewers = Add reviewers
+keyExpandAllMessages = Expand all messages
+keyCollapseAllMessages = Collapse all messages
 
 
 patchTableColumnName = File Path