X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpeventclient.c;h=a2913bb9b23d57a2024c16f1c970c5572170cf95;hb=2d9cd5848ca3f4205cc86435e08c75cc98c391bf;hp=15a55e79960758b4237ccdbf1b209c9dc6fab30b;hpb=67a31b2b42fdbabd942ddf051c63c85809a7180b;p=citadel.git

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index 15a55e799..a2913bb9b 100644
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -158,6 +158,8 @@ void FinalizeMessageSend(SmtpOutMsg *Msg)
 
 		RemoveQItem(Msg->MyQItem);
 	}
+
+	RemoveContext(Msg->IO.CitContext);
 	DeleteSmtpOutMsg(Msg);
 }
 
@@ -450,9 +452,10 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem,
 	else 		 SendMsg->msgtext = NewStrBufDup(MsgText);
 	
 	if (smtp_resolve_recipients(SendMsg)) {
-
-		
-
+		CitContext *SubC;
+		SubC = CloneContext (CC);
+		SubC->session_specific_data = (char*) SendMsg;
+		SendMsg->IO.CitContext = SubC;
 
 		if (SendMsg->pCurrRelay == NULL)
 			QueueEventContext(&SendMsg->IO,