Patch to update smtp-before-pop patch from 0.4.x

Would the list prefer a text-only patch, or is a gzipped copy acceptable
attached to the email?  I am worried about the mail formatting breaking the
patch text.

Cheers!

=Rob=