diff --git a/mozilla/editor/ui/composer/content/editor.js b/mozilla/editor/ui/composer/content/editor.js
index b7ec381afe8..bbc407d85dd 100644
--- a/mozilla/editor/ui/composer/content/editor.js
+++ b/mozilla/editor/ui/composer/content/editor.js
@@ -1751,7 +1751,10 @@ function InitObjectPropertiesMenuitem(id)
     switch (name)
     {
       case "img":
-        objStr = GetString("Image");
+        if (editorShell.GetElementOrParentByTagName("href", element))
+          objStr = GetString("ImageAndLink");
+        else
+          objStr = GetString("Image");
         break;
       case "hr":
         objStr = GetString("HLine");