Polish responsiveness of Messages pg at VWs < 400, refactor