2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index edb844f2..2520c10c 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@
 * Expunge edge case fix by Sunil Shetye.
 * Fixes for some odd IMAP and SMTP edge cases by Sunil Shetye.
 * UIDL bug fix by Matthias Andree.
+* Use smtpaddress, if present, to set the return path on warning mail.
 
 fetchmail-5.9.6 (Fri Dec 14 04:03:50 EST 2001), 21247 lines:
 
diff --git a/sink.c b/sink.c
index cbed595e..0951e9ca 100644
--- a/sink.c
+++ b/sink.c
@@ -1222,7 +1222,8 @@ int open_warning_by_mail(struct query *ctl, struct msgblk *msg)
     struct msgblk reply = {NULL, NULL, "FETCHMAIL-DAEMON@", 0};
     int status;
 
-    strcat(reply.return_path, fetchmailhost);
+    strcat(reply.return_path, ctl->smtpaddress ? ctl->smtpaddress :
+	    fetchmailhost);
 
     if (!MULTIDROP(ctl))		/* send to calling user */
     {