Index: /trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java	(revision 8472)
+++ /trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java	(revision 8473)
@@ -89,5 +89,4 @@
                     }
                     newNote = api.createNote(note.getLatLon(), comment.getText(), monitor);
-                    note.setId(newNote.getId());
                     break;
                 case closed:
Index: /trunk/src/org/openstreetmap/josm/data/osm/NoteData.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/NoteData.java	(revision 8472)
+++ /trunk/src/org/openstreetmap/josm/data/osm/NoteData.java	(revision 8473)
@@ -291,5 +291,12 @@
             Note oldNote = entry.getKey();
             Note newNote = entry.getValue();
+            boolean reindex = oldNote.hashCode() != newNote.hashCode();
+            if (reindex) {
+                noteList.removeElem(oldNote);
+            }
             oldNote.updateWith(newNote);
+            if (reindex) {
+                noteList.add(oldNote);
+            }
         }
         dataUpdated();