--- smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-services.services2	2008-12-20 20:02:07.000000000 +1100
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-services	2008-12-20 20:02:34.000000000 +1100
@@ -4,6 +4,6 @@
 /etc/rc.d/init.d/zarafa-ical $1
 /etc/rc.d/init.d/zarafa-licensed $1
 /etc/rc.d/init.d/zarafa-monitor $1
-/etc/rc.d/init.d/zarafa-spooler $1
 /etc/rc.d/init.d/zarafa-server $1
+/etc/rc.d/init.d/zarafa-spooler $1
 
--- smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-install.services2	2008-12-20 20:05:13.000000000 +1100
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-install	2008-12-20 20:07:17.000000000 +1100
@@ -3,6 +3,9 @@
 /bin/echo "initialize-default-databases"
 /etc/e-smith/events/actions/initialize-default-databases
 
+/bin/echo "set users to use zarafa"
+/etc/e-smith/events/actions/qmail-update-user 
+
 /bin/echo "reassign and disable sme gateway ports"
 /sbin/e-smith/config setprop pop3 TCPPort 8110 
 /sbin/e-smith/config setprop pop3s TCPPort 8995 
--- smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-services-stop.services	2008-12-20 18:24:21.000000000 +1100
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-services-stop	2008-12-20 18:31:41.000000000 +1100
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+/etc/rc.d/init.d/zarafa-gateway stop
+/etc/rc.d/init.d/zarafa-ical stop
+/etc/rc.d/init.d/zarafa-licensed stop
+/etc/rc.d/init.d/zarafa-monitor stop
+/etc/rc.d/init.d/zarafa-spooler stop
+/etc/rc.d/init.d/zarafa-server stop
--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates-user/.qmail-junkmail/00DeliverToZarafa.services	2008-12-20 19:12:26.000000000 +1100
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates-user/.qmail-junkmail/00DeliverToZarafa	2008-12-20 19:13:43.000000000 +1100
@@ -1,6 +1,13 @@
 {
-   my $zarafa = $user->prop('zarafa') || 'enabled';
-   return "| /usr/bin/zarafa-dagent -qj $USERNAME ; if [ $? -ne 0 ] ; then exit -1; else exit 99; fi;"
+    # vim: ft=perl:
+    die "USERNAME not set." unless defined ($USERNAME);
+
+    use esmith::AccountsDB;
+    $adb = esmith::AccountsDB->open_ro or die "Couldn't open AccountsDB";
+
+    $user = $adb->get($USERNAME) or die "No user $USERNAME in AccountsDB";
+
+    my $zarafa = $user->prop('zarafa') || 'enabled';
+    return "| /usr/bin/zarafa-dagent -qj $USERNAME ; if [ $? -ne 0 ] ; then exit -1; else exit 99; fi;"
            if ($zarafa eq 'enabled');
 }
-