X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpeventclient.c;fp=citadel%2Fmodules%2Fsmtp%2Fserv_smtpeventclient.c;h=d70e80a3f4e7e217677d587771dbcb089537f31e;hp=f1901a99641401b044cda0f74451c7b3b7c08fcd;hb=c1c91208257a253e65275545aea79bba4699ba09;hpb=8d8541b74ae9c251f8f7b36b22377b440dc272fd

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index f1901a996..d70e80a3f 100644
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -587,8 +587,10 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem,
 	if (KeepMsgText) Msg->msgtext = MsgText;
 	else		 Msg->msgtext = NewStrBufDup(MsgText);
 
-	if (smtp_resolve_recipients(Msg)) {
-
+	if (((!MyQItem->HaveRelay ||
+	      (MyQItem->URL != NULL)) &&
+	     smtp_resolve_recipients(Msg)))
+	{
 		safestrncpy(
 			((CitContext *)Msg->IO.CitContext)->cs_host,
 			Msg->node,
@@ -619,8 +621,9 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem,
 		/* No recipients? well fail then. */
 		if (Msg->MyQEntry != NULL) {
 			Msg->MyQEntry->Status = 5;
-			StrBufPlain(Msg->MyQEntry->StatusMessage,
-				    HKEY("Invalid Recipient!"));
+			if (StrLength(Msg->MyQEntry->StatusMessage) == 0)
+				StrBufPlain(Msg->MyQEntry->StatusMessage,
+					    HKEY("Invalid Recipient!"));
 		}
 		FinalizeMessageSend_DB(&Msg->IO);
 		DeleteSmtpOutMsg(&Msg->IO);