I'm not sure how to address this without resorting to protocol-specific filters -- I know that we can calculate the size differently based on each with the info we have, but are you saying that we can check the last body part and somehow determine that we're looking at a POP3 vs IMAP message? I added a comment and filtered this to work on only POP3 for now, but didn't really address the core problem here.