X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmsgbase.c;fp=citadel%2Fmsgbase.c;h=4c1bd70ed2bdb2fedc8c1579e5c3a0f313909798;hp=22b41b38fa4a23765563289885ab45858cafa316;hb=80172bd70dde62001e0779f39efd4ad9835788d9;hpb=60f03c2407f834ba677dfac9fe545db255ac8263

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 22b41b38f..4c1bd70ed 100644
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1521,14 +1521,15 @@ int check_cached_msglist(long msgnum) {
  * 
  */
 int CtdlOutputMsg(long msg_num,		/* message number (local) to fetch */
-		  int mode,		/* how would you like that message? */
-		  int headers_only,	/* eschew the message body? */
-		  int do_proto,		/* do Citadel protocol responses? */
-		  int crlf,		/* Use CRLF newlines instead of LF? */
-		  char *section, 	/* NULL or a message/rfc822 section */
-		  int flags,		/* various flags; see msgbase.h */
-		  char **Author,
-		  char **Address
+		int mode,		/* how would you like that message? */
+		int headers_only,	/* eschew the message body? */
+		int do_proto,		/* do Citadel protocol responses? */
+		int crlf,		/* Use CRLF newlines instead of LF? */
+		char *section,	 	/* NULL or a message/rfc822 section */
+		int flags,		/* various flags; see msgbase.h */
+		char **Author,
+		char **Address,
+		char **MessageID
 ) {
 	struct CitContext *CCC = CC;
 	struct CtdlMessage *TheMessage = NULL;
@@ -1616,6 +1617,11 @@ int CtdlOutputMsg(long msg_num,		/* message number (local) to fetch */
 			long len;
 			CM_GetAsField(TheMessage, erFc822Addr, Address, &len);
 		}
+		if ((MessageID != NULL) && (*MessageID == NULL))
+		{	
+			long len;
+			CM_GetAsField(TheMessage, emessageId, MessageID, &len);
+		}
 		CM_Free(TheMessage);
 		TheMessage = NULL;
 
@@ -1655,6 +1661,11 @@ int CtdlOutputMsg(long msg_num,		/* message number (local) to fetch */
 		long len;
 		CM_GetAsField(TheMessage, erFc822Addr, Address, &len);
 	}
+	if ((MessageID != NULL) && (*MessageID == NULL))
+	{	
+		long len;
+		CM_GetAsField(TheMessage, emessageId, MessageID, &len);
+	}
 
 	CM_Free(TheMessage);