diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Message.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Message.java
index 2d25409b1e..6fcabeea09 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Message.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Message.java
@@ -41,6 +41,7 @@ class Message extends Composite {
   }
 
   @UiField Style style;
+  @UiField HTMLPanel header;
   @UiField Element name;
   @UiField Element summary;
   @UiField Element date;
@@ -58,7 +59,7 @@ class Message extends Composite {
     }
 
     initWidget(uiBinder.createAndBindUi(this));
-    addDomHandler(new ClickHandler() {
+    header.addDomHandler(new ClickHandler() {
       @Override
       public void onClick(ClickEvent event) {
         setOpen(!isOpen());
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Message.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Message.ui.xml
index e506340c03..b36fbb26a5 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Message.ui.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Message.ui.xml
@@ -85,9 +85,11 @@ limitations under the License.
       addStyleNames='{style.closed}'>
     <c:AvatarImage ui:field='avatar' styleName='{style.avatar}'/>
     <div class='{style.contents}'>
-      <div class='{style.name}' ui:field='name'/>
-      <div ui:field='summary' class='{style.summary}'/>
-      <div class='{style.date}' ui:field='date'/>
+      <g:HTMLPanel ui:field='header'>
+        <div class='{style.name}' ui:field='name'/>
+        <div ui:field='summary' class='{style.summary}'/>
+        <div class='{style.date}' ui:field='date'/>
+      </g:HTMLPanel>
       <div ui:field='message'
            aria-hidden='true'
            style='display: NONE'/>