ML: remove cludge to set the reply-to from the original mail recipiient; we may now...

diff --git a/citadel/modules/network/serv_netmail.c b/citadel/modules/network/serv_netmail.c
index dac000efc8527477b2cc6b0185f1ccd2c75f70b3..733a6ae37db66ac141972ae6dd47b3b33a994af1 100644 (file)
--- 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