Index: trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java	(revision 417)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java	(revision 418)
@@ -328,7 +328,9 @@
 
 		// ---------------------------------------
-		// This drop-down will probably be removed soon.
-		//
-		if (TaggingPresetPreference.taggingPresets.size() > 0) {
+		// This drop-down is really deprecated but we offer people a chance to 
+		// activate it if they really want. Presets should be used from the 
+		// menu.
+		if (TaggingPresetPreference.taggingPresets.size() > 0 && 
+				Main.pref.getBoolean("taggingpresets.in-properties-dialog", false)) {
 			Vector<ActionListener> allPresets = new Vector<ActionListener>();
 			for (final TaggingPreset p : TaggingPresetPreference.taggingPresets)
@@ -352,7 +354,4 @@
 		});
 		taggingPresets.setRenderer(new TaggingCellRenderer());
-		
-		// End of "will be removed soon".
-		// --------------------------------------------
 
 		// setting up the properties table