Allow filtering of From Name and Email Address

We would like to be able to filter the from name and email address for different product groups.
Merge pull request #2024 from jdevalk/patch-2

Allow filtering of From Name and Email Address