mail boundary fix