2 files changed, 6 insertions, 0 deletions

diff --git a/qmail-send.9 b/qmail-send.9
index e5be479..3f01376 100644
--- a/qmail-send.9
+++ b/qmail-send.9
@@ -117,6 +117,10 @@ notice to
 (If that bounces,
 .B qmail-send
 gives up.)
+As a special case, if the first line of
+.IR doublebounceto
+is blank (contains a single linefeed), qmail-send will not queue
+the double-bounce at all.
 .TP 5
 .I envnoathost
 Presumed domain name for addresses without @ signs.
diff --git a/qmail-send.c b/qmail-send.c
index 685b08c..0baed66 100644
--- a/qmail-send.c
+++ b/qmail-send.c
@@ -690,6 +690,8 @@ unsigned long id;
   }
  if (str_equal(sender.s,"#@[]"))
    log3("triple bounce: discarding ",fn2.s,"\n");
+ else if (!*sender.s && *doublebounceto.s == '@')
+   log3("double bounce: discarding ",fn2.s,"\n");
  else
   {
    if (qmail_open(&qqt) == -1)