diff --git a/ChangeLog b/ChangeLog
index 9722fbba..dd7b6699 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,10 @@ v0.83.0		06-Nov-2005
 		Fixed accepting connections with the chatserver when no
 		password is given.
 
+	mbaff:
+		Fixed announce and filefind report problem when there were "
+		characters in the description.
+
 	mbsetup:
 		In users edit screen, removed append record option.
 		Blocked changing the users unixname.
diff --git a/mbfido/announce.c b/mbfido/announce.c
index 4c18ae4f..ceebe689 100644
--- a/mbfido/announce.c
+++ b/mbfido/announce.c
@@ -268,6 +268,7 @@ int Report(gr_list *ta, int filepos)
 	    break;
     }
 
+	Syslog('m', "Announce %s %s %s", T_File.Echo, T_File.Name, T_File.LName);
     if ((fi = OpenMacro(newfiles.Template, newfiles.Language, FALSE)) != NULL) {
 	/*
 	 * Area block header
@@ -303,8 +304,6 @@ int Report(gr_list *ta, int filepos)
 	     * Extra description lines follow
 	     */
 	    for (i = 1; i < 24; i++) {
-//		if (strlen(T_File.LDesc[i]))
-//		    MacroVars("t", "s", To_Low(T_File.LDesc[i],newfiles.HiAscii));
 		fseek(fi, filepos2, SEEK_SET);
 		if (strlen(T_File.LDesc[i])) {
 		    MacroVars("t", "s", To_Low(T_File.LDesc[i],newfiles.HiAscii));
diff --git a/mbfido/msgutil.c b/mbfido/msgutil.c
index 25a187dc..8860bbb6 100644
--- a/mbfido/msgutil.c
+++ b/mbfido/msgutil.c
@@ -268,19 +268,27 @@ void CountPosted(char *Base)
 
 char *To_Low(char *inp, int High)
 {
-	static char	temp[81];
-	int		i;
+    static char	temp[81];
+    int		i;
 
-	memset(&temp, 0, sizeof(temp));
-	strncpy(temp, inp, 80);
+    memset(&temp, 0, sizeof(temp));
+    strncpy(temp, inp, 80);
 
-	if (High)
-		return temp;
-
-	for (i = 0; i < strlen(temp); i++)
-		temp[i] = lotab[temp[i] & 0xff];
+    /*
+     * Change " into ' because the diesel macro processor gets confused by
+     * the " characters.
+     */
+    for (i = 0; i < strlen(temp); i++)
+	if (temp[i] == '"')
+	    temp[i] = '\'';
 
+    if (High)
 	return temp;
+
+    for (i = 0; i < strlen(temp); i++)
+	temp[i] = lotab[temp[i] & 0xff];
+
+    return temp;
 }