Search for system emails in To and Delivered-To

Previously, the Delivered-To header was only used if the To header was not found