diff --git a/src/js/index.js b/src/js/index.js
index a3744e761..d16ad0921 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -84,7 +84,7 @@ app.config(['$routeProvider', function ($routeProvider) {
     }).when('/emails-eventlog', {
         controller: 'EmailsEventlogController',
         templateUrl: 'views/emails-eventlog.html?<%= revision %>'
-    }).when('/email/:domain', {
+    }).when('/email/:domain/:view?', {
         controller: 'EmailController',
         templateUrl: 'views/email.html?<%= revision %>'
     }).when('/notifications', {
diff --git a/src/views/email.html b/src/views/email.html
index a62aedb50..752ee2eca 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -309,8 +309,8 @@
 
   <br/>
 
-  <uib-tabset>
-    <uib-tab index="0" heading="{{ 'email.incoming.tabTitle' | tr }}">
+  <uib-tabset active="activeTab">
+    <uib-tab index="'mailboxes'" select="setView('mailboxes')" heading="{{ 'email.incoming.tabTitle' | tr }}">
       <div class="card card-large" style="margin-bottom: 15px;">
         <h4>{{ 'email.incoming.title' | tr }}</h4>
 
@@ -477,7 +477,7 @@
       </div>
     </uib-tab>
 
-    <uib-tab index="1" heading="{{ 'email.outbound.tabTitle' | tr }}">
+    <uib-tab index="'outbound'" select="setView('outbound')" heading="{{ 'email.outbound.tabTitle' | tr }}">
       <div class="card card-large" style="margin-bottom: 15px;">
         <h4>{{ 'email.outbound.title' | tr }} <sup><a ng-href="https://docs.cloudron.io/email/#relay-outbound-mails" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></h4>
 
@@ -576,7 +576,7 @@
       </div>
     </uib-tab>
 
-    <uib-tab index="2" heading="{{ 'email.settings.tabTitle' | tr }}">
+    <uib-tab index="'settings'" select="setView('settings')" heading="{{ 'email.settings.tabTitle' | tr }}">
       <div class="card card-large" style="margin-bottom: 15px;">
         <h4>{{ 'email.masquerading.title' | tr }}</h4>
 
@@ -627,7 +627,7 @@
       </div>
     </uib-tab>
 
-    <uib-tab index="3" heading="{{ 'email.status.tabTitle' | tr }}">
+    <uib-tab index="'status'" select="setView('status')" heading="{{ 'email.status.tabTitle' | tr }}">
       <!-- nothing to show if incoming mail is disabled and using a relay -->
       <div class="card card-large" style="margin-bottom: 15px;" ng-hide="!domain.mailConfig.enabled && domain.mailConfig.relay.provider !== 'cloudron-smtp'">
         <div class="row">
diff --git a/src/views/email.js b/src/views/email.js
index 4b5df796d..c6791db57 100644
--- a/src/views/email.js
+++ b/src/views/email.js
@@ -4,12 +4,31 @@
 /* global $ */
 /* global async */
 
-angular.module('Application').controller('EmailController', ['$scope', '$location', '$translate', '$timeout', '$routeParams', 'Client', function ($scope, $location, $translate, $timeout, $routeParams, Client) {
+angular.module('Application').controller('EmailController', ['$scope', '$location', '$translate', '$timeout', '$route', '$routeParams', 'Client', function ($scope, $location, $translate, $timeout, $route, $routeParams, Client) {
     Client.onReady(function () { if (!Client.getUserInfo().isAtLeastAdmin) $location.path('/'); });
 
+    // Avoid full reload on path change
+    // https://stackoverflow.com/a/22614334
+    // reloadOnUrl: false in $routeProvider did not work!
+    var lastRoute = $route.current;
+    $scope.$on('$locationChangeSuccess', function (/* event */) {
+        if (lastRoute.$$route.originalPath === $route.current.$$route.originalPath) {
+            $route.current = lastRoute;
+        }
+    });
+
     var domainName = $routeParams.domain;
     if (!domainName) return $location.path('/email');
 
+    $scope.setView = function (view, setAlways) {
+        if (!setAlways && !$scope.ready) return;
+        if ($scope.view === view) return;
+
+        $route.updateParams({ view: view });
+        $scope.view = view;
+        $scope.activeTab = view;
+    };
+
     $scope.ready = false;
     $scope.refreshBusy = true;
     $scope.client = Client;
@@ -803,6 +822,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
                     }, function iteratorDone(error) {
                         if (error) return console.error(error);
 
+                        $scope.setView($routeParams.view || 'mailboxes', true /* always set */);
                         $scope.ready = true;
                     });
                 });