diff --git a/src/views/app.html b/src/views/app.html
index a8ab0b313..b2a7ec275 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -987,7 +987,7 @@
                     <br/>
                   </div>
                 </fieldset>
-                <input class="ng-hide" type="submit" ng-disabled="(email.currentMailboxDomainName === email.mailboxDomain.domain && email.currentMailboxName === email.mailboxName) || email.busy || app.error || app.taskId"/>
+                <input class="ng-hide" type="submit" ng-disabled="(email.currentMailboxDomainName === email.mailboxDomain.domain && email.currentMailboxName === email.mailboxName) || email.mailboxBusy || app.error || app.taskId"/>
               </form>
             </div>
 
@@ -1005,8 +1005,8 @@
         <div class="row" ng-show="app.manifest.addons.sendmail">
           <div class="col-md-12 text-right">
             <br/>
-            <button class="btn btn-outline btn-primary pull-right" ng-click="email.submitMailbox()" 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 class="btn btn-outline btn-primary pull-right" ng-click="email.submitMailbox()" ng-disabled="(app.enableMailbox === email.enableMailbox && email.currentMailboxDomainName === email.mailboxDomain.domain && email.currentMailboxName === email.mailboxName) || email.mailboxBusy || 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.mailboxBusy"></i> {{ 'app.email.from.saveAction' | tr }}
             </button>
           </div>
         </div>
@@ -1049,7 +1049,7 @@
                     <br/>
                   </div>
                 </fieldset>
-                <input class="ng-hide" type="submit" ng-disabled="(email.currentInboxDomainName === email.inboxDomain.domain && email.currentInboxName === email.inboxName) || email.busy || app.error || app.taskId"/>
+                <input class="ng-hide" type="submit" ng-disabled="(email.currentInboxDomainName === email.inboxDomain.domain && email.currentInboxName === email.inboxName) || email.inboxBusy || app.error || app.taskId"/>
               </form>
             </div>
 
@@ -1067,8 +1067,8 @@
         <div class="row" ng-show="app.manifest.addons.recvmail">
           <div class="col-md-12 text-right">
             <br/>
-            <button class="btn btn-outline btn-primary pull-right" ng-click="email.submitInbox()" ng-disabled="inboxForm.$invalid || (app.enableInbox === email.enableInbox && email.currentInboxDomainName === email.inboxDomain.domain && email.currentInboxName === email.inboxName) || 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 class="btn btn-outline btn-primary pull-right" ng-click="email.submitInbox()" ng-disabled="inboxForm.$invalid || (app.enableInbox === email.enableInbox && email.currentInboxDomainName === email.inboxDomain.domain && email.currentInboxName === email.inboxName) || email.inboxBusy || 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.inboxBusy"></i> {{ 'app.email.from.saveAction' | tr }}
             </button>
           </div>
         </div>
diff --git a/src/views/app.js b/src/views/app.js
index 202b1f04d..6e5c1a13b 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -805,14 +805,13 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
     };
 
     $scope.email = {
-        busy: false,
-
         enableMailbox: true,
         mailboxName: '',
         mailboxDomain: null,
         currentMailboxName: '',
         currentMailboxDomainName: '',
         mailboxError: {},
+        mailboxBusy: false,
 
         enableInbox: true,
         inboxName: '',
@@ -820,6 +819,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         currentInboxName: '',
         currentInboxDomainName: '',
         inboxError: {},
+        inboxBusy: false,
 
         show: function () {
             var app = $scope.app;
@@ -843,7 +843,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
 
         submitMailbox: function () {
             $scope.email.error = {};
-            $scope.email.busy = true;
+            $scope.email.mailboxBusy = true;
 
             var data = {
                 enable: $scope.email.enableMailbox === '1'
@@ -856,7 +856,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
 
             Client.configureApp($scope.app.id, 'mailbox', data, function (error) {
                 if (error && error.statusCode === 400) {
-                    $scope.email.busy = false;
+                    $scope.email.mailboxBusy = false;
                     $scope.email.error.mailboxName = error.message;
                     $scope.emailForm.$setPristine();
                     return;
@@ -875,14 +875,14 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
                     $scope.email.currentMailboxName = $scope.app.mailboxName || '';
                     $scope.email.currentMailboxDomainName = $scope.email.mailboxDomain ? $scope.email.mailboxDomain.domain : '';
 
-                    $timeout(function () { $scope.email.busy = false; }, 1000);
+                    $timeout(function () { $scope.email.mailboxBusy = false; }, 1000);
                 });
             });
         },
 
         submitInbox: function () {
             $scope.email.error = {};
-            $scope.email.busy = true;
+            $scope.email.inboxBusy = true;
 
             var data = {
                 enable: $scope.email.enableInbox === '1'
@@ -895,7 +895,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
 
             Client.configureApp($scope.app.id, 'inbox', data, function (error) {
                 if (error && error.statusCode === 400) {
-                    $scope.email.busy = false;
+                    $scope.email.inboxBusy = false;
                     $scope.email.error.inboxName = error.message;
                     $scope.inboxForm.$setPristine();
                     return;
@@ -914,7 +914,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
                     $scope.email.currentInboxName = $scope.app.inboxName || '';
                     $scope.email.currentInboxDomainName = $scope.email.inboxDomain ? $scope.email.inboxDomain.domain : '';
 
-                    $timeout(function () { $scope.email.busy = false; }, 1000);
+                    $timeout(function () { $scope.email.inboxBusy = false; }, 1000);
                 });
             });
         }