diff --git a/mailnews/base/resources/content/msgHdrViewOverlay.js b/mailnews/base/resources/content/msgHdrViewOverlay.js
index feb8b00e240..dc528367c50 100644
--- a/mailnews/base/resources/content/msgHdrViewOverlay.js
+++ b/mailnews/base/resources/content/msgHdrViewOverlay.js
@@ -910,6 +910,15 @@ createNewAttachmentInfo.prototype.saveAttachment = function saveAttachment()
                              false);
 }
 
+createNewAttachmentInfo.prototype.viewAttachment = function viewAttachment()
+{
+  var url = this.url;
+  if (!this.isExternalAttachment)
+    url += "&filename=" + encodeURIComponent(this.displayName);
+  openDialog("chrome://navigator/content/viewSource.xul",
+             "_blank", "all,dialog=no", url);
+}
+
 createNewAttachmentInfo.prototype.openAttachment = function openAttachment()
 {
   messenger.openAttachment(this.contentType, 
@@ -959,6 +968,7 @@ function onShowAttachmentContextMenu()
   var attachmentList = document.getElementById('attachmentList');
   var selectedAttachments = attachmentList.selectedItems;
   var openMenu = document.getElementById('context-openAttachment');
+  var viewMenu = document.getElementById('context-viewAttachment');
   var saveMenu = document.getElementById('context-saveAttachment');
   var detachMenu = document.getElementById('context-detachAttachment');
   var deleteMenu = document.getElementById('context-deleteAttachment');
@@ -971,10 +981,12 @@ function onShowAttachmentContextMenu()
   if (canOpen && selectedAttachments.length == 1)
   {
     openMenu.removeAttribute('disabled');
+    viewMenu.removeAttribute('disabled');
   }
   else
   {
     openMenu.setAttribute('disabled', true);
+    viewMenu.setAttribute('disabled', true);
   }
   if (canOpen)
   {
@@ -1165,71 +1177,52 @@ function addAttachmentToPopup(popup, attachment, attachmentIndex)
 
       item.setAttribute('label', formattedDisplayNameString); 
       item.setAttribute('accesskey', attachmentIndex); 
+
+      var openpopup = document.createElement('menupopup');
+      openpopup = item.appendChild(openpopup);
       if (attachment.contentType == "text/x-moz-deleted") {
         item.setAttribute('disabled', 'true');
         return;
       }
+      openpopup.attachment = attachment;
+      openpopup.addEventListener('popupshowing', FillAttachmentItemPopup, false);
       setApplicationIconForAttachment(attachment, item);
-      var canDetach = CanDetachAttachments();
+    }
+  }
+}
 
-      var openpopup = document.createElement('menupopup');
-      openpopup = item.appendChild(openpopup);
+function FillAttachmentItemPopup(event)
+{
+  var canDetach = CanDetachAttachments();
+  var openpopup = event.target;
+  openpopup.removeEventListener('popupshowing', FillAttachmentItemPopup, false);
 
-      var menuitementry = document.createElement('menuitem');     
+  var menuitementry = document.getElementById("context-openAttachment").cloneNode(false);
+  menuitementry.setAttribute('oncommand', 'this.parentNode.attachment.openAttachment();'); 
+  menuitementry = openpopup.appendChild(menuitementry);
 
-      menuitementry.attachment = attachment;
-      menuitementry.setAttribute('oncommand', 'this.attachment.openAttachment()'); 
+  menuitementry = document.getElementById("context-viewAttachment").cloneNode(false);
+  menuitementry.setAttribute('oncommand', 'this.parentNode.attachment.viewAttachment();');
+  menuitementry = openpopup.appendChild(menuitementry);
 
-      if (!gDeleteLabel)
-        gDeleteLabel = gMessengerBundle.getString("deleteLabel");
-      if (!gDeleteLabelAccesskey)
-        gDeleteLabelAccesskey = gMessengerBundle.getString("deleteLabelAccesskey");
-      if (!gDetachLabel)
-        gDetachLabel = gMessengerBundle.getString("detachLabel");
-      if (!gDetachLabelAccesskey)
-        gDetachLabelAccesskey = gMessengerBundle.getString("detachLabelAccesskey");
-      if (!gSaveLabel)
-        gSaveLabel = gMessengerBundle.getString("saveLabel");
-      if (!gSaveLabelAccesskey)
-        gSaveLabelAccesskey = gMessengerBundle.getString("saveLabelAccesskey");
-      if (!gOpenLabel)
-        gOpenLabel = gMessengerBundle.getString("openLabel");
-      if (!gOpenLabelAccesskey)
-        gOpenLabelAccesskey = gMessengerBundle.getString("openLabelAccesskey");
+  menuitementry = document.getElementById("context-saveAttachment").cloneNode(false);
+  menuitementry.setAttribute('oncommand', 'this.parentNode.attachment.saveAttachment()'); 
+  menuitementry = openpopup.appendChild(menuitementry);
 
-      menuitementry.setAttribute('label', gOpenLabel); 
-      menuitementry.setAttribute('accesskey', gOpenLabelAccesskey); 
-      menuitementry = openpopup.appendChild(menuitementry);
+  var menuseparator = document.createElement('menuseparator');
+  openpopup.appendChild(menuseparator);
 
-      menuitementry = document.createElement('menuitem');
-      menuitementry.attachment = attachment;
-      menuitementry.setAttribute('oncommand', 'this.attachment.saveAttachment()'); 
-      menuitementry.setAttribute('label', gSaveLabel); 
-      menuitementry.setAttribute('accesskey', gSaveLabelAccesskey); 
-      menuitementry = openpopup.appendChild(menuitementry);
+  menuitementry = document.getElementById("context-detachAttachment").cloneNode(false);
+  menuitementry.setAttribute('oncommand', 'this.parentNode.attachment.detachAttachment()'); 
+  if (!canDetach)
+    menuitementry.setAttribute('disabled', 'true');
+  menuitementry = openpopup.appendChild(menuitementry);
 
-      var menuseparator = document.createElement('menuseparator');
-      openpopup.appendChild(menuseparator);
-
-      menuitementry = document.createElement('menuitem');
-      menuitementry.attachment = attachment;
-      menuitementry.setAttribute('oncommand', 'this.attachment.detachAttachment()'); 
-      menuitementry.setAttribute('label', gDetachLabel); 
-      menuitementry.setAttribute('accesskey', gDetachLabelAccesskey); 
-      if (!canDetach)
-        menuitementry.setAttribute('disabled', 'true');
-      menuitementry = openpopup.appendChild(menuitementry);
-
-      menuitementry = document.createElement('menuitem');
-      menuitementry.attachment = attachment;
-      menuitementry.setAttribute('oncommand', 'this.attachment.deleteAttachment()'); 
-      menuitementry.setAttribute('label', gDeleteLabel); 
-      menuitementry.setAttribute('accesskey', gDeleteLabelAccesskey); 
-      if (!canDetach)
-        menuitementry.setAttribute('disabled', 'true');
-      menuitementry = openpopup.appendChild(menuitementry);
-    }  // if we created a menu item for this attachment...
-  } // if we have a popup
+  menuitementry = document.getElementById("context-deleteAttachment").cloneNode(false);
+  menuitementry.setAttribute('oncommand', 'this.attachment.deleteAttachment()'); 
+  if (!canDetach)
+    menuitementry.setAttribute('disabled', 'true');
+  menuitementry = openpopup.appendChild(menuitementry);
 } 
 
 function HandleMultipleAttachments(commandPrefix, selectedAttachments)
@@ -1291,7 +1284,7 @@ function HandleMultipleAttachments(commandPrefix, selectedAttachments)
 function ClearAttachmentList() 
 { 
   // we also have to disable the File/Attachments menuitem
-  node = document.getElementById("fileAttachmentMenu");
+  var node = document.getElementById("fileAttachmentMenu");
   if (node)
     node.setAttribute("disabled", "true");
 
diff --git a/mailnews/base/resources/content/msgHdrViewOverlay.xul b/mailnews/base/resources/content/msgHdrViewOverlay.xul
index 7a0be473cb2..6957ad9713a 100644
--- a/mailnews/base/resources/content/msgHdrViewOverlay.xul
+++ b/mailnews/base/resources/content/msgHdrViewOverlay.xul
@@ -79,6 +79,8 @@
 <popup id="attachmentListContext" onpopupshowing="return onShowAttachmentContextMenu();">
   <menuitem id="context-openAttachment" label="&openAttachmentCmd.label;" accesskey="&openAttachmentCmd.accesskey;"
      oncommand="handleAttachmentSelection('openAttachment');"/>
+  <menuitem id="context-viewAttachment" label="&viewAttachmentCmd.label;" accesskey="&viewAttachmentCmd.accesskey;"
+     oncommand="handleAttachmentSelection('viewAttachment');"/>
   <menuitem id="context-saveAttachment" label="&saveAsAttachmentCmd.label;" accesskey="&saveAsAttachmentCmd.accesskey;"
      oncommand="handleAttachmentSelection('saveAttachment');"/>
   <menuseparator/>
diff --git a/mailnews/base/resources/locale/en-US/messenger.properties b/mailnews/base/resources/locale/en-US/messenger.properties
index c602f183130..02ea7dd61a1 100644
--- a/mailnews/base/resources/locale/en-US/messenger.properties
+++ b/mailnews/base/resources/locale/en-US/messenger.properties
@@ -291,14 +291,6 @@ cannotHaveTwoFilterRulesDialogs=Filter Rules Dialog
 cannotHaveTwoFilterRulesText=The filter cannot be created because the Filter Rules dialog is already in use. Please close the dialog and try again.
 
 # msgHdrViewOverlay.js
-openLabel=Open
-openLabelAccesskey=O
-saveLabel=Save As...
-saveLabelAccesskey=A
-detachLabel=Detach...
-detachLabelAccesskey=D
-deleteLabel=Delete
-deleteLabelAccesskey=E
 deleteAttachments=The following attachments will be permanently deleted from this message:\n%S\nThis action cannot be undone. Do you wish to continue?
 detachAttachments=The following attachments have been successfully saved and will now be permanently deleted from this message:\n%S\nThis action cannot be undone. Do you wish to continue?
 deleteAttachmentFailure=Failed to delete the selected attachments.
diff --git a/mailnews/base/resources/locale/en-US/msgHdrViewOverlay.dtd b/mailnews/base/resources/locale/en-US/msgHdrViewOverlay.dtd
index d28db3c0472..7a14879472b 100644
--- a/mailnews/base/resources/locale/en-US/msgHdrViewOverlay.dtd
+++ b/mailnews/base/resources/locale/en-US/msgHdrViewOverlay.dtd
@@ -57,6 +57,8 @@
 <!ENTITY attachmentsTree.label             "Attachments:">
 <!ENTITY openAttachmentCmd.label           "Open">
 <!ENTITY openAttachmentCmd.accesskey       "O">
+<!ENTITY viewAttachmentCmd.label           "View Source">
+<!ENTITY viewAttachmentCmd.accesskey       "V">
 <!ENTITY saveAsAttachmentCmd.label         "Save As...">
 <!ENTITY saveAsAttachmentCmd.accesskey     "A">
 <!ENTITY printAttachmentCmd.label          ".Print">