Index: applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java
===================================================================
--- applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java	(revision 16290)
+++ applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java	(revision 16294)
@@ -34,4 +34,5 @@
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.tools.DateUtils;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -167,7 +168,7 @@
                 WayPoint wpt = new WayPoint(n.getCoor());
                 if (anonTime) {
-                    wpt.attr.put("time", "1970-01-01T00:00:00");
+                    wpt.attr.put("time", "1970-01-01T00:00:00Z");
                 } else {
-                    wpt.attr.put("time", WayPoint.GPXTIMEFMT.format(tstamp));
+                    wpt.attr.put("time", DateUtils.fromDate(tstamp));
                 }
                 wpt.setTime();
@@ -185,7 +186,7 @@
             WayPoint wpt = new WayPoint(n.getCoor());
             if (anonTime) {
-                wpt.attr.put("time", "1970-01-01T00:00:00");
+                wpt.attr.put("time", "1970-01-01T00:00:00Z");
             } else {
-                wpt.attr.put("time", WayPoint.GPXTIMEFMT.format(tstamp));
+                wpt.attr.put("time", DateUtils.fromDate(tstamp));
             }
             wpt.setTime();
Index: applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxMode.java
===================================================================
--- applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxMode.java	(revision 16290)
+++ applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxMode.java	(revision 16294)
@@ -68,5 +68,5 @@
             //go through nodes and mark the ones in the selection rect as deleted
             for (Node n: dataSet.nodes) {
-                Point p = Main.map.mapView.getPoint(n.getEastNorth());
+                Point p = Main.map.mapView.getPoint(n);
                 if (r.contains(p)) {
                     n.deleted = true; //only set as deleted. this makes reset to beginning possible
Index: applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java
===================================================================
--- applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java	(revision 16290)
+++ applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java	(revision 16294)
@@ -115,11 +115,8 @@
                         Way w = new Way();
                         for (WayPoint p : segment) {
-                            Node n = new Node(p.latlon);
+                            Node n = new Node(p.getCoor());
                             String timestr = p.getString("time");
                             if(timestr != null)
-                            {
-                                timestr = timestr.replace("Z","+00:00");
                                 n.setTimestamp(DateUtils.fromString(timestr));
-                            }
                             dataSet.nodes.add(n);
                             w.nodes.add(n); //TODO what to do with these while deletion