diff --git a/mailnews/base/resources/content/msgHdrViewOverlay.js b/mailnews/base/resources/content/msgHdrViewOverlay.js
index 723a8366835c..e0ad50b5ea5d 100644
--- a/mailnews/base/resources/content/msgHdrViewOverlay.js
+++ b/mailnews/base/resources/content/msgHdrViewOverlay.js
@@ -920,11 +920,17 @@ function createNewAttachmentInfo(contentType, url, displayName, uri, isExternalA
 
 createNewAttachmentInfo.prototype.saveAttachment = function saveAttachment()
 {
-  messenger.saveAttachment(this.contentType, 
-                           this.url, 
-                           encodeURIComponent(this.displayName), 
-                           this.uri,
-                           this.isExternalAttachment);
+  if (this.isExternalAttachment)
+    internalSave(this.url, null,
+                 this.displayName, null,
+                 this.contentType, false,
+                 "SaveAttachmentTitle", null, null);
+  else
+    messenger.saveAttachment(this.contentType, 
+                             this.url, 
+                             encodeURIComponent(this.displayName), 
+                             this.uri,
+                             false);
 }
 
 createNewAttachmentInfo.prototype.openAttachment = function openAttachment()
diff --git a/xpfe/communicator/resources/locale/en-US/contentAreaCommands.properties b/xpfe/communicator/resources/locale/en-US/contentAreaCommands.properties
index 25b0a88bfd39..38432a311896 100644
--- a/xpfe/communicator/resources/locale/en-US/contentAreaCommands.properties
+++ b/xpfe/communicator/resources/locale/en-US/contentAreaCommands.properties
@@ -5,6 +5,7 @@ searchText=Search Web for "%S"
 SavePageTitle=Save Web Page
 SaveImageTitle=Save Image
 SaveLinkTitle=Save As
+SaveAttachmentTitle=Save Attachment
 DefaultSaveFileName=index
 WebPageCompleteFilter=Web Page, complete
 WebPageHTMLOnlyFilter=Web Page, HTML only