diff -urN smeserver-mailsorting-1.2.orig/root/etc/e-smith/templates-user/.mailfilter/00setup smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.mailfilter/00setup
--- smeserver-mailsorting-1.2.orig/root/etc/e-smith/templates-user/.mailfilter/00setup	1970-01-01 10:00:00.000000000 +1000
+++ smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.mailfilter/00setup	2009-03-22 19:53:56.000000000 +1100
@@ -0,0 +1,16 @@
+{
+    # vim: ft=perl:
+
+    use esmith::AccountsDB;
+    our $adb = esmith::AccountsDB->open_ro or die "Couldn't open AccountsDB";
+
+    $user = $adb->get($USERNAME) or die "No user $USERNAME in AccountsDB";
+    %props = $user->props;
+
+    our $zarafa1 = $props{zarafa} || 'disabled1';
+    our $zarafa2 = ${'zarafa-server'}{GlobalForward} || 'disabled2';
+    our $EmailForward = $props{EmailForward}  || '';
+    our $ForwardAddress = $props{ForwardAddress}  || '';
+
+    $OUT = '';
+}
diff -urN smeserver-mailsorting-1.2.orig/root/etc/e-smith/templates-user/.mailfilter/90default smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.mailfilter/90default
--- smeserver-mailsorting-1.2.orig/root/etc/e-smith/templates-user/.mailfilter/90default	2009-03-22 18:45:23.000000000 +1100
+++ smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.mailfilter/90default	2009-03-22 19:34:40.000000000 +1100
@@ -1,5 +1,36 @@
 {
+  if ($qmail{FilterOrder})
+  {
+
+    # honour EmailForward
+    my $EmailForward = $props{EmailForward}  || '';
+    my $ForwardAddress = $props{ForwardAddress}  || '';
+
+    if ($EmailForward eq 'forward')
+    {
+      $OUT .= "\n";
+      $OUT .= "log \"--- forward mail ---------------- \"\n";
+      $OUT .= "to \"!$ForwardAddress\"";
+    }
+    elsif ($EmailForward eq 'both')
+    {
+      $OUT .= "\n";
+      $OUT .= "log \"--- to the inbox and forward ----- \"\n";
+      $OUT .= "cc Maildir\n";
+      $OUT .= "to \"!$ForwardAddress\"";
+    }
+    else
+    {
+      $OUT .= "\n";
+      $OUT .= "log \"--- to the inbox ----------------- \"\n";
+      $OUT .= "to Maildir";
+    }
+
+  }
+  else
+  {
       $OUT .= "\n";
       $OUT .= "log \"--- to the inbox ----------------- \"\n";
-      $OUT .= "to Maildir\n";
+      $OUT .= "to Maildir\n";
+  }
 }
diff -urN smeserver-mailsorting-1.2.orig/root/etc/e-smith/templates-user/.procmailrc/00setup smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.procmailrc/00setup
--- smeserver-mailsorting-1.2.orig/root/etc/e-smith/templates-user/.procmailrc/00setup	2009-03-22 18:45:23.000000000 +1100
+++ smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.procmailrc/00setup	2009-03-22 19:34:40.000000000 +1100
@@ -9,6 +9,8 @@
 
     our $zarafa1 = $props{zarafa} || 'disabled1';
     our $zarafa2 = ${'zarafa-server'}{GlobalForward} || 'disabled2';
+    our $EmailForward = $props{EmailForward}  || '';
+    our $ForwardAddress = $props{ForwardAddress}  || '';
 
     $OUT = '';
 }
diff -urN smeserver-mailsorting-1.2.orig/root/etc/e-smith/templates-user/.qmail/50Filter smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.qmail/50Filter
--- smeserver-mailsorting-1.2.orig/root/etc/e-smith/templates-user/.qmail/50Filter	1970-01-01 10:00:00.000000000 +1000
+++ smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.qmail/50Filter	2009-03-22 19:34:40.000000000 +1100
@@ -0,0 +1,29 @@
+{
+  if ($qmail{FilterOrder})
+  {
+    if ($USERNAME)
+    {
+      return "# Procmail/Maildrop disabled for admin"
+        if ($USERNAME eq 'admin');
+    }
+
+    if ($props{MailFilter})
+    {
+      my $MailFilter = $props{MailFilter}  || 'on';
+
+      return '# Procmail/Maildrop disabled for this user'
+	    if ($MailFilter eq 'bypass');
+    }
+
+    if ($qmail{FilterType})
+    {
+      return '| /usr/bin/procmail ~/.procmailrc ; if [ $? -ne 0 ] ; then exit -1; else exit 99; fi;'
+	    if ($qmail{FilterType} eq 'procmail');
+
+      return '| /usr/bin/maildrop ; if [ $? -ne 0 ] ; then exit -1; else exit 99; fi;'
+	    if ($qmail{FilterType} eq 'maildrop' );
+    }
+
+    return '# Procmail/Maildrop disabled for all users'
+  }
+}
diff -urN smeserver-mailsorting-1.2.orig/root/etc/e-smith/templates-user/.qmail/76Filter smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.qmail/76Filter
--- smeserver-mailsorting-1.2.orig/root/etc/e-smith/templates-user/.qmail/76Filter	2009-03-22 18:45:23.000000000 +1100
+++ smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.qmail/76Filter	2009-03-22 19:34:40.000000000 +1100
@@ -1,4 +1,10 @@
 {
+  if ($qmail{FilterOrder})
+  {
+    return '# qmail FilterOrder enabled'
+  }
+  else
+  {
     if ($USERNAME)
     {
       return "# Procmail/Maildrop disabled for admin"
@@ -23,4 +29,5 @@
     }
 
     return '# Procmail/Maildrop disabled for all users'
+  }
 }