Index: trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java	(revision 7881)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java	(revision 7882)
@@ -227,5 +227,5 @@
                 String toolTipText = userName + " @ " + sdf.format(note.getCreatedAt());
                 JLabel jlabel = (JLabel)comp;
-                jlabel.setText(text);
+                jlabel.setText(note.getId() + ": " +text);
                 ImageIcon icon;
                 if (note.getId() < 0) {
Index: trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java	(revision 7881)
+++ trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java	(revision 7882)
@@ -111,6 +111,7 @@
         if (noteData.getSelectedNote() != null) {
             StringBuilder sb = new StringBuilder("<html>");
+            sb.append(tr("Note"));
+            sb.append(" " + noteData.getSelectedNote().getId());
             List<NoteComment> comments = noteData.getSelectedNote().getComments();
-            String sep = "";
             SimpleDateFormat dayFormat = new SimpleDateFormat("MMM d, yyyy");
             for (NoteComment comment : comments) {
@@ -118,5 +119,5 @@
                 //closing a note creates an empty comment that we don't want to show
                 if (commentText != null && commentText.trim().length() > 0) {
-                    sb.append(sep);
+                    sb.append("<hr/>");
                     String userName = XmlWriter.encode(comment.getUser().getName());
                     if (userName == null || userName.trim().length() == 0) {
@@ -131,5 +132,4 @@
                     sb.append(htmlText);
                 }
-                sep = "<hr/>";
             }
             sb.append("</html>");
