Merge pull request #1220 from shackbarth/22390-email