diff --git a/zephyr/jstemplates/message.html b/zephyr/jstemplates/message.html
index e12bdf7a32..ffa5bc9a78 100644
--- a/zephyr/jstemplates/message.html
+++ b/zephyr/jstemplates/message.html
@@ -65,6 +65,9 @@
             <span class="sender_name">{{sender_full_name}}</span>
         </span>
         {{/include_sender}}
+        <div class="message_right star">
+          <i class="{{#if starred}}icon-star{{else}}icon-star-empty{{/if}}" title="Star this message"></i>
+        </div>
         <div class="message_right actions_hover">
             {{! If include_sender is not set, we will never show this link anyway. }}
             {{#include_sender}}<span class="actions_link">&laquo; Info</span>{{/include_sender}}
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index 640ef6ce88..acc6a56180 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -1062,3 +1062,13 @@ table.floating_recipient {
     height: 48px;
     margin-right: .75em;
 }
+
+.star {
+    padding-left: 2px;
+    opacity: .4;
+}
+
+.star:hover {
+    cursor:  pointer;
+    opacity: 1;
+}