From 752e0bb25a7c529d2a240df84db55141e827f458 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Fri, 12 Feb 2016 13:13:14 -0500
Subject: [PATCH] More closely match Apple mail shortcuts

---
 keymaps/templates/Apple Mail.cson | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/keymaps/templates/Apple Mail.cson b/keymaps/templates/Apple Mail.cson
index fb1212b3e..96cdb9e39 100644
--- a/keymaps/templates/Apple Mail.cson	
+++ b/keymaps/templates/Apple Mail.cson	
@@ -1,12 +1,19 @@
 # Note: For a menu item to have a keyboard equiavalent, it needs
 # to be listed in this file.
+#
+# http://dashkards.com/img/dashkard-mail.png
 
 'body':
-  'cmdctrl-n' : 'application:new-message'
-  'cmdctrl-r' : 'application:reply'
-  'cmdctrl-R' : 'application:reply-all'
-  'cmdctrl-F' : 'application:forward'
+  # 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'
+
+  # Composing
+  'cmdctrl-n': 'application:new-message'
+  'cmdctrl-shift-d': 'composer:send-message'
+
+  # Management
   'cmdctrl-alt-f': 'application:focus-search'
-  'cmdctrl-shift-D': 'composer:send-message'
-  'cmdctrl-V': 'application:change-category'
-  'cmdctrl-e'   : 'application:archive-item'