Some changes with email sending