diff --git a/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy b/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy
index 17feaf80..ce49adea 100644
--- a/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy
+++ b/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy
@@ -785,7 +785,10 @@ class MainFrameController {
     
     @ControllerAction
     void messageCompose() {
-        
+        def params = [:]
+        params.recipients = new HashSet<>()
+        params.core = core
+        mvcGroup.createMVCGroup("new-message", UUID.randomUUID().toString(), params)
     }
     
     @ControllerAction
diff --git a/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy b/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
index 2a3555a3..faefd1b5 100644
--- a/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
+++ b/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
@@ -719,7 +719,7 @@ class MainFrameView {
                                             }
                                         }
                                         panel(constraints : BorderLayout.SOUTH) {
-                                            button(text : trans("COMPOSE"), enabled : bind{model.messageButtonsEnabled}, messageComposeAction)
+                                            button(text : trans("COMPOSE"), messageComposeAction)
                                             button(text : trans("REPLY"), enabled : bind{model.messageButtonsEnabled}, messageReplyAction)
                                             button(text : trans("DELETE"), enabled : bind{model.messageButtonsEnabled}, messageDeleteAction)
                                         }