fixes #455 - Spam screen refactored