X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtp.c;h=6bbe6471889c84e42f71f78d084602f0f8f049da;hb=68024dbc1b04d5fc7422f5c67640475065e72399;hp=f212256711b8b67f566ba3cadd8befbc4f05a0e0;hpb=07ebf1e2e622321c65fc0222a982c8b80a8cb08f;p=citadel.git

diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c
index f21225671..6bbe64718 100644
--- a/citadel/modules/smtp/serv_smtp.c
+++ b/citadel/modules/smtp/serv_smtp.c
@@ -1742,9 +1742,9 @@ void *smtp_do_queue(void *arg) {
 	int num_processed = 0;
 	struct CitContext smtp_queue_CC;
 
+	CtdlFillSystemContext(&smtp_queue_CC, "SMTP Send");
 	CtdlLogPrintf(CTDL_INFO, "SMTP client: processing outbound queue\n");
 
-	CtdlFillSystemContext(&smtp_queue_CC, "SMTP Send");
 	citthread_setspecific(MyConKey, (void *)&smtp_queue_CC );
 
 	if (CtdlGetRoom(&CC->room, SMTP_SPOOLOUT_ROOM) != 0) {
@@ -1756,6 +1756,8 @@ void *smtp_do_queue(void *arg) {
 
 	citthread_mutex_unlock (&smtp_send_lock);
 	CtdlLogPrintf(CTDL_INFO, "SMTP client: queue run completed; %d messages processed\n", num_processed);
+
+	CtdlClearSystemContext();
 	return(NULL);
 }