----------------------
-- Revision of MessageMaker finished for the moment (still some bugfixing ongoing).

NOTE that all messages should be recreated!