Fix messages collection (not Message)
fix message creation