Small Changes related to email