Ok, hopefully last version. This addresses Jani's latest comments. The first patch uses a typedef to handle the incompatibility between the crypto context between GMIME 2.4 and 2.6. We probably should have done this originally, as it gets rid of a bunch of #ifdefs, and should help reduce confusion. I also move to use strcasecmp for the crypto protocol, with a comment that points to the relevant RFCs for justification. jamie.