Messages PR the first part

Let's play and merge it.