Correct e-mail implementation, fixes #2