[API] Update Messaging API after Pierre-Yves Le Morvan comments