added blacklist functionality to current e-mail sending
Merge branch 'master' into dev