Fix: Improved e-mail handling