Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 4553)
+++ /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 4554)
@@ -75,4 +75,7 @@
     protected final SortedMap<String, String> colornames = new TreeMap<String, String>();
 
+    /* NOTE: FIXME: Remove when saving XML enabled */
+    private boolean loadedXML = false;
+
     public interface PreferenceChangeEvent{
         String getKey();
@@ -385,5 +388,16 @@
         final PrintWriter out = new PrintWriter(new OutputStreamWriter(
                 new FileOutputStream(prefFile + "_tmp"), "utf-8"), false);
-        out.print(toXML(false));
+        /* FIXME: NOTE: loadedXML - removed 01.12.2011 */
+        if(loadedXML) {
+            out.print(toXML(false));
+        } else {
+            for (final Entry<String, String> e : properties.entrySet()) {
+                String s = defaults.get(e.getKey());
+                /* don't save default values */
+                if(s == null || !s.equals(e.getValue())) {
+                    out.println(e.getKey() + "=" + e.getValue());
+                }
+              }
+        }
         out.close();
 
@@ -443,4 +457,5 @@
             if(v == '<') {
                 fromXML(in);
+                loadedXML = true;
             } else {
                 int lineNumber = 0;