diff --git a/js/views/message_view.js b/js/views/message_view.js
index 69daaa5b..609fabde 100644
--- a/js/views/message_view.js
+++ b/js/views/message_view.js
@@ -22,7 +22,7 @@
             this.timeStampView = new Whisper.ExtendedTimestampView();
         },
         events: {
-            'click .timestamp': 'select',
+            'click .meta': 'select',
             'click .error': 'select'
         },
         select: function(e) {
diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index 923b531c..7a3c2a99 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -57,13 +57,6 @@
           border: solid 3px transparent;
         }
 
-        .timestamp {
-          cursor: pointer;
-
-          &:hover {
-            text-decoration: underline;
-          }
-        }
       }
     }
   }
@@ -240,6 +233,9 @@
 .timestamp {
   font-size: smaller;
   margin-right: 3px;
+  &:hover {
+      text-decoration: underline;
+  }
 }
 
 .outgoing.entry {
@@ -308,6 +304,9 @@
       margin: 0;
     }
     .meta {
+      margin-top: 3px;
+      float: right;
+      cursor: pointer;
       opacity: 0.5;
 
       &:hover {
@@ -439,11 +438,6 @@
     line-height: 36px;
   }
 
-  .meta {
-    margin-top: 3px;
-    float: right;
-  }
-
   .end-session {
     font: small;
     font-style: italic;
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index 6bcd281c..8430db27 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -627,10 +627,6 @@ input.search {
           height: 16px;
           width: 16px;
           border: solid 3px transparent; }
-        .conversation .panel .discussion-container .message-list .timestamp {
-          cursor: pointer; }
-          .conversation .panel .discussion-container .message-list .timestamp:hover {
-            text-decoration: underline; }
 
 .group-member-list,
 .new-group-update,
@@ -753,6 +749,8 @@ input.search {
 .timestamp {
   font-size: smaller;
   margin-right: 3px; }
+  .timestamp:hover {
+    text-decoration: underline; }
 
 .outgoing.entry .status {
   display: inline-block;
@@ -810,6 +808,9 @@ input.search {
       margin: 0; }
     .message-detail .bubble .meta,
     .message-list .bubble .meta {
+      margin-top: 3px;
+      float: right;
+      cursor: pointer;
       opacity: 0.5; }
       .message-detail .bubble .meta:hover,
       .message-list .bubble .meta:hover {
@@ -910,10 +911,6 @@ input.search {
     height: 36px;
     width: 36px;
     line-height: 36px; }
-  .message-detail .meta,
-  .message-list .meta {
-    margin-top: 3px;
-    float: right; }
   .message-detail .end-session,
   .message-list .end-session {
     font: small;