diff --git a/src/views/email.html b/src/views/email.html
index ce79f62a7..8b0ba15af 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -230,39 +230,6 @@
   </div>
 </div>
 
-<!-- Test email sent -->
-<div class="modal fade" id="testEmailModal" tabindex="-1" role="dialog">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h4 class="modal-title">Send test email</h4>
-      </div>
-      <div class="modal-body">
-        <form name="testEmailForm" role="form" novalidate ng-submit="testEmail.submit()" autocomplete="off">
-          <fieldset>
-            <p class="has-error text-center" ng-show="testEmail.error">{{ testEmail.error.generic }}</p>
-
-            <p>This will send a test email from no-reply@{{domain.domain}} to the address below.</p>
-            <br/>
-            <div class="form-group" ng-class="{ 'has-error': testEmail.error.key }">
-              <label class="control-label" for="inputTestEmailKey">Email to</label>
-              <input type="text" class="form-control" ng-model="testEmail.mailTo" id="inputTestMailTo" name="mailTo" ng-disabled="testEmail.busy" placeholder="Email address" autofocus>
-            </div>
-
-            <input class="ng-hide" type="submit" ng-disabled="testEmailForm.$invalid"/>
-          </fieldset>
-        </form>
-      </div>
-      <div class="modal-footer ">
-        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-        <button type="submit" class="btn btn-outline btn-success pull-right" ng-click="testEmail.submit()" ng-disabled="testEmail.$invalid || testEmail.busy">
-          <i class="fa fa-circle-notch fa-spin" ng-show="testEmail.busy"></i><span>Send</span>
-        </button>
-      </div>
-    </div>
-  </div>
-</div>
-
 <div ng-show="!ready" class="loading-banner">
   <h1><i class="fa fa-circle-notch fa-spin"></i></h1>
 </div>
@@ -636,12 +603,6 @@
                   </div>
                 </div>
               </div>
-
-              <div class="row">
-                <div class="col-xs-12">
-                  <button class="btn btn-primary pull-left" ng-click="testEmail.show()">Send Test Email</button>
-                </div>
-              </div>
             </div>
           </div>
         </div>
diff --git a/src/views/email.js b/src/views/email.js
index 6f6f0f2d3..e4bbd4e5e 100644
--- a/src/views/email.js
+++ b/src/views/email.js
@@ -501,47 +501,6 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
         }
     };
 
-    $scope.testEmail = {
-        busy: false,
-        error: {},
-
-        mailTo: '',
-
-        domain: null,
-
-        clearForm: function () {
-            $scope.testEmail.mailTo = '';
-        },
-
-        show: function () {
-            $scope.testEmail.error = {};
-            $scope.testEmail.busy = false;
-
-            $scope.testEmail.domain = $scope.domain;
-            $scope.testEmail.mailTo = $scope.user.email;
-
-            $('#testEmailModal').modal('show');
-        },
-
-        submit: function () {
-            $scope.testEmail.error = {};
-            $scope.testEmail.busy = true;
-
-            Client.sendTestMail($scope.domain.domain, $scope.testEmail.mailTo, function (error) {
-                $scope.testEmail.busy = false;
-
-                if (error) {
-                    $scope.testEmail.error.generic = error.message;
-                    console.error(error);
-                    $('#inputTestMailTo').focus();
-                    return;
-                }
-
-                $('#testEmailModal').modal('hide');
-            });
-        }
-    };
-
     function resetDnsRecords() {
         $scope.expectedDnsRecordsTypes.forEach(function (record) {
             var type = record.value;
@@ -703,7 +662,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
     });
 
     // setup all the dialog focus handling
-    ['testEmailModal', 'mailboxAddModal', 'mailboxEditModal', 'mailinglistEditModal', 'mailinglistAddModal'].forEach(function (id) {
+    ['mailboxAddModal', 'mailboxEditModal', 'mailinglistEditModal', 'mailinglistAddModal'].forEach(function (id) {
         $('#' + id).on('shown.bs.modal', function () {
             $(this).find('[autofocus]:first').focus();
         });
diff --git a/src/views/emails.html b/src/views/emails.html
index a4a6d5263..f2d2e69e9 100644
--- a/src/views/emails.html
+++ b/src/views/emails.html
@@ -1,3 +1,37 @@
+
+<!-- Test email -->
+<div class="modal fade" id="testEmailModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title">Send test email for <b>{{ testEmail.domain.domain }}</b></h4>
+      </div>
+      <div class="modal-body">
+        <form name="testEmailForm" role="form" novalidate ng-submit="testEmail.submit()" autocomplete="off">
+          <fieldset>
+            <p class="has-error text-center" ng-show="testEmail.error">{{ testEmail.error.generic }}</p>
+
+            <p>This will send a test email from <b>no-reply@{{testEmail.domain.domain}}</b> to the address below.</p>
+            <br/>
+            <div class="form-group" ng-class="{ 'has-error': testEmail.error.key }">
+              <label class="control-label" for="inputTestEmailKey">Email to</label>
+              <input type="text" class="form-control" ng-model="testEmail.mailTo" id="inputTestMailTo" name="mailTo" ng-disabled="testEmail.busy" placeholder="Email address" autofocus>
+            </div>
+
+            <input class="ng-hide" type="submit" ng-disabled="testEmailForm.$invalid"/>
+          </fieldset>
+        </form>
+      </div>
+      <div class="modal-footer ">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+        <button type="submit" class="btn btn-outline btn-success pull-right" ng-click="testEmail.submit()" ng-disabled="testEmail.$invalid || testEmail.busy">
+          <i class="fa fa-circle-notch fa-spin" ng-show="testEmail.busy"></i><span>Send</span>
+        </button>
+      </div>
+    </div>
+  </div>
+</div>
+
 <div class="content">
   <div class="text-left">
     <h1>
@@ -35,7 +69,8 @@
                 <a href="/#/email/{{ domain.domain }}" class="email-domain-list-item">{{ domain.domain }}</a>
               </td>
               <td class="text-right no-wrap">
-                <a href="/#/email/{{ domain.domain }}" class="btn btn-xs btn-default"><i class="fa fa-pencil-alt"></i></a href="/#/email/{{ domain.domain }}">
+                <button class="btn btn-xs btn-default" ng-click="testEmail.show(domain)" uib-tooltip="Send Test Email"><i class="fa fa-paper-plane"></i></button>
+                <a href="/#/email/{{ domain.domain }}" class="btn btn-xs btn-default"><i class="fa fa-pencil-alt"></i></a>
               </td>
             </tr>
           </tbody>
diff --git a/src/views/emails.js b/src/views/emails.js
index 6da9d8fb6..4f24e7d76 100644
--- a/src/views/emails.js
+++ b/src/views/emails.js
@@ -8,6 +8,7 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
 
     $scope.ready = false;
     $scope.config = Client.getConfig();
+    $scope.user = Client.getUserInfo();
     $scope.domains = [];
 
     $scope.activity = {
@@ -34,6 +35,48 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
         }
     };
 
+
+    $scope.testEmail = {
+        busy: false,
+        error: {},
+
+        mailTo: '',
+
+        domain: null,
+
+        clearForm: function () {
+            $scope.testEmail.mailTo = '';
+        },
+
+        show: function (domain) {
+            $scope.testEmail.error = {};
+            $scope.testEmail.busy = false;
+
+            $scope.testEmail.domain = domain;
+            $scope.testEmail.mailTo = $scope.user.email;
+
+            $('#testEmailModal').modal('show');
+        },
+
+        submit: function () {
+            $scope.testEmail.error = {};
+            $scope.testEmail.busy = true;
+
+            Client.sendTestMail($scope.testEmail.domain.domain, $scope.testEmail.mailTo, function (error) {
+                $scope.testEmail.busy = false;
+
+                if (error) {
+                    $scope.testEmail.error.generic = error.message;
+                    console.error(error);
+                    $('#inputTestMailTo').focus();
+                    return;
+                }
+
+                $('#testEmailModal').modal('hide');
+            });
+        }
+    };
+
     function refreshDomainStatuses() {
         $scope.domains.forEach(function (domain) {
             Client.getMailStatusForDomain(domain.domain, function (error, result) {
@@ -59,5 +102,12 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
         });
     });
 
+    // setup all the dialog focus handling
+    ['testEmailModal'].forEach(function (id) {
+        $('#' + id).on('shown.bs.modal', function () {
+            $(this).find('[autofocus]:first').focus();
+        });
+    });
+
     $('.modal-backdrop').remove();
 }]);