diff --git a/createlinks b/createlinks
index c6d2dac..13702e5 100755
--- a/createlinks
+++ b/createlinks
@@ -5,11 +5,9 @@ use esmith::Build::CreateLinks qw(:all);
 service_link_enhanced("memcached-sogo", "S55", "7");
 service_link_enhanced("sogod", "S85", "7");
 
-templates2events("/etc/e-smith/sql/init/30sogo_mysql_create_database", qw(email-update bootstrap-console-save));
-templates2events("/etc/e-smith/sql/init/31sogo_mysql_update_privileges", qw(email-update bootstrap-console-save));
-templates2events("/home/sogo/smeserver/sogo_mysql_update_privileges.sql", qw(email-update bootstrap-console-save));
+templates2events("/etc/e-smith/sql/init/sogo", qw(email-update bootstrap-console-save));
 templates2events("/etc/cron.d/sogo-alarm", qw(email-update bootstrap-console-save));
-templates2events("/home/sogo/GNUstep/Defaults/.GNUstepDefaults", qw(email-update bootstrap-console-save pre-backup));
+templates2events("/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults", qw(email-update bootstrap-console-save pre-backup));
 templates2events("/etc/sysconfig/sogo", qw(email-update bootstrap-console-save));
 templates2events("/etc/logrotate.d/sogo", qw(email-update bootstrap-console-save));
 
@@ -21,6 +19,7 @@ event_link("sogo-delete-backup", "pre-backup", "60");
 event_link("sogo-delete-backup", "post-backup", "60");
 event_link("sogo-backup", "pre-backup", "70");
 event_link("sogo-delete-user", "user-delete", "10");
+event_link("sogo-upgrade", "email-update", "20");
 
 panel_link("sogo", "manager");
 
diff --git a/root/etc/e-smith/events/actions/sogo-backup b/root/etc/e-smith/events/actions/sogo-backup
index aedf906..531499e 100644
--- a/root/etc/e-smith/events/actions/sogo-backup
+++ b/root/etc/e-smith/events/actions/sogo-backup
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-su - sogo -c "/usr/sbin/sogo-tool backup /home/e-smith/db/sogo ALL"  > /dev/null 2>&1
+su -l -s /bin/bash sogo -c "/usr/sbin/sogo-tool backup /home/e-smith/db/sogo ALL"  > /dev/null 2>&1
 
diff --git a/root/etc/e-smith/events/actions/sogo-delete-user b/root/etc/e-smith/events/actions/sogo-delete-user
index 9733f85..7ea545c 100644
--- a/root/etc/e-smith/events/actions/sogo-delete-user
+++ b/root/etc/e-smith/events/actions/sogo-delete-user
@@ -12,5 +12,5 @@ if [ -z "$USER" ]; then
     exit 1
 fi
 
-su - sogo -c "/usr/sbin/sogo-tool remove $USER"  > /dev/null 2>&1
+su -l -s /bin/bash sogo -c "/usr/sbin/sogo-tool remove $USER"  > /dev/null 2>&1
 
diff --git a/root/etc/e-smith/events/actions/sogo-upgrade b/root/etc/e-smith/events/actions/sogo-upgrade
new file mode 100644
index 0000000..2dfd531
--- /dev/null
+++ b/root/etc/e-smith/events/actions/sogo-upgrade
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+/usr/bin/getent passwd sogo | grep -q '/home/sogo'
+if [ $? -eq 0 ]; then
+    /usr/sbin/usermod -d /var/lib/sogo -m -s /sbin/nologin -c "SOGo daemon" sogo 2>/dev/null
+fi
diff --git a/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/31sogo_mysql_update_privileges b/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/31sogo_mysql_update_privileges
deleted file mode 100644
index 6a29f37..0000000
--- a/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/31sogo_mysql_update_privileges
+++ /dev/null
@@ -1 +0,0 @@
-PERMS=0540
diff --git a/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/31sogo_upgrade b/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/31sogo_upgrade
deleted file mode 100644
index 6a29f37..0000000
--- a/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/31sogo_upgrade
+++ /dev/null
@@ -1 +0,0 @@
-PERMS=0540
diff --git a/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/30sogo_mysql_create_database b/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/sogo
similarity index 100%
rename from root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/30sogo_mysql_create_database
rename to root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/sogo
diff --git a/root/etc/e-smith/templates.metadata/home/sogo/GNUstep/Defaults/.GNUstepDefaults b/root/etc/e-smith/templates.metadata/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults
similarity index 100%
rename from root/etc/e-smith/templates.metadata/home/sogo/GNUstep/Defaults/.GNUstepDefaults
rename to root/etc/e-smith/templates.metadata/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults
diff --git a/root/etc/e-smith/templates/etc/e-smith/sql/init/30sogo_mysql_create_database b/root/etc/e-smith/templates/etc/e-smith/sql/init/30sogo_mysql_create_database
deleted file mode 100644
index f5ef3fb..0000000
--- a/root/etc/e-smith/templates/etc/e-smith/sql/init/30sogo_mysql_create_database
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec mysql < /home/sogo/smeserver/sogo_mysql_create_database.sql
diff --git a/root/etc/e-smith/templates/etc/e-smith/sql/init/31sogo_mysql_update_privileges b/root/etc/e-smith/templates/etc/e-smith/sql/init/31sogo_mysql_update_privileges
deleted file mode 100644
index e614329..0000000
--- a/root/etc/e-smith/templates/etc/e-smith/sql/init/31sogo_mysql_update_privileges
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec mysql < /home/sogo/smeserver/sogo_mysql_update_privileges.sql
diff --git a/root/etc/e-smith/templates/etc/e-smith/sql/init/31sogo_upgrade b/root/etc/e-smith/templates/etc/e-smith/sql/init/31sogo_upgrade
deleted file mode 100644
index 643584f..0000000
--- a/root/etc/e-smith/templates/etc/e-smith/sql/init/31sogo_upgrade
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec /etc/e-smith/events/actions/sogo_upgrade
diff --git a/root/etc/e-smith/templates/etc/e-smith/sql/init/sogo b/root/etc/e-smith/templates/etc/e-smith/sql/init/sogo
new file mode 100644
index 0000000..06648a8
--- /dev/null
+++ b/root/etc/e-smith/templates/etc/e-smith/sql/init/sogo
@@ -0,0 +1,40 @@
+{
+my $db = ${'sogod'}{'DbName'} || 'sogo';
+my $user = ${'sogod'}{'DbUser'} || 'sogo';
+my $pass = ${'sogod'}{'DbPassword'} || 'secret';
+
+$OUT .= <<"END";
+/usr/bin/mysql <<EOF
+CREATE DATABASE IF NOT EXISTS $db CHARACTER SET='utf8';
+
+USE mysql;
+
+REPLACE INTO user (  
+                     host,
+                     user,
+                     password)
+            VALUES ( 
+                     'localhost',
+                     '$user',
+                     PASSWORD ('$pass'));
+
+
+REPLACE INTO db (  
+                   host,
+                   db,
+                   user,
+                   select_priv, insert_priv, update_priv, delete_priv,
+                   create_priv, alter_priv, index_priv, drop_priv, create_tmp_table_priv,
+                   grant_priv, lock_tables_priv, references_priv)
+          VALUES ( 
+                   'localhost',
+                   '$db',
+                   '$user',
+                   'Y', 'Y', 'Y', 'Y',
+                   'Y', 'Y', 'Y', 'Y', 'Y',
+                   'N', 'Y', 'Y');
+
+FLUSH PRIVILEGES;
+EOF
+END
+}
diff --git a/root/etc/e-smith/templates/home/sogo/smeserver/sogo_mysql_update_privileges.sql b/root/etc/e-smith/templates/home/sogo/smeserver/sogo_mysql_update_privileges.sql
deleted file mode 100644
index 2510a81..0000000
--- a/root/etc/e-smith/templates/home/sogo/smeserver/sogo_mysql_update_privileges.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-CONNECT mysql;
-
-REPLACE INTO user (host, user, password)
-    VALUES (
-        'localhost',
-        'sogo',
-        password('{$sogod{DbPassword}}')
-    );
-
-REPLACE INTO db (host, db, user, select_priv, insert_priv, update_priv,
-                 delete_priv, create_priv, drop_priv, alter_priv, index_priv,
-                 references_priv)
-    VALUES (
-        'localhost',
-        'sogo',
-        'sogo',
-        'Y', 'Y', 'Y', 'Y',
-        'Y', 'Y', 'Y', 'Y',
-        'Y'
-    );
-
-FLUSH PRIVILEGES;
diff --git a/root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/10start b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/10start
similarity index 100%
rename from root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/10start
rename to root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/10start
diff --git a/root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/15mysql b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/15mysql
similarity index 100%
rename from root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/15mysql
rename to root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/15mysql
diff --git a/root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/16memcached b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/16memcached
similarity index 100%
rename from root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/16memcached
rename to root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/16memcached
diff --git a/root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/20mail b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/20mail
similarity index 100%
rename from root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/20mail
rename to root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/20mail
diff --git a/root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/25notifications b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/25notifications
similarity index 100%
rename from root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/25notifications
rename to root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/25notifications
diff --git a/root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/30defaultPrefs b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/30defaultPrefs
similarity index 100%
rename from root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/30defaultPrefs
rename to root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/30defaultPrefs
diff --git a/root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/35external b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/35external
similarity index 100%
rename from root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/35external
rename to root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/35external
diff --git a/root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/40sieve b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/40sieve
similarity index 100%
rename from root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/40sieve
rename to root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/40sieve
diff --git a/root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/45admins b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/45admins
similarity index 100%
rename from root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/45admins
rename to root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/45admins
diff --git a/root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/50timezone b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/50timezone
similarity index 100%
rename from root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/50timezone
rename to root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/50timezone
diff --git a/root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/55authSource b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/55authSource
similarity index 100%
rename from root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/55authSource
rename to root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/55authSource
diff --git a/root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/60various b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/60various
similarity index 100%
rename from root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/60various
rename to root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/60various
diff --git a/root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/99end b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/99end
similarity index 100%
rename from root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/99end
rename to root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/99end
diff --git a/root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/template-begin b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/template-begin
similarity index 100%
rename from root/etc/e-smith/templates/home/sogo/GNUstep/Defaults/.GNUstepDefaults/template-begin
rename to root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/template-begin
diff --git a/root/home/sogo/smeserver/sogo_mysql_create_database.sql b/root/home/sogo/smeserver/sogo_mysql_create_database.sql
deleted file mode 100644
index 1598846..0000000
--- a/root/home/sogo/smeserver/sogo_mysql_create_database.sql
+++ /dev/null
@@ -1,29 +0,0 @@
--- SOGo Database Creation
-
-CREATE DATABASE IF NOT EXISTS `sogo`;
-
-CONNECT `sogo`;
-
-CREATE TABLE IF NOT EXISTS `sogo_folder_info` (
-  `c_folder_id` bigint(20) unsigned NOT NULL auto_increment,
-  `c_path` varchar(255) NOT NULL,
-  `c_path1` varchar(255) NOT NULL,
-  `c_path2` varchar(255) default NULL,
-  `c_path3` varchar(255) default NULL,
-  `c_path4` varchar(255) default NULL,
-  `c_foldername` varchar(255) NOT NULL,
-  `c_location` varchar(2048) NOT NULL,
-  `c_quick_location` varchar(2048) default NULL,
-  `c_acl_location` varchar(2048) default NULL,
-  `c_folder_type` varchar(255) NOT NULL,
-  PRIMARY KEY  (`c_path`),
-  UNIQUE KEY `c_folder_id` (`c_folder_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS `sogo_user_profile` (
-  `c_uid` varchar(255) NOT NULL,
-  `c_defaults` text,
-  `c_settings` text,
-  PRIMARY KEY  (`c_uid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
diff --git a/root/home/sogo/smeserver/sogo_mysql_update_privileges.sql b/root/home/sogo/smeserver/sogo_mysql_update_privileges.sql
deleted file mode 100644
index a62dfad..0000000
--- a/root/home/sogo/smeserver/sogo_mysql_update_privileges.sql
+++ /dev/null
@@ -1 +0,0 @@
--- sogo_mysql_privileges.sql template
diff --git a/root/usr/share/qpsmtpd/plugins/fix_headers_case b/root/usr/share/qpsmtpd/plugins/fix_headers_case
index 83bf0af..147c272 100644
--- a/root/usr/share/qpsmtpd/plugins/fix_headers_case
+++ b/root/usr/share/qpsmtpd/plugins/fix_headers_case
@@ -32,7 +32,7 @@ sub fix_headers_case {
   $mailer =~ m/^SOGoMail/ or return DECLINED;
   $self->log(LOGINFO, "SOGo mailer detected, going to fix headers case");
   foreach my $header (qw/From To Cc Subject Message-ID Content-Type Date Content-Length Content-Transfer-Encoding/){
-    my $value = $self->get_header($transaction,$header) or return DECLINED;
+    my $value = $self->get_header($transaction,$header) or next;
     $self->set_header($transaction, $header, $value);
   }
   return DECLINED;
diff --git a/root/home/sogo/GNUstep/Defaults/.GNUstepDefaults b/root/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults
similarity index 100%
rename from root/home/sogo/GNUstep/Defaults/.GNUstepDefaults
rename to root/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults
diff --git a/root/home/sogo/GNUstep/Library/SOGo/Templates/MainUI/SOGoRootPage.wox b/root/var/lib/sogo/GNUstep/Library/SOGo/Templates/MainUI/SOGoRootPage.wox
similarity index 100%
rename from root/home/sogo/GNUstep/Library/SOGo/Templates/MainUI/SOGoRootPage.wox
rename to root/var/lib/sogo/GNUstep/Library/SOGo/Templates/MainUI/SOGoRootPage.wox