Merge pull request #6435 from seamuslee001/mailing_ui_tidy_up