Merge "improvement send email"