X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpeventclient.c;h=47c1d605e525c213424501448f51e3d3d2e3335a;hb=5e3befebe2ed0ce85324da3be83b21880dc7d069;hp=afdde7dad1e229a5b8f60708fe3a8781f7a976f3;hpb=15fc2bf9cd4d2a34fd91aa16c4f632ee46e72dd8;p=citadel.git

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index afdde7dad..47c1d605e 100644
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -212,7 +212,7 @@ eNextState FinalizeMessageSend_DB(AsyncIO *IO)
 	Msg->MyQItem->QueMsgID = -1;
 
 	if (Msg->IDestructQueItem)
-		smtpq_do_bounce(Msg->MyQItem, StatusMessage, Msg->msgtext, Msg->pCurrRelay);
+		smtpq_do_bounce(Msg->MyQItem, Msg->msgtext, Msg->pCurrRelay);
 
 	if (Msg->nRemain > 0)
 	{
@@ -222,12 +222,12 @@ eNextState FinalizeMessageSend_DB(AsyncIO *IO)
 		msg->cm_magic = CTDLMESSAGE_MAGIC;
 		msg->cm_anon_type = MES_NORMAL;
 		msg->cm_format_type = FMT_RFC822;
-		msg->cm_fields['M'] = SmashStrBuf(&Msg->QMsgData);
-		msg->cm_fields['U'] = strdup("QMSG");
+		CM_SetAsFieldSB(msg, eMesageText, &Msg->QMsgData);
+		CM_SetField(msg, eMsgSubject, HKEY("QMSG"));
 		Msg->MyQItem->QueMsgID =
 			CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM, QP_EADDR);
 		EVS_syslog(LOG_DEBUG, "%ld", Msg->MyQItem->QueMsgID);
-		CtdlFreeMessage(msg);
+		CM_Free(msg);
 	}
 	else {
 		CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM,