diff --git a/internal_packages/preferences/lib/tabs/preferences-keymaps.cjsx b/internal_packages/preferences/lib/tabs/preferences-keymaps.cjsx
index aeb960241..9fc8c680c 100644
--- a/internal_packages/preferences/lib/tabs/preferences-keymaps.cjsx
+++ b/internal_packages/preferences/lib/tabs/preferences-keymaps.cjsx
@@ -31,6 +31,15 @@ DisplayedKeybindings = [
       ['application:remove-and-next', 'Remove from view and next'],
     ]
   },
+  {
+    title: 'Composer',
+    items: [
+      ['composer:send-message', 'Send Message'],
+      ['composer:focus-to', 'Focus the To field'],
+      ['composer:show-and-focus-cc', 'Focus the Cc field'],
+      ['composer:show-and-focus-bcc', 'Focus the Bcc field']
+    ]
+  },
   {
     title: 'Navigation',
     items: [
@@ -94,7 +103,7 @@ class PreferencesKeymaps extends React.Component
     bindings = {}
     for section in DisplayedKeybindings
       for [command, label] in section.items
-        bindings[command] = NylasEnv.keymaps.findKeyBindings(command: command, target: document.body) || []
+        bindings[command] = NylasEnv.keymaps.findKeyBindings(command: command) || []
     bindings
 
   render: =>
diff --git a/keymaps/templates/Apple Mail.cson b/keymaps/templates/Apple Mail.cson
index cab50d727..fb1212b3e 100644
--- a/keymaps/templates/Apple Mail.cson	
+++ b/keymaps/templates/Apple Mail.cson	
@@ -7,6 +7,6 @@
   'cmdctrl-R' : 'application:reply-all'
   'cmdctrl-F' : 'application:forward'
   'cmdctrl-alt-f': 'application:focus-search'
-  'cmdctrl-D': 'application:send-message'
+  'cmdctrl-shift-D': 'composer:send-message'
   'cmdctrl-V': 'application:change-category'
   'cmdctrl-e'   : 'application:archive-item'
diff --git a/keymaps/templates/Outlook.cson b/keymaps/templates/Outlook.cson
index ddce21b1e..ed7391ffc 100644
--- a/keymaps/templates/Outlook.cson
+++ b/keymaps/templates/Outlook.cson
@@ -10,7 +10,7 @@
   'cmdctrl-shift-v': 'application:change-category'
   'cmdctrl-d':       'application:delete-item'
   'alt-backspace':   'core:undo'
-  'alt-s':           'application:send-message'
+  'alt-s':           'composer:send-message'
   'cmdctrl-r':       'application:reply'
   'cmdctrl-shift-r': 'application:reply-all'
   'cmdctrl-n' :      'application:new-message'