diff -urN smeserver-mailsorting-1.2.po/root/etc/e-smith/templates-user/.mailfilter/90default smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.mailfilter/90default
--- smeserver-mailsorting-1.2.po/root/etc/e-smith/templates-user/.mailfilter/90default	2005-09-23 11:50:36.000000000 +1000
+++ smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.mailfilter/90default	2008-09-29 21:47:26.000000000 +1000
@@ -1,41 +1,5 @@
 {
-    use esmith::config;
-    use esmith::db;
-
-    my %accounts;
-    tie %accounts, 'esmith::config', '/home/e-smith/db/accounts';
-
-    # get $USERNAME from esmith::config
-    die "Username criterion missing." unless defined ($USERNAME);
-
-    my $type = db_get_type(\%accounts, $USERNAME);
-
-    die
-        "Account $USERNAME is not a user account; "
-        . "update email forwarding failed.\n"
-            unless $type eq 'user';
-
-    # honour EmailForward
-    my $EmailForward   = db_get_prop(\%accounts, $USERNAME, "EmailForward")   || '';
-    my $ForwardAddress = db_get_prop(\%accounts, $USERNAME, "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";
-    }
-}
\ No newline at end of file
+      $OUT .= "\n";
+      $OUT .= "log \"--- to the inbox ----------------- \"\n";
+      $OUT .= "to Maildir\n";
+}
diff -urN smeserver-mailsorting-1.2.po/root/etc/e-smith/templates-user/.procmailrc/90default smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.procmailrc/90default
--- smeserver-mailsorting-1.2.po/root/etc/e-smith/templates-user/.procmailrc/90default	2005-09-25 15:41:06.000000000 +1000
+++ smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.procmailrc/90default	2008-09-29 21:47:28.000000000 +1000
@@ -1,49 +1,8 @@
 {
-    use esmith::config;
-    use esmith::db;
-
-    my %accounts;
-    tie %accounts, 'esmith::config', '/home/e-smith/db/accounts';
-
-    # get $USERNAME from esmith::config
-    die "Username criterion missing." unless defined ($USERNAME);
-
-    my $type = db_get_type(\%accounts, $USERNAME);
-
-    die
-        "Account $USERNAME is not a user account; "
-        . "update email forwarding failed.\n"
-            unless $type eq 'user';
-
-    # use EmailForward
-    my $EmailForward   = db_get_prop(\%accounts, $USERNAME, "EmailForward")   || '';
-    my $ForwardAddress = db_get_prop(\%accounts, $USERNAME, "ForwardAddress") || '';
-
-    if ($EmailForward eq 'forward')
-    {
-      $OUT .= "\n";
-      $OUT .= "# ----  forward mail ------------------\n";
-      $OUT .= ":0\n";
-      $OUT .= "! $ForwardAddress\n";
-    }
-    elsif ($EmailForward eq 'both')
-    {
-      $OUT .= "\n";
-      $OUT .= "# ----  to the inbox and forward-------\n";
-      $OUT .= ":0 c\n";
-      $OUT .= "\$DEFAULT\n";
-      $OUT .= "\n";
-      $OUT .= ":0\n";
-      $OUT .= "! $ForwardAddress\n";
-    }
-    else
-    {
-      $OUT .= "\n";
-      $OUT .= "# ----  to the inbox------------------\n";
-      $OUT .= ":0\n";
-      $OUT .= "\$DEFAULT\n";
-    }
-
-      $OUT .= "\n";
-      $OUT .= "# ----  end of rules ------------------\n";
-}
\ No newline at end of file
+      $OUT .= "\n";
+      $OUT .= "# ----  to the inbox------------------\n";
+      $OUT .= ":0\n";
+      $OUT .= "\$DEFAULT\n";
+      $OUT .= "\n";
+      $OUT .= "# ----  end of rules ------------------\n";
+}