Email boundary fix