diff --git a/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy b/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
index 6c94baa9..8a859aea 100644
--- a/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
+++ b/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
@@ -713,7 +713,7 @@ class MainFrameView {
                                             splitPane(id : "message-attachments-split-pane", orientation : JSplitPane.VERTICAL_SPLIT,
                                             continuousLayout : true, dividerLocation : 500, constraints : BorderLayout.CENTER) {
                                                 scrollPane {
-                                                    textArea(id : "message-body-textarea", editable : false)
+                                                    textArea(id : "message-body-textarea", editable : false, lineWrap : true, wrapStyleWord : true)
                                                 }
                                                 panel {
                                                     borderLayout()