diff --git a/mail/inc/class.mail_bo.inc.php b/mail/inc/class.mail_bo.inc.php
index 5c633d2ac5..5dd362d6e8 100644
--- a/mail/inc/class.mail_bo.inc.php
+++ b/mail/inc/class.mail_bo.inc.php
@@ -759,7 +759,7 @@ class mail_bo
 		$foldersNameSpace = array();
 		$delimiter = $this->getHierarchyDelimiter();
 		// TODO: cache by $this->icServer->ImapServerId
-		if (is_null($nameSpace)) $nameSpace = $this->icServer->getNameSpaces();
+		if (is_null($nameSpace)) $nameSpace = $this->icServer->getNameSpaceArray();
 		if (is_array($nameSpace)) {
 			foreach($nameSpace as $type => $singleNameSpace) {
 				$prefix_present = false;
diff --git a/mail/inc/class.mail_bopreferences.inc.php b/mail/inc/class.mail_bopreferences.inc.php
index c6dd856681..8dff5735d5 100644
--- a/mail/inc/class.mail_bopreferences.inc.php
+++ b/mail/inc/class.mail_bopreferences.inc.php
@@ -110,7 +110,7 @@ class mail_bopreferences extends mail_sopreferences
 		$accountData = array_shift($accountData);
 		//_debug_array($accountData);
 
-		$icServer = CreateObject('emailadmin.defaultimap');
+		$icServer = new emailadmin_oldimap();
 		$icServer->ImapServerId	= $accountData['id'];
 		$icServer->encryption	= isset($accountData['ic_encryption']) ? $accountData['ic_encryption'] : 1;
 		$icServer->host		= $accountData['ic_hostname'];
@@ -166,7 +166,7 @@ class mail_bopreferences extends mail_sopreferences
 		#_debug_array($accountData);
 		foreach ($AllAccountData as $key => $accountData)
 		{
-			$icServer = CreateObject('emailadmin.defaultimap');
+			$icServer = new emailadmin_oldimap();
 			$icServer->ImapServerId	= $accountData['id'];
 			$icServer->encryption	= isset($accountData['ic_encryption']) ? $accountData['ic_encryption'] : 1;
 			$icServer->host		= $accountData['ic_hostname'];
diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 753e6fd453..5f6e572709 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -61,7 +61,7 @@ class mail_ui
 	/**
 	 * instance of mail_bo
 	 *
-	 * @var object
+	 * @var mail_bo
 	 */
 	var $mail_bo;
 
@@ -86,7 +86,7 @@ class mail_ui
 	 */
 	var $statusTypes = array(
 		'any'		=> 'any status',// lang('any status')
-		'flagged'	=> 'flagged',	// lang('flagged')	
+		'flagged'	=> 'flagged',	// lang('flagged')
 		'unseen'	=> 'unread',	// lang('unread')
 		'answered'	=> 'replied',	// lang('replied')
 		'seen'		=> 'read',		// lang('read')
@@ -1959,7 +1959,7 @@ unset($query['actions']);
 					);
 */
 					$decodedPersonalName = $realName;
-/*						
+/*
 					if (!empty($decodedPersonalName)) {
 						if($spacePos = strrpos($decodedPersonalName, ' ')) {
 							$linkData['presets[n_family]']	= substr($decodedPersonalName, $spacePos+1);