Added a fix for empty emails.