Merge pull request #7269 from neheb/emailr