Tidied up the calendar usage for the add mailing date