--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates-user/.qmail/80Zarafa.globalforward	2009-01-17 18:58:33.000000000 +1100
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates-user/.qmail/80Zarafa	2009-01-17 19:17:45.000000000 +1100
@@ -1,5 +1,6 @@
 {
    my $zarafa = $user->prop('zarafa') || 'disabled';
+   my $zarafa2 = ${'zarafa-server'}{GlobalForward} || 'disabled';
    return "| /usr/bin/zarafa-dagent -q $USERNAME ; if [ $? -ne 0 ] ; then exit -1; else exit 99; fi;"
-           if ($zarafa eq 'enabled');
+           if ($zarafa eq 'enabled' || $zarafa2 eq 'enabled');
 }