- if (jmsg->recps.num_ignet > 0) {
- for (i=0; i<jmsg->recps.num_ignet; ++i) {
- extract_token(recipient, jmsg->recps.recp_ignet,
- i, '|', sizeof recipient);
- sprintf(&message_text[strlen(message_text)],
- " %s\r\n", recipient);
+ StrBufAppendBufPlain(message_text, HKEY("\r\nMessage-ID: <"), 0);
+ StrBufAppendBufPlain(message_text, jmsg->msgn, -1, 0);
+ StrBufAppendBufPlain(message_text, HKEY(">\r\nRecipients:\r\n"), 0);
+
+ if (jmsg->recps.num_local > 0) {
+ for (i=0; i<jmsg->recps.num_local; ++i) {
+ extract_token(recipient, jmsg->recps.recp_local, i, '|', sizeof recipient);
+ local_to_inetemail(inetemail, recipient, sizeof inetemail);
+ StrBufAppendPrintf(message_text, " %s <%s>\r\n", recipient, inetemail);