Index: /trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 1657)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 1658)
@@ -806,5 +806,5 @@
                 toDownload.size())), GBC.eol());
 
-            if (JOptionPane.showConfirmDialog(Main.parent, msg,
+            if (toDownload.size() > 1 && JOptionPane.showConfirmDialog(Main.parent, msg,
                 tr("Download from OSM along this track"),
                 JOptionPane.OK_CANCEL_OPTION) == JOptionPane.CANCEL_OPTION) {
Index: /trunk/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java	(revision 1657)
+++ /trunk/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java	(revision 1658)
@@ -17,5 +17,5 @@
 
     public static boolean show(String prefKey, String msg) {
-        return show(prefKey, new JLabel(msg), true, JOptionPane.OK_CANCEL_OPTION, JOptionPane.OK_OPTION);
+        return show(prefKey, new JLabel(msg), false, JOptionPane.OK_CANCEL_OPTION, JOptionPane.OK_OPTION);
     }
 
@@ -25,9 +25,9 @@
 
     public static boolean show(String prefKey, Container msg) {
-        return show(prefKey, msg, true, JOptionPane.OK_CANCEL_OPTION, JOptionPane.OK_OPTION);
+        return show(prefKey, msg, false, JOptionPane.OK_CANCEL_OPTION, JOptionPane.OK_OPTION);
     }
 
     public static boolean show(String prefKey, Container msg, Boolean state, int options, int true_option) {
-        if (!Main.pref.getBoolean("message."+prefKey)) {
+        if (!Main.pref.getBoolean("message."+prefKey, state)) {
             JCheckBox dontshowagain = new JCheckBox(tr("Do not show again"));
             dontshowagain.setSelected(Main.pref.getBoolean("message."+prefKey, state));