Repairing identification problems
Changing ENVELOPE fetch for a full header fetch >>>
Less performance but less duplicates also.