Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 1261)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 1262)
@@ -80,9 +80,4 @@
         Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
             Shortcut.registerShortcut("mapmode:drawfocus", tr("Mode: Draw Focus"), KeyEvent.VK_N, Shortcut.GROUP_EDIT).getKeyStroke(), tr("Draw"));
-
-        //putValue("help", "Action/AddNode/Autnode");
-        selectedColor = Main.pref.getColor(marktr("selected"), Color.red);
-
-        drawHelperLine = Main.pref.getBoolean("draw.helper-line", true);
     }
 
@@ -97,4 +92,7 @@
     @Override public void enterMode() {
         super.enterMode();
+        selectedColor = Main.pref.getColor(marktr("selected"), Color.red);
+        drawHelperLine = Main.pref.getBoolean("draw.helper-line", true);
+
         Main.map.mapView.addMouseListener(this);
         Main.map.mapView.addMouseMotionListener(this);
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/LafPreference.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/LafPreference.java	(revision 1261)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/LafPreference.java	(revision 1262)
@@ -32,4 +32,5 @@
     private JCheckBox showSplashScreen = new JCheckBox(tr("Show splash screen at startup"));
     private JCheckBox showID = new JCheckBox(tr("Show object ID in selection lists"));
+    private JCheckBox drawHelperLine = new JCheckBox(tr("Draw rubber-band helper line"));
 
     public void addGui(PreferenceDialog gui) {
@@ -77,4 +78,8 @@
         panel.add(showID, GBC.eop().insets(20, 0, 0, 0));
 
+        drawHelperLine.setToolTipText(tr("Draw rubber-band helper line"));
+        drawHelperLine.setSelected(Main.pref.getBoolean("draw.helper-line", true));
+        panel.add(drawHelperLine, GBC.eop().insets(20, 0, 0, 0));
+
         panel.add(Box.createVerticalGlue(), GBC.eol().insets(0, 20, 0, 0));
 
@@ -91,4 +96,5 @@
         Main.pref.put("draw.splashscreen", showSplashScreen.isSelected());
         Main.pref.put("osm-primitives.showid", showID.isSelected());
+        Main.pref.put("draw.helper-line", drawHelperLine.isSelected());
         return Main.pref.put("laf", ((LookAndFeelInfo)lafCombo.getSelectedItem()).getClassName());
     }