storage: Support de-duplication in the mail channel (again)