X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsmtpqueue.c;h=8bf02a7f60f8cb752d5aee22a2528e1fe3b74885;hb=f77abc65a2ec7e662ac383a9fc3a9739d1142b2d;hp=fc95a0dc6e0c5073dfc52b61d52ff40d9b1fa96e;hpb=4b49575b46e9726cc7f629c935bf4e110361d01c;p=citadel.git

diff --git a/webcit/smtpqueue.c b/webcit/smtpqueue.c
index fc95a0dc6..8bf02a7f6 100644
--- a/webcit/smtpqueue.c
+++ b/webcit/smtpqueue.c
@@ -250,6 +250,7 @@ void QItem_Handle_SenderRoom(OneQueItem *Item, StrBuf *Line, const char **Pos)
 
 void QItem_Handle_Recipient(OneQueItem *Item, StrBuf *Line, const char **Pos)
 {
+	const char *pch;
 	if (Item->Current == NULL)
 		NewMailQEntry(Item);
 	if (Item->Current->Recipient == NULL)
@@ -257,6 +258,18 @@ void QItem_Handle_Recipient(OneQueItem *Item, StrBuf *Line, const char **Pos)
 	StrBufExtract_NextToken(Item->Current->Recipient, Line, Pos, '|');
 	Item->Current->Status = StrBufExtractNext_int(Line, Pos, '|');
 	StrBufExtract_NextToken(Item->Current->StatusMessage, Line, Pos, '|');
+
+	pch = ChrPtr(Item->Current->StatusMessage);
+	while ((pch != NULL) && (*pch != '\0')) {
+		pch = strchr(pch, ';');
+		if (pch != NULL) {
+			pch ++;
+			if (*pch == ' ') {
+				StrBufPeek(Item->Current->StatusMessage,
+					   pch, -1, '\n');
+			}
+		}
+	}
 	Item->Current = NULL; // TODO: is this always right?
 }