diff --git a/src/smblib/smblib.c b/src/smblib/smblib.c
index b12d59177b1159ab49d257090ec78e26cd8889a4..4c25378f59e9febe80d089e274ffa19ace739022 100644
--- a/src/smblib/smblib.c
+++ b/src/smblib/smblib.c
@@ -1,8 +1,5 @@
 /* Synchronet message base (SMB) library routines */
 
-/* $Id: smblib.c,v 1.209 2020/05/07 19:30:22 rswindell Exp $ */
-// vi: tabstop=4
-
 /****************************************************************************
  * @format.tab-size 4		(Plain Text/Source Code File Header)			*
  * @format.use-tabs true	(see http://www.synchro.net/ptsc_hdr.html)		*
@@ -16,21 +13,9 @@
  * See the GNU Lesser General Public License for more details: lgpl.txt or	*
  * http://www.fsf.org/copyleft/lesser.html									*
  *																			*
- * Anonymous FTP access to the most recent released source is available at	*
- * ftp://vert.synchro.net, ftp://cvs.synchro.net and ftp://ftp.synchro.net	*
- *																			*
- * Anonymous CVS access to the development source and modification history	*
- * is available at cvs.synchro.net:/cvsroot/sbbs, example:					*
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs login			*
- *     (just hit return, no password is necessary)							*
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs checkout src		*
- *																			*
  * For Synchronet coding style and modification guidelines, see				*
  * http://www.synchro.net/source.html										*
  *																			*
- * You are encouraged to submit any modifications (preferably in Unix diff	*
- * format) via e-mail to mods@synchro.net									*
- *																			*
  * Note: If this box doesn't appear square, then you need to fix your tabs.	*
  ****************************************************************************/
 
@@ -733,7 +718,9 @@ static void set_convenience_ptr(smbmsg_t* msg, uint16_t hfield_type, void* hfiel
 				break; 
 			}
 		case FORWARDED: 	/* fall through */
-			msg->forwarded=TRUE;
+			msg->forwarded = TRUE;
+			msg->to_ext = NULL;
+			memset(&msg->to_net, 0, sizeof(msg->to_net));
 			break;
 		case SENDERAGENT:
 			if(!msg->forwarded)