diff --git a/suite/common/contentAreaContextOverlay.xul b/suite/common/contentAreaContextOverlay.xul
index fb8b95e64d23..a115129411ae 100644
--- a/suite/common/contentAreaContextOverlay.xul
+++ b/suite/common/contentAreaContextOverlay.xul
@@ -135,7 +135,6 @@
                 accesskey="&saveLinkCmd.accesskey;"
                 oncommand="contextMenu.saveLink();"/>
       <menuitem id="context-saveimage"
-                value="&saveImageCmd.label;"
                 accesskey="&saveImageCmd.accesskey;"
                 oncommand="contextMenu.saveImage();"/>
       <menuitem id="context-savebgimage"
diff --git a/suite/common/nsContextMenu.js b/suite/common/nsContextMenu.js
index 5e20db9888e0..4769543fed6f 100644
--- a/suite/common/nsContextMenu.js
+++ b/suite/common/nsContextMenu.js
@@ -116,6 +116,14 @@ nsContextMenu.prototype = {
     
         // Save image depends on whether there is one.
         this.showItem( "context-saveimage", this.onImage );
+        if (this.onImage){ //if onImage, let's get the imagename into the context menu       
+           var saveImageMenuItem = document.getElementById( 'context-saveimage' );
+           var imageName = extractFileNameFromUrl(this.imageURL);
+           var bundle = srGetStrBundle("chrome://communicator/locale/contentAreaCommands.properties");
+           var caption = bundle.formatStringFromName("saveImageAs",[imageName],1);
+
+           saveImageMenuItem.setAttribute( "value", caption );
+        }
 
         // Remove separator if none of these were shown.
         var showSep = !this.inDirList || this.inFrame || this.onSaveableLink || this.hasBGImage || this.onImage;
diff --git a/suite/locales/en-US/chrome/common/contentAreaCommands.dtd b/suite/locales/en-US/chrome/common/contentAreaCommands.dtd
index 041c12d1116c..dd314db88ca2 100644
--- a/suite/locales/en-US/chrome/common/contentAreaCommands.dtd
+++ b/suite/locales/en-US/chrome/common/contentAreaCommands.dtd
@@ -41,7 +41,6 @@
 <!ENTITY saveFrameCmd.accesskey       "f">
 <!ENTITY saveLinkCmd.label            "Save Link As...">
 <!ENTITY saveLinkCmd.accesskey        "a">
-<!ENTITY saveImageCmd.label           "Save Image As...">
 <!ENTITY saveImageCmd.accesskey       "a">
 <!ENTITY saveBGImageCmd.label         "Save Background Image As...">
 <!ENTITY saveBGImageCmd.accesskey     "a">
diff --git a/suite/locales/en-US/chrome/common/contentAreaCommands.properties b/suite/locales/en-US/chrome/common/contentAreaCommands.properties
new file mode 100644
index 000000000000..c18b05f63b71
--- /dev/null
+++ b/suite/locales/en-US/chrome/common/contentAreaCommands.properties
@@ -0,0 +1,3 @@
+# context menu strings
+
+saveImageAs=Save Image (%S)...