Bugfix causing empty mails