Index: trunk/src/org/openstreetmap/josm/gui/NoteInputDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/NoteInputDialog.java	(revision 8210)
+++ trunk/src/org/openstreetmap/josm/gui/NoteInputDialog.java	(revision 8211)
@@ -11,6 +11,6 @@
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
 
+import org.openstreetmap.josm.gui.widgets.JosmTextArea;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -22,5 +22,5 @@
 public class NoteInputDialog extends ExtendedDialog {
 
-    private JTextArea textArea = new JTextArea();
+    private JosmTextArea textArea = new JosmTextArea();
 
     /**
@@ -45,4 +45,5 @@
         textArea.setColumns(30);
         textArea.setLineWrap(true);
+        textArea.setWrapStyleWord(true);
         JScrollPane scrollPane = new JScrollPane(textArea);
         scrollPane.setAlignmentX(Component.LEFT_ALIGNMENT); //without this the label gets pushed to the right