X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmessages.c;h=bc5a6e5cfd4bd0c9ef44baced9fa9e74a8b21c62;hp=adc1d13b6db0bebaa1e6e889c5d542dca7c2a556;hb=1bf28924fb95c17730a07c1a1547bca3de9afa20;hpb=275923e95ec5e974182ce1b2458b374906d4c646

diff --git a/citadel/messages.c b/citadel/messages.c
index adc1d13b6..bc5a6e5cf 100644
--- a/citadel/messages.c
+++ b/citadel/messages.c
@@ -52,6 +52,7 @@
 
 char reply_to[SIZ];
 char reply_subject[SIZ];
+char reply_references[SIZ];
 
 struct cittext {
 	struct cittext *next;
@@ -404,6 +405,7 @@ int read_message(CtdlIPC *ipc,
 
 	strcpy(reply_to, NO_REPLY_TO);
 	strcpy(reply_subject, "");
+	strcpy(reply_references, "");
 
 	r = CtdlIPCGetSingleMessage(ipc, num, (pagin == READ_HEADER ? 1 : 0), 4, &message, buf);
 	if (r / 100 != 1) {
@@ -588,9 +590,20 @@ int read_message(CtdlIPC *ipc,
 		lines_printed = checkpagin(lines_printed, pagin, screenheight);
 	}
 
+
+	/* Always do msgid before references ... the latter is a concatenation! */
+	if (message->msgid != NULL) {
+		safestrncpy(reply_references, message->msgid, sizeof reply_references);
+	}
+
+	if (message->references != NULL) if (!IsEmptyStr(message->references)) {
+		int l = strlen(reply_references);
+		strcpy(&reply_references[l++], "|");
+		safestrncpy(&reply_references[l], message->references, (sizeof(reply_references) - l));
+	}
+
 	if (message->subject != NULL) {
-		safestrncpy(reply_subject, message->subject,
-						sizeof reply_subject);
+		safestrncpy(reply_subject, message->subject, sizeof reply_subject);
 		if (!IsEmptyStr(message->subject)) {
 			if (dest) {
 				fprintf(dest, "Subject: %s\n",
@@ -1090,6 +1103,7 @@ int entmsg(CtdlIPC *ipc,
 	strcpy(message.recipient, "");
 	strcpy(message.author, "");
 	strcpy(message.subject, "");
+	strcpy(message.references, "");
 	message.text = "";		/* point to "", changes later */
 	message.anonymous = 0;
 	message.type = mode;
@@ -1136,6 +1150,7 @@ int entmsg(CtdlIPC *ipc,
 	strcpy(message.recipient, buf);
 
 	if (is_reply) {
+
 		if (!IsEmptyStr(reply_subject)) {
 			if (!strncasecmp(reply_subject,
 			   "Re: ", 3)) {
@@ -1148,6 +1163,8 @@ int entmsg(CtdlIPC *ipc,
 					reply_subject);
 			}
 		}
+
+		safestrncpy(message.references, reply_references, sizeof message.references);
 	}
 
 	if (room_flags & QR_ANONOPT) {