diff -urN smeserver-mailsorting-1.2.orig/root/etc/e-smith/templates-user/.procmailrc/40global smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.procmailrc/40global
--- smeserver-mailsorting-1.2.orig/root/etc/e-smith/templates-user/.procmailrc/40global	2009-06-12 21:53:52.000000000 +1000
+++ smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.procmailrc/40global	2009-06-12 22:01:25.000000000 +1000
@@ -33,8 +33,12 @@
         my $copy       = db_get_prop(\%processmail, $pmGlobRule, "copy")       || '';
         my $action     = db_get_prop(\%processmail, $pmGlobRule, "action")     || '';
         my $action2    = db_get_prop(\%processmail, $pmGlobRule, "action2")    || '';
-        $deliver       =~ s/ /\\ /g;
-        $deliver2      =~ s/ /\\ /g;
+
+        unless (($zarafa1 eq 'enabled') || ($zarafa2 eq 'enabled'))
+        { 
+          $deliver       =~ s/ /\\ /g;
+          $deliver2      =~ s/ /\\ /g;
+        }
 
         foreach ($basis, $basis2)
         {
diff -urN smeserver-mailsorting-1.2.orig/root/etc/e-smith/templates-user/.procmailrc/60user smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.procmailrc/60user
--- smeserver-mailsorting-1.2.orig/root/etc/e-smith/templates-user/.procmailrc/60user	2009-06-12 21:53:52.000000000 +1000
+++ smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.procmailrc/60user	2009-06-12 22:01:48.000000000 +1000
@@ -33,9 +33,13 @@
         my $copy       = db_get_prop(\%processmail, $pmRule, "copy")       || '';
         my $action     = db_get_prop(\%processmail, $pmRule, "action")     || '';
         my $action2    = db_get_prop(\%processmail, $pmRule, "action2")    || '';
+
         #allow for spaces _ to \_
-	$deliver       =~ s/ /\\ /g;
-        $deliver2      =~ s/ /\\ /g;
+        unless (($zarafa1 eq 'enabled') || ($zarafa2 eq 'enabled'))
+        { 
+          $deliver       =~ s/ /\\ /g;
+          $deliver2      =~ s/ /\\ /g;
+        }
 
         foreach ($basis, $basis2)
         {