Sort out RFC2822 Originator fields... Finally! 

Signed-off-by: Gawain Lynch <gawain.lynch@gmail.com>