Fix view messages and subjects