diff --git a/content/mail.js b/content/mail.js
index 56660e0d..d56299f0 100644
--- a/content/mail.js
+++ b/content/mail.js
@@ -264,6 +264,10 @@ liberator.Mail = function ()
         
 
     // SENDING MESSAGES
+    liberator.mappings.add(modes, ["m"],
+        "Compose a new message",
+        function () { goOpenNewMessage(); });
+
     liberator.mappings.add(modes, ["r"],
         "Reply to sender",
         function () { goDoCommand("cmd_reply"); });
diff --git a/content/muttator.js b/content/muttator.js
index 86c68432..80e796c8 100644
--- a/content/muttator.js
+++ b/content/muttator.js
@@ -93,10 +93,19 @@ liberator.config = {
             ["o"], "Open a message",
             function () { liberator.commandline.open(":", "open ", liberator.modes.EX); });
 
+        // TODO: move elsewhere
         liberator.mappings.add([liberator.modes.COMPOSE],
             ["e"], "Edit message",
             function () { liberator.editor.editWithExternalEditor(); });
 
+        liberator.mappings.add([liberator.modes.COMPOSE],
+            ["y"], "Send message now",
+            function () { goDoCommand("cmd_sendNow"); });
+
+        liberator.mappings.add([liberator.modes.COMPOSE],
+            ["Y"], "Send message later",
+            function () { goDoCommand("cmd_sendLater"); });
+
         // don't wait too long when selecting new messages
         // GetThreadTree()._selectDelay = 300; // TODO: make configurable
         this.isComposeWindow = window.wintype == "msgcompose";