diff --git a/gui/griffon-app/views/com/muwire/gui/AddCommentView.groovy b/gui/griffon-app/views/com/muwire/gui/AddCommentView.groovy
index 31058c97..aca6ee62 100644
--- a/gui/griffon-app/views/com/muwire/gui/AddCommentView.groovy
+++ b/gui/griffon-app/views/com/muwire/gui/AddCommentView.groovy
@@ -43,7 +43,7 @@ class AddCommentView {
             borderLayout()
             panel (constraints : BorderLayout.CENTER) {
                 scrollPane {
-                    textarea = textArea(text : comment, rows : 20, columns : 100, editable : true)
+                    textarea = textArea(text : comment, rows : 20, columns : 100, editable : true, lineWrap:true, wrapStyleWord:true)
                 }
             }
             panel (constraints : BorderLayout.SOUTH) {
diff --git a/gui/griffon-app/views/com/muwire/gui/ShowCommentView.groovy b/gui/griffon-app/views/com/muwire/gui/ShowCommentView.groovy
index 4bca9dd0..4c4cd9ea 100644
--- a/gui/griffon-app/views/com/muwire/gui/ShowCommentView.groovy
+++ b/gui/griffon-app/views/com/muwire/gui/ShowCommentView.groovy
@@ -37,7 +37,7 @@ class ShowCommentView {
             borderLayout()
             panel (constraints : BorderLayout.CENTER) {
                 scrollPane {
-                    textArea(text : model.result.comment, rows : 20, columns : 100, editable : false)
+                    textArea(text : model.result.comment, rows : 20, columns : 100, editable : false, lineWrap : true, wrapStyleWord : true)
                 }
             }
             panel (constraints : BorderLayout.SOUTH) {