Merge branch 'jk/send-email-fix-addresses-from-composed-messages'