Before changes when sending email to Davoud