Index: /trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java	(revision 14491)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java	(revision 14492)
@@ -16,4 +16,5 @@
 import org.openstreetmap.josm.gui.autofilter.AutoFilterManager;
 import org.openstreetmap.josm.gui.autofilter.AutoFilterRule;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
@@ -62,4 +63,5 @@
     private final JCheckBox useWireframeAntialiasing = new JCheckBox(tr("Smooth map graphics in wireframe mode (antialiasing)"));
     private final JCheckBox outlineOnly = new JCheckBox(tr("Draw only outlines of areas"));
+    private final JCheckBox hideLabelsWhileDragging = new JCheckBox(tr("Hide labels while dragging the map"));
 
     @Override
@@ -134,4 +136,8 @@
         outlineOnly.setSelected(Config.getPref().getBoolean("draw.data.area_outline_only", false));
 
+        // hideLabelsWhileDragging
+        hideLabelsWhileDragging.setToolTipText(tr("This option hides the textual labels of OSM objects while dragging the map."));
+        hideLabelsWhileDragging.setSelected(OsmDataLayer.PROPERTY_HIDE_LABELS_WHILE_DRAGGING.get());
+
         // discardable keys
         discardableKeys.setToolTipText(tr("Display keys which have been deemed uninteresting to the point that they can be silently removed."));
@@ -168,4 +174,5 @@
         panel.add(useHighlighting, GBC.eop().insets(20, 0, 0, 0));
         panel.add(outlineOnly, GBC.eol().insets(20, 0, 0, 0));
+        panel.add(hideLabelsWhileDragging, GBC.eol().insets(20, 0, 0, 0));
 
         panel.add(new JLabel(tr("Other options")),
@@ -183,4 +190,5 @@
         ExpertToggleAction.addVisibilitySwitcher(useHighlighting);
         ExpertToggleAction.addVisibilitySwitcher(outlineOnly);
+        ExpertToggleAction.addVisibilitySwitcher(hideLabelsWhileDragging);
         ExpertToggleAction.addVisibilitySwitcher(discardableKeys);
 
@@ -195,4 +203,5 @@
     public boolean ok() {
         boolean restart = gpxPanel.savePreferences();
+        OsmDataLayer.PROPERTY_HIDE_LABELS_WHILE_DRAGGING.put(hideLabelsWhileDragging.isSelected());
         Config.getPref().putBoolean("draw.data.area_outline_only", outlineOnly.isSelected());
         Config.getPref().putBoolean("draw.segment.direction", directionHint.isSelected());