diff --git a/mbfido/announce.c b/mbfido/announce.c
index 317f0961..173a549d 100644
--- a/mbfido/announce.c
+++ b/mbfido/announce.c
@@ -285,6 +285,7 @@ long Report(gr_list *ta, long filepos)
     int		    i, Total = 0;
     unsigned long   Size = 0;
     long	    filepos1 = 0, filepos2, filepos3 = 0, finalpos = 0;
+    time_t	    ftime;
 
     temp = calloc(PATH_MAX, sizeof(char));
     sprintf(temp, "%s/etc/toberep.data", getenv("MBSE_ROOT"));
@@ -326,9 +327,18 @@ long Report(gr_list *ta, long filepos)
 	     * Report one newfile, first line.
 	     */
 	    fseek(fi, filepos1, SEEK_SET);
-	    MacroVars("slbkdt", "ssddss", T_File.Name, T_File.LName, T_File.Size, T_File.SizeKb, rfcdate(T_File.Fdate),
-				    To_Low(T_File.LDesc[0],newfiles.HiAscii));
+	Syslog('-', "1");
+	    ftime = T_File.Fdate;
+//	    MacroVars("slbkdt", "ssddss", T_File.Name, T_File.LName, T_File.Size, T_File.SizeKb, /* rfcdate(ftime) */ " ",
+	//			    To_Low(T_File.LDesc[0],newfiles.HiAscii));
+	MacroVars("sl", "ss", T_File.Name, T_File.LName);
+	Syslog('-', "2");
+	MacroVars("bk", "dd", T_File.Size, T_File.SizeKb);
+	Syslog('-', "3");
+	MacroVars("dt", "ss", rfcdate(ftime), To_Low(T_File.LDesc[0],newfiles.HiAscii));
+	Syslog('-', "4");
 	    Msg_Macro(fi);
+	Syslog('-', "5");
 	    filepos2 = ftell(fi);
 	    /*
 	     * Extra description lines follow
diff --git a/mbfido/forward.c b/mbfido/forward.c
index 20ff8fe5..19f3e093 100644
--- a/mbfido/forward.c
+++ b/mbfido/forward.c
@@ -53,7 +53,7 @@ void ForwardFile(fidoaddr Node, fa_list *sbl)
 	char		flavor;
 	faddr		*dest, *route, *Fa;
 	int		i, z, n;
-	time_t		now;
+	time_t		now, ftime;
 	fa_list		*tmp;
 
 	if (!SearchNode(Node)) {
@@ -135,10 +135,17 @@ void ForwardFile(fidoaddr Node, fa_list *sbl)
 	if (nodes.Message) {
 	    if ((net = SendMgrMail(fido2faddr(Node), CFG.ct_KeepMgr, TRUE, (char *)"Filemgr", subject, NULL)) != NULL) {
 		if ((fi = OpenMacro("forward.tic", nodes.Language, FALSE)) != NULL) {
-		    MacroVars("abcdfghijmns", "ssdssddsssss", TIC.TicIn.Area, tic.Comment, TIC.FileCost, fgroup.Comment,
-							    TIC.TicIn.FullName, TIC.FileSize, TIC.FileSize / 1024, 
-							    TIC.TicIn.Crc, TIC.TicIn.Origin, rfcdate(TIC.FileDate), 
-							    TIC.TicIn.Desc, nodes.Sysop);
+		    ftime = TIC.FileDate;
+		    MacroVars("ab", "ss", TIC.TicIn.Area, tic.Comment);
+		    MacroVars("cd", "ds", TIC.FileCost, fgroup.Comment);
+		    MacroVars("fg", "sd", TIC.TicIn.FullName, TIC.FileSize);
+		    MacroVars("hi", "ds", TIC.FileSize / 1024, TIC.TicIn.Crc);
+		    MacroVars("jm", "ss", TIC.TicIn.Origin, rfcdate(ftime));
+		    MacroVars("ns", "ss", TIC.TicIn.Desc, nodes.Sysop);
+//		    MacroVars("abcdfghijmns", "ssdssddsssss", TIC.TicIn.Area, tic.Comment, TIC.FileCost, fgroup.Comment,
+//							    TIC.TicIn.FullName, TIC.FileSize, TIC.FileSize / 1024, 
+//							    TIC.TicIn.Crc, TIC.TicIn.Origin, rfcdate(ftime), 
+//							    TIC.TicIn.Desc, nodes.Sysop);
 		    if (TIC.SendOrg)
 			MacroVars("e", "s", TIC.RealName);
 		    else
diff --git a/mbfido/tic.c b/mbfido/tic.c
index d24a7a24..05f95e3d 100644
--- a/mbfido/tic.c
+++ b/mbfido/tic.c
@@ -179,7 +179,8 @@ int LoadTic(char *inb, char *tfn)
 	memset(&T_File, 0, sizeof(T_File));
 
 	sprintf(TIC.Inbound, "%s", inb);
-	strncpy(TIC.TicName, tfn, 12);
+//	strncpy(TIC.TicName, tfn, 12);
+	sprintf(TIC.TicName, "%s", tfn);
 
 	chdir(inb);
 	if ((tfp = fopen(tfn, "r")) == NULL) {