diff --git a/UI/MailerUI/English.lproj/Localizable.strings b/UI/MailerUI/English.lproj/Localizable.strings
index cc9d5b822..cc9815278 100644
--- a/UI/MailerUI/English.lproj/Localizable.strings
+++ b/UI/MailerUI/English.lproj/Localizable.strings
@@ -371,4 +371,7 @@
 "Filter" = "Filter";
 
 /* Hotkey to write a new message */
-"hotkey_compose" = "w";
\ No newline at end of file
+"hotkey_compose" = "w";
+
+/* Hotkey to flag a message */
+"hotkey_flag" = "f";
\ No newline at end of file
diff --git a/UI/Templates/MailerUI/UIxMailViewTemplate.wox b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
index cafca6a8d..ccecd28e3 100644
--- a/UI/Templates/MailerUI/UIxMailViewTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
@@ -25,7 +25,7 @@
           </md-button>
           <div class="md-flex"><!-- spacer --></div>
           <md-button class="sg-icon-button" label:aria-label="flagged" ng-click="viewer.message.toggleFlag()">
-            <md-icon ng-class="{'icon-star': viewer.message.isflagged,
+            <md-icon ng-class="{'icon-star md-accent md-hue-2': viewer.message.isflagged,
                                'icon-star-border': !viewer.message.isflagged}"><!-- flag --></md-icon>
           </md-button>
           <md-button class="sg-icon-button"
diff --git a/UI/WebServerResources/js/Mailer/MessageController.js b/UI/WebServerResources/js/Mailer/MessageController.js
index f28071863..3ab1502e8 100644
--- a/UI/WebServerResources/js/Mailer/MessageController.js
+++ b/UI/WebServerResources/js/Mailer/MessageController.js
@@ -104,6 +104,10 @@
 
 
     function _registerHotkeys(keys) {
+      keys.push(sgHotkeys.createHotkey({
+        key: l('hotkey_flag'),
+        callback: angular.bind(stateMessage, stateMessage.toggleFlag)
+      }));
       keys.push(sgHotkeys.createHotkey({
         key: 'backspace',
         callback: function($event) {