--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates-user/.qmail/80Zarafa.userprop	2008-12-20 17:27:42.000000000 +1100
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates-user/.qmail/80Zarafa	2008-12-20 17:28:21.000000000 +1100
@@ -1,5 +1,5 @@
 {
-   my $zarafa = $user->prop('zarafa') || 'disabled';
+   my $zarafa = $user->prop('zarafa') || 'enabled';
    return "| /usr/bin/zarafa-dagent -q $USERNAME ; if [ $? -ne 0 ] ; then exit -1; else exit 99; fi;"
            if ($zarafa eq 'enabled');
 }
--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates-user/.qmail-junkmail/00DeliverToZarafa.userprop	2008-12-20 17:46:53.000000000 +1100
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates-user/.qmail-junkmail/00DeliverToZarafa	2008-12-20 17:40:19.000000000 +1100
@@ -0,0 +1,6 @@
+{
+   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');
+}
+
--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/server.cfg/server.cfg.userprop	2008-12-20 17:51:40.000000000 +1100
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/server.cfg/server.cfg	2008-12-20 17:54:03.000000000 +1100
@@ -10,7 +10,7 @@
 server_tcp_enabled	= yes
 
 # Port to bind to
-server_tcp_port   = { ${'zarafa-server'}{TCPPort} || '236'; }
+server_tcp_port   = { ${'zarafa-server'}{tcpport} || '236'; }
 
 # Accept unix pipe connections (not recommended to disable)
 server_pipe_enabled	= yes
@@ -182,7 +182,7 @@
 { 
   if (( ${'zarafa-server'}{Plugin} || 'db' ) eq 'unix')
   { 'user_plugin_config	= /etc/zarafa/unix.cfg'; }
-  else
+  elsif (( ${'zarafa-server'}{Plugin} || 'db' ) eq 'ldap')
   { 'user_plugin_config	= /etc/zarafa/ldap.cfg'; }
 }