Sending e-mails works now

Final part of fix for #57
Cleanup ...