Merge pull request #12758 from samuelsov/DraftMailing