Save and parse message in delivery agent.
Merge branch 'MAILSMTP-3'