Changes message display. Fixes #6