Put the non-client painting related message cases with the client ones
so that they can be happy together.

Related to #1383.