diff -urN mail_fwd/config_dist.php mail_fwd.olo/config_dist.php
--- mail_fwd/config_dist.php	2003-03-04 00:54:34.000000000 +0100
+++ mail_fwd.olo/config_dist.php	2003-12-05 12:41:39.000000000 +0100
@@ -11,6 +11,14 @@
 // $save_local_enabled = true;
 $save_local_enabled = false;
 
+// If defined, specifies static string that is an expression
+// defining delivery to local mailbox in Courier MTA (if local
+// saving is enabled).
+// Typically it's the path to the Maildir directory relative
+// to user's homedir:
+//global $local_delivery_expression;
+//$local_delivery_expression = "./Maildir";
+
 /// For forwarding stored in a MySQL table, use
 /// these settings:
 ///
diff -urN mail_fwd/functions.php mail_fwd.olo/functions.php
--- mail_fwd/functions.php	2003-03-28 01:51:32.000000000 +0100
+++ mail_fwd.olo/functions.php	2003-12-05 12:43:41.000000000 +0100
@@ -38,7 +38,7 @@
     }
     global $optmode;
     global $username, $data_dir;
-    global $mail_fwd_wfwd_binary, $save_local_enabled;
+    global $mail_fwd_wfwd_binary, $save_local_enabled, $local_delivery_expression;
     global $mysql_forwarding_enabled, $mysql_server, $mysql_manager_id,
            $mysql_manager_pwd, $mysql_database, $mysql_table, 
            $mysql_userid_field, $mysql_forward_field;
@@ -62,7 +62,11 @@
 
         if( $save_local_enabled && isset($_POST['mfwd_local']) ) {
             if ( ctype_print($email) ) {
-                $email = "\\".$username." ".$email;
+                if ( isset($local_delivery_expression) ) {
+                  $email = "\\".$local_delivery_expression." ".$email;
+                } else {
+                  $email = "\\".$username." ".$email;
+                }
             }
         }
 
diff -urN mail_fwd/fwdfile/config.mk mail_fwd.olo/fwdfile/config.mk
--- mail_fwd/fwdfile/config.mk	2002-10-19 14:11:41.000000000 +0200
+++ mail_fwd.olo/fwdfile/config.mk	2003-12-05 12:45:25.000000000 +0100
@@ -13,6 +13,12 @@
 # Change this to the user your webserver run as.
 WEBUSER = apache
 
+# The name of file which contains forwarding instructions
+# typical valies include .forward for sendmail-compatible MTA-s
+# and .courier for Courier MTA.
+#FWFILE = .courier
+FWFILE = .forward
+
 ## Compile time flags
 LIBDIR =
 CFLAGS = -g
@@ -22,4 +28,4 @@
 # XTRA_CC_FLAGS = -traditional-cpp
 
 # REMOVE THIS after you've changed WEBUSER to the right value
-REMOVE_THIS=YES
+#REMOVE_THIS=YES
diff -urN mail_fwd/fwdfile/Makefile mail_fwd.olo/fwdfile/Makefile
--- mail_fwd/fwdfile/Makefile	2002-10-15 21:39:28.000000000 +0200
+++ mail_fwd.olo/fwdfile/Makefile	2003-12-05 12:03:42.000000000 +0100
@@ -28,5 +28,5 @@
 ifeq ($(REMOVE_THIS),YES)
 	@echo $(ERRORMSG)
 else
-	$(CC) $(XTRA_CC_FLAGS) -c $(CFLAGS) $(RESTRICTUSE) -D WEBUSER=\"$(WEBUSER)\" wfwd.c
+	$(CC) $(XTRA_CC_FLAGS) -c $(CFLAGS) $(RESTRICTUSE) -D WEBUSER=\"$(WEBUSER)\" -D FWFILE=\"$(FWFILE)\" wfwd.c
 endif
diff -urN mail_fwd/fwdfile/wfwd.c mail_fwd.olo/fwdfile/wfwd.c
--- mail_fwd/fwdfile/wfwd.c	2002-10-19 13:58:26.000000000 +0200
+++ mail_fwd.olo/fwdfile/wfwd.c	2003-12-05 12:06:38.000000000 +0100
@@ -1,7 +1,7 @@
 /*
  * wfwd.c
  *
- * Writes .forward file for email forwarding
+ * Writes .forward (or any other defined in config.mk) file for email forwarding
  *
  * Original author Ritchie Low
  *
@@ -78,7 +78,7 @@
 	}
 
 	/* get filename to molest */
-	if (snprintf(filename, BUFFER-1, "%s/.forward", path) == -1) {
+	if (snprintf(filename, BUFFER-1, "%s/%s", path, FWFILE) == -1) {
 		fprintf(stderr, "%s: path too long.\n", argv[0]);
 		exit(1);
 	}
@@ -86,8 +86,8 @@
 	/* is somebody attempting to screw around with us? */
 	if (lstat(filename, &st) == 0) {
 		if (!S_ISREG(st.st_mode)) {
-			fprintf(stderr, "%s: .forward is not a regular file.\n",
-			        argv[0]);
+			fprintf(stderr, "%s: %s is not a regular file.\n",
+			        argv[0], FWFILE);
 			exit(1);
 		}
 	}