Jhbate/messages no groupid

@nicolashery still a WIP and testing with clamshell locally at the moment