From 5ae4b967b24efce2337688834a5b866e7313bb07 Mon Sep 17 00:00:00 2001
From: Michiel Broek <mbse@mbse.eu>
Date: Thu, 2 Jan 2003 20:09:06 +0000
Subject: [PATCH] Fixed a problem with out-of zone echomail

---
 ChangeLog        | 3 +++
 mbfido/tosspkt.c | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cfb7691c..289ee7d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -44,6 +44,9 @@ v0.37.00	26-Dec-2002.
 		Move old files to another area failed, only the symbolic link
 		was moved.
 
+	mbfido:
+		Echomail from other zones showed the address of your own zone.
+
 	mbsetup:
 		Removed global flags No-IBN, IFC and ITN from the setup.
 		Removed nodes flags No-IBN, IFC and ITN from the setup.
diff --git a/mbfido/tosspkt.c b/mbfido/tosspkt.c
index bf5ad249..281b642d 100644
--- a/mbfido/tosspkt.c
+++ b/mbfido/tosspkt.c
@@ -236,8 +236,10 @@ int importmsg(faddr *p_from, faddr *f, faddr *t, char *orig, char *subj, time_t
     } /* end of checking kludges */
 
     if (echomail) {
-	f->zone = p_from->zone;
-	t->zone = tzone;
+	if (!f->zone)
+	    f->zone = p_from->zone;
+	if (!t->zone)
+	    t->zone = tzone;
 	rc = postecho(p_from, f, t, orig, subj, mdate, flags, cost, fp, TRUE);
     } else
 	rc = postnetmail(fp, f, t, orig, subj, mdate, flags, TRUE, p_from->zone, tzone);