Merge branch 'tz/send-email-helpfix'