X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fimap%2Fimap_fetch.c;fp=citadel%2Fmodules%2Fimap%2Fimap_fetch.c;h=293fecca019eec5c160b7c7531a63cfd4c32f818;hb=5ac2920028e92a453c686c799327d7a66b3e7b49;hp=91cb398323268b149f82a3ead81abb0026adf31e;hpb=f59e2e6772d87d323d065f09919ec0876bf2e0be;p=citadel.git

diff --git a/citadel/modules/imap/imap_fetch.c b/citadel/modules/imap/imap_fetch.c
index 91cb39832..293fecca0 100644
--- a/citadel/modules/imap/imap_fetch.c
+++ b/citadel/modules/imap/imap_fetch.c
@@ -2,7 +2,7 @@
  * Implements the FETCH command in IMAP.
  * This is a good example of the protocol's gratuitous complexity.
  *
- * Copyright (c) 2001-2017 by the citadel.org team
+ * Copyright (c) 2001-2020 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -347,19 +347,14 @@ void imap_output_envelope_from(struct CtdlMessage *msg) {
 
 	if (!CM_IsEmpty(msg, erFc822Addr)) {
 		process_rfc822_addr(msg->cm_fields[erFc822Addr], user, node, name);
-		IPutStr(user, strlen(user));		/* mailbox name (user id) */
+		IPutStr(user, strlen(user));			/* mailbox name (user id) */
 		IAPuts(" ");
-		if (!strcasecmp(node, CtdlGetConfigStr("c_nodename"))) {
-			IPutStr(CtdlGetConfigStr("c_fqdn"), strlen(CtdlGetConfigStr("c_fqdn")));
-		}
-		else {
-			IPutStr(node, strlen(node));		/* host name */
-		}
+		IPutStr(node, strlen(node));			/* host name */
 	}
 	else {
-		IPutMsgField(eAuthor); /* mailbox name (user id) */
+		IPutMsgField(eAuthor);				/* Make up a synthetic address */
 		IAPuts(" ");
-		IPutMsgField(eNodeName);	/* host name */
+		IPutStr(CtdlGetConfigStr("c_fqdn"), strlen(CtdlGetConfigStr("c_fqdn")));
 	}
 	
 	IAPuts(")) "); /* close double-parens */