Updated notification messages in emails
Removed yusuph's changes via patch