diff --git a/UI/Common/UIxTopnavToolbar.m b/UI/Common/UIxTopnavToolbar.m
index 87fa63526..4ca5d8570 100644
--- a/UI/Common/UIxTopnavToolbar.m
+++ b/UI/Common/UIxTopnavToolbar.m
@@ -62,4 +62,9 @@
   return (vacationOptions && [[vacationOptions objectForKey: @"enabled"] boolValue]);
 }
 
+- (BOOL) userHasVacationDisabled
+{
+  return ![self userHasVacationEnabled];
+}
+
 @end
diff --git a/UI/Templates/UIxTopnavToolbar.wox b/UI/Templates/UIxTopnavToolbar.wox
index ddf8b776f..bca8fbad3 100644
--- a/UI/Templates/UIxTopnavToolbar.wox
+++ b/UI/Templates/UIxTopnavToolbar.wox
@@ -47,10 +47,13 @@
                var:ng-click="navButtonClick"
                ng-href="{{::activeUser.path.mail}}">
       <md-icon>email</md-icon>
+      <var:if condition="userHasVacationDisabled">
+        <md-tooltip><var:string label:value="Mail"/></md-tooltip>
+      </var:if>
       <var:if condition="userHasVacationEnabled">
         <md-icon class="md-default-theme md-warn md-bg sg-icon--badge" label:aria-label="Vacation message is enabled">forward</md-icon>
+        <md-tooltip><var:string label:value="Vacation message is enabled"/></md-tooltip>
       </var:if>
-      <md-tooltip><var:string label:value="Mail"/></md-tooltip>
     </md-button>
     <md-button class="md-icon-button"
                ng-disabled="::baseURL.endsWith('/Administration')"