Added more options for RFC822 output