X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpeventclient.c;h=7374107d810ccbfcdc20d5427651d4c1a097ea19;hb=ded2dfcfba9d0b30ff8f31086d03833d9bd75457;hp=d1815f91bccf3d068ae52172c3edfe48ef1607ea;hpb=df417b479cb81f3bc0c042dd6568eca5aa1e684f;p=citadel.git

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index d1815f91b..7374107d8 100644
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -139,6 +139,13 @@ void FinalizeMessageSend(SmtpOutMsg *Msg)
 
 	nRemain = CountActiveQueueEntries(Msg->MyQItem);
 
+	if (Msg->MyQEntry->Active && 
+	    CheckQEntryIsBounce(Msg->MyQEntry))
+	{
+		/* are we casue for a bounce mail? */
+		Msg->MyQItem->SendBounceMail = 1;
+	}
+
 	if ((nRemain > 0) || IDestructQueItem)
 		MsgData = SerializeQueueItem(Msg->MyQItem);
 	else