updated repost logic for mailer
Merge branch 'issue-004' into develop