Merge branch 'jc/send-email-sensible-encoding'