Merge branch 'ab/send-email-transferencoding-fix'