diff --git a/src/mail_templates/test.ejs b/src/mail_templates/test.ejs
new file mode 100644
index 000000000..b7ad4c856
--- /dev/null
+++ b/src/mail_templates/test.ejs
@@ -0,0 +1,11 @@
+<%if (format === 'text') { %>
+
+Test Email from <%= fqdn %>,
+
+if you can read this, your Cloudron email settings are good.
+
+Sent at: <%= new Date().toUTCString() %>
+
+<% } else { %>
+
+<% } %>
diff --git a/src/mailer.js b/src/mailer.js
index 8ec7a16c5..8f9f45b3d 100644
--- a/src/mailer.js
+++ b/src/mailer.js
@@ -30,6 +30,8 @@ exports = module.exports = {
     FEEDBACK_TYPE_UPGRADE_REQUEST: 'upgrade_request',
     sendFeedback: sendFeedback,
 
+    sendTestMail: sendTestMail,
+
     _getMailQueue: _getMailQueue,
     _clearMailQueue: _clearMailQueue
 };
@@ -552,8 +554,8 @@ function sendFeedback(user, type, subject, description) {
         type === exports.FEEDBACK_TYPE_UPGRADE_REQUEST ||
         type === exports.FEEDBACK_TYPE_APP_ERROR);
 
-    var mailOptions = {
-        from: mailConfig().from,
+        var mailOptions = {
+            from: mailConfig().from,
         to: 'support@cloudron.io',
         subject: util.format('[%s] %s - %s', type, config.fqdn(), subject),
         text: render('feedback.ejs', { fqdn: config.fqdn(), type: type, user: user, subject: subject, description: description, format: 'text'})
@@ -562,6 +564,19 @@ function sendFeedback(user, type, subject, description) {
     enqueue(mailOptions);
 }
 
+function sendTestMail(email) {
+    assert.strictEqual(typeof email, 'string');
+
+    var mailOptions = {
+        from: mailConfig().from,
+        to: email,
+        subject: util.format('Test Email from %s', config.fqdn()),
+        text: render('test.ejs', { fqdn: config.fqdn(), format: 'text'})
+    };
+
+    enqueue(mailOptions);
+}
+
 function _getMailQueue() {
     return gMailQueue;
 }
diff --git a/src/routes/cloudron.js b/src/routes/cloudron.js
index 938f4a676..c6506b6eb 100644
--- a/src/routes/cloudron.js
+++ b/src/routes/cloudron.js
@@ -15,7 +15,8 @@ exports = module.exports = {
     feedback: feedback,
     checkForUpdates: checkForUpdates,
     getLogs: getLogs,
-    getLogStream: getLogStream
+    getLogStream: getLogStream,
+    sendTestMail: sendTestMail
 };
 
 var assert = require('assert'),
@@ -301,3 +302,13 @@ function getLogStream(req, res, next) {
         logStream.on('error', res.end.bind(res, null));
     });
 }
+
+function sendTestMail(req, res, next) {
+    assert.strictEqual(typeof req.body, 'object');
+
+    if (!req.body.email || typeof req.body.email !== 'string') return next(new HttpError(400, 'email must be a non-empty string'));
+
+    mailer.sendTestMail(req.body.email);
+
+    next(new HttpSuccess(202));
+}
diff --git a/src/server.js b/src/server.js
index 29014730a..438666be2 100644
--- a/src/server.js
+++ b/src/server.js
@@ -124,7 +124,8 @@ function initializeExpressSync() {
     router.put ('/api/v1/cloudron/ssh/authorized_keys', cloudronScope, routes.user.requireAdmin, routes.ssh.addAuthorizedKey);
     router.get ('/api/v1/cloudron/ssh/authorized_keys/:identifier', cloudronScope, routes.user.requireAdmin, routes.ssh.getAuthorizedKey);
     router.del ('/api/v1/cloudron/ssh/authorized_keys/:identifier', cloudronScope, routes.user.requireAdmin, routes.ssh.delAuthorizedKey);
-    router.get ('/api/v1/cloudron/eventlog', settingsScope, routes.user.requireAdmin, routes.eventlog.get);
+    router.get ('/api/v1/cloudron/eventlog', cloudronScope, routes.user.requireAdmin, routes.eventlog.get);
+    router.post('/api/v1/cloudron/send_test_mail',  cloudronScope, routes.user.requireAdmin, routes.cloudron.sendTestMail);
 
     // profile api, working off the user behind the provided token
     router.get ('/api/v1/profile', profileScope, routes.profile.get);
diff --git a/webadmin/src/js/client.js b/webadmin/src/js/client.js
index 84c01d620..d0da06048 100644
--- a/webadmin/src/js/client.js
+++ b/webadmin/src/js/client.js
@@ -1157,6 +1157,17 @@ angular.module('Application').service('Client', ['$http', 'md5', 'Notification',
         }).error(defaultErrorHandler(callback));
     };
 
+    Client.prototype.sentTestMail = function (email, callback) {
+        var data = {
+            email: email
+        };
+
+        post('/api/v1/cloudron/send_test_mail', data).success(function(data, status) {
+            if (status !== 202) return callback(new ClientError(status, data));
+            callback(null);
+        }).error(defaultErrorHandler(callback));
+    };
+
     client = new Client();
     return client;
 }]);
diff --git a/webadmin/src/views/email.html b/webadmin/src/views/email.html
index af2baf2d5..a08bd4891 100644
--- a/webadmin/src/views/email.html
+++ b/webadmin/src/views/email.html
@@ -26,6 +26,23 @@
   </div>
 </div>
 
+<!-- Test email sent -->
+<div class="modal fade" id="testEmailSent" tabindex="-1" role="dialog">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title">Test Email Sent</h4>
+      </div>
+      <div class="modal-body">
+        A test Email was sent to {{ user.email }}. Please check the inbox of this account and verify the Email was delivered.
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Ok</button>
+      </div>
+    </div>
+  </div>
+</div>
+
 <div class="content">
   <div class="text-left">
     <h1>Email</h1>
@@ -39,6 +56,7 @@
     <div class="row">
       <div class="col-md-12">
         Cloudron has a built-in <a ng-href="{{ config.webServerOrigin + '/documentation/email/' }}" target="_blank">email server</a> that allows users to send and receive email for your domain.
+        Apps can send Emails regardless of this setting.
       </div>
     </div>
     <div class="row" ng-show="mailConfig.enabled">
@@ -57,7 +75,7 @@
     <br/>
     <div class="row">
       <div class="col-md-12" ng-show="dnsConfig.provider !== 'caas'">
-        <button ng-class="mailConfig.enabled ? 'btn btn-danger' : 'btn btn-primary'" ng-click="email.toggle()" ng-enabled="mailConfig">{{ mailConfig.enabled ? "Disable Email" : "Enable Email" }}</button>
+        <button class="pull-right" ng-class="mailConfig.enabled ? 'btn btn-danger' : 'btn btn-primary'" ng-click="email.toggle()" ng-enabled="mailConfig">{{ mailConfig.enabled ? "Disable Email" : "Enable Email" }}</button>
       </div>
       <div class="col-md-12" ng-show="dnsConfig.provider === 'caas'">
         <span class="text-danger text-bold">This feature requires the Cloudron to be on <a ng-href="{{ config.webServerOrigin + '/documentation/managed-hosting/#using-a-custom-domain' }}" target="_blank">custom domain</a>.</span>
@@ -242,6 +260,11 @@
           </div>
         </div>
 
+        <div class="row">
+          <div class="col-xs-12">
+            <button class="btn btn-primary pull-right" ng-click="sendTestEmail()">Send Test Email</button>
+          </div>
+        </div>
       </div>
     </div>
   </div>
diff --git a/webadmin/src/views/email.js b/webadmin/src/views/email.js
index ec3a42dcb..af120c72f 100644
--- a/webadmin/src/views/email.js
+++ b/webadmin/src/views/email.js
@@ -158,6 +158,14 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
         }
     };
 
+    $scope.sendTestEmail = function () {
+        Client.sentTestMail($scope.user.email, function (error) {
+            if (error) return console.error(error);
+
+            $('#testEmailSent').modal('show');
+        });
+    };
+
     function getMailConfig() {
         Client.getMailConfig(function (error, mailConfig) {
             if (error) return console.error(error);