Reduce headaches, make SMTP collector function-scoped for now
Merge pull request #1347 from mfalesni/fscope-smtp

Reduce headaches, make SMTP collector function-scoped for now