ENH/BF: exim improvements with sample


XATRIX on irc wanted help with: http://www.fpaste.org/18357/5241137/

This is what I came up with.