Mail scripts changes