Adding new feature to send emails (pending)