diff --git a/TODO.txt b/TODO.txt
index 20071babc2c1195665b0762e933cb50bdab74e81..05bb208010577bc79d5188c38d89641259324968 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -10,6 +10,8 @@ remove done tasks or assign yourself to a task.
 Installer
 --------------------------------------
 
+- Load and update system config from file into sql database during installation.
+
 
 Server
 --------------------------------------
@@ -55,7 +57,9 @@ Sites (web) module
   this as a new tab named "SSL" to the exiting domain settings form.
   
 - Add a "httpd includes" field to the options tab of the domain settings form
-  like it is implemented in ISPConfig 2. 
+  like it is implemented in ISPConfig 2.
+
+- Make sure that changes in the domain name do not break the configuration.
 
 
 BE-Designer module
@@ -65,6 +69,19 @@ WARNING: Please do not use the BE Designer at the moment, the serializing functi
 of the module editor may break some of the existing modules.
 
 
+Remoting framework
+--------------------------------------
+
+
+
+Interface
+--------------------------------------
+
+- Enhance the list function to allow soorting by column
+
+- Enhance the paging in lists (e.g. like this: [1 2 3 4 ... 10])
+
+
 General tasks
 --------------------------------------
 
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 55328bf94a7edd9126e63babb5e02c2ad7bf1bd2..9bfbf6efac259586ec415ad98c357535d9fcf729 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -623,7 +623,7 @@ class installer_base {
 			if ($dh = opendir($dir)) {
 				while (($file = readdir($dh)) !== false) {
 					if($file != '.' && $file != '..') {
-						symlink($install_dir.'/server/plugins-available/'.$file, $install_dir.'/server/plugins-enabled/'.$file);
+						if(!is_link($install_dir.'/server/plugins-enabled/'.$file)) symlink($install_dir.'/server/plugins-available/'.$file, $install_dir.'/server/plugins-enabled/'.$file);
 					}
 				}
 				closedir($dh);
diff --git a/install/update.php b/install/update.php
index 9d7a24b42dcea2ae025d27936cecbeba5fe30ff4..8f25e42cce0bc794f2e757a5a4742f2e6f7cf4a1 100644
--- a/install/update.php
+++ b/install/update.php
@@ -30,6 +30,18 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 //** ISPConfig 3 installer.
+//** The banner on the command line
+echo "\n\n".str_repeat('-',80)."\n";
+echo " _____ ___________   _____              __ _       
+|_   _/  ___| ___ \ /  __ \            / _(_)      
+  | | \ `--.| |_/ / | /  \/ ___  _ __ | |_ _  __ _ 
+  | |  `--. \  __/  | |    / _ \| '_ \|  _| |/ _` |
+ _| |_/\__/ / |     | \__/\ (_) | | | | | | | (_| |
+ \___/\____/\_|      \____/\___/|_| |_|_| |_|\__, |
+                                              __/ |
+                                             |___/ ";
+echo "\n".str_repeat('-',80)."\n";
+echo "\n\n>> Update  \n\n";
 
 
 //** Include the library with the basic installer functions
diff --git a/server/plugins-available/mail_plugin.inc.php b/server/plugins-available/mail_plugin.inc.php
index 9140708fef0d7da958c080177c131b5de43b52a3..e63d3f18ab3dc2642046a6a418628c79741b73e1 100644
--- a/server/plugins-available/mail_plugin.inc.php
+++ b/server/plugins-available/mail_plugin.inc.php
@@ -45,10 +45,15 @@ class mail_plugin {
 		Register for the events
 		*/
 		
+		//* Mailboxes
 		$app->plugins->registerEvent('mail_user_insert',$this->plugin_name,'user_insert');
 		$app->plugins->registerEvent('mail_user_update',$this->plugin_name,'user_update');
 		$app->plugins->registerEvent('mail_user_delete',$this->plugin_name,'user_delete');
 		
+		//* Mail Domains
+		//$app->plugins->registerEvent('mail_domain_insert',$this->plugin_name,'domain_insert');
+		//$app->plugins->registerEvent('mail_domain_update',$this->plugin_name,'domain_update');
+		//$app->plugins->registerEvent('mail_domain_delete',$this->plugin_name,'domain_delete');
 		
 	}
 	
@@ -62,7 +67,6 @@ class mail_plugin {
 			exec('chown '.$mail_config['mailuser_name'].':'.$mail_config['mailuser_group'].' '.escapeshellcmd($data['new']['maildir']));
 			$app->log('Created Maildir: '.$data['new']['maildir'],LOGLEVEL_DEBUG);
 		}
-		
 	}
 	
 	function user_update($event_name,$data) {
@@ -86,7 +90,6 @@ class mail_plugin {
 			rmdir($data['old']['maildir']);
 			$app->log('Moved Maildir from: '.$data['old']['maildir'].' to '.$data['new']['maildir'],LOGLEVEL_DEBUG);
 		}
-		
 	}
 	
 	function user_delete($event_name,$data) {
@@ -99,7 +102,6 @@ class mail_plugin {
 		} else {
 			$app->log('Possible security violation when deleting the maildir: '.$data['old']['maildir'],LOGLEVEL_ERROR);
 		}
-		
 	}