--- popup.xml	2003-12-09 09:54:35.522784600 -0500
+++ popup.xml	2003-12-09 09:36:20.418101400 -0500
@@ -158,17 +158,17 @@
         ]]>
       </handler>
     </handlers>
   </binding>
 
   <binding id="tooltip" extends="chrome://global/content/bindings/popup.xml#popup">
     <content>
       <children>
-        <xul:label class="tooltip-label" xbl:inherits="value=label,crop" crop="right" flex="1"/>
+        <xul:vbox anonid="vbox"/>
       </children>
     </content>
     
     <implementation>
       <field name="_mouseOutCount">0</field>
       <field name="_isMouseOver">false</field>
       
       <property name="label"
@@ -222,21 +222,42 @@
         if (rel != this && this._isMouseOver) {
           this.hidePopup();
         }        
       ]]></handler>
 
       <handler event="popupshowing">
       <![CDATA[
         // fill in the label automatically for the default tooltip
+        var label = this.label;
         if (this.getAttribute("default") == "true") {
-          var label = "";
           var ttNode = document.tooltipNode;
           if (ttNode && ttNode.hasAttribute("tooltiptext"))
-            this.label = ttNode.getAttribute("tooltiptext");
+            label = ttNode.getAttribute("tooltiptext");
+        }
+        var vbox = document.getAnonymousElementByAttribute(this, "anonid", "vbox");
+        if (vbox) {
+          while (vbox.lastChild)
+            vbox.removeChild(vbox.lastChild);
+          var labels = label.split(/\n\r|\n|\r\n|\r/);
+          var splitpoint;
+          for (var i = 0; i < labels.length; i++) {
+            // deal with wrapping long lines by finding last space
+            // before the 50th character and wrapping at that point
+            if (labels[i].length > 50) {
+              splitpoint = labels[i].substring(0, 50).lastIndexOf(" ");
+              if (splitpoint > 0)
+                removed = labels.splice(i, 1, labels[i].substring(0, splitpoint), labels[i].substr(splitpoint + 1));
+            }
+            label = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "label");
+            label.className = "tooltip-label";
+            label.setAttribute("value", labels[i]);
+            label.setAttribute("crop", this.getAttribute("crop") || "right");
+            vbox.appendChild(label);
+          }
         }
 
         // This is a special consideration for tree titletips. There is a
         // case where the user moves the mouse from over the treebody to
         // completely outside of the window, while passing over a cell that
         // displays a titletip.  This causes the titletip to show, even though
         // the mouse is not over the corresponding cell, so we need to check
         // if the titletip was entered by the mouse, and if not, hide it.