Messages restructuring