MessageCriterion+GPGMail.h moved to headers.