Put RawMailMessage and MailMessenger in separate files.
Work on message format.