1. Checking in fixes for message changes
2. Email sending code as it was not checked in earlier.