diff --git a/src/filemanager.html b/src/filemanager.html
index 26ce3dfbd..784baf5f3 100644
--- a/src/filemanager.html
+++ b/src/filemanager.html
@@ -73,7 +73,7 @@
 
   <a class="offline-banner animateMe" ng-show="client.offline" ng-cloak href="https://docs.cloudron.io/troubleshooting/" target="_blank"><i class="fa fa-circle-notch fa-spin"></i> {{ 'main.offline' | tr }}</a>
 
-  <div class="restart-banner animateMe" ng-show="restartAppBusy" ng-cloak><i class="fa fa-circle-notch fa-spin"></i> {{ 'filemanager.status.restartingApp' | tr}}</div>
+  <div class="restart-banner animateMe" ng-show="restartBusy" ng-cloak><i class="fa fa-circle-notch fa-spin"></i> {{ 'filemanager.status.restartingApp' | tr}}</div>
 
   <!-- Modal image/video viewer -->
   <div class="modal fade" id="mediaViewerModal" tabindex="-1" role="dialog">
@@ -318,12 +318,13 @@
                 <li><a class="hand" ng-click="onUploadFolder()">{{ 'filemanager.toolbar.uploadFolder' | tr }}</a></li>
               </ul>
             </div>
-            <div class="btn-group" ng-show="type === 'app'">
+            <div class="btn-group" ng-show="type === 'app' || type === 'mail'">
               <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-h"></i></button>
               <ul class="dropdown-menu dropdown-menu-right">
-                <li><a class="hand" ng-click="onRestartApp()"><i class="fas fa-sync-alt fa-fw"></i> {{ 'filemanager.toolbar.restartApp' | tr }}</a></li>
-                <li><a class="hand" ng-href="{{ '/logs.html?appId=' + id }}" target="_blank"><i class="fas fa-align-left fa-fw"></i> {{ 'filemanager.toolbar.openLogs' | tr }}</a></li>
-                <li><a class="hand" ng-href="{{ '/terminal.html?id=' + id }}" target="_blank"><i class="fa fa-terminal fa-fw"></i> {{ 'filemanager.toolbar.openTerminal' | tr }}</a></li>
+                <li><a class="hand" ng-show="type === 'app'" ng-click="onRestartApp()"><i class="fas fa-sync-alt fa-fw"></i> {{ 'filemanager.toolbar.restartApp' | tr }}</a></li>
+                <li><a class="hand" ng-show="type === 'mail'" ng-click="onRestartMail()"><i class="fas fa-sync-alt fa-fw"></i> {{ 'filemanager.toolbar.restartApp' | tr }}</a></li>
+                <li><a class="hand" ng-href="/logs.html?{{ type === 'app' ? 'appId=' + id : 'id=mail' }}" target="_blank"><i class="fas fa-align-left fa-fw"></i> {{ 'filemanager.toolbar.openLogs' | tr }}</a></li>
+                <li><a class="hand" ng-show="type === 'app'" ng-href="{{ '/terminal.html?id=' + id }}" target="_blank"><i class="fa fa-terminal fa-fw"></i> {{ 'filemanager.toolbar.openTerminal' | tr }}</a></li>
                 <li role="separator" class="divider" ng-show="volumes.length"></li>
                 <li class="disabled" ng-show="volumes.length"><a href="#">Volumes</a></li>
                 <li ng-repeat="volume in volumes"><a class="hand" ng-href="{{ '/filemanager.html?type=volume&id=' + volume.id }}" target="_blank"><i class="fas fa-folder fa-fw"></i> {{ volume.name }}</a></li>
diff --git a/src/js/filemanager.js b/src/js/filemanager.js
index 3180ff7c5..d88ad7be7 100644
--- a/src/js/filemanager.js
+++ b/src/js/filemanager.js
@@ -1,4 +1,4 @@
-"use strict";
+'use strict';
 
 require.config({ paths: { 'vs': '3rdparty/vs' }});
 
@@ -650,9 +650,9 @@ app.controller('FileManagerController', ['$scope', '$translate', '$timeout', 'Cl
     $('#uploadFolderInput').on('change', function (e ) { uploadFiles(e.target.files || [], $scope.cwd, false); });
     $scope.onUploadFolder = function () { $('#uploadFolderInput').click(); };
 
-    $scope.restartAppBusy = false;
+    $scope.restartBusy = false;
     $scope.onRestartApp = function () {
-        $scope.restartAppBusy = true;
+        $scope.restartBusy = true;
 
         function waitUntilRestarted(callback) {
             Client.getApp($scope.id, function (error, result) {
@@ -669,7 +669,30 @@ app.controller('FileManagerController', ['$scope', '$translate', '$timeout', 'Cl
             waitUntilRestarted(function (error) {
                 if (error) console.error('Failed wait for restart.', error);
 
-                $scope.restartAppBusy = false;
+                $scope.restartBusy = false;
+            });
+        });
+    };
+
+    $scope.onRestartMail = function () {
+        $scope.restartBusy = true;
+
+        function waitUntilRestarted(callback) {
+            Client.getService('mail', function (error, result) {
+                if (error) return callback(error);
+
+                if (result.status === 'active') return callback();
+                setTimeout(waitUntilRestarted.bind(null, callback), 2000);
+            });
+        }
+
+        Client.restartService('mail', function (error) {
+            if (error) console.error('Failed to restart mail.', error);
+
+            waitUntilRestarted(function (error) {
+                if (error) console.error('Failed wait for restart.', error);
+
+                $scope.restartBusy = false;
             });
         });
     };