X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_network.c;fp=citadel%2Fmodules%2Fnetwork%2Fserv_network.c;h=ef9dfc56829fd4793e5a1cabea32427262087c19;hp=32bf49564a1f4f7b6f370df7eacf5abe4e3cdf15;hb=55013f95f08eafe1b375df4241e8defe387c6cdc;hpb=2b80e75820618944e1c75b9c01aeeefc8b6b0c81

diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c
index 32bf49564..ef9dfc568 100644
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.c
@@ -116,11 +116,11 @@ int network_usetable(struct CtdlMessage *msg)
 	}
 
 	/* Generate the message ID */
-	msgid = NewStrBufPlain(msg->cm_fields[emessageId], -1);
+	msgid = NewStrBufPlain(CM_KEY(msg, emessageId));
 	if (haschar(ChrPtr(msgid), '@') == 0) {
 		StrBufAppendBufPlain(msgid, HKEY("@"), 0);
 		if (!CM_IsEmpty(msg, eNodeName)) {
-			StrBufAppendBufPlain(msgid, msg->cm_fields[eNodeName], -1, 0);
+			StrBufAppendBufPlain(msgid, CM_KEY(msg, eNodeName), 0);
 		}
 		else {
 			FreeStrBuf(&msgid);