Fix incoming mail