Fixed rfc822 bug