bmsg->cm_anon_type = MES_NORMAL;
bmsg->cm_format_type = FMT_RFC822;
- bmsg->cm_fields[eOriginalRoom] = strdup(MAILROOM);
- bmsg->cm_fields[eAuthor] = strdup("Citadel");
- bmsg->cm_fields[eNodeName] = strdup(config.c_nodename);
- bmsg->cm_fields[eMsgSubject] = strdup("Delivery Status Notification (Failure)");
- bmsg->cm_fields[eMesageText] = SmashStrBuf(&BounceMB);
+ CM_SetField(bmsg, eOriginalRoom, HKEY(MAILROOM));
+ CM_SetField(bmsg, eAuthor, HKEY("Citadel"));
+ CM_SetField(bmsg, eNodeName, config.c_nodename, strlen(config.c_nodename));
+ CM_SetField(bmsg, eMsgSubject, HKEY("Delivery Status Notification (Failure)"));
+ CM_SetAsFieldSB(bmsg, eMesageText, &BounceMB);
/* First try the user who sent the message */
if (StrLength(MyQItem->BounceTo) == 0) {