Index: trunk/src/org/openstreetmap/josm/actions/UploadAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UploadAction.java	(revision 6630)
+++ trunk/src/org/openstreetmap/josm/actions/UploadAction.java	(revision 6631)
@@ -236,4 +236,7 @@
                     tags.put("source", Main.map.mapView.getLayerInformationForSourceTag());
                 }
+                if (!tags.containsKey("comment")) {
+                    tags.put("comment", dialog.getLastChangesetCommentFromHistory());
+                }
                 dialog.setDefaultChangesetTags(tags);
             }
Index: trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java	(revision 6630)
+++ trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java	(revision 6631)
@@ -142,10 +142,4 @@
      */
     public void startUserInput() {
-        List<String> history = hcbUploadComment.getHistory();
-        int age = (int) (System.currentTimeMillis()/1000 - Main.pref.getInteger(HISTORY_LAST_USED_KEY, 0));
-        // only pre-select latest entry if used less than 4 hours ago.
-        if (age < Main.pref.getInteger(HISTORY_MAX_AGE_KEY, 4 * 3600 * 1000) && history != null && !history.isEmpty()) {
-            hcbUploadComment.setText(history.get(0));
-        }
         hcbUploadComment.requestFocusInWindow();
         hcbUploadComment.getEditor().getEditorComponent().requestFocusInWindow();
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java	(revision 6630)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java	(revision 6631)
@@ -589,3 +589,13 @@
         setTitle(tr("Upload to ''{0}''", url));
     }
+
+    public String getLastChangesetCommentFromHistory() {
+        Collection<String> history = Main.pref.getCollection(BasicUploadSettingsPanel.HISTORY_KEY, new ArrayList<String>());
+        int age = (int) (System.currentTimeMillis() / 1000 - Main.pref.getInteger(BasicUploadSettingsPanel.HISTORY_LAST_USED_KEY, 0));
+        if (age < Main.pref.getInteger(BasicUploadSettingsPanel.HISTORY_MAX_AGE_KEY, 4 * 3600 * 1000) && history != null && !history.isEmpty()) {
+            return history.iterator().next();
+        } else {
+            return null;
+        }
+    }
 }