Merge pull request #811 from narfbg/develop-email

Improve the Email library