Issue #1856562 by andypost | sun: Convert "Subject" and "Message" into Message base fields.