Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java	(revision 2317)
+++ trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java	(revision 2318)
@@ -21,6 +21,8 @@
 import org.openstreetmap.josm.data.osm.history.HistoryDataSetListener;
 import org.openstreetmap.josm.gui.SideButton;
-import org.openstreetmap.josm.gui.dialogs.HistoryDialog;
+import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
+import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
 /**
@@ -71,5 +73,11 @@
         btn.setName("btn.close");
         pnl.add(btn);
+
+        btn = new SideButton(new ContextSensitiveHelpAction(ht("/Dialog/History")));
+        btn.setName("btn.help");
+        pnl.add(btn);
         add(pnl, BorderLayout.SOUTH);
+
+        HelpUtil.setHelpContext(getRootPane(), ht("/Dialog/History"));
 
         setSize(800, 500);
Index: trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java	(revision 2317)
+++ trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java	(revision 2318)
@@ -12,4 +12,5 @@
 import java.util.Observable;
 import java.util.Observer;
+import java.util.logging.Logger;
 
 import javax.swing.JLabel;
@@ -26,4 +27,5 @@
  */
 public class VersionInfoPanel extends JPanel implements Observer{
+    static private final Logger logger = Logger.getLogger(VersionInfoPanel.class.getName());
 
     private PointInTimeType pointInTimeType;
@@ -123,5 +125,6 @@
             lblUser.setUrl(null);
         }
-        lblUser.setDescription(getPrimitive().getUser());
+        String username = getPrimitive().getUser();
+        lblUser.setDescription(username);
     }
 }
Index: trunk/src/org/openstreetmap/josm/tools/UrlLabel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/UrlLabel.java	(revision 2317)
+++ trunk/src/org/openstreetmap/josm/tools/UrlLabel.java	(revision 2318)
@@ -48,11 +48,23 @@
     }
 
+    /**
+     * Sets the URL to be visited if the user clicks on this URL label. If null, the
+     * label turns into a normal label without hyperlink.
+     * 
+     * @param url the url. Can be null.
+     */
     public void setUrl(String url) {
-        this.url = url == null ? "" : url;
+        this.url = url;
         refresh();
     }
 
+    /**
+     * Sets the text part of the URL label. Defaults to the empty string if description is null.
+     * 
+     * @param description the description
+     */
     public void setDescription(String description) {
         this.description = description == null? "" : description;
+        this.description = this.description.replace("&", "&amp;").replace(">", "&gt;").replace("<", "&lt;");
         refresh();
     }
