Filter on the email template
Pass the payment id on this template filter
Filter on email subject
Better filter readability
Merge pull request #796 from Geczy/master

Email filters