Index: /trunk/src/org/openstreetmap/josm/gui/MapScaler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MapScaler.java	(revision 1236)
+++ /trunk/src/org/openstreetmap/josm/gui/MapScaler.java	(revision 1237)
@@ -29,5 +29,6 @@
         LatLon ll2 = mv.getLatLon(100,0);
         double dist = ll1.greatCircleDistance(ll2);
-        String text = dist > 1000 ? (Math.round(dist/100)/10.0)+" km" : Math.round(dist*10)/10+" m";
+        String text = dist > 1000 ? Math.round(dist/100)/10 +" km" : (dist >= 1
+        ? Math.round(dist*10)/10 +" m" : "< 1 m");
         Rectangle2D bound = g.getFontMetrics().getStringBounds(text, g);
         g.setColor(getColor());
@@ -38,5 +39,6 @@
         g.drawLine(24, 3, 24, 7);
         g.drawLine(74, 3, 74, 7);
-        g.drawString(text, (int)(50-bound.getWidth()/2), 23);
+        g.drawString(text, (int)(100-bound.getWidth()), 23);
+        g.drawString("0", 0, 23);
     }
 
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 1236)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 1237)
@@ -86,5 +86,5 @@
         final JLabel minimize = new JLabel(ImageProvider.get("misc", "normal"));
         titleBar.add(minimize);
-        
+
         // scale down the dialog icon
         ImageIcon inIcon = ImageProvider.get("dialogs", iconName);
@@ -109,5 +109,5 @@
                     }
                 }
-                
+
                 Main.pref.put(action.prefname+".minimized", !nowVisible);
                 if(nowVisible == true) {