diff --git a/ChangeLog b/ChangeLog
index 2ee8fbdc..074f14bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4694,6 +4694,8 @@ v0.33.20        10-Feb-2002
 		For points in echomail no seen-by entry is added.
 		The AreaMgr and FileMgr responses and notify messages now use
 		the diesel macro language.
+		The tic file forward function now uses only filenames in the
+		subject of the netmail messages without the path.
 
 	mball:
 		Will not crash anymore when it needs more then 10 minutes to
diff --git a/mbfido/forward.c b/mbfido/forward.c
index 0319dea9..c2fedc2f 100644
--- a/mbfido/forward.c
+++ b/mbfido/forward.c
@@ -47,7 +47,7 @@
 
 void ForwardFile(fidoaddr Node, fa_list *sbl)
 {
-	char		*subject = NULL, *temp, *fwdfile = NULL, *ticfile = NULL, fname[PATH_MAX];
+	char		*subject = NULL, *temp, *fwdfile = NULL, *ticfile = NULL, fname[PATH_MAX], *ticname;
 	FILE		*fp, *net;
 	char		flavor;
 	faddr		*dest, *route, *Fa;
@@ -93,10 +93,13 @@ void ForwardFile(fidoaddr Node, fa_list *sbl)
 	/*
 	 * Create the full filename
 	 */
-	if (TIC.SendOrg)
+	if (TIC.SendOrg) {
 		sprintf(fwdfile, "%s/%s", TIC.Inbound, TIC.RealName);
-	else
+		subject = xstrcpy(TIC.RealName);
+	} else {
 		sprintf(fwdfile, "%s/%s", TIC.BBSpath, TIC.NewName);
+		subject = xstrcpy(TIC.NewName);
+	}
 
 	flavor = 'f';
 	if (nodes.Crash) 
@@ -111,20 +114,20 @@ void ForwardFile(fidoaddr Node, fa_list *sbl)
 	dest = fido2faddr(Node);
 	attach(*route, fwdfile, LEAVE, flavor);
 
-	if (strlen(CFG.dospath))
-		subject = xstrcpy(Unix2Dos(fwdfile));
-	else
-		subject = xstrcpy(fwdfile);
+//	if (strlen(CFG.dospath))
+//		subject = xstrcpy(Unix2Dos(fwdfile));
+//	else
+//		subject = xstrcpy(fwdfile);
 
 	ticfile = calloc(PATH_MAX, sizeof(char));
+	ticname = calloc(15, sizeof(char));
 	if (nodes.Tic) {
-		sprintf(ticfile, "%s/%08lx.tic", CFG.ticout, sequencer());
+		sprintf(ticname, "%08lx.tic", sequencer());
 		subject = xstrcat(subject, (char *)" ");
-		if (strlen(CFG.dospath))
-			subject = xstrcat(subject, Unix2Dos(ticfile));
-		else
-			subject = xstrcat(subject, ticfile);
+		subject = xstrcat(subject, ticname);
+		sprintf(ticfile, "%s/%s", CFG.ticout, ticname);
 	}
+	free(ticname);
 
 	/*
 	 *  Send netmail message if the node has it turned on.