Fix semantics of mu_header_set_value and creation of multipart/alternative MIME

Until now, mu_header_set_value called with replace=0 prepended the header
to the header list, if a header with such name was already present.  This
has been changed.  Now, if the header with the requested name is already
present, its action is as follows:

  1. If repl is 0, return MU_ERR_EXISTS
  2. Otherwise, replace the header with the new value.

If the header is not present, it is appended to the end of the header
list, instead of putting it at the beginning.

This change is incompatible and breaks the tests, that relied on a particular
field ordering.  These are fixed as well.

The use of mu_header_set_value throughout the sources has been revised to
ensure that single-instance headers are never added twice.

This change also facilitates the second part of this commit, which
fixes creation of the multipart/alternative message by the mail utility.

* libmailutils/mailbox/header.c (mu_header_set_value): Fix semantics.
If the replace parameter is not set and the header field with the
given name already exists, return MU_ERR_EXISTS without changing
anything.  If adding new header, append it to the end of the header
list, instead of pushing it to the top.

* configure.ac: Raise shared library revision number.

* libmu_scm/mu_message.c (mu-message-set-header)
(mu-message-set-header-fields): call mu_header_set_value explicitly if
repl is not set.
* libmu_sieve/extensions/moderator.c: Force replace header mode when
needed.
* libmu_sieve/extensions/vacation.c: Likewise.
* mh/mh_init.c (mh_annotate): Prepend the annotation header.
* mh/mhn.c: Force replace header mode when needed.
* mh/repl.c: Likewise.
* mh/send.c: Likewise.

* libmailutils/tests/modmesg01.at: Change expected header order.
* libmailutils/tests/modmesg03.at: Likewise.
* mh/tests/mhn.at: Likewise.
* mh/tests/send.at: Likewise.
* sieve/tests/moderator.at: Likewise.
* sieve/tests/redirect.at: Likewise.
* sieve/tests/reject.at: Likewise.
* sieve/tests/vacation.at: Likewise.

* examples/mta.c (message_finalize): Append X-Authentication-Warning,
instead of setting it.

Make sure Content-Disposition is not set for parts of a multipart/
alternative MIME message.  Some mail readers (notably, yahoo),
misinterpret it.

* libmailutils/mime/attachment.c (at_hdr): Use mu_header_set_value
to set Content-Type and Content-Disposition.
* libmailutils/mime/mime.c (_mime_set_content_type): If the content
type is set to multipart/alternative, remove the Content-Disposition
headers from the message parts.

* mail/send.c (saveatt): Don't set content-disposition for
multipart/alternative, it is now done by the library.
(add_attachments): Warn about ignored headers.
Append only Received and X-* headers, replace others.
(parse_headers): Append headers.
(compose_header_set): Use mu_header_append if COMPOSE_APPEND is requested.
* mail/util.c (util_header_expand): Use mu_header_append.

4 files changed, 146 insertions, 146 deletions

diff --git a/sieve/tests/moderator.at b/sieve/tests/moderator.at
index 1d28daab5..b08f9d8f0 100644
--- a/sieve/tests/moderator.at
+++ b/sieve/tests/moderator.at
@@ -31,8 +31,8 @@ sed 's/ENVELOPE FROM:.*/ENVELOPE FROM/' ./mta.diag
 ],
 [ENVELOPE FROM
 ENVELOPE TO: <bug-foobar-request@example.org>
-   0: Subject: confirm 7e02c99a82a21a2349291a4f142ee2347bb5fd0b
-   1: To: bug-foobar-request@example.org
+   0: To: bug-foobar-request@example.org
+   1: Subject: confirm 7e02c99a82a21a2349291a4f142ee2347bb5fd0b
    2:
 END OF MESSAGE
 ],
@@ -55,9 +55,9 @@ cat ./mta.diag
 ],
 [ENVELOPE FROM: sergiusz@example.org
 ENVELOPE TO: <bug-foobar-request@example.org>
-   0: From: <sergiusz@example.org>
+   0: To: bug-foobar-request@example.org
    1: Subject: confirm 7e02c99a82a21a2349291a4f142ee2347bb5fd0b
-   2: To: bug-foobar-request@example.org
+   2: From: <sergiusz@example.org>
    3:
 END OF MESSAGE
 ],
diff --git a/sieve/tests/redirect.at b/sieve/tests/redirect.at
index 809850153..67887792e 100644
--- a/sieve/tests/redirect.at
+++ b/sieve/tests/redirect.at
@@ -36,11 +36,11 @@ sed 's/ $//' ./mta.diag
 [0],
 [ENVELOPE FROM: coyote@desert.example.org
 ENVELOPE TO: <gray@gnu.org>
-   0: X-Loop-Prevention: foobar@nonexistent.net
-   1: From: coyote@desert.example.org
-   2: To: roadrunner@acme.example.com
-   3: Subject: I have a present for you
-   4: X-Caffeine: C8H10N4O2
+   0: From: coyote@desert.example.org
+   1: To: roadrunner@acme.example.com
+   2: Subject: I have a present for you
+   3: X-Caffeine: C8H10N4O2
+   4: X-Loop-Prevention: foobar@nonexistent.net
    5: 
    6: Look, I'm sorry about the whole anvil thing, and I really
    7: didn't mean to try and drop it on you from the top of the
@@ -55,12 +55,12 @@ ENVELOPE TO: <gray@gnu.org>
 END OF MESSAGE
 ENVELOPE FROM: b1ff@de.res.example.com
 ENVELOPE TO: <gray@gnu.org>
-   0: X-Loop-Prevention: foobar@nonexistent.net
-   1: From: youcouldberich!@reply-by-postal-mail.invalid
-   2: To: rube@landru.example.edu
-   3: Subject: $$$ YOU, TOO, CAN BE A MILLIONAIRE! $$$
-   4: Date: TBD
-   5: X-Number: 0015
+   0: From: youcouldberich!@reply-by-postal-mail.invalid
+   1: To: rube@landru.example.edu
+   2: Subject: $$$ YOU, TOO, CAN BE A MILLIONAIRE! $$$
+   3: Date: TBD
+   4: X-Number: 0015
+   5: X-Loop-Prevention: foobar@nonexistent.net
    6: 
    7: YOU MAY HAVE ALREADY WON TEN MILLION DOLLARS, BUT I DOUBT
    8: IT!  SO JUST POST THIS TO SIX HUNDRED NEWSGROUPS!  IT WILL
@@ -72,15 +72,15 @@ ENVELOPE TO: <gray@gnu.org>
 END OF MESSAGE
 ENVELOPE FROM: bar@dontmailme.org
 ENVELOPE TO: <gray@gnu.org>
-   0: X-Loop-Prevention: foobar@nonexistent.net
-   1: Received: (from bar@dontmailme.org)
-   2: 	by dontmailme.org id fERKR9N16790
-   3: 	for foobar@nonexistent.net; Fri, 28 Dec 2001 22:18:08 +0200
-   4: Date: Fri, 28 Dec 2001 23:28:08 +0200
-   5: From: Bar <bar@dontmailme.org>
-   6: To: Foo Bar <foobar@nonexistent.net>
-   7: Message-Id: <200112232808.fERKR9N16790@dontmailme.org>
-   8: Subject: Coffee
+   0: Received: (from bar@dontmailme.org)
+   1: 	by dontmailme.org id fERKR9N16790
+   2: 	for foobar@nonexistent.net; Fri, 28 Dec 2001 22:18:08 +0200
+   3: Date: Fri, 28 Dec 2001 23:28:08 +0200
+   4: From: Bar <bar@dontmailme.org>
+   5: To: Foo Bar <foobar@nonexistent.net>
+   6: Message-Id: <200112232808.fERKR9N16790@dontmailme.org>
+   7: Subject: Coffee
+   8: X-Loop-Prevention: foobar@nonexistent.net
    9: 
   10: How about some coffee?
 END OF MESSAGE
diff --git a/sieve/tests/reject.at b/sieve/tests/reject.at
index d98c69e3c..204819d7e 100644
--- a/sieve/tests/reject.at
+++ b/sieve/tests/reject.at
@@ -55,8 +55,8 @@ sed -f filter.sed ./mta.diag
 [ENVELOPE FROM: MAILER-DAEMON@nonexistent.net
 ENVELOPE TO: <coyote@desert.example.org>
    0: To: coyote@desert.example.org
-   1: Content-Type: multipart/mixed; boundary=(boundary)
-   2: MIME-Version: 1.0
+   1: MIME-Version: 1.0
+   2: Content-Type: multipart/mixed; boundary=(boundary)
    3: 
    4: --(boundary)
    5: Content-Type: text/plain;charset=UTF-8
@@ -104,8 +104,8 @@ END OF MESSAGE
 ENVELOPE FROM: MAILER-DAEMON@nonexistent.net
 ENVELOPE TO: <b1ff@de.res.example.com>
    0: To: b1ff@de.res.example.com
-   1: Content-Type: multipart/mixed; boundary=(boundary)
-   2: MIME-Version: 1.0
+   1: MIME-Version: 1.0
+   2: Content-Type: multipart/mixed; boundary=(boundary)
    3: 
    4: --(boundary)
    5: Content-Type: text/plain;charset=UTF-8
@@ -151,8 +151,8 @@ END OF MESSAGE
 ENVELOPE FROM: MAILER-DAEMON@nonexistent.net
 ENVELOPE TO: <bar@dontmailme.org>
    0: To: bar@dontmailme.org
-   1: Content-Type: multipart/mixed; boundary=(boundary)
-   2: MIME-Version: 1.0
+   1: MIME-Version: 1.0
+   2: Content-Type: multipart/mixed; boundary=(boundary)
    3: 
    4: --(boundary)
    5: Content-Type: text/plain;charset=UTF-8
diff --git a/sieve/tests/vacation.at b/sieve/tests/vacation.at
index 302f374cd..b1b90f2b7 100644
--- a/sieve/tests/vacation.at
+++ b/sieve/tests/vacation.at
@@ -31,14 +31,14 @@ cat ./mta.diag
 ],
 [ENVELOPE FROM: foobar@nonexistent.net
 ENVELOPE TO: <bar@dontmailme.org>
-   0: References: <200112232808.fERKR9N16790@dontmailme.org>
-   1: In-Reply-To: Your message of Fri, 28 Dec 2001 23:28:08 +0200
-   2: 	<200112232808.fERKR9N16790@dontmailme.org>
-   3: Subject: =?UTF-8?Q?Re:_Coffee?=
-   4: To: bar@dontmailme.org
-   5: Content-Transfer-Encoding: 8bit
-   6: Content-Type: text/plain;charset=UTF-8
-   7: MIME-Version: 1.0
+   0: MIME-Version: 1.0
+   1: Content-Type: text/plain;charset=UTF-8
+   2: Content-Transfer-Encoding: 8bit
+   3: To: bar@dontmailme.org
+   4: Subject: =?UTF-8?Q?Re:_Coffee?=
+   5: In-Reply-To: Your message of Fri, 28 Dec 2001 23:28:08 +0200
+   6: 	<200112232808.fERKR9N16790@dontmailme.org>
+   7: References: <200112232808.fERKR9N16790@dontmailme.org>
    8:
    9: I'm on vacation
 END OF MESSAGE
@@ -62,25 +62,25 @@ cat ./mta.diag
 ],
 [ENVELOPE FROM: roadrunner@acme.example.com
 ENVELOPE TO: <coyote@desert.example.org>
-   0: In-Reply-To: Your message of Sun May  6 22:16:47 2001
-   1: Subject: =?UTF-8?Q?Re:_I_have_a_present_for_you?=
-   2: To: coyote@desert.example.org
-   3: Content-Transfer-Encoding: 8bit
-   4: Content-Type: text/plain;charset=UTF-8
-   5: MIME-Version: 1.0
+   0: MIME-Version: 1.0
+   1: Content-Type: text/plain;charset=UTF-8
+   2: Content-Transfer-Encoding: 8bit
+   3: To: coyote@desert.example.org
+   4: Subject: =?UTF-8?Q?Re:_I_have_a_present_for_you?=
+   5: In-Reply-To: Your message of Sun May  6 22:16:47 2001
    6:
    7: I'm on vacation
 END OF MESSAGE
 ENVELOPE FROM: foobar@nonexistent.net
 ENVELOPE TO: <bar@dontmailme.org>
-   0: References: <200112232808.fERKR9N16790@dontmailme.org>
-   1: In-Reply-To: Your message of Fri, 28 Dec 2001 23:28:08 +0200
-   2: 	<200112232808.fERKR9N16790@dontmailme.org>
-   3: Subject: =?UTF-8?Q?Re:_Coffee?=
-   4: To: bar@dontmailme.org
-   5: Content-Transfer-Encoding: 8bit
-   6: Content-Type: text/plain;charset=UTF-8
-   7: MIME-Version: 1.0
+   0: MIME-Version: 1.0
+   1: Content-Type: text/plain;charset=UTF-8
+   2: Content-Transfer-Encoding: 8bit
+   3: To: bar@dontmailme.org
+   4: Subject: =?UTF-8?Q?Re:_Coffee?=
+   5: In-Reply-To: Your message of Fri, 28 Dec 2001 23:28:08 +0200
+   6: 	<200112232808.fERKR9N16790@dontmailme.org>
+   7: References: <200112232808.fERKR9N16790@dontmailme.org>
    8:
    9: I'm on vacation
 END OF MESSAGE
@@ -104,36 +104,36 @@ cat ./mta.diag
 ],
 [ENVELOPE FROM: foobar@nonexistent.net
 ENVELOPE TO: <coyote@desert.example.org>
-   0: In-Reply-To: Your message of Sun May  6 22:16:47 2001
-   1: Subject: =?UTF-8?Q?Re:_I_have_a_present_for_you?=
-   2: To: coyote@desert.example.org
-   3: Content-Transfer-Encoding: 8bit
-   4: Content-Type: text/plain;charset=UTF-8
-   5: MIME-Version: 1.0
+   0: MIME-Version: 1.0
+   1: Content-Type: text/plain;charset=UTF-8
+   2: Content-Transfer-Encoding: 8bit
+   3: To: coyote@desert.example.org
+   4: Subject: =?UTF-8?Q?Re:_I_have_a_present_for_you?=
+   5: In-Reply-To: Your message of Sun May  6 22:16:47 2001
    6:
    7: I'm on vacation
 END OF MESSAGE
 ENVELOPE FROM: foobar@nonexistent.net
 ENVELOPE TO: <b1ff@de.res.example.com>
-   0: In-Reply-To: Your message of TBD
-   1: Subject: =?UTF-8?Q?Re:_$$$_YOU,_TOO,_CAN_BE_A_MILLIONAIRE!_$$$?=
-   2: To: b1ff@de.res.example.com
-   3: Content-Transfer-Encoding: 8bit
-   4: Content-Type: text/plain;charset=UTF-8
-   5: MIME-Version: 1.0
+   0: MIME-Version: 1.0
+   1: Content-Type: text/plain;charset=UTF-8
+   2: Content-Transfer-Encoding: 8bit
+   3: To: b1ff@de.res.example.com
+   4: Subject: =?UTF-8?Q?Re:_$$$_YOU,_TOO,_CAN_BE_A_MILLIONAIRE!_$$$?=
+   5: In-Reply-To: Your message of TBD
    6:
    7: I'm on vacation
 END OF MESSAGE
 ENVELOPE FROM: foobar@nonexistent.net
 ENVELOPE TO: <bar@dontmailme.org>
-   0: References: <200112232808.fERKR9N16790@dontmailme.org>
-   1: In-Reply-To: Your message of Fri, 28 Dec 2001 23:28:08 +0200
-   2: 	<200112232808.fERKR9N16790@dontmailme.org>
-   3: Subject: =?UTF-8?Q?Re:_Coffee?=
-   4: To: bar@dontmailme.org
-   5: Content-Transfer-Encoding: 8bit
-   6: Content-Type: text/plain;charset=UTF-8
-   7: MIME-Version: 1.0
+   0: MIME-Version: 1.0
+   1: Content-Type: text/plain;charset=UTF-8
+   2: Content-Transfer-Encoding: 8bit
+   3: To: bar@dontmailme.org
+   4: Subject: =?UTF-8?Q?Re:_Coffee?=
+   5: In-Reply-To: Your message of Fri, 28 Dec 2001 23:28:08 +0200
+   6: 	<200112232808.fERKR9N16790@dontmailme.org>
+   7: References: <200112232808.fERKR9N16790@dontmailme.org>
    8:
    9: I'm on vacation
 END OF MESSAGE
@@ -158,36 +158,36 @@ cat ./mta.diag
 ],
 [ENVELOPE FROM: foobar@nonexistent.net
 ENVELOPE TO: <coyote@desert.example.org>
-   0: In-Reply-To: Your message of Sun May  6 22:16:47 2001
-   1: Subject: =?UTF-8?Q?Re:_I_have_a_present_for_you?=
-   2: To: coyote@desert.example.org
-   3: Content-Transfer-Encoding: 8bit
-   4: Content-Type: text/plain;charset=UTF-8
-   5: MIME-Version: 1.0
+   0: MIME-Version: 1.0
+   1: Content-Type: text/plain;charset=UTF-8
+   2: Content-Transfer-Encoding: 8bit
+   3: To: coyote@desert.example.org
+   4: Subject: =?UTF-8?Q?Re:_I_have_a_present_for_you?=
+   5: In-Reply-To: Your message of Sun May  6 22:16:47 2001
    6:
    7: I'm on vacation
 END OF MESSAGE
 ENVELOPE FROM: foobar@nonexistent.net
 ENVELOPE TO: <b1ff@de.res.example.com>
-   0: In-Reply-To: Your message of TBD
-   1: Subject: =?UTF-8?Q?Re:_$$$_YOU,_TOO,_CAN_BE_A_MILLIONAIRE!_$$$?=
-   2: To: b1ff@de.res.example.com
-   3: Content-Transfer-Encoding: 8bit
-   4: Content-Type: text/plain;charset=UTF-8
-   5: MIME-Version: 1.0
+   0: MIME-Version: 1.0
+   1: Content-Type: text/plain;charset=UTF-8
+   2: Content-Transfer-Encoding: 8bit
+   3: To: b1ff@de.res.example.com
+   4: Subject: =?UTF-8?Q?Re:_$$$_YOU,_TOO,_CAN_BE_A_MILLIONAIRE!_$$$?=
+   5: In-Reply-To: Your message of TBD
    6:
    7: I'm on vacation
 END OF MESSAGE
 ENVELOPE FROM: foobar@nonexistent.net
 ENVELOPE TO: <bar@dontmailme.org>
-   0: References: <200112232808.fERKR9N16790@dontmailme.org>
-   1: In-Reply-To: Your message of Fri, 28 Dec 2001 23:28:08 +0200
-   2: 	<200112232808.fERKR9N16790@dontmailme.org>
-   3: Subject: =?UTF-8?Q?Re:_Coffee?=
-   4: To: bar@dontmailme.org
-   5: Content-Transfer-Encoding: 8bit
-   6: Content-Type: text/plain;charset=UTF-8
-   7: MIME-Version: 1.0
+   0: MIME-Version: 1.0
+   1: Content-Type: text/plain;charset=UTF-8
+   2: Content-Transfer-Encoding: 8bit
+   3: To: bar@dontmailme.org
+   4: Subject: =?UTF-8?Q?Re:_Coffee?=
+   5: In-Reply-To: Your message of Fri, 28 Dec 2001 23:28:08 +0200
+   6: 	<200112232808.fERKR9N16790@dontmailme.org>
+   7: References: <200112232808.fERKR9N16790@dontmailme.org>
    8:
    9: I'm on vacation
 END OF MESSAGE
@@ -214,36 +214,36 @@ cat ./mta.diag
 ],
 [ENVELOPE FROM: foobar@nonexistent.net
 ENVELOPE TO: <coyote@desert.example.org>
-   0: In-Reply-To: Your message of Sun May  6 22:16:47 2001
-   1: Subject: =?UTF-8?Q?Re:_I_have_a_present_for_you?=
-   2: To: coyote@desert.example.org
-   3: Content-Transfer-Encoding: base64
-   4: Content-Type: text/plain;charset=UTF-8
-   5: MIME-Version: 1.0
+   0: MIME-Version: 1.0
+   1: Content-Type: text/plain;charset=UTF-8
+   2: Content-Transfer-Encoding: base64
+   3: To: coyote@desert.example.org
+   4: Subject: =?UTF-8?Q?Re:_I_have_a_present_for_you?=
+   5: In-Reply-To: Your message of Sun May  6 22:16:47 2001
    6:
    7: SSdtIG9uIHZhY2F0aW9uLg==
 END OF MESSAGE
 ENVELOPE FROM: foobar@nonexistent.net
 ENVELOPE TO: <b1ff@de.res.example.com>
-   0: In-Reply-To: Your message of TBD
-   1: Subject: =?UTF-8?Q?Re:_$$$_YOU,_TOO,_CAN_BE_A_MILLIONAIRE!_$$$?=
-   2: To: b1ff@de.res.example.com
-   3: Content-Transfer-Encoding: base64
-   4: Content-Type: text/plain;charset=UTF-8
-   5: MIME-Version: 1.0
+   0: MIME-Version: 1.0
+   1: Content-Type: text/plain;charset=UTF-8
+   2: Content-Transfer-Encoding: base64
+   3: To: b1ff@de.res.example.com
+   4: Subject: =?UTF-8?Q?Re:_$$$_YOU,_TOO,_CAN_BE_A_MILLIONAIRE!_$$$?=
+   5: In-Reply-To: Your message of TBD
    6:
    7: SSdtIG9uIHZhY2F0aW9uLg==
 END OF MESSAGE
 ENVELOPE FROM: foobar@nonexistent.net
 ENVELOPE TO: <bar@dontmailme.org>
-   0: References: <200112232808.fERKR9N16790@dontmailme.org>
-   1: In-Reply-To: Your message of Fri, 28 Dec 2001 23:28:08 +0200
-   2: 	<200112232808.fERKR9N16790@dontmailme.org>
-   3: Subject: =?UTF-8?Q?Re:_Coffee?=
-   4: To: bar@dontmailme.org
-   5: Content-Transfer-Encoding: base64
-   6: Content-Type: text/plain;charset=UTF-8
-   7: MIME-Version: 1.0
+   0: MIME-Version: 1.0
+   1: Content-Type: text/plain;charset=UTF-8
+   2: Content-Transfer-Encoding: base64
+   3: To: bar@dontmailme.org
+   4: Subject: =?UTF-8?Q?Re:_Coffee?=
+   5: In-Reply-To: Your message of Fri, 28 Dec 2001 23:28:08 +0200
+   6: 	<200112232808.fERKR9N16790@dontmailme.org>
+   7: References: <200112232808.fERKR9N16790@dontmailme.org>
    8:
    9: SSdtIG9uIHZhY2F0aW9uLg==
 END OF MESSAGE
@@ -275,10 +275,10 @@ cat ./mta.diag
 ],
 [ENVELOPE FROM: foobar@nonexistent.net
 ENVELOPE TO: <coyote@desert.example.org>
-   0: In-Reply-To: Your message of Sun May  6 22:16:47 2001
-   1: Subject: =?UTF-8?Q?Re:_I_have_a_present_for_you?=
-   2: To: coyote@desert.example.org
-   3: X-Mail-Processor: sieve
+   0: X-Mail-Processor: sieve
+   1: To: coyote@desert.example.org
+   2: Subject: =?UTF-8?Q?Re:_I_have_a_present_for_you?=
+   3: In-Reply-To: Your message of Sun May  6 22:16:47 2001
    4:
    5: I'm on vacation right now.
    6: I will attend to your message as soon as I'm back.
@@ -288,10 +288,10 @@ ENVELOPE TO: <coyote@desert.example.org>
 END OF MESSAGE
 ENVELOPE FROM: foobar@nonexistent.net
 ENVELOPE TO: <b1ff@de.res.example.com>
-   0: In-Reply-To: Your message of TBD
-   1: Subject: =?UTF-8?Q?Re:_$$$_YOU,_TOO,_CAN_BE_A_MILLIONAIRE!_$$$?=
-   2: To: b1ff@de.res.example.com
-   3: X-Mail-Processor: sieve
+   0: X-Mail-Processor: sieve
+   1: To: b1ff@de.res.example.com
+   2: Subject: =?UTF-8?Q?Re:_$$$_YOU,_TOO,_CAN_BE_A_MILLIONAIRE!_$$$?=
+   3: In-Reply-To: Your message of TBD
    4:
    5: I'm on vacation right now.
    6: I will attend to your message as soon as I'm back.
@@ -301,12 +301,12 @@ ENVELOPE TO: <b1ff@de.res.example.com>
 END OF MESSAGE
 ENVELOPE FROM: foobar@nonexistent.net
 ENVELOPE TO: <bar@dontmailme.org>
-   0: References: <200112232808.fERKR9N16790@dontmailme.org>
-   1: In-Reply-To: Your message of Fri, 28 Dec 2001 23:28:08 +0200
-   2: 	<200112232808.fERKR9N16790@dontmailme.org>
-   3: Subject: =?UTF-8?Q?Re:_Coffee?=
-   4: To: bar@dontmailme.org
-   5: X-Mail-Processor: sieve
+   0: X-Mail-Processor: sieve
+   1: To: bar@dontmailme.org
+   2: Subject: =?UTF-8?Q?Re:_Coffee?=
+   3: In-Reply-To: Your message of Fri, 28 Dec 2001 23:28:08 +0200
+   4: 	<200112232808.fERKR9N16790@dontmailme.org>
+   5: References: <200112232808.fERKR9N16790@dontmailme.org>
    6:
    7: I'm on vacation right now.
    8: I will attend to your message as soon as I'm back.
@@ -340,12 +340,12 @@ cat ./mta.diag
 ],
 [ENVELOPE FROM: foobar@nonexistent.net
 ENVELOPE TO: <coyote@desert.example.org>
-   0: In-Reply-To: Your message of Sun May  6 22:16:47 2001
-   1: Subject: =?UTF-8?Q?Re:_I_have_a_present_for_you?=
-   2: To: coyote@desert.example.org
-   3: Content-Transfer-Encoding: 8bit
-   4: Content-Type: text/plain;charset=UTF-8
-   5: MIME-Version: 1.0
+   0: MIME-Version: 1.0
+   1: Content-Type: text/plain;charset=UTF-8
+   2: Content-Transfer-Encoding: 8bit
+   3: To: coyote@desert.example.org
+   4: Subject: =?UTF-8?Q?Re:_I_have_a_present_for_you?=
+   5: In-Reply-To: Your message of Sun May  6 22:16:47 2001
    6:
    7: I'm on vacation right now.
    8: I will attend to your message as soon as I'm back.
@@ -356,12 +356,12 @@ ENVELOPE TO: <coyote@desert.example.org>
 END OF MESSAGE
 ENVELOPE FROM: foobar@nonexistent.net
 ENVELOPE TO: <b1ff@de.res.example.com>
-   0: In-Reply-To: Your message of TBD
-   1: Subject: =?UTF-8?Q?Re:_$$$_YOU,_TOO,_CAN_BE_A_MILLIONAIRE!_$$$?=
-   2: To: b1ff@de.res.example.com
-   3: Content-Transfer-Encoding: 8bit
-   4: Content-Type: text/plain;charset=UTF-8
-   5: MIME-Version: 1.0
+   0: MIME-Version: 1.0
+   1: Content-Type: text/plain;charset=UTF-8
+   2: Content-Transfer-Encoding: 8bit
+   3: To: b1ff@de.res.example.com
+   4: Subject: =?UTF-8?Q?Re:_$$$_YOU,_TOO,_CAN_BE_A_MILLIONAIRE!_$$$?=
+   5: In-Reply-To: Your message of TBD
    6:
    7: I'm on vacation right now.
    8: I will attend to your message as soon as I'm back.
@@ -372,14 +372,14 @@ ENVELOPE TO: <b1ff@de.res.example.com>
 END OF MESSAGE
 ENVELOPE FROM: foobar@nonexistent.net
 ENVELOPE TO: <bar@dontmailme.org>
-   0: References: <200112232808.fERKR9N16790@dontmailme.org>
-   1: In-Reply-To: Your message of Fri, 28 Dec 2001 23:28:08 +0200
-   2: 	<200112232808.fERKR9N16790@dontmailme.org>
-   3: Subject: =?UTF-8?Q?Re:_Coffee?=
-   4: To: bar@dontmailme.org
-   5: Content-Transfer-Encoding: 8bit
-   6: Content-Type: text/plain;charset=UTF-8
-   7: MIME-Version: 1.0
+   0: MIME-Version: 1.0
+   1: Content-Type: text/plain;charset=UTF-8
+   2: Content-Transfer-Encoding: 8bit
+   3: To: bar@dontmailme.org
+   4: Subject: =?UTF-8?Q?Re:_Coffee?=
+   5: In-Reply-To: Your message of Fri, 28 Dec 2001 23:28:08 +0200
+   6: 	<200112232808.fERKR9N16790@dontmailme.org>
+   7: References: <200112232808.fERKR9N16790@dontmailme.org>
    8:
    9: I'm on vacation right now.
   10: I will attend to your message as soon as I'm back.