Commented out the keyboard shortcut override for Mail as it doesn't work