Move message defaults to a subobject of the main defaults object
Fix message defaults
Fix message defaults