diff -u -r -p mlmmj-1.2.15/TUNABLES mlmmj.bounceaddr/TUNABLES
--- mlmmj-1.2.15/TUNABLES	Sat Mar  3 18:21:58 2007
+++ mlmmj.bounceaddr/TUNABLES	Sat Feb 23 01:49:08 2008
@@ -192,3 +192,8 @@ to specify several entries (one pr. line
 
    If this is set, no reject notifications caused by violation of maxmailsize
    will be sent.
+
+ · staticbounceaddr      	(normal)
+
+   If this is set, the bounce address (Return-Path:) will be fixed      
+   to this address in case you need to disable automatic bounce handling.
diff -u -r -p mlmmj-1.2.15/src/mlmmj-send.c mlmmj.bounceaddr/src/mlmmj-send.c
--- mlmmj-1.2.15/src/mlmmj-send.c	Wed Dec  6 14:19:10 2006
+++ mlmmj.bounceaddr/src/mlmmj-send.c	Sat Feb 23 01:41:21 2008
@@ -102,12 +102,19 @@ char *get_index_from_filename(const char
 }
 
 char *bounce_from_adr(const char *recipient, const char *listadr,
-		      const char *listdelim, const char *mailfilename)
+		      const char *listdelim, const char *mailfilename,
+		      const char *listdir)
 {
 	char *bounceaddr, *myrecipient, *mylistadr, *mylistdelim;
 	char *indexstr, *listdomain, *a = NULL, *mymailfilename;
+	char *staticbounceaddr;
 	size_t len;
 
+	staticbounceaddr = ctrlvalue(listdir, "staticbounceaddr");
+	if (staticbounceaddr) {
+		return staticbounceaddr;
+	}
+
 	mymailfilename = mystrdup(mailfilename);
 	if (!mymailfilename) {
 		return NULL;
@@ -629,7 +636,7 @@ int send_mail_many_list(int sockfd, cons
 					    hdrs, hdrslen, body, bodylen);
 		} else {
 			bounceaddr = bounce_from_adr(addr, listaddr, listdelim,
-						     archivefilename);
+						     archivefilename, listdir);
 			res = send_mail(sockfd, bounceaddr, addr, replyto,
 				  mailmap, mailsize, listdir, mlmmjbounce,
 				  hdrs, hdrslen, body, bodylen);
@@ -929,7 +936,7 @@ int main(int argc, char **argv)
 		deletewhensent = 0;
 		archivefilename = mystrdup(mailfilename);
 		bounceaddr = bounce_from_adr(to_addr, listaddr, listdelim,
-						archivefilename);
+						archivefilename, listdir);
 		break;
 	default: /* normal list mail -- now handled when forking */
 		addtohdr = statctrl(listdir, "addtohdr");


