Updated for re-scheduling sent messages