Index: trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java	(revision 2446)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java	(revision 2447)
@@ -364,9 +364,9 @@
     protected String getUploadComment() {
         switch(southTabbedPane.getSelectedIndex()) {
-            case 0:
-                return pnlChangesetSelection.getUploadComment();
-            case 1:
-                TagModel tm = tagEditorPanel.getModel().get("comment");
-                return tm == null? "" : tm.getValue();
+        case 0:
+            return pnlChangesetSelection.getUploadComment();
+        case 1:
+            TagModel tm = tagEditorPanel.getModel().get("comment");
+            return tm == null? "" : tm.getValue();
         }
         return "";
@@ -953,4 +953,7 @@
                     }
                     tagEditorPanel.getModel().initFromPrimitive(cs);
+                    if (cs.get("comment") != null) {
+                        cmt.setText(cs.get("comment"));
+                    }
                 }
             }