diff --git a/xpfe/browser/resources/content/metadata.js b/xpfe/browser/resources/content/metadata.js
index 9c2b75d005623827dbe204965f6bd60612af93d5..383093ff114a949251c25bbdaaade29bdc3a9195 100644
--- a/xpfe/browser/resources/content/metadata.js
+++ b/xpfe/browser/resources/content/metadata.js
@@ -167,6 +167,15 @@ function checkForImage(elem, htmllocalname)
 
     if (img) {
         setInfo("image-url", img.src);
+        if ("width" in img) {
+            setInfo("image-width", img.width);
+            setInfo("image-height", img.height);
+        }
+	else {
+	    setInfo("image-width", "");
+	    setInfo("image-height", "");
+	}	
+	 
         if (imgType == "img") {
             setInfo("image-desc", getAbsoluteURL(img.longDesc, img));
         } else {
@@ -317,7 +326,6 @@ function setInfo(id, value)
             node.removeChild(node.firstChild);
         node.appendChild(node.ownerDocument.createTextNode(value));
     }
-
 }
 
 // Hide node with specified id
@@ -362,8 +370,8 @@ function getImageForMap(map)
         }
     }
 
-    var list = getHTMLElements(map.ownerDocument, "object");
-    for (var i=0; i < list.length; i++) {
+    list = getHTMLElements(map.ownerDocument, "object");
+    for (i = 0; i < list.length; i++) {
         if (list.item(i).getAttribute("usemap") == mapuri) {
             if (img) {
               multipleFound = true;
diff --git a/xpfe/browser/resources/content/metadata.xul b/xpfe/browser/resources/content/metadata.xul
index ab866301ac3056a10891a83b6d62f368c03fc1e3..801f77779bf13d1a2108824b2c2640547007e53a 100644
--- a/xpfe/browser/resources/content/metadata.xul
+++ b/xpfe/browser/resources/content/metadata.xul
@@ -71,7 +71,11 @@
       <rows>
         <row id="link-url">
           <text value="&link-url.label; "/>
-          <text id="link-url-text" value="" class="text-link" onclick="openLink(this)"/>
+          <hbox>
+            <text id="link-url-text" value="" class="text-link" 
+                  onclick="openLink(this)"/>
+            <spring flex="1"/>
+          </hbox>
         </row>
         <row id="link-target">
           <text value="&link-target.label; "/>
@@ -106,11 +110,33 @@
       <rows>
         <row id="image-url">
           <text value="&image-url.label; "/>
-          <text id="image-url-text" value="" class="text-link" onclick="openLink(this)"/>
+          <hbox>
+            <text id="image-url-text" value="" class="text-link" 
+                  onclick="openLink(this)"/>
+            <spring flex="1"/>
+          </hbox>
+        </row>
+        <row id="image-width">
+          <text value="&image-width.label; "/>
+          <hbox>
+            <text id="image-width-text" value=""/>
+            <text value=" &image-pixels.label;"/>
+          </hbox>
+        </row>
+        <row id="image-height">    
+          <text value="&image-height.label; "/>
+          <hbox>
+            <text id="image-height-text" value=""/>
+            <text value=" &image-pixels.label;"/>
+          </hbox>
         </row>
         <row id="image-desc">
           <text value="&image-desc.label; "/>
-          <text id="image-desc-text" value="" class="text-link" onclick="openLink(this)"/>
+          <hbox>
+            <text id="image-desc-text" value="" class="text-link" 
+                  onclick="openLink(this)"/>
+            <spring flex="1"/>
+          </hbox>
         </row>
       </rows>
     </grid>
@@ -125,7 +151,11 @@
       <rows>
         <row id="insdel-cite">
           <text value="&insdel-cite.label; "/>
-          <text id="insdel-cite-text" value="" class="text-link" onclick="openLink(this)"/>
+          <hbox>
+            <text id="insdel-cite-text" value="" class="text-link" 
+                  onclick="openLink(this)"/>
+            <spring flex="1"/>
+          </hbox>
         </row>
         <row id="insdel-date">
           <text value="&insdel-date.label; "/>
@@ -144,7 +174,11 @@
       <rows>
         <row id="quote-cite">
           <text value="&quote-cite.label; "/>
-          <text id="quote-cite-text" value="" class="text-link" onclick="openLink(this)"/>
+          <hbox>
+            <text id="quote-cite-text" value="" class="text-link" 
+                  onclick="openLink(this)"/>
+            <spring flex="1"/>
+          </hbox>
         </row>
       </rows>
     </grid>
diff --git a/xpfe/browser/resources/locale/en-US/metadata.dtd b/xpfe/browser/resources/locale/en-US/metadata.dtd
index b60f0df40c30fbf613bc8d789a32e0c9f1515c4a..bef3883fc1bb8ec8a287c170f08d41790f88d981 100644
--- a/xpfe/browser/resources/locale/en-US/metadata.dtd
+++ b/xpfe/browser/resources/locale/en-US/metadata.dtd
@@ -4,6 +4,9 @@
 <!ENTITY image-sec.label       "Image Properties">
 <!ENTITY image-url.label       "Location:">
 <!ENTITY image-desc.label      "Description:">
+<!ENTITY image-width.label     "Width:">
+<!ENTITY image-height.label    "Height:">
+<!ENTITY image-pixels.label    "pixels">
 <!ENTITY insdel-sec.label      "Insert/Delete Properties">
 <!ENTITY insdel-cite.label     "Info:">
 <!ENTITY insdel-date.label     "Date:">
@@ -16,7 +19,7 @@
 <!ENTITY link-rev.label        "Reversed relation:">
 <!ENTITY misc-sec.label        "Miscellaneous Properties">
 <!ENTITY misc-lang.label       "Text language:">
-<!ENTITY misc-title.label      "Text title:">
+<!ENTITY misc-title.label      "Title:">
 <!ENTITY misc-tblsummary.label "Table summary:">
 <!ENTITY quote-sec.label       "Quote Properties">
 <!ENTITY quote-cite.label      "Info:">