X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpeventclient.c;h=b3ec5da0e5ff8bed1a35197d855e7fdc44b8a1ad;hb=d3064cffd20796822ade6cb15cdbb82b2185d1d0;hp=bb11522c19eb29af47a00086fd34f605803c57bc;hpb=d50dcea65ea51fc2fff9c430fc7de8786ed677ef;p=citadel.git

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index bb11522c1..b3ec5da0e 100644
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -154,7 +154,14 @@ eNextState FinalizeMessageSend_DB(AsyncIO *IO)
 {
 	const char *Status;
 	SmtpOutMsg *Msg = IO->Data;
-	
+	StrBuf *StatusMessage;
+
+	if (Msg->MyQEntry->AllStatusMessages != NULL)
+		StatusMessage = Msg->MyQEntry->AllStatusMessages;
+	else
+		StatusMessage = Msg->MyQEntry->StatusMessage;
+
+
 	if (Msg->MyQEntry->Status == 2) {
 		SetSMTPState(IO, eSTMPfinished);
 		Status = "Delivery successful.";
@@ -175,7 +182,7 @@ eNextState FinalizeMessageSend_DB(AsyncIO *IO)
 		   Msg->user,
 		   Msg->node,
 		   Msg->name,
-		   ChrPtr(Msg->MyQEntry->StatusMessage));
+		   ChrPtr(StatusMessage));
 
 
 	Msg->IDestructQueItem = DecreaseQReference(Msg->MyQItem);
@@ -204,7 +211,7 @@ eNextState FinalizeMessageSend_DB(AsyncIO *IO)
 	Msg->MyQItem->QueMsgID = -1;
 
 	if (Msg->IDestructQueItem)
-		smtpq_do_bounce(Msg->MyQItem, Msg->msgtext, Msg->pCurrRelay);
+		smtpq_do_bounce(Msg->MyQItem, StatusMessage, Msg->msgtext, Msg->pCurrRelay);
 
 	if (Msg->nRemain > 0)
 	{