X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpeventclient.c;h=4b6dea3954c39c48cb681eb066e02f442754d8bd;hb=82fcf5721fdbf10ac860bd551409ae7b8a4aed0c;hp=0d3428fea894f5ed529b75e2b50254875ad2064d;hpb=09e2fca2273038a0f651287306f19b0a3cf44bb8;p=citadel.git

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index 0d3428fea..4b6dea395 100644
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -203,14 +203,16 @@ eNextState FinalizeMessageSend_DB(AsyncIO *IO)
 	}
 
 	RemoveContext(Msg->IO.CitContext);
-	if (Msg->IDestructQueItem)
-		RemoveQItem(Msg->MyQItem);
 	return eAbort;
 }
 
 eNextState Terminate(AsyncIO *IO)
 {
 	SmtpOutMsg *Msg = IO->Data;
+
+	if (Msg->IDestructQueItem)
+		RemoveQItem(Msg->MyQItem);
+
 	DeleteSmtpOutMsg(Msg);
 	return eAbort;
 }