Jhbate/messages

@nicolashery can you have a look please. Will try and chat with you tonight (NZT). 
Cheers - Jamie