From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sun, 17 Feb 2013 22:41:54 +0000 (+0100)
Subject: ML: remove cludge to set the reply-to from the original mail recipiient; we may now... 
X-Git-Tag: v8.20~97
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=ebef395a9cb568444adc0ed4d8239b58db4d6420

ML: remove cludge to set the reply-to from the original mail recipiient; we may now use our new config value or the default room name.
---

diff --git a/citadel/modules/network/serv_netmail.c b/citadel/modules/network/serv_netmail.c
index dac000efc..733a6ae37 100644
--- a/citadel/modules/network/serv_netmail.c
+++ b/citadel/modules/network/serv_netmail.c
@@ -320,25 +320,8 @@ void network_process_list(SpoolControl *sc, struct CtdlMessage *omsg, long *dele
 
 	msg = CtdlDuplicateMessage(omsg);
 
-	if (msg->cm_fields['K'] != NULL)
-		free(msg->cm_fields['K']);
-	if (msg->cm_fields['V'] == NULL){
-		/* local message, no enVelope */
-		StrBuf *Buf;
-		Buf = NewStrBuf();
-		StrBufAppendBufPlain(Buf,
-				     msg->cm_fields['O']
-				     , -1, 0);
-		StrBufAppendBufPlain(Buf, HKEY("@"), 0);
-		StrBufAppendBufPlain(Buf, config.c_fqdn, -1, 0);
-
-		msg->cm_fields['K'] = SmashStrBuf(&Buf);
-	}
-	else {
-		msg->cm_fields['K'] =
-			strdup (msg->cm_fields['V']);
-	}
 
+	CtdlMsgSetCM_Fields(msg, 'K', SKEY(sc->Users[roommailalias]));
 	CtdlMsgSetCM_Fields(msg, 'F', SKEY(sc->Users[roommailalias]));
 
 	/* if there is no other recipient, Set the recipient