diff --git a/gui/griffon-app/i18n/messages.properties b/gui/griffon-app/i18n/messages.properties
index 95e0fb6a..549f81a2 100644
--- a/gui/griffon-app/i18n/messages.properties
+++ b/gui/griffon-app/i18n/messages.properties
@@ -580,6 +580,8 @@ COLLECTION=Collection
 
 ## New message window
 RECIPIENTS=Recipients
+RECIPIENTS_TITLE=Drag and drop recipients from your contacts
 SEND=Send
 MESSAGE_VERB=Message
-ATTACHMENT_DROP_TABLE_TITLE=You can drag files or collections from your library and attach to this message.
+MESSAGE_NOUN=Message
+ATTACHMENT_DROP_TABLE_TITLE=You can drag files or collections from your library and attach to this message
diff --git a/gui/griffon-app/views/com/muwire/gui/NewMessageView.groovy b/gui/griffon-app/views/com/muwire/gui/NewMessageView.groovy
index 84734508..d0bc41aa 100644
--- a/gui/griffon-app/views/com/muwire/gui/NewMessageView.groovy
+++ b/gui/griffon-app/views/com/muwire/gui/NewMessageView.groovy
@@ -18,6 +18,7 @@ import javax.swing.ListModel
 import javax.swing.SwingConstants
 import javax.swing.TransferHandler
 import javax.swing.TransferHandler.TransferSupport
+import javax.swing.border.TitledBorder
 
 import com.muwire.core.InfoHash
 import com.muwire.core.SharedFile
@@ -62,28 +63,27 @@ class NewMessageView {
             borderLayout()
             panel(constraints : BorderLayout.NORTH) {
                 borderLayout()
-                panel(constraints : BorderLayout.NORTH) {
-                    label(text : trans("RECIPIENTS"))
-                    scrollPane {
+                panel(constraints : BorderLayout.NORTH, border : titledBorder(title : trans("RECIPIENTS_TITLE"), 
+                    border : etchedBorder(), titlePosition : TitledBorder.TOP)) {
+                    borderLayout()
+                    scrollPane(constraints : BorderLayout.CENTER) {
                         widget(recipientsList)
                     }
                 }
-                panel(constraints : BorderLayout.SOUTH) {
+                panel(constraints : BorderLayout.SOUTH, border : titledBorder(title : trans("SUBJECT"),
+                    border : etchedBorder(), titlePosition : TitledBorder.TOP)) {
                     borderLayout()
-                    label(text : trans("SUBJECT"), constraints : BorderLayout.WEST)
                     subjectField = textField(constraints : BorderLayout.CENTER)
                 }
             }
             panel(constraints : BorderLayout.CENTER) {
                 splitPane(orientation : JSplitPane.VERTICAL_SPLIT, continuousLayout : true, dividerLocation : 300) {
-                    scrollPane {
+                    scrollPane(border : titledBorder(title : trans("MESSAGE_NOUN"), border : etchedBorder(), titlePosition : TitledBorder.TOP)) {
                         bodyArea = textArea(editable : true, rows : 10, columns : 50)
                     }
-                    panel {
+                    panel (border : titledBorder(title : trans("ATTACHMENT_DROP_TABLE_TITLE"),
+                        border : etchedBorder(), titlePosition : TitledBorder.TOP)) {
                         borderLayout()
-                        panel(constraints : BorderLayout.NORTH) {
-                            label(text : trans("ATTACHMENT_DROP_TABLE_TITLE"))
-                        }
                         scrollPane(constraints : BorderLayout.CENTER) {
                             attachmentsTable = table(autoCreateRowSorter : true, rowHeight : rowHeight) { 
                                 tableModel(list : model.attachments) {