Merge branch 'jc/send-email'