Follow-up fix for bug#9921 - Reply to previously signed email breaks PGP verification.

-reworked regular expressions