- "date", H_CHECK, M_NEEDDATE,
- "from", H_ADDR|H_CHECK, M_NEEDFROM,
- "original-from", 0, 0,
- "sender", H_ADDR, 0,
- "full-name", H_ACHECK, M_FULLNAME,
- "to", H_ADDR|H_RCPT, 0,
- "cc", H_ADDR|H_RCPT, 0,
- "bcc", H_ADDR|H_RCPT, 0,
- "message-id", 0, 0,
- "message", H_EOH, 0,
- "text", H_EOH, 0,
- "posted-date", 0, 0,
- "return-receipt-to", 0, 0,
- "received-date", H_CHECK, M_LOCAL,
- "received-from", H_CHECK, M_LOCAL,
- "precedence", 0, 0,
- "mail-from", H_FORCE, 0,
- "via", H_FORCE, 0,
- NULL, 0, 0,
+ /* originator fields, most to least significant */
+ "resent-sender", H_FROM|H_RESENT,
+ "resent-from", H_FROM|H_RESENT,
+ "sender", H_FROM,
+ "from", H_FROM,
+ "full-name", H_ACHECK,
+ "return-receipt-to", H_FROM,
+ "errors-to", H_FROM,
+ /* destination fields */
+ "to", H_RCPT,
+ "resent-to", H_RCPT|H_RESENT,
+ "cc", H_RCPT,
+ "resent-cc", H_RCPT|H_RESENT,
+ "bcc", H_RCPT|H_ACHECK,
+ "resent-bcc", H_RCPT|H_ACHECK|H_RESENT,
+ /* message identification and control */
+ "message-id", 0,
+ "resent-message-id", H_RESENT,
+ "message", H_EOH,
+ "text", H_EOH,
+ /* date fields */
+ "date", 0,
+ "resent-date", H_RESENT,
+ /* trace fields */
+ "received", H_TRACE|H_FORCE,
+ "via", H_TRACE|H_FORCE,
+ "mail-from", H_TRACE|H_FORCE,
+
+ NULL, 0,