From 0359b4f3422c9b66640e30054fc679845ddb6f03 Mon Sep 17 00:00:00 2001
From: sdewith <sdw@nylas.com>
Date: Tue, 8 Mar 2016 13:23:18 -0800
Subject: [PATCH] Some fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixed based on Ben’s feedback, should be good to go now.
---
 keymaps/templates/Apple Mail.cson | 33 ++++++++++++-------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/keymaps/templates/Apple Mail.cson b/keymaps/templates/Apple Mail.cson
index de8029edc..5522ec2f7 100644
--- a/keymaps/templates/Apple Mail.cson	
+++ b/keymaps/templates/Apple Mail.cson	
@@ -6,34 +6,27 @@
 'body':
 
   ### Jumping ###
-  'cmd-1' : 'navigation:go-to-inbox'
-  'cmd-2' : 'navigation:go-to-starred'
-  'cmd-3' : 'navigation:go-to-sent'
-  'cmd-4' : 'navigation:go-to-drafts'
-  'cmd-5' : 'navigation:go-to-all'
-  'cmd-6' : 'navigation:go-to-contacts'
-  'cmd-7' : 'navigation:go-to-tasks'
-  'cmd-8' : 'navigation:go-to-label'
+  'cmd-ctrl-1' : 'navigation:go-to-inbox'
+  'cmd-ctrl-2' : 'navigation:go-to-starred'
+  'cmd-ctrl-3' : 'navigation:go-to-sent'
+  'cmd-ctrl-4' : 'navigation:go-to-drafts'
+  'cmd-ctrl-5' : 'navigation:go-to-all'
+  'cmd-ctrl-6' : 'navigation:go-to-contacts'
+  'cmd-ctrl-7' : 'navigation:go-to-tasks'
+  'cmd-ctrl-8' : 'navigation:go-to-label'
 
     ### Threadlist selection ###
   'cmd-a': 'multiselect-list:select-all'
 
-
-  ### Application ###
-
-  'cmdopt-f': 'application:focus-search'
-
-
   # Triage
   'cmdctrl-r': 'application:reply'
-  'cmdctrl-shift-r': 'application:reply-all'
-  'cmdctrl-shift-f': 'application:forward'
-  'cmdctrl-shift-j': 'application:report-as-spam'
-  'cmdctrl-shift-u': 'application:mark-as-unread'
-  'cmdctrl-a': 'application:archive-item'
+  'cmd-ctrl-shift-r': 'application:reply-all'
+  'cmd-ctrl-shift-f': 'application:forward'
+  'cmd-ctrl-shift-j': 'application:report-as-spam'
+  'cmd-ctrl-shift-u': 'application:mark-as-unread'
+  'cmd-ctrl-a': 'application:archive-item'
   'cmd-shift-l': 'application:star-item'
 
-
   # Composing
   'cmdctrl-n': 'application:new-message'
   'cmdctrl-shift-d': 'composer:send-message'