Index: /trunk/src/org/openstreetmap/josm/io/GpxReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/GpxReader.java	(revision 541)
+++ /trunk/src/org/openstreetmap/josm/io/GpxReader.java	(revision 542)
@@ -20,4 +20,5 @@
 import javax.xml.parsers.SAXParserFactory;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
@@ -237,5 +238,10 @@
 					currentState = states.pop();
 					currentTrackSeg.add(currentWayPoint);
-					if (currentWayPoint.attr.containsKey("name") || currentWayPoint.attr.containsKey("desc")) {
+					String option = "marker.namedtrackpoints";
+					if (Main.pref.hasKey(option) && 
+						Main.pref.getBoolean(option) && 
+						(currentWayPoint.attr.containsKey("name") || 
+							currentWayPoint.attr.containsKey("desc"))) 
+					{
 						currentData.waypoints.add(currentWayPoint);
 					}