Merge pull request #871 from narfbg/develop-helpers-eff

Improve email, file & form helpers