Bugfix for the mail API