Fix bug when send mail and optional questions are present