Task #1654 - cleaning up email subjects