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

diff --git a/citadel/modules/network/serv_netmail.c b/citadel/modules/network/serv_netmail.c
index b06da93f1..c488388f9 100644
--- a/citadel/modules/network/serv_netmail.c
+++ b/citadel/modules/network/serv_netmail.c
@@ -136,8 +136,7 @@ static void ListCalculateSubject(struct CtdlMessage *msg)
 		Subject = NewStrBufPlain(HKEY("(no subject)"));
 	}
 	else {
-		Subject = NewStrBufPlain(
-			msg->cm_fields[eMsgSubject], -1);
+		Subject = NewStrBufPlain(CM_KEY(msg, eMsgSubject));
 	}
 	FlatSubject = NewStrBufPlain(NULL, StrLength(Subject));
 	StrBuf_RFC822_to_Utf8(FlatSubject, Subject, NULL, NULL);
@@ -407,7 +406,7 @@ void network_process_participate(SpoolControl *sc, struct CtdlMessage *omsg, lon
 			ok_to_participate = 1;
 		}
 		
-		Buf = NewStrBufPlain(msg->cm_fields[eNodeName], -1);
+		Buf = NewStrBufPlain(CM_KEY(msg, eNodeName));
 		if (CtdlIsValidNode(NULL,
 				    NULL,
 				    Buf,