Tmail to mail tests fallback

This adds the fallback behaviour to deal with possible reordering of reparsed attachments.