Re-enabled mail, fixed a bug.
Fixed some function calls.
Merge pull request #33 from JonNatanael/master

Fixes