Bug fixes for email notifications
Merge branch 'my'