Fixing bad email processing