Added removing email, refined mail message