Multi emails fix