Removed the workaround, as Rfc2822 is now fixed