Changed the way messages are composed.

Reply messages and forward messages with ContentAdd are now in the style
of Magister instead of a Mata-ish style.
Personally I like this more, this commit isn't really needed, but is
more kind of a style issue. :)