diff --git a/UI/MailPartViewers/English.lproj/Localizable.strings b/UI/MailPartViewers/English.lproj/Localizable.strings
index a23ee4125..cfd3fcd80 100644
--- a/UI/MailPartViewers/English.lproj/Localizable.strings
+++ b/UI/MailPartViewers/English.lproj/Localizable.strings
@@ -46,3 +46,8 @@ reply_info = "This is a reply to an event invitation done by you.";
 "Date" = "Date";
 "To" = "To";
 "Issuer" = "Issuer";
+
+/* Tooltips */
+
+"View Attachment" = "View Attachment";
+"Save Attachment" = "Save Attachment";
diff --git a/UI/Templates/MailPartViewers/UIxMailPartLinkViewer.wox b/UI/Templates/MailPartViewers/UIxMailPartLinkViewer.wox
index 8ebea35d2..c70463d80 100644
--- a/UI/Templates/MailPartViewers/UIxMailPartLinkViewer.wox
+++ b/UI/Templates/MailPartViewers/UIxMailPartLinkViewer.wox
@@ -22,9 +22,11 @@
     
     <div layout="row" layout-align="end end">
       <md-button class="sg-icon-button" var:href="pathToAttachment">
+        <md-tooltip md-direction="left"><var:string label:value="View Attachment"/></md-tooltip>
         <md-icon>open_in_browser</md-icon>
       </md-button>
       <md-button class="sg-icon-button" var:href="pathForDownload">
+        <md-tooltip md-direction="left"><var:string label:value="Save Attachment"/></md-tooltip>
         <md-icon>save</md-icon>
       </md-button>
     </div>