Index: trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java	(revision 5897)
+++ trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java	(revision 5898)
@@ -11,5 +11,4 @@
 import java.awt.Point;
 import java.awt.Rectangle;
-import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -27,10 +26,7 @@
 import org.openstreetmap.gui.jmapviewer.MapMarkerDot;
 import org.openstreetmap.gui.jmapviewer.MemoryTileCache;
-import org.openstreetmap.gui.jmapviewer.OsmFileCacheTileLoader;
 import org.openstreetmap.gui.jmapviewer.OsmMercator;
 import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
 import org.openstreetmap.gui.jmapviewer.interfaces.MapMarker;
-import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
-import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
 import org.openstreetmap.gui.jmapviewer.tilesources.MapQuestOpenAerialTileSource;
@@ -39,4 +35,5 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
@@ -171,6 +168,6 @@
     public static final String RESIZE_PROP = SlippyMapBBoxChooser.class.getName() + ".resize";
 
-    private TileLoader cachedLoader;
-    private TileLoader uncachedLoader;
+    private OsmTileLoader cachedLoader;
+    private OsmTileLoader uncachedLoader;
 
     private final SizeButton iSizeButton = new SizeButton();
@@ -189,4 +186,5 @@
 
         uncachedLoader = new OsmTileLoader(this);
+        uncachedLoader.headers.put("User-Agent", Version.getInstance().getFullAgentString());
         setZoomContolsVisible(Main.pref.getBoolean("slippy_map_chooser.zoomcontrols",false));
         setMapMarkerVisible(false);
Index: trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java	(revision 5897)
+++ trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java	(revision 5898)
@@ -42,6 +42,9 @@
 import org.openstreetmap.gui.jmapviewer.MapMarkerDot;
 import org.openstreetmap.gui.jmapviewer.OsmMercator;
+import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
 import org.openstreetmap.gui.jmapviewer.interfaces.MapMarker;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
@@ -120,4 +123,7 @@
     }
 
+    /**
+     * Constructs a new {@code TileSelectionBBoxChooser}.
+     */
     public TileSelectionBBoxChooser() {
         build();
@@ -655,4 +661,8 @@
         public TileBoundsMapView() {
             setBorder(BorderFactory.createLineBorder(Color.DARK_GRAY));
+            TileLoader loader = tileController.getTileLoader();
+            if (loader instanceof OsmTileLoader) {
+                ((OsmTileLoader)loader).headers.put("User-Agent", Version.getInstance().getFullAgentString());
+            }
         }
 
Index: trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java	(revision 5897)
+++ trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java	(revision 5898)
@@ -6,7 +6,5 @@
 
 import java.awt.Dimension;
-import java.awt.Graphics;
 import java.awt.Toolkit;
-
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
Index: trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java	(revision 5897)
+++ trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java	(revision 5898)
@@ -57,4 +57,5 @@
 import org.openstreetmap.josm.actions.RenameLayerAction;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -133,5 +134,7 @@
             if (cachePath != null && !cachePath.isEmpty()) {
                 try {
-                    return new OsmFileCacheTileLoader(listener, new File(cachePath));
+                    OsmFileCacheTileLoader loader = new OsmFileCacheTileLoader(listener, new File(cachePath));
+                    loader.headers.put("User-Agent", Version.getInstance().getFullAgentString());
+                    return loader;
                 } catch (IOException e) {
                 }
@@ -418,4 +421,5 @@
             }
         }
+        tileLoader.headers.put("User-Agent", Version.getInstance().getFullAgentString());
     }