diff --git a/ChangeLog b/ChangeLog
index b3da9627..f04febd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -62,6 +62,7 @@ v0.35.03	06-Jul-2002
 		There are people using M$ wordprocessors to create TIC files,
 		there is now better filtering to get that garbage out of the
 		received tic files. We will forward plain ascii of course.
+		Fixed the outbound queue to send to nodes not in the setup.
 
 	newuser:
 		Check for Unix accounts is now case sensitive.
diff --git a/mbfido/mbfido.c b/mbfido/mbfido.c
index 639f5869..64f9b609 100644
--- a/mbfido/mbfido.c
+++ b/mbfido/mbfido.c
@@ -90,6 +90,7 @@ int	do_learn   = FALSE;		/* News articles learnmode	    */
 int	check_crc  = TRUE;		/* Check .tic crc values	    */
 int	check_dupe = TRUE;		/* Check duplicates		    */
 int	do_flush   = FALSE;		/* Flush outbound queue		    */
+int	flushed    = FALSE;		/* If anything was flushed	    */
 extern	int do_quiet;			/* Quiet flag			    */
 extern	int e_pid;			/* Pid of child process		    */
 extern	int show_log;			/* Show logging on screen	    */
@@ -215,7 +216,7 @@ void die(int onsig)
     if (echo_imp + net_imp + net_out + echo_out)
 	CreateSema((char *)"msglink");
 
-    if (echo_out + net_out + tic_out)
+    if ((echo_out + net_out + tic_out) || flushed)
 	CreateSema((char *)"scanout");
 
     if (tic_imp)
diff --git a/mbfido/queue.c b/mbfido/queue.c
index e4bcc293..03d2987a 100644
--- a/mbfido/queue.c
+++ b/mbfido/queue.c
@@ -48,6 +48,8 @@ static char *dow[] = {(char *)"su", (char *)"mo", (char *)"tu", (char *)"we",
 
 
 extern	int	do_quiet;
+extern	int	flushed;
+
 
 
 /*
@@ -98,11 +100,16 @@ void flush_dir(char *ndir)
     sprintf(nodenr.domain, "%s", noden.domain);
 
     if (!SearchNode(nodenr)) {
-	WriteError("Downlink %s not found", aka2str(nodenr));
-	if (noden.domain)
-	    free(noden.domain);
-	free(temp);
-	return;
+	/*
+	 * Node not known, blank noderecord and fill in some details
+	 * so that we are able to send mail crash or immediate.
+	 */
+	Syslog('+', "Node %s not in setup, using default settings", aka2str(nodenr));
+	memset(&nodes, 0, sizeof(nodes));
+	nodes.Aka[0].zone  = noden.zone;
+	nodes.Aka[0].net   = noden.net;
+	nodes.Aka[0].node  = noden.node;
+	nodes.Aka[0].point = noden.point;
     }
 
     /*
@@ -351,6 +358,7 @@ void flush_dir(char *ndir)
 		fflush(stdout);
 	    }
 	    first = FALSE;
+	    flushed = TRUE;
 	}
 
 	if (execute(archiver.marc, arcfile, fname, (char *)"/dev/null", (char *)"/dev/null", (char *)"/dev/null") == 0) {
@@ -419,6 +427,7 @@ void flush_dir(char *ndir)
 		fflush(stdout);
 	    }
 	    first = FALSE;
+	    flushed = TRUE;
 	}
 
 	sprintf(pktfile, "%s/%s", temp, fname);
@@ -500,6 +509,7 @@ void flush_dir(char *ndir)
 	if (!do_quiet) {
 	    printf("\rAdding files for %s                        ", ascfnode(&noden, 0x1f));
 	    fflush(stdout);
+	    flushed = TRUE;
 	}
 
 	buf = calloc(PATH_MAX + 1, sizeof(char));