diff --git a/addressbook/setup/setup.inc.php b/addressbook/setup/setup.inc.php
index 6e476fc8f9..4bf584c548 100755
--- a/addressbook/setup/setup.inc.php
+++ b/addressbook/setup/setup.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Addressbook - setup config
+ * EGroupware - Addressbook
  *
  * @package addressbook
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
@@ -10,7 +10,7 @@
 /* Basic information about this app */
 $setup_info['addressbook']['name']      = 'addressbook';
 $setup_info['addressbook']['title']     = 'Addressbook';
-$setup_info['addressbook']['version']   = '1.6';
+$setup_info['addressbook']['version']   = '1.8';
 $setup_info['addressbook']['app_order'] = 4;
 $setup_info['addressbook']['enable']    = 1;
 
@@ -48,11 +48,11 @@ $setup_info['addressbook']['hooks']['not_enum_group_acls'] = 'addressbook_hooks:
 /* Dependencies for this app to work */
 $setup_info['addressbook']['depends'][] = array(
 	'appname' => 'phpgwapi',
-	'versions' => Array('1.5','1.6','1.7')
+	'versions' => Array('1.7','1.8','1.9')
 );
 $setup_info['addressbook']['depends'][] = array(
 	'appname' => 'etemplate',
-	'versions' => Array('1.5','1.6','1.7')
+	'versions' => Array('1.7','1.8','1.9')
 );
 
 // installation checks for addresbook
diff --git a/admin/setup/setup.inc.php b/admin/setup/setup.inc.php
index 2c00c6fa6a..50eb9cce36 100755
--- a/admin/setup/setup.inc.php
+++ b/admin/setup/setup.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * eGroupWare - Admin
+ * EGroupware - Admin
  *
  * @link http://www.egroupware.org
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
@@ -10,7 +10,7 @@
  */
 
 $setup_info['admin']['name']      = 'admin';
-$setup_info['admin']['version']   = '1.6';
+$setup_info['admin']['version']   = '1.8';
 $setup_info['admin']['app_order'] = 1;
 $setup_info['admin']['tables']    = array('egw_admin_queue','egw_admin_remote');
 $setup_info['admin']['enable']    = 1;
@@ -27,7 +27,7 @@ $setup_info['admin']['maintainer'][] = array(
 );
 
 $setup_info['admin']['license']  = 'GPL';
-$setup_info['admin']['description'] = 'eGroupWare administration application';
+$setup_info['admin']['description'] = 'EGroupware administration application';
 
 /* The hooks this app includes, needed for hooks registration */
 $setup_info['admin']['hooks'] = array(
@@ -48,9 +48,9 @@ $setup_info['admin']['hooks']['sidebox_menu'] =$setup_info['admin']['name'].'.ad
 /* Dependencies for this app to work */
 $setup_info['admin']['depends'][] = array(
 	'appname' => 'phpgwapi',
-	'versions' => Array('1.5','1.6','1.7')
+	'versions' => Array('1.7','1.8','1.9')
 );
 $setup_info['admin']['depends'][] = array(
 	'appname' => 'etemplate',
-	'versions' => Array('1.5','1.6','1.7')
+	'versions' => Array('1.7','1.8','1.9')
 );
diff --git a/admin/setup/tables_update.inc.php b/admin/setup/tables_update.inc.php
index 9af4906adc..b81ebfbb8c 100644
--- a/admin/setup/tables_update.inc.php
+++ b/admin/setup/tables_update.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * eGroupWare - Setup
+ * EGroupware - Setup
  *
  * Created by eTemplates DB-Tools written by ralfbecker@outdoor-training.de
  *
@@ -84,3 +84,9 @@ function admin_upgrade1_5_003()
 {
 	return $GLOBALS['setup_info']['admin']['currentver'] = '1.6';
 }
+
+
+function admin_upgrade1_6()
+{
+	return $GLOBALS['setup_info']['admin']['currentver'] = '1.8';
+}
diff --git a/calendar/setup/setup.inc.php b/calendar/setup/setup.inc.php
index bb12a45d07..88a9b7e6a4 100755
--- a/calendar/setup/setup.inc.php
+++ b/calendar/setup/setup.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * eGroupWare - Calendar setup
+ * EGroupware - Calendar
  *
  * @link http://www.egroupware.org
  * @package calendar
@@ -10,7 +10,7 @@
  */
 
 $setup_info['calendar']['name']    = 'calendar';
-$setup_info['calendar']['version'] = '1.7.011';
+$setup_info['calendar']['version'] = '1.9.001';
 $setup_info['calendar']['app_order'] = 3;
 $setup_info['calendar']['enable']  = 1;
 $setup_info['calendar']['index']   = 'calendar.calendar_uiviews.index';
@@ -46,11 +46,11 @@ $setup_info['calendar']['hooks']['config_validate'] = 'calendar_hooks::config_va
 /* Dependencies for this app to work */
 $setup_info['calendar']['depends'][] = array(
 	 'appname' => 'phpgwapi',
-	 'versions' => Array('1.3','1.4','1.5','1.6','1.7')
+	 'versions' => Array('1.7','1.8','1.9')
 );
 $setup_info['calendar']['depends'][] = array(
 	 'appname' => 'etemplate',
-	 'versions' => Array('1.3','1.4','1.5','1.6','1.7')
+	 'versions' => Array('1.7','1.8','1.9')
 );
 
 // installation checks for calendar
diff --git a/calendar/setup/tables_update.inc.php b/calendar/setup/tables_update.inc.php
index cdcaf77266..a23a726900 100644
--- a/calendar/setup/tables_update.inc.php
+++ b/calendar/setup/tables_update.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * eGroupWare - Calendar setup
+ * EGroupware - Calendar setup
  *
  * @link http://www.egroupware.org
  * @package calendar
@@ -2087,6 +2087,18 @@ function calendar_upgrade1_7_010()
 		'comment' => '1 if the event has been deleted, but you want to keep it around'
 	));
 
-	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.011';
+	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.001';	// was 1.7.011
+}
+
+function calendar_upgrade1_7_011()
+{
+	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.001';
+}
+	
+function calendar_upgrade1_8()
+{
+	calendar_upgrade1_7_010();
+
+	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.001';
 }
 
diff --git a/egw-pear/setup/setup.inc.php b/egw-pear/setup/setup.inc.php
index e89fb219bc..9d3703a0f0 100644
--- a/egw-pear/setup/setup.inc.php
+++ b/egw-pear/setup/setup.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * eGroupWare - PEAR
+ * EGroupware - modified PEAR modules
  *
  * @link http://www.egroupware.org
  * @package egw-pear
@@ -11,7 +11,7 @@
 
 $setup_info['egw-pear']['name']		= 'egw-pear';
 $setup_info['egw-pear']['title']	= 'egw-pear';
-$setup_info['egw-pear']['version']	= '1.4.000';
+$setup_info['egw-pear']['version']	= '1.8';
 $setup_info['egw-pear']['app_order']	= 99;
 $setup_info['egw-pear']['enable']	= 0;	// no need to show anywhere in EGroupware
 
@@ -39,11 +39,11 @@ $setup_info['egw-pear']['check_install'] = array(
 	// we need pear itself to be installed
 	'' => array(
 		'func' => 'pear_check',
-		'from' => 'FeLaMiMail',
+		'from' => 'FMail',
 	),
 	// Net_Socket is required from Net_IMAP & Net_Sieve
 	'Net_Socket' => array(
 		'func' => 'pear_check',
-		'from' => 'FeLaMiMail',
+		'from' => 'FMail',
 	),
 );
diff --git a/emailadmin/setup/setup.inc.php b/emailadmin/setup/setup.inc.php
index 901feb525a..0a7429e43d 100644
--- a/emailadmin/setup/setup.inc.php
+++ b/emailadmin/setup/setup.inc.php
@@ -12,7 +12,7 @@
 
 $setup_info['emailadmin']['name']      = 'emailadmin';
 $setup_info['emailadmin']['title']     = 'EMailAdmin';
-$setup_info['emailadmin']['version']   = '1.7.004';
+$setup_info['emailadmin']['version']   = '1.9.001';
 $setup_info['emailadmin']['app_order'] = 10;
 $setup_info['emailadmin']['enable']    = 2;
 $setup_info['emailadmin']['index']     = 'emailadmin.emailadmin_ui.listProfiles';
@@ -42,11 +42,11 @@ $setup_info['emailadmin']['hooks']['deletegroup'] = 'emailadmin_hooks::deletegro
 /* Dependencies for this app to work */
 $setup_info['emailadmin']['depends'][] = array(
 	'appname'  => 'phpgwapi',
-	'versions' => Array('1.6','1.7')
+	'versions' => Array('1.7','1.8','1.9')
 );
 $setup_info['emailadmin']['depends'][] = array(
 	'appname'  => 'egw-pear',
-	'versions' => Array('1.4.000','1.5','1.6','1.7')
+	'versions' => Array('1.8','1.9')
 );
 // installation checks for felamimail
 $setup_info['emailadmin']['check_install'] = array(
diff --git a/emailadmin/setup/tables_update.inc.php b/emailadmin/setup/tables_update.inc.php
index 7765aedadf..dacd432f35 100644
--- a/emailadmin/setup/tables_update.inc.php
+++ b/emailadmin/setup/tables_update.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * eGroupware EMailAdmin - DB schema
+ * EGroupware EMailAdmin - DB schema
  *
  * @link http://www.egroupware.org
  * @author Lars Kneschke
@@ -278,7 +278,7 @@ function emailadmin_upgrade1_6_001()
 		'type' => 'text'
 	));
 
-	return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.7.003';
+	return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.8';	// was '1.7.003';
 }
 
 function emailadmin_upgrade1_7_003()
@@ -299,5 +299,17 @@ function emailadmin_upgrade1_7_003()
 	{
 		$GLOBALS['egw_setup']->oProc->query('update egw_emailadmin set ea_imap_type=\''.$newtype.'\' where ea_imap_type=\''.$id.'\'',__LINE__,__FILE__);
 	}
-	return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.7.004';
+	return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.9.001';	// was '1.7.004';
+}
+
+function emailadmin_upgrade1_8()
+{
+	emailadmin_upgrade1_7_003();
+	
+	return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.9.001';
+}
+	
+function emailadmin_upgrade1_7_004()
+{
+	return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.9.001';
 }
diff --git a/etemplate/setup/setup.inc.php b/etemplate/setup/setup.inc.php
index 2ae9ba9384..1085341c25 100644
--- a/etemplate/setup/setup.inc.php
+++ b/etemplate/setup/setup.inc.php
@@ -12,7 +12,7 @@
  */
 
 $setup_info['etemplate']['name']      = 'etemplate';
-$setup_info['etemplate']['version']   = '1.6';
+$setup_info['etemplate']['version']   = '1.8';
 $setup_info['etemplate']['app_order'] = 60;	// just behind the developers-tools
 $setup_info['etemplate']['tables']    = array('egw_etemplate');
 $setup_info['etemplate']['enable']    = 1;
@@ -39,6 +39,5 @@ $setup_info['etemplate']['hooks'][] = 'sidebox_menu';
 /* Dependencies for this app to work */
 $setup_info['etemplate']['depends'][] = array(
 	 'appname' => 'phpgwapi',
-	 'versions' => Array('1.5','1.6','1.7')
+	 'versions' => Array('1.7','1.8','1.9')
 );
-
diff --git a/etemplate/setup/tables_update.inc.php b/etemplate/setup/tables_update.inc.php
index ee165b0ff6..c5ab8e1ae8 100644
--- a/etemplate/setup/tables_update.inc.php
+++ b/etemplate/setup/tables_update.inc.php
@@ -118,3 +118,9 @@ function etemplate_upgrade1_5_001()
 {
 	return $GLOBALS['setup_info']['etemplate']['currentver'] = '1.6';
 }
+
+
+function etemplate_upgrade1_6()
+{
+	return $GLOBALS['setup_info']['etemplate']['currentver'] = '1.8';
+}
diff --git a/felamimail/setup/setup.inc.php b/felamimail/setup/setup.inc.php
index 7807a438f9..e8b8cc48bd 100644
--- a/felamimail/setup/setup.inc.php
+++ b/felamimail/setup/setup.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * eGroupWare - FeLaMiMail
+ * EGroupware - FMail
  *
  * @link http://www.egroupware.org
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
@@ -11,7 +11,7 @@
 
 $setup_info['felamimail']['name']      		= 'felamimail';
 $setup_info['felamimail']['title']     		= 'FeLaMiMail';
-$setup_info['felamimail']['version']     	= '1.7.001';
+$setup_info['felamimail']['version']     	= '1.8';
 $setup_info['felamimail']['app_order'] 		= 2;
 $setup_info['felamimail']['enable']    		= 1;
 $setup_info['felamimail']['index']    		= 'felamimail.uifelamimail.viewMainScreen';
@@ -39,15 +39,15 @@ $setup_info['felamimail']['hooks']['search_link'] = 'felamimail_hooks::search_li
 /* Dependencies for this app to work */
 $setup_info['felamimail']['depends'][] = array(
 	'appname'  => 'phpgwapi',
-	'versions' => Array('1.3','1.4','1.5','1.6','1.7')
+	'versions' => Array('1.7','1.8','1.9')
 );
 $setup_info['felamimail']['depends'][] = array(
 	'appname'  => 'emailadmin',
-	'versions' => Array('1.3','1.4','1.5','1.6','1.7')
+	'versions' => Array('1.7','1.8','1.9')
 );
 $setup_info['felamimail']['depends'][] = array(
 	'appname'  => 'egw-pear',
-	'versions' => Array('1.4.000','1.5','1.6','1.7')
+	'versions' => Array('1.8','1.9')
 );
 // installation checks for felamimail
 $setup_info['felamimail']['check_install'] = array(
diff --git a/felamimail/setup/tables_update.inc.php b/felamimail/setup/tables_update.inc.php
index 398a8299bf..e1a04c5bab 100644
--- a/felamimail/setup/tables_update.inc.php
+++ b/felamimail/setup/tables_update.inc.php
@@ -1,264 +1,366 @@
 <?php
-	/**************************************************************************\
-	* eGroupWare - Setup                                                       *
-	* http://www.egroupware.org                                                *
-	* --------------------------------------------                             *
-	*  This program is free software; you can redistribute it and/or modify it *
-	*  under the terms of the GNU General Public License as published by the   *
-	*  Free Software Foundation; either version 2 of the License, or (at your  *
-	*  option) any later version.                                              *
-	\**************************************************************************/
+/**
+ * EGroupware - FMail
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package felamimail
+ * @subpackage setup
+ * @version $Id$
+ */
 
-	/* $Id$ */
-
-	$test[] = '0.8.2';
-	function felamimail_upgrade0_8_2()
-	{
-		$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_felamimail_cache','to_name',array('type' => 'varchar', 'precision' => 120));
-		$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_felamimail_cache','to_address',array('type' => 'varchar', 'precision' => 120));
-		
-		$GLOBALS['setup_info']['felamimail']['currentver'] = '0.8.3';
-		return $GLOBALS['setup_info']['felamimail']['currentver'];
-	}
-
-	$test[] = '0.8.3';
-	function felamimail_upgrade0_8_3()
-	{
-
-		$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_felamimail_cache','attachments',array('type' => 'varchar', 'precision' => 120));
-		
-		$GLOBALS['setup_info']['felamimail']['currentver'] = '0.8.4';
-		return $GLOBALS['setup_info']['felamimail']['currentver'];
-	}
-
-	$test[] = '0.8.4';
-	function felamimail_upgrade0_8_4()
-	{
-		$GLOBALS['setup_info']['felamimail']['currentver'] = '0.9.0';
-		return $GLOBALS['setup_info']['felamimail']['currentver'];
-	}
-
-	$test[] = '0.9.0';
-	function felamimail_upgrade0_9_0()
-	{
-		$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_felamimail_folderstatus', 'accountname', array('type' => 'varchar', 'precision' => 200, 'nullable' => false));
-		$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_felamimail_cache', 'accountname', array('type' => 'varchar', 'precision' => 200, 'nullable' => false));
-
-		$GLOBALS['setup_info']['felamimail']['currentver'] = '0.9.1';
-		return $GLOBALS['setup_info']['felamimail']['currentver'];
-	}
-
-	$test[] = '0.9.1';
-	function felamimail_upgrade0_9_1()
-	{
-		$GLOBALS['setup_info']['felamimail']['currentver'] = '0.9.2';
-		return $GLOBALS['setup_info']['felamimail']['currentver'];
-	}
-
-	$test[] = '0.9.2';
-	function felamimail_upgrade0_9_2()
-	{
-		$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_felamimail_displayfilter',
-			Array(
-				'fd' => array(
-					'accountid' 	=> array('type' => 'int', 'precision' => 4, 'nullable' => false),
-					'filter' 	=> array('type' => 'text')
-				),
-				'pk' => array('accountid'),
-				'fk' => array(),
-				'ix' => array(),
-				'uc' => array()
-			)
-
-		);
-
-		$GLOBALS['setup_info']['felamimail']['currentver'] = '0.9.3';
-		return $GLOBALS['setup_info']['felamimail']['currentver'];
-	}
-
-	$test[] = '0.9.3';
-	function felamimail_upgrade0_9_3()
-	{
-		$GLOBALS['egw_setup']->oProc->DropTable('phpgw_felamimail_cache');
-		$GLOBALS['egw_setup']->oProc->query('delete from phpgw_felamimail_folderstatus',__LINE__,__FILE__);
-		$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_felamimail_cache',
-			Array(
-				'fd' => array(
-					'accountid' 	=> array('type' => 'int', 'precision' => 4, 'nullable' => false),
-					'hostname' 	=> array('type' => 'varchar', 'precision' => 60, 'nullable' => false),
-					'accountname' 	=> array('type' => 'varchar', 'precision' => 200, 'nullable' => false),
-					'foldername' 	=> array('type' => 'varchar', 'precision' => 200, 'nullable' => false),
-					'uid' 		=> array('type' => 'int', 'precision' => 4, 'nullable' => false),
-					'subject'	=> array('type' => 'text'),
-					'striped_subject'=> array('type' => 'text'),
-					'sender_name'	=> array('type' => 'varchar', 'precision' => 120),
-					'sender_address'=> array('type' => 'varchar', 'precision' => 120),
-					'to_name'	=> array('type' => 'varchar', 'precision' => 120),
-					'to_address'	=> array('type' => 'varchar', 'precision' => 120),
-					'date'		=> array('type' => 'varchar', 'precision' => 120),
-					'size'		=> array('type' => 'int', 'precision' => 4),
-					'attachments'	=> array('type' => 'varchar', 'precision' =>120)
-				),
-				'pk' => array('accountid','hostname','accountname','foldername','uid'),
-				'fk' => array(),
-				'ix' => array(),
-				'uc' => array()
-			)
-		);
-
-		$GLOBALS['setup_info']['felamimail']['currentver'] = '0.9.4';
-		return $GLOBALS['setup_info']['felamimail']['currentver'];
-	}
-
-
-
-	$test[] = '0.9.4';
-	function felamimail_upgrade0_9_4()
-	{
-		$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_felamimail_cache','accountname',array(
-			'type' => 'varchar',
-			'precision' => '25',
-			'nullable' => False
-		));
-		$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_felamimail_cache','date',array(
-			'type' => 'int',
-			'precision' => '8'
-		));
-
-		$GLOBALS['setup_info']['felamimail']['currentver'] = '0.9.5';
-		return $GLOBALS['setup_info']['felamimail']['currentver'];
-	}
-
-
-	$test[] = '0.9.5';
-	function felamimail_upgrade0_9_5()
-	{
-		$GLOBALS['setup_info']['felamimail']['currentver'] = '1.0.0';
-		return $GLOBALS['setup_info']['felamimail']['currentver'];
-	}
-
-
-	$test[] = '1.0.0';
-	function felamimail_upgrade1_0_0()
-	{
-		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','accountid','fmail_accountid');
-		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','hostname','fmail_hostname');
-		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','accountname','fmail_accountname');
-		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','foldername','fmail_foldername');
-		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','uid','fmail_uid');
-		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','subject','fmail_subject');
-		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','striped_subject','fmail_striped_subject');
-		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','sender_name','fmail_sender_name');
-		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','sender_address','fmail_sender_address');
-		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','to_name','fmail_to_name');
-		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','to_address','fmail_to_address');
-		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','date','fmail_date');
-		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','size','fmail_size');
-		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','attachments','fmail_attachments');
-
-		$GLOBALS['setup_info']['felamimail']['currentver'] = '1.0.0.001';
-		return $GLOBALS['setup_info']['felamimail']['currentver'];
-	}
-
-
-	$test[] = '1.0.0.001';
-	function felamimail_upgrade1_0_0_001()
-	{
-		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','accountid','fmail_accountid');
-		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','hostname','fmail_hostname');
-		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','accountname','fmail_accountname');
-		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','foldername','fmail_foldername');
-		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','messages','fmail_messages');
-		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','recent','fmail_recent');
-		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','unseen','fmail_unseen');
-		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','uidnext','fmail_uidnext');
-		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','uidvalidity','fmail_uidvalidity');
-
-		$GLOBALS['setup_info']['felamimail']['currentver'] = '1.0.0.002';
-		return $GLOBALS['setup_info']['felamimail']['currentver'];
-	}
-
-
-	$test[] = '1.0.0.002';
-	function felamimail_upgrade1_0_0_002()
-	{
-		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_displayfilter','accountid','fmail_filter_accountid');
-		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_displayfilter','filter','fmail_filter_data');
-
-		$GLOBALS['setup_info']['felamimail']['currentver'] = '1.0.0.003';
-		return $GLOBALS['setup_info']['felamimail']['currentver'];
-	}
-
-	$test[] = '1.0.0.003';
-	function felamimail_upgrade1_0_0_003()
-	{
-		$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_felamimail_cache', 'fmail_accountname', array('type' => 'varchar','precision' => '200','nullable' => False));
-
-		$GLOBALS['setup_info']['felamimail']['currentver'] = '1.0.0.004';
-		return $GLOBALS['setup_info']['felamimail']['currentver'];
-	}
-
-
-
-	$test[] = '1.0.0.004';
-	function felamimail_upgrade1_0_0_004()
-	{
-		// index was to big for mysql with charset utf8 (max 1000byte = 333 utf8 chars)
-		$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_felamimail_cache','fmail_accountname',array(
-			'type' => 'varchar',
-			'precision' => '128',
-			'nullable' => False
-		));
-		$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_felamimail_cache','fmail_foldername',array(
-			'type' => 'varchar',
-			'precision' => '128',
-			'nullable' => False
-		));
-
-		$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_felamimail_cache','egw_felamimail_cache');
-
-		$GLOBALS['setup_info']['felamimail']['currentver'] = '1.0.0.005';
-		return $GLOBALS['setup_info']['felamimail']['currentver'];
-	}
-
-
-	$test[] = '1.0.0.005';
-	function felamimail_upgrade1_0_0_005()
-	{
-		// index was to big for mysql with charset utf8 (max 1000byte = 333 utf8 chars)
-		$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_felamimail_folderstatus','fmail_accountname',array(
-			'type' => 'varchar',
-			'precision' => '128',
-			'nullable' => False
-		));
-		$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_felamimail_folderstatus','fmail_foldername',array(
-			'type' => 'varchar',
-			'precision' => '128',
-			'nullable' => False
-		));
-
-		$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_felamimail_folderstatus','egw_felamimail_folderstatus');
-		$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_felamimail_displayfilter','egw_felamimail_displayfilter');
-
-		$GLOBALS['setup_info']['felamimail']['currentver'] = '1.0.0.006';
-		return $GLOBALS['setup_info']['felamimail']['currentver'];
-	}
-
-
-	$test[] = '1.0.0.006';
-	function felamimail_upgrade1_0_0_006()
-	{
-		return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.2';
-	}
+function felamimail_upgrade0_8_2()
+{
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_felamimail_cache','to_name',array('type' => 'varchar', 'precision' => 120));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_felamimail_cache','to_address',array('type' => 'varchar', 'precision' => 120));
 	
-	// next version should be 1.2.001
+	$GLOBALS['setup_info']['felamimail']['currentver'] = '0.8.3';
+	return $GLOBALS['setup_info']['felamimail']['currentver'];
+}
 
+function felamimail_upgrade0_8_3()
+{
 
-	$test[] = '1.2';
-	function felamimail_upgrade1_2()
-	{
-		$GLOBALS['egw_setup']->oProc->CreateTable('fm_accounts',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_felamimail_cache','attachments',array('type' => 'varchar', 'precision' => 120));
+	
+	$GLOBALS['setup_info']['felamimail']['currentver'] = '0.8.4';
+	return $GLOBALS['setup_info']['felamimail']['currentver'];
+}
+
+function felamimail_upgrade0_8_4()
+{
+	$GLOBALS['setup_info']['felamimail']['currentver'] = '0.9.0';
+	return $GLOBALS['setup_info']['felamimail']['currentver'];
+}
+
+function felamimail_upgrade0_9_0()
+{
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_felamimail_folderstatus', 'accountname', array('type' => 'varchar', 'precision' => 200, 'nullable' => false));
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_felamimail_cache', 'accountname', array('type' => 'varchar', 'precision' => 200, 'nullable' => false));
+
+	$GLOBALS['setup_info']['felamimail']['currentver'] = '0.9.1';
+	return $GLOBALS['setup_info']['felamimail']['currentver'];
+}
+
+function felamimail_upgrade0_9_1()
+{
+	$GLOBALS['setup_info']['felamimail']['currentver'] = '0.9.2';
+	return $GLOBALS['setup_info']['felamimail']['currentver'];
+}
+
+function felamimail_upgrade0_9_2()
+{
+	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_felamimail_displayfilter',
+		Array(
 			'fd' => array(
+				'accountid' 	=> array('type' => 'int', 'precision' => 4, 'nullable' => false),
+				'filter' 	=> array('type' => 'text')
+			),
+			'pk' => array('accountid'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		)
+
+	);
+
+	$GLOBALS['setup_info']['felamimail']['currentver'] = '0.9.3';
+	return $GLOBALS['setup_info']['felamimail']['currentver'];
+}
+
+function felamimail_upgrade0_9_3()
+{
+	$GLOBALS['egw_setup']->oProc->DropTable('phpgw_felamimail_cache');
+	$GLOBALS['egw_setup']->oProc->query('delete from phpgw_felamimail_folderstatus',__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_felamimail_cache',
+		Array(
+			'fd' => array(
+				'accountid' 	=> array('type' => 'int', 'precision' => 4, 'nullable' => false),
+				'hostname' 	=> array('type' => 'varchar', 'precision' => 60, 'nullable' => false),
+				'accountname' 	=> array('type' => 'varchar', 'precision' => 200, 'nullable' => false),
+				'foldername' 	=> array('type' => 'varchar', 'precision' => 200, 'nullable' => false),
+				'uid' 		=> array('type' => 'int', 'precision' => 4, 'nullable' => false),
+				'subject'	=> array('type' => 'text'),
+				'striped_subject'=> array('type' => 'text'),
+				'sender_name'	=> array('type' => 'varchar', 'precision' => 120),
+				'sender_address'=> array('type' => 'varchar', 'precision' => 120),
+				'to_name'	=> array('type' => 'varchar', 'precision' => 120),
+				'to_address'	=> array('type' => 'varchar', 'precision' => 120),
+				'date'		=> array('type' => 'varchar', 'precision' => 120),
+				'size'		=> array('type' => 'int', 'precision' => 4),
+				'attachments'	=> array('type' => 'varchar', 'precision' =>120)
+			),
+			'pk' => array('accountid','hostname','accountname','foldername','uid'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		)
+	);
+
+	$GLOBALS['setup_info']['felamimail']['currentver'] = '0.9.4';
+	return $GLOBALS['setup_info']['felamimail']['currentver'];
+}
+
+
+function felamimail_upgrade0_9_4()
+{
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_felamimail_cache','accountname',array(
+		'type' => 'varchar',
+		'precision' => '25',
+		'nullable' => False
+	));
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_felamimail_cache','date',array(
+		'type' => 'int',
+		'precision' => '8'
+	));
+
+	$GLOBALS['setup_info']['felamimail']['currentver'] = '0.9.5';
+	return $GLOBALS['setup_info']['felamimail']['currentver'];
+}
+
+
+function felamimail_upgrade0_9_5()
+{
+	$GLOBALS['setup_info']['felamimail']['currentver'] = '1.0.0';
+	return $GLOBALS['setup_info']['felamimail']['currentver'];
+}
+
+
+function felamimail_upgrade1_0_0()
+{
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','accountid','fmail_accountid');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','hostname','fmail_hostname');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','accountname','fmail_accountname');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','foldername','fmail_foldername');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','uid','fmail_uid');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','subject','fmail_subject');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','striped_subject','fmail_striped_subject');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','sender_name','fmail_sender_name');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','sender_address','fmail_sender_address');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','to_name','fmail_to_name');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','to_address','fmail_to_address');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','date','fmail_date');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','size','fmail_size');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','attachments','fmail_attachments');
+
+	$GLOBALS['setup_info']['felamimail']['currentver'] = '1.0.0.001';
+	return $GLOBALS['setup_info']['felamimail']['currentver'];
+}
+
+
+function felamimail_upgrade1_0_0_001()
+{
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','accountid','fmail_accountid');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','hostname','fmail_hostname');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','accountname','fmail_accountname');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','foldername','fmail_foldername');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','messages','fmail_messages');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','recent','fmail_recent');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','unseen','fmail_unseen');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','uidnext','fmail_uidnext');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','uidvalidity','fmail_uidvalidity');
+
+	$GLOBALS['setup_info']['felamimail']['currentver'] = '1.0.0.002';
+	return $GLOBALS['setup_info']['felamimail']['currentver'];
+}
+
+
+function felamimail_upgrade1_0_0_002()
+{
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_displayfilter','accountid','fmail_filter_accountid');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_displayfilter','filter','fmail_filter_data');
+
+	$GLOBALS['setup_info']['felamimail']['currentver'] = '1.0.0.003';
+	return $GLOBALS['setup_info']['felamimail']['currentver'];
+}
+
+
+function felamimail_upgrade1_0_0_003()
+{
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_felamimail_cache', 'fmail_accountname', array('type' => 'varchar','precision' => '200','nullable' => False));
+
+	$GLOBALS['setup_info']['felamimail']['currentver'] = '1.0.0.004';
+	return $GLOBALS['setup_info']['felamimail']['currentver'];
+}
+
+
+function felamimail_upgrade1_0_0_004()
+{
+	// index was to big for mysql with charset utf8 (max 1000byte = 333 utf8 chars)
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_felamimail_cache','fmail_accountname',array(
+		'type' => 'varchar',
+		'precision' => '128',
+		'nullable' => False
+	));
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_felamimail_cache','fmail_foldername',array(
+		'type' => 'varchar',
+		'precision' => '128',
+		'nullable' => False
+	));
+
+	$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_felamimail_cache','egw_felamimail_cache');
+
+	$GLOBALS['setup_info']['felamimail']['currentver'] = '1.0.0.005';
+	return $GLOBALS['setup_info']['felamimail']['currentver'];
+}
+
+
+function felamimail_upgrade1_0_0_005()
+{
+	// index was to big for mysql with charset utf8 (max 1000byte = 333 utf8 chars)
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_felamimail_folderstatus','fmail_accountname',array(
+		'type' => 'varchar',
+		'precision' => '128',
+		'nullable' => False
+	));
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_felamimail_folderstatus','fmail_foldername',array(
+		'type' => 'varchar',
+		'precision' => '128',
+		'nullable' => False
+	));
+
+	$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_felamimail_folderstatus','egw_felamimail_folderstatus');
+	$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_felamimail_displayfilter','egw_felamimail_displayfilter');
+
+	$GLOBALS['setup_info']['felamimail']['currentver'] = '1.0.0.006';
+	return $GLOBALS['setup_info']['felamimail']['currentver'];
+}
+
+
+function felamimail_upgrade1_0_0_006()
+{
+	return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.2';
+}
+
+
+function felamimail_upgrade1_2()
+{
+	$GLOBALS['egw_setup']->oProc->CreateTable('fm_accounts',array(
+		'fd' => array(
+			'fm_owner' => array('type' => 'int','precision' => '4','nullable' => False),
+			'fm_id' => array('type' => 'auto'),
+			'fm_realname' => array('type' => 'varchar','precision' => '128'),
+			'fm_organization' => array('type' => 'varchar','precision' => '128'),
+			'fm_emailaddress' => array('type' => 'varchar','precision' => '128','nullable' => False),
+			'fm_ic_hostname' => array('type' => 'varchar','precision' => '128','nullable' => False),
+			'fm_ic_port' => array('type' => 'int','precision' => '4','nullable' => False),
+			'fm_ic_username' => array('type' => 'varchar','precision' => '128','nullable' => False),
+			'fm_ic_password' => array('type' => 'varchar','precision' => '128'),
+			'fm_ic_encryption' => array('type' => 'bool','nullable' => False),
+			'fm_og_hostname' => array('type' => 'varchar','precision' => '128','nullable' => False),
+			'fm_og_port' => array('type' => 'int','precision' => '4','nullable' => False),
+			'fm_og_smtpauth' => array('type' => 'bool','nullable' => False),
+			'fm_og_username' => array('type' => 'varchar','precision' => '128'),
+			'fm_og_password' => array('type' => 'varchar','precision' => '128')
+		),
+		'pk' => array('fm_id'),
+		'fk' => array(),
+		'ix' => array('fm_owner'),
+		'uc' => array()
+	));
+
+	return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.2.001';
+}
+
+
+function felamimail_upgrade1_2_001()
+{
+	$GLOBALS['egw_setup']->oProc->AddColumn('fm_accounts','fm_active',array(
+		'type' => 'bool',
+		'nullable' => False
+	));
+
+	return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.2.002';
+}
+
+
+function felamimail_upgrade1_2_002()
+{
+	$GLOBALS['egw_setup']->oProc->AddColumn('fm_accounts','fm_validatecertificate',array(
+		'type' => 'bool',
+		'nullable' => False
+	));
+
+	return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.2.003';
+}
+
+
+function felamimail_upgrade1_2_003()
+{
+	$GLOBALS['egw_setup']->oProc->RenameColumn('fm_accounts','fm_validatecertificate','fm_ic_validatecertificate');
+
+	return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.2.004';
+}
+
+
+function felamimail_upgrade1_2_004()
+{
+	$GLOBALS['egw_setup']->oProc->query('delete from egw_felamimail_folderstatus',__LINE__,__FILE__);
+
+	return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.3.000';
+}
+
+
+function felamimail_upgrade1_3_000()
+{
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_cache','fmail_sender_name',array(
+		'type' => 'varchar',
+		'precision' => '256'
+	));
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_cache','fmail_sender_address',array(
+		'type' => 'varchar',
+		'precision' => '256'
+	));
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_cache','fmail_to_name',array(
+		'type' => 'varchar',
+		'precision' => '256'
+	));
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_cache','fmail_to_address',array(
+		'type' => 'varchar',
+		'precision' => '256'
+	));
+
+	return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.3.001';
+}
+
+
+function felamimail_upgrade1_3_001()
+{
+	$GLOBALS['egw_setup']->oProc->RenameTable('fm_accounts','egw_felamimail_accounts');
+
+	return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.3.002';
+}
+
+
+function felamimail_upgrade1_3_002()
+{
+	$GLOBALS['egw_setup']->oProc->CreateTable('egw_felamimail_signatures',array(
+		'fd' => array(
+			'fm_signatureid' => array('type' => 'auto'),
+			'fm_accountid' => array('type' => 'int','precision' => '11'),
+			'fm_signature' => array('type' => 'text'),
+			'fm_description' => array('type' => 'varchar','precision' => '255')
+		),
+		'pk' => array('fm_signatureid'),
+		'fk' => array(),
+		'ix' => array(),
+		'uc' => array(array('fm_signatureid','fm_accountid'))
+	));
+
+	return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.3.003';
+}
+
+
+function felamimail_upgrade1_3_003()
+{
+	#$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_ic_encryption',array(
+	#	'type' => 'int',
+	#	'precision' => '4',
+	#	'nullable' => False
+	#));
+
+	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_felamimail_accounts',array(
+ 		'fd' => array(
 				'fm_owner' => array('type' => 'int','precision' => '4','nullable' => False),
 				'fm_id' => array('type' => 'auto'),
 				'fm_realname' => array('type' => 'varchar','precision' => '128'),
@@ -268,212 +370,80 @@
 				'fm_ic_port' => array('type' => 'int','precision' => '4','nullable' => False),
 				'fm_ic_username' => array('type' => 'varchar','precision' => '128','nullable' => False),
 				'fm_ic_password' => array('type' => 'varchar','precision' => '128'),
-				'fm_ic_encryption' => array('type' => 'bool','nullable' => False),
+				'fm_ic_encryption' => array('type' => 'int','precision' => '4'),
 				'fm_og_hostname' => array('type' => 'varchar','precision' => '128','nullable' => False),
 				'fm_og_port' => array('type' => 'int','precision' => '4','nullable' => False),
 				'fm_og_smtpauth' => array('type' => 'bool','nullable' => False),
 				'fm_og_username' => array('type' => 'varchar','precision' => '128'),
-				'fm_og_password' => array('type' => 'varchar','precision' => '128')
+				'fm_og_password' => array('type' => 'varchar','precision' => '128'),
+				'fm_active' => array('type' => 'bool','nullable' => False),
+				'fm_ic_validatecertificate' => array('type' => 'bool','nullable' => False),
 			),
-			'pk' => array('fm_id'),
-			'fk' => array(),
-			'ix' => array('fm_owner'),
-			'uc' => array()
-		));
+		'pk' => array('fm_id'),
+		'fk' => array(),
+		'ix' => array('fm_owner'),
+		'uc' => array()
+		), array(
+			'fm_ic_encryption' => "CASE WHEN fm_ic_encryption THEN 1 ELSE 0 END",
+		)
+	);
 
-		return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.2.001';
-	}
+	return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.3.004';
+}
 
 
-	$test[] = '1.2.001';
-	function felamimail_upgrade1_2_001()
-	{
-		$GLOBALS['egw_setup']->oProc->AddColumn('fm_accounts','fm_active',array(
-			'type' => 'bool',
-			'nullable' => False
-		));
+function felamimail_upgrade1_3_004()
+{
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_felamimail_signatures','fm_defaultsignature',array(
+		'type' => 'bool'
+	));
 
-		return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.2.002';
-	}
+	return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.3.005';
+}
 
 
-	$test[] = '1.2.002';
-	function felamimail_upgrade1_2_002()
-	{
-		$GLOBALS['egw_setup']->oProc->AddColumn('fm_accounts','fm_validatecertificate',array(
-			'type' => 'bool',
-			'nullable' => False
-		));
+function felamimail_upgrade1_3_005()
+{
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_felamimail_accounts','fm_ic_enable_sieve',array(
+		'type' => 'bool',
+		'precision' => '255'
+	));
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_felamimail_accounts','fm_ic_sieve_server',array(
+		'type' => 'varchar',
+		'precision' => '128'
+	));
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_felamimail_accounts','fm_ic_sieve_port',array(
+		'type' => 'int',
+		'precision' => '4'
+	));
 
-		return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.2.003';
-	}
-
-	$test[] = '1.2.003';
-	function felamimail_upgrade1_2_003()
-	{
-		$GLOBALS['egw_setup']->oProc->RenameColumn('fm_accounts','fm_validatecertificate','fm_ic_validatecertificate');
-
-		return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.2.004';
-	}
-
-	$test[] = '1.2.004';
-	function felamimail_upgrade1_2_004()
-	{
-		$GLOBALS['egw_setup']->oProc->query('delete from egw_felamimail_folderstatus',__LINE__,__FILE__);
-
-		return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.3.000';
-	}
-
-	$test[] = '1.3.000';
-	function felamimail_upgrade1_3_000()
-	{
-		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_cache','fmail_sender_name',array(
-			'type' => 'varchar',
-			'precision' => '256'
-		));
-		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_cache','fmail_sender_address',array(
-			'type' => 'varchar',
-			'precision' => '256'
-		));
-		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_cache','fmail_to_name',array(
-			'type' => 'varchar',
-			'precision' => '256'
-		));
-		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_cache','fmail_to_address',array(
-			'type' => 'varchar',
-			'precision' => '256'
-		));
-
-		return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.3.001';
-	}
-
-	$test[] = '1.3.001';
-	function felamimail_upgrade1_3_001()
-	{
-		$GLOBALS['egw_setup']->oProc->RenameTable('fm_accounts','egw_felamimail_accounts');
-
-		return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.3.002';
-	}
+	return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.3.006';
+}
 
 
-	$test[] = '1.3.002';
-	function felamimail_upgrade1_3_002()
-	{
-		$GLOBALS['egw_setup']->oProc->CreateTable('egw_felamimail_signatures',array(
-			'fd' => array(
-				'fm_signatureid' => array('type' => 'auto'),
-				'fm_accountid' => array('type' => 'int','precision' => '11'),
-				'fm_signature' => array('type' => 'text'),
-				'fm_description' => array('type' => 'varchar','precision' => '255')
-			),
-			'pk' => array('fm_signatureid'),
-			'fk' => array(),
-			'ix' => array(),
-			'uc' => array(array('fm_signatureid','fm_accountid'))
-		));
-
-		return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.3.003';
-	}
+function felamimail_upgrade1_3_006()
+{
+	return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.4';
+}
 
 
-	$test[] = '1.3.003';
-	function felamimail_upgrade1_3_003()
-	{
-		#$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_ic_encryption',array(
-		#	'type' => 'int',
-		#	'precision' => '4',
-		#	'nullable' => False
-		#));
-
-		$GLOBALS['egw_setup']->oProc->RefreshTable('egw_felamimail_accounts',array(
- 			'fd' => array(
-					'fm_owner' => array('type' => 'int','precision' => '4','nullable' => False),
-					'fm_id' => array('type' => 'auto'),
-					'fm_realname' => array('type' => 'varchar','precision' => '128'),
-					'fm_organization' => array('type' => 'varchar','precision' => '128'),
-					'fm_emailaddress' => array('type' => 'varchar','precision' => '128','nullable' => False),
-					'fm_ic_hostname' => array('type' => 'varchar','precision' => '128','nullable' => False),
-					'fm_ic_port' => array('type' => 'int','precision' => '4','nullable' => False),
-					'fm_ic_username' => array('type' => 'varchar','precision' => '128','nullable' => False),
-					'fm_ic_password' => array('type' => 'varchar','precision' => '128'),
-					'fm_ic_encryption' => array('type' => 'int','precision' => '4'),
-					'fm_og_hostname' => array('type' => 'varchar','precision' => '128','nullable' => False),
-					'fm_og_port' => array('type' => 'int','precision' => '4','nullable' => False),
-					'fm_og_smtpauth' => array('type' => 'bool','nullable' => False),
-					'fm_og_username' => array('type' => 'varchar','precision' => '128'),
-					'fm_og_password' => array('type' => 'varchar','precision' => '128'),
-					'fm_active' => array('type' => 'bool','nullable' => False),
-					'fm_ic_validatecertificate' => array('type' => 'bool','nullable' => False),
-				),
-			'pk' => array('fm_id'),
-			'fk' => array(),
-			'ix' => array('fm_owner'),
-			'uc' => array()
-			), array(
-				'fm_ic_encryption' => "CASE WHEN fm_ic_encryption THEN 1 ELSE 0 END",
-			)
-		);
-
-		return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.3.004';
-	}
-
-
-	$test[] = '1.3.004';
-	function felamimail_upgrade1_3_004()
-	{
-		$GLOBALS['egw_setup']->oProc->AddColumn('egw_felamimail_signatures','fm_defaultsignature',array(
-			'type' => 'bool'
-		));
-
-		return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.3.005';
-	}
-
-
-	$test[] = '1.3.005';
-	function felamimail_upgrade1_3_005()
-	{
-		$GLOBALS['egw_setup']->oProc->AddColumn('egw_felamimail_accounts','fm_ic_enable_sieve',array(
-			'type' => 'bool',
-			'precision' => '255'
-		));
-		$GLOBALS['egw_setup']->oProc->AddColumn('egw_felamimail_accounts','fm_ic_sieve_server',array(
-			'type' => 'varchar',
-			'precision' => '128'
-		));
-		$GLOBALS['egw_setup']->oProc->AddColumn('egw_felamimail_accounts','fm_ic_sieve_port',array(
-			'type' => 'int',
-			'precision' => '4'
-		));
-
-		return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.3.006';
-	}
-
-
-	$test[] = '1.3.006';
-	function felamimail_upgrade1_3_006()
-	{
-		return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.4';
-	}
-
-    $test[] = '1.4';
-    function felamimail_upgrade1_4()
-    {
-		$GLOBALS['egw_setup']->oProc->DropTable('egw_felamimail_cache');
-		$GLOBALS['egw_setup']->oProc->DropTable('egw_felamimail_displayfilter');
-		$GLOBALS['egw_setup']->oProc->DropTable('egw_felamimail_folderstatus');
-        $GLOBALS['egw_setup']->oProc->AddColumn('egw_felamimail_accounts','fm_signatureid',array(
-            'type' => 'int',
-            'precision' => '4'
-        ));
+function felamimail_upgrade1_4()
+{
+	$GLOBALS['egw_setup']->oProc->DropTable('egw_felamimail_cache');
+	$GLOBALS['egw_setup']->oProc->DropTable('egw_felamimail_displayfilter');
+	$GLOBALS['egw_setup']->oProc->DropTable('egw_felamimail_folderstatus');
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_felamimail_accounts','fm_signatureid',array(
+		'type' => 'int',
+		'precision' => '4'
+	));
  
-        return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.5.001';
-    }
+	return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.5.001';
+}
 
-    $test[] = '1.5.001';
-    function felamimail_upgrade1_5_001()
-    {
 
-        $GLOBALS['egw_setup']->oProc->CreateTable('egw_felamimail_displayfilter',
+function felamimail_upgrade1_5_001()
+{
+	$GLOBALS['egw_setup']->oProc->CreateTable('egw_felamimail_displayfilter',
             Array(
                 'fd' => array(
                     'fmail_filter_accountid'     => array('type' => 'int', 'precision' => 4, 'nullable' => false),
@@ -484,61 +454,66 @@
                 'ix' => array(),
                 'uc' => array()
             )
-		);
-        return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.5.002';
-    }
+	);
+	return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.5.002';
+}
 
-	$test[] = '1.5.002';
-	function felamimail_upgrade1_5_002()
-	{
-		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_ic_encryption',array(
-			'type' => 'int',
-			'precision' => '4',
-		));
-		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_ic_hostname',array(
-			'type' => 'varchar',
-			'precision' => '128',
-		));
-		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_ic_port',array(
-			'type' => 'int',
-			'precision' => '4',
-		));
-		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_ic_username',array(
-			'type' => 'varchar',
-			'precision' => '128',
-		));
-		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_ic_validatecertificate',array(
-			'type' => 'bool',
-		));
-		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_og_hostname',array(
-			'type' => 'varchar',
-			'precision' => '128',
-		));
-		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_og_port',array(
-			'type' => 'int',
-			'precision' => '4',
-		));
-		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_og_smtpauth',array(
-			'type' => 'bool',
-		)); 
-		return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.5.003';
-	}
 
-	$test[] = '1.5.003';
-	function felamimail_upgrade1_5_003()
-	{
-		$GLOBALS['egw_setup']->oProc->AddColumn('egw_felamimail_accounts','fm_ic_folderstoshowinhome',  array('type' => 'text'));
-		$GLOBALS['egw_setup']->oProc->AddColumn('egw_felamimail_accounts','fm_ic_sentfolder', array('type' => 'varchar','precision' => '128'));
-		$GLOBALS['egw_setup']->oProc->AddColumn('egw_felamimail_accounts','fm_ic_trashfolder',  array('type' => 'varchar','precision' => '128'));
-		$GLOBALS['egw_setup']->oProc->AddColumn('egw_felamimail_accounts','fm_ic_draftfolder',  array('type' => 'varchar','precision' => '128'));
-		$GLOBALS['egw_setup']->oProc->AddColumn('egw_felamimail_accounts','fm_ic_templatefolder',  array('type' => 'varchar','precision' => '128'));
-		return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.6.001';
-	}
+function felamimail_upgrade1_5_002()
+{
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_ic_encryption',array(
+		'type' => 'int',
+		'precision' => '4',
+	));
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_ic_hostname',array(
+		'type' => 'varchar',
+		'precision' => '128',
+	));
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_ic_port',array(
+		'type' => 'int',
+		'precision' => '4',
+	));
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_ic_username',array(
+		'type' => 'varchar',
+		'precision' => '128',
+	));
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_ic_validatecertificate',array(
+		'type' => 'bool',
+	));
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_og_hostname',array(
+		'type' => 'varchar',
+		'precision' => '128',
+	));
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_og_port',array(
+		'type' => 'int',
+		'precision' => '4',
+	));
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_og_smtpauth',array(
+		'type' => 'bool',
+	)); 
+	return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.5.003';
+}
 
-	$test[] = '1.6.001';
-	function felamimail_upgrade1_6_001()
-	{
-		// no real changes here
-		return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.7.001';
-	}
-?>
+
+function felamimail_upgrade1_5_003()
+{
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_felamimail_accounts','fm_ic_folderstoshowinhome',  array('type' => 'text'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_felamimail_accounts','fm_ic_sentfolder', array('type' => 'varchar','precision' => '128'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_felamimail_accounts','fm_ic_trashfolder',  array('type' => 'varchar','precision' => '128'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_felamimail_accounts','fm_ic_draftfolder',  array('type' => 'varchar','precision' => '128'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_felamimail_accounts','fm_ic_templatefolder',  array('type' => 'varchar','precision' => '128'));
+	return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.6.001';
+}
+
+
+function felamimail_upgrade1_6_001()
+{
+	// no real changes here
+	return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.7.001';
+}
+
+
+function felamimail_upgrade1_7_001()
+{
+	return $GLOBALS['setup_info']['felamimail']['currentver'] = '1.8';
+}
diff --git a/filemanager/setup/setup.inc.php b/filemanager/setup/setup.inc.php
index d5cfa82a42..22ec04704b 100755
--- a/filemanager/setup/setup.inc.php
+++ b/filemanager/setup/setup.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * eGroupWare - Filemanager - setup
+ * EGroupware - Filemanager - setup
  *
  * @link http://www.egroupware.org
  * @package filemanager
@@ -10,7 +10,7 @@
 
 $setup_info['filemanager']['name']    = 'filemanager';
 $setup_info['filemanager']['title']   = 'Filemanager';
-$setup_info['filemanager']['version'] = '1.6';
+$setup_info['filemanager']['version'] = '1.8';
 $setup_info['filemanager']['app_order'] = 6;
 $setup_info['filemanager']['enable']  = 1;
 $setup_info['filemanager']['index']   = 'filemanager.filemanager_ui.index';
@@ -33,5 +33,5 @@ $setup_info['filemanager']['hooks']['admin'] = 'filemanager_hooks::admin';
 /* Dependencies for this app to work */
 $setup_info['filemanager']['depends'][] = array(
 	'appname' => 'phpgwapi',
-	'versions' => array('1.5','1.6','1.7')
+	'versions' => array('1.7','1.8','1.9')
 );
diff --git a/home/setup/setup.inc.php b/home/setup/setup.inc.php
index 9ebcfe826d..7b503f9a34 100755
--- a/home/setup/setup.inc.php
+++ b/home/setup/setup.inc.php
@@ -1,32 +1,34 @@
 <?php
-	/**************************************************************************\
-	* eGroupWare - Home                                                        *
-	* http://www.egroupware.org                                                *
-	* --------------------------------------------                             *
-	*  This program is free software; you can redistribute it and/or modify it *
-	*  under the terms of the GNU General Public License as published by the   *
-	*  Free Software Foundation; either version 2 of the License, or (at your  *
-	*  option) any later version.                                              *
-	\**************************************************************************/
+/**
+ * EGroupware Home
+ *
+ * @link http://www.egroupware.org
+ * @package home
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @version $Id$
+ */
 
-	/* $Id$ */
+/* Basic information about this app */
+$setup_info['home']['name']      = 'home';
+$setup_info['home']['title']     = 'Home';
+$setup_info['home']['version']   = '1.8';
+$setup_info['home']['app_order'] = 1;
+$setup_info['home']['enable']    = 1;
 
-	/* Basic information about this app */
-	$setup_info['home']['name']      = 'home';
-	$setup_info['home']['title']     = 'Home';
-	$setup_info['home']['version']   = '1.4';
-	$setup_info['home']['app_order'] = 1;
-	$setup_info['home']['enable']    = 1;
+$setup_info['home']['author'] = 'eGroupWare Core Team';
+$setup_info['home']['license']  = 'GPL';
+$setup_info['home']['description'] = 'Displays eGroupWare\' homepage';
+$setup_info['home']['maintainer'] = array(
+	'name' => 'eGroupWare Developers',
+	'email' => 'egroupware-developers@lists.sourceforge.net'
+);
 
-	$setup_info['home']['author'] = 'eGroupWare Core Team';
-	$setup_info['home']['license']  = 'GPL';
-	$setup_info['home']['description'] = 'Displays eGroupWare\' homepage';
-	$setup_info['home']['maintainer'] = array(
-		'name' => 'eGroupWare Developers',
-		'email' => 'egroupware-developers@lists.sourceforge.net'
-	);
-
-	/* The hooks this app includes, needed for hooks registration */
-	$setup_info['home']['hooks']['hasUpdates'] = 'home.updates.hasUpdates';
-	$setup_info['home']['hooks']['showUpdates'] = 'home.updates.showUpdates';
-?>
+/* The hooks this app includes, needed for hooks registration */
+$setup_info['home']['hooks']['hasUpdates'] = 'home.updates.hasUpdates';
+$setup_info['home']['hooks']['showUpdates'] = 'home.updates.showUpdates';
+	
+/* Dependencies for this app to work */
+$setup_info['home']['depends'][] = array(
+	'appname' => 'phpgwapi',
+	'versions' => Array('1.7','1.8','1.9')
+);
diff --git a/importexport/setup/setup.inc.php b/importexport/setup/setup.inc.php
index 13f8bcbf48..ded58f2477 100644
--- a/importexport/setup/setup.inc.php
+++ b/importexport/setup/setup.inc.php
@@ -1,7 +1,8 @@
 <?php
 /**
- * importexport
+ * EGroupware - importexport
  *
+ * @link www.egroupware.org
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @package importexport
  * @author Cornelius Weiss <nelius@cwtech.de>
@@ -9,7 +10,7 @@
  */
 
 $setup_info['importexport']['name']      = 'importexport';
-$setup_info['importexport']['version']   = '1.7.001';
+$setup_info['importexport']['version']   = '1.8';
 $setup_info['importexport']['app_order'] = 2;
 $setup_info['importexport']['enable']    = 2;
 $setup_info['importexport']['tables']    = array('egw_importexport_definitions');
@@ -33,11 +34,11 @@ $setup_info['importexport']['hooks']['sidebox_menu'] = 'importexport_admin_prefs
 /* Dependencies for this app to work */
 $setup_info['importexport']['depends'][] = array(
 	 'appname' => 'phpgwapi',
-	 'versions' => Array('1.6','1.7')
+	 'versions' => Array('1.7','1.8','1.9')
 );
 $setup_info['importexport']['depends'][] = array(
 	 'appname' => 'etemplate',
-	 'versions' => Array('1.6','1.7')
+	 'versions' => Array('1.7','1.8','1.9')
 );
 
 // installation checks for importexport
diff --git a/importexport/setup/tables_update.inc.php b/importexport/setup/tables_update.inc.php
index 9d32ff1740..64364a8fe7 100755
--- a/importexport/setup/tables_update.inc.php
+++ b/importexport/setup/tables_update.inc.php
@@ -1,40 +1,43 @@
 <?php
+/**
+ * EGroupware - Setup
+ * 
+ * @link http://www.egroupware.org 
+ * Created by eTemplates DB-Tools written by ralfbecker@outdoor-training.de
+ *
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package importexport
+ * @subpackage setup
+ * @version $Id: class.db_tools.inc.php 21408 2006-04-21 10:31:06Z nelius_weiss $
+ */
 
-	/**
-	 * eGroupWare - Setup
-	 * http://www.egroupware.org 
-	 * Created by eTemplates DB-Tools written by ralfbecker@outdoor-training.de
-	 *
-	 * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
-	 * @package importexport
-	 * @subpackage setup
-	 * @version $Id: class.db_tools.inc.php 21408 2006-04-21 10:31:06Z nelius_weiss $
-	 */
+function importexport_upgrade0_002()
+{
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_importexport_definitions','description',array(
+		'type' => 'varchar',
+		'precision' => '255'
+	));
 
-	$test[] = '0.002';
-	function importexport_upgrade0_002()
-	{
-		$GLOBALS['egw_setup']->oProc->AddColumn('egw_importexport_definitions','description',array(
-			'type' => 'varchar',
-			'precision' => '255'
-		));
-
-		return $GLOBALS['setup_info']['importexport']['currentver'] = '0.003';
-	}
+	return $GLOBALS['setup_info']['importexport']['currentver'] = '0.003';
+}
 
 
-	$test[] = '0.003';
-	function importexport_upgrade0_003()
-	{
-		return $GLOBALS['setup_info']['importexport']['currentver'] = '1.4';
-	}
+function importexport_upgrade0_003()
+{
+	return $GLOBALS['setup_info']['importexport']['currentver'] = '1.4';
+}
 
-	$test[] = '1.4';
-	function importexport_upgrade1_4()
-	{
-		$sql = 'UPDATE egw_importexport_definitions SET plugin = CONCAT(application, "_", plugin)';
 
-		$GLOBALS['egw_setup']->db->query($sql, __LINE__, __FILE__);
-		return $GLOBALS['setup_info']['importexport']['currentver'] = '1.7.001';
-	}
-?>
+function importexport_upgrade1_4()
+{
+	$sql = 'UPDATE egw_importexport_definitions SET plugin = CONCAT(application, "_", plugin)';
+
+	$GLOBALS['egw_setup']->db->query($sql, __LINE__, __FILE__);
+	return $GLOBALS['setup_info']['importexport']['currentver'] = '1.7.001';
+}
+
+
+function importexport_upgrade1_7_001()
+{
+	return $GLOBALS['setup_info']['importexport']['currentver'] = '1.8';
+}
diff --git a/infolog/setup/setup.inc.php b/infolog/setup/setup.inc.php
index 7fdfb97684..bc5fa4f04d 100755
--- a/infolog/setup/setup.inc.php
+++ b/infolog/setup/setup.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * InfoLog - Setup
+ * EGroupware - InfoLog - Setup
  *
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
@@ -12,7 +12,7 @@
  */
 
 $setup_info['infolog']['name']      = 'infolog';
-$setup_info['infolog']['version']   = '1.6';
+$setup_info['infolog']['version']   = '1.8';
 $setup_info['infolog']['app_order'] = 5;
 $setup_info['infolog']['tables']    = array('egw_infolog','egw_infolog_extra');
 $setup_info['infolog']['enable']    = 1;
@@ -64,9 +64,9 @@ $setup_info['infolog']['hooks']['pm_custom_app_icons'] = 'infolog.infolog_bo.pm_
 /* Dependencies for this app to work */
 $setup_info['infolog']['depends'][] = array(
 	'appname' => 'phpgwapi',
-	'versions' => Array('1.5','1.6','1.7')
+	'versions' => Array('1.7','1.8','1.9')
 );
 $setup_info['infolog']['depends'][] = array(
 	'appname' => 'etemplate',
-	'versions' => Array('1.5','1.6','1.7')
+	'versions' => Array('1.7','1.8','1.9')
 );
diff --git a/infolog/setup/tables_update.inc.php b/infolog/setup/tables_update.inc.php
index e28dc43137..9ae0ac29c6 100644
--- a/infolog/setup/tables_update.inc.php
+++ b/infolog/setup/tables_update.inc.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * InfoLog - Setup
+ * EGroupware - InfoLog - Setup
  *
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @package infolog
  * @subpackage setup
- * @copyright (c) 2003-8 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2003-10 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
@@ -628,3 +628,9 @@ function infolog_upgrade1_5_004()
 {
 	return $GLOBALS['setup_info']['infolog']['currentver'] = '1.6';
 }
+
+
+function infolog_upgrade1_6()
+{
+	return $GLOBALS['setup_info']['infolog']['currentver'] = '1.8';
+}
diff --git a/notifications/setup/setup.inc.php b/notifications/setup/setup.inc.php
index 59bca50515..225e7c480b 100644
--- a/notifications/setup/setup.inc.php
+++ b/notifications/setup/setup.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * eGroupWare - Notifications
+ * EGroupware - Notifications
  *
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @package notifications
@@ -15,7 +15,7 @@ if (!defined('NOTIFICATION_APP'))
 }
 
 $setup_info[NOTIFICATION_APP]['name']      = NOTIFICATION_APP;
-$setup_info[NOTIFICATION_APP]['version']   = '1.6';
+$setup_info[NOTIFICATION_APP]['version']   = '1.8';
 $setup_info[NOTIFICATION_APP]['app_order'] = 1;
 $setup_info[NOTIFICATION_APP]['tables']    = array('egw_notificationpopup');
 $setup_info[NOTIFICATION_APP]['enable']    = 2;
@@ -42,10 +42,10 @@ $setup_info[NOTIFICATION_APP]['hooks'][] = 'admin';
 /* Dependencies for this app to work */
 $setup_info[NOTIFICATION_APP]['depends'][] = array(
 	 'appname' => 'phpgwapi',
-	 'versions' => Array('1.5','1.6','1.7')
+	 'versions' => Array('1.7','1.8','1.9')
 );
 $setup_info[NOTIFICATION_APP]['depends'][] = array(
 	 'appname' => 'etemplate',
-	 'versions' => Array('1.5','1.6','1.7')
+	 'versions' => Array('1.7','1.8','1.9')
 );
 
diff --git a/notifications/setup/tables_update.inc.php b/notifications/setup/tables_update.inc.php
index 26d7db710e..b7671597d8 100644
--- a/notifications/setup/tables_update.inc.php
+++ b/notifications/setup/tables_update.inc.php
@@ -32,3 +32,9 @@ function notifications_upgrade1_4()
 {
 	return $GLOBALS['setup_info']['notifications']['currentver'] = '1.6';
 }
+
+
+function notifications_upgrade1_6()
+{
+	return $GLOBALS['setup_info']['notifications']['currentver'] = '1.8';
+}
diff --git a/phpgwapi/setup/setup.inc.php b/phpgwapi/setup/setup.inc.php
index 1717902c17..ecab65939e 100755
--- a/phpgwapi/setup/setup.inc.php
+++ b/phpgwapi/setup/setup.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * eGroupWare - API Setup
+ * EGroupware - API Setup
  *
  * @link http://www.egroupware.org
  * @package api
@@ -12,7 +12,7 @@
 /* Basic information about this app */
 $setup_info['phpgwapi']['name']      = 'phpgwapi';
 $setup_info['phpgwapi']['title']     = 'eGroupWare API';
-$setup_info['phpgwapi']['version']   = '1.7.003';
+$setup_info['phpgwapi']['version']   = '1.9.001';
 $setup_info['phpgwapi']['versions']['current_header'] = '1.29';
 $setup_info['phpgwapi']['enable']    = 3;
 $setup_info['phpgwapi']['app_order'] = 1;
@@ -65,7 +65,7 @@ $setup_info['phpgwapi']['hooks']['editgroup']		= 'phpgwapi.vfs_home_hooks.editGr
 
 /* CalDAV/CardDAV/GroupDAV app */
 $setup_info['groupdav']['name']      = 'groupdav';
-$setup_info['groupdav']['version']   = '1.6';
+$setup_info['groupdav']['version']   = '1.8';
 $setup_info['groupdav']['enable']    = 2;
 $setup_info['groupdav']['app_order'] = 1;
 $setup_info['groupdav']['icon']      = 'groupdav';
diff --git a/phpgwapi/setup/tables_update.inc.php b/phpgwapi/setup/tables_update.inc.php
index aa3e4ef4cb..4110258f54 100644
--- a/phpgwapi/setup/tables_update.inc.php
+++ b/phpgwapi/setup/tables_update.inc.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * eGroupWare - API Setup
+ * EGroupware - API Setup
  *
- * Update scripts 1.6 --> 1.8
+ * Update scripts 1.8 --> 2.0
  *
  * @link http://www.egroupware.org
  * @package api
@@ -19,46 +19,12 @@ include('tables_update_0_9_14.inc.php');
 include('tables_update_1_0.inc.php');
 include('tables_update_1_2.inc.php');
 include('tables_update_1_4.inc.php');
+include('tables_update_1_6.inc.php');
 
 /**
- * Update from the stable 1.6 branch to the new devel branch 1.7.xxx
+ * Update from the stable 1.8 branch to the new devel branch 1.9.xxx
  */
-function phpgwapi_upgrade1_6_001()
+function phpgwapi_upgrade1_8_001()
 {
-	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.7.001';
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.9.001';
 }
-
-function phpgwapi_upgrade1_6_002()
-{
-	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.7.001';
-}
-
-function phpgwapi_upgrade1_6_003()
-{
-	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.7.001';
-}
-
-function phpgwapi_upgrade1_7_001()
-{
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_sqlfs','fs_link',array(
-		'type' => 'varchar',
-		'precision' => '255'
-	));
-	// moving symlinks from fs_content to fs_link
-	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_sqlfs SET fs_link=fs_content,fs_content=NULL WHERE fs_mime='application/x-symlink'",__LINE__,__FILE__);
-
-	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.7.002';
-}
-
-
-function phpgwapi_upgrade1_7_002()
-{
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_sqlfs','fs_mime',array(
-		'type' => 'varchar',
-		'precision' => '96',
-		'nullable' => False
-	));
-
-	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.7.003';
-}
-
diff --git a/phpgwapi/setup/tables_update_1_6.inc.php b/phpgwapi/setup/tables_update_1_6.inc.php
new file mode 100644
index 0000000000..fc260748ca
--- /dev/null
+++ b/phpgwapi/setup/tables_update_1_6.inc.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * EGroupware - API Setup
+ *
+ * Update scripts 1.6 --> 1.8
+ *
+ * @link http://www.egroupware.org
+ * @package api
+ * @subpackage setup
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @version $Id$
+ */
+
+/**
+ * Update from the stable 1.6 branch to the new devel branch 1.7.xxx
+ */
+function phpgwapi_upgrade1_6_001()
+{
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.7.001';
+}
+
+function phpgwapi_upgrade1_6_002()
+{
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.7.001';
+}
+
+function phpgwapi_upgrade1_6_003()
+{
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.7.001';
+}
+
+function phpgwapi_upgrade1_7_001()
+{
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_sqlfs','fs_link',array(
+		'type' => 'varchar',
+		'precision' => '255'
+	));
+	// moving symlinks from fs_content to fs_link
+	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_sqlfs SET fs_link=fs_content,fs_content=NULL WHERE fs_mime='application/x-symlink'",__LINE__,__FILE__);
+
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.7.002';
+}
+
+
+function phpgwapi_upgrade1_7_002()
+{
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_sqlfs','fs_mime',array(
+		'type' => 'varchar',
+		'precision' => '96',
+		'nullable' => False
+	));
+
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.7.003';
+}
+
+
+function phpgwapi_upgrade1_7_003()
+{
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_sqlfs','fs_mime',array(
+		'type' => 'varchar',
+		'precision' => '96',
+		'nullable' => False
+	));
+
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.8.001';
+}
diff --git a/preferences/setup/setup.inc.php b/preferences/setup/setup.inc.php
index 1e96da59a6..3226c46e32 100755
--- a/preferences/setup/setup.inc.php
+++ b/preferences/setup/setup.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * eGroupWare - Preferences
+ * EGroupware - Preferences
  *
  * @link http://www.egroupware.org
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
@@ -11,7 +11,7 @@
 
 $setup_info['preferences']['name']      = 'preferences';
 $setup_info['preferences']['title']     = 'Preferences';
-$setup_info['preferences']['version']   = '1.7';
+$setup_info['preferences']['version']   = '1.8';
 $setup_info['preferences']['app_order'] = 1;
 $setup_info['preferences']['tables']    = '';
 $setup_info['preferences']['enable']    = 2;
@@ -27,7 +27,7 @@ $setup_info['preferences']['hooks']['edit_user']     = 'preferences.uisettings.e
 /* Dependencies for this app to work */
 $setup_info['preferences']['depends'][] = array(
 	'appname' => 'phpgwapi',
-	'versions' => Array('1.2','1.3','1.4','1.5','1.6','1.7')
+	'versions' => Array('1.7','1.8','1.9')
 );
 
 /**
diff --git a/resources/setup/setup.inc.php b/resources/setup/setup.inc.php
index 5c80b2f808..c37c018071 100755
--- a/resources/setup/setup.inc.php
+++ b/resources/setup/setup.inc.php
@@ -13,7 +13,7 @@
 
 $setup_info['resources']['name']	= 'resources';
 $setup_info['resources']['title']	= 'Resources';
-$setup_info['resources']['version']	= '1.6';
+$setup_info['resources']['version']	= '1.8';
 $setup_info['resources']['app_order']	= 5;
 $setup_info['resources']['tables']	= array('egw_resources','egw_resources_extra');
 $setup_info['resources']['enable']	= 1;
@@ -38,9 +38,9 @@ $setup_info['resources']['hooks']['calendar_resources']	= 'resources.resources_h
 
 $setup_info['resources']['depends'][]	= array(
 	 'appname' => 'phpgwapi',
-	 'versions' => Array('1.3','1.4','1.5','1.6','1.7')
+	 'versions' => Array('1.7','1.8','1.9')
 );
 $setup_info['resources']['depends'][]	= array( // cause eTemplates is not in the api yet
 	 'appname' => 'etemplate',
-	 'versions' => Array('1.3','1.4','1.5','1.6','1.7')
+	 'versions' => Array('1.7','1.8','1.9')
 );
diff --git a/resources/setup/tables_update.inc.php b/resources/setup/tables_update.inc.php
index 6a91cf1204..156547c1df 100755
--- a/resources/setup/tables_update.inc.php
+++ b/resources/setup/tables_update.inc.php
@@ -312,3 +312,9 @@ function resources_upgrade1_4()
 	}
 	return $GLOBALS['setup_info']['resources']['currentver'] = '1.6';
 }
+
+
+function resources_upgrade1_6()
+{
+	return $GLOBALS['setup_info']['resources']['currentver'] = '1.8';
+}
diff --git a/timesheet/setup/setup.inc.php b/timesheet/setup/setup.inc.php
index e2096ab504..861ad3b17b 100644
--- a/timesheet/setup/setup.inc.php
+++ b/timesheet/setup/setup.inc.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * TimeSheet - setup definitions
+ * EGroupware - TimeSheet - setup definitions
  *
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @package timesheet
  * @subpackage setup
- * @copyright (c) 2005/6 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2005-10 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
@@ -17,7 +17,7 @@ if (!defined('TIMESHEET_APP'))
 }
 
 $setup_info[TIMESHEET_APP]['name']      = TIMESHEET_APP;
-$setup_info[TIMESHEET_APP]['version']   = '1.7.001';
+$setup_info[TIMESHEET_APP]['version']   = '1.8';
 $setup_info[TIMESHEET_APP]['app_order'] = 5;
 $setup_info[TIMESHEET_APP]['tables']    = array('egw_timesheet','egw_timesheet_extra');
 $setup_info[TIMESHEET_APP]['enable']    = 1;
@@ -47,9 +47,9 @@ $setup_info[TIMESHEET_APP]['hooks']['pm_cumulate'] = 'timesheet_hooks::cumulate'
 /* Dependencies for this app to work */
 $setup_info[TIMESHEET_APP]['depends'][] = array(
 	 'appname' => 'phpgwapi',
-	 'versions' => Array('1.5','1.6','1.7')
+	 'versions' => Array('1.7','1.8','1.9')
 );
 $setup_info[TIMESHEET_APP]['depends'][] = array(
 	 'appname' => 'etemplate',
-	 'versions' => Array('1.5','1.6','1.7')
+	 'versions' => Array('1.7','1.8','1.9')
 );
diff --git a/timesheet/setup/tables_update.inc.php b/timesheet/setup/tables_update.inc.php
index a5bee0cf66..6e4b18b0b7 100644
--- a/timesheet/setup/tables_update.inc.php
+++ b/timesheet/setup/tables_update.inc.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * TimeSheet - setup table updates
+ * EGroupware - TimeSheet - setup table updates
  *
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @package timesheet
  * @subpackage setup
- * @copyright (c) 2005-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2005-10 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
@@ -55,6 +55,7 @@ function timesheet_upgrade1_4()
 	return $GLOBALS['setup_info']['timesheet']['currentver'] = '1.6';
 }
 
+
 function timesheet_upgrade1_6()
 {
 	$GLOBALS['egw_setup']->oProc->AddColumn('egw_timesheet','ts_status',array(
@@ -67,3 +68,8 @@ function timesheet_upgrade1_6()
 	return $GLOBALS['setup_info']['timesheet']['currentver'] = '1.7.001';
 }
 
+
+function timesheet_upgrade1_7_001()
+{
+	return $GLOBALS['setup_info']['timesheet']['currentver'] = '1.8';
+}