merge hickups. TBC.

diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c
index e0cc3280ba040a0c4f397c142339ab6721524a74..4518740bf1ac9d00754940659cfbe3070abb6f5b 100644 (file)
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.c
@@ -730,15 +730,6 @@ void network_spool_msg(long msgnum, void *userdata) {
                                free(msg->cm_fields['U']);
                                msg->cm_fields['U'] = pBuff;
                        }
-                       /* else we won't modify the buffer, since the roomname is already here. */
-
-                               rlen += len + 4;
-                               pBuff = malloc (rlen * sizeof(char));
-
-                               snprintf(pBuff, rlen, "[%s] %s", CC->room.QRname, msg->cm_fields['U']);
-                               free(msg->cm_fields['U']);
-                               msg->cm_fields['U'] = pBuff;
-                       }
                        /* else we won't modify the buffer, since the roomname is already here. */
 
                        /* if we don't already have a 'reply to' field, put our roomname in. */