fixing mail and rest