added message/rfc822 handling