diff --git a/keymaps/base.cson b/keymaps/base.cson
index 73f069f7d..1116bccbd 100644
--- a/keymaps/base.cson
+++ b/keymaps/base.cson
@@ -1,42 +1,24 @@
 # Email-specific core key-mappings
-# All platforms are put here to consolidate custom actions and to prevent
-# duplication in 3 files.
 #
-# TODO let the user pick whether they want to use Gmail, Mac Mail, or
-# Outlook keymappings
+# There are additional mappings in <platform>.cson files that bind
+# menu items. In the future, we should break these into files like:
+# darwin-gmail.cson, darwin-macmail.cson, win32-gmail.cson...
+
 'body':
-  'c'     : 'application:new-message' # Gmail
-  'cmd-n' : 'application:new-message' # Mac mail
-  'ctrl-n': 'application:new-message' # Outlook
-
-  'k' : 'application:previous-message' # Gmail
-  'up': 'application:previous-message' # Mac mail
-
-  'j'   : 'application:next-message' # Gmail
-  'down': 'application:next-message' # Mac mail
-
+  'c'        : 'application:new-message' # Gmail
+  'k'        : 'application:previous-message' # Gmail
+  'up'       : 'application:previous-message' # Mac mail
+  'j'        : 'application:next-message' # Gmail
+  'down'     : 'application:next-message' # Mac mail
   ']'        : 'application:archive-and-previous' # Gmail
-
   '['        : 'application:archive-thread' # Gmail
   'e'        : 'application:archive-thread' # Gmail
   'delete'   : 'application:archive-thread' # Mac mail
   'backspace': 'application:archive-thread' # Outlook
 
   'r'     : 'application:reply' # Gmail
-  'cmd-r' : 'application:reply' # Mac mail
-  'ctrl-r': 'application:reply' # Outlook
-
   'a'     : 'application:reply-all' # Gmail
-  'cmd-R' : 'application:reply-all' # Mac mail
-  'ctrl-R': 'application:reply-all' # Outlook
-
   'f'     : 'application:forward' # Gmail
-  'cmd-F' : 'application:forward' # Mac mail
-  'ctrl-F': 'application:forward' # Outlook
-
-  'cmd-alt-f': 'application:focus-search' # Mac mail
-
-  'cmd-D': 'application:send-message' # Mac mail
 
 # Default cross-platform core behaviors
   'left': 'core:move-left'
diff --git a/keymaps/darwin.cson b/keymaps/darwin.cson
index 151626c0e..e331d8f50 100644
--- a/keymaps/darwin.cson
+++ b/keymaps/darwin.cson
@@ -1,8 +1,16 @@
 # Note: For a menu item to have a keyboard equiavalent, it needs
 # to be listed in this file.
 
-# Mac application keys
 'body':
+  # Mac email-specific menu items
+  'cmd-n' : 'application:new-message' # Mac mail
+  'cmd-r' : 'application:reply' # Mac mail
+  'cmd-R' : 'application:reply-all' # Mac mail
+  'cmd-F' : 'application:forward' # Mac mail
+  'cmd-alt-f': 'application:focus-search' # Mac mail
+  'cmd-D': 'application:send-message' # Mac mail
+
+  # Mac application keys
   'cmd-q': 'application:quit'
   'cmd-h': 'application:hide'
   'cmd-1': 'application:show-main-window'
@@ -11,7 +19,7 @@
   'alt-cmd-ctrl-m': 'application:zoom'
   'cmd-alt-ctrl-s': 'application:run-all-specs'
 
-# Mac core keys
+  # Mac core keys
   'cmd-z': 'core:undo'
   'cmd-Z': 'core:redo'
   'cmd-y': 'core:redo'
@@ -20,7 +28,7 @@
   'cmd-a': 'core:select-all'
   'cmd-v': 'core:paste'
 
-# Mac window keys
+  # Mac window keys
   'cmd-w': 'window:close'
   'cmd-=': 'window:increase-font-size'
   'cmd-+': 'window:increase-font-size'
diff --git a/keymaps/linux.cson b/keymaps/linux.cson
index a27d6af27..9b233c040 100644
--- a/keymaps/linux.cson
+++ b/keymaps/linux.cson
@@ -1,12 +1,18 @@
 # Note: For a menu item to have a keyboard equiavalent, it needs
 # to be listed in this file.
 
-# Linux application keys
+# Linux email-specific menu items
 'body':
+  'ctrl-n': 'application:new-message' # Outlook
+  'ctrl-r': 'application:reply' # Outlook
+  'ctrl-R': 'application:reply-all' # Outlook
+  'ctrl-F': 'application:forward' # Outlook
+
+  # Linux application keys
   'ctrl-q': 'application:quit'
   'ctrl-alt-s': 'application:run-all-specs'
 
-# Linux core keys
+  # Linux core keys
   'ctrl-z': 'core:undo'
   'ctrl-Z': 'core:redo'
   'ctrl-y': 'core:redo'
@@ -17,7 +23,7 @@
   'ctrl-insert': 'core:copy'
   'shift-insert': 'core:paste'
 
-# Linux window keys
+  # Linux window keys
   'ctrl-w': 'core:close'
   'ctrl-=': 'window:increase-font-size'
   'ctrl-+': 'window:increase-font-size'
diff --git a/keymaps/win32.cson b/keymaps/win32.cson
index 9e661999e..a286ca691 100644
--- a/keymaps/win32.cson
+++ b/keymaps/win32.cson
@@ -1,8 +1,14 @@
 # Note: For a menu item to have a keyboard equiavalent, it needs
 # to be listed in this file.
 
-# Windows application keys
 'body':
+  # Windows email-specific menu items
+  'ctrl-n': 'application:new-message' # Outlook
+  'ctrl-r': 'application:reply' # Outlook
+  'ctrl-R': 'application:reply-all' # Outlook
+  'ctrl-F': 'application:forward' # Outlook
+
+  # Windows application keys
   'ctrl-q': 'application:quit'
   'ctrl-alt-s': 'application:run-all-specs'