mail matches fix