saurfang Merge pull request #15 from nachti/mail