diff --git a/src/translation/en.json b/src/translation/en.json
index cb2e8bef9..8492ac3af 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -1198,11 +1198,14 @@
         "email": {
             "from": {
                 "title": "Mail FROM Address",
-                "description": "This sets the address from which this app sends email. This app is already configured to send mail using {{ domain }}'s <a href=\"{{ domainConfigLink }}\">Outbound Email</a> settings.",
+                "description": "This sets the address from which this app sends email. This app is already configured to send mail using {{ domain }}'s <a href=\\\"{{ domainConfigLink }}\\\">Outbound Email</a> settings.",
                 "mailboxPlaceholder": "Leave empty to use platform default",
                 "saveAction": "Save",
-                "enable": "Send emails using the internal mail server",
-                "description2": "When enabled, the app is configured to send emails via the internal mail server using this address. The internal mail server will use the {{ domain }}'s <a href=\"{{ domainConfigLink }}\">Outbound Email</a> settings to send mail. When disabled, you can configure the email settings within the app."
+                "enable": "Use Cloudron Mail to send emails",
+                "description2": "When enabled, the app is configured to send emails via the internal mail server using this address. The internal mail server will use the {{ domain }}'s <a href=\"{{ domainConfigLink }}\">Outbound Email</a> settings to send mail. When disabled, you can configure the email settings within the app.",
+                "disable": "Do not configure mail settings",
+                "enableDescription": "The app is configured to send mails using the address below and the {{ domain }}'s <a href=\\\"{{ domainConfigLink }}\\\">Outbound Email</a> settings.",
+                "disableDescription": "The app's mail delivery settings is left alone. You can configure it inside the app."
             },
             "csp": {
                 "title": "Content Security Policy"
diff --git a/src/translation/nl.json b/src/translation/nl.json
index 00ade2853..247f96769 100644
--- a/src/translation/nl.json
+++ b/src/translation/nl.json
@@ -317,7 +317,9 @@
             "noTokensPlaceholder": "Er zijn geen API Tokens aangemaakt",
             "revokeTokenTooltip": "Token intrekken",
             "expiresAt": "Vervalt op",
-            "description": "Gebruik deze persoonlijke toegangstokens voor authenticatie met de <a target=\"_blank\" href=\"{{ apiDocsLink }}\">Cloudron API</a>"
+            "description": "Gebruik deze persoonlijke toegangstokens voor authenticatie met de <a target=\"_blank\" href=\"{{ apiDocsLink }}\">Cloudron API</a>",
+            "neverUsed": "nooit",
+            "lastUsed": "Laatst gebruikt"
         },
         "loginTokens": {
             "title": "Inlog Tokens",
@@ -643,7 +645,9 @@
                 "title": "E-mail VAN adres",
                 "mailboxPlaceholder": "Laat leeg om platformstandaard te gebruiken",
                 "saveAction": "Opslaan",
-                "description": "Dit stelt het adres in waarvandaan deze app e-mail verzendt. Deze app is al geconfigureerd om e-mail te verzenden met deze {{ domain }}'s <a href=\"{{ domainConfigLink }}\">uitgaande e-mail</a> instellingen."
+                "description": "Dit stelt het adres in waarvandaan deze app e-mail verzendt. Deze app is al geconfigureerd om e-mail te verzenden met deze {{ domain }}'s <a href=\"{{ domainConfigLink }}\">uitgaande e-mail</a> instellingen.",
+                "description2": "Indien ingeschakeld, verstuurt de app e-mails via de interne mailserver met dit adres. De interne mailserver gebruikt de {{ domain }}'s <a href=\"{{ domainConfigLink }}\">Uitgaande e-mail</a> instellingen om e-mail te versturen. Indien uitgeschakeld, kun je de e-mailinstellingen bewerken in de app.",
+                "enable": "Verstuur e-mails via de interne mailserver"
             }
         },
         "backAction": "Terug naar Mijn Apps",
diff --git a/src/views/app.html b/src/views/app.html
index 6d26c2a7d..845eb6d49 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -858,21 +858,15 @@
       <div class="card" ng-show="view === 'email'">
         <div class="row">
           <div class="col-md-12">
-            <div class="radio">
-              <label>
-                <input type="radio" ng-model="email.enableMailbox" value="0"> {{ 'app.email.from.disable' | tr }}
-              </label>
-            </div>
+            <label class="control-label">{{ 'app.email.from.title' | tr }} <sup><a ng-href="https://docs.cloudron.io/apps/#mail-from-address" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
 
-            <p class="small">Some description what this does</p>
-
-            <div class="radio">
+            <div class="radio" ng-show="app.manifest.addons.sendmail.optional">
               <label>
                 <input type="radio" ng-model="email.enableMailbox" value="1"> {{ 'app.email.from.enable' | tr }}
               </label>
             </div>
 
-            <p ng-bind-html="'app.email.from.description2' | tr:{ domain: app.domain, domainConfigLink: ('/#/email/' + app.domain) }"></p>
+            <p ng-bind-html="'app.email.from.enableDescription' | tr:{ domain: app.domain, domainConfigLink: ('/#/email/' + app.domain) }"></p>
 
             <form role="form" name="emailForm" ng-submit="email.submit()" autocomplete="off">
               <fieldset ng-disabled="!email.enableMailbox">
@@ -899,11 +893,19 @@
               </fieldset>
               <input class="ng-hide" type="submit" ng-disabled="(email.currentMailboxDomainName === email.mailboxDomain.domain && email.currentMailboxName === email.mailboxName) || email.busy || app.error || app.taskId"/>
             </form>
+
+            <div class="radio" ng-show="app.manifest.addons.sendmail.optional">
+              <label>
+                <input type="radio" ng-model="email.enableMailbox" value="0"> {{ 'app.email.from.disable' | tr }}
+              </label>
+            </div>
+
+            <p ng-show="app.manifest.addons.sendmail.optional">{{ 'app.email.from.disableDescription' | tr }}</p>
           </div>
         </div>
         <div class="row">
           <div class="col-md-12 text-right">
-            <button class="btn btn-outline btn-primary pull-right" ng-click="email.submit()" ng-disabled="(email.currentMailboxDomainName === email.mailboxDomain.domain && email.currentMailboxName === email.mailboxName) || email.busy || app.error || app.taskId" tooltip-enable="app.error || app.taskId" uib-tooltip="{{ app.error ? 'App is in error state' : 'App is busy' }}">
+            <button class="btn btn-outline btn-primary pull-right" ng-click="email.submit()" ng-disabled="(app.enableMailbox === email.enableMailbox && email.currentMailboxDomainName === email.mailboxDomain.domain && email.currentMailboxName === email.mailboxName) || email.busy || app.error || app.taskId" tooltip-enable="app.error || app.taskId" uib-tooltip="{{ app.error ? 'App is in error state' : 'App is busy' }}">
               <i class="fa fa-circle-notch fa-spin" ng-show="email.busy"></i> {{ 'app.email.from.saveAction' | tr }}
             </button>
           </div>
diff --git a/src/views/app.js b/src/views/app.js
index 5241c27c3..351e6dca9 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -771,7 +771,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
             $scope.email.error = {};
             $scope.email.busy = true;
 
-            Client.configureApp($scope.app.id, 'mailbox', { enable: $scope.email.enableMailbox, mailboxName: $scope.email.mailboxName || null, mailboxDomain: $scope.email.mailboxDomain.domain }, function (error) {
+            Client.configureApp($scope.app.id, 'mailbox', { enable: $scope.email.enableMailbox === '1', mailboxName: $scope.email.mailboxName || null, mailboxDomain: $scope.email.mailboxDomain.domain }, function (error) {
                 if (error && error.statusCode === 400) {
                     $scope.email.busy = false;
                     $scope.email.error.mailboxName = error.message;