Message view now sort of works again