[3347, 3979] messages module - DONE