Emailer fix

Pretty sure this works... well no worse than current at least. Sending pull request, but not sure what's going to happen... adventures!