Made all e-mails work