diff --git a/UI/Templates/MailerUI/UIxMailViewTemplate.wox b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
index c41f7426d..21337cdc9 100644
--- a/UI/Templates/MailerUI/UIxMailViewTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
@@ -31,10 +31,17 @@
         <md-button class="sg-icon-button"
                    ng-hide="viewer.message.isDraft"
                    ng-click="viewer.reply($event)"
-                   label:aria-label="reply">
+                   label:aria-label="Reply">
           <md-tooltip md-direction="bottom"><var:string label:value="Reply to Sender Only"/></md-tooltip>
           <md-icon>reply</md-icon>
         </md-button>
+        <md-button class="sg-icon-button"
+                   ng-show="viewer.message.allowReplyAll()"
+                   ng-click="viewer.replyAll($event)"
+                   label:aria-label="Reply All">
+          <md-tooltip md-direction="bottom"><var:string label:value="Reply to sender and all recipients"/></md-tooltip>
+          <md-icon>reply_all</md-icon>
+        </md-button>
         <md-button class="sg-icon-button" label:aria-label="Forward"
                    ng-hide="viewer.message.isDraft"
                    ng-click="viewer.forward($event)">
@@ -62,12 +69,6 @@
             <md-icon>more_vert</md-icon>
           </md-button>
           <md-menu-content width="4">
-            <md-menu-item ng-hide="viewer.message.isDraft">
-              <md-button label:aria-label="Reply All"
-                         ng-click="viewer.replyAll($event)">
-                <var:string label:value="Reply All"/>
-              </md-button>
-            </md-menu-item>
             <md-menu-item>
               <md-button label:aria-label="Save As..."
                          ng-click="viewer.saveMessage()">
diff --git a/UI/WebServerResources/js/Mailer/Message.service.js b/UI/WebServerResources/js/Mailer/Message.service.js
index 6595fb3bc..3b89b485b 100644
--- a/UI/WebServerResources/js/Mailer/Message.service.js
+++ b/UI/WebServerResources/js/Mailer/Message.service.js
@@ -212,6 +212,24 @@
     return address;
   };
 
+  /**
+   * @function allowReplyAll
+   * @memberof Message.prototype
+   * @desc Check if 'Reply to All' is an appropriate action on the message.
+   * @returns true if the message is not a draft and has more than one recipient
+   */
+  Message.prototype.allowReplyAll = function() {
+    var recipientsCount = 0;
+    recipientsCount = _.reduce(['to', 'cc'], function(count, type) {
+      if (this[type])
+        return count + this[type].length;
+      else
+        return count;
+    }, recipientsCount, this);
+
+    return !this.isDraft && recipientsCount > 1;
+  };
+
   /**
    * @function loadUnsafeContent
    * @memberof Message.prototype