Merge branch 'jk/send-email-expand-paths'