Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java	(revision 6652)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java	(revision 6653)
@@ -19,4 +19,5 @@
 import javax.swing.AbstractAction;
 import javax.swing.JCheckBox;
+import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -56,23 +57,9 @@
     private ApiUrlPropagator propagator;
 
-    protected JPanel buildDefaultServerUrlPanel() {
-        JPanel pnl = new JPanel(new GridBagLayout());
-        GridBagConstraints gc = new GridBagConstraints();
-
-        gc.fill = GridBagConstraints.HORIZONTAL;
-        gc.anchor = GridBagConstraints.NORTHWEST;
-        gc.weightx = 0.0;
-        gc.insets = new Insets(0,0,0,3);
-        gc.gridwidth  = 1;
-        pnl.add(cbUseDefaultServerUrl = new JCheckBox(), gc);
+    protected JComponent buildDefaultServerUrlPanel() {
+        cbUseDefaultServerUrl = new JCheckBox(tr("<html>Use the default OSM server URL (<strong>{0}</strong>)</html>", OsmApi.DEFAULT_API_URL));
         cbUseDefaultServerUrl.addItemListener(new UseDefaultServerUrlChangeHandler());
-
-        gc.gridx = 1;
-        gc.weightx = 1.0;
-        JLabel lbl = new JLabel(tr("<html>Use the default OSM server URL (<strong>{0}</strong>)</html>", OsmApi.DEFAULT_API_URL));
-        lbl.setFont(lbl.getFont().deriveFont(Font.PLAIN));
-        pnl.add(lbl, gc);
-
-        return pnl;
+        cbUseDefaultServerUrl.setFont(cbUseDefaultServerUrl.getFont().deriveFont(Font.PLAIN));
+        return cbUseDefaultServerUrl;
     }
 
