Fix the order of RFC2685 fields in the output.