Patches for pop3(s) email-matching plugin [sf#1331909] [#749]