More message layout work (not done yet)