Add delivered-to detection to mail fetcher

Duplicate delivered-to handling from mail parse as temp. solution.