EGroupware / egroupware

api/src/Mail.php

Spacing +1134 added lines, -1135 removed lines

@@ -121,7 +121,7 @@ 
 	 *
 	 * @array
 	 */
-	static $tidy_config = array('clean'=>false,'output-html'=>true,'join-classes'=>true,'join-styles'=>true,'show-body-only'=>"auto",'word-2000'=>true,'wrap'=>0);
+	static $tidy_config = array('clean'=>false, 'output-html'=>true, 'join-classes'=>true, 'join-styles'=>true, 'show-body-only'=>"auto", 'word-2000'=>true, 'wrap'=>0);
 
 	/**
 	 * static used to configure htmLawed, for use with emails
@@ -131,9 +131,9 @@ 
 	static $htmLawed_config = array('comment'=>1, //remove comments
 		'make_tag_strict' => 3, // 3 is a new own config value, to indicate that transformation is to be performed, but don't transform font as size transformation of numeric sizes to keywords alters the intended result too much
 		'keep_bad'=>2, //remove tags but keep element content (4 and 6 keep element content only if text (pcdata) is valid in parent element as per specs, this may lead to textloss if balance is switched on)
-		'balance'=>1,//turn off tag-balancing (config['balance']=>0). That will not introduce any security risk; only standards-compliant tag nesting check/filtering will be turned off (basic tag-balance will remain; i.e., there won't be any unclosed tag, etc., after filtering)
+		'balance'=>1, //turn off tag-balancing (config['balance']=>0). That will not introduce any security risk; only standards-compliant tag nesting check/filtering will be turned off (basic tag-balance will remain; i.e., there won't be any unclosed tag, etc., after filtering)
 		'direct_list_nest' => 1,
-		'allow_for_inline' => array('table','div','li','p'),//block elements allowed for nesting when only inline is allowed; Example span does not allow block elements as table; table is the only element tested so far
+		'allow_for_inline' => array('table', 'div', 'li', 'p'), //block elements allowed for nesting when only inline is allowed; Example span does not allow block elements as table; table is the only element tested so far
 		// tidy eats away even some wanted whitespace, so we switch it off;
 		// we used it for its compacting and beautifying capabilities, which resulted in better html for further processing
 		'tidy'=>0,
@@ -148,13 +148,13 @@ 
 	 *
 	 * @array
 	 */
-	static $aclShortCuts = array('' => array('label'=>'none','title'=>'The user has no rights whatsoever.'),
-		'lrs'		=> array('label'=>'readable','title'=>'Allows a user to read the contents of the mailbox.'),
-		'lprs'		=> array('label'=>'post','title'=>'Allows a user to read the mailbox and post to it through the delivery system by sending mail to the submission address of the mailbox.'),
-		'ilprs'		=> array('label'=>'append','title'=>'Allows a user to read the mailbox and append messages to it, either via IMAP or through the delivery system.'),
-		'cdilprsw'	=> array('label'=>'write','title'=>'Allows a user to read the maibox, post to it, append messages to it, and delete messages or the mailbox itself. The only right not given is the right to change the ACL of the mailbox.'),
-		'acdilprsw'	=> array('label'=>'all','title'=>'The user has all possible rights on the mailbox. This is usually granted to users only on the mailboxes they own.'),
-		'custom'	=> array('label'=>'custom','title'=>'User defined combination of rights for the ACL'),
+	static $aclShortCuts = array('' => array('label'=>'none', 'title'=>'The user has no rights whatsoever.'),
+		'lrs'		=> array('label'=>'readable', 'title'=>'Allows a user to read the contents of the mailbox.'),
+		'lprs'		=> array('label'=>'post', 'title'=>'Allows a user to read the mailbox and post to it through the delivery system by sending mail to the submission address of the mailbox.'),
+		'ilprs'		=> array('label'=>'append', 'title'=>'Allows a user to read the mailbox and append messages to it, either via IMAP or through the delivery system.'),
+		'cdilprsw'	=> array('label'=>'write', 'title'=>'Allows a user to read the maibox, post to it, append messages to it, and delete messages or the mailbox itself. The only right not given is the right to change the ACL of the mailbox.'),
+		'acdilprsw'	=> array('label'=>'all', 'title'=>'The user has all possible rights on the mailbox. This is usually granted to users only on the mailboxes they own.'),
+		'custom'	=> array('label'=>'custom', 'title'=>'User defined combination of rights for the ACL'),
 	);
 
 	/**
@@ -196,27 +196,27 @@ 
 	 * @param boolean $_reuseCache = null if null it is set to the value of $_restoreSession
 	 * @return Mail
 	 */
-	public static function getInstance($_restoreSession=true, &$_profileID=0, $_validate=true, $_oldImapServerObject=false, $_reuseCache=null)
+	public static function getInstance($_restoreSession = true, &$_profileID = 0, $_validate = true, $_oldImapServerObject = false, $_reuseCache = null)
 	{
 		//$_restoreSession=false;
 		if (is_null($_reuseCache)) $_reuseCache = $_restoreSession;
 		//error_log(__METHOD__.' ('.__LINE__.') '.' RestoreSession:'.$_restoreSession.' ProfileId:'.$_profileID.'/'.Mail\Account::get_default_acc_id().' for user:'.$GLOBALS['egw_info']['user']['account_lid'].' called from:'.function_backtrace());
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($_oldImapServerObject));
-		if (isset(self::$profileDefunct[$_profileID]) && self::$profileDefunct[$_profileID]===true)
+		if (isset(self::$profileDefunct[$_profileID]) && self::$profileDefunct[$_profileID] === true)
 		{
-			throw new Exception(__METHOD__." failed to instanciate Mail for $_profileID / ".$this->profileID." with error:".$e->getMessage().($e->details?', '.$e->details:''));
+			throw new Exception(__METHOD__." failed to instanciate Mail for $_profileID / ".$this->profileID." with error:".$e->getMessage().($e->details ? ', '.$e->details : ''));
 		}
 		if ($_oldImapServerObject instanceof Mail\Imap)
 		{
 			if (!is_object(self::$instances[$_profileID]))
 			{
-				self::$instances[$_profileID] = new Mail('utf-8',false,$_profileID,false,$_reuseCache);
+				self::$instances[$_profileID] = new Mail('utf-8', false, $_profileID, false, $_reuseCache);
 			}
 			self::$instances[$_profileID]->icServer = $_oldImapServerObject;
-			self::$instances[$_profileID]->accountid= $_oldImapServerObject->ImapServerId;
-			self::$instances[$_profileID]->profileID= $_oldImapServerObject->ImapServerId;
+			self::$instances[$_profileID]->accountid = $_oldImapServerObject->ImapServerId;
+			self::$instances[$_profileID]->profileID = $_oldImapServerObject->ImapServerId;
 			self::$instances[$_profileID]->mailPreferences = $GLOBALS['egw_info']['user']['preferences']['mail'];
-			self::$instances[$_profileID]->htmlOptions  = self::$instances[$_profileID]->mailPreferences['htmlOptions'];
+			self::$instances[$_profileID]->htmlOptions = self::$instances[$_profileID]->mailPreferences['htmlOptions'];
 			return self::$instances[$_profileID];
 		}
 		if ($_profileID == 0)
@@ -229,14 +229,14 @@ 
 			{
 				$profileID = Mail\Account::get_default_acc_id();
 			}
-			if ($profileID!=$_profileID) $_restoreSession==false;
-			$_profileID=$profileID;
+			if ($profileID != $_profileID) $_restoreSession == false;
+			$_profileID = $profileID;
 			if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' called with profileID==0 using '.$profileID.' instead->'.function_backtrace());
 		}
 		// no validation or restoreSession for old ImapServer Object, just fetch it and return it
-		if ($_oldImapServerObject===true)
+		if ($_oldImapServerObject === true)
 		{
-			return new Mail('utf-8',false,$_profileID,true,$_reuseCache);
+			return new Mail('utf-8', false, $_profileID, true, $_reuseCache);
 		}
 		if ($_profileID != 0 && $_validate)
 		{
@@ -256,9 +256,9 @@ 
 			//Cache::setSession('mail','activeProfileID',$_profileID);
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.' RestoreSession:'.$_restoreSession.' ProfileId:'.$_profileID.' called from:'.function_backtrace());
-		if ($_profileID && (!isset(self::$instances[$_profileID]) || $_restoreSession===false))
+		if ($_profileID && (!isset(self::$instances[$_profileID]) || $_restoreSession === false))
 		{
-			self::$instances[$_profileID] = new Mail('utf-8',$_restoreSession,$_profileID,false,$_reuseCache);
+			self::$instances[$_profileID] = new Mail('utf-8', $_restoreSession, $_profileID, false, $_reuseCache);
 		}
 		else
 		{
@@ -269,7 +269,7 @@ 
 				self::$instances[$_profileID]->ogServer = Mail\Account::read($_profileID)->smtpServer();
 				// TODO: merge mailprefs into userprefs, for easy treatment
 				self::$instances[$_profileID]->mailPreferences = $GLOBALS['egw_info']['user']['preferences']['mail'];
-				self::$instances[$_profileID]->htmlOptions  = self::$instances[$_profileID]->mailPreferences['htmlOptions'];
+				self::$instances[$_profileID]->htmlOptions = self::$instances[$_profileID]->mailPreferences['htmlOptions'];
 			} catch (\Exception $e)
 			{
 				$newprofileID = Mail\Account::get_default_acc_id();
@@ -277,15 +277,15 @@ 
 				error_log(__METHOD__.' ('.__LINE__.') '." Loading the Profile for ProfileID ".$_profileID.' failed for icServer; '.$e->getMessage().' Trigger new instance for Default-Profile '.$newprofileID.'. called from:'.function_backtrace());
 				if ($newprofileID)
 				{
-					self::$instances[$newprofileID] = new Mail('utf-8',false,$newprofileID,false,$_reuseCache);
+					self::$instances[$newprofileID] = new Mail('utf-8', false, $newprofileID, false, $_reuseCache);
 					$_profileID = $newprofileID;
 				}
 				else
 				{
-					throw new Exception(__METHOD__." failed to load the Profile for ProfileID for $_profileID / ".$this->profileID." with error:".$e->getMessage().($e->details?', '.$e->details:''));
+					throw new Exception(__METHOD__." failed to load the Profile for ProfileID for $_profileID / ".$this->profileID." with error:".$e->getMessage().($e->details ? ', '.$e->details : ''));
 				}
 			}
-			self::storeActiveProfileIDToPref(self::$instances[$_profileID]->icServer, $_profileID, $_validate );
+			self::storeActiveProfileIDToPref(self::$instances[$_profileID]->icServer, $_profileID, $_validate);
 		}
 		self::$instances[$_profileID]->profileID = $_profileID;
 		if (!isset(self::$instances[$_profileID]->idna2)) self::$instances[$_profileID]->idna2 = new Horde_Idna;
@@ -301,7 +301,7 @@ 
 	 * @param boolean $_testConnection = 0
 	 * @return mixed $_profileID or false on failed ConnectionTest
 	 */
-	public static function storeActiveProfileIDToPref($_icServerObject, $_profileID=0, $_testConnection=true)
+	public static function storeActiveProfileIDToPref($_icServerObject, $_profileID = 0, $_testConnection = true)
 	{
 		if (isset($GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID']) && !empty($GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID']))
 		{
@@ -322,12 +322,12 @@ 
 		}
 		if ($oldProfileID != $_profileID)
 		{
-			if ($oldProfileID && $_profileID==0) $_profileID = $oldProfileID;
-			$GLOBALS['egw']->preferences->add('mail','ActiveProfileID',$_profileID,'user');
+			if ($oldProfileID && $_profileID == 0) $_profileID = $oldProfileID;
+			$GLOBALS['egw']->preferences->add('mail', 'ActiveProfileID', $_profileID, 'user');
 			// save prefs
 			$GLOBALS['egw']->preferences->save_repository(true);
 			$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] = $_profileID;
-			Cache::setSession('mail','activeProfileID',$_profileID);
+			Cache::setSession('mail', 'activeProfileID', $_profileID);
 		}
 		return $_profileID;
 	}
@@ -342,7 +342,7 @@ 
 	 * @param int $_acc_id = 0
 	 * @return int validated acc_id -> either acc_id given, or first valid one
 	 */
-	public static function validateProfileID($_acc_id=0)
+	public static function validateProfileID($_acc_id = 0)
 	{
 		if ($_acc_id)
 		{
@@ -361,7 +361,7 @@ 
 		}
 		// no account specified or specified account not found or not valid
 		// --> search existing account for first valid one and return that
-		foreach(Mail\Account::search($only_current_user=true, 'acc_imap_host') as $acc_id => $imap_host)
+		foreach (Mail\Account::search($only_current_user = true, 'acc_imap_host') as $acc_id => $imap_host)
 		{
 			if (!empty($imap_host) && ($account = Mail\Account::read($acc_id)) && $account->is_imap())
 			{
@@ -383,7 +383,7 @@ 
 	 * @param boolean $_oldImapServerObject = false
 	 * @param boolean $_reuseCache = null if null it is set to the value of $_restoreSession
 	 */
-	private function __construct($_displayCharset='utf-8',$_restoreSession=true, $_profileID=0, $_oldImapServerObject=false, $_reuseCache=null)
+	private function __construct($_displayCharset = 'utf-8', $_restoreSession = true, $_profileID = 0, $_oldImapServerObject = false, $_reuseCache = null)
 	{
 		if (is_null($_reuseCache)) $_reuseCache = $_restoreSession;
 		if (!empty($_displayCharset)) self::$displayCharset = $_displayCharset;
@@ -403,7 +403,7 @@ 
 			$firstMessage = $this->sessionData['previewMessage'];
 			$this->sessionData = array();
 		}
-		if (!$_reuseCache) $this->forcePrefReload($_profileID,!$_reuseCache);
+		if (!$_reuseCache) $this->forcePrefReload($_profileID, !$_reuseCache);
 		try
 		{
 			$this->profileID = self::validateProfileID($_profileID);
@@ -417,11 +417,11 @@ 
 			throw new Exception(__METHOD__." failed to instanciate Mail for $_profileID / ".$this->profileID." with error:".$e->getMessage());
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($acc->imapServer()));
-		$this->icServer = ($_oldImapServerObject?$acc->oldImapServer():$acc->imapServer());
+		$this->icServer = ($_oldImapServerObject ? $acc->oldImapServer() : $acc->imapServer());
 		$this->ogServer = $acc->smtpServer();
 		// TODO: merge mailprefs into userprefs, for easy treatment
 		$this->mailPreferences = $GLOBALS['egw_info']['user']['preferences']['mail'];
-		$this->htmlOptions  = $this->mailPreferences['htmlOptions'];
+		$this->htmlOptions = $this->mailPreferences['htmlOptions'];
 		if (isset($this->icServer->ImapServerId) && !empty($this->icServer->ImapServerId))
 		{
 			$_profileID = $this->profileID = $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] = $this->icServer->ImapServerId;
@@ -439,7 +439,7 @@ 
 	public static function &forceEAProfileLoad($_profile_id)
 	{
 		self::unsetCachedObjects($_profile_id);
-		$mail = self::getInstance(false, $_profile_id,false);
+		$mail = self::getInstance(false, $_profile_id, false);
 		//_debug_array( $_profile_id);
 		$mail->icServer = Mail\Account::read($_profile_id)->imapServer();
 		$mail->ogServer = Mail\Account::read($_profile_id)->smtpServer();
@@ -451,11 +451,11 @@ 
 	 * @param int $_profile_id
 	 * @param boolean $_resetFolderObjects
 	 */
-	public static function forcePrefReload($_profile_id=null,$_resetFolderObjects=true)
+	public static function forcePrefReload($_profile_id = null, $_resetFolderObjects = true)
 	{
 		// unset the mail_preferences session object, to force the reload/rebuild
-		Cache::setSession('mail','mail_preferences',serialize(array()));
-		Cache::setSession('emailadmin','session_data',serialize(array()));
+		Cache::setSession('mail', 'mail_preferences', serialize(array()));
+		Cache::setSession('emailadmin', 'session_data', serialize(array()));
 		if ($_resetFolderObjects) self::resetFolderObjectCache($_profile_id);
 	}
 
@@ -464,8 +464,8 @@ 
 	 */
 	function restoreSessionData()
 	{
-		$this->sessionData = array();//Cache::getCache(Cache::SESSION,'mail','session_data',$callback=null,$callback_params=array(),$expiration=60*60*1);
-		self::$activeFolderCache = Cache::getCache(Cache::INSTANCE,'email','activeMailbox'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*10);
+		$this->sessionData = array(); //Cache::getCache(Cache::SESSION,'mail','session_data',$callback=null,$callback_params=array(),$expiration=60*60*1);
+		self::$activeFolderCache = Cache::getCache(Cache::INSTANCE, 'email', 'activeMailbox'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 10);
 		if (!empty(self::$activeFolderCache[$this->profileID])) $this->sessionData['mailbox'] = self::$activeFolderCache[$this->profileID];
 	}
 
@@ -475,10 +475,10 @@ 
 	function saveSessionData()
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string(array_keys($this->sessionData)));
-		if (!empty($this->sessionData['mailbox'])) self::$activeFolderCache[$this->profileID]=$this->sessionData['mailbox'];
+		if (!empty($this->sessionData['mailbox'])) self::$activeFolderCache[$this->profileID] = $this->sessionData['mailbox'];
 		if (isset(self::$activeFolderCache) && is_array(self::$activeFolderCache))
 		{
-			Cache::setCache(Cache::INSTANCE,'email','activeMailbox'.trim($GLOBALS['egw_info']['user']['account_id']),self::$activeFolderCache, 60*60*10);
+			Cache::setCache(Cache::INSTANCE, 'email', 'activeMailbox'.trim($GLOBALS['egw_info']['user']['account_id']), self::$activeFolderCache, 60 * 60 * 10);
 		}
 	}
 
@@ -494,40 +494,40 @@ 
 	 * @param int $_profileID = null default profile of user as returned by getUserDefaultProfileID
 	 * @return void
 	 */
-	static function unsetCachedObjects($_profileID=null)
+	static function unsetCachedObjects($_profileID = null)
 	{
 		if (is_null($_profileID)) $_profileID = Mail\Account::get_default_acc_id();
 		if (is_array($_profileID) && $_profileID['account_id']) $account_id = $_profileID['account_id'];
 		//error_log(__METHOD__.__LINE__.' called with ProfileID:'.array2string($_profileID).' from '.function_backtrace());
-		if (!is_array($_profileID) && (is_numeric($_profileID) || !(stripos($_profileID,'tracker_')===false)))
+		if (!is_array($_profileID) && (is_numeric($_profileID) || !(stripos($_profileID, 'tracker_') === false)))
 		{
 			self::resetConnectionErrorCache($_profileID);
-			$rawHeadersCache = Cache::getCache(Cache::INSTANCE,'email','rawHeadersCache'.trim($account_id),$callback=null,$callback_params=array(),$expiration=60*60*1);
+			$rawHeadersCache = Cache::getCache(Cache::INSTANCE, 'email', 'rawHeadersCache'.trim($account_id), $callback = null, $callback_params = array(), $expiration = 60 * 60 * 1);
 			if (isset($rawHeadersCache[$_profileID]))
 			{
 				unset($rawHeadersCache[$_profileID]);
-				Cache::setCache(Cache::INSTANCE,'email','rawHeadersCache'.trim($account_id),$rawHeadersCache, $expiration=60*60*1);
+				Cache::setCache(Cache::INSTANCE, 'email', 'rawHeadersCache'.trim($account_id), $rawHeadersCache, $expiration = 60 * 60 * 1);
 			}
-			$HierarchyDelimiterCache = Cache::getCache(Cache::INSTANCE,'email','HierarchyDelimiter'.trim($account_id),$callback=null,$callback_params=array(),$expiration=60*60*24*5);
+			$HierarchyDelimiterCache = Cache::getCache(Cache::INSTANCE, 'email', 'HierarchyDelimiter'.trim($account_id), $callback = null, $callback_params = array(), $expiration = 60 * 60 * 24 * 5);
 			if (isset($HierarchyDelimiterCache[$_profileID]))
 			{
 				unset($HierarchyDelimiterCache[$_profileID]);
-				Cache::setCache(Cache::INSTANCE,'email','HierarchyDelimiter'.trim($account_id),$HierarchyDelimiterCache, $expiration=60*60*24*5);
+				Cache::setCache(Cache::INSTANCE, 'email', 'HierarchyDelimiter'.trim($account_id), $HierarchyDelimiterCache, $expiration = 60 * 60 * 24 * 5);
 			}
 			//reset folderObject cache, to trigger reload
 			self::resetFolderObjectCache($_profileID);
 			//reset counter of deleted messages per folder
-			$eMailListContainsDeletedMessages = Cache::getCache(Cache::INSTANCE,'email','eMailListContainsDeletedMessages'.trim($account_id),$callback=null,$callback_params=array(),$expiration=60*60*1);
+			$eMailListContainsDeletedMessages = Cache::getCache(Cache::INSTANCE, 'email', 'eMailListContainsDeletedMessages'.trim($account_id), $callback = null, $callback_params = array(), $expiration = 60 * 60 * 1);
 			if (isset($eMailListContainsDeletedMessages[$_profileID]))
 			{
 				unset($eMailListContainsDeletedMessages[$_profileID]);
-				Cache::setCache(Cache::INSTANCE,'email','eMailListContainsDeletedMessages'.trim($account_id),$eMailListContainsDeletedMessages, $expiration=60*60*1);
+				Cache::setCache(Cache::INSTANCE, 'email', 'eMailListContainsDeletedMessages'.trim($account_id), $eMailListContainsDeletedMessages, $expiration = 60 * 60 * 1);
 			}
-			$vacationCached = Cache::getCache(Cache::INSTANCE, 'email', 'vacationNotice'.trim($account_id),$callback=null,$callback_params=array(),$expiration=60*60*24*1);
+			$vacationCached = Cache::getCache(Cache::INSTANCE, 'email', 'vacationNotice'.trim($account_id), $callback = null, $callback_params = array(), $expiration = 60 * 60 * 24 * 1);
 			if (isset($vacationCached[$_profileID]))
 			{
 				unset($vacationCached[$_profileID]);
-				Cache::setCache(Cache::INSTANCE,'email','vacationNotice'.trim($account_id),$vacationCached, $expiration=60*60*24*1);
+				Cache::setCache(Cache::INSTANCE, 'email', 'vacationNotice'.trim($account_id), $vacationCached, $expiration = 60 * 60 * 24 * 1);
 			}
 
 			if (isset(self::$instances[$_profileID])) unset(self::$instances[$_profileID]);
@@ -535,17 +535,17 @@ 
 		if (is_array($_profileID) && $_profileID['location'] == 'clear_cache')
 		{
 			// called via hook
-			foreach($GLOBALS['egw']->accounts->search(array('type' => 'accounts','order' => 'account_lid')) as $account)
+			foreach ($GLOBALS['egw']->accounts->search(array('type' => 'accounts', 'order' => 'account_lid')) as $account)
 			{
 				//error_log(__METHOD__.__LINE__.array2string($account));
 				$account_id = $account['account_id'];
 				$_profileID = null;
-				self::resetConnectionErrorCache($_profileID,$account_id);
-				self::resetFolderObjectCache($_profileID,$account_id);
-				Cache::setCache(Cache::INSTANCE,'email','rawHeadersCache'.trim($account_id),array(), 60*60*1);
-				Cache::setCache(Cache::INSTANCE,'email','HierarchyDelimiter'.trim($account_id),array(), 60*60*24*5);
-				Cache::setCache(Cache::INSTANCE,'email','eMailListContainsDeletedMessages'.trim($account_id),array(), 60*60*1);
-				Cache::setCache(Cache::INSTANCE,'email','vacationNotice'.trim($account_id),array(), 60*60*24*1);
+				self::resetConnectionErrorCache($_profileID, $account_id);
+				self::resetFolderObjectCache($_profileID, $account_id);
+				Cache::setCache(Cache::INSTANCE, 'email', 'rawHeadersCache'.trim($account_id), array(), 60 * 60 * 1);
+				Cache::setCache(Cache::INSTANCE, 'email', 'HierarchyDelimiter'.trim($account_id), array(), 60 * 60 * 24 * 5);
+				Cache::setCache(Cache::INSTANCE, 'email', 'eMailListContainsDeletedMessages'.trim($account_id), array(), 60 * 60 * 1);
+				Cache::setCache(Cache::INSTANCE, 'email', 'vacationNotice'.trim($account_id), array(), 60 * 60 * 24 * 1);
 			}
 		}
 	}
@@ -556,7 +556,7 @@ 
 	 * @param int $_ImapServerId the profileID to look for
 	 * @param int $account_id the egw account to look for
 	 */
-	static function resetConnectionErrorCache($_ImapServerId=null,$account_id=null)
+	static function resetConnectionErrorCache($_ImapServerId = null, $account_id = null)
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.' for Profile:'.array2string($_ImapServerId) .' for user:'.trim($account_id));
 		if (is_null($account_id)) $account_id = $GLOBALS['egw_info']['user']['account_id'];
@@ -574,19 +574,19 @@ 
 		}
 		else
 		{
-			$isConError = Cache::getCache(Cache::INSTANCE,'email','icServerSIEVE_connectionError'.trim($account_id));
+			$isConError = Cache::getCache(Cache::INSTANCE, 'email', 'icServerSIEVE_connectionError'.trim($account_id));
 			if (isset($isConError[$_ImapServerId]))
 			{
 				unset($isConError[$_ImapServerId]);
 			}
-			$waitOnFailure = Cache::getCache(Cache::INSTANCE,'email','ActiveSyncWaitOnFailure'.trim($account_id),null,array(),60*60*2);
+			$waitOnFailure = Cache::getCache(Cache::INSTANCE, 'email', 'ActiveSyncWaitOnFailure'.trim($account_id), null, array(), 60 * 60 * 2);
 			if (isset($waitOnFailure[$_ImapServerId]))
 			{
 				unset($waitOnFailure[$_ImapServerId]);
 			}
 		}
-		Cache::setCache(Cache::INSTANCE,'email','icServerSIEVE_connectionError'.trim($account_id),$isConError,60*15);
-		Cache::setCache(Cache::INSTANCE,'email','ActiveSyncWaitOnFailure'.trim($account_id),$waitOnFailure,60*60*2);
+		Cache::setCache(Cache::INSTANCE, 'email', 'icServerSIEVE_connectionError'.trim($account_id), $isConError, 60 * 15);
+		Cache::setCache(Cache::INSTANCE, 'email', 'ActiveSyncWaitOnFailure'.trim($account_id), $waitOnFailure, 60 * 60 * 2);
 	}
 
 	/**
@@ -595,13 +595,13 @@ 
 	 * @param int $_ImapServerId the profileID to look for
 	 * @param int $account_id the egw account to look for
 	 */
-	static function resetFolderObjectCache($_ImapServerId=null,$account_id=null)
+	static function resetFolderObjectCache($_ImapServerId = null, $account_id = null)
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.' called for Profile:'.array2string($_ImapServerId).'->'.function_backtrace());
 		if (is_null($account_id)) $account_id = $GLOBALS['egw_info']['user']['account_id'];
 		// on [location] => verify_settings we coud either use [prefs] => Array([ActiveProfileID] => 9, .. as $_ImapServerId
 		// or treat it as not given. we try that path
-		if (is_null($_ImapServerId)||is_array($_ImapServerId))
+		if (is_null($_ImapServerId) || is_array($_ImapServerId))
 		{
 			$folders2return = array();
 			$folderInfo = array();
@@ -610,12 +610,12 @@ 
 		}
 		else
 		{
-			$folders2return = Cache::getCache(Cache::INSTANCE,'email','folderObjects'.trim($account_id),null,array(),60*60*1);
+			$folders2return = Cache::getCache(Cache::INSTANCE, 'email', 'folderObjects'.trim($account_id), null, array(), 60 * 60 * 1);
 			if (!empty($folders2return) && isset($folders2return[$_ImapServerId]))
 			{
 				unset($folders2return[$_ImapServerId]);
 			}
-			$folderInfo = Cache::getCache(Cache::INSTANCE,'email','icServerFolderExistsInfo'.trim($account_id),null,array(),60*60*5);
+			$folderInfo = Cache::getCache(Cache::INSTANCE, 'email', 'icServerFolderExistsInfo'.trim($account_id), null, array(), 60 * 60 * 5);
 			if (!empty($folderInfo) && isset($folderInfo[$_ImapServerId]))
 			{
 				unset($folderInfo[$_ImapServerId]);
@@ -627,23 +627,23 @@ 
 				unset($lastFolderUsedForMove[$_ImapServerId]);
 			}
 			*/
-			$folderBasicInfo = Cache::getCache(Cache::INSTANCE,'email','folderBasicInfo'.trim($account_id),null,array(),60*60*1);
+			$folderBasicInfo = Cache::getCache(Cache::INSTANCE, 'email', 'folderBasicInfo'.trim($account_id), null, array(), 60 * 60 * 1);
 			if (!empty($folderBasicInfo) && isset($folderBasicInfo[$_ImapServerId]))
 			{
 				unset($folderBasicInfo[$_ImapServerId]);
 			}
-			$_specialUseFolders = Cache::getCache(Cache::INSTANCE,'email','specialUseFolders'.trim($account_id),null,array(),60*60*12);
+			$_specialUseFolders = Cache::getCache(Cache::INSTANCE, 'email', 'specialUseFolders'.trim($account_id), null, array(), 60 * 60 * 12);
 			if (!empty($_specialUseFolders) && isset($_specialUseFolders[$_ImapServerId]))
 			{
 				unset($_specialUseFolders[$_ImapServerId]);
-				self::$specialUseFolders=null;
+				self::$specialUseFolders = null;
 			}
 		}
-		Cache::setCache(Cache::INSTANCE,'email','folderObjects'.trim($account_id),$folders2return, 60*60*1);
-		Cache::setCache(Cache::INSTANCE,'email','icServerFolderExistsInfo'.trim($account_id),$folderInfo,60*60*5);
+		Cache::setCache(Cache::INSTANCE, 'email', 'folderObjects'.trim($account_id), $folders2return, 60 * 60 * 1);
+		Cache::setCache(Cache::INSTANCE, 'email', 'icServerFolderExistsInfo'.trim($account_id), $folderInfo, 60 * 60 * 5);
 		//Cache::setCache(Cache::INSTANCE,'email','lastFolderUsedForMove'.trim($account_id),$lastFolderUsedForMove,$expiration=60*60*1);
-		Cache::setCache(Cache::INSTANCE,'email','folderBasicInfo'.trim($account_id),$folderBasicInfo,60*60*1);
-		Cache::setCache(Cache::INSTANCE,'email','specialUseFolders'.trim($account_id),$_specialUseFolders,60*60*12);
+		Cache::setCache(Cache::INSTANCE, 'email', 'folderBasicInfo'.trim($account_id), $folderBasicInfo, 60 * 60 * 1);
+		Cache::setCache(Cache::INSTANCE, 'email', 'specialUseFolders'.trim($account_id), $_specialUseFolders, 60 * 60 * 12);
 	}
 
 	/**
@@ -664,15 +664,15 @@ 
 	 * @param string $_profileID the ID of the mailaccount to check for identities, if null current mail-account is used
 	 * @return array - array(email=>realname)
 	 */
-	function getUserEMailAddresses($_profileID=null)
+	function getUserEMailAddresses($_profileID = null)
 	{
-		$acc = Mail\Account::read((!empty($_profileID)?$_profileID:$this->profileID));
+		$acc = Mail\Account::read((!empty($_profileID) ? $_profileID : $this->profileID));
 		//error_log(__METHOD__.' ('.__LINE__.') '.':'.array2string($acc));
 		$identities = Mail\Account::identities($acc);
 
 		$userEMailAdresses = array($acc['ident_email']=>$acc['ident_realname']);
 
-		foreach($identities as $ik => $ident) {
+		foreach ($identities as $ik => $ident) {
 			//error_log(__METHOD__.' ('.__LINE__.') '.':'.$ik.'->'.array2string($ident));
 			$identity = Mail\Account::read_identity($ik);
 			if (!empty($identity['ident_email']) && !isset($userEMailAdresses[$identity['ident_email']])) $userEMailAdresses[$identity['ident_email']] = $identity['ident_realname'];
@@ -687,19 +687,19 @@ 
 	 * @param boolean $resolve_placeholders wether or not resolve possible placeholders in identities
 	 * @return array - array(email=>realname)
 	 */
-	static function getAllIdentities($_accountToSearch=null,$resolve_placeholders=false)
+	static function getAllIdentities($_accountToSearch = null, $resolve_placeholders = false)
 	{
 		$userEMailAdresses = array();
-		foreach(Mail\Account::search($only_current_user=($_accountToSearch?$_accountToSearch:true), $just_name=true) as $acc_id => $identity_name)
+		foreach (Mail\Account::search($only_current_user = ($_accountToSearch ? $_accountToSearch : true), $just_name = true) as $acc_id => $identity_name)
 		{
-			$acc = Mail\Account::read($acc_id,($_accountToSearch?$_accountToSearch:null));
-			if (!$resolve_placeholders) $userEMailAdresses[$acc['ident_id']] = array('acc_id'=>$acc_id,'ident_id'=>$acc['ident_id'],'ident_email'=>$acc['ident_email'],'ident_org'=>$acc['ident_org'],'ident_realname'=>$acc['ident_realname'],'ident_signature'=>$acc['ident_signature'],'ident_name'=>$acc['ident_name']);
+			$acc = Mail\Account::read($acc_id, ($_accountToSearch ? $_accountToSearch : null));
+			if (!$resolve_placeholders) $userEMailAdresses[$acc['ident_id']] = array('acc_id'=>$acc_id, 'ident_id'=>$acc['ident_id'], 'ident_email'=>$acc['ident_email'], 'ident_org'=>$acc['ident_org'], 'ident_realname'=>$acc['ident_realname'], 'ident_signature'=>$acc['ident_signature'], 'ident_name'=>$acc['ident_name']);
 
-			foreach(Mail\Account::identities($acc) as $ik => $ident) {
+			foreach (Mail\Account::identities($acc) as $ik => $ident) {
 				//error_log(__METHOD__.' ('.__LINE__.') '.':'.$ik.'->'.array2string($ident));
-				$identity = Mail\Account::read_identity($ik,$resolve_placeholders);
+				$identity = Mail\Account::read_identity($ik, $resolve_placeholders);
 				//error_log(__METHOD__.' ('.__LINE__.') '.':'.$ik.'->'.array2string($identity));
-				if (!isset($userEMailAdresses[$identity['ident_id']])) $userEMailAdresses[$identity['ident_id']] = array('acc_id'=>$acc_id,'ident_id'=>$identity['ident_id'],'ident_email'=>$identity['ident_email'],'ident_org'=>$identity['ident_org'],'ident_realname'=>$identity['ident_realname'],'ident_signature'=>$identity['ident_signature'],'ident_name'=>$identity['ident_name']);
+				if (!isset($userEMailAdresses[$identity['ident_id']])) $userEMailAdresses[$identity['ident_id']] = array('acc_id'=>$acc_id, 'ident_id'=>$identity['ident_id'], 'ident_email'=>$identity['ident_email'], 'ident_org'=>$identity['ident_org'], 'ident_realname'=>$identity['ident_realname'], 'ident_signature'=>$identity['ident_signature'], 'ident_name'=>$identity['ident_name']);
 			}
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($userEMailAdresses));
@@ -719,9 +719,9 @@ 
 			$account = Mail\Account::read($account);
 		}
 		$userEMailAdresses = array();
-		foreach(Mail\Account::identities($account, true, 'params') as $ik => $ident) {
+		foreach (Mail\Account::identities($account, true, 'params') as $ik => $ident) {
 			//error_log(__METHOD__.' ('.__LINE__.') '.':'.$ik.'->'.array2string($ident));
-			$identity = Mail\Account::read_identity($ik,true,null,$account);
+			$identity = Mail\Account::read_identity($ik, true, null, $account);
 			//error_log(__METHOD__.' ('.__LINE__.') '.':'.$ik.'->'.array2string($identity));
 			// standardIdentity has ident_id==acc_id (as it is done within account->identities)
 			if (empty($identity['ident_id'])) $identity['ident_id'] = $identity['acc_id'];
@@ -748,9 +748,9 @@ 
 	function getDefaultIdentity()
 	{
 		// retrieve the signature accociated with the identity
-		$id = $this->getIdentitiesWithAccounts($_accountData=array());
-		foreach(Mail\Account::identities($_accountData[$this->profileID] ?
-			$this->profileID : $_accountData[$id],false,'ident_id') as $accountData)
+		$id = $this->getIdentitiesWithAccounts($_accountData = array());
+		foreach (Mail\Account::identities($_accountData[$this->profileID] ?
+			$this->profileID : $_accountData[$id], false, 'ident_id') as $accountData)
 		{
 			return $accountData;
 		}
@@ -766,13 +766,13 @@ 
 	{
 		// account select box
 		$selectedID = $this->profileID;
-		$allAccountData = Mail\Account::search($only_current_user=true, false, null);
+		$allAccountData = Mail\Account::search($only_current_user = true, false, null);
 		if ($allAccountData) {
-			$rememberFirst=$selectedFound=null;
+			$rememberFirst = $selectedFound = null;
 			foreach ($allAccountData as $tmpkey => $icServers)
 			{
 				if (is_null($rememberFirst)) $rememberFirst = $tmpkey;
-				if ($tmpkey == $selectedID) $selectedFound=true;
+				if ($tmpkey == $selectedID) $selectedFound = true;
 				//error_log(__METHOD__.' ('.__LINE__.') '.' Key:'.$tmpkey.'->'.array2string($icServers->acc_imap_host));
 				$host = $icServers->acc_imap_host;
 				if (empty($host)) continue;
@@ -780,7 +780,7 @@ 
 				//error_log(__METHOD__.' ('.__LINE__.') '.' Key:'.$tmpkey.'->'.array2string($identities[$icServers->acc_id]));
 			}
 		}
-		return ($selectedFound?$selectedID:$rememberFirst);
+		return ($selectedFound ? $selectedID : $rememberFirst);
 	}
 
 	/**
@@ -790,7 +790,7 @@ 
 	 * @var boolean $fullString full or false=NamePart only is returned
 	 * @return string - constructed of identity object data as defined in mailConfig
 	 */
-	static function generateIdentityString($identity, $fullString=true)
+	static function generateIdentityString($identity, $fullString = true)
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($identity));
 		//if (is_null(self::$mailConfig)) self::$mailConfig = Config::read('mail');
@@ -801,16 +801,16 @@ 
 		{
 			case 'email';
 				//$retData = str_replace('@',' ',$identity->emailAddress).($fullString===true?' <'.$identity->emailAddress.'>':'');
-				$retData = $identity['ident_email'].($fullString===true?' <'.$identity['ident_email'].'>':'');
+				$retData = $identity['ident_email'].($fullString === true ? ' <'.$identity['ident_email'].'>' : '');
 				break;
 			case 'nameNemail';
-				$retData = (!empty($identity['ident_realname'])?$identity['ident_realname']:substr_replace($identity['ident_email'],'',strpos($identity['ident_email'],'@'))).($fullString===true?' <'.$identity['ident_email'].'>':'');
+				$retData = (!empty($identity['ident_realname']) ? $identity['ident_realname'] : substr_replace($identity['ident_email'], '', strpos($identity['ident_email'], '@'))).($fullString === true ? ' <'.$identity['ident_email'].'>' : '');
 				break;
 			case 'orgNemail';
-				$retData = (!empty($identity['ident_org'])?$identity['ident_org']:substr_replace($identity['ident_email'],'',0,strpos($identity['ident_email'],'@')+1)).($fullString===true?' <'.$identity['ident_email'].'>':'');
+				$retData = (!empty($identity['ident_org']) ? $identity['ident_org'] : substr_replace($identity['ident_email'], '', 0, strpos($identity['ident_email'], '@') + 1)).($fullString === true ? ' <'.$identity['ident_email'].'>' : '');
 				break;
 			default:
-				$retData = $identity['ident_realname'].(!empty($identity['ident_org'])?' '.$identity['ident_org']:'').($fullString===true?' <'.$identity['ident_email'].'>':'');
+				$retData = $identity['ident_realname'].(!empty($identity['ident_org']) ? ' '.$identity['ident_org'] : '').($fullString === true ? ' <'.$identity['ident_email'].'>' : '');
 		}
 		return $retData;
 	}
@@ -835,7 +835,7 @@ 
 	 */
 	function reopen($_foldername)
 	{
-		if (self::$debugTimes) $starttime = microtime (true);
+		if (self::$debugTimes) $starttime = microtime(true);
 
 		//error_log(__METHOD__.' ('.__LINE__.') '."('$_foldername') ".function_backtrace());
 		// TODO: trying to reduce traffic to the IMAP Server here, introduces problems with fetching the bodies of
@@ -850,7 +850,7 @@ 
 			}
 			$folderOpened = $_foldername;
 		//}
-		if (self::$debugTimes) self::logRunTimes($starttime,null,'Folder:'.$_foldername,__METHOD__.' ('.__LINE__.') ');
+		if (self::$debugTimes) self::logRunTimes($starttime, null, 'Folder:'.$_foldername, __METHOD__.' ('.__LINE__.') ');
 	}
 
 
@@ -861,15 +861,15 @@ 
 	 * @throws Horde_Imap_Client_Exception on connection error or authentication failure
 	 * @throws InvalidArgumentException on missing credentials
 	 */
-	function openConnection($_icServerID=0)
+	function openConnection($_icServerID = 0)
 	{
 		//error_log( "-------------------------->open connection ".function_backtrace());
 		//error_log(__METHOD__.' ('.__LINE__.') '.' ->'.array2string($this->icServer));
-		if (self::$debugTimes) $starttime = microtime (true);
-		$mailbox=null;
+		if (self::$debugTimes) $starttime = microtime(true);
+		$mailbox = null;
 		try
 		{
-			if(isset($this->sessionData['mailbox'])&&$this->folderExists($this->sessionData['mailbox'])) $mailbox = $this->sessionData['mailbox'];
+			if (isset($this->sessionData['mailbox']) && $this->folderExists($this->sessionData['mailbox'])) $mailbox = $this->sessionData['mailbox'];
 			if (empty($mailbox)) $mailbox = $this->icServer->getCurrentMailbox();
 /*
 			if (isset(Mail\Imap::$supports_keywords[$_icServerID]))
@@ -896,7 +896,7 @@ 
 			error_log(__METHOD__.' ('.__LINE__.') '."->open connection for Server with profileID:".$_icServerID." trying to examine ($mailbox) failed!".$e->getMessage());
 			throw new Exception(__METHOD__." failed to ".__METHOD__." on Profile to $_icServerID while trying to examine $mailbox:".$e->getMessage());
 		}
-		if (self::$debugTimes) self::logRunTimes($starttime,null,'ProfileID:'.$_icServerID,__METHOD__.' ('.__LINE__.') ');
+		if (self::$debugTimes) self::logRunTimes($starttime, null, 'ProfileID:'.$_icServerID, __METHOD__.' ('.__LINE__.') ');
 	}
 
 	/**
@@ -909,7 +909,7 @@ 
 	{
 		static $quota;
 		if (isset($quota)) return $quota;
-		if (isset(self::$profileDefunct[$this->profileID]) && self::$profileDefunct[$this->profileID]===true)
+		if (isset(self::$profileDefunct[$this->profileID]) && self::$profileDefunct[$this->profileID] === true)
 		{
 			// something is wrong. Do not proceed. either no folder or profile is marked as defunct for this request
 			return false;
@@ -917,7 +917,7 @@ 
 		try
 		{
 			$this->icServer->getCurrentMailbox();
-			if(!$this->icServer->hasCapability('QUOTA')) {
+			if (!$this->icServer->hasCapability('QUOTA')) {
 				$quota = false;
 				return false;
 			}
@@ -927,14 +927,14 @@ 
 		{
 			//error_log(__METHOD__.array2string($e));
 			//error_log(__METHOD__." failed to fetch quota on ".$this->profileID.' Reason:'.$e->getMessage().($e->details?', '.$e->details:'')/*.function_backtrace()*/);
-			if ($e->getCode()==102)
+			if ($e->getCode() == 102)
 			{
-				self::$profileDefunct[$this->profileID]=true;
-				throw new Exception(__METHOD__." failed to fetch quota on ".$this->profileID.' Reason:'.$e->getMessage().($e->details?', '.$e->details:''));
+				self::$profileDefunct[$this->profileID] = true;
+				throw new Exception(__METHOD__." failed to fetch quota on ".$this->profileID.' Reason:'.$e->getMessage().($e->details ? ', '.$e->details : ''));
 			}
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($quota));
-		if(is_array($quota)) {
+		if (is_array($quota)) {
 			$quota = array(
 				'usage'	=> $quota['USED'],
 				'limit'	=> $quota['QMAX'],
@@ -952,10 +952,10 @@ 
 	 *
 	 * @return int - timeout (either set or default 20/10)
 	 */
-	static function getTimeOut($_use='IMAP')
+	static function getTimeOut($_use = 'IMAP')
 	{
 		$timeout = $GLOBALS['egw_info']['user']['preferences']['mail']['connectionTimeout'];
-		if (empty($timeout)) $timeout = ($_use=='SIEVE'?10:20); // this is the default value
+		if (empty($timeout)) $timeout = ($_use == 'SIEVE' ? 10 : 20); // this is the default value
 		return $timeout;
 	}
 
@@ -976,18 +976,18 @@ 
 		if (is_null($nameSpace)) $nameSpace = $this->icServer->getNameSpaceArray();
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($nameSpace));
 		if (is_array($nameSpace)) {
-			foreach($nameSpace as $type => $singleNameSpaceArray)
+			foreach ($nameSpace as $type => $singleNameSpaceArray)
 			{
 				foreach ($singleNameSpaceArray as $singleNameSpace)
 				{
 					$_foldersNameSpace = array();
-					if($type == 'personal' && $singleNameSpace['name'] == '#mh/' && ($this->folderExists('Mail')||$this->folderExists('INBOX')))
+					if ($type == 'personal' && $singleNameSpace['name'] == '#mh/' && ($this->folderExists('Mail') || $this->folderExists('INBOX')))
 					{
 						$_foldersNameSpace['prefix_present'] = 'forced';
 						// uw-imap server with mailbox prefix or dovecot maybe
-						$_foldersNameSpace['prefix'] = ($this->folderExists('Mail')?'Mail':(!empty($singleNameSpace['name'])?$singleNameSpace['name']:''));
+						$_foldersNameSpace['prefix'] = ($this->folderExists('Mail') ? 'Mail' : (!empty($singleNameSpace['name']) ? $singleNameSpace['name'] : ''));
 					}
-					elseif($type == 'personal' && ($singleNameSpace['name'] == '#mh/') && $this->folderExists('mail'))
+					elseif ($type == 'personal' && ($singleNameSpace['name'] == '#mh/') && $this->folderExists('mail'))
 					{
 						$_foldersNameSpace['prefix_present'] = 'forced';
 						// uw-imap server with mailbox prefix or dovecot maybe
@@ -996,9 +996,9 @@ 
 						$_foldersNameSpace['prefix_present'] = !empty($singleNameSpace['name']);
 						$_foldersNameSpace['prefix'] = $singleNameSpace['name'];
 					}
-					$_foldersNameSpace['delimiter'] = ($singleNameSpace['delimiter']?$singleNameSpace['delimiter']:$delimiter);
+					$_foldersNameSpace['delimiter'] = ($singleNameSpace['delimiter'] ? $singleNameSpace['delimiter'] : $delimiter);
 					$_foldersNameSpace['type'] = $type;
-					$foldersNameSpace[] =$_foldersNameSpace;
+					$foldersNameSpace[] = $_foldersNameSpace;
 				}
 				//echo "############## $type->".print_r($foldersNameSpace[$type],true)." ###################<br>";
 			}
@@ -1016,10 +1016,10 @@ 
 	 */
 	function getFolderPrefixFromNamespace($nameSpace, $folderName)
 	{
-		foreach($nameSpace as &$singleNameSpace)
+		foreach ($nameSpace as &$singleNameSpace)
 		{
 			//if (substr($singleNameSpace['prefix'],0,strlen($folderName))==$folderName) return $singleNameSpace['prefix'];
-			if (substr($folderName,0,strlen($singleNameSpace['prefix']))==$singleNameSpace['prefix']) return $singleNameSpace['prefix'];
+			if (substr($folderName, 0, strlen($singleNameSpace['prefix'])) == $singleNameSpace['prefix']) return $singleNameSpace['prefix'];
 		}
 		return "";
 	}
@@ -1030,12 +1030,12 @@ 
 	 * @var boolean $_useCache
 	 * @return string the hierarchyDelimiter
 	 */
-	function getHierarchyDelimiter($_useCache=true)
+	function getHierarchyDelimiter($_useCache = true)
 	{
 		static $HierarchyDelimiter = null;
-		if (is_null($HierarchyDelimiter)) $HierarchyDelimiter = Cache::getCache(Cache::INSTANCE,'email','HierarchyDelimiter'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*24*5);
-		if ($_useCache===false) unset($HierarchyDelimiter[$this->icServer->ImapServerId]);
-		if (isset($HierarchyDelimiter[$this->icServer->ImapServerId])&&!empty($HierarchyDelimiter[$this->icServer->ImapServerId]))
+		if (is_null($HierarchyDelimiter)) $HierarchyDelimiter = Cache::getCache(Cache::INSTANCE, 'email', 'HierarchyDelimiter'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 24 * 5);
+		if ($_useCache === false) unset($HierarchyDelimiter[$this->icServer->ImapServerId]);
+		if (isset($HierarchyDelimiter[$this->icServer->ImapServerId]) && !empty($HierarchyDelimiter[$this->icServer->ImapServerId]))
 		{
 			return $HierarchyDelimiter[$this->icServer->ImapServerId];
 		}
@@ -1045,13 +1045,13 @@ 
 			$this->icServer->getCurrentMailbox();
 			$HierarchyDelimiter[$this->icServer->ImapServerId] = $this->icServer->getDelimiter();
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
-			if ($e->getCode()==102) self::$profileDefunct[$this->profileID]=true;
+			if ($e->getCode() == 102) self::$profileDefunct[$this->profileID] = true;
 			unset($e);
 			$HierarchyDelimiter[$this->icServer->ImapServerId] = '/';
 		}
-		Cache::setCache(Cache::INSTANCE,'email','HierarchyDelimiter'.trim($GLOBALS['egw_info']['user']['account_id']),$HierarchyDelimiter, 60*60*24*5);
+		Cache::setCache(Cache::INSTANCE, 'email', 'HierarchyDelimiter'.trim($GLOBALS['egw_info']['user']['account_id']), $HierarchyDelimiter, 60 * 60 * 24 * 5);
 		return $HierarchyDelimiter[$this->icServer->ImapServerId];
 	}
 
@@ -1064,7 +1064,7 @@ 
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.':'.$this->icServer->ImapServerId.' Connected:'.$this->icServer->_connected);
 		static $_specialUseFolders = null;
-		if (is_null($_specialUseFolders)||empty($_specialUseFolders)) $_specialUseFolders = Cache::getCache(Cache::INSTANCE,'email','specialUseFolders'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*24*5);
+		if (is_null($_specialUseFolders) || empty($_specialUseFolders)) $_specialUseFolders = Cache::getCache(Cache::INSTANCE, 'email', 'specialUseFolders'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 24 * 5);
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($this->icServer->acc_folder_trash));
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($this->icServer->acc_folder_sent));
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($this->icServer->acc_folder_draft));
@@ -1072,20 +1072,20 @@ 
 		self::$specialUseFolders = $_specialUseFolders[$this->icServer->ImapServerId];
 		if (isset($_specialUseFolders[$this->icServer->ImapServerId]) && !empty($_specialUseFolders[$this->icServer->ImapServerId]))
 			return $_specialUseFolders[$this->icServer->ImapServerId];
-		$_specialUseFolders[$this->icServer->ImapServerId]=array();
+		$_specialUseFolders[$this->icServer->ImapServerId] = array();
 		//if (!empty($this->icServer->acc_folder_trash) && !isset($_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_trash]))
-			$_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_trash]='Trash';
+			$_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_trash] = 'Trash';
 		//if (!empty($this->icServer->acc_folder_draft) && !isset($_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_draft]))
-			$_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_draft]='Drafts';
+			$_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_draft] = 'Drafts';
 		//if (!empty($this->icServer->acc_folder_sent) && !isset($_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_sent]))
-			$_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_sent]='Sent';
+			$_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_sent] = 'Sent';
 		//if (!empty($this->icServer->acc_folder_template) && !isset($_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_template]))
-			$_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_template]='Templates';
-		$_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_junk]='Junk';
-		$_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_archive]='Archive';
+			$_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_template] = 'Templates';
+		$_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_junk] = 'Junk';
+		$_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_archive] = 'Archive';
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($_specialUseFolders));//.'<->'.array2string($this->icServer));
 		self::$specialUseFolders = $_specialUseFolders[$this->icServer->ImapServerId];
-		Cache::setCache(Cache::INSTANCE,'email','specialUseFolders'.trim($GLOBALS['egw_info']['user']['account_id']),$_specialUseFolders, 60*60*24*5);
+		Cache::setCache(Cache::INSTANCE, 'email', 'specialUseFolders'.trim($GLOBALS['egw_info']['user']['account_id']), $_specialUseFolders, 60 * 60 * 24 * 5);
 		return $_specialUseFolders[$this->icServer->ImapServerId];
 	}
 
@@ -1099,8 +1099,8 @@ 
 	function folderIsSelectable($folderToSelect)
 	{
 		$retval = true;
-		if($folderToSelect && ($folderStatus = $this->getFolderStatus($folderToSelect,false,true))) {
-			if (!empty($folderStatus['attributes']) && stripos(array2string($folderStatus['attributes']),'noselect')!==false)
+		if ($folderToSelect && ($folderStatus = $this->getFolderStatus($folderToSelect, false, true))) {
+			if (!empty($folderStatus['attributes']) && stripos(array2string($folderStatus['attributes']), 'noselect') !== false)
 			{
 				$retval = false;
 			}
@@ -1120,7 +1120,7 @@ 
 	 *
 	 * @throws Exception
 	 */
-	function _getStatus($folderName,$ignoreStatusCache=false)
+	function _getStatus($folderName, $ignoreStatusCache = false)
 	{
 		static $folderStatus = null;
 		if (!$ignoreStatusCache && isset($folderStatus[$this->icServer->ImapServerId][$folderName]))
@@ -1130,11 +1130,11 @@ 
 		}
 		try
 		{
-			$folderStatus[$this->icServer->ImapServerId][$folderName] = $this->icServer->getStatus($folderName,$ignoreStatusCache);
+			$folderStatus[$this->icServer->ImapServerId][$folderName] = $this->icServer->getStatus($folderName, $ignoreStatusCache);
 		}
 		catch (\Exception $e)
 		{
-			throw new Exception(__METHOD__.' ('.__LINE__.') '." failed for $folderName with error:".$e->getMessage().($e->details?', '.$e->details:''));
+			throw new Exception(__METHOD__.' ('.__LINE__.') '." failed for $folderName with error:".$e->getMessage().($e->details ? ', '.$e->details : ''));
 		}
 		return $folderStatus[$this->icServer->ImapServerId][$folderName];
 	}
@@ -1150,10 +1150,10 @@ 
 	 * @param fetchSubscribedInfo bool fetch Subscribed Info on folder
 	 * @return array
 	 */
-	function getFolderStatus($_folderName,$ignoreStatusCache=false,$basicInfoOnly=false,$fetchSubscribedInfo=true)
+	function getFolderStatus($_folderName, $ignoreStatusCache = false, $basicInfoOnly = false, $fetchSubscribedInfo = true)
 	{
 		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '." called with:$_folderName,$ignoreStatusCache,$basicInfoOnly");
-		if (!is_string($_folderName) || empty($_folderName)||(isset(self::$profileDefunct[$this->profileID]) && self::$profileDefunct[$this->profileID]===true))
+		if (!is_string($_folderName) || empty($_folderName) || (isset(self::$profileDefunct[$this->profileID]) && self::$profileDefunct[$this->profileID] === true))
 		{
 			// something is wrong. Do not proceed. either no folder or profile is marked as defunct for this request
 			return false;
@@ -1164,7 +1164,7 @@ 
 		{
 			$folderInfoCache = $folderBasicInfo[$this->profileID];
 		}
-		if (isset($folderInfoCache[$_folderName]) && $ignoreStatusCache==false && $basicInfoOnly) return $folderInfoCache[$_folderName];
+		if (isset($folderInfoCache[$_folderName]) && $ignoreStatusCache == false && $basicInfoOnly) return $folderInfoCache[$_folderName];
 		$retValue = array();
 		$retValue['subscribed'] = false;
 /*
@@ -1185,39 +1185,39 @@ 
 			{
 				//error_log(__METHOD__.array2string($e));
 				//error_log(__METHOD__." failed to fetch Mailbox $_folderName on ".$this->profileID.' Reason:'.$e->getMessage().($e->details?', '.$e->details:'')/*.function_backtrace()*/);
-				self::$profileDefunct[$this->profileID]=true;
-				throw new Exception(__METHOD__." failed to fetch Mailbox $_folderName on ".$this->profileID.' Reason:'.$e->getMessage().($e->details?', '.$e->details:''));
+				self::$profileDefunct[$this->profileID] = true;
+				throw new Exception(__METHOD__." failed to fetch Mailbox $_folderName on ".$this->profileID.' Reason:'.$e->getMessage().($e->details ? ', '.$e->details : ''));
 			}
 			//error_log(__METHOD__.' ('.__LINE__.') '.$_folderName.' '.array2string($ret));
 			if (is_array($ret))
 			{
 				$retkeys = array_keys($ret);
-				if ($retkeys[0]==$_folderName) $folderInfoCache[$_folderName] = $ret[$retkeys[0]];
+				if ($retkeys[0] == $_folderName) $folderInfoCache[$_folderName] = $ret[$retkeys[0]];
 			}
 			else
 			{
-				$folderInfoCache[$_folderName]=false;
+				$folderInfoCache[$_folderName] = false;
 			}
 		}
 		$folderInfo = $folderInfoCache[$_folderName];
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($folderInfo).'->'.function_backtrace());
-		if($ignoreStatusCache||!$folderInfo|| !is_array($folderInfo)) {
+		if ($ignoreStatusCache || !$folderInfo || !is_array($folderInfo)) {
 			try
 			{
-				$folderInfo = $this->_getStatus($_folderName,$ignoreStatusCache);
+				$folderInfo = $this->_getStatus($_folderName, $ignoreStatusCache);
 			}
 			catch (\Exception $e)
 			{
 				//error_log(__METHOD__.array2string($e));
-				error_log(__METHOD__." failed to fetch status for $_folderName on ".$this->profileID.' Reason:'.$e->getMessage().($e->details?', '.$e->details:'')/*.function_backtrace()*/);
-				self::$profileDefunct[$this->profileID]=true;
+				error_log(__METHOD__." failed to fetch status for $_folderName on ".$this->profileID.' Reason:'.$e->getMessage().($e->details ? ', '.$e->details : '')/*.function_backtrace()*/);
+				self::$profileDefunct[$this->profileID] = true;
 				//throw new Exception(__METHOD__." failed to fetch status for $_folderName on ".$this->profileID.' Reason:'.$e->getMessage().($e->details?', '.$e->details:''));
-				$folderInfo=null;
+				$folderInfo = null;
 			}
 			if (!is_array($folderInfo))
 			{
 				// no folder info, but there is a status returned for the folder: something is wrong, try to cope with it
-				$folderInfo = is_array($folderInfo)?$folderInfo:array('HIERACHY_DELIMITER'=>$this->getHierarchyDelimiter(),
+				$folderInfo = is_array($folderInfo) ? $folderInfo : array('HIERACHY_DELIMITER'=>$this->getHierarchyDelimiter(),
 					'ATTRIBUTES' => '');
 				if (!isset($folderInfo['HIERACHY_DELIMITER']) || empty($folderInfo['HIERACHY_DELIMITER']) || (isset($folderInfo['delimiter']) && empty($folderInfo['delimiter'])))
 				{
@@ -1229,24 +1229,24 @@ 
 		#if(!is_array($folderInfo)) {
 		#	return false;
 		#}
-		$retValue['delimiter']		= (isset($folderInfo['HIERACHY_DELIMITER']) && $folderInfo['HIERACHY_DELIMITER']?$folderInfo['HIERACHY_DELIMITER']:$folderInfo['delimiter']);
-		$retValue['attributes']		= (isset($folderInfo['ATTRIBUTES']) && $folderInfo['ATTRIBUTES']?$folderInfo['ATTRIBUTES']:$folderInfo['attributes']);
-		$shortNameParts			= explode($retValue['delimiter'], $_folderName);
+		$retValue['delimiter']		= (isset($folderInfo['HIERACHY_DELIMITER']) && $folderInfo['HIERACHY_DELIMITER'] ? $folderInfo['HIERACHY_DELIMITER'] : $folderInfo['delimiter']);
+		$retValue['attributes']		= (isset($folderInfo['ATTRIBUTES']) && $folderInfo['ATTRIBUTES'] ? $folderInfo['ATTRIBUTES'] : $folderInfo['attributes']);
+		$shortNameParts = explode($retValue['delimiter'], $_folderName);
 		$retValue['shortName']		= array_pop($shortNameParts);
 		$retValue['displayName']	= $_folderName;
-		$retValue['shortDisplayName']	= $retValue['shortName'];
-		if(strtoupper($retValue['shortName']) == 'INBOX') {
-			$retValue['displayName']	= lang('INBOX');
-			$retValue['shortDisplayName']	= lang('INBOX');
+		$retValue['shortDisplayName'] = $retValue['shortName'];
+		if (strtoupper($retValue['shortName']) == 'INBOX') {
+			$retValue['displayName'] = lang('INBOX');
+			$retValue['shortDisplayName'] = lang('INBOX');
 		}
 		// translate the automatic Folders (Sent, Drafts, ...) like the INBOX
-		elseif (in_array($retValue['shortName'],self::$autoFolders))
+		elseif (in_array($retValue['shortName'], self::$autoFolders))
 		{
 			$retValue['displayName'] = $retValue['shortDisplayName'] = lang($retValue['shortName']);
 		}
-		if ($folderInfo) $folderBasicInfo[$this->profileID][$_folderName]=$retValue;
+		if ($folderInfo) $folderBasicInfo[$this->profileID][$_folderName] = $retValue;
 		//error_log(__METHOD__.' ('.__LINE__.') '.' '.$_folderName.array2string($retValue['attributes']));
-		if ($basicInfoOnly || (isset($retValue['attributes']) && stripos(array2string($retValue['attributes']),'noselect')!==false))
+		if ($basicInfoOnly || (isset($retValue['attributes']) && stripos(array2string($retValue['attributes']), 'noselect') !== false))
 		{
 			return $retValue;
 		}
@@ -1259,12 +1259,12 @@ 
 		if (is_null($nameSpace) || empty($nameSpace[$this->profileID])) $nameSpace[$this->profileID] = $this->_getNameSpaces();
 		if (!empty($nameSpace[$this->profileID]))
 		{
-			$nsNoPersonal=array();
-			foreach($nameSpace[$this->profileID] as &$ns)
+			$nsNoPersonal = array();
+			foreach ($nameSpace[$this->profileID] as &$ns)
 			{
-				if ($ns['type']!='personal') $nsNoPersonal[]=$ns;
+				if ($ns['type'] != 'personal') $nsNoPersonal[] = $ns;
 			}
-			$nameSpace[$this->profileID]=$nsNoPersonal;
+			$nameSpace[$this->profileID] = $nsNoPersonal;
 		}
 		if (is_null($prefix) || empty($prefix[$this->profileID]) || empty($prefix[$this->profileID][$_folderName])) $prefix[$this->profileID][$_folderName] = $this->getFolderPrefixFromNamespace($nameSpace[$this->profileID], $_folderName);
 
@@ -1273,33 +1273,33 @@ 
 			$subscribedFolders[$this->profileID] = $this->icServer->listSubscribedMailboxes();
 		}
 
-		if($fetchSubscribedInfo && is_array($subscribedFolders[$this->profileID]) && in_array($_folderName,$subscribedFolders[$this->profileID])) {
+		if ($fetchSubscribedInfo && is_array($subscribedFolders[$this->profileID]) && in_array($_folderName, $subscribedFolders[$this->profileID])) {
 			$retValue['subscribed'] = true;
 		}
 
 		try
 		{
 			//$folderStatus = $this->_getStatus($_folderName,$ignoreStatusCache);
-			$folderStatus = $this->getMailBoxCounters($_folderName,false);
-			$retValue['messages']		= $folderStatus['MESSAGES'];
+			$folderStatus = $this->getMailBoxCounters($_folderName, false);
+			$retValue['messages'] = $folderStatus['MESSAGES'];
 			$retValue['recent']		= $folderStatus['RECENT'];
-			$retValue['uidnext']		= $folderStatus['UIDNEXT'];
-			$retValue['uidvalidity']	= $folderStatus['UIDVALIDITY'];
+			$retValue['uidnext'] = $folderStatus['UIDNEXT'];
+			$retValue['uidvalidity'] = $folderStatus['UIDVALIDITY'];
 			$retValue['unseen']		= $folderStatus['UNSEEN'];
 			if (//$retValue['unseen']==0 &&
 				(isset($this->mailPreferences['trustServersUnseenInfo']) && // some servers dont serve the UNSEEN information
-				$this->mailPreferences['trustServersUnseenInfo']==false) ||
+				$this->mailPreferences['trustServersUnseenInfo'] == false) ||
 				(isset($this->mailPreferences['trustServersUnseenInfo']) &&
-				$this->mailPreferences['trustServersUnseenInfo']==2 &&
-				$prefix[$this->profileID][$_folderName] != '' && stripos($_folderName,$prefix[$this->profileID][$_folderName]) !== false)
+				$this->mailPreferences['trustServersUnseenInfo'] == 2 &&
+				$prefix[$this->profileID][$_folderName] != '' && stripos($_folderName, $prefix[$this->profileID][$_folderName]) !== false)
 			)
 			{
 				//error_log(__METHOD__." returned folderStatus for Folder $_folderName:".print_r($prefix,true).' TS:'.$this->mailPreferences['trustServersUnseenInfo']);
 				// we filter for the combined status of unseen and undeleted, as this is what we show in list
 				try
 				{
-					$byUid=true;
-					$sortResult = $this->getSortedList($_folderName, $_sort=0, $_reverse=1, array('status'=>array('UNSEEN','UNDELETED')),$byUid,false);
+					$byUid = true;
+					$sortResult = $this->getSortedList($_folderName, $_sort = 0, $_reverse = 1, array('status'=>array('UNSEEN', 'UNDELETED')), $byUid, false);
 					$retValue['unseen'] = $sortResult['count'];
 				}
 				catch (\Exception $ee)
@@ -1310,7 +1310,7 @@ 
 		}
 		catch (\Exception $e)
 		{
-			if (self::$debug) error_log(__METHOD__." returned folderStatus for Folder $_folderName:".print_r($e->getMessage(),true));
+			if (self::$debug) error_log(__METHOD__." returned folderStatus for Folder $_folderName:".print_r($e->getMessage(), true));
 		}
 
 		return $retValue;
@@ -1332,7 +1332,7 @@ 
 	 * @param mixed $_fetchPreviews = false (boolean/int) fetch part of the body of the messages requested (if integer the number is assumed to be the number of chars to be returned for preview; if set to true 300 chars are returned (when available))
 	 * @return array result as array(header=>array,total=>int,first=>int,last=>int)
 	 */
-	function getHeaders($_folderName, $_startMessage, $_numberOfMessages, $_sort, $_reverse, $_filter, $_thisUIDOnly=null, $_cacheResult=true, $_fetchPreviews=false)
+	function getHeaders($_folderName, $_startMessage, $_numberOfMessages, $_sort, $_reverse, $_filter, $_thisUIDOnly = null, $_cacheResult = true, $_fetchPreviews = false)
 	{
 		//self::$debug=true;
 		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.function_backtrace());
@@ -1345,7 +1345,7 @@ 
 		$rByUid = true; // try searching by uid. this var will be passed by reference to getSortedList, and may be set to false, if UID retrieval fails
 		#print "<pre>";
 		#$this->icServer->setDebug(true);
-		$total=0;
+		$total = 0;
 		if ($_thisUIDOnly === null)
 		{
 			if (($_startMessage || $_numberOfMessages) && !isset($_filter['range']))
@@ -1358,24 +1358,24 @@ 
 				//$_filter['range'] ="$_startMessage:*";
 			}
 			if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '."$_folderName, $_sort, $reverse, ".array2string($_filter).", $rByUid");
-			if (self::$debug||self::$debugTimes) $starttime = microtime (true);
+			if (self::$debug || self::$debugTimes) $starttime = microtime(true);
 			//see this example below for a 12 week datefilter (since)
 			//$_filter = array('status'=>array('UNDELETED'),'type'=>"SINCE",'string'=> date("d-M-Y", $starttime-(3600*24*7*12)));
 			$_sortResult = $this->getSortedList($_folderName, $_sort, $reverse, $_filter, $rByUid, $_cacheResult);
 			$sortResult = $_sortResult['match']->ids;
 			//$modseq = $_sortResult['modseq'];
 			//error_log(__METHOD__.' ('.__LINE__.') '.'Modsequence:'.$modseq);
-			if (self::$debug||self::$debugTimes) self::logRunTimes($starttime,null,' call getSortedList for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_thisUIDOnly),__METHOD__.' ('.__LINE__.') ');
+			if (self::$debug || self::$debugTimes) self::logRunTimes($starttime, null, ' call getSortedList for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_thisUIDOnly), __METHOD__.' ('.__LINE__.') ');
 
 			if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.array2string($sortResult));
 			#$this->icServer->setDebug(false);
 			#print "</pre>";
 			// nothing found
-			if(!is_array($sortResult) || empty($sortResult)) {
+			if (!is_array($sortResult) || empty($sortResult)) {
 				$retValue = array();
 				$retValue['info']['total']	= 0;
 				$retValue['info']['first']	= 0;
-				$retValue['info']['last']	= 0;
+				$retValue['info']['last'] = 0;
 				return $retValue;
 			}
 
@@ -1383,54 +1383,54 @@ 
 			#_debug_array($sortResult);
 			#_debug_array(array_slice($sortResult, -5, -2));
 			//error_log("REVERSE: $reverse");
-			if($reverse === true) {
-				if  ($_startMessage<=$total)
+			if ($reverse === true) {
+				if ($_startMessage <= $total)
 				{
-					$startMessage = $_startMessage-1;
+					$startMessage = $_startMessage - 1;
 				}
 				else
 				{
 					//error_log(__METHOD__.' ('.__LINE__.') '.' Start:'.$_startMessage.' NumberOfMessages:'.$_numberOfMessages.' Total:'.$total);
-					if ($_startMessage+$_numberOfMessages>$total)
+					if ($_startMessage + $_numberOfMessages > $total)
 					{
-						$numberOfMessages = $total%$_numberOfMessages;
+						$numberOfMessages = $total % $_numberOfMessages;
 						//$numberOfMessages = abs($_startMessage-$total-1);
-						if ($numberOfMessages>0 && $numberOfMessages<=$_numberOfMessages) $_numberOfMessages = $numberOfMessages;
+						if ($numberOfMessages > 0 && $numberOfMessages <= $_numberOfMessages) $_numberOfMessages = $numberOfMessages;
 						//error_log(__METHOD__.' ('.__LINE__.') '.' Start:'.$_startMessage.' NumberOfMessages:'.$_numberOfMessages.' Total:'.$total);
 					}
-					$startMessage=($total-$_numberOfMessages)-1;
+					$startMessage = ($total - $_numberOfMessages) - 1;
 					//$retValue['info']['first'] = $startMessage;
 					//$retValue['info']['last'] = $total;
 
 				}
-				if ($startMessage+$_numberOfMessages>$total)
+				if ($startMessage + $_numberOfMessages > $total)
 				{
-					$_numberOfMessages = $_numberOfMessages-($total-($startMessage+$_numberOfMessages));
+					$_numberOfMessages = $_numberOfMessages - ($total - ($startMessage + $_numberOfMessages));
 					//$retValue['info']['first'] = $startMessage;
 					//$retValue['info']['last'] = $total;
 				}
-				if($startMessage > 0) {
-					if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' StartMessage:'.(-($_numberOfMessages+$startMessage)).', '.-$startMessage.' Number of Messages:'.count($sortResult));
-					$sortResult = array_slice($sortResult, -($_numberOfMessages+$startMessage), -$startMessage);
+				if ($startMessage > 0) {
+					if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' StartMessage:'.(-($_numberOfMessages + $startMessage)).', '.-$startMessage.' Number of Messages:'.count($sortResult));
+					$sortResult = array_slice($sortResult, -($_numberOfMessages + $startMessage), -$startMessage);
 				} else {
-					if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' StartMessage:'.(-($_numberOfMessages+($_startMessage-1))).', AllTheRest, Number of Messages:'.count($sortResult));
-					$sortResult = array_slice($sortResult, -($_numberOfMessages+($_startMessage-1)));
+					if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' StartMessage:'.(-($_numberOfMessages + ($_startMessage - 1))).', AllTheRest, Number of Messages:'.count($sortResult));
+					$sortResult = array_slice($sortResult, -($_numberOfMessages + ($_startMessage - 1)));
 				}
 				$sortResult = array_reverse($sortResult);
 			} else {
-				if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' StartMessage:'.($_startMessage-1).', '.$_numberOfMessages.' Number of Messages:'.count($sortResult));
-				$sortResult = array_slice($sortResult, $_startMessage-1, $_numberOfMessages);
+				if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' StartMessage:'.($_startMessage - 1).', '.$_numberOfMessages.' Number of Messages:'.count($sortResult));
+				$sortResult = array_slice($sortResult, $_startMessage - 1, $_numberOfMessages);
 			}
 			if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.array2string($sortResult));
 		}
 		else
 		{
-			$sortResult = (is_array($_thisUIDOnly) ? $_thisUIDOnly:(array)$_thisUIDOnly);
+			$sortResult = (is_array($_thisUIDOnly) ? $_thisUIDOnly : (array)$_thisUIDOnly);
 		}
 
 
 		// fetch the data for the selected messages
-		if (self::$debug||self::$debugTimes) $starttime = microtime(true);
+		if (self::$debug || self::$debugTimes) $starttime = microtime(true);
 		try
 		{
 			$uidsToFetch = new Horde_Imap_Client_Ids();
@@ -1439,22 +1439,22 @@ 
 			$fquery = new Horde_Imap_Client_Fetch_Query();
 
 			// Pre-cache the headers we want, 'fetchHeaders' is a label into the cache
-			$fquery->headers('fetchHeaders',array(
-				'DISPOSITION-NOTIFICATION-TO','RETURN-RECEIPT-TO','X-CONFIRM-READING-TO',
-				'DATE','SUBJECT','FROM','TO','CC',
+			$fquery->headers('fetchHeaders', array(
+				'DISPOSITION-NOTIFICATION-TO', 'RETURN-RECEIPT-TO', 'X-CONFIRM-READING-TO',
+				'DATE', 'SUBJECT', 'FROM', 'TO', 'CC',
 				'X-PRIORITY'
-			),array(
+			), array(
 				// Cache headers, we'll look at them below
-				'cache' => true,//$_cacheResult,
+				'cache' => true, //$_cacheResult,
 				// Set peek so messages are not flagged as read
 				'peek' => true
 			));
 			$fquery->size();
 			$fquery->structure();
 			$fquery->flags();
-			$fquery->imapDate();// needed to ensure getImapDate fetches the internaldate, not the current time
+			$fquery->imapDate(); // needed to ensure getImapDate fetches the internaldate, not the current time
 			// if $_fetchPreviews is activated fetch part of the messages too
-			if ($_fetchPreviews) $fquery->fullText(array('peek'=>true,'length'=>((int)$_fetchPreviews<5000?5000:$_fetchPreviews),'start'=>0));
+			if ($_fetchPreviews) $fquery->fullText(array('peek'=>true, 'length'=>((int)$_fetchPreviews < 5000 ? 5000 : $_fetchPreviews), 'start'=>0));
 			$headersNew = $this->icServer->fetch($_folderName, $fquery, array(
 				'ids' => $uidsToFetch,
 			));
@@ -1465,9 +1465,9 @@ 
 			$headersNew = array();
 			$sortResult = array();
 		}
-		if (self::$debug||self::$debugTimes)
+		if (self::$debug || self::$debugTimes)
 		{
-			self::logRunTimes($starttime,null,'HordeFetch: for Folder:'.$_folderName.' Filter:'.array2string($_filter),__METHOD__.' ('.__LINE__.') ');
+			self::logRunTimes($starttime, null, 'HordeFetch: for Folder:'.$_folderName.' Filter:'.array2string($_filter), __METHOD__.' ('.__LINE__.') ');
 			if (self::$debug)
 			{
 				$queryString = implode(',', $sortResult);
@@ -1477,27 +1477,27 @@ 
 
 		$cnt = 0;
 
-		foreach((array)$sortResult as $uid) {
+		foreach ((array)$sortResult as $uid) {
 			$sortOrder[$uid] = $cnt++;
 		}
 
 		$count = 0;
 		if (is_object($headersNew)) {
-			if (self::$debug||self::$debugTimes) $starttime = microtime(true);
-			foreach($headersNew->ids() as $id) {
+			if (self::$debug || self::$debugTimes) $starttime = microtime(true);
+			foreach ($headersNew->ids() as $id) {
 				$_headerObject = $headersNew->get($id);
 				//error_log(__METHOD__.' ('.__LINE__.') '.array2string($_headerObject));
 				$headerObject = array();
 				$bodyPreview = null;
-				$uid = $headerObject['UID']= ($_headerObject->getUid()?$_headerObject->getUid():$id);
+				$uid = $headerObject['UID'] = ($_headerObject->getUid() ? $_headerObject->getUid() : $id);
 				$headerObject['MSG_NUM'] = $_headerObject->getSeq();
 				$headerObject['SIZE'] = $_headerObject->getSize();
 				$headerObject['INTERNALDATE'] = $_headerObject->getImapDate();
 
 				// Get already cached headers, 'fetchHeaders' is a label matchimg above
-				$headerForPrio = $_headerObject->getHeaders('fetchHeaders',Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->toArray();
+				$headerForPrio = $_headerObject->getHeaders('fetchHeaders', Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->toArray();
 				// Try to fetch header with key='' as some servers might have no fetchHeaders index. e.g. yandex.com
-				if (empty($headerForPrio)) $headerForPrio = $_headerObject->getHeaders('',Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->toArray();
+				if (empty($headerForPrio)) $headerForPrio = $_headerObject->getHeaders('', Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->toArray();
 				//fetch the fullMsg part if all conditions match to be available in case $_headerObject->getHeaders returns
 				//nothing worthwhile (as it does for googlemail accounts, when preview is switched on
 				if ($_fetchPreviews)
@@ -1505,16 +1505,16 @@ 
 					// on enabled preview $bodyPreview is needed lateron. fetched here, for fallback-reasons
 					// in case of failed Header-Retrieval
 					$bodyPreview = $_headerObject->getFullMsg();
-					if (empty($headerForPrio)||(is_array($headerForPrio)&&count($headerForPrio)===1&&$headerForPrio['']))
+					if (empty($headerForPrio) || (is_array($headerForPrio) && count($headerForPrio) === 1 && $headerForPrio['']))
 					{
 						$length = strpos($bodyPreview, Horde_Mime_Part::RFC_EOL.Horde_Mime_Part::RFC_EOL);
-						if ($length===false) $length = strlen($bodyPreview);
-						$headerForPrio =  Horde_Mime_Headers::parseHeaders(substr($bodyPreview, 0,$length))->toArray();
+						if ($length === false) $length = strlen($bodyPreview);
+						$headerForPrio = Horde_Mime_Headers::parseHeaders(substr($bodyPreview, 0, $length))->toArray();
 					}
 				}
 				$headerForPrio = array_change_key_case($headerForPrio, CASE_UPPER);
 				if (self::$debug) {
-					error_log(__METHOD__.' ('.__LINE__.') '.array2string($_headerObject).'UID:'.$_headerObject->getUid().' Size:'.$_headerObject->getSize().' Date:'.$_headerObject->getImapDate().'/'.DateTime::to($_headerObject->getImapDate(),'Y-m-d H:i:s'));
+					error_log(__METHOD__.' ('.__LINE__.') '.array2string($_headerObject).'UID:'.$_headerObject->getUid().' Size:'.$_headerObject->getSize().' Date:'.$_headerObject->getImapDate().'/'.DateTime::to($_headerObject->getImapDate(), 'Y-m-d H:i:s'));
 					error_log(__METHOD__.' ('.__LINE__.') '.array2string($headerForPrio));
 				}
 				// message deleted from server but cache still reporting its existence ; may happen on QRESYNC with No permanent modsequences
@@ -1523,21 +1523,21 @@ 
 					$total--;
 					continue;
 				}
-				if ( isset($headerForPrio['DISPOSITION-NOTIFICATION-TO']) ) {
+				if (isset($headerForPrio['DISPOSITION-NOTIFICATION-TO'])) {
 					$headerObject['DISPOSITION-NOTIFICATION-TO'] = self::decode_header(trim($headerForPrio['DISPOSITION-NOTIFICATION-TO']));
-				} else if ( isset($headerForPrio['RETURN-RECEIPT-TO']) ) {
+				} else if (isset($headerForPrio['RETURN-RECEIPT-TO'])) {
 					$headerObject['DISPOSITION-NOTIFICATION-TO'] = self::decode_header(trim($headerForPrio['RETURN-RECEIPT-TO']));
-				} else if ( isset($headerForPrio['X-CONFIRM-READING-TO']) ) {
+				} else if (isset($headerForPrio['X-CONFIRM-READING-TO'])) {
 					$headerObject['DISPOSITION-NOTIFICATION-TO'] = self::decode_header(trim($headerForPrio['X-CONFIRM-READING-TO']));
 				} /*else $sent_not = "";*/
 				//error_log(__METHOD__.' ('.__LINE__.') '.array2string($headerObject));
 				$headerObject['DATE'] = $headerForPrio['DATE'];
-				$headerObject['SUBJECT'] = (is_array($headerForPrio['SUBJECT'])?$headerForPrio['SUBJECT'][0]:$headerForPrio['SUBJECT']);
-				$headerObject['FROM'] = (array)($headerForPrio['FROM']?$headerForPrio['FROM']:($headerForPrio['REPLY-TO']?$headerForPrio['REPLY-TO']:$headerForPrio['RETURN-PATH']));
+				$headerObject['SUBJECT'] = (is_array($headerForPrio['SUBJECT']) ? $headerForPrio['SUBJECT'][0] : $headerForPrio['SUBJECT']);
+				$headerObject['FROM'] = (array)($headerForPrio['FROM'] ? $headerForPrio['FROM'] : ($headerForPrio['REPLY-TO'] ? $headerForPrio['REPLY-TO'] : $headerForPrio['RETURN-PATH']));
 				$headerObject['TO'] = (array)$headerForPrio['TO'];
-				$headerObject['CC'] = isset($headerForPrio['CC'])?(array)$headerForPrio['CC']:array();
-				$headerObject['PRIORITY'] = isset($headerForPrio['X-PRIORITY'])?$headerForPrio['X-PRIORITY']:null;
-				foreach (array('FROM','TO','CC') as $key)
+				$headerObject['CC'] = isset($headerForPrio['CC']) ? (array)$headerForPrio['CC'] : array();
+				$headerObject['PRIORITY'] = isset($headerForPrio['X-PRIORITY']) ? $headerForPrio['X-PRIORITY'] : null;
+				foreach (array('FROM', 'TO', 'CC') as $key)
 				{
 					$address = array();
 					foreach ($headerObject[$key] as $k => $ad)
@@ -1559,13 +1559,13 @@ 
 						foreach ($rfcAddr as $_rfcAddr)
 						{
 							if (!$_rfcAddr->valid)	continue; // skip. not a valid address
-							$address[] = imap_rfc822_write_address($_rfcAddr->mailbox,$_rfcAddr->host,$_rfcAddr->personal);
+							$address[] = imap_rfc822_write_address($_rfcAddr->mailbox, $_rfcAddr->host, $_rfcAddr->personal);
 						}
 					}
 					$headerObject[$key] = $address;
 				}
 				$headerObject['FLAGS'] = $_headerObject->getFlags();
-				$headerObject['BODYPREVIEW']=null;
+				$headerObject['BODYPREVIEW'] = null;
 				// this section fetches part of the message-body (if enabled) for some kind of preview
 				// if we fail to succeed, we fall back to the retrieval of the message-body with
 				// fetchPartContents (see below, when we iterate over the structure to determine the
@@ -1577,17 +1577,17 @@ 
 					if (empty($bodyPreview)) $bodyPreview = $_headerObject->getFullMsg();
 					//error_log(__METHOD__.' ('.__LINE__.') '.array2string($bodyPreview));
 					$base = Horde_Mime_Part::parseMessage($bodyPreview);
-					foreach($base->partIterator() as $part)
+					foreach ($base->partIterator() as $part)
 					{
 						//error_log(__METHOD__.__LINE__.'Part:'.$part->getPrimaryType());
-						if (empty($headerObject['BODYPREVIEW'])&&$part->getPrimaryType()== 'text')
+						if (empty($headerObject['BODYPREVIEW']) && $part->getPrimaryType() == 'text')
 						{
 							$charset = $part->getContentTypeParameter('charset');
 							$buffer = Mail\Html::convertHTMLToText($part->toString(array(
-												'encode' => Horde_Mime_Part::ENCODE_BINARY,	// otherwise we cant recode charset
+												'encode' => Horde_Mime_Part::ENCODE_BINARY, // otherwise we cant recode charset
 											)), $charset, 'utf-8');
-							$headerObject['BODYPREVIEW']=trim(str_replace(array("\r\n","\r","\n"),' ',mb_substr(Translation::convert_jsonsafe($buffer),0,((int)$_fetchPreviews<300?300:$_fetchPreviews))));
-						} elseif (empty($headerObject['BODYPREVIEW'])&&$part->getPrimaryType()== 'multipart')
+							$headerObject['BODYPREVIEW'] = trim(str_replace(array("\r\n", "\r", "\n"), ' ', mb_substr(Translation::convert_jsonsafe($buffer), 0, ((int)$_fetchPreviews < 300 ? 300 : $_fetchPreviews))));
+						} elseif (empty($headerObject['BODYPREVIEW']) && $part->getPrimaryType() == 'multipart')
 						{
 							//error_log(__METHOD__.' ('.__LINE__.') '.array2string($part));
 						}
@@ -1598,12 +1598,12 @@ 
 				//error_log(__METHOD__.' ('.__LINE__.') '.array2string($headerObject));
 				//error_log(__METHOD__.' ('.__LINE__.') '.' MimeMap:'.array2string($mailStructureObject->contentTypeMap()));
 				//foreach ($_headerObject->getStructure()->getParts() as $p => $part)
-				$headerObject['ATTACHMENTS']=null;
-				$skipParts=array();
-				$messageMimeType='';
+				$headerObject['ATTACHMENTS'] = null;
+				$skipParts = array();
+				$messageMimeType = '';
 				foreach ($mailStructureObject->contentTypeMap() as $mime_id => $mime_type)
 				{
-					if ($mime_id==0 || $messageMimeType==='') $messageMimeType = $mime_type;
+					if ($mime_id == 0 || $messageMimeType === '') $messageMimeType = $mime_type;
 					$part = $mailStructureObject->getPart($mime_id);
 					$partdisposition = $part->getDisposition();
 					$partPrimaryType = $part->getPrimaryType();
@@ -1611,16 +1611,16 @@ 
 					// drawback here it is talking to the mailserver for each mail thus consuming
 					// more time than expected; so we call this section only when there is no
 					// bodypreview could be found (multipart/....)
-					if ($_fetchPreviews && empty($headerObject['BODYPREVIEW'])&&($partPrimaryType == 'text') &&
+					if ($_fetchPreviews && empty($headerObject['BODYPREVIEW']) && ($partPrimaryType == 'text') &&
 						((intval($mime_id) === 1) || !$mime_id) &&
 						($partdisposition !== 'attachment')) {
-							$_structure=$part;
-							$this->fetchPartContents($uid, $_structure, false,true);
-							$headerObject['BODYPREVIEW']=trim(str_replace(array("\r\n","\r","\n"),' ',mb_substr(Mail\Html::convertHTMLToText($_structure->getContents()),0,((int)$_fetchPreviews<300?300:$_fetchPreviews))));
-							$charSet=Translation::detect_encoding($headerObject['BODYPREVIEW']);
+							$_structure = $part;
+							$this->fetchPartContents($uid, $_structure, false, true);
+							$headerObject['BODYPREVIEW'] = trim(str_replace(array("\r\n", "\r", "\n"), ' ', mb_substr(Mail\Html::convertHTMLToText($_structure->getContents()), 0, ((int)$_fetchPreviews < 300 ? 300 : $_fetchPreviews))));
+							$charSet = Translation::detect_encoding($headerObject['BODYPREVIEW']);
 							// add line breaks to $bodyParts
 							//error_log(__METHOD__.' ('.__LINE__.') '.' Charset:'.$bodyParts[$i]['charSet'].'->'.$bodyParts[$i]['body']);
-							$headerObject['BODYPREVIEW']  = Translation::convert_jsonsafe($headerObject['BODYPREVIEW'], $charSet);
+							$headerObject['BODYPREVIEW'] = Translation::convert_jsonsafe($headerObject['BODYPREVIEW'], $charSet);
 							//error_log(__METHOD__.__LINE__.$headerObject['BODYPREVIEW']);
 					}
 					//error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$uid.'->'.$mime_id.' Disp:'.$partdisposition.' Type:'.$partPrimaryType);
@@ -1630,28 +1630,28 @@ 
 						// the presence of an cid does not necessarily indicate its inline. it may lack the needed
 						// link to show the image. Considering this: we "list" everything that matches the above criteria
 						// as attachment in order to not loose/miss information on our data
-						$partdisposition='attachment';//($partPrimaryType == 'image'&&!empty($cid)?'inline':'attachment');
+						$partdisposition = 'attachment'; //($partPrimaryType == 'image'&&!empty($cid)?'inline':'attachment');
 					}
-					if ($mime_type=='message/rfc822')
+					if ($mime_type == 'message/rfc822')
 					{
 						//error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$uid.'->'.$mime_id.':'.array2string($part->contentTypeMap()));
-						foreach($part->contentTypeMap() as $sub_id => $sub_type) { if ($sub_id != $mime_id) $skipParts[$sub_id] = $sub_type;}
+						foreach ($part->contentTypeMap() as $sub_id => $sub_type) { if ($sub_id != $mime_id) $skipParts[$sub_id] = $sub_type; }
 					}
 					//error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$uid.'->'.$mime_id.' Disp:'.$partdisposition.' Type:'.$partPrimaryType.' Skip:'.array2string($skipParts));
-					if (array_key_exists($mime_id,$skipParts)) continue;
-					if ($partdisposition=='attachment' ||
-						($partdisposition=='inline'&&$partPrimaryType == 'image'&&$mime_type=='image/tiff') || // as we are not able to display tiffs
-						($partdisposition=='inline'&&$partPrimaryType == 'image'&&empty($cid)) ||
-						($partdisposition=='inline' && $partPrimaryType != 'image' && $partPrimaryType != 'multipart' && $partPrimaryType != 'text'))
+					if (array_key_exists($mime_id, $skipParts)) continue;
+					if ($partdisposition == 'attachment' ||
+						($partdisposition == 'inline' && $partPrimaryType == 'image' && $mime_type == 'image/tiff') || // as we are not able to display tiffs
+						($partdisposition == 'inline' && $partPrimaryType == 'image' && empty($cid)) ||
+						($partdisposition == 'inline' && $partPrimaryType != 'image' && $partPrimaryType != 'multipart' && $partPrimaryType != 'text'))
 					{
-						$headerObject['ATTACHMENTS'][$mime_id]=$part->getAllDispositionParameters();
-						$headerObject['ATTACHMENTS'][$mime_id]['mimeType']=$mime_type;
-						$headerObject['ATTACHMENTS'][$mime_id]['uid']=$uid;
+						$headerObject['ATTACHMENTS'][$mime_id] = $part->getAllDispositionParameters();
+						$headerObject['ATTACHMENTS'][$mime_id]['mimeType'] = $mime_type;
+						$headerObject['ATTACHMENTS'][$mime_id]['uid'] = $uid;
 						$headerObject['ATTACHMENTS'][$mime_id]['cid'] = $cid;
-						$headerObject['ATTACHMENTS'][$mime_id]['partID']=$mime_id;
-						if (!isset($headerObject['ATTACHMENTS'][$mime_id]['name']))$headerObject['ATTACHMENTS'][$mime_id]['name']=$part->getName();
-						if (!strcasecmp($headerObject['ATTACHMENTS'][$mime_id]['name'],'winmail.dat') ||
-							$headerObject['ATTACHMENTS'][$mime_id]['mimeType']=='application/ms-tnef')
+						$headerObject['ATTACHMENTS'][$mime_id]['partID'] = $mime_id;
+						if (!isset($headerObject['ATTACHMENTS'][$mime_id]['name']))$headerObject['ATTACHMENTS'][$mime_id]['name'] = $part->getName();
+						if (!strcasecmp($headerObject['ATTACHMENTS'][$mime_id]['name'], 'winmail.dat') ||
+							$headerObject['ATTACHMENTS'][$mime_id]['mimeType'] == 'application/ms-tnef')
 						{
 							$headerObject['ATTACHMENTS'][$mime_id]['is_winmail'] = true;
 						}
@@ -1666,54 +1666,54 @@ 
 				if (empty($headerObject['UID'])) continue;
 				//$uid = ($rByUid ? $headerObject['UID'] : $headerObject['MSG_NUM']);
 				// make dates like "Mon, 23 Apr 2007 10:11:06 UT" working with strtotime
-				if(substr($headerObject['DATE'],-2) === 'UT') {
+				if (substr($headerObject['DATE'], -2) === 'UT') {
 					$headerObject['DATE'] .= 'C';
 				}
-				if(substr($headerObject['INTERNALDATE'],-2) === 'UT') {
+				if (substr($headerObject['INTERNALDATE'], -2) === 'UT') {
 					$headerObject['INTERNALDATE'] .= 'C';
 				}
 				//error_log(__METHOD__.' ('.__LINE__.') '.' '.$headerObject['SUBJECT'].'->'.$headerObject['DATE'].'<->'.$headerObject['INTERNALDATE'] .'#');
 				//error_log(__METHOD__.' ('.__LINE__.') '.' '.$this->decode_subject($headerObject['SUBJECT']).'->'.$headerObject['DATE']);
-				if (isset($headerObject['ATTACHMENTS']) && count($headerObject['ATTACHMENTS'])) foreach ($headerObject['ATTACHMENTS'] as &$a) { $retValue['header'][$sortOrder[$uid]]['attachments'][]=$a;}
-				$retValue['header'][$sortOrder[$uid]]['subject']	= $this->decode_subject($headerObject['SUBJECT']);
-				$retValue['header'][$sortOrder[$uid]]['size'] 		= $headerObject['SIZE'];
-				$retValue['header'][$sortOrder[$uid]]['date']		= self::_strtotime(($headerObject['DATE']&&!($headerObject['DATE']=='NIL')?$headerObject['DATE']:$headerObject['INTERNALDATE']),'ts',true);
-				$retValue['header'][$sortOrder[$uid]]['internaldate']= self::_strtotime($headerObject['INTERNALDATE'],'ts',true);
-				$retValue['header'][$sortOrder[$uid]]['mimetype']	= $messageMimeType;
-				$retValue['header'][$sortOrder[$uid]]['id']		= $headerObject['MSG_NUM'];
-				$retValue['header'][$sortOrder[$uid]]['uid']		= $headerObject['UID'];
-				$retValue['header'][$sortOrder[$uid]]['bodypreview']		= $headerObject['BODYPREVIEW'];
-				$retValue['header'][$sortOrder[$uid]]['priority']		= ($headerObject['PRIORITY']?$headerObject['PRIORITY']:3);
+				if (isset($headerObject['ATTACHMENTS']) && count($headerObject['ATTACHMENTS'])) foreach ($headerObject['ATTACHMENTS'] as &$a) { $retValue['header'][$sortOrder[$uid]]['attachments'][] = $a; }
+				$retValue['header'][$sortOrder[$uid]]['subject'] = $this->decode_subject($headerObject['SUBJECT']);
+				$retValue['header'][$sortOrder[$uid]]['size'] = $headerObject['SIZE'];
+				$retValue['header'][$sortOrder[$uid]]['date'] = self::_strtotime(($headerObject['DATE'] && !($headerObject['DATE'] == 'NIL') ? $headerObject['DATE'] : $headerObject['INTERNALDATE']), 'ts', true);
+				$retValue['header'][$sortOrder[$uid]]['internaldate'] = self::_strtotime($headerObject['INTERNALDATE'], 'ts', true);
+				$retValue['header'][$sortOrder[$uid]]['mimetype'] = $messageMimeType;
+				$retValue['header'][$sortOrder[$uid]]['id'] = $headerObject['MSG_NUM'];
+				$retValue['header'][$sortOrder[$uid]]['uid'] = $headerObject['UID'];
+				$retValue['header'][$sortOrder[$uid]]['bodypreview'] = $headerObject['BODYPREVIEW'];
+				$retValue['header'][$sortOrder[$uid]]['priority'] = ($headerObject['PRIORITY'] ? $headerObject['PRIORITY'] : 3);
 				//error_log(__METHOD__.' ('.__LINE__.') '.' '.array2string($retValue['header'][$sortOrder[$uid]]));
 				if (isset($headerObject['DISPOSITION-NOTIFICATION-TO'])) $retValue['header'][$sortOrder[$uid]]['disposition-notification-to'] = $headerObject['DISPOSITION-NOTIFICATION-TO'];
 				if (is_array($headerObject['FLAGS'])) {
-					$retValue['header'][$sortOrder[$uid]] = array_merge($retValue['header'][$sortOrder[$uid]],self::prepareFlagsArray($headerObject));
+					$retValue['header'][$sortOrder[$uid]] = array_merge($retValue['header'][$sortOrder[$uid]], self::prepareFlagsArray($headerObject));
 				}
 				//error_log(__METHOD__.' ('.__LINE__.') '.$headerObject['SUBJECT'].'->'.array2string($_headerObject->getEnvelope()->__get('from')));
-				if(is_array($headerObject['FROM']) && $headerObject['FROM'][0]) {
-					$retValue['header'][$sortOrder[$uid]]['sender_address'] = self::decode_header($headerObject['FROM'][0],true);
+				if (is_array($headerObject['FROM']) && $headerObject['FROM'][0]) {
+					$retValue['header'][$sortOrder[$uid]]['sender_address'] = self::decode_header($headerObject['FROM'][0], true);
 				}
-				if(is_array($headerObject['TO']) && $headerObject['TO'][0]) {
-					$retValue['header'][$sortOrder[$uid]]['to_address'] = self::decode_header($headerObject['TO'][0],true);
-					if (count($headerObject['TO'])>1)
+				if (is_array($headerObject['TO']) && $headerObject['TO'][0]) {
+					$retValue['header'][$sortOrder[$uid]]['to_address'] = self::decode_header($headerObject['TO'][0], true);
+					if (count($headerObject['TO']) > 1)
 					{
-						$ki=0;
-						foreach($headerObject['TO'] as $k => $add)
+						$ki = 0;
+						foreach ($headerObject['TO'] as $k => $add)
 						{
-							if ($k==0) continue;
+							if ($k == 0) continue;
 							//error_log(__METHOD__.' ('.__LINE__.') '."-> $k:".array2string($add));
-							$retValue['header'][$sortOrder[$uid]]['additional_to_addresses'][$ki] = self::decode_header($add,true);
+							$retValue['header'][$sortOrder[$uid]]['additional_to_addresses'][$ki] = self::decode_header($add, true);
 							//error_log(__METHOD__.' ('.__LINE__.') '.array2string($retValue['header'][$sortOrder[$uid]]['additional_to_addresses'][$ki]));
 							$ki++;
 						}
 					}
 				}
-				if(is_array($headerObject['CC']) && count($headerObject['CC'])>0) {
-					$ki=0;
-					foreach($headerObject['CC'] as $k => $add)
+				if (is_array($headerObject['CC']) && count($headerObject['CC']) > 0) {
+					$ki = 0;
+					foreach ($headerObject['CC'] as $k => $add)
 					{
 						//error_log(__METHOD__.' ('.__LINE__.') '."-> $k:".array2string($add));
-						$retValue['header'][$sortOrder[$uid]]['cc_addresses'][$ki] = self::decode_header($add,true);
+						$retValue['header'][$sortOrder[$uid]]['cc_addresses'][$ki] = self::decode_header($add, true);
 						//error_log(__METHOD__.' ('.__LINE__.') '.array2string($retValue['header'][$sortOrder[$uid]]['additional_to_addresses'][$ki]));
 						$ki++;
 					}
@@ -1722,27 +1722,27 @@ 
 
 				$count++;
 			}
-			if (self::$debug||self::$debugTimes) self::logRunTimes($starttime,null,' fetching Headers and stuff for Folder:'.$_folderName,__METHOD__.' ('.__LINE__.') ');
+			if (self::$debug || self::$debugTimes) self::logRunTimes($starttime, null, ' fetching Headers and stuff for Folder:'.$_folderName, __METHOD__.' ('.__LINE__.') ');
 			//self::$debug=false;
 			// sort the messages to the requested displayorder
-			if(is_array($retValue['header'])) {
+			if (is_array($retValue['header'])) {
 				$countMessages = $total;
 				if (isset($_filter['range'])) $countMessages = self::$folderStatusCache[$this->profileID][$_folderName]['messages'];
 				ksort($retValue['header']);
 				$retValue['info']['total']	= $total;
 				//if ($_startMessage>$total) $_startMessage = $total-($count-1);
 				$retValue['info']['first']	= $_startMessage;
-				$retValue['info']['last']	= $_startMessage + $count - 1 ;
+				$retValue['info']['last'] = $_startMessage + $count - 1;
 				return $retValue;
 			} else {
 				$retValue = array();
 				$retValue['info']['total']	= 0;
 				$retValue['info']['first']	= 0;
-				$retValue['info']['last']	= 0;
+				$retValue['info']['last'] = 0;
 				return $retValue;
 			}
 		} else {
-			if ($headersNew == null && empty($_thisUIDOnly)) error_log(__METHOD__." -> retrieval of Message Details to Query $queryString failed: ".print_r($headersNew,TRUE));
+			if ($headersNew == null && empty($_thisUIDOnly)) error_log(__METHOD__." -> retrieval of Message Details to Query $queryString failed: ".print_r($headersNew, TRUE));
 			$retValue = array();
 			$retValue['info']['total']  = 0;
 			$retValue['info']['first']  = 0;
@@ -1759,17 +1759,17 @@ 
 	 */
 	static function prepareFlagsArray($headerObject)
 	{
-		if (is_array($headerObject['FLAGS'])) $headerFlags = array_map('strtolower',$headerObject['FLAGS']);
+		if (is_array($headerObject['FLAGS'])) $headerFlags = array_map('strtolower', $headerObject['FLAGS']);
 		$retValue = array();
 		$retValue['recent']		= in_array('\\recent', $headerFlags);
 		$retValue['flagged']	= in_array('\\flagged', $headerFlags);
-		$retValue['answered']	= in_array('\\answered', $headerFlags);
-		$retValue['forwarded']   = in_array('$forwarded', $headerFlags);
+		$retValue['answered'] = in_array('\\answered', $headerFlags);
+		$retValue['forwarded'] = in_array('$forwarded', $headerFlags);
 		$retValue['deleted']	= in_array('\\deleted', $headerFlags);
-		$retValue['seen']		= in_array('\\seen', $headerFlags);
-		$retValue['draft']		= in_array('\\draft', $headerFlags);
-		$retValue['mdnsent']	= in_array('$mdnsent', $headerFlags)||in_array('mdnsent', $headerFlags);
-		$retValue['mdnnotsent']	= in_array('$mdnnotsent', $headerFlags)||in_array('mdnnotsent', $headerFlags);
+		$retValue['seen'] = in_array('\\seen', $headerFlags);
+		$retValue['draft'] = in_array('\\draft', $headerFlags);
+		$retValue['mdnsent']	= in_array('$mdnsent', $headerFlags) || in_array('mdnsent', $headerFlags);
+		$retValue['mdnnotsent'] = in_array('$mdnnotsent', $headerFlags) || in_array('mdnnotsent', $headerFlags);
 		$retValue['label1']   = in_array('$label1', $headerFlags);
 		$retValue['label2']   = in_array('$label2', $headerFlags);
 		$retValue['label3']   = in_array('$label3', $headerFlags);
@@ -1793,12 +1793,12 @@ 
 	 * @param bool $setSession if set to true the session will be populated with the result of the query
 	 * @return mixed bool/array false or array of ids
 	 */
-	function getSortedList($_folderName, $_sort, &$_reverse, $_filter, &$resultByUid=true, $setSession=true)
+	function getSortedList($_folderName, $_sort, &$_reverse, $_filter, &$resultByUid = true, $setSession = true)
 	{
 		static $cachedFolderStatus = null;
 		// in the past we needed examineMailbox to figure out if the server with the serverID support keywords
 		// this information is filled/provided by examineMailbox; but caching within one request seems o.k.
-		if (is_null($cachedFolderStatus) || !isset($cachedFolderStatus[$this->profileID][$_folderName]) )
+		if (is_null($cachedFolderStatus) || !isset($cachedFolderStatus[$this->profileID][$_folderName]))
 		{
 			$folderStatus = $cachedFolderStatus[$this->profileID][$_folderName] = $this->icServer->examineMailbox($_folderName);
 		}
@@ -1810,28 +1810,28 @@ 
 		//error_log(__METHOD__.' ('.__LINE__.') '.' Filter:'.array2string($_filter));
 		$try2useCache = true;
 		static $eMailListContainsDeletedMessages = null;
-		if (is_null($eMailListContainsDeletedMessages)) $eMailListContainsDeletedMessages = Cache::getCache(Cache::INSTANCE,'email','eMailListContainsDeletedMessages'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
+		if (is_null($eMailListContainsDeletedMessages)) $eMailListContainsDeletedMessages = Cache::getCache(Cache::INSTANCE, 'email', 'eMailListContainsDeletedMessages'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 1);
 		// this indicates, that there is no Filter set, and the returned set/subset should not contain DELETED Messages, nor filtered for UNDELETED
-		if ($setSession==true && ((strpos(array2string($_filter), 'UNDELETED') === false && strpos(array2string($_filter), 'DELETED') === false)))
+		if ($setSession == true && ((strpos(array2string($_filter), 'UNDELETED') === false && strpos(array2string($_filter), 'DELETED') === false)))
 		{
 			if (self::$debugTimes) $starttime = microtime(true);
-			if (is_null($eMailListContainsDeletedMessages) || empty($eMailListContainsDeletedMessages[$this->profileID]) || empty($eMailListContainsDeletedMessages[$this->profileID][$_folderName])) $eMailListContainsDeletedMessages = Cache::getCache(Cache::INSTANCE,'email','eMailListContainsDeletedMessages'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
-			$five=true;
-			$deletedMessages = $this->getSortedList($_folderName, 0, $three=1, array('status'=>array('DELETED')),$five,false);
+			if (is_null($eMailListContainsDeletedMessages) || empty($eMailListContainsDeletedMessages[$this->profileID]) || empty($eMailListContainsDeletedMessages[$this->profileID][$_folderName])) $eMailListContainsDeletedMessages = Cache::getCache(Cache::INSTANCE, 'email', 'eMailListContainsDeletedMessages'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 1);
+			$five = true;
+			$deletedMessages = $this->getSortedList($_folderName, 0, $three = 1, array('status'=>array('DELETED')), $five, false);
 			if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') Found DeletedMessages:'.array2string($eMailListContainsDeletedMessages));
-			$eMailListContainsDeletedMessages[$this->profileID][$_folderName] =$deletedMessages['count'];
-			Cache::setCache(Cache::INSTANCE,'email','eMailListContainsDeletedMessages'.trim($GLOBALS['egw_info']['user']['account_id']),$eMailListContainsDeletedMessages, 60*60*1);
-			if (self::$debugTimes) self::logRunTimes($starttime,null,'setting eMailListContainsDeletedMessages for Profile:'.$this->profileID.' Folder:'.$_folderName.' to '.$eMailListContainsDeletedMessages[$this->profileID][$_folderName],__METHOD__.' ('.__LINE__.') ');			//error_log(__METHOD__.' ('.__LINE__.') '.' Profile:'.$this->profileID.' Folder:'.$_folderName.' -> EXISTS/SessStat:'.array2string($folderStatus['MESSAGES']).'/'.self::$folderStatusCache[$this->profileID][$_folderName]['messages'].' ListContDelMsg/SessDeleted:'.$eMailListContainsDeletedMessages[$this->profileID][$_folderName].'/'.self::$folderStatusCache[$this->profileID][$_folderName]['deleted']);
+			$eMailListContainsDeletedMessages[$this->profileID][$_folderName] = $deletedMessages['count'];
+			Cache::setCache(Cache::INSTANCE, 'email', 'eMailListContainsDeletedMessages'.trim($GLOBALS['egw_info']['user']['account_id']), $eMailListContainsDeletedMessages, 60 * 60 * 1);
+			if (self::$debugTimes) self::logRunTimes($starttime, null, 'setting eMailListContainsDeletedMessages for Profile:'.$this->profileID.' Folder:'.$_folderName.' to '.$eMailListContainsDeletedMessages[$this->profileID][$_folderName], __METHOD__.' ('.__LINE__.') '); //error_log(__METHOD__.' ('.__LINE__.') '.' Profile:'.$this->profileID.' Folder:'.$_folderName.' -> EXISTS/SessStat:'.array2string($folderStatus['MESSAGES']).'/'.self::$folderStatusCache[$this->profileID][$_folderName]['messages'].' ListContDelMsg/SessDeleted:'.$eMailListContainsDeletedMessages[$this->profileID][$_folderName].'/'.self::$folderStatusCache[$this->profileID][$_folderName]['deleted']);
 		}
 		$try2useCache = false;
 		//self::$supportsORinQuery[$this->profileID]=true;
 		if (is_null(self::$supportsORinQuery) || !isset(self::$supportsORinQuery[$this->profileID]))
 		{
-			self::$supportsORinQuery = Cache::getCache(Cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*10);
-			if (!isset(self::$supportsORinQuery[$this->profileID])) self::$supportsORinQuery[$this->profileID]=true;
+			self::$supportsORinQuery = Cache::getCache(Cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 10);
+			if (!isset(self::$supportsORinQuery[$this->profileID])) self::$supportsORinQuery[$this->profileID] = true;
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($_filter).' SupportsOrInQuery:'.self::$supportsORinQuery[$this->profileID]);
-		$filter = $this->createIMAPFilter($_folderName, $_filter,self::$supportsORinQuery[$this->profileID]);
+		$filter = $this->createIMAPFilter($_folderName, $_filter, self::$supportsORinQuery[$this->profileID]);
 		if (self::$debug)
 		{
 			$query_str = $filter->build();
@@ -1839,14 +1839,14 @@ 
 		}
 		//_debug_array($filter);
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($filter).'#'.array2string($this->icServer->capability()));
-		if($this->icServer->hasCapability('SORT')) {
+		if ($this->icServer->hasCapability('SORT')) {
 			// when using an orQuery and we sort by date. sort seems to fail on certain servers => ZIMBRA with Horde_Imap_Client
 			// thus we translate the search request from date to Horde_Imap_Client::SORT_SEQUENCE (which should be the same, if
 			// there is no messing with the dates)
 			//if (self::$supportsORinQuery[$this->profileID]&&$_sort=='date'&&$_filter['type']=='quick'&&!empty($_filter['string']))$_sort='INTERNALDATE';
 			if (self::$debug) error_log(__METHOD__." Mailserver has SORT Capability, SortBy: ".array2string($_sort)." Reverse: $_reverse");
 			$sortOrder = $this->_getSortString($_sort, $_reverse);
-			if ($_reverse && in_array(Horde_Imap_Client::SORT_REVERSE,$sortOrder)) $_reverse=false; // as we reversed the result already
+			if ($_reverse && in_array(Horde_Imap_Client::SORT_REVERSE, $sortOrder)) $_reverse = false; // as we reversed the result already
 			if (self::$debug) error_log(__METHOD__." Mailserver runs SORT: SortBy:".array2string($_sort)."->".array2string($sortOrder)." Filter: ".array2string($filter));
 			try
 			{
@@ -1854,24 +1854,24 @@ 
 					'sort' => $sortOrder,));
 			// if there is an Error, we assume that the server is not capable of sorting
 			}
-			catch(\Exception $e)
+			catch (\Exception $e)
 			{
 				//error_log(__METHOD__.'('.__LINE__.'):'.$e->getMessage());
 				$resultByUid = false;
 				$sortOrder = array(Horde_Imap_Client::SORT_SEQUENCE);
-				if ($_reverse) array_unshift($sortOrder,Horde_Imap_Client::SORT_REVERSE);
+				if ($_reverse) array_unshift($sortOrder, Horde_Imap_Client::SORT_REVERSE);
 				try
 				{
 					$sortResult = $this->icServer->search($_folderName, $filter, array(
 						'sort' => $sortOrder));
 				}
-				catch(\Exception $e)
+				catch (\Exception $e)
 				{
 					error_log(__METHOD__.'('.__LINE__.'):'.$e->getMessage());
 					$sortResult = self::$folderStatusCache[$this->profileID][$_folderName]['sortResult'];
 				}
 			}
-			if (self::$debug) error_log(__METHOD__.print_r($sortResult,true));
+			if (self::$debug) error_log(__METHOD__.print_r($sortResult, true));
 		} else {
 			if (self::$debug) error_log(__METHOD__." Mailserver has NO SORT Capability");
 			//$sortOrder = array(Horde_Imap_Client::SORT_SEQUENCE);
@@ -1881,12 +1881,12 @@ 
 				$sortResult = $this->icServer->search($_folderName, $filter, array()/*array(
 					'sort' => $sortOrder)*/);
 			}
-			catch(\Exception $e)
+			catch (\Exception $e)
 			{
 				//error_log(__METHOD__.'('.__LINE__.'):'.$e->getMessage());
 				// possible error OR Query. But Horde gives no detailed Info :-(
-				self::$supportsORinQuery[$this->profileID]=false;
-				Cache::setCache(Cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']),self::$supportsORinQuery,60*60*10);
+				self::$supportsORinQuery[$this->profileID] = false;
+				Cache::setCache(Cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), self::$supportsORinQuery, 60 * 60 * 10);
 				if (self::$debug) error_log(__METHOD__.__LINE__." Mailserver seems to have NO OR Capability for Search:".$sortResult->message);
 				$filter = $this->createIMAPFilter($_folderName, $_filter, self::$supportsORinQuery[$this->profileID]);
 				try
@@ -1894,25 +1894,25 @@ 
 					$sortResult = $this->icServer->search($_folderName, $filter, array()/*array(
 						'sort' => $sortOrder)*/);
 				}
-				catch(\Exception $e)
+				catch (\Exception $e)
 				{
 				}
 			}
-			if(is_array($sortResult['match'])) {
+			if (is_array($sortResult['match'])) {
 					// not sure that this is going so succeed as $sortResult['match'] is a hordeObject
 					sort($sortResult['match'], SORT_NUMERIC);
 			}
-			if (self::$debug) error_log(__METHOD__." using Filter:".print_r($filter,true)." ->".print_r($sortResult,true));
+			if (self::$debug) error_log(__METHOD__." using Filter:".print_r($filter, true)." ->".print_r($sortResult, true));
 		}
 		if ($setSession)
 		{
 			self::$folderStatusCache[$this->profileID][$_folderName]['uidValidity'] = $folderStatus['UIDVALIDITY'];
-			self::$folderStatusCache[$this->profileID][$_folderName]['messages']	= $folderStatus['MESSAGES'];
+			self::$folderStatusCache[$this->profileID][$_folderName]['messages'] = $folderStatus['MESSAGES'];
 			self::$folderStatusCache[$this->profileID][$_folderName]['deleted']	= $eMailListContainsDeletedMessages[$this->profileID][$_folderName];
 			self::$folderStatusCache[$this->profileID][$_folderName]['uidnext']	= $folderStatus['UIDNEXT'];
-			self::$folderStatusCache[$this->profileID][$_folderName]['filter']	= $_filter;
+			self::$folderStatusCache[$this->profileID][$_folderName]['filter'] = $_filter;
 			self::$folderStatusCache[$this->profileID][$_folderName]['sortResult'] = $sortResult;
-			self::$folderStatusCache[$this->profileID][$_folderName]['sort']	= $_sort;
+			self::$folderStatusCache[$this->profileID][$_folderName]['sort'] = $_sort;
 		}
 		//error_log(__METHOD__." using Filter:".print_r($filter,true)." ->".print_r($sortResult,true));
 		//_debug_array($sortResult['match']->ids);
@@ -1926,12 +1926,12 @@ 
 	 * @param bool _reverse wether to add REVERSE to the Sort String or not
 	 * @return the sort sequence for horde search
 	 */
-	function _getSortString($_sort, $_reverse=false)
+	function _getSortString($_sort, $_reverse = false)
 	{
-		$_reverse=false;
+		$_reverse = false;
 		if (is_numeric($_sort))
 		{
-			switch($_sort) {
+			switch ($_sort) {
 				case 2:
 					$retValue = array(Horde_Imap_Client::SORT_FROM);
 					break;
@@ -1953,7 +1953,7 @@ 
 		}
 		else
 		{
-			switch(strtoupper($_sort)) {
+			switch (strtoupper($_sort)) {
 				case 'FROMADDRESS':
 					$retValue = array(Horde_Imap_Client::SORT_FROM);
 					break;
@@ -1979,7 +1979,7 @@ 
 					break;
 			}
 		}
-		if ($_reverse) array_unshift($retValue,Horde_Imap_Client::SORT_REVERSE);
+		if ($_reverse) array_unshift($retValue, Horde_Imap_Client::SORT_REVERSE);
 		//error_log(__METHOD__.' ('.__LINE__.') '.' '.($_reverse?'REVERSE ':'').$_sort.'->'.$retValue);
 		return $retValue;
 	}
@@ -1992,28 +1992,28 @@ 
 	 * @param boolean $_supportsOrInQuery wether to use the OR Query on QuickSearch
 	 * @return Horde_Imap_Client_Search_Query the IMAP filter
 	 */
-	function createIMAPFilter($_folder, $_criterias, $_supportsOrInQuery=true)
+	function createIMAPFilter($_folder, $_criterias, $_supportsOrInQuery = true)
 	{
 		$imapFilter = new Horde_Imap_Client_Search_Query();
 		$imapFilter->charset('UTF-8');
 
 		//_debug_array($_criterias);
-		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' Criterias:'.(!is_array($_criterias)?" none -> returning":array2string($_criterias)));
-		if((!is_array($_criterias) || $_criterias['status']=='any') &&
+		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' Criterias:'.(!is_array($_criterias) ? " none -> returning" : array2string($_criterias)));
+		if ((!is_array($_criterias) || $_criterias['status'] == 'any') &&
 			(!isset($_criterias['string']) || empty($_criterias['string'])) &&
-			(!isset($_criterias['range'])|| empty($_criterias['range']) ||
-			( !empty($_criterias['range'])&& ($_criterias['range']!='BETWEEN' && empty($_criterias['date'])||
-			($_criterias['range']=='BETWEEN' && empty($_criterias['since'])&& empty($_criterias['before']))))))
+			(!isset($_criterias['range']) || empty($_criterias['range']) ||
+			(!empty($_criterias['range']) && ($_criterias['range'] != 'BETWEEN' && empty($_criterias['date']) ||
+			($_criterias['range'] == 'BETWEEN' && empty($_criterias['since']) && empty($_criterias['before']))))))
 		{
 			//error_log(__METHOD__.' ('.__LINE__.') returning early Criterias:'.print_r($_criterias, true));
-			$imapFilter->flag('DELETED', $set=false);
+			$imapFilter->flag('DELETED', $set = false);
 			return $imapFilter;
 		}
 		$queryValid = false;
 		// statusQuery MUST be placed first, as search for subject/mailbody and such is
 		// depending on charset. flagSearch is not BUT messes the charset if called afterwards
 		$statusQueryValid = false;
-		foreach((array)$_criterias['status'] as $k => $criteria) {
+		foreach ((array)$_criterias['status'] as $k => $criteria) {
 			$imapStatusFilter = new Horde_Imap_Client_Search_Query();
 			$imapStatusFilter->charset('UTF-8');
 			$criteria = strtoupper($criteria);
@@ -2023,12 +2023,12 @@ 
 				case 'FLAGGED':
 				case 'RECENT':
 				case 'SEEN':
-					$imapStatusFilter->flag($criteria, $set=true);
-					$queryValid = $statusQueryValid =true;
+					$imapStatusFilter->flag($criteria, $set = true);
+					$queryValid = $statusQueryValid = true;
 					break;
 				case 'READ':
-					$imapStatusFilter->flag('SEEN', $set=true);
-					$queryValid = $statusQueryValid =true;
+					$imapStatusFilter->flag('SEEN', $set = true);
+					$queryValid = $statusQueryValid = true;
 					break;
 				case 'LABEL1':
 				case 'KEYWORD1':
@@ -2040,38 +2040,38 @@ 
 				case 'KEYWORD4':
 				case 'LABEL5':
 				case 'KEYWORD5':
-					$imapStatusFilter->flag(str_ireplace('KEYWORD','$LABEL',$criteria), $set=true);
-					$queryValid = $statusQueryValid =true;
+					$imapStatusFilter->flag(str_ireplace('KEYWORD', '$LABEL', $criteria), $set = true);
+					$queryValid = $statusQueryValid = true;
 					break;
 				case 'NEW':
-					$imapStatusFilter->flag('RECENT', $set=true);
-					$imapStatusFilter->flag('SEEN', $set=false);
-					$queryValid = $statusQueryValid =true;
+					$imapStatusFilter->flag('RECENT', $set = true);
+					$imapStatusFilter->flag('SEEN', $set = false);
+					$queryValid = $statusQueryValid = true;
 					break;
 				case 'OLD':
-					$imapStatusFilter->flag('RECENT', $set=false);
-					$queryValid = $statusQueryValid =true;
+					$imapStatusFilter->flag('RECENT', $set = false);
+					$queryValid = $statusQueryValid = true;
 					break;
 // operate only on system flags
 //        $systemflags = array(
 //            'ANSWERED', 'DELETED', 'DRAFT', 'FLAGGED', 'RECENT', 'SEEN'
 //        );
 				case 'UNANSWERED':
-					$imapStatusFilter->flag('ANSWERED', $set=false);
-					$queryValid = $statusQueryValid =true;
+					$imapStatusFilter->flag('ANSWERED', $set = false);
+					$queryValid = $statusQueryValid = true;
 					break;
 				case 'UNDELETED':
-					$imapFilter->flag('DELETED', $set=false);
+					$imapFilter->flag('DELETED', $set = false);
 					$queryValid = true;
 					break;
 				case 'UNFLAGGED':
-					$imapStatusFilter->flag('FLAGGED', $set=false);
-					$queryValid = $statusQueryValid =true;
+					$imapStatusFilter->flag('FLAGGED', $set = false);
+					$queryValid = $statusQueryValid = true;
 					break;
 				case 'UNREAD':
 				case 'UNSEEN':
-					$imapStatusFilter->flag('SEEN', $set=false);
-					$queryValid = $statusQueryValid =true;
+					$imapStatusFilter->flag('SEEN', $set = false);
+					$queryValid = $statusQueryValid = true;
 					break;
 				case 'UNLABEL1':
 				case 'UNKEYWORD1':
@@ -2083,8 +2083,8 @@ 
 				case 'UNKEYWORD4':
 				case 'UNLABEL5':
 				case 'UNKEYWORD5':
-					$imapStatusFilter->flag(str_ireplace(array('UNKEYWORD','UNLABEL'),'$LABEL',$criteria), $set=false);
-					$queryValid = $statusQueryValid =true;
+					$imapStatusFilter->flag(str_ireplace(array('UNKEYWORD', 'UNLABEL'), '$LABEL', $criteria), $set = false);
+					$queryValid = $statusQueryValid = true;
 					break;
 				default:
 					$statusQueryValid = false;
@@ -2100,20 +2100,20 @@ 
 		$imapSearchFilter = new Horde_Imap_Client_Search_Query();
 		$imapSearchFilter->charset('UTF-8');
 
-		if(!empty($_criterias['string'])) {
+		if (!empty($_criterias['string'])) {
 			$criteria = strtoupper($_criterias['type']);
 			switch ($criteria) {
 				case 'BYDATE':
 				case 'QUICK':
 				case 'QUICKWITHCC':
-					$imapSearchFilter->headerText('SUBJECT', $_criterias['string'], $not=false);
+					$imapSearchFilter->headerText('SUBJECT', $_criterias['string'], $not = false);
 					//$imapSearchFilter->charset('UTF-8');
 					$imapFilter2 = new Horde_Imap_Client_Search_Query();
 					$imapFilter2->charset('UTF-8');
-					if($this->isSentFolder($_folder)) {
-						$imapFilter2->headerText('TO', $_criterias['string'], $not=false);
+					if ($this->isSentFolder($_folder)) {
+						$imapFilter2->headerText('TO', $_criterias['string'], $not = false);
 					} else {
-						$imapFilter2->headerText('FROM', $_criterias['string'], $not=false);
+						$imapFilter2->headerText('FROM', $_criterias['string'], $not = false);
 					}
 					if ($_supportsOrInQuery)
 					{
@@ -2123,31 +2123,31 @@ 
 					{
 						$imapSearchFilter->andSearch($imapFilter2);
 					}
-					if ($_supportsOrInQuery && $criteria=='QUICKWITHCC')
+					if ($_supportsOrInQuery && $criteria == 'QUICKWITHCC')
 					{
 						$imapFilter3 = new Horde_Imap_Client_Search_Query();
 						$imapFilter3->charset('UTF-8');
-						$imapFilter3->headerText('CC', $_criterias['string'], $not=false);
+						$imapFilter3->headerText('CC', $_criterias['string'], $not = false);
 						$imapSearchFilter->orSearch($imapFilter3);
 					}
 					$queryValid = true;
 					break;
 				case 'LARGER':
 				case 'SMALLER':
-					if (strlen(trim($_criterias['string'])) != strlen((float) trim($_criterias['string'])))
+					if (strlen(trim($_criterias['string'])) != strlen((float)trim($_criterias['string'])))
 					{
 						//examine string to evaluate size
-						$unit = strtoupper(trim(substr(trim($_criterias['string']),strlen((float) trim($_criterias['string'])))));
-						$multipleBy = array('KB'=>1024,'K'=>1024,
-											'MB'=>1024*1000,'M'=>1024*1000,
-											'GB'=>1024*1000*1000,'G'=>1024*1000*1000,
-											'TB'=>1024*1000*1000*1000,'T'=>1024*1000*1000*1000);
-						$numberinBytes=(float)$_criterias['string'];
-						if (isset($multipleBy[$unit])) $numberinBytes=(float)$_criterias['string']*$multipleBy[$unit];
+						$unit = strtoupper(trim(substr(trim($_criterias['string']), strlen((float)trim($_criterias['string'])))));
+						$multipleBy = array('KB'=>1024, 'K'=>1024,
+											'MB'=>1024 * 1000, 'M'=>1024 * 1000,
+											'GB'=>1024 * 1000 * 1000, 'G'=>1024 * 1000 * 1000,
+											'TB'=>1024 * 1000 * 1000 * 1000, 'T'=>1024 * 1000 * 1000 * 1000);
+						$numberinBytes = (float)$_criterias['string'];
+						if (isset($multipleBy[$unit])) $numberinBytes = (float)$_criterias['string'] * $multipleBy[$unit];
 						//error_log(__METHOD__.__LINE__.'#'.$_criterias['string'].'->'.(float)$_criterias['string'].'#'.$unit.' ='.$numberinBytes);
-						$_criterias['string']=$numberinBytes;
+						$_criterias['string'] = $numberinBytes;
 					}
-					$imapSearchFilter->size( $_criterias['string'], ($criteria=='LARGER'?true:false), $not=false);
+					$imapSearchFilter->size($_criterias['string'], ($criteria == 'LARGER' ? true : false), $not = false);
 					//$imapSearchFilter->charset('UTF-8');
 					$queryValid = true;
 					break;
@@ -2156,31 +2156,31 @@ 
 				case 'CC':
 				case 'BCC':
 				case 'SUBJECT':
-					$imapSearchFilter->headerText($criteria, $_criterias['string'], $not=false);
+					$imapSearchFilter->headerText($criteria, $_criterias['string'], $not = false);
 					//$imapSearchFilter->charset('UTF-8');
 					$queryValid = true;
 					break;
 				case 'BODY':
 				case 'TEXT':
-					$imapSearchFilter->text($_criterias['string'],($criteria=='BODY'?true:false), $not=false);
+					$imapSearchFilter->text($_criterias['string'], ($criteria == 'BODY' ? true : false), $not = false);
 					//$imapSearchFilter->charset('UTF-8');
 					$queryValid = true;
 					break;
 				case 'SINCE':
-					$imapSearchFilter->dateSearch(new DateTime($_criterias['string']), Horde_Imap_Client_Search_Query::DATE_SINCE, $header=true, $not=false);
+					$imapSearchFilter->dateSearch(new DateTime($_criterias['string']), Horde_Imap_Client_Search_Query::DATE_SINCE, $header = true, $not = false);
 					$queryValid = true;
 					break;
 				case 'BEFORE':
-					$imapSearchFilter->dateSearch(new DateTime($_criterias['string']), Horde_Imap_Client_Search_Query::DATE_BEFORE, $header=true, $not=false);
+					$imapSearchFilter->dateSearch(new DateTime($_criterias['string']), Horde_Imap_Client_Search_Query::DATE_BEFORE, $header = true, $not = false);
 					$queryValid = true;
 					break;
 				case 'ON':
-					$imapSearchFilter->dateSearch(new DateTime($_criterias['string']), Horde_Imap_Client_Search_Query::DATE_ON, $header=true, $not=false);
+					$imapSearchFilter->dateSearch(new DateTime($_criterias['string']), Horde_Imap_Client_Search_Query::DATE_ON, $header = true, $not = false);
 					$queryValid = true;
 					break;
 			}
 		}
-		if ($statusQueryValid && !$queryValid) $queryValid=true;
+		if ($statusQueryValid && !$queryValid) $queryValid = true;
 		if ($queryValid) $imapFilter->andSearch($imapSearchFilter);
 
 		if (isset($_criterias['range']) && !empty($_criterias['range']))
@@ -2189,12 +2189,12 @@ 
 			$imapRangeFilter = new Horde_Imap_Client_Search_Query();
 			$imapRangeFilter->charset('UTF-8');
 			$criteria = strtoupper($_criterias['range']);
-			if ($_criterias['range'] == "BETWEEN" && isset($_criterias['since']) && isset($_criterias['before']) && $_criterias['since']==$_criterias['before'])
+			if ($_criterias['range'] == "BETWEEN" && isset($_criterias['since']) && isset($_criterias['before']) && $_criterias['since'] == $_criterias['before'])
 			{
-				$_criterias['date']=$_criterias['since'];
+				$_criterias['date'] = $_criterias['since'];
 				unset($_criterias['since']);
 				unset($_criterias['before']);
-				$criteria=$_criterias['range']='ON';
+				$criteria = $_criterias['range'] = 'ON';
 			}
 			switch ($criteria) {
 				case 'BETWEEN':
@@ -2202,7 +2202,7 @@ 
 					//enddate
 					if ($_criterias['since'])
 					{
-						$imapRangeFilter->dateSearch(new DateTime($_criterias['since']), Horde_Imap_Client_Search_Query::DATE_SINCE, $header=true, $not=false);
+						$imapRangeFilter->dateSearch(new DateTime($_criterias['since']), Horde_Imap_Client_Search_Query::DATE_SINCE, $header = true, $not = false);
 						$rangeValid = true;
 					}
 					//startdate
@@ -2211,28 +2211,28 @@ 
 						$imapRangeFilter2 = new Horde_Imap_Client_Search_Query();
 						$imapRangeFilter2->charset('UTF-8');
 						//our before (startdate) is inklusive, as we work with "d-M-Y", we must add a day
-						$_criterias['before'] = date("d-M-Y",DateTime::to($_criterias['before'],'ts')+(3600*24));
-						$imapRangeFilter2->dateSearch(new DateTime($_criterias['before']), Horde_Imap_Client_Search_Query::DATE_BEFORE, $header=true, $not=false);
+						$_criterias['before'] = date("d-M-Y", DateTime::to($_criterias['before'], 'ts') + (3600 * 24));
+						$imapRangeFilter2->dateSearch(new DateTime($_criterias['before']), Horde_Imap_Client_Search_Query::DATE_BEFORE, $header = true, $not = false);
 						$imapRangeFilter->andSearch($imapRangeFilter2);
 						$rangeValid = true;
 					}
 					break;
 				case 'SINCE'://enddate
-					$imapRangeFilter->dateSearch(new DateTime(($_criterias['since']?$_criterias['since']:$_criterias['date'])), Horde_Imap_Client_Search_Query::DATE_SINCE, $header=true, $not=false);
+					$imapRangeFilter->dateSearch(new DateTime(($_criterias['since'] ? $_criterias['since'] : $_criterias['date'])), Horde_Imap_Client_Search_Query::DATE_SINCE, $header = true, $not = false);
 					$rangeValid = true;
 					break;
 				case 'BEFORE'://startdate
 					//our before (startdate) is inklusive, as we work with "d-M-Y", we must add a day
-					$_criterias['before'] = date("d-M-Y",DateTime::to(($_criterias['before']?$_criterias['before']:$_criterias['date']),'ts')+(3600*24));
-					$imapRangeFilter->dateSearch(new DateTime($_criterias['before']), Horde_Imap_Client_Search_Query::DATE_BEFORE, $header=true, $not=false);
+					$_criterias['before'] = date("d-M-Y", DateTime::to(($_criterias['before'] ? $_criterias['before'] : $_criterias['date']), 'ts') + (3600 * 24));
+					$imapRangeFilter->dateSearch(new DateTime($_criterias['before']), Horde_Imap_Client_Search_Query::DATE_BEFORE, $header = true, $not = false);
 					$rangeValid = true;
 					break;
 				case 'ON':
-					$imapRangeFilter->dateSearch(new DateTime($_criterias['date']), Horde_Imap_Client_Search_Query::DATE_ON, $header=true, $not=false);
+					$imapRangeFilter->dateSearch(new DateTime($_criterias['date']), Horde_Imap_Client_Search_Query::DATE_ON, $header = true, $not = false);
 					$rangeValid = true;
 					break;
 			}
-			if ($rangeValid && !$queryValid) $queryValid=true;
+			if ($rangeValid && !$queryValid) $queryValid = true;
 			if ($rangeValid) $imapFilter->andSearch($imapRangeFilter);
 		}
 		if (self::$debug)
@@ -2241,8 +2241,8 @@ 
 			$query_str = $imapFilter->build();
 			//error_log(__METHOD__.' ('.__LINE__.') '.' '.$query_str['query'].' created by Criterias:'.(!is_array($_criterias)?" none -> returning":array2string($_criterias)));
 		}
-		if($queryValid==false) {
-			$imapFilter->flag('DELETED', $set=false);
+		if ($queryValid == false) {
+			$imapFilter->flag('DELETED', $set = false);
 			return $imapFilter;
 		} else {
 			return $imapFilter;
@@ -2256,11 +2256,11 @@ 
 	 * @param  mixed/boolean $_tryIDNConversion (true/false AND FORCE): try IDN Conversion on domainparts of emailADRESSES
 	 * @return mixed - based on the input type
 	 */
-	static function decode_header($_string, $_tryIDNConversion=false)
+	static function decode_header($_string, $_tryIDNConversion = false)
 	{
 		if (is_array($_string))
 		{
-			foreach($_string as $k=>$v)
+			foreach ($_string as $k=>$v)
 			{
 				$_string[$k] = self::decode_header($v, $_tryIDNConversion);
 			}
@@ -2268,18 +2268,18 @@ 
 		}
 		else
 		{
-			$_string = Mail\Html::decodeMailHeader($_string,self::$displayCharset);
+			$_string = Mail\Html::decodeMailHeader($_string, self::$displayCharset);
 			$test = @json_encode($_string);
 			//error_log(__METHOD__.__LINE__.' ->'.strlen($singleBodyPart['body']).' Error:'.json_last_error().'<- BodyPart:#'.$test.'#');
-			if (($test=="null" || $test === false || is_null($test)) && strlen($_string)>0)
+			if (($test == "null" || $test === false || is_null($test)) && strlen($_string) > 0)
 			{
 				// try to fix broken utf8
 				$x = utf8_encode($_string);
 				$test = @json_encode($x);
-				if (($test=="null" || $test === false || is_null($test)) && strlen($_string)>0)
+				if (($test == "null" || $test === false || is_null($test)) && strlen($_string) > 0)
 				{
 					// this should not be needed, unless something fails with charset detection/ wrong charset passed
-					$_string = (function_exists('mb_convert_encoding')?mb_convert_encoding($_string,'UTF-8','UTF-8'):(function_exists('iconv')?@iconv("UTF-8","UTF-8//IGNORE",$_string):$_string));
+					$_string = (function_exists('mb_convert_encoding') ? mb_convert_encoding($_string, 'UTF-8', 'UTF-8') : (function_exists('iconv') ? @iconv("UTF-8", "UTF-8//IGNORE", $_string) : $_string));
 				}
 				else
 				{
@@ -2287,7 +2287,7 @@ 
 				}
 			}
 
-			if ($_tryIDNConversion===true && stripos($_string,'@')!==false)
+			if ($_tryIDNConversion === true && stripos($_string, '@') !== false)
 			{
 				$rfcAddr = self::parseAddressList($_string);
 				$stringA = array();
@@ -2299,11 +2299,11 @@ 
 						$stringA = array();
 						break; // skip idna conversion if we encounter an error here
 					}
-					$stringA[] = imap_rfc822_write_address($_rfcAddr->mailbox,Horde_Idna::decode($_rfcAddr->host),$_rfcAddr->personal);
+					$stringA[] = imap_rfc822_write_address($_rfcAddr->mailbox, Horde_Idna::decode($_rfcAddr->host), $_rfcAddr->personal);
 				}
-				if (!empty($stringA)) $_string = implode(',',$stringA);
+				if (!empty($stringA)) $_string = implode(',', $stringA);
 			}
-			if ($_tryIDNConversion==='FORCE')
+			if ($_tryIDNConversion === 'FORCE')
 			{
 				//error_log(__METHOD__.' ('.__LINE__.') '.'->'.$_string.'='.Horde_Idna::decode($_string));
 				$_string = Horde_Idna::decode($_string);
@@ -2319,17 +2319,17 @@ 
 	 * @param  boolean $decode try decoding
 	 * @return mixed - based on the input type
 	 */
-	function decode_subject($_string,$decode=true)
+	function decode_subject($_string, $decode = true)
 	{
 		#$string = $_string;
-		if($_string=='NIL')
+		if ($_string == 'NIL')
 		{
 			return 'No Subject';
 		}
 		if ($decode) $_string = self::decode_header($_string);
 		// make sure its utf-8
 		$test = @json_encode($_string);
-		if (($test=="null" || $test === false || is_null($test)) && strlen($_string)>0)
+		if (($test == "null" || $test === false || is_null($test)) && strlen($_string) > 0)
 		{
 			$_string = utf8_encode($_string);
 		}
@@ -2381,18 +2381,18 @@ 
 	function createFolder($_parent, $_folderName, &$_error)
 	{
 		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '."->"."$_parent, $_folderName called from:".function_backtrace());
-		$parent		= $_parent;//$this->_encodeFolderName($_parent);
-		$folderName	= $_folderName;//$this->_encodeFolderName($_folderName);
+		$parent = $_parent; //$this->_encodeFolderName($_parent);
+		$folderName = $_folderName; //$this->_encodeFolderName($_folderName);
 
-		if(empty($parent)) {
+		if (empty($parent)) {
 			$newFolderName = $folderName;
 		} else {
 			$HierarchyDelimiter = $this->getHierarchyDelimiter();
-			$newFolderName = $parent . $HierarchyDelimiter . $folderName;
+			$newFolderName = $parent.$HierarchyDelimiter.$folderName;
 		}
 		if (empty($newFolderName)) return false;
 		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.'->'.$newFolderName);
-		if ($this->folderExists($newFolderName,true))
+		if ($this->folderExists($newFolderName, true))
 		{
 			if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '." Folder $newFolderName already exists.");
 			return $newFolderName;
@@ -2409,7 +2409,7 @@ 
 		}
 		catch (\Exception $e)
 		{
-			$_error = lang('Could not create Folder %1 Reason: %2',$newFolderName,$e->getMessage());
+			$_error = lang('Could not create Folder %1 Reason: %2', $newFolderName, $e->getMessage());
 			error_log(__METHOD__.' ('.__LINE__.') '.' create Folder '.$newFolderName.'->'.$e->getMessage().' ('.$e->details.') Namespace:'.array2string($this->icServer->getNameSpaces()).function_backtrace());
 			return false;
 		}
@@ -2438,15 +2438,15 @@ 
 	 */
 	function renameFolder($_oldFolderName, $_parent, $_folderName)
 	{
-		$oldFolderName	= $_oldFolderName;//$this->_encodeFolderName($_oldFolderName);
-		$parent		= $_parent;//$this->_encodeFolderName($_parent);
-		$folderName	= $_folderName;//$this->_encodeFolderName($_folderName);
+		$oldFolderName = $_oldFolderName; //$this->_encodeFolderName($_oldFolderName);
+		$parent = $_parent; //$this->_encodeFolderName($_parent);
+		$folderName = $_folderName; //$this->_encodeFolderName($_folderName);
 
-		if(empty($parent)) {
+		if (empty($parent)) {
 			$newFolderName = $folderName;
 		} else {
 			$HierarchyDelimiter = $this->getHierarchyDelimiter();
-			$newFolderName = $parent . $HierarchyDelimiter . $folderName;
+			$newFolderName = $parent.$HierarchyDelimiter.$folderName;
 		}
 		if (self::$debug) error_log("create folder: $newFolderName");
 		try
@@ -2455,10 +2455,10 @@ 
 		}
 		catch (\Exception $e)
 		{
-			throw new Exception(__METHOD__." failed for $oldFolderName (rename to: $newFolderName) with error:".$e->getMessage());;
+			throw new Exception(__METHOD__." failed for $oldFolderName (rename to: $newFolderName) with error:".$e->getMessage()); ;
 		}
 		// clear FolderExistsInfoCache
-		Cache::setCache(Cache::INSTANCE,'email','icServerFolderExistsInfo'.trim($GLOBALS['egw_info']['user']['account_id']),$folderInfo,60*60*5);
+		Cache::setCache(Cache::INSTANCE, 'email', 'icServerFolderExistsInfo'.trim($GLOBALS['egw_info']['user']['account_id']), $folderInfo, 60 * 60 * 5);
 
 		return $newFolderName;
 
@@ -2477,15 +2477,15 @@ 
 		//$folderName = $this->_encodeFolderName($_folderName);
 		try
 		{
-			$this->icServer->subscribeMailbox($_folderName,false);
+			$this->icServer->subscribeMailbox($_folderName, false);
 			$this->icServer->deleteMailbox($_folderName);
 		}
 		catch (\Exception $e)
 		{
-			throw new Exception("Deleting Folder $_folderName failed! Error:".$e->getMessage());;
+			throw new Exception("Deleting Folder $_folderName failed! Error:".$e->getMessage()); ;
 		}
 		// clear FolderExistsInfoCache
-		Cache::setCache(Cache::INSTANCE,'email','icServerFolderExistsInfo'.trim($GLOBALS['egw_info']['user']['account_id']),$folderInfo,60*60*5);
+		Cache::setCache(Cache::INSTANCE, 'email', 'icServerFolderExistsInfo'.trim($GLOBALS['egw_info']['user']['account_id']), $folderInfo, 60 * 60 * 5);
 
 		return true;
 	}
@@ -2520,10 +2520,10 @@ 
 	 *
 	 * @return array with folder objects. eg.: INBOX => {inbox object}
 	 */
-	function getFolderObjects($_subscribedOnly=false, $_getCounters=false, $_alwaysGetDefaultFolders=false,$_useCacheIfPossible=true)
+	function getFolderObjects($_subscribedOnly = false, $_getCounters = false, $_alwaysGetDefaultFolders = false, $_useCacheIfPossible = true)
 	{
 		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' ServerID:'.$this->icServer->ImapServerId.", subscribedOnly:$_subscribedOnly, getCounters:$_getCounters, alwaysGetDefaultFolders:$_alwaysGetDefaultFolders, _useCacheIfPossible:$_useCacheIfPossible");
-		if (self::$debugTimes) $starttime = microtime (true);
+		if (self::$debugTimes) $starttime = microtime(true);
 		static $folders2return;
 		//$_subscribedOnly=false;
 		// always use static on single request if info is available;
@@ -2531,42 +2531,42 @@ 
 		// set $_useCacheIfPossible to false !
 		if ($_useCacheIfPossible && isset($folders2return[$this->icServer->ImapServerId]) && !empty($folders2return[$this->icServer->ImapServerId]))
 		{
-			if (self::$debugTimes) self::logRunTimes($starttime,null,'using static',__METHOD__.' ('.__LINE__.') ');
+			if (self::$debugTimes) self::logRunTimes($starttime, null, 'using static', __METHOD__.' ('.__LINE__.') ');
 			return $folders2return[$this->icServer->ImapServerId];
 		}
 
-		if ($_subscribedOnly && $_getCounters===false)
+		if ($_subscribedOnly && $_getCounters === false)
 		{
-			if (is_null($folders2return)) $folders2return = Cache::getCache(Cache::INSTANCE,'email','folderObjects'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
+			if (is_null($folders2return)) $folders2return = Cache::getCache(Cache::INSTANCE, 'email', 'folderObjects'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 1);
 			if ($_useCacheIfPossible && isset($folders2return[$this->icServer->ImapServerId]) && !empty($folders2return[$this->icServer->ImapServerId]))
 			{
 				//error_log(__METHOD__.' ('.__LINE__.') '.' using Cached folderObjects'.array2string($folders2return[$this->icServer->ImapServerId]));
-				if (self::$debugTimes) self::logRunTimes($starttime,null,'from Cache',__METHOD__.' ('.__LINE__.') ');
+				if (self::$debugTimes) self::logRunTimes($starttime, null, 'from Cache', __METHOD__.' ('.__LINE__.') ');
 				return $folders2return[$this->icServer->ImapServerId];
 			}
 		}
 		// use $folderBasicInfo for holding attributes and other basic folderinfo $folderBasicInfo[$this->icServer->ImapServerId]
 		static $folderBasicInfo;
-		if (is_null($folderBasicInfo)||!isset($folderBasicInfo[$this->icServer->ImapServerId])) $folderBasicInfo = Cache::getCache(Cache::INSTANCE,'email','folderBasicInfo'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
+		if (is_null($folderBasicInfo) || !isset($folderBasicInfo[$this->icServer->ImapServerId])) $folderBasicInfo = Cache::getCache(Cache::INSTANCE, 'email', 'folderBasicInfo'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 1);
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string(array_keys($folderBasicInfo[$this->icServer->ImapServerId])));
 
 		$delimiter = $this->getHierarchyDelimiter();
 
 		$inboxData = new \stdClass;
-		$inboxData->name 		= 'INBOX';
+		$inboxData->name = 'INBOX';
 		$inboxData->folderName		= 'INBOX';
-		$inboxData->displayName		= lang('INBOX');
+		$inboxData->displayName = lang('INBOX');
 		$inboxData->delimiter 		= $delimiter;
-		$inboxData->shortFolderName	= 'INBOX';
-		$inboxData->shortDisplayName	= lang('INBOX');
+		$inboxData->shortFolderName = 'INBOX';
+		$inboxData->shortDisplayName = lang('INBOX');
 		$inboxData->subscribed = true;
-		if($_getCounters == true) {
+		if ($_getCounters == true) {
 			$inboxData->counter = $this->getMailBoxCounters('INBOX');
 		}
 		// force unsubscribed by preference showAllFoldersInFolderPane
 		if ($_subscribedOnly == true &&
 			isset($this->mailPreferences['showAllFoldersInFolderPane']) &&
-			$this->mailPreferences['showAllFoldersInFolderPane']==1)
+			$this->mailPreferences['showAllFoldersInFolderPane'] == 1)
 		{
 			$_subscribedOnly = false;
 		}
@@ -2579,12 +2579,12 @@ 
 		//error_log(__METHOD__.__LINE__.array2string($nameSpace));
 		if (is_array($nameSpace))
 		{
-			foreach($nameSpace as $k => $singleNameSpace) {
+			foreach ($nameSpace as $k => $singleNameSpace) {
 				$type = $singleNameSpace['type'];
 				// the following line (assumption that for the same namespace the delimiter should be equal) may be wrong
-				$foldersNameSpace[$type]['delimiter']  = $singleNameSpace['delimiter'];
+				$foldersNameSpace[$type]['delimiter'] = $singleNameSpace['delimiter'];
 
-				if(is_array($singleNameSpace)&&$fetchedAllInOneGo==false) {
+				if (is_array($singleNameSpace) && $fetchedAllInOneGo == false) {
 					// fetch and sort the subscribed folders
 					// we alway fetch the subscribed, as this provides the only way to tell
 					// if a folder is subscribed or not
@@ -2592,22 +2592,22 @@ 
 					{
 						try
 						{
-							$subscribedMailboxes = $this->icServer->listSubscribedMailboxes('',0,true);
+							$subscribedMailboxes = $this->icServer->listSubscribedMailboxes('', 0, true);
 							if (!empty($subscribedMailboxes))
 							{
 								$fetchedAllInOneGo = true;
 							}
 							else
 							{
-								$subscribedMailboxes = $this->icServer->listSubscribedMailboxes($singleNameSpace['prefix'],0,true);
+								$subscribedMailboxes = $this->icServer->listSubscribedMailboxes($singleNameSpace['prefix'], 0, true);
 							}
 						}
-						catch(Exception $e)
+						catch (Exception $e)
 						{
 							continue;
 						}
 						//echo "subscribedMailboxes";_debug_array($subscribedMailboxes);
-						$subscribedFoldersPerNS = (!empty($subscribedMailboxes)?array_keys($subscribedMailboxes):array());
+						$subscribedFoldersPerNS = (!empty($subscribedMailboxes) ? array_keys($subscribedMailboxes) : array());
 						//if (is_array($foldersNameSpace[$type]['subscribed'])) sort($foldersNameSpace[$type]['subscribed']);
 						//_debug_array($foldersNameSpace);
 						//error_log(__METHOD__.__LINE__.array2string($singleNameSpace).':#:'.array2string($subscribedFoldersPerNS));
@@ -2617,18 +2617,18 @@ 
 							foreach ($subscribedMailboxes as $k => $finfo)
 							{
 								//error_log(__METHOD__.__LINE__.$k.':#:'.array2string($finfo));
-								$subscribedFoldersForCache[$this->icServer->ImapServerId][$k]=
-								$folderBasicInfo[$this->icServer->ImapServerId][$k]=array(
+								$subscribedFoldersForCache[$this->icServer->ImapServerId][$k] =
+								$folderBasicInfo[$this->icServer->ImapServerId][$k] = array(
 									'MAILBOX'=>$finfo['MAILBOX'],
 									'ATTRIBUTES'=>$finfo['ATTRIBUTES'],
-									'delimiter'=>$finfo['delimiter'],//lowercase for some reason???
-									'SUBSCRIBED'=>$finfo['SUBSCRIBED'],//seeded by getMailboxes
+									'delimiter'=>$finfo['delimiter'], //lowercase for some reason???
+									'SUBSCRIBED'=>$finfo['SUBSCRIBED'], //seeded by getMailboxes
 								);
-								if (empty($foldersNameSpace[$type]['subscribed']) || !in_array($k,$foldersNameSpace[$type]['subscribed']))
+								if (empty($foldersNameSpace[$type]['subscribed']) || !in_array($k, $foldersNameSpace[$type]['subscribed']))
 								{
 									$foldersNameSpace[$type]['subscribed'][] = $k;
 								}
-								if (empty($foldersNameSpace[$type]['all']) || !in_array($k,$foldersNameSpace[$type]['all']))
+								if (empty($foldersNameSpace[$type]['all']) || !in_array($k, $foldersNameSpace[$type]['all']))
 								{
 									$foldersNameSpace[$type]['all'][] = $k;
 								}
@@ -2651,7 +2651,7 @@ 
 						// that may produce problems, when encountering recursions probably
 						// horde is handling that, so we do not; keep that in mind!
 						//$allMailboxesExt = $this->icServer->getMailboxes($singleNameSpace['prefix'],2,true);
-						$allMailboxesExt = $this->icServer->getMailboxes($singleNameSpace['prefix'],0,true);
+						$allMailboxesExt = $this->icServer->getMailboxes($singleNameSpace['prefix'], 0, true);
 					}
 					catch (\Exception $e)
 					{
@@ -2669,26 +2669,26 @@ 
 					foreach ($allMailboxesExt as $mbx) {
 						if (!isset($folderBasicInfo[$this->icServer->ImapServerId][$mbx['MAILBOX']]))
 						{
-							$folderBasicInfo[$this->icServer->ImapServerId][$mbx['MAILBOX']]=array(
+							$folderBasicInfo[$this->icServer->ImapServerId][$mbx['MAILBOX']] = array(
 								'MAILBOX'=>$mbx['MAILBOX'],
 								'ATTRIBUTES'=>$mbx['ATTRIBUTES'],
-								'delimiter'=>$mbx['delimiter'],//lowercase for some reason???
-								'SUBSCRIBED'=>$mbx['SUBSCRIBED'],//seeded by getMailboxes
+								'delimiter'=>$mbx['delimiter'], //lowercase for some reason???
+								'SUBSCRIBED'=>$mbx['SUBSCRIBED'], //seeded by getMailboxes
 							);
 							if ($mbx['SUBSCRIBED'] && !isset($subscribedFoldersForCache[$this->icServer->ImapServerId][$mbx['MAILBOX']]))
 							{
 								$subscribedFoldersForCache[$this->icServer->ImapServerId][$mbx['MAILBOX']] = $folderBasicInfo[$this->icServer->ImapServerId][$mbx['MAILBOX']];
 							}
 						}
-						if ($mbx['SUBSCRIBED'] && (empty($foldersNameSpace[$type]['subscribed']) || !in_array($mbx['MAILBOX'],$foldersNameSpace[$type]['subscribed'])))
+						if ($mbx['SUBSCRIBED'] && (empty($foldersNameSpace[$type]['subscribed']) || !in_array($mbx['MAILBOX'], $foldersNameSpace[$type]['subscribed'])))
 						{
 							$foldersNameSpace[$type]['subscribed'][] = $mbx['MAILBOX'];
 						}
 						//echo __METHOD__;_debug_array($mbx);
 						//error_log(__METHOD__.' ('.__LINE__.') '.array2string($mbx));
-						if (isset($allMailBoxesExtSorted[$mbx['MAILBOX']])||
-							isset($allMailBoxesExtSorted[$mbx['MAILBOX'].$foldersNameSpace[$type]['delimiter']])||
-							(substr($mbx['MAILBOX'],-1)==$foldersNameSpace[$type]['delimiter'] && isset($allMailBoxesExtSorted[substr($mbx['MAILBOX'],0,-1)]))
+						if (isset($allMailBoxesExtSorted[$mbx['MAILBOX']]) ||
+							isset($allMailBoxesExtSorted[$mbx['MAILBOX'].$foldersNameSpace[$type]['delimiter']]) ||
+							(substr($mbx['MAILBOX'], -1) == $foldersNameSpace[$type]['delimiter'] && isset($allMailBoxesExtSorted[substr($mbx['MAILBOX'], 0, -1)]))
 						) continue;
 
 						//echo '#'.$mbx['MAILBOX'].':'.array2string($mbx)."#<br>";
@@ -2698,7 +2698,7 @@ 
 					//_debug_array(array_keys($allMailBoxesExtSorted));
 					$allMailboxes = array();
 					foreach ((array)$allMailBoxesExtSorted as $mbx) {
-						if (!in_array($mbx['MAILBOX'],$allMailboxes)) $allMailboxes[] = $mbx['MAILBOX'];
+						if (!in_array($mbx['MAILBOX'], $allMailboxes)) $allMailboxes[] = $mbx['MAILBOX'];
 						//echo "Result:";_debug_array($allMailboxes);
 					}
 					$foldersNameSpace[$type]['all'] = $allMailboxes;
@@ -2707,57 +2707,57 @@ 
 			}
 		}
 		//subscribed folders may be used in getFolderStatus
-		Cache::setCache(Cache::INSTANCE,'email','subscribedFolders'.trim($GLOBALS['egw_info']['user']['account_id']),$subscribedFoldersForCache,$expiration=60*60*1);
+		Cache::setCache(Cache::INSTANCE, 'email', 'subscribedFolders'.trim($GLOBALS['egw_info']['user']['account_id']), $subscribedFoldersForCache, $expiration = 60 * 60 * 1);
 		//echo "<br>FolderNameSpace To Process:";_debug_array($foldersNameSpace);
 		$autoFolderObjects = $folders = array();
 		$autofolder_exists = array();
-		foreach( array('personal', 'others', 'shared') as $type) {
-			if(isset($foldersNameSpace[$type])) {
-				if($_subscribedOnly) {
-					if( !empty($foldersNameSpace[$type]['subscribed']) ) $listOfFolders = $foldersNameSpace[$type]['subscribed'];
+		foreach (array('personal', 'others', 'shared') as $type) {
+			if (isset($foldersNameSpace[$type])) {
+				if ($_subscribedOnly) {
+					if (!empty($foldersNameSpace[$type]['subscribed'])) $listOfFolders = $foldersNameSpace[$type]['subscribed'];
 				} else {
-					if( !empty($foldersNameSpace[$type]['all'])) $listOfFolders = $foldersNameSpace[$type]['all'];
+					if (!empty($foldersNameSpace[$type]['all'])) $listOfFolders = $foldersNameSpace[$type]['all'];
 				}
-				foreach((array)$listOfFolders as $folderName) {
+				foreach ((array)$listOfFolders as $folderName) {
 					//echo "<br>FolderToCheck:$folderName<br>";
 					//error_log(__METHOD__.__LINE__.'#Delimiter:'.$delimiter.':#'.$folderName);
-					if ($_subscribedOnly && empty($foldersNameSpace[$type]['all'])) continue;//when subscribedonly, we fetch all folders in one go.
-					if($_subscribedOnly && !(in_array($folderName, $foldersNameSpace[$type]['all'])||in_array($folderName.$foldersNameSpace[$type]['delimiter'], $foldersNameSpace[$type]['all']))) {
+					if ($_subscribedOnly && empty($foldersNameSpace[$type]['all'])) continue; //when subscribedonly, we fetch all folders in one go.
+					if ($_subscribedOnly && !(in_array($folderName, $foldersNameSpace[$type]['all']) || in_array($folderName.$foldersNameSpace[$type]['delimiter'], $foldersNameSpace[$type]['all']))) {
 						#echo "$folderName failed to be here <br>";
 						continue;
 					}
 					if (isset($folders[$folderName])) continue;
 					if (isset($autoFolderObjects[$folderName])) continue;
-					if (empty($delimiter)||$delimiter != $foldersNameSpace[$type]['delimiter']) $delimiter = $foldersNameSpace[$type]['delimiter'];
+					if (empty($delimiter) || $delimiter != $foldersNameSpace[$type]['delimiter']) $delimiter = $foldersNameSpace[$type]['delimiter'];
 					$folderParts = explode($delimiter, $folderName);
 					$shortName = array_pop($folderParts);
 
 					$folderObject = new \stdClass;
-					$folderObject->delimiter	= $delimiter;
-					$folderObject->folderName	= $folderName;
-					$folderObject->shortFolderName	= $shortName;
-					if(!$_subscribedOnly) {
+					$folderObject->delimiter = $delimiter;
+					$folderObject->folderName = $folderName;
+					$folderObject->shortFolderName = $shortName;
+					if (!$_subscribedOnly) {
 						#echo $folderName."->".$type."<br>";
 						#_debug_array($foldersNameSpace[$type]['subscribed']);
 						$folderObject->subscribed = in_array($folderName, (array)$foldersNameSpace[$type]['subscribed']);
 					}
 
-					if($_getCounters == true) {
+					if ($_getCounters == true) {
 						//error_log(__METHOD__.' ('.__LINE__.') '.' getCounter forFolder:'.$folderName);
 						$folderObject->counter = $this->getMailBoxCounters($folderName);
 					}
-					if(strtoupper($folderName) == 'INBOX') {
+					if (strtoupper($folderName) == 'INBOX') {
 						$folderName = 'INBOX';
-						$folderObject->folderName	= 'INBOX';
-						$folderObject->shortFolderName	= 'INBOX';
-						$folderObject->displayName	= lang('INBOX');
+						$folderObject->folderName = 'INBOX';
+						$folderObject->shortFolderName = 'INBOX';
+						$folderObject->displayName = lang('INBOX');
 						$folderObject->shortDisplayName = lang('INBOX');
-						$folderObject->subscribed	= true;
+						$folderObject->subscribed = true;
 					// translate the automatic Folders (Sent, Drafts, ...) like the INBOX
-					} elseif (in_array($shortName,self::$autoFolders)) {
-						$tmpfolderparts = explode($delimiter,$folderObject->folderName);
+					} elseif (in_array($shortName, self::$autoFolders)) {
+						$tmpfolderparts = explode($delimiter, $folderObject->folderName);
 						array_pop($tmpfolderparts);
-						$folderObject->displayName = implode($delimiter,$tmpfolderparts).$delimiter.lang($shortName);
+						$folderObject->displayName = implode($delimiter, $tmpfolderparts).$delimiter.lang($shortName);
 						$folderObject->shortDisplayName = lang($shortName);
 						unset($tmpfolderparts);
 					} else {
@@ -2765,13 +2765,13 @@ 
 						$folderObject->shortDisplayName = $shortName;
 					}
 					//$folderName = $folderName;
-					if (in_array($shortName,self::$autoFolders)&&self::searchValueInFolderObjects($shortName,$autoFolderObjects)===false) {
+					if (in_array($shortName, self::$autoFolders) && self::searchValueInFolderObjects($shortName, $autoFolderObjects) === false) {
 						$autoFolderObjects[$folderName] = $folderObject;
 					} else {
 						$folders[$folderName] = $folderObject;
 					}
 					//error_log(__METHOD__.' ('.__LINE__.') '.':'.$folderObject->folderName);
-					if (!isset(self::$specialUseFolders)) $this->getSpecialUseFolders ();
+					if (!isset(self::$specialUseFolders)) $this->getSpecialUseFolders();
 					if (isset(self::$specialUseFolders[$folderName]))
 					{
 						$autofolder_exists[$folderName] = self::$specialUseFolders[$folderName];
@@ -2780,27 +2780,27 @@ 
 			}
 		}
 		if (is_array($autoFolderObjects) && !empty($autoFolderObjects)) {
-			uasort($autoFolderObjects,array($this,"sortByAutoFolderPos"));
+			uasort($autoFolderObjects, array($this, "sortByAutoFolderPos"));
 		}
 		// check if some standard folders are missing and need to be created
 		if (count($autofolder_exists) < count(self::$autoFolders) && $this->check_create_autofolders($autofolder_exists))
 		{
 			// if new folders have been created, re-read folders ignoring the cache
-			return $this->getFolderObjects($_subscribedOnly, $_getCounters, $_alwaysGetDefaultFolders, false);	// false = do NOT use cache
+			return $this->getFolderObjects($_subscribedOnly, $_getCounters, $_alwaysGetDefaultFolders, false); // false = do NOT use cache
 		}
-		if (is_array($folders)) uasort($folders,array($this,"sortByDisplayName"));
+		if (is_array($folders)) uasort($folders, array($this, "sortByDisplayName"));
 		//$folders2return = array_merge($autoFolderObjects,$folders);
 		//_debug_array($folders2return); #exit;
-		$folders2return[$this->icServer->ImapServerId] = array_merge((array)$inboxFolderObject,(array)$autoFolderObjects,(array)$folders);
-		if (($_subscribedOnly && $_getCounters===false) ||
-			($_subscribedOnly == false && $_getCounters===false &&
+		$folders2return[$this->icServer->ImapServerId] = array_merge((array)$inboxFolderObject, (array)$autoFolderObjects, (array)$folders);
+		if (($_subscribedOnly && $_getCounters === false) ||
+			($_subscribedOnly == false && $_getCounters === false &&
 			isset($this->mailPreferences['showAllFoldersInFolderPane']) &&
-			$this->mailPreferences['showAllFoldersInFolderPane']==1))
+			$this->mailPreferences['showAllFoldersInFolderPane'] == 1))
 		{
-			Cache::setCache(Cache::INSTANCE,'email','folderObjects'.trim($GLOBALS['egw_info']['user']['account_id']),$folders2return,$expiration=60*60*1);
+			Cache::setCache(Cache::INSTANCE, 'email', 'folderObjects'.trim($GLOBALS['egw_info']['user']['account_id']), $folders2return, $expiration = 60 * 60 * 1);
 		}
-		Cache::setCache(Cache::INSTANCE,'email','folderBasicInfo'.trim($GLOBALS['egw_info']['user']['account_id']),$folderBasicInfo,$expiration=60*60*1);
-		if (self::$debugTimes) self::logRunTimes($starttime,null,function_backtrace(),__METHOD__.' ('.__LINE__.') ');
+		Cache::setCache(Cache::INSTANCE, 'email', 'folderBasicInfo'.trim($GLOBALS['egw_info']['user']['account_id']), $folderBasicInfo, $expiration = 60 * 60 * 1);
+		if (self::$debugTimes) self::logRunTimes($starttime, null, function_backtrace(), __METHOD__.' ('.__LINE__.') ');
 		return $folders2return[$this->icServer->ImapServerId];
 	}
 
@@ -2821,21 +2821,21 @@ 
 	 *
 	 * @return array arrays of folders
 	 */
-	function getFolderArrays ($_nodePath = null, $_onlyTopLevel = false, $_search= 2, $_subscribedOnly = false, $_getCounter = false)
+	function getFolderArrays($_nodePath = null, $_onlyTopLevel = false, $_search = 2, $_subscribedOnly = false, $_getCounter = false)
 	{
 		// delimiter
 		$delimiter = $this->getHierarchyDelimiter();
 
-		$folders = $nameSpace =  array();
+		$folders = $nameSpace = array();
 		$nameSpaceTmp = $this->_getNameSpaces();
-		foreach($nameSpaceTmp as $k => $singleNameSpace) {
-			$nameSpace[$singleNameSpace['type']]=$singleNameSpace;
+		foreach ($nameSpaceTmp as $k => $singleNameSpace) {
+			$nameSpace[$singleNameSpace['type']] = $singleNameSpace;
 		}
 		unset($nameSpaceTmp);
 
 		//error_log(__METHOD__.__LINE__.array2string($nameSpace));
 		// Get special use folders
-		if (!isset(self::$specialUseFolders)) $this->getSpecialUseFolders (); // Set self::$specialUseFolders
+		if (!isset(self::$specialUseFolders)) $this->getSpecialUseFolders(); // Set self::$specialUseFolders
 		// topLevelQueries generally ignore the $_search param. Except for Config::examineNamespace
 		if ($_onlyTopLevel) // top level leaves
 		{
@@ -2846,20 +2846,20 @@ 
 			if (is_null(self::$mailConfig)) self::$mailConfig = Config::read('mail');
 			if (self::$mailConfig['examineNamespace'])
 			{
-				$prefixes=array();
+				$prefixes = array();
 				if (is_array($nameSpace))
 				{
-					foreach($nameSpace as $k => $singleNameSpace) {
+					foreach ($nameSpace as $k => $singleNameSpace) {
 						$type = $singleNameSpace['type'];
 
-						if(is_array($singleNameSpace) && $singleNameSpace['prefix']){
+						if (is_array($singleNameSpace) && $singleNameSpace['prefix']) {
 							$prefixes[$type] = $singleNameSpace['prefix'];
 							//regard extra care for nameSpacequeries when configured AND respect $_search
-							$result = $this->icServer->getMailboxes($singleNameSpace['prefix'], $_search==0?0:2, true);
+							$result = $this->icServer->getMailboxes($singleNameSpace['prefix'], $_search == 0 ? 0 : 2, true);
 							if (is_array($result))
 							{
 								ksort($result);
-								$topFolders = array_merge($topFolders,$result);
+								$topFolders = array_merge($topFolders, $result);
 							}
 						}
 					}
@@ -2868,7 +2868,7 @@ 
 
 			$autofolders = array();
 
-			foreach(self::$specialUseFolders as $path => $folder)
+			foreach (self::$specialUseFolders as $path => $folder)
 			{
 				if ($this->folderExists($path))
 				{
@@ -2876,9 +2876,9 @@ 
 				}
 			}
 			// Check if the special use folders are there, otherwise try to create them
-			if (count($autofolders) < count(self::$autoFolders) && $this->check_create_autofolders ($autofolders))
+			if (count($autofolders) < count(self::$autoFolders) && $this->check_create_autofolders($autofolders))
 			{
-				return $this->getFolderArrays ($_nodePath, $_onlyTopLevel, $_search, $_subscribedOnly, $_getCounter);
+				return $this->getFolderArrays($_nodePath, $_onlyTopLevel, $_search, $_subscribedOnly, $_getCounter);
 			}
 
 			// now process topFolders for next level
@@ -2886,13 +2886,13 @@ 
 			{
 				$pattern = "/\\".$delimiter."/";
 				$reference = preg_replace($pattern, '', $node['MAILBOX']);
-				if(!empty($prefixes))
+				if (!empty($prefixes))
 				{
 					$reference = '';
-					$tmpArray = explode($delimiter,$node['MAILBOX']);
-					foreach($tmpArray as $p)
+					$tmpArray = explode($delimiter, $node['MAILBOX']);
+					foreach ($tmpArray as $p)
 					{
-						$reference = empty($reference)?$p:$reference.$delimiter.$p;
+						$reference = empty($reference) ? $p : $reference.$delimiter.$p;
 					}
 				}
 				$mainFolder = $subFolders = array();
@@ -2928,19 +2928,19 @@ 
 							$nFolders [$path] = $folder;
 						}
 					}
-					if (is_array($aFolders)) uasort ($aFolders, array($this,'sortByAutofolder'));
+					if (is_array($aFolders)) uasort($aFolders, array($this, 'sortByAutofolder'));
 					//ksort($aFolders);
 
 					// Sort none auto folders base on mailbox name
-					uasort($nFolders,array($this,'sortByMailbox'));
+					uasort($nFolders, array($this, 'sortByMailbox'));
 
-					$subFolders = array_merge($aFolders,$nFolders);
+					$subFolders = array_merge($aFolders, $nFolders);
 				}
 				else
 				{
 					if (is_array($subFolders)) ksort($subFolders);
 				}
-				$folders = array_merge($folders,(array)$mainFolder, (array)$subFolders);
+				$folders = array_merge($folders, (array)$mainFolder, (array)$subFolders);
 			}
 		}
 		elseif ($_nodePath) // single node
@@ -2967,9 +2967,9 @@ 
 				$folders = $this->icServer->getMailboxes($path, $_search, true);
 			}
 
-			uasort($folders,array($this,'sortByMailbox'));//ksort($folders);
+			uasort($folders, array($this, 'sortByMailbox')); //ksort($folders);
 		}
-		elseif(!$_nodePath) // all
+		elseif (!$_nodePath) // all
 		{
 			if ($_subscribedOnly)
 			{
@@ -2985,101 +2985,101 @@ 
 		{
 			// SORTING FOLDERS
 			//self::$debugTimes=true;
-			if (self::$debugTimes) $starttime = microtime (true);
+			if (self::$debugTimes) $starttime = microtime(true);
 			// Merge of all auto folders and specialusefolders
 			$autoFoldersTmp = array_unique((array_merge(self::$autoFolders, array_values(self::$specialUseFolders))));
-			uasort($folders,array($this,'sortByMailbox'));//ksort($folders);
+			uasort($folders, array($this, 'sortByMailbox')); //ksort($folders);
 			$tmpFolders = $folders;
-			$inboxFolderObject=$inboxSubFolderObjects=$autoFolderObjects=$typeFolderObject=$mySpecialUseFolders=array();
-			$googleMailFolderObject=$googleAutoFolderObjects=$googleSubFolderObjects=array();
-			$isGoogleMail=false;
-			foreach($autoFoldersTmp as $afk=>$aF)
+			$inboxFolderObject = $inboxSubFolderObjects = $autoFolderObjects = $typeFolderObject = $mySpecialUseFolders = array();
+			$googleMailFolderObject = $googleAutoFolderObjects = $googleSubFolderObjects = array();
+			$isGoogleMail = false;
+			foreach ($autoFoldersTmp as $afk=>$aF)
 			{
-				if (!isset($mySpecialUseFolders[$aF]) && $aF) $mySpecialUseFolders[$aF]=$this->getFolderByType($aF,false);
+				if (!isset($mySpecialUseFolders[$aF]) && $aF) $mySpecialUseFolders[$aF] = $this->getFolderByType($aF, false);
 				//error_log($afk.':'.$aF.'->'.$mySpecialUseFolders[$aF]);
 			}
 			//error_log(array2string($mySpecialUseFolders));
 			foreach ($tmpFolders as $k => $f) {
-				$sorted=false;
-				if (strtoupper(substr($k,0,5))=='INBOX') {
-					if (strtoupper($k)=='INBOX') {
+				$sorted = false;
+				if (strtoupper(substr($k, 0, 5)) == 'INBOX') {
+					if (strtoupper($k) == 'INBOX') {
 						//error_log(__METHOD__.__LINE__.':'.strtoupper(substr($k,0,5)).':'.$k);
-						$inboxFolderObject[$k]=$f;
+						$inboxFolderObject[$k] = $f;
 						unset($folders[$k]);
-						$sorted=true;
+						$sorted = true;
 					} else {
-						$isAutoFolder=false;
-						foreach($autoFoldersTmp as $afk=>$aF)
+						$isAutoFolder = false;
+						foreach ($autoFoldersTmp as $afk=>$aF)
 						{
 							//error_log(__METHOD__.__LINE__.$k.':'.$aF.'->'.$mySpecialUseFolders[$aF]);
-							if($aF && strlen($mySpecialUseFolders[$aF])&&/*strlen($k)>=strlen($mySpecialUseFolders[$aF])&&*/
-								($mySpecialUseFolders[$aF]==$k || substr($k,0,strlen($mySpecialUseFolders[$aF].$delimiter))==$mySpecialUseFolders[$aF].$delimiter || //k may be child of an autofolder
-								stristr($mySpecialUseFolders[$aF],$k.$delimiter)!==false)) // k is parent of an autofolder
+							if ($aF && strlen($mySpecialUseFolders[$aF]) && /*strlen($k)>=strlen($mySpecialUseFolders[$aF])&&*/
+								($mySpecialUseFolders[$aF] == $k || substr($k, 0, strlen($mySpecialUseFolders[$aF].$delimiter)) == $mySpecialUseFolders[$aF].$delimiter || //k may be child of an autofolder
+								stristr($mySpecialUseFolders[$aF], $k.$delimiter) !== false)) // k is parent of an autofolder
 							{
 								//error_log(__METHOD__.__LINE__.$k.'->'.$mySpecialUseFolders[$aF]);
-								$isAutoFolder=true;
-								$autoFolderObjects[$k]=$f;
+								$isAutoFolder = true;
+								$autoFolderObjects[$k] = $f;
 								break;
 							}
 						}
-						if ($isAutoFolder==false) $inboxSubFolderObjects[$k]=$f;
+						if ($isAutoFolder == false) $inboxSubFolderObjects[$k] = $f;
 						unset($folders[$k]);
-						$sorted=true;
+						$sorted = true;
 					}
-				} elseif (strtoupper(substr($k,0,13))=='[GOOGLE MAIL]') {
-					$isGoogleMail=true;
-					if (strtoupper($k)=='[GOOGLE MAIL]') {
-						$googleMailFolderObject[$k]=$f;
+				} elseif (strtoupper(substr($k, 0, 13)) == '[GOOGLE MAIL]') {
+					$isGoogleMail = true;
+					if (strtoupper($k) == '[GOOGLE MAIL]') {
+						$googleMailFolderObject[$k] = $f;
 						unset($folders[$k]);
-						$sorted=true;
+						$sorted = true;
 					} else {
-						$isAutoFolder=false;
-						foreach($autoFoldersTmp as $afk=>$aF)
+						$isAutoFolder = false;
+						foreach ($autoFoldersTmp as $afk=>$aF)
 						{
 							//error_log($k.':'.$aF.'->'.$mySpecialUseFolders[$aF]);
-							if($aF && strlen($mySpecialUseFolders[$aF])&&/*strlen($k)>=strlen($mySpecialUseFolders[$aF])&&*/
-								($mySpecialUseFolders[$aF]==$k || substr($k,0,strlen($mySpecialUseFolders[$aF].$delimiter))==$mySpecialUseFolders[$aF].$delimiter|| //k may be child of an autofolder
-								stristr($mySpecialUseFolders[$aF],$k.$delimiter)!==false)) // k is parent of an autofolder
+							if ($aF && strlen($mySpecialUseFolders[$aF]) && /*strlen($k)>=strlen($mySpecialUseFolders[$aF])&&*/
+								($mySpecialUseFolders[$aF] == $k || substr($k, 0, strlen($mySpecialUseFolders[$aF].$delimiter)) == $mySpecialUseFolders[$aF].$delimiter || //k may be child of an autofolder
+								stristr($mySpecialUseFolders[$aF], $k.$delimiter) !== false)) // k is parent of an autofolder
 							{
 								//error_log($k.'->'.$mySpecialUseFolders[$aF]);
-								$isAutoFolder=true;
-								$googleAutoFolderObjects[$k]=$f;
+								$isAutoFolder = true;
+								$googleAutoFolderObjects[$k] = $f;
 								break;
 							}
 						}
-						if ($isAutoFolder==false) $googleSubFolderObjects[$k]=$f;
+						if ($isAutoFolder == false) $googleSubFolderObjects[$k] = $f;
 						unset($folders[$k]);
-						$sorted=true;
+						$sorted = true;
 					}
 				} else {
-					$isAutoFolder=false;
-					foreach($autoFoldersTmp as $afk=>$aF)
+					$isAutoFolder = false;
+					foreach ($autoFoldersTmp as $afk=>$aF)
 					{
 						//error_log($k.':'.$aF.'->'.$mySpecialUseFolders[$aF]);
-						if($aF && strlen($mySpecialUseFolders[$aF])&&/*strlen($k)>=strlen($mySpecialUseFolders[$aF])&&*/
-								($mySpecialUseFolders[$aF]==$k || substr($k,0,strlen($mySpecialUseFolders[$aF].$delimiter))==$mySpecialUseFolders[$aF].$delimiter|| //k may be child of an autofolder
-								stristr($mySpecialUseFolders[$aF],$k.$delimiter)!==false)) // k is parent of an autofolder
+						if ($aF && strlen($mySpecialUseFolders[$aF]) && /*strlen($k)>=strlen($mySpecialUseFolders[$aF])&&*/
+								($mySpecialUseFolders[$aF] == $k || substr($k, 0, strlen($mySpecialUseFolders[$aF].$delimiter)) == $mySpecialUseFolders[$aF].$delimiter || //k may be child of an autofolder
+								stristr($mySpecialUseFolders[$aF], $k.$delimiter) !== false)) // k is parent of an autofolder
 						{
 							//error_log($k.'->'.$mySpecialUseFolders[$aF]);
-							$isAutoFolder=true;
-							$autoFolderObjects[$k]=$f;
+							$isAutoFolder = true;
+							$autoFolderObjects[$k] = $f;
 							unset($folders[$k]);
-							$sorted=true;
+							$sorted = true;
 							break;
 						}
 					}
 				}
 
-				if ($sorted==false)
+				if ($sorted == false)
 				{
-					foreach(array('others','shared') as $type)
+					foreach (array('others', 'shared') as $type)
 					{
-						if ($nameSpace[$type]['prefix_present']&&$nameSpace[$type]['prefix'])
+						if ($nameSpace[$type]['prefix_present'] && $nameSpace[$type]['prefix'])
 						{
-							if (substr($k,0,strlen($nameSpace[$type]['prefix']))==$nameSpace[$type]['prefix']||
-								substr($k,0,strlen($nameSpace[$type]['prefix'])-strlen($nameSpace[$type]['delimiter']))==substr($nameSpace[$type]['prefix'],0,strlen($nameSpace[$type]['delimiter'])*-1)) {
+							if (substr($k, 0, strlen($nameSpace[$type]['prefix'])) == $nameSpace[$type]['prefix'] ||
+								substr($k, 0, strlen($nameSpace[$type]['prefix']) - strlen($nameSpace[$type]['delimiter'])) == substr($nameSpace[$type]['prefix'], 0, strlen($nameSpace[$type]['delimiter']) * -1)) {
 								//error_log(__METHOD__.__LINE__.':'.substr($k,0,strlen($nameSpace[$type]['prefix'])).':'.$k);
-								$typeFolderObject[$type][$k]=$f;
+								$typeFolderObject[$type][$k] = $f;
 								unset($folders[$k]);
 							}
 						}
@@ -3090,40 +3090,40 @@ 
 			// avoid calling sortByAutoFolder as it is not regarding subfolders
 			$autoFolderObjectsTmp = $autoFolderObjects;
 			unset($autoFolderObjects);
-			uasort($autoFolderObjectsTmp, array($this,'sortByMailbox'));
-			foreach($autoFoldersTmp as $afk=>$aF)
+			uasort($autoFolderObjectsTmp, array($this, 'sortByMailbox'));
+			foreach ($autoFoldersTmp as $afk=>$aF)
 			{
-				foreach($autoFolderObjectsTmp as $k => $f)
+				foreach ($autoFolderObjectsTmp as $k => $f)
 				{
-					if($aF && ($mySpecialUseFolders[$aF]==$k ||
-						substr($k,0,strlen($mySpecialUseFolders[$aF].$delimiter))==$mySpecialUseFolders[$aF].$delimiter ||
-						stristr($mySpecialUseFolders[$aF],$k.$delimiter)!==false))
+					if ($aF && ($mySpecialUseFolders[$aF] == $k ||
+						substr($k, 0, strlen($mySpecialUseFolders[$aF].$delimiter)) == $mySpecialUseFolders[$aF].$delimiter ||
+						stristr($mySpecialUseFolders[$aF], $k.$delimiter) !== false))
 					{
-						$autoFolderObjects[$k]=$f;
+						$autoFolderObjects[$k] = $f;
 					}
 				}
 			}
 			//error_log(__METHOD__.__LINE__.array2string($autoFolderObjects));
 			if (!$isGoogleMail) {
-				$folders = array_merge($inboxFolderObject,$autoFolderObjects,(array)$inboxSubFolderObjects,(array)$folders,(array)$typeFolderObject['others'],(array)$typeFolderObject['shared']);
+				$folders = array_merge($inboxFolderObject, $autoFolderObjects, (array)$inboxSubFolderObjects, (array)$folders, (array)$typeFolderObject['others'], (array)$typeFolderObject['shared']);
 			} else {
 				// avoid calling sortByAutoFolder as it is not regarding subfolders
 				$gAutoFolderObjectsTmp = $googleAutoFolderObjects;
 				unset($googleAutoFolderObjects);
-				uasort($gAutoFolderObjectsTmp, array($this,'sortByMailbox'));
-				foreach($autoFoldersTmp as $afk=>$aF)
+				uasort($gAutoFolderObjectsTmp, array($this, 'sortByMailbox'));
+				foreach ($autoFoldersTmp as $afk=>$aF)
 				{
-					foreach($gAutoFolderObjectsTmp as $k => $f)
+					foreach ($gAutoFolderObjectsTmp as $k => $f)
 					{
-						if($aF && ($mySpecialUseFolders[$aF]==$k || substr($k,0,strlen($mySpecialUseFolders[$aF].$delimiter))==$mySpecialUseFolders[$aF].$delimiter))
+						if ($aF && ($mySpecialUseFolders[$aF] == $k || substr($k, 0, strlen($mySpecialUseFolders[$aF].$delimiter)) == $mySpecialUseFolders[$aF].$delimiter))
 						{
-							$googleAutoFolderObjects[$k]=$f;
+							$googleAutoFolderObjects[$k] = $f;
 						}
 					}
 				}
-				$folders = array_merge($inboxFolderObject,$autoFolderObjects,(array)$folders,(array)$googleMailFolderObject,$googleAutoFolderObjects,$googleSubFolderObjects,(array)$typeFolderObject['others'],(array)$typeFolderObject['shared']);
+				$folders = array_merge($inboxFolderObject, $autoFolderObjects, (array)$folders, (array)$googleMailFolderObject, $googleAutoFolderObjects, $googleSubFolderObjects, (array)$typeFolderObject['others'], (array)$typeFolderObject['shared']);
 			}
-			if (self::$debugTimes) self::logRunTimes($starttime,null,function_backtrace(),__METHOD__.' ('.__LINE__.') Sorting:');
+			if (self::$debugTimes) self::logRunTimes($starttime, null, function_backtrace(), __METHOD__.' ('.__LINE__.') Sorting:');
 			//self::$debugTimes=false;
 		}
 		// Get counter information and add them to each fetched folders array
@@ -3145,10 +3145,10 @@ 
 	 * @param array $autofolders_exists existing folders, no need to check their existance again
 	 * @return int number of new folders created
 	 */
-	function check_create_autofolders(array $autofolders_exists=array())
+	function check_create_autofolders(array $autofolders_exists = array())
 	{
 		$num_created = 0;
-		foreach(self::$autoFolders as $folder)
+		foreach (self::$autoFolders as $folder)
 		{
 			$created = false;
 			if (!in_array($folder, $autofolders_exists) && $this->_getSpecialUseFolder($folder, true, $created) &&
@@ -3173,7 +3173,7 @@ 
 		$rv = false;
 		foreach ($haystack as $k => $v)
 		{
-			foreach($v as &$sv) {if (trim($sv)==trim($needle)) return $k;}
+			foreach ($v as &$sv) {if (trim($sv) == trim($needle)) return $k; }
 		}
 		return $rv;
 	}
@@ -3186,9 +3186,9 @@ 
 	 * @param array $b array of folders
 	 * @return int expect values (0, 1 or -1)
 	 */
-	function sortByMailbox($a,$b)
+	function sortByMailbox($a, $b)
 	{
-		return strcasecmp($a['MAILBOX'],$b['MAILBOX']);
+		return strcasecmp($a['MAILBOX'], $b['MAILBOX']);
 	}
 
 	/**
@@ -3198,13 +3198,13 @@ 
 	 * @param string $_hDelimiter hierarchy delimiter
 	 * @return array returns an array of data extracted from given node path
 	 */
-	static function pathToFolderData ($_path, $_hDelimiter)
+	static function pathToFolderData($_path, $_hDelimiter)
 	{
 		if (!strpos($_path, self::DELIMITER)) $_path = self::DELIMITER.$_path;
 		list(,$path) = explode(self::DELIMITER, $_path);
 		$path_chain = $parts = explode($_hDelimiter, $path);
 		$name = array_pop($parts);
-		return array (
+		return array(
 			'name' => $name,
 			'mailbox' => $path,
 			'parent' => implode($_hDelimiter, $parts),
@@ -3227,8 +3227,8 @@ 
 		// 0, 1 und -1
 		$a = self::pathToFolderData($_a['MAILBOX'], $_a['delimiter']);
 		$b = self::pathToFolderData($_b['MAILBOX'], $_b['delimiter']);
-		$pos1 = array_search(trim($a['name']),self::$autoFolders);
-		$pos2 = array_search(trim($b['name']),self::$autoFolders);
+		$pos1 = array_search(trim($a['name']), self::$autoFolders);
+		$pos2 = array_search(trim($b['name']), self::$autoFolders);
 		if ($pos1 == $pos2) return 0;
 		return ($pos1 < $pos2) ? -1 : 1;
 	}
@@ -3241,10 +3241,10 @@ 
 	 * @param object $b array of folderobjects
 	 * @return int expect values (0, 1 or -1)
 	 */
-	function sortByDisplayName($a,$b)
+	function sortByDisplayName($a, $b)
 	{
 		// 0, 1 und -1
-		return strcasecmp($a->displayName,$b->displayName);
+		return strcasecmp($a->displayName, $b->displayName);
 	}
 
 	/**
@@ -3255,11 +3255,11 @@ 
 	 * @param object $b array of folderobjects
 	 * @return int expect values (0, 1 or -1)
 	 */
-	function sortByAutoFolderPos($a,$b)
+	function sortByAutoFolderPos($a, $b)
 	{
 		// 0, 1 und -1
-		$pos1 = array_search(trim($a->shortFolderName),self::$autoFolders);
-		$pos2 = array_search(trim($b->shortFolderName),self::$autoFolders);
+		$pos1 = array_search(trim($a->shortFolderName), self::$autoFolders);
+		$pos2 = array_search(trim($b->shortFolderName), self::$autoFolders);
 		if ($pos1 == $pos2) return 0;
 		return ($pos1 < $pos2) ? -1 : 1;
 	}
@@ -3272,7 +3272,7 @@ 
 	 * @param boolean $_returnObject return the counters as object rather than an array
 	 * @return mixed false or array of counters array(MESSAGES,UNSEEN,RECENT,UIDNEXT,UIDVALIDITY) or object
 	 */
-	function getMailBoxCounters($folderName,$_returnObject=true)
+	function getMailBoxCounters($folderName, $_returnObject = true)
 	{
 		try
 		{
@@ -3284,9 +3284,9 @@ 
 			if (self::$debug) error_log(__METHOD__." returned FolderStatus for Folder $folderName:".$e->getMessage());
 			return false;
 		}
-		if(is_array($folderStatus)) {
-			if ($_returnObject===false) return $folderStatus;
-			$status =  new \stdClass;
+		if (is_array($folderStatus)) {
+			if ($_returnObject === false) return $folderStatus;
+			$status = new \stdClass;
 			$status->messages   = $folderStatus['MESSAGES'];
 			$status->unseen     = $folderStatus['UNSEEN'];
 			$status->recent     = $folderStatus['RECENT'];
@@ -3308,42 +3308,42 @@ 
 	 * @param string $reclevel 0, counter to keep track of the current recursionlevel
 	 * @return array of mailboxes
 	 */
-	function getMailBoxesRecursive($_mailbox, $delimiter, $prefix, $reclevel=0)
+	function getMailBoxesRecursive($_mailbox, $delimiter, $prefix, $reclevel = 0)
 	{
 		#echo __METHOD__." retrieve SubFolders for $_mailbox$delimiter <br>";
-		$maxreclevel=25;
+		$maxreclevel = 25;
 		if ($reclevel > $maxreclevel) {
-			error_log( __METHOD__." Recursion Level Exeeded ($reclevel) while looking up $_mailbox$delimiter ");
+			error_log(__METHOD__." Recursion Level Exeeded ($reclevel) while looking up $_mailbox$delimiter ");
 			return array();
 		}
 		$reclevel++;
 		// clean up double delimiters
-		$_mailbox = preg_replace('~'.($delimiter == '.' ? "\\".$delimiter:$delimiter).'+~s',$delimiter,$_mailbox);
+		$_mailbox = preg_replace('~'.($delimiter == '.' ? "\\".$delimiter : $delimiter).'+~s', $delimiter, $_mailbox);
 		//get that mailbox in question
-		$mbx = $this->icServer->getMailboxes($_mailbox,1,true);
+		$mbx = $this->icServer->getMailboxes($_mailbox, 1, true);
 		$mbxkeys = array_keys($mbx);
 		#_debug_array($mbx);
 //error_log(__METHOD__.' ('.__LINE__.') '.' Delimiter:'.array2string($delimiter));
 //error_log(__METHOD__.' ('.__LINE__.') '.array2string($mbx));
 		// Example: Array([INBOX/GaGa] => Array([MAILBOX] => INBOX/GaGa[ATTRIBUTES] => Array([0] => \\unmarked)[delimiter] => /))
-		if (is_array($mbx[$mbxkeys[0]]["ATTRIBUTES"]) && (in_array('\HasChildren',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\Haschildren',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\haschildren',$mbx[$mbxkeys[0]]["ATTRIBUTES"]))) {
+		if (is_array($mbx[$mbxkeys[0]]["ATTRIBUTES"]) && (in_array('\HasChildren', $mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\Haschildren', $mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\haschildren', $mbx[$mbxkeys[0]]["ATTRIBUTES"]))) {
 			// if there are children fetch them
 			//echo $mbx[$mbxkeys[0]]['MAILBOX']."<br>";
 
-			$buff = $this->icServer->getMailboxes($mbx[$mbxkeys[0]]['MAILBOX'].($mbx[$mbxkeys[0]]['MAILBOX'] == $prefix ? '':$delimiter),2,false);
+			$buff = $this->icServer->getMailboxes($mbx[$mbxkeys[0]]['MAILBOX'].($mbx[$mbxkeys[0]]['MAILBOX'] == $prefix ? '' : $delimiter), 2, false);
 			//$buff = $this->icServer->getMailboxes($mbx[$mbxkeys[0]]['MAILBOX'],2,false);
 			//_debug_array($buff);
 			$allMailboxes = array();
 			foreach ($buff as $mbxname) {
 //error_log(__METHOD__.' ('.__LINE__.') '.array2string($mbxname));
-				$mbxname = preg_replace('~'.($delimiter == '.' ? "\\".$delimiter:$delimiter).'+~s',$delimiter,$mbxname['MAILBOX']);
+				$mbxname = preg_replace('~'.($delimiter == '.' ? "\\".$delimiter : $delimiter).'+~s', $delimiter, $mbxname['MAILBOX']);
 				#echo "About to recur in level $reclevel:".$mbxname."<br>";
-				if ( $mbxname != $mbx[$mbxkeys[0]]['MAILBOX'] && $mbxname != $prefix  && $mbxname != $mbx[$mbxkeys[0]]['MAILBOX'].$delimiter)
+				if ($mbxname != $mbx[$mbxkeys[0]]['MAILBOX'] && $mbxname != $prefix && $mbxname != $mbx[$mbxkeys[0]]['MAILBOX'].$delimiter)
 				{
 					$allMailboxes = array_merge($allMailboxes, self::getMailBoxesRecursive($mbxname, $delimiter, $prefix, $reclevel));
 				}
 			}
-			if (!(in_array('\NoSelect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\Noselect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\noselect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]))) $allMailboxes[] = $mbx[$mbxkeys[0]]['MAILBOX'];
+			if (!(in_array('\NoSelect', $mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\Noselect', $mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\noselect', $mbx[$mbxkeys[0]]["ATTRIBUTES"]))) $allMailboxes[] = $mbx[$mbxkeys[0]]['MAILBOX'];
 			return $allMailboxes;
 		} else {
 			return array($_mailbox);
@@ -3358,18 +3358,18 @@ 
 	 * @param boolean& $created =null on return true: if folder was just created, false if not
 	 * @return mixed string or false
 	 */
-	function _getSpecialUseFolder($_type, $_checkexistance=TRUE, &$created=null)
+	function _getSpecialUseFolder($_type, $_checkexistance = TRUE, &$created = null)
 	{
 		static $types = array(
-			'Drafts'   => array('profileKey'=>'acc_folder_draft','autoFolderName'=>'Drafts'),
-			'Template' => array('profileKey'=>'acc_folder_template','autoFolderName'=>'Templates'),
-			'Trash'    => array('profileKey'=>'acc_folder_trash','autoFolderName'=>'Trash'),
-			'Sent'     => array('profileKey'=>'acc_folder_sent','autoFolderName'=>'Sent'),
-			'Junk'     => array('profileKey'=>'acc_folder_junk','autoFolderName'=>'Junk'),
-			'Outbox'   => array('profileKey'=>'acc_folder_outbox','autoFolderName'=>'Outbox'),
-			'Archive'   => array('profileKey'=>'acc_folder_archive','autoFolderName'=>'Archive'),
+			'Drafts'   => array('profileKey'=>'acc_folder_draft', 'autoFolderName'=>'Drafts'),
+			'Template' => array('profileKey'=>'acc_folder_template', 'autoFolderName'=>'Templates'),
+			'Trash'    => array('profileKey'=>'acc_folder_trash', 'autoFolderName'=>'Trash'),
+			'Sent'     => array('profileKey'=>'acc_folder_sent', 'autoFolderName'=>'Sent'),
+			'Junk'     => array('profileKey'=>'acc_folder_junk', 'autoFolderName'=>'Junk'),
+			'Outbox'   => array('profileKey'=>'acc_folder_outbox', 'autoFolderName'=>'Outbox'),
+			'Archive'   => array('profileKey'=>'acc_folder_archive', 'autoFolderName'=>'Archive'),
 		);
-		if ($_type == 'Templates') $_type = 'Template';	// for some reason self::$autofolders uses 'Templates'!
+		if ($_type == 'Templates') $_type = 'Template'; // for some reason self::$autofolders uses 'Templates'!
 		$created = false;
 		if (!isset($types[$_type]))
 		{
@@ -3391,7 +3391,7 @@ 
 		}
 		// do not try to autocreate configured Archive-Folder. Return false if configured folder does not exist
 		if ($_type == 'Archive') {
-			if ($_folderName && $_checkexistance && strtolower($_folderName) !='none' && !$this->folderExists($_folderName,true)) {
+			if ($_folderName && $_checkexistance && strtolower($_folderName) != 'none' && !$this->folderExists($_folderName, true)) {
 				return false;
 			} else {
 				return $_folderName;
@@ -3399,38 +3399,38 @@ 
 
 		}
 		// does the folder exist??? (is configured/preset, but non-existent)
-		if ($_folderName && $_checkexistance && strtolower($_folderName) !='none' && !$this->folderExists($_folderName,true)) {
+		if ($_folderName && $_checkexistance && strtolower($_folderName) != 'none' && !$this->folderExists($_folderName, true)) {
 			try
 			{
 				$error = null;
 				if (($_folderName = $this->createFolder('', $_folderName, $error))) $created = true;
 				if ($error) error_log(__METHOD__.' ('.__LINE__.') '.' Failed to create Folder '.$_folderName." for $_type:".$error);
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
 				error_log(__METHOD__.' ('.__LINE__.') '.' Failed to create Folder '.$_folderName." for $_type:".$e->getMessage().':'.function_backtrace());
 				$_folderName = false;
 			}
 		}
 		// not sure yet if false is the correct behavior on none
-		if ($_folderName =='none') return 'none' ; //false;
+		if ($_folderName == 'none') return 'none'; //false;
 		//no (valid) folder found yet; try specialUseFolders
-		if (empty($_folderName) && is_array(self::$specialUseFolders) && ($f = array_search($_type,self::$specialUseFolders))) $_folderName = $f;
+		if (empty($_folderName) && is_array(self::$specialUseFolders) && ($f = array_search($_type, self::$specialUseFolders))) $_folderName = $f;
 		//no specialUseFolder; try some Defaults
 		if (empty($_folderName) && isset($types[$_type]))
 		{
 			$nameSpace = $this->_getNameSpaces();
-			$prefix='';
+			$prefix = '';
 			foreach ($nameSpace as $nSp)
 			{
-				if ($nSp['type']=='personal')
+				if ($nSp['type'] == 'personal')
 				{
 					//error_log(__METHOD__.__LINE__.array2string($nSp));
 					$prefix = $nSp['prefix'];
 					break;
 				}
 			}
-			if ($this->folderExists($prefix.$types[$_type]['autoFolderName'],true))
+			if ($this->folderExists($prefix.$types[$_type]['autoFolderName'], true))
 			{
 				$_folderName = $prefix.$types[$_type]['autoFolderName'];
 			}
@@ -3439,11 +3439,11 @@ 
 				try
 				{
 					$error = null;
-					$this->createFolder('', $prefix.$types[$_type]['autoFolderName'],$error);
+					$this->createFolder('', $prefix.$types[$_type]['autoFolderName'], $error);
 					$_folderName = $prefix.$types[$_type]['autoFolderName'];
 					if ($error) error_log(__METHOD__.' ('.__LINE__.') '.' Failed to create Folder '.$_folderName." for $_type:".$error);
 				}
-				catch(Exception $e)
+				catch (Exception $e)
 				{
 					error_log(__METHOD__.' ('.__LINE__.') '.' Failed to create Folder '.$_folderName." for $_type:".$e->getMessage());
 					$_folderName = false;
@@ -3459,7 +3459,7 @@ 
 	 * @param boolean $_checkexistance trigger check for existance
 	 * @return mixed string or false
 	 */
-	function getFolderByType($type, $_checkexistance=false)
+	function getFolderByType($type, $_checkexistance = false)
 	{
 		return $this->_getSpecialUseFolder($type, $_checkexistance);
 	}
@@ -3469,7 +3469,7 @@ 
 	 * @param boolean $_checkexistance trigger check for existance
 	 * @return mixed string or false
 	 */
-	function getJunkFolder($_checkexistance=TRUE)
+	function getJunkFolder($_checkexistance = TRUE)
 	{
 		return $this->_getSpecialUseFolder('Junk', $_checkexistance);
 	}
@@ -3479,7 +3479,7 @@ 
 	 * @param boolean $_checkexistance trigger check for existance
 	 * @return mixed string or false
 	 */
-	function getDraftFolder($_checkexistance=TRUE)
+	function getDraftFolder($_checkexistance = TRUE)
 	{
 		return $this->_getSpecialUseFolder('Drafts', $_checkexistance);
 	}
@@ -3489,7 +3489,7 @@ 
 	 * @param boolean $_checkexistance trigger check for existance
 	 * @return mixed string or false
 	 */
-	function getTemplateFolder($_checkexistance=TRUE)
+	function getTemplateFolder($_checkexistance = TRUE)
 	{
 		return $this->_getSpecialUseFolder('Template', $_checkexistance);
 	}
@@ -3499,7 +3499,7 @@ 
 	 * @param boolean $_checkexistance trigger check for existance
 	 * @return mixed string or false
 	 */
-	function getTrashFolder($_checkexistance=TRUE)
+	function getTrashFolder($_checkexistance = TRUE)
 	{
 		return $this->_getSpecialUseFolder('Trash', $_checkexistance);
 	}
@@ -3509,7 +3509,7 @@ 
 	 * @param boolean $_checkexistance trigger check for existance
 	 * @return mixed string or false
 	 */
-	function getSentFolder($_checkexistance=TRUE)
+	function getSentFolder($_checkexistance = TRUE)
 	{
 		return $this->_getSpecialUseFolder('Sent', $_checkexistance);
 	}
@@ -3519,7 +3519,7 @@ 
 	 * @param boolean $_checkexistance trigger check for existance
 	 * @return mixed string or false
 	 */
-	function getOutboxFolder($_checkexistance=TRUE)
+	function getOutboxFolder($_checkexistance = TRUE)
 	{
 		return $this->_getSpecialUseFolder('Outbox', $_checkexistance);
 	}
@@ -3529,7 +3529,7 @@ 
 	 * @param boolean $_checkexistance trigger check for existance . We do no autocreation for configured Archive folder
 	 * @return mixed string or false
 	 */
-	function getArchiveFolder($_checkexistance=TRUE)
+	function getArchiveFolder($_checkexistance = TRUE)
 	{
 		return $this->_getSpecialUseFolder('Archive', $_checkexistance);
 	}
@@ -3540,10 +3540,10 @@ 
 	 * @param boolean $_checkexistance trigger check for existance
 	 * @return boolean
 	 */
-	function isSentFolder($_folderName, $_checkexistance=TRUE)
+	function isSentFolder($_folderName, $_checkexistance = TRUE)
 	{
 		$sentFolder = $this->getSentFolder($_checkexistance);
-		if(empty($sentFolder)) {
+		if (empty($sentFolder)) {
 			return false;
 		}
 		// does the folder exist???
@@ -3551,7 +3551,7 @@ 
 			return false;
 		}
 
-		if(false !== stripos($_folderName, $sentFolder)) {
+		if (false !== stripos($_folderName, $sentFolder)) {
 			return true;
 		} else {
 			return false;
@@ -3564,15 +3564,15 @@ 
 	 * @param boolean $_checkexistance trigger check for existance
 	 * @return boolean
 	 */
-	function isOutbox($_folderName, $_checkexistance=TRUE)
+	function isOutbox($_folderName, $_checkexistance = TRUE)
 	{
-		if (stripos($_folderName, 'Outbox')===false) {
+		if (stripos($_folderName, 'Outbox') === false) {
 			return false;
 		}
 		// does the folder exist???
 		if ($_checkexistance && $GLOBALS['egw_info']['user']['apps']['activesync'] && !$this->folderExists($_folderName)) {
 			$outboxFolder = $this->getOutboxFolder($_checkexistance);
-			if(false !== stripos($_folderName, $outboxFolder)) {
+			if (false !== stripos($_folderName, $outboxFolder)) {
 				return true;
 			} else {
 				return false;
@@ -3587,18 +3587,18 @@ 
 	 * @param boolean $_checkexistance trigger check for existance
 	 * @return boolean
 	 */
-	function isDraftFolder($_folderName, $_checkexistance=TRUE)
+	function isDraftFolder($_folderName, $_checkexistance = TRUE)
 	{
 		$draftFolder = $this->getDraftFolder($_checkexistance);
-		if(empty($draftFolder)) {
+		if (empty($draftFolder)) {
 			return false;
 		}
 		// does the folder exist???
 		if ($_checkexistance && !$this->folderExists($_folderName)) {
 			return false;
 		}
-		if (is_a($_folderName,"Horde_Imap_Client_Mailbox")) $_folderName = $_folderName->utf8;
-		if(false !== stripos($_folderName, $draftFolder)) {
+		if (is_a($_folderName, "Horde_Imap_Client_Mailbox")) $_folderName = $_folderName->utf8;
+		if (false !== stripos($_folderName, $draftFolder)) {
 			return true;
 		} else {
 			return false;
@@ -3611,10 +3611,10 @@ 
 	 * @param boolean $_checkexistance trigger check for existance
 	 * @return boolean
 	 */
-	function isTrashFolder($_folderName, $_checkexistance=TRUE)
+	function isTrashFolder($_folderName, $_checkexistance = TRUE)
 	{
 		$trashFolder = $this->getTrashFolder($_checkexistance);
-		if(empty($trashFolder)) {
+		if (empty($trashFolder)) {
 			return false;
 		}
 		// does the folder exist???
@@ -3622,7 +3622,7 @@ 
 			return false;
 		}
 
-		if(false !== stripos($_folderName, $trashFolder)) {
+		if (false !== stripos($_folderName, $trashFolder)) {
 			return true;
 		} else {
 			return false;
@@ -3635,10 +3635,10 @@ 
 	 * @param boolean $_checkexistance trigger check for existance
 	 * @return boolean
 	 */
-	function isTemplateFolder($_folderName, $_checkexistance=TRUE)
+	function isTemplateFolder($_folderName, $_checkexistance = TRUE)
 	{
 		$templateFolder = $this->getTemplateFolder($_checkexistance);
-		if(empty($templateFolder)) {
+		if (empty($templateFolder)) {
 			return false;
 		}
 		// does the folder exist???
@@ -3646,7 +3646,7 @@ 
 			return false;
 		}
 
-		if(false !== stripos($_folderName, $templateFolder)) {
+		if (false !== stripos($_folderName, $templateFolder)) {
 			return true;
 		} else {
 			return false;
@@ -3659,24 +3659,24 @@ 
 	 * @param boolean $_forceCheck trigger check for existance on icServer
 	 * @return mixed string or false
 	 */
-	function folderExists($_folder, $_forceCheck=false)
+	function folderExists($_folder, $_forceCheck = false)
 	{
 		static $folderInfo;
 		$forceCheck = $_forceCheck;
 		if (empty($_folder))
 		{
 			// this error is more or less without significance, unless we force the check
-			if ($_forceCheck===true) error_log(__METHOD__.' ('.__LINE__.') '.' Called with empty Folder:'.$_folder.function_backtrace());
+			if ($_forceCheck === true) error_log(__METHOD__.' ('.__LINE__.') '.' Called with empty Folder:'.$_folder.function_backtrace());
 			return false;
 		}
 		// when check is not enforced , we assume a folder represented as Horde_Imap_Client_Mailbox as existing folder
-		if (is_a($_folder,"Horde_Imap_Client_Mailbox")&&$_forceCheck===false) return true;
-		if (is_a($_folder,"Horde_Imap_Client_Mailbox")) $_folder =  $_folder->utf8;
+		if (is_a($_folder, "Horde_Imap_Client_Mailbox") && $_forceCheck === false) return true;
+		if (is_a($_folder, "Horde_Imap_Client_Mailbox")) $_folder = $_folder->utf8;
 		// reduce traffic within the Instance per User; Expire every 5 hours
 		//error_log(__METHOD__.' ('.__LINE__.') '.' Called with Folder:'.$_folder.function_backtrace());
-		if (is_null($folderInfo)) $folderInfo = Cache::getCache(Cache::INSTANCE,'email','icServerFolderExistsInfo'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),$expiration=60*60*5);
+		if (is_null($folderInfo)) $folderInfo = Cache::getCache(Cache::INSTANCE, 'email', 'icServerFolderExistsInfo'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), $expiration = 60 * 60 * 5);
 		//error_log(__METHOD__.' ('.__LINE__.') '.'Cached Info on Folder:'.$_folder.' for Profile:'.$this->profileID.($forceCheck?'(forcedCheck)':'').':'.array2string($folderInfo));
-		if (!empty($folderInfo) && isset($folderInfo[$this->profileID]) && isset($folderInfo[$this->profileID][$_folder]) && $forceCheck===false)
+		if (!empty($folderInfo) && isset($folderInfo[$this->profileID]) && isset($folderInfo[$this->profileID][$_folder]) && $forceCheck === false)
 		{
 			//error_log(__METHOD__.' ('.__LINE__.') '.' Using cached Info on Folder:'.$_folder.' for Profile:'.$this->profileID);
 			return $folderInfo[$this->profileID][$_folder];
@@ -3692,7 +3692,7 @@ 
 
 		// does the folder exist???
 		//error_log(__METHOD__."->Connected?".$this->icServer->_connected.", ".$_folder.", ".($forceCheck?' forceCheck activated':'dont check on server'));
-		if ( $forceCheck || empty($folderInfo) || !isset($folderInfo[$this->profileID]) || !isset($folderInfo[$this->profileID][$_folder])) {
+		if ($forceCheck || empty($folderInfo) || !isset($folderInfo[$this->profileID]) || !isset($folderInfo[$this->profileID][$_folder])) {
 			//error_log(__METHOD__."->NotConnected and forceCheck with profile:".$this->profileID);
 			//return false;
 			//try to connect
@@ -3703,18 +3703,18 @@ 
 		}
 		catch (\Exception $e)
 		{
-			error_log(__METHOD__.__LINE__.$e->getMessage().($e->details?', '.$e->details:''));
-			self::$profileDefunct[$this->profileID]=true;
+			error_log(__METHOD__.__LINE__.$e->getMessage().($e->details ? ', '.$e->details : ''));
+			self::$profileDefunct[$this->profileID] = true;
 			$folderInfo[$this->profileID][$_folder] = false;
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.' Folder Exists:'.$folderInfo[$this->profileID][$_folder].function_backtrace());
 
-		if(!empty($folderInfo) && isset($folderInfo[$this->profileID][$_folder]) &&
+		if (!empty($folderInfo) && isset($folderInfo[$this->profileID][$_folder]) &&
 			$folderInfo[$this->profileID][$_folder] !== true)
 		{
 			$folderInfo[$this->profileID][$_folder] = false; // set to false, whatever it was (to have a valid returnvalue for the static return)
 		}
-		Cache::setCache(Cache::INSTANCE,'email','icServerFolderExistsInfo'.trim($GLOBALS['egw_info']['user']['account_id']),$folderInfo,$expiration=60*60*5);
+		Cache::setCache(Cache::INSTANCE, 'email', 'icServerFolderExistsInfo'.trim($GLOBALS['egw_info']['user']['account_id']), $folderInfo, $expiration = 60 * 60 * 5);
 		return (!empty($folderInfo) && isset($folderInfo[$this->profileID][$_folder]) ? $folderInfo[$this->profileID][$_folder] : false);
 	}
 
@@ -3727,14 +3727,14 @@ 
 	 */
 	function compressFolder($_folderName = false)
 	{
-		$folderName	= ($_folderName ? $_folderName : $this->sessionData['mailbox']);
-		$deleteOptions	= $GLOBALS['egw_info']['user']['preferences']['mail']['deleteOptions'];
-		$trashFolder	= $this->getTrashFolder();
+		$folderName = ($_folderName ? $_folderName : $this->sessionData['mailbox']);
+		$deleteOptions = $GLOBALS['egw_info']['user']['preferences']['mail']['deleteOptions'];
+		$trashFolder = $this->getTrashFolder();
 
 		$this->icServer->openMailbox($folderName);
 
-		if(strtolower($folderName) == strtolower($trashFolder) && $deleteOptions == "move_to_trash") {
-			$this->deleteMessages('all',$folderName,'remove_immediately');
+		if (strtolower($folderName) == strtolower($trashFolder) && $deleteOptions == "move_to_trash") {
+			$this->deleteMessages('all', $folderName, 'remove_immediately');
 		} else {
 			$this->icServer->expunge($folderName);
 		}
@@ -3750,19 +3750,19 @@ 
 	 * @return bool true, as we do not handle return values yet
 	 * @throws Exception
 	 */
-	function deleteMessages($_messageUID, $_folder=NULL, $_forceDeleteMethod='no')
+	function deleteMessages($_messageUID, $_folder = NULL, $_forceDeleteMethod = 'no')
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.'->'.array2string($_messageUID).','.array2string($_folder).', '.$_forceDeleteMethod);
 		$oldMailbox = '';
 		if (is_null($_folder) || empty($_folder)) $_folder = $this->sessionData['mailbox'];
 		if (empty($_messageUID))
 		{
-			if (self::$debug) error_log(__METHOD__." no messages Message(s): ".implode(',',$_messageUID));
+			if (self::$debug) error_log(__METHOD__." no messages Message(s): ".implode(',', $_messageUID));
 			return false;
 		}
-		elseif ($_messageUID==='all')
+		elseif ($_messageUID === 'all')
 		{
-			$_messageUID= null;
+			$_messageUID = null;
 		}
 		else
 		{
@@ -3771,32 +3771,32 @@ 
 			$uidsToDelete->add($_messageUID);
 		}
 		$deleteOptions = $_forceDeleteMethod; // use forceDeleteMethod if not "no", or unknown method
-		if ($_forceDeleteMethod === 'no' || !in_array($_forceDeleteMethod,array('move_to_trash',"mark_as_deleted","remove_immediately"))) $deleteOptions  = ($this->mailPreferences['deleteOptions']?$this->mailPreferences['deleteOptions']:"mark_as_deleted");
+		if ($_forceDeleteMethod === 'no' || !in_array($_forceDeleteMethod, array('move_to_trash', "mark_as_deleted", "remove_immediately"))) $deleteOptions = ($this->mailPreferences['deleteOptions'] ? $this->mailPreferences['deleteOptions'] : "mark_as_deleted");
 		//error_log(__METHOD__.' ('.__LINE__.') '.'->'.array2string($_messageUID).','.$_folder.'/'.$this->sessionData['mailbox'].' Option:'.$deleteOptions);
 		$trashFolder    = $this->getTrashFolder();
-		$draftFolder	= $this->getDraftFolder(); //$GLOBALS['egw_info']['user']['preferences']['mail']['draftFolder'];
+		$draftFolder = $this->getDraftFolder(); //$GLOBALS['egw_info']['user']['preferences']['mail']['draftFolder'];
 		$templateFolder = $this->getTemplateFolder(); //$GLOBALS['egw_info']['user']['preferences']['mail']['templateFolder'];
-		if((strtolower($_folder) == strtolower($trashFolder) && $deleteOptions == "move_to_trash") ||
+		if ((strtolower($_folder) == strtolower($trashFolder) && $deleteOptions == "move_to_trash") ||
 		   (strtolower($_folder) == strtolower($draftFolder))) {
 			$deleteOptions = "remove_immediately";
 		}
-		if($this->icServer->getCurrentMailbox() != $_folder) {
+		if ($this->icServer->getCurrentMailbox() != $_folder) {
 			$oldMailbox = $this->icServer->getCurrentMailbox();
 			$this->icServer->openMailbox($_folder);
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.'->'.array2string($_messageUID).','.$_folder.'/'.$this->sessionData['mailbox'].' Option:'.$deleteOptions);
 		$updateCache = false;
-		switch($deleteOptions) {
+		switch ($deleteOptions) {
 			case "move_to_trash":
 				//error_log(__METHOD__.' ('.__LINE__.') ');
 				$updateCache = true;
-				if(!empty($trashFolder)) {
+				if (!empty($trashFolder)) {
 					if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.implode(' : ', $_messageUID));
-					if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '."$trashFolder <= $_folder / ". $this->sessionData['mailbox']);
+					if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '."$trashFolder <= $_folder / ".$this->sessionData['mailbox']);
 					// copy messages
 					try
 					{
-						$this->icServer->copy($_folder, $trashFolder, array('ids'=>$uidsToDelete,'move'=>true));
+						$this->icServer->copy($_folder, $trashFolder, array('ids'=>$uidsToDelete, 'move'=>true));
 					}
 					catch (\Exception $e)
 					{
@@ -3808,18 +3808,18 @@ 
 			case "mark_as_deleted":
 				//error_log(__METHOD__.' ('.__LINE__.') ');
 				// mark messages as deleted
-				if (is_null($_messageUID)) $_messageUID='all';
-				foreach((array)$_messageUID as $key =>$uid)
+				if (is_null($_messageUID)) $_messageUID = 'all';
+				foreach ((array)$_messageUID as $key =>$uid)
 				{
 					//flag messages, that are flagged for deletion as seen too
 					$this->flagMessages('read', $uid, $_folder);
 					$flags = $this->getFlags($uid);
 					$this->flagMessages('delete', $uid, $_folder);
 					//error_log(__METHOD__.' ('.__LINE__.') '.array2string($flags));
-					if (strpos( array2string($flags),'Deleted')!==false) $undelete[] = $uid;
+					if (strpos(array2string($flags), 'Deleted') !== false) $undelete[] = $uid;
 					unset($flags);
 				}
-				foreach((array)$undelete as $key =>$uid)
+				foreach ((array)$undelete as $key =>$uid)
 				{
 					$this->flagMessages('undelete', $uid, $_folder);
 				}
@@ -3828,14 +3828,14 @@ 
 			case "remove_immediately":
 				//error_log(__METHOD__.' ('.__LINE__.') ');
 				$updateCache = true;
-				if (is_null($_messageUID)) $_messageUID='all';
+				if (is_null($_messageUID)) $_messageUID = 'all';
 				if (is_object($_messageUID))
 				{
 					$this->flagMessages('delete', $_messageUID, $_folder);
 				}
 				else
 				{
-					foreach((array)$_messageUID as $key =>$uid)
+					foreach ((array)$_messageUID as $key =>$uid)
 					{
 						//flag messages, that are flagged for deletion as seen too
 						$this->flagMessages('delete', $uid, $_folder);
@@ -3845,7 +3845,7 @@ 
 				$this->icServer->expunge($_folder);
 				break;
 		}
-		if($oldMailbox != '') {
+		if ($oldMailbox != '') {
 			$this->icServer->openMailbox($oldMailbox);
 		}
 
@@ -3859,7 +3859,7 @@ 
 	 *
 	 * @return null/array flags
 	 */
-	function getFlags ($_messageUID) {
+	function getFlags($_messageUID) {
 		try
 		{
 			$uidsToFetch = new Horde_Imap_Client_Ids();
@@ -3872,7 +3872,7 @@ 
 				'ids' => $uidsToFetch,
 			));
 			if (is_object($headersNew)) {
-				foreach($headersNew->ids() as $id) {
+				foreach ($headersNew->ids() as $id) {
 					$_headerObject = $headersNew->get($id);
 					$flags = $_headerObject->getFlags();
 				}
@@ -3895,22 +3895,22 @@ 
 	 *
 	 * @return null/boolean
 	 */
-	function getNotifyFlags ($_messageUID, $flags=null)
+	function getNotifyFlags($_messageUID, $flags = null)
 	{
 		if (self::$debug) error_log(__METHOD__.$_messageUID.' Flags:'.array2string($flags));
 		try
 		{
-			if($flags===null) $flags =  $this->getFlags($_messageUID);
+			if ($flags === null) $flags = $this->getFlags($_messageUID);
 		}
 		catch (\Exception $e)
 		{
 			return null;
 		}
 
-		if ( stripos( array2string($flags),'MDNSent')!==false)
+		if (stripos(array2string($flags), 'MDNSent') !== false)
 			return true;
 
-		if ( stripos( array2string($flags),'MDNnotSent')!==false)
+		if (stripos(array2string($flags), 'MDNnotSent') !== false)
 			return false;
 
 		return null;
@@ -3927,45 +3927,45 @@ 
 	 *
 	 * @return bool true, as we do not handle icserver->setFlags returnValue
 	 */
-	function flagMessages($_flag, $_messageUID,$_folder=NULL)
+	function flagMessages($_flag, $_messageUID, $_folder = NULL)
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.'->' .$_flag." ".array2string($_messageUID).",$_folder /".$this->sessionData['mailbox']);
 		if (empty($_messageUID))
 		{
-			if (self::$debug) error_log(__METHOD__." no messages Message(s): ".implode(',',$_messageUID));
+			if (self::$debug) error_log(__METHOD__." no messages Message(s): ".implode(',', $_messageUID));
 			return false;
 		}
-		$this->icServer->openMailbox(($_folder?$_folder:$this->sessionData['mailbox']));
+		$this->icServer->openMailbox(($_folder ? $_folder : $this->sessionData['mailbox']));
 		$folder = $this->icServer->getCurrentMailbox();
-		if (is_array($_messageUID)&& count($_messageUID)>50)
+		if (is_array($_messageUID) && count($_messageUID) > 50)
 		{
-			$count = $this->getMailBoxCounters($folder,true);
-			if ($count->messages == count($_messageUID)) $_messageUID='all';
+			$count = $this->getMailBoxCounters($folder, true);
+			if ($count->messages == count($_messageUID)) $_messageUID = 'all';
 		}
 
-		if ($_messageUID==='all')
+		if ($_messageUID === 'all')
 		{
 			$messageUIDs = array('all');
 		}
 		else
 		{
 			if (!(is_object($_messageUID) || is_array($_messageUID))) $_messageUID = (array)$_messageUID;
-			$messageUIDs = array_chunk($_messageUID,50,true);
+			$messageUIDs = array_chunk($_messageUID, 50, true);
 		}
 		try
 		{
-			foreach($messageUIDs as &$uids)
+			foreach ($messageUIDs as &$uids)
 			{
-				if ($uids==='all')
+				if ($uids === 'all')
 				{
-					$uidsToModify=null;
+					$uidsToModify = null;
 				}
 				else
 				{
 					$uidsToModify = new Horde_Imap_Client_Ids();
 					$uidsToModify->add($uids);
 				}
-				switch($_flag) {
+				switch ($_flag) {
 					case "delete":
 						$ret = $this->icServer->store($folder, array('add'=>array('\\Deleted'), 'ids'=> $uidsToModify));
 						break;
@@ -3989,7 +3989,7 @@ 
 						break;
 					case "unread":
 					case "unseen":
-						$ret = $this->icServer->store($folder, array('remove'=>array('\\Seen','\\Answered','$Forwarded'), 'ids'=> $uidsToModify));
+						$ret = $this->icServer->store($folder, array('remove'=>array('\\Seen', '\\Answered', '$Forwarded'), 'ids'=> $uidsToModify));
 						break;
 					case "mdnsent":
 						$ret = $this->icServer->store($folder, array('add'=>array('MDNSent'), 'ids'=> $uidsToModify));
@@ -4047,13 +4047,13 @@ 
 				}
 			}
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			error_log(__METHOD__.__LINE__.' Error, could not flag messages in folder '.$folder.' Reason:'.$e->getMessage());
 		}
 		if ($folder instanceof Horde_Imap_Client_Mailbox) $_folder = $folder->utf8;
 		//error_log(__METHOD__.__LINE__.'#'.$this->icServer->ImapServerId.'#'.array2string($_folder).'#');
-		self::$folderStatusCache[$this->icServer->ImapServerId][(!empty($_folder)?$_folder: $this->sessionData['mailbox'])]['uidValidity'] = 0;
+		self::$folderStatusCache[$this->icServer->ImapServerId][(!empty($_folder) ? $_folder : $this->sessionData['mailbox'])]['uidValidity'] = 0;
 
 		//error_log(__METHOD__.' ('.__LINE__.') '.'->' .$_flag." ".array2string($_messageUID).",".($_folder?$_folder:$this->sessionData['mailbox']));
 		return true; // as we do not catch/examine setFlags returnValue
@@ -4074,19 +4074,19 @@ 
 	 * @return mixed/bool true,false or new uid
 	 * @throws Exception
 	 */
-	function moveMessages($_foldername, $_messageUID, $deleteAfterMove=true, $currentFolder = Null, $returnUIDs = false, $_sourceProfileID = Null, $_targetProfileID = Null)
+	function moveMessages($_foldername, $_messageUID, $deleteAfterMove = true, $currentFolder = Null, $returnUIDs = false, $_sourceProfileID = Null, $_targetProfileID = Null)
 	{
-		$source = Mail\Account::read(($_sourceProfileID?$_sourceProfileID:$this->icServer->ImapServerId))->imapServer();
+		$source = Mail\Account::read(($_sourceProfileID ? $_sourceProfileID : $this->icServer->ImapServerId))->imapServer();
 		//$deleteOptions  = $GLOBALS['egw_info']["user"]["preferences"]["mail"]["deleteOptions"];
 		if (empty($_messageUID))
 		{
-			if (self::$debug) error_log(__METHOD__." no Message(s): ".implode(',',$_messageUID));
+			if (self::$debug) error_log(__METHOD__." no Message(s): ".implode(',', $_messageUID));
 			return false;
 		}
-		elseif ($_messageUID==='all')
+		elseif ($_messageUID === 'all')
 		{
 			//error_log(__METHOD__." all Message(s): ".implode(',',$_messageUID));
-			$uidsToMove= null;
+			$uidsToMove = null;
 		}
 		else
 		{
@@ -4095,7 +4095,7 @@ 
 			if (!(is_object($_messageUID) || is_array($_messageUID))) $_messageUID = (array)$_messageUID;
 			$uidsToMove->add($_messageUID);
 		}
-		$sourceFolder = (!empty($currentFolder)?$currentFolder: $this->sessionData['mailbox']);
+		$sourceFolder = (!empty($currentFolder) ? $currentFolder : $this->sessionData['mailbox']);
 		//error_log(__METHOD__.__LINE__."$_targetProfileID !== ".array2string($source->ImapServerId));
 		if (!is_null($_targetProfileID) && $_targetProfileID !== $source->ImapServerId)
 		{
@@ -4115,19 +4115,19 @@ 
 			//error_log(__METHOD__.' ('.__LINE__.') '.' Sourceserver:'.$source->ImapServerId.' mailheaders:'.array2string($headersNew));
 
 			if (is_object($headersNew)) {
-				$c=0;
+				$c = 0;
 				$retUid = new Horde_Imap_Client_Ids();
 				// we copy chunks of 5 to avoid too much memory and/or server stress
 				// some servers seem not to allow/support the appendig of multiple messages. so we are down to one
-				foreach($headersNew as &$_headerObject) {
+				foreach ($headersNew as &$_headerObject) {
 					$c++;
 					$flags = $_headerObject->getFlags(); //unseen status seems to be lost when retrieving the full message
 					$date = $_headerObject->getImapDate();
-					$currentDate =  new Horde_Imap_Client_DateTime();
+					$currentDate = new Horde_Imap_Client_DateTime();
 					// if the internal Date of the message equals the current date; try using the header date
-					if ($date==$currentDate)
+					if ($date == $currentDate)
 					{
-						$headerForPrio = array_change_key_case($_headerObject->getHeaderText(0,Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->toArray(), CASE_UPPER);
+						$headerForPrio = array_change_key_case($_headerObject->getHeaderText(0, Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->toArray(), CASE_UPPER);
 						//error_log(__METHOD__.__LINE__.'#'.array2string($date).'#'.array2string($currentDate).'#'.$headerForPrio['DATE']);
 						$date = new Horde_Imap_Client_DateTime($headerForPrio['DATE']);
 						//error_log(__METHOD__.__LINE__.'#'.array2string($date).'#'.array2string($currentDate).'#');
@@ -4136,20 +4136,20 @@ 
 					//error_log(__METHOD__.' ('.__LINE__.') '.array2string($flags));
 					$body = $_headerObject->getFullMsg();
 					$dataNflags[] = array('data'=>$body, 'flags'=>$flags, 'internaldate'=>$date);
-					if ($c==1)
+					if ($c == 1)
 					{
 						$target = Mail\Account::read($_targetProfileID)->imapServer();
 						//error_log(__METHOD__.' ('.__LINE__.') '.' Sourceserver:'.$source->ImapServerId.' TargetServer:'.$_targetProfileID.' TargetFolderObject:'.array2string($_foldername));
 						$foldername = $target->getMailbox($_foldername);
 						// make sure the target folder is open and ready
 						$target->openMailbox($foldername);
-						$ret = $target->append($foldername,$dataNflags);
+						$ret = $target->append($foldername, $dataNflags);
 						$retUid->add($ret);
 						unset($dataNflags);
 						// sleep 500 miliseconds; AS some sERVERs seem not to be capable of the load this is
 						// inflicting in them. they "reply" with an unspecific IMAP Error
-						time_nanosleep(0,500000);
-						$c=0;
+						time_nanosleep(0, 500000);
+						$c = 0;
 					}
 				}
 				if (isset($dataNflags))
@@ -4159,7 +4159,7 @@ 
 					$foldername = $target->getMailbox($_foldername);
 					// make sure the target folder is open and ready
 					$target->openMailbox($foldername);
-					$ret = $target->append($foldername,$dataNflags);
+					$ret = $target->append($foldername, $dataNflags);
 					$retUid->add($ret);
 					unset($dataNflags);
 				}
@@ -4170,7 +4170,7 @@ 
 				{
 					$remember = $this->icServer;
 					$this->icServer = $source;
-					$this->deleteMessages($_messageUID, $sourceFolder, $_forceDeleteMethod='remove_immediately');
+					$this->deleteMessages($_messageUID, $sourceFolder, $_forceDeleteMethod = 'remove_immediately');
 					$this->icServer = $remember;
 				}
 			}
@@ -4179,7 +4179,7 @@ 
 		{
 			try
 			{
-				$retUid = $source->copy($sourceFolder, $_foldername, array('ids'=>$uidsToMove,'move'=>$deleteAfterMove));
+				$retUid = $source->copy($sourceFolder, $_foldername, array('ids'=>$uidsToMove, 'move'=>$deleteAfterMove));
 			}
 			catch (exception $e)
 			{
@@ -4199,19 +4199,19 @@ 
 	 * @param string $format ='' if none is passed, use user prefs
 	 * @return string returns the date as it is parseable by strtotime, or current timestamp if everything fails
 	 */
-	static function _strtotime($_date='', $format='', $convert2usertime=false)
+	static function _strtotime($_date = '', $format = '', $convert2usertime = false)
 	{
 		try {
-			$date = new DateTime($_date);	// parse date & time including timezone (throws exception, if not parsable)
-			if ($convert2usertime) $date->setUser();	// convert to user-time
+			$date = new DateTime($_date); // parse date & time including timezone (throws exception, if not parsable)
+			if ($convert2usertime) $date->setUser(); // convert to user-time
 			$date2return = $date->format($format);
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
-			unset($e);	// not used
+			unset($e); // not used
 
 			// remove last space-separated part and retry
-			$parts = explode(' ',$_date);
+			$parts = explode(' ', $_date);
 			if (count($parts) > 1)
 			{
 				array_pop($parts);
@@ -4232,12 +4232,12 @@ 
 	 * @param mixed $_charset false or string -> Target charset, if false Mail displayCharset will be used
 	 * @return string
 	 */
-	static function htmlentities($_string, $_charset=false)
+	static function htmlentities($_string, $_charset = false)
 	{
 		//setting the charset (if not given)
-		if ($_charset===false) $_charset = self::$displayCharset;
+		if ($_charset === false) $_charset = self::$displayCharset;
 		$string = @htmlentities($_string, ENT_QUOTES, $_charset, false);
-		if (empty($string) && !empty($_string)) $string = @htmlentities(Translation::convert($_string,Translation::detect_encoding($_string),$_charset),ENT_QUOTES | ENT_IGNORE,$_charset, false);
+		if (empty($string) && !empty($_string)) $string = @htmlentities(Translation::convert($_string, Translation::detect_encoding($_string), $_charset), ENT_QUOTES|ENT_IGNORE, $_charset, false);
 		return $string;
 	}
 
@@ -4254,21 +4254,21 @@ 
 		//$_html = str_replace("\t",' ',$_html);
 		//error_log(__METHOD__.__LINE__.':'.$_html);
 		//repair doubleencoded ampersands, and some stuff htmLawed stumbles upon with balancing switched on
-		$_html = str_replace(array('&amp;amp;','<DIV><BR></DIV>',"<DIV>&nbsp;</DIV>",'<div>&nbsp;</div>','</td></font>','<br><td>','<tr></tr>','<o:p></o:p>','<o:p>','</o:p>'),
-							 array('&amp;',    '<BR>',           '<BR>',             '<BR>',             '</font></td>','<td>',    '',         '',           '',  ''),$_html);
+		$_html = str_replace(array('&amp;amp;', '<DIV><BR></DIV>', "<DIV>&nbsp;</DIV>", '<div>&nbsp;</div>', '</td></font>', '<br><td>', '<tr></tr>', '<o:p></o:p>', '<o:p>', '</o:p>'),
+							 array('&amp;', '<BR>', '<BR>', '<BR>', '</font></td>', '<td>', '', '', '', ''), $_html);
 		//$_html = str_replace(array('&amp;amp;'),array('&amp;'),$_html);
-		if (stripos($_html,'style')!==false) Mail\Html::replaceTagsCompletley($_html,'style'); // clean out empty or pagewide style definitions / left over tags
-		if (stripos($_html,'head')!==false) Mail\Html::replaceTagsCompletley($_html,'head'); // Strip out stuff in head
+		if (stripos($_html, 'style') !== false) Mail\Html::replaceTagsCompletley($_html, 'style'); // clean out empty or pagewide style definitions / left over tags
+		if (stripos($_html, 'head') !== false) Mail\Html::replaceTagsCompletley($_html, 'head'); // Strip out stuff in head
 		//if (stripos($_html,'![if')!==false && stripos($_html,'<![endif]>')!==false) Mail\Html::replaceTagsCompletley($_html,'!\[if','<!\[endif\]>',false); // Strip out stuff in ifs
 		//if (stripos($_html,'!--[if')!==false && stripos($_html,'<![endif]-->')!==false) Mail\Html::replaceTagsCompletley($_html,'!--\[if','<!\[endif\]-->',false); // Strip out stuff in ifs
 		//error_log(__METHOD__.' ('.__LINE__.') '.$_html);
 
 		if (get_magic_quotes_gpc() === 1) $_html = stripslashes($_html);
 		// Strip out doctype in head, as htmlLawed cannot handle it TODO: Consider extracting it and adding it afterwards
-		if (stripos($_html,'!doctype')!==false) Mail\Html::replaceTagsCompletley($_html,'!doctype');
-		if (stripos($_html,'?xml:namespace')!==false) Mail\Html::replaceTagsCompletley($_html,'\?xml:namespace','/>',false);
-		if (stripos($_html,'?xml version')!==false) Mail\Html::replaceTagsCompletley($_html,'\?xml version','\?>',false);
-		if (strpos($_html,'!CURSOR')!==false) Mail\Html::replaceTagsCompletley($_html,'!CURSOR');
+		if (stripos($_html, '!doctype') !== false) Mail\Html::replaceTagsCompletley($_html, '!doctype');
+		if (stripos($_html, '?xml:namespace') !== false) Mail\Html::replaceTagsCompletley($_html, '\?xml:namespace', '/>', false);
+		if (stripos($_html, '?xml version') !== false) Mail\Html::replaceTagsCompletley($_html, '\?xml version', '\?>', false);
+		if (strpos($_html, '!CURSOR') !== false) Mail\Html::replaceTagsCompletley($_html, '!CURSOR');
 		// htmLawed filter only the 'body'
 		//preg_match('`(<htm.+?<body[^>]*>)(.+?)(</body>.*?</html>)`ims', $_html, $matches);
 		//if ($matches[2])
@@ -4279,16 +4279,16 @@ 
 		// purify got switched to htmLawed
 		// some testcode to test purifying / htmlawed
 		//$_html = "<BLOCKQUOTE>hi <div> there </div> kram <br> </blockquote>".$_html;
-		$_html = Html\HtmLawed::purify($_html,self::$htmLawed_config,array(),true);
+		$_html = Html\HtmLawed::purify($_html, self::$htmLawed_config, array(), true);
 		//if ($hasOther) $_html = $matches[1]. $_html. $matches[3];
 		// clean out comments , should not be needed as purify should do the job.
 		$search = array(
-			'@url\(http:\/\/[^\)].*?\)@si',  // url calls e.g. in style definitions
-			'@<!--[\s\S]*?[ \t\n\r]*-->@',         // Strip multi-line comments including CDATA
+			'@url\(http:\/\/[^\)].*?\)@si', // url calls e.g. in style definitions
+			'@<!--[\s\S]*?[ \t\n\r]*-->@', // Strip multi-line comments including CDATA
 		);
-		$_html = preg_replace($search,"",$_html);
+		$_html = preg_replace($search, "", $_html);
 		// remove non printable chars
-		$_html = preg_replace('/([\000-\011])/','',$_html);
+		$_html = preg_replace('/([\000-\011])/', '', $_html);
 		//error_log(__METHOD__.':'.__LINE__.':'.$_html);
 	}
 
@@ -4305,12 +4305,12 @@ 
 	function getMimePartCharset($_mimePartObject)
 	{
 		//$charSet = 'iso-8859-1';//self::$displayCharset; //'iso-8859-1'; // self::displayCharset seems to be asmarter fallback than iso-8859-1
-		$CharsetFound=false;
+		$CharsetFound = false;
 		//echo "#".$_mimePartObject->encoding.'#<br>';
-		if(is_array($_mimePartObject->parameters)) {
-			if(isset($_mimePartObject->parameters['CHARSET'])) {
+		if (is_array($_mimePartObject->parameters)) {
+			if (isset($_mimePartObject->parameters['CHARSET'])) {
 				$charSet = $_mimePartObject->parameters['CHARSET'];
-				$CharsetFound=true;
+				$CharsetFound = true;
 			}
 		}
 		// this one is dirty, but until I find something that does the trick of detecting the encoding, ....
@@ -4329,7 +4329,7 @@ 
 	function decodeMimePart($_mimeMessage, $_encoding, $_charset = '')
 	{
 		// decode the part
-		if (self::$debug) error_log(__METHOD__."() with $_encoding and $_charset:".print_r($_mimeMessage,true));
+		if (self::$debug) error_log(__METHOD__."() with $_encoding and $_charset:".print_r($_mimeMessage, true));
 		switch (strtoupper($_encoding))
 		{
 			case 'BASE64':
@@ -4369,10 +4369,10 @@ 
 		// sometimes there are 3 parts, when there is an ics/ical attached/included-> we want to show that
 		// as attachment AND as abstracted ical information (we use our notification style here).
 		$partText = $partCalendar = $partHTML = null;
-		if (self::$debug) _debug_array(array("METHOD"=>__METHOD__,"LINE"=>__LINE__,"STRUCTURE"=>$_structure));
+		if (self::$debug) _debug_array(array("METHOD"=>__METHOD__, "LINE"=>__LINE__, "STRUCTURE"=>$_structure));
 		//error_log(__METHOD__.' ('.__LINE__.') ');
 		$ignore_first_part = true;
-		foreach($_structure->contentTypeMap() as $mime_id => $mime_type)
+		foreach ($_structure->contentTypeMap() as $mime_id => $mime_type)
 		{
 			//error_log(__METHOD__."($_uid, ".$_structure->getMimeId().") $mime_id: $mime_type"." ignoreFirstPart:".$ignore_first_part);
 			if (self::$debug) echo __METHOD__."($_uid, partID=".$_structure->getMimeId().") $mime_id: $mime_type<br>";
@@ -4380,15 +4380,15 @@ 
 			if ($ignore_first_part)
 			{
 				$ignore_first_part = false;
-				continue;	// ignore multipart/alternative itself
+				continue; // ignore multipart/alternative itself
 			}
 
 			$mimePart = $_structure->getPart($mime_id);
 
-			switch($mimePart->getPrimaryType())
+			switch ($mimePart->getPrimaryType())
 			{
 				case 'text':
-					switch($mimePart->getSubType())
+					switch ($mimePart->getSubType())
 					{
 						case 'plain':
 							if ($mimePart->getBytes() > 0) $partText = $mimePart;
@@ -4401,7 +4401,7 @@ 
 					break;
 
 				case 'multipart':
-					switch($mimePart->getSubType())
+					switch ($mimePart->getSubType())
 					{
 						case 'related':
 						case 'mixed':
@@ -4423,13 +4423,13 @@ 
 			}
 		}
 
-		switch($_htmlMode)
+		switch ($_htmlMode)
 		{
 			case 'html_only':
 			case 'always_display':
 				if ($partHTML)
 				{
-					switch($partHTML->getSubType())
+					switch ($partHTML->getSubType())
 					{
 						case 'related':
 							return $this->getMultipartRelated($_uid, $partHTML, $_htmlMode, $_preserveSeen);
@@ -4441,7 +4441,7 @@ 
 							return $this->getTextPart($_uid, $partHTML, $_htmlMode, $_preserveSeen);
 					}
 				}
-				elseif ($partText && $_htmlMode=='always_display')
+				elseif ($partText && $_htmlMode == 'always_display')
 				{
 					return $this->getTextPart($_uid, $partText, $_htmlMode, $_preserveSeen);
 				}
@@ -4487,7 +4487,7 @@ 
 	 * @param array	&$skipParts - passed by reference to have control/knowledge which parts are already fetched
 	 * @return array containing the desired part
 	 */
-	function getMultipartMixed($_uid, Horde_Mime_Part $_structure, $_htmlMode, $_preserveSeen = false, &$skipParts=array())
+	function getMultipartMixed($_uid, Horde_Mime_Part $_structure, $_htmlMode, $_preserveSeen = false, &$skipParts = array())
 	{
 		if (self::$debug) echo __METHOD__."$_uid, $_htmlMode<br>";
 		$bodyPart = array();
@@ -4496,7 +4496,7 @@ 
 		$ignore_first_part = true;
 		//$skipParts = array();
 		//error_log(__METHOD__.__LINE__.array2string($_structure->contentTypeMap()));
-		foreach($_structure->contentTypeMap() as $mime_id => $mime_type)
+		foreach ($_structure->contentTypeMap() as $mime_id => $mime_type)
 		{
 			//error_log(__METHOD__."($_uid, ".$_structure->getMimeId().") $mime_id: $mime_type");
 			if (self::$debug) echo __METHOD__."($_uid, partID=".$_structure->getMimeId().") $mime_id: $mime_type<br>";
@@ -4504,9 +4504,9 @@ 
 			{
 				$ignore_first_part = false;
 				//error_log(__METHOD__."($_uid, ".$_structure->getMimeId().") SKIPPED FirstPart $mime_id: $mime_type");
-				continue;	// ignore multipart/mixed itself
+				continue; // ignore multipart/mixed itself
 			}
-			if (array_key_exists($mime_id,$skipParts))
+			if (array_key_exists($mime_id, $skipParts))
 			{
 				//error_log(__METHOD__."($_uid, ".$_structure->getMimeId().") SKIPPED $mime_id: $mime_type");
 				continue;
@@ -4514,11 +4514,11 @@ 
 
 			$part = $_structure->getPart($mime_id);
 
-			switch($part->getPrimaryType())
+			switch ($part->getPrimaryType())
 			{
 				case 'multipart':
 					if ($part->getDisposition() == 'attachment') continue;
-					switch($part->getSubType())
+					switch ($part->getSubType())
 					{
 						case 'alternative':
 							return array($this->getMultipartAlternative($_uid, $part, $_htmlMode, $_preserveSeen));
@@ -4534,15 +4534,15 @@ 
 					}
 					break;
 				case 'application':
-					switch($part->getSubType())
+					switch ($part->getSubType())
 					{
 						case 'pgp-encrypted':
-							if (($part = $_structure->getPart($mime_id+1)) &&
+							if (($part = $_structure->getPart($mime_id + 1)) &&
 								$part->getType() == 'application/octet-stream')
 							{
 								$this->fetchPartContents($_uid, $part);
-								$skipParts[$mime_id]=$mime_type;
-								$skipParts[$mime_id+1]=$part->getType();
+								$skipParts[$mime_id] = $mime_type;
+								$skipParts[$mime_id + 1] = $part->getType();
 								$bodyPart[] = array(
 									'body'		=> $part->getContents(array(
 										'stream' => false,
@@ -4556,15 +4556,15 @@ 
 					break;
 
 				case 'text':
-					switch($part->getSubType())
+					switch ($part->getSubType())
 					{
 						case 'plain':
 						case 'html':
 						case 'calendar': // inline ics/ical files
-							if($part->getDisposition() != 'attachment')
+							if ($part->getDisposition() != 'attachment')
 							{
 								$bodyPart[] = $this->getTextPart($_uid, $part, $_htmlMode, $_preserveSeen);
-								$skipParts[$mime_id]=$mime_type;
+								$skipParts[$mime_id] = $mime_type;
 							}
 							//error_log(__METHOD__.' ('.__LINE__.') '.' ->'.$part->type."/".$part->subType.' -> BodyPart:'.array2string($bodyPart[count($bodyPart)-1]));
 							break;
@@ -4573,16 +4573,16 @@ 
 
 				case 'message':
 					//skip attachments
-					if($part->getSubType() == 'delivery-status' && $part->getDisposition() != 'attachment')
+					if ($part->getSubType() == 'delivery-status' && $part->getDisposition() != 'attachment')
 					{
 						$bodyPart[] = $this->getTextPart($_uid, $part, $_htmlMode, $_preserveSeen);
-						$skipParts[$mime_id]=$mime_type;
+						$skipParts[$mime_id] = $mime_type;
 					}
 					// do not descend into attached Messages
-					if($part->getSubType() == 'rfc822' || $part->getDisposition() == 'attachment')
+					if ($part->getSubType() == 'rfc822' || $part->getDisposition() == 'attachment')
 					{
 						$skipParts[$mime_id.'.0'] = $mime_type;
-						foreach($part->contentTypeMap() as $sub_id => $sub_type){ $skipParts[$sub_id] = $sub_type;}
+						foreach ($part->contentTypeMap() as $sub_id => $sub_type) { $skipParts[$sub_id] = $sub_type; }
 						//error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$_uid.' Part:'.$mime_id.':'.array2string($skipParts));
 						//break 2;
 					}
@@ -4623,13 +4623,13 @@ 
 	 * @param boolean $_tryDecodingServerside = true; wether to try to fetch Data with BINARY instead of BODY
 	 * @return string|resource
 	 */
-	function getBodyPart($_uid, $_partID=null, $_folder=null, $_preserveSeen=false, $_stream=false, &$_encoding=null, $_tryDecodingServerside=true)
+	function getBodyPart($_uid, $_partID = null, $_folder = null, $_preserveSeen = false, $_stream = false, &$_encoding = null, $_tryDecodingServerside = true)
 	{
-		if (self::$debug) error_log( __METHOD__.__LINE__."(".array2string($_uid).", $_partID, $_folder, $_preserveSeen, $_stream, $_encoding, $_tryDecodingServerside)");
+		if (self::$debug) error_log(__METHOD__.__LINE__."(".array2string($_uid).", $_partID, $_folder, $_preserveSeen, $_stream, $_encoding, $_tryDecodingServerside)");
 
 		if (empty($_folder))
 		{
-			$_folder = (isset($this->sessionData['mailbox'])&&$this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+			$_folder = (isset($this->sessionData['mailbox']) && $this->sessionData['mailbox'] ? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($_folder).'/'.$this->icServer->getCurrentMailbox().'/'. $this->sessionData['mailbox']);
 		// querying contents of body part
@@ -4640,11 +4640,11 @@ 
 		$fquery = new Horde_Imap_Client_Fetch_Query();
 		$fetchParams = array(
 			'peek' => $_preserveSeen,
-			'decode' => true,	// try decode on server, does NOT neccessary work
+			'decode' => true, // try decode on server, does NOT neccessary work
 		);
-		if ($_tryDecodingServerside===false)// || ($_tryDecodingServerside&&$this->isDraftFolder($_folder)))
+		if ($_tryDecodingServerside === false)// || ($_tryDecodingServerside&&$this->isDraftFolder($_folder)))
 		{
-			$_tryDecodingServerside=false;
+			$_tryDecodingServerside = false;
 			$fetchParams = array(
 				'peek' => $_preserveSeen,
 			);
@@ -4664,12 +4664,12 @@ 
 		}
 		// if we get an empty result, server may have trouble fetching data with UID FETCH $_uid (BINARY.PEEK[$_partID])
 		// thus we trigger a second go with UID FETCH $_uid (BODY.PEEK[$_partID])
-		if (empty($partToReturn)&&$_tryDecodingServerside===true)
+		if (empty($partToReturn) && $_tryDecodingServerside === true)
 		{
 			error_log(__METHOD__.__LINE__.' failed to fetch bodyPart in  BINARY. Try BODY');
 			$partToReturn = $this->getBodyPart($_uid, $_partID, $_folder, $_preserveSeen, $_stream, $_encoding, false);
 		}
-		return ($partToReturn?$partToReturn:null);
+		return ($partToReturn ? $partToReturn : null);
 	}
 
 	/**
@@ -4682,13 +4682,13 @@ 
 	 * @param boolean $_stream = false true return a stream, false return string
 	 * @return array containing the desired text part, mimeType and charset
 	 */
-	function getTextPart($_uid, Horde_Mime_Part $_structure, $_htmlMode='', $_preserveSeen=false, $_stream=false)
+	function getTextPart($_uid, Horde_Mime_Part $_structure, $_htmlMode = '', $_preserveSeen = false, $_stream = false)
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.'->'.$_uid.':'.array2string($_structure).' '.function_backtrace());
 		$bodyPart = array();
-		if (self::$debug) _debug_array(array($_structure,function_backtrace()));
+		if (self::$debug) _debug_array(array($_structure, function_backtrace()));
 
-		if($_structure->getSubType() == 'html' && !in_array($_htmlMode, array('html_only', 'always_display', 'only_if_no_text')))
+		if ($_structure->getSubType() == 'html' && !in_array($_htmlMode, array('html_only', 'always_display', 'only_if_no_text')))
 		{
 			$bodyPart = array(
 				'error'		=> 1,
@@ -4734,10 +4734,10 @@ 
 	 * @param string $_folder folder to work on
 	 * @return array containing the message body, mimeType and charset
 	 */
-	function getMessageBody($_uid, $_htmlOptions='', $_partID=null, Horde_Mime_Part $_structure=null, $_preserveSeen = false, $_folder = '')
+	function getMessageBody($_uid, $_htmlOptions = '', $_partID = null, Horde_Mime_Part $_structure = null, $_preserveSeen = false, $_folder = '')
 	{
 		if (self::$debug) echo __METHOD__."$_uid, $_htmlOptions, $_partID<br>";
-		if($_htmlOptions != '') {
+		if ($_htmlOptions != '') {
 			$this->htmlOptions = $_htmlOptions;
 		}
 		if (empty($_folder))
@@ -4758,7 +4758,7 @@ 
 			return array(
 				array(
 					'error'		=> 1,
-					'body'		=> 'Error: Could not fetch structure on mail:'.$_uid." as $_htmlOptions". 'for Mailprofile'.$this->icServer->ImapServerId.' User:'.$GLOBALS['egw_info']['user']['account_lid'],
+					'body'		=> 'Error: Could not fetch structure on mail:'.$_uid." as $_htmlOptions".'for Mailprofile'.$this->icServer->ImapServerId.' User:'.$GLOBALS['egw_info']['user']['account_lid'],
 					'mimeType'	=> 'text/plain',
 					'charSet'	=> self::$displayCharset,
 				)
@@ -4771,7 +4771,7 @@ 
 			//_debug_array($_structure->getMimeId()); exit;
 		}
 
-		switch($_structure->getPrimaryType())
+		switch ($_structure->getPrimaryType())
 		{
 			case 'application':
 				return array(
@@ -4783,7 +4783,7 @@ 
 				);
 
 			case 'multipart':
-				switch($_structure->getSubType())
+				switch ($_structure->getSubType())
 				{
 					case 'alternative':
 						$bodyParts = array($this->getMultipartAlternative($_uid, $_structure, $this->htmlOptions, $_preserveSeen));
@@ -4817,7 +4817,7 @@ 
 				$bodyPart = array();
 				if ($_structure->getDisposition() != 'attachment')
 				{
-					switch($_structure->getSubType())
+					switch ($_structure->getSubType())
 					{
 						case 'calendar':
 							// this is handeled in getTextPart
@@ -4833,11 +4833,11 @@ 
 
 			case 'attachment':
 			case 'message':
-				switch($_structure->getSubType())
+				switch ($_structure->getSubType())
 				{
 					case 'rfc822':
 						$newStructure = $_structure->getParts();
-						if (self::$debug) {echo __METHOD__." Message -> RFC -> NewStructure:"; _debug_array($newStructure[0]);}
+						if (self::$debug) {echo __METHOD__." Message -> RFC -> NewStructure:"; _debug_array($newStructure[0]); }
 						return self::normalizeBodyParts($this->getMessageBody($_uid, $_htmlOptions, $newStructure[0]->getMimeId(), $newStructure[0], $_preserveSeen, $_folder));
 				}
 				break;
@@ -4865,11 +4865,11 @@ 
 	{
 		if (is_array($_bodyParts))
 		{
-			foreach($_bodyParts as $singleBodyPart)
+			foreach ($_bodyParts as $singleBodyPart)
 			{
 				if (!isset($singleBodyPart['body'])) {
 					$buff = self::normalizeBodyParts($singleBodyPart);
-					foreach ((array)$buff as $val) { $body2return[] = $val;}
+					foreach ((array)$buff as $val) { $body2return[] = $val; }
 					continue;
 				}
 				$body2return[] = $singleBodyPart;
@@ -4890,14 +4890,14 @@ 
 	 * @param boolean $useTidy  switch to use tidy
 	 * @return string a preformatted string with the mails converted to text
 	 */
-	static function &getdisplayableBody(&$mailClass, $bodyParts, $preserveHTML = false,  $useTidy = true)
+	static function &getdisplayableBody(&$mailClass, $bodyParts, $preserveHTML = false, $useTidy = true)
 	{
-		$message='';
-		for($i=0; $i<count($bodyParts); $i++)
+		$message = '';
+		for ($i = 0; $i < count($bodyParts); $i++)
 		{
 			if (!isset($bodyParts[$i]['body'])) {
 				$bodyParts[$i]['body'] = self::getdisplayableBody($mailClass, $bodyParts[$i], $preserveHTML, $useTidy);
-				$message .= empty($bodyParts[$i]['body'])?'':$bodyParts[$i]['body'];
+				$message .= empty($bodyParts[$i]['body']) ? '' : $bodyParts[$i]['body'];
 				continue;
 			}
 			if (isset($bodyParts[$i]['error'])) continue;
@@ -4922,32 +4922,32 @@ 
 				'(R)',
 			);
 
-			if(($bodyParts[$i]['mimeType'] == 'text/html' || $bodyParts[$i]['mimeType'] == 'text/plain') &&
+			if (($bodyParts[$i]['mimeType'] == 'text/html' || $bodyParts[$i]['mimeType'] == 'text/plain') &&
 				strtoupper($bodyParts[$i]['charSet']) != 'UTF-8')
 			{
-				$bodyParts[$i]['body'] = preg_replace($sar,$rar,$bodyParts[$i]['body']);
+				$bodyParts[$i]['body'] = preg_replace($sar, $rar, $bodyParts[$i]['body']);
 			}
 
-			if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = Translation::detect_encoding($bodyParts[$i]['body']);
+			if ($bodyParts[$i]['charSet'] === false) $bodyParts[$i]['charSet'] = Translation::detect_encoding($bodyParts[$i]['body']);
 			// add line breaks to $bodyParts
 			//error_log(__METHOD__.' ('.__LINE__.') '.' Charset:'.$bodyParts[$i]['charSet'].'->'.$bodyParts[$i]['body']);
-			$newBody  = Translation::convert_jsonsafe($bodyParts[$i]['body'], $bodyParts[$i]['charSet']);
+			$newBody = Translation::convert_jsonsafe($bodyParts[$i]['body'], $bodyParts[$i]['charSet']);
 			//error_log(__METHOD__.' ('.__LINE__.') '.' MimeType:'.$bodyParts[$i]['mimeType'].'->'.$newBody);
 			$mailClass->activeMimeType = 'text/plain';
 			if ($bodyParts[$i]['mimeType'] == 'text/html') {
 				$mailClass->activeMimeType = $bodyParts[$i]['mimeType'];
 				if (!$preserveHTML)
 				{
-					$alreadyHtmlLawed=false;
+					$alreadyHtmlLawed = false;
 					// as Translation::convert reduces \r\n to \n and purifier eats \n -> peplace it with a single space
-					$newBody = str_replace("\n"," ",$newBody);
+					$newBody = str_replace("\n", " ", $newBody);
 					// convert HTML to text, as we dont want HTML in infologs
 					if ($useTidy && extension_loaded('tidy'))
 					{
 						$tidy = new tidy();
-						$cleaned = $tidy->repairString($newBody, self::$tidy_config,'utf8');
+						$cleaned = $tidy->repairString($newBody, self::$tidy_config, 'utf8');
 						// Found errors. Strip it all so there's some output
-						if($tidy->getStatus() == 2)
+						if ($tidy->getStatus() == 2)
 						{
 							error_log(__METHOD__.' ('.__LINE__.') '.' ->'.$tidy->errorBuffer);
 						}
@@ -4958,7 +4958,7 @@ 
 						if (!$preserveHTML)
 						{
 							// filter only the 'body', as we only want that part, if we throw away the html
-							preg_match('`(<htm.+?<body[^>]*>)(.+?)(</body>.*?</html>)`ims', $newBody, $matches=array());
+							preg_match('`(<htm.+?<body[^>]*>)(.+?)(</body>.*?</html>)`ims', $newBody, $matches = array());
 							if ($matches[2])
 							{
 								$hasOther = true;
@@ -4969,7 +4969,7 @@ 
 					else
 					{
 						// htmLawed filter only the 'body'
-						preg_match('`(<htm.+?<body[^>]*>)(.+?)(</body>.*?</html>)`ims', $newBody, $matches=array());
+						preg_match('`(<htm.+?<body[^>]*>)(.+?)(</body>.*?</html>)`ims', $newBody, $matches = array());
 						if ($matches[2])
 						{
 							$hasOther = true;
@@ -4978,17 +4978,17 @@ 
 						$htmLawed = new Html\HtmLawed();
 						// the next line should not be needed, but produces better results on HTML 2 Text conversion,
 						// as we switched off HTMLaweds tidy functionality
-						$newBody = str_replace(array('&amp;amp;','<DIV><BR></DIV>',"<DIV>&nbsp;</DIV>",'<div>&nbsp;</div>'),array('&amp;','<BR>','<BR>','<BR>'),$newBody);
-						$newBody = $htmLawed->run($newBody,self::$htmLawed_config);
-						if ($hasOther && $preserveHTML) $newBody = $matches[1]. $newBody. $matches[3];
-						$alreadyHtmlLawed=true;
+						$newBody = str_replace(array('&amp;amp;', '<DIV><BR></DIV>', "<DIV>&nbsp;</DIV>", '<div>&nbsp;</div>'), array('&amp;', '<BR>', '<BR>', '<BR>'), $newBody);
+						$newBody = $htmLawed->run($newBody, self::$htmLawed_config);
+						if ($hasOther && $preserveHTML) $newBody = $matches[1].$newBody.$matches[3];
+						$alreadyHtmlLawed = true;
 					}
 					//error_log(__METHOD__.' ('.__LINE__.') '.' after purify:'.$newBody);
-					if ($preserveHTML==false) $newBody = Mail\Html::convertHTMLToText($newBody,self::$displayCharset,true,true);
+					if ($preserveHTML == false) $newBody = Mail\Html::convertHTMLToText($newBody, self::$displayCharset, true, true);
 					//error_log(__METHOD__.' ('.__LINE__.') '.' after convertHTMLToText:'.$newBody);
-					if ($preserveHTML==false) $newBody = nl2br($newBody); // we need this, as htmLawed removes \r\n
+					if ($preserveHTML == false) $newBody = nl2br($newBody); // we need this, as htmLawed removes \r\n
 					/*if (!$alreadyHtmlLawed) */ $mailClass->getCleanHTML($newBody); // remove stuff we regard as unwanted
-					if ($preserveHTML==false) $newBody = str_replace("<br />","\r\n",$newBody);
+					if ($preserveHTML == false) $newBody = str_replace("<br />", "\r\n", $newBody);
 					//error_log(__METHOD__.' ('.__LINE__.') '.' after getClean:'.$newBody);
 				}
 				$message .= $newBody;
@@ -4997,9 +4997,9 @@ 
 			//error_log(__METHOD__.' ('.__LINE__.') '.' Body(after specialchars):'.$newBody);
 			//use Mail\Html::convertHTMLToText instead of strip_tags, (even message is plain text) as strip_tags eats away too much
 			//$newBody = strip_tags($newBody); //we need to fix broken tags (or just stuff like "<800 USD/p" )
-			$newBody = Mail\Html::convertHTMLToText($newBody,self::$displayCharset,false,false);
+			$newBody = Mail\Html::convertHTMLToText($newBody, self::$displayCharset, false, false);
 			//error_log(__METHOD__.' ('.__LINE__.') '.' Body(after strip tags):'.$newBody);
-			$newBody = htmlspecialchars_decode($newBody,ENT_QUOTES);
+			$newBody = htmlspecialchars_decode($newBody, ENT_QUOTES);
 			//error_log(__METHOD__.' ('.__LINE__.') '.' Body (after hmlspc_decode):'.$newBody);
 			$message .= $newBody;
 			//continue;
@@ -5007,27 +5007,27 @@ 
 		return $message;
 	}
 
-	static function wordwrap($str, $cols, $cut, $dontbreaklinesstartingwith=false)
+	static function wordwrap($str, $cols, $cut, $dontbreaklinesstartingwith = false)
 	{
 		$lines = explode("\n", $str);
 		$newStr = '';
-		foreach($lines as $line)
+		foreach ($lines as $line)
 		{
 			// replace tabs by 8 space chars, or any tab only counts one char
 			//$line = str_replace("\t","        ",$line);
 			//$newStr .= wordwrap($line, $cols, $cut);
-			$allowedLength = $cols-strlen($cut);
+			$allowedLength = $cols - strlen($cut);
 			//dont try to break lines with links, chance is we mess up the text is way too big
-			if (strlen($line) > $allowedLength && stripos($line,'href=')===false &&
-				($dontbreaklinesstartingwith==false ||
+			if (strlen($line) > $allowedLength && stripos($line, 'href=') === false &&
+				($dontbreaklinesstartingwith == false ||
 				 ($dontbreaklinesstartingwith &&
-				  strlen($dontbreaklinesstartingwith)>=1 &&
-				  substr($line,0,strlen($dontbreaklinesstartingwith)) != $dontbreaklinesstartingwith
+				  strlen($dontbreaklinesstartingwith) >= 1 &&
+				  substr($line, 0, strlen($dontbreaklinesstartingwith)) != $dontbreaklinesstartingwith
 				 )
 				)
 			   )
 			{
-				$s=explode(" ", $line);
+				$s = explode(" ", $line);
 				$line = "";
 				$linecnt = 0;
 				foreach ($s as &$v) {
@@ -5035,22 +5035,22 @@ 
 					// only break long words within the wordboundaries,
 					// but it may destroy links, so we check for href and dont do it if we find one
 					// we check for any html within the word, because we do not want to break html by accident
-					if($cnt > $allowedLength && stripos($v,'href=')===false && stripos($v,'onclick=')===false && $cnt == strlen(html_entity_decode($v)))
+					if ($cnt > $allowedLength && stripos($v, 'href=') === false && stripos($v, 'onclick=') === false && $cnt == strlen(html_entity_decode($v)))
 					{
-						$v=wordwrap($v, $allowedLength, $cut, true);
+						$v = wordwrap($v, $allowedLength, $cut, true);
 					}
 					// the rest should be broken at the start of the new word that exceeds the limit
-					if ($linecnt+$cnt > $allowedLength) {
-						$v=$cut.$v;
+					if ($linecnt + $cnt > $allowedLength) {
+						$v = $cut.$v;
 						#$linecnt = 0;
-						$linecnt =strlen($v)-strlen($cut);
+						$linecnt = strlen($v) - strlen($cut);
 					} else {
 						$linecnt += $cnt;
 					}
 					if (strlen($v)) $line .= (strlen($line) ? " " : "").$v;
 				}
 			}
-			$newStr .= $line . "\n";
+			$newStr .= $line."\n";
 		}
 		return $newStr;
 	}
@@ -5065,12 +5065,12 @@ 
 	 * @param boolean $_useHeaderInsteadOfEnvelope - force getMessageHeader method to be used for fetching Envelope Information
 	 * @return array the message header
 	 */
-	function getMessageEnvelope($_uid, $_partID = '',$decode=false, $_folder='', $_useHeaderInsteadOfEnvelope=false)
+	function getMessageEnvelope($_uid, $_partID = '', $decode = false, $_folder = '', $_useHeaderInsteadOfEnvelope = false)
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.":$_uid,$_partID,$decode,$_folder".function_backtrace());
-		if (empty($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		if (empty($_folder)) $_folder = ($this->sessionData['mailbox'] ? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
 		//error_log(__METHOD__.' ('.__LINE__.') '.":$_uid,$_partID,$decode,$_folder");
-		if((empty($_partID)||$_partID=='null')&&$_useHeaderInsteadOfEnvelope===false) {
+		if ((empty($_partID) || $_partID == 'null') && $_useHeaderInsteadOfEnvelope === false) {
 			$uidsToFetch = new Horde_Imap_Client_Ids();
 			if (!(is_object($_uid) || is_array($_uid))) $_uid = (array)$_uid;
 			$uidsToFetch->add($_uid);
@@ -5083,7 +5083,7 @@ 
 				'ids' => $uidsToFetch,
 			));
 			if (is_object($headersNew)) {
-				foreach($headersNew as &$_headerObject) {
+				foreach ($headersNew as &$_headerObject) {
 					$env = $_headerObject->getEnvelope();
 					//_debug_array($envFields->singleFields());
 					$singleFields = $envFields->singleFields();
@@ -5098,34 +5098,34 @@ 
 							case 'bcc':
 							case 'sender':
 								//error_log(__METHOD__.' ('.__LINE__.') '.$v.'->'.array2string($env->$v->addresses));
-								$envelope[$v]=$env->$v->addresses;
+								$envelope[$v] = $env->$v->addresses;
 								$address = array();
 								if (!is_array($envelope[$v])) break;
 								foreach ($envelope[$v] as $k => $ad)
 								{
-									if (stripos($ad,'@')===false)
+									if (stripos($ad, '@') === false)
 									{
-										$remember=$k;
+										$remember = $k;
 									}
 									else
 									{
-										$address[] = (!is_null($remember)?$envelope[$v][$remember].' ':'').$ad;
-										$remember=null;
+										$address[] = (!is_null($remember) ? $envelope[$v][$remember].' ' : '').$ad;
+										$remember = null;
 									}
 								}
 								$envelope[$v] = $address;
 								break;
 							case 'date':
-								$envelope[$v]=DateTime::to($env->$v);
+								$envelope[$v] = DateTime::to($env->$v);
 								break;
 							default:
-								$envelope[$v]=$env->$v;
+								$envelope[$v] = $env->$v;
 						}
 					}
-					$envelope['size']=$_headerObject->getSize();
+					$envelope['size'] = $_headerObject->getSize();
 				}
 			}
-			$envelope = array_change_key_case($envelope,CASE_UPPER);
+			$envelope = array_change_key_case($envelope, CASE_UPPER);
 			//if ($decode) _debug_array($envelope);
 			//error_log(__METHOD__.' ('.__LINE__.') '.array2string($envelope));
 			if ($decode)
@@ -5133,19 +5133,19 @@ 
 				foreach ($envelope as $key => $rvV)
 				{
 					//try idn conversion only on 'FROM', 'TO', 'CC', 'BCC', 'SENDER', 'REPLY-TO'
-					$envelope[$key]=self::decode_header($rvV,in_array($key,array('FROM', 'TO', 'CC', 'BCC', 'SENDER', 'REPLY-TO')));
+					$envelope[$key] = self::decode_header($rvV, in_array($key, array('FROM', 'TO', 'CC', 'BCC', 'SENDER', 'REPLY-TO')));
 				}
 			}
 			return $envelope;
 		} else {
 
-			$headers = $this->getMessageHeader($_uid, $_partID, true,true,$_folder);
+			$headers = $this->getMessageHeader($_uid, $_partID, true, true, $_folder);
 
 			//error_log(__METHOD__.' ('.__LINE__.') '.':'.array2string($headers));
 			//_debug_array($headers);
 			$newData = array(
 				'DATE'		=> $headers['DATE'],
-				'SUBJECT'	=> ($decode ? self::decode_header($headers['SUBJECT']):$headers['SUBJECT']),
+				'SUBJECT'	=> ($decode ? self::decode_header($headers['SUBJECT']) : $headers['SUBJECT']),
 				'MESSAGE_ID'	=> $headers['MESSAGE-ID']
 			);
 			if (isset($headers['IN-REPLY-TO'])) $newData['IN-REPLY-TO'] = $headers['IN-REPLY-TO'];
@@ -5156,11 +5156,11 @@ 
 			if (isset($headers['SIZE'])) $newData['SIZE'] = $headers['SIZE'];
 			//_debug_array($newData);
 			$recepientList = array('FROM', 'TO', 'CC', 'BCC', 'SENDER', 'REPLY-TO');
-			foreach($recepientList as $recepientType) {
-				if(isset($headers[$recepientType])) {
-					if ($decode) $headers[$recepientType] =  self::decode_header($headers[$recepientType],true);
+			foreach ($recepientList as $recepientType) {
+				if (isset($headers[$recepientType])) {
+					if ($decode) $headers[$recepientType] = self::decode_header($headers[$recepientType], true);
 					//error_log(__METHOD__.__LINE__." ".$recepientType."->".array2string($headers[$recepientType]));
-					foreach(self::parseAddressList($headers[$recepientType]) as $singleAddress) {
+					foreach (self::parseAddressList($headers[$recepientType]) as $singleAddress) {
 						$addressData = array(
 							'PERSONAL_NAME'		=> $singleAddress->personal ? $singleAddress->personal : 'NIL',
 							'AT_DOMAIN_LIST'	=> $singleAddress->adl ? $singleAddress->adl : 'NIL',
@@ -5168,15 +5168,15 @@ 
 							'HOST_NAME'		=> $singleAddress->host ? $singleAddress->host : 'NIL',
 							'EMAIL'			=> $singleAddress->host ? $singleAddress->mailbox.'@'.$singleAddress->host : $singleAddress->mailbox,
 						);
-						if($addressData['PERSONAL_NAME'] != 'NIL') {
+						if ($addressData['PERSONAL_NAME'] != 'NIL') {
 							$addressData['RFC822_EMAIL'] = imap_rfc822_write_address($singleAddress->mailbox, $singleAddress->host, $singleAddress->personal);
 						} else {
 							$addressData['RFC822_EMAIL'] = 'NIL';
 						}
-						$newData[$recepientType][] = ($addressData['RFC822_EMAIL']!='NIL'?$addressData['RFC822_EMAIL']:$addressData['EMAIL']);//$addressData;
+						$newData[$recepientType][] = ($addressData['RFC822_EMAIL'] != 'NIL' ? $addressData['RFC822_EMAIL'] : $addressData['EMAIL']); //$addressData;
 					}
 				} else {
-					if($recepientType == 'SENDER' || $recepientType == 'REPLY-TO') {
+					if ($recepientType == 'SENDER' || $recepientType == 'REPLY-TO') {
 						$newData[$recepientType] = $newData['FROM'];
 					} else {
 						$newData[$recepientType] = array();
@@ -5198,10 +5198,10 @@ 
 	 * @param string $_folder folder to work on
 	 * @return array|Horde_Mime_Headers message header as array or object
 	 */
-	function getMessageHeader($_uid, $_partID = '',$decode=false, $preserveUnSeen=false, $_folder='')
+	function getMessageHeader($_uid, $_partID = '', $decode = false, $preserveUnSeen = false, $_folder = '')
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.':'.$_uid.', '.$_partID.', '.$decode.', '.$preserveUnSeen.', '.$_folder);
-		if (empty($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		if (empty($_folder)) $_folder = ($this->sessionData['mailbox'] ? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
 		$uidsToFetch = new Horde_Imap_Client_Ids();
 		if (!(is_object($_uid) || is_array($_uid))) $_uid = (array)$_uid;
 		$uidsToFetch->add($_uid);
@@ -5209,7 +5209,7 @@ 
 		$fquery = new Horde_Imap_Client_Fetch_Query();
 		if ($_partID != '')
 		{
-			$fquery->headerText(array('id'=>$_partID,'peek'=>$preserveUnSeen));
+			$fquery->headerText(array('id'=>$_partID, 'peek'=>$preserveUnSeen));
 			$fquery->structure();
 		}
 		else
@@ -5222,18 +5222,18 @@ 
 			'ids' => $uidsToFetch,
 		));
 		if (is_object($headersNew)) {
-			foreach($headersNew as $_fetchObject)
+			foreach ($headersNew as $_fetchObject)
 			{
-				$headers = $_fetchObject->getHeaderText(0,Horde_Imap_Client_Data_Fetch::HEADER_PARSE);
+				$headers = $_fetchObject->getHeaderText(0, Horde_Imap_Client_Data_Fetch::HEADER_PARSE);
 				if ($_partID != '')
 				{
 					$mailStructureObject = $_fetchObject->getStructure();
 					foreach ($mailStructureObject->contentTypeMap() as $mime_id => $mime_type)
 					{
-						if ($mime_id==$_partID)
+						if ($mime_id == $_partID)
 						{
 							//error_log(__METHOD__.' ('.__LINE__.') '."$mime_id == $_partID".array2string($_headerObject->getHeaderText($mime_id,Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->toArray()));
-							$headers = $_fetchObject->getHeaderText($mime_id,Horde_Imap_Client_Data_Fetch::HEADER_PARSE);
+							$headers = $_fetchObject->getHeaderText($mime_id, Horde_Imap_Client_Data_Fetch::HEADER_PARSE);
 							break;
 						}
 					}
@@ -5246,15 +5246,15 @@ 
 				if (is_object($headers)) $headers->setUserAgent('EGroupware API '.$GLOBALS['egw_info']['server']['versions']['phpgwapi']);
 				return $headers;
 			}
-			$retValue = is_object($headers) ? $headers->toArray():array();
+			$retValue = is_object($headers) ? $headers->toArray() : array();
 			if ($size) $retValue['size'] = $size;
 		}
-		$retValue = array_change_key_case($retValue,CASE_UPPER);
+		$retValue = array_change_key_case($retValue, CASE_UPPER);
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($retValue));
 		// if SUBJECT is an array, use thelast one, as we assume something with the unfolding for the subject did not work
 		if (is_array($retValue['SUBJECT']))
 		{
-			$retValue['SUBJECT'] = $retValue['SUBJECT'][count($retValue['SUBJECT'])-1];
+			$retValue['SUBJECT'] = $retValue['SUBJECT'][count($retValue['SUBJECT']) - 1];
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.':'.array2string($decode ? self::decode_header($retValue,true):$retValue));
 		if ($decode)
@@ -5262,7 +5262,7 @@ 
 			foreach ($retValue as $key => $rvV)
 			{
 				//try idn conversion only on 'FROM', 'TO', 'CC', 'BCC', 'SENDER', 'REPLY-TO'
-				$retValue[$key]=self::decode_header($rvV,in_array($key,array('FROM', 'TO', 'CC', 'BCC', 'SENDER', 'REPLY-TO')));
+				$retValue[$key] = self::decode_header($rvV, in_array($key, array('FROM', 'TO', 'CC', 'BCC', 'SENDER', 'REPLY-TO')));
 			}
 		}
 		return $retValue;
@@ -5279,14 +5279,14 @@ 
 	function getMessageRawHeader($_uid, $_partID = '', $_folder = '')
 	{
 		static $rawHeaders;
-		if (empty($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		if (empty($_folder)) $_folder = ($this->sessionData['mailbox'] ? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
 		//error_log(__METHOD__.' ('.__LINE__.') '." Try Using Cache for raw Header $_uid, $_partID in Folder $_folder");
 
-		if (is_null($rawHeaders)||!is_array($rawHeaders)) $rawHeaders = Cache::getCache(Cache::INSTANCE,'email','rawHeadersCache'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
-		if (isset($rawHeaders[$this->icServer->ImapServerId][(string)$_folder][$_uid][(empty($_partID)?'NIL':$_partID)]))
+		if (is_null($rawHeaders) || !is_array($rawHeaders)) $rawHeaders = Cache::getCache(Cache::INSTANCE, 'email', 'rawHeadersCache'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 1);
+		if (isset($rawHeaders[$this->icServer->ImapServerId][(string)$_folder][$_uid][(empty($_partID) ? 'NIL' : $_partID)]))
 		{
 			//error_log(__METHOD__.' ('.__LINE__.') '." Using Cache for raw Header $_uid, $_partID in Folder $_folder");
-			return $rawHeaders[$this->icServer->ImapServerId][(string)$_folder][$_uid][(empty($_partID)?'NIL':$_partID)];
+			return $rawHeaders[$this->icServer->ImapServerId][(string)$_folder][$_uid][(empty($_partID) ? 'NIL' : $_partID)];
 		}
 		$uidsToFetch = new Horde_Imap_Client_Ids();
 		$uid = $_uid;
@@ -5296,7 +5296,7 @@ 
 		$fquery = new Horde_Imap_Client_Fetch_Query();
 		if ($_partID != '')
 		{
-			$fquery->headerText(array('id'=>$_partID,'peek'=>true));
+			$fquery->headerText(array('id'=>$_partID, 'peek'=>true));
 			$fquery->structure();
 		}
 		else
@@ -5307,14 +5307,14 @@ 
 			'ids' => $uidsToFetch,
 		));
 		if (is_object($headersNew)) {
-			foreach($headersNew as &$_headerObject) {
+			foreach ($headersNew as &$_headerObject) {
 				$retValue = $_headerObject->getHeaderText();
 				if ($_partID != '')
 				{
 					$mailStructureObject = $_headerObject->getStructure();
 					foreach ($mailStructureObject->contentTypeMap() as $mime_id => $mime_type)
 					{
-						if ($mime_id==$_partID)
+						if ($mime_id == $_partID)
 						{
 							$retValue = $_headerObject->getHeaderText($mime_id);
 						}
@@ -5322,8 +5322,8 @@ 
 				}
 			}
 		}
-		$rawHeaders[$this->icServer->ImapServerId][(string)$_folder][$_uid][(empty($_partID)?'NIL':$_partID)]=$retValue;
-		Cache::setCache(Cache::INSTANCE,'email','rawHeadersCache'.trim($GLOBALS['egw_info']['user']['account_id']),$rawHeaders,60*60*1);
+		$rawHeaders[$this->icServer->ImapServerId][(string)$_folder][$_uid][(empty($_partID) ? 'NIL' : $_partID)] = $retValue;
+		Cache::setCache(Cache::INSTANCE, 'email', 'rawHeadersCache'.trim($GLOBALS['egw_info']['user']['account_id']), $rawHeaders, 60 * 60 * 1);
 		return $retValue;
 	}
 
@@ -5336,25 +5336,25 @@ 
 	{
 		$style = '';
 		if (empty($_bodyParts)) return "";
-		foreach((array)$_bodyParts as $singleBodyPart) {
+		foreach ((array)$_bodyParts as $singleBodyPart) {
 			if (!isset($singleBodyPart['body'])) {
 				$singleBodyPart['body'] = self::getStyles($singleBodyPart);
 				$style .= $singleBodyPart['body'];
 				continue;
 			}
 
-			if ($singleBodyPart['charSet']===false) $singleBodyPart['charSet'] = Translation::detect_encoding($singleBodyPart['body']);
+			if ($singleBodyPart['charSet'] === false) $singleBodyPart['charSet'] = Translation::detect_encoding($singleBodyPart['body']);
 			$singleBodyPart['body'] = Translation::convert(
 				$singleBodyPart['body'],
 				strtolower($singleBodyPart['charSet'])
 			);
 			$ct = 0;
-			$newStyle=array();
-			if (stripos($singleBodyPart['body'],'<style')!==false)  $ct = preg_match_all('#<style(?:\s.*)?>(.+)</style>#isU', $singleBodyPart['body'], $newStyle);
-			if ($ct>0)
+			$newStyle = array();
+			if (stripos($singleBodyPart['body'], '<style') !== false)  $ct = preg_match_all('#<style(?:\s.*)?>(.+)</style>#isU', $singleBodyPart['body'], $newStyle);
+			if ($ct > 0)
 			{
 				//error_log(__METHOD__.' ('.__LINE__.') '.'#'.$ct.'#'.array2string($newStyle));
-				$style2buffer = implode('',$newStyle[0]);
+				$style2buffer = implode('', $newStyle[0]);
 			}
 			if ($style2buffer && strtoupper(self::$displayCharset) == 'UTF-8')
 			{
@@ -5362,7 +5362,7 @@ 
 				$test = json_encode($style2buffer);
 				//error_log(__METHOD__.' ('.__LINE__.') '.'#'.$test.'# ->'.strlen($style2buffer).' Error:'.json_last_error());
 				//if (json_last_error() != JSON_ERROR_NONE && strlen($style2buffer)>0)
-				if ($test=="null" && strlen($style2buffer)>0)
+				if ($test == "null" && strlen($style2buffer) > 0)
 				{
 					// this should not be needed, unless something fails with charset detection/ wrong charset passed
 					error_log(__METHOD__.' ('.__LINE__.') '.' Found Invalid sequence for utf-8 in CSS:'.$style2buffer.' Charset Reported:'.$singleBodyPart['charSet'].' Carset Detected:'.Translation::detect_encoding($style2buffer));
@@ -5373,19 +5373,19 @@ 
 		}
 		// clean out comments and stuff
 		$search = array(
-			'@url\(http:\/\/[^\)].*?\)@si',  // url calls e.g. in style definitions
+			'@url\(http:\/\/[^\)].*?\)@si', // url calls e.g. in style definitions
 //			'@<!--[\s\S]*?[ \t\n\r]*-->@',   // Strip multi-line comments including CDATA
 //			'@<!--[\s\S]*?[ \t\n\r]*--@',    // Strip broken multi-line comments including CDATA
 		);
-		$style = preg_replace($search,"",$style);
+		$style = preg_replace($search, "", $style);
 
 		// CSS Security
 		// http://code.google.com/p/browsersec/wiki/Part1#Cascading_stylesheets
-		$css = preg_replace('/(javascript|expression|-moz-binding)/i','',$style);
-		if (stripos($css,'script')!==false) Mail\Html::replaceTagsCompletley($css,'script'); // Strip out script that may be included
+		$css = preg_replace('/(javascript|expression|-moz-binding)/i', '', $style);
+		if (stripos($css, 'script') !== false) Mail\Html::replaceTagsCompletley($css, 'script'); // Strip out script that may be included
 		// we need this, as styledefinitions are enclosed with curly brackets; and template stuff tries to replace everything between curly brackets that is having no horizontal whitespace
 		// as the comments as <!-- styledefinition --> in stylesheet are outdated, and ck-editor does not understand it, we remove it
-		$css = str_replace(array(':','<!--','-->'),array(': ','',''),$css);
+		$css = str_replace(array(':', '<!--', '-->'), array(': ', '', ''), $css);
 		//error_log(__METHOD__.' ('.__LINE__.') '.$css);
 		// TODO: we may have to strip urls and maybe comments and ifs
 		return $css;
@@ -5399,16 +5399,16 @@ 
 	 * @param string $_folder folder to work on
 	 * @return string the message body
 	 */
-	function getMessageRawBody($_uid, $_partID = '', $_folder='')
+	function getMessageRawBody($_uid, $_partID = '', $_folder = '')
 	{
 		//TODO: caching einbauen static!
 		static $rawBody;
 		if (is_null($rawBody)) $rawBody = array();
-		if (empty($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
-		if (isset($rawBody[$this->icServer->ImapServerId][$_folder][$_uid][(empty($_partID)?'NIL':$_partID)]))
+		if (empty($_folder)) $_folder = ($this->sessionData['mailbox'] ? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		if (isset($rawBody[$this->icServer->ImapServerId][$_folder][$_uid][(empty($_partID) ? 'NIL' : $_partID)]))
 		{
 			//error_log(__METHOD__.' ('.__LINE__.') '." Using Cache for raw Body $_uid, $_partID in Folder $_folder");
-			return $rawBody[$this->icServer->ImapServerId][$_folder][$_uid][(empty($_partID)?'NIL':$_partID)];
+			return $rawBody[$this->icServer->ImapServerId][$_folder][$_uid][(empty($_partID) ? 'NIL' : $_partID)];
 		}
 
 		$uidsToFetch = new Horde_Imap_Client_Ids();
@@ -5421,13 +5421,13 @@ 
 		if ($_partID != '')
 		{
 			$fquery->structure();
-			$fquery->bodyPart($_partID,array('peek'=>true));
+			$fquery->bodyPart($_partID, array('peek'=>true));
 		}
 		$headersNew = $this->icServer->fetch($_folder, $fquery, array(
 			'ids' => $uidsToFetch,
 		));
 		if (is_object($headersNew)) {
-			foreach($headersNew as &$_headerObject) {
+			foreach ($headersNew as &$_headerObject) {
 				$body = $_headerObject->getFullMsg();
 				if ($_partID != '')
 				{
@@ -5435,7 +5435,7 @@ 
 					//_debug_array($mailStructureObject->contentTypeMap());
 					foreach ($mailStructureObject->contentTypeMap() as $mime_id => $mime_type)
 					{
-						if ($mime_id==$_partID)
+						if ($mime_id == $_partID)
 						{
 							$body = $_headerObject->getBodyPart($mime_id);
 						}
@@ -5444,7 +5444,7 @@ 
 			}
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '."[$this->icServer->ImapServerId][$_folder][$_uid][".(empty($_partID)?'NIL':$_partID)."]");
-		$rawBody[$this->icServer->ImapServerId][$_folder][$_uid][(empty($_partID)?'NIL':$_partID)] = $body;
+		$rawBody[$this->icServer->ImapServerId][$_folder][$_uid][(empty($_partID) ? 'NIL' : $_partID)] = $body;
 		return $body;
 	}
 
@@ -5458,13 +5458,13 @@ 
 	 * @param Horde_Imap_Client_Fetch_Query $fquery=null default query just structure
 	 * @return Horde_Mime_Part
 	 */
-	function getStructure($_uid, $_partID=null, $_folder=null, $_preserveSeen=false)
+	function getStructure($_uid, $_partID = null, $_folder = null, $_preserveSeen = false)
 	{
-		if (self::$debug) error_log( __METHOD__.' ('.__LINE__.') '.":$_uid, $_partID");
+		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.":$_uid, $_partID");
 
 		if (empty($_folder))
 		{
-			$_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+			$_folder = ($this->sessionData['mailbox'] ? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
 		}
 		$uidsToFetch = new Horde_Imap_Client_Ids();
 		if (!(is_object($_uid) || is_array($_uid))) $_uid = (array)$_uid;
@@ -5482,7 +5482,7 @@ 
 				'ids' => $uidsToFetch,
 			))->first();
 
-			return is_object($mail)?$mail->getStructure():null;
+			return is_object($mail) ? $mail->getStructure() : null;
 		}
 		catch (\Exception $e)
 		{
@@ -5505,14 +5505,14 @@ 
 	 * @param string $_folder folder to work on
 	 * @return array  an array of information about the attachment: array of array(name, size, mimeType, partID, encoding)
 	 */
-	function getMessageAttachments($_uid, $_partID=null, Horde_Mime_Part $_structure=null, $fetchEmbeddedImages=true, $fetchTextCalendar=false, $resolveTNEF=true, $_folder='')
+	function getMessageAttachments($_uid, $_partID = null, Horde_Mime_Part $_structure = null, $fetchEmbeddedImages = true, $fetchTextCalendar = false, $resolveTNEF = true, $_folder = '')
 	{
-		if (self::$debug) error_log( __METHOD__.":$_uid, $_partID");
-		if (empty($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		if (self::$debug) error_log(__METHOD__.":$_uid, $_partID");
+		if (empty($_folder)) $_folder = ($this->sessionData['mailbox'] ? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
 		$attachments = array();
 		if (!isset($_structure))
 		{
-			$_structure = $this->getStructure($_uid, $_partID,$_folder,true);
+			$_structure = $this->getStructure($_uid, $_partID, $_folder, true);
 			//error_log(__METHOD__.' ('.__LINE__.') '.':'.print_r($_structure->contentTypeMap(),true));
 		}
 		if (!$_structure || !$_structure->contentTypeMap()) return array();
@@ -5520,7 +5520,7 @@ 
 		$skipParts = array();
 		$tnefParts = array();
 		$skip = 0;
-		foreach($_structure->contentTypeMap() as $mime_id => $mime_type)
+		foreach ($_structure->contentTypeMap() as $mime_id => $mime_type)
 		{
 			// skip multipart/encrypted incl. its two sub-parts, as we show 2. sub-part as body to be decrypted client-side
 			if ($mime_type == 'multipart/encrypted')
@@ -5528,7 +5528,7 @@ 
 				$skip = 2;
 				continue;
 			}
-			elseif($skip)
+			elseif ($skip)
 			{
 				$skip--;
 				continue;
@@ -5542,10 +5542,10 @@ 
 			$partPrimaryType = $part->getPrimaryType();
 			// we only want to retrieve the attachments of the current mail, not those of possible
 			// attached mails
-			if ($mime_type=='message/rfc822' && $_partID!=$mime_id)
+			if ($mime_type == 'message/rfc822' && $_partID != $mime_id)
 			{
 				//error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$uid.'->'.$mime_id.':'.array2string($part->contentTypeMap()));
-				foreach($part->contentTypeMap() as $sub_id => $sub_type) {if ($sub_id != $mime_id) $skipParts[$sub_id] = $sub_type;}
+				foreach ($part->contentTypeMap() as $sub_id => $sub_type) {if ($sub_id != $mime_id) $skipParts[$sub_id] = $sub_type; }
 			}
 			if (empty($partDisposition) && $partPrimaryType != 'multipart' && $partPrimaryType != 'text')
 			{
@@ -5553,27 +5553,27 @@ 
 				// attachment with no link to show the attachment inline.
 				// Considering this: we "list" everything that matches the above criteria
 				// as attachment in order to not loose/miss information on our data
-				$partDisposition='attachment';
+				$partDisposition = 'attachment';
 			}
 			//error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$uid.' Part:'.$_partID.'->'.$mime_id.':'.array2string($skipParts));
-			if (array_key_exists($mime_id,$skipParts)) continue;
+			if (array_key_exists($mime_id, $skipParts)) continue;
 
 			if ($partDisposition == 'attachment' ||
-				(($partDisposition == 'inline' || empty($partDisposition)) && $partPrimaryType == 'image' && $part->getContentId()=='') ||
+				(($partDisposition == 'inline' || empty($partDisposition)) && $partPrimaryType == 'image' && $part->getContentId() == '') ||
 				(($partDisposition == 'inline' || empty($partDisposition)) && $partPrimaryType != 'image' && $partPrimaryType != 'text' && $partPrimaryType != 'multipart') ||
-				($mime_type=='image/tiff') || //always fetch. even if $fetchEmbeddedImages is false. as we cannot display tiffs
+				($mime_type == 'image/tiff') || //always fetch. even if $fetchEmbeddedImages is false. as we cannot display tiffs
 				($fetchEmbeddedImages && ($partDisposition == 'inline' || empty($partDisposition)) && $partPrimaryType == 'image') ||
 				($fetchTextCalendar && $partPrimaryType == 'text' && $part->getSubType() == 'calendar'))
 			{
 				// if type is message/rfc822 and _partID is given, and MimeID equals partID
 				// we attempt to fetch "ourselves"
-				if ($_partID==$part->getMimeId() && $part->getPrimaryType()=='message') continue;
+				if ($_partID == $part->getMimeId() && $part->getPrimaryType() == 'message') continue;
 				$attachment = $part->getAllDispositionParameters();
 				$attachment['disposition'] = $part->getDisposition();
 				$attachment['mimeType'] = $mime_type;
 				$attachment['uid'] = $_uid;
 				$attachment['partID'] = $mime_id;
-				if (!isset($attachment['name'])||empty($attachment['name'])) $attachment['name'] = $part->getName();
+				if (!isset($attachment['name']) || empty($attachment['name'])) $attachment['name'] = $part->getName();
 				if ($fetchTextCalendar)
 				{
 					//error_log(__METHOD__.' ('.__LINE__.') '.array2string($part->getAllContentTypeParameters()));
@@ -5583,11 +5583,11 @@ 
 				}
 				$attachment['size'] = $part->getBytes();
 				if (($cid = $part->getContentId())) $attachment['cid'] = $cid;
-				if (empty($attachment['name'])) $attachment['name'] = (isset($attachment['cid'])&&!empty($attachment['cid'])?$attachment['cid']:lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.MimeMagic::mime2ext($mime_type);
+				if (empty($attachment['name'])) $attachment['name'] = (isset($attachment['cid']) && !empty($attachment['cid']) ? $attachment['cid'] : lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.MimeMagic::mime2ext($mime_type);
 				//error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$uid.' Part:'.$_partID.'->'.$mime_id.':'.array2string($attachment));
 				//typical winmail.dat attachment is
 				//Array([size] => 1462762[filename] => winmail.dat[mimeType] => application/ms-tnef[uid] => 100[partID] => 2[name] => winmail.dat)
-				if ($resolveTNEF && ($attachment['mimeType']=='application/ms-tnef' || !strcasecmp($attachment['name'],'winmail.dat')))
+				if ($resolveTNEF && ($attachment['mimeType'] == 'application/ms-tnef' || !strcasecmp($attachment['name'], 'winmail.dat')))
 				{
 					$tnefParts[] = $attachment;
 				}
@@ -5602,31 +5602,31 @@ 
 			//error_log(__METHOD__.__LINE__.array2string($tnefParts));
 			foreach ($tnefParts as $k => $tnp)
 			{
-				$tnefResolved=false;
-				$tnef_data = $this->getAttachment($tnp['uid'],$tnp['partID'],$k,false);
+				$tnefResolved = false;
+				$tnef_data = $this->getAttachment($tnp['uid'], $tnp['partID'], $k, false);
 				$myTnef = $this->tnef_decoder($tnef_data['attachment']);
 				//error_log(__METHOD__.__LINE__.array2string($myTnef->getParts()));
 				// Note: MimeId starts with 0, almost always, we cannot use that as winmail_id
 				// we need to build Something that meets the needs
 				if ($myTnef)
 				{
-					foreach($myTnef->getParts() as $mime_id => $part)
+					foreach ($myTnef->getParts() as $mime_id => $part)
 					{
-						$tnefResolved=true;
+						$tnefResolved = true;
 						$attachment = $part->getAllDispositionParameters();
 						$attachment['disposition'] = $part->getDisposition();
 						$attachment['mimeType'] = $part->getType();
 						$attachment['uid'] = $tnp['uid'];
 						$attachment['partID'] = $tnp['partID'];
 						$attachment['is_winmail'] = $tnp['uid'].'@'.$tnp['partID'].'@'.$mime_id;
-						if (!isset($attachment['name'])||empty($attachment['name'])) $attachment['name'] = $part->getName();
+						if (!isset($attachment['name']) || empty($attachment['name'])) $attachment['name'] = $part->getName();
 						$attachment['size'] = $part->getBytes();
 						if (($cid = $part->getContentId())) $attachment['cid'] = $cid;
-						if (empty($attachment['name'])) $attachment['name'] = (isset($attachment['cid'])&&!empty($attachment['cid'])?$attachment['cid']:lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.MimeMagic::mime2ext($attachment['mimeType']);
+						if (empty($attachment['name'])) $attachment['name'] = (isset($attachment['cid']) && !empty($attachment['cid']) ? $attachment['cid'] : lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.MimeMagic::mime2ext($attachment['mimeType']);
 						$attachments[] = $attachment;
 					}
 				}
-				if ($tnefResolved===false) $attachments[]=$tnp;
+				if ($tnefResolved === false) $attachments[] = $tnp;
 			}
 		}
 		//error_log(__METHOD__.__LINE__.array2string($attachments));
@@ -5641,9 +5641,9 @@ 
 	 * @return boolean|Horde_Mime_part Multipart/Mixed part decoded attachments |
 	 *	return false if there's no attachments or failure
 	 */
-	public function tnef_decoder( $data )
+	public function tnef_decoder($data)
 	{
-		foreach(array('Horde_Compress', 'Horde_Icalendar', 'Horde_Mapi') as $class)
+		foreach (array('Horde_Compress', 'Horde_Icalendar', 'Horde_Mapi') as $class)
 		{
 			if (!class_exists($class))
 			{
@@ -5675,7 +5675,7 @@ 
 				$tmp_part->setContents($data['stream']);
 				$tmp_part->setDescription($data['name']);
 
-				$type = $data['type'] . '/' . $data['subtype'];
+				$type = $data['type'].'/'.$data['subtype'];
 				if (in_array($type, array('application/octet-stream', 'application/base64')))
 				{
 					$type = Horde_Mime_Magic::filenameToMIME($data['name']);
@@ -5718,24 +5718,24 @@ 
 	 *
 	 * @return array returns an array of all resolved embeded attachments from winmail.dat
 	 */
-	function getTnefAttachments ($_uid, $_partID, $_stream=false)
+	function getTnefAttachments($_uid, $_partID, $_stream = false)
 	{
-		$tnef_data = $this->getAttachment($_uid, $_partID,0,false);
+		$tnef_data = $this->getAttachment($_uid, $_partID, 0, false);
 		$tnef_parts = $this->tnef_decoder($tnef_data['attachment']);
 		$attachments = array();
 		if ($tnef_parts)
 		{
-			foreach($tnef_parts->getParts() as $mime_id => $part)
+			foreach ($tnef_parts->getParts() as $mime_id => $part)
 			{
 
 				$attachment = $part->getAllDispositionParameters();
 				$attachment['mimeType'] = $part->getType();
-				if (!isset($attachment['filename'])||empty($attachment['filename'])) $attachment['filename'] = $part->getName();
+				if (!isset($attachment['filename']) || empty($attachment['filename'])) $attachment['filename'] = $part->getName();
 				if (($cid = $part->getContentId())) $attachment['cid'] = $cid;
 				if (empty($attachment['filename']))
 				{
-					$attachment['filename'] = (isset($attachment['cid'])&&!empty($attachment['cid'])?
-						$attachment['cid']:lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.MimeMagic::mime2ext($attachment['mimeType']);
+					$attachment['filename'] = (isset($attachment['cid']) && !empty($attachment['cid']) ?
+						$attachment['cid'] : lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.MimeMagic::mime2ext($attachment['mimeType']);
 				}
 
 				$attachment['attachment'] = $part->getContents(array('stream'=>$_stream));
@@ -5759,10 +5759,10 @@ 
 	 *
 	 * @return array
 	 */
-	function getAttachment($_uid, $_partID, $_winmail_nr=0, $_returnPart=true, $_stream=false, $_folder=null)
+	function getAttachment($_uid, $_partID, $_winmail_nr = 0, $_returnPart = true, $_stream = false, $_folder = null)
 	{
 		//error_log(__METHOD__.__LINE__."Uid:$_uid, PartId:$_partID, WinMailNr:$_winmail_nr, ReturnPart:$_returnPart, Stream:$_stream, Folder:$_folder".function_backtrace());
-		if (!isset($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		if (!isset($_folder)) $_folder = ($this->sessionData['mailbox'] ? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
 
 		$uidsToFetch = new Horde_Imap_Client_Ids();
 		if (!(is_object($_uid) || is_array($_uid))) $_uid = (array)$_uid;
@@ -5775,36 +5775,36 @@ 
 			'ids' => $uidsToFetch,
 		));
 		if (is_object($headersNew)) {
-			foreach($headersNew as $id=>$_headerObject) {
+			foreach ($headersNew as $id=>$_headerObject) {
 				$body = $_headerObject->getFullMsg();
 				if ($_partID != '')
 				{
 					$mailStructureObject = $_headerObject->getStructure();
 					$mailStructureObject->contentTypeMap();
 					$part = $mailStructureObject->getPart($_partID);
-					$partDisposition = ($part?$part->getDisposition():'failed');
-					if ($partDisposition=='failed')
+					$partDisposition = ($part ? $part->getDisposition() : 'failed');
+					if ($partDisposition == 'failed')
 					{
 						error_log(__METHOD__.'('.__LINE__.'):'.array2string($_uid).','.$_partID.' ID:'.$id.' HObject:'.array2string($_headerObject).' StructureObject:'.array2string($mailStructureObject->contentTypeMap()).'->'.function_backtrace());
 					}
 					// if $partDisposition is empty, we assume attachment, and hope that the function
 					// itself is only triggered to fetch attachments
-					if (empty($partDisposition)) $partDisposition='attachment';
-					if ($part && ($partDisposition=='attachment' || $partDisposition=='inline' || ($part->getPrimaryType() == 'text' && $part->getSubType() == 'calendar')))
+					if (empty($partDisposition)) $partDisposition = 'attachment';
+					if ($part && ($partDisposition == 'attachment' || $partDisposition == 'inline' || ($part->getPrimaryType() == 'text' && $part->getSubType() == 'calendar')))
 					{
 						//$headerObject=$part->getAllDispositionParameters();//not used anywhere around here
 						$structure_mime = $part->getType();
 						$filename = $part->getName();
 						$charset = $part->getContentTypeParameter('charset');
 						//$structure_bytes = $part->getBytes(); $structure_partID=$part->getMimeId(); error_log(__METHOD__.__LINE__." fetchPartContents(".array2string($_uid).", $structure_partID, $_stream, $_preserveSeen,$structure_mime)" );
-						$this->fetchPartContents($_uid, $part, $_stream, $_preserveSeen=true,$structure_mime);
+						$this->fetchPartContents($_uid, $part, $_stream, $_preserveSeen = true, $structure_mime);
 						if ($_returnPart) return $part;
 					}
 				}
 			}
 		}
 		$ext = MimeMagic::mime2ext($structure_mime);
-		if ($ext && stripos($filename,'.')===false && stripos($filename,$ext)===false) $filename = trim($filename).'.'.$ext;
+		if ($ext && stripos($filename, '.') === false && stripos($filename, $ext) === false) $filename = trim($filename).'.'.$ext;
 		if (!$part)
 		{
 			throw new Exception\WrongParameter("Error: Could not fetch attachment for Uid=".array2string($_uid).", PartId=$_partID, WinMailNr=$_winmail_nr, folder=$_folder");
@@ -5822,20 +5822,20 @@ 
 		// try guessing the mimetype, if we get the application/octet-stream
 		if (strtolower($attachmentData['type']) == 'application/octet-stream') $attachmentData['type'] = MimeMagic::filename2mime($attachmentData['filename']);
 		# if the attachment holds a winmail number and is a winmail.dat then we have to handle that.
-		if ( $filename == 'winmail.dat' && $_winmail_nr)
+		if ($filename == 'winmail.dat' && $_winmail_nr)
 		{
 			//by now _uid is of type array
-			$tnefResolved=false;
-			$wantedPart=$_uid[0].'@'.$_partID;
+			$tnefResolved = false;
+			$wantedPart = $_uid[0].'@'.$_partID;
 			$myTnef = $this->tnef_decoder($attachmentData['attachment']);
 			//error_log(__METHOD__.__LINE__.array2string($myTnef->getParts()));
 			// Note: MimeId starts with 0, almost always, we cannot use that as winmail_id
 			// we need to build Something that meets the needs
 			if ($myTnef)
 			{
-				foreach($myTnef->getParts() as $mime_id => $part)
+				foreach ($myTnef->getParts() as $mime_id => $part)
 				{
-					$tnefResolved=true;
+					$tnefResolved = true;
 					$attachment = $part->getAllDispositionParameters();
 					$attachment['mimeType'] = $part->getType();
 					//error_log(__METHOD__.__LINE__.'#'.$mime_id.'#'.$filename.'#'.array2string($attachment));
@@ -5843,9 +5843,9 @@ 
 					if ($_winmail_nr == $wantedPart.'@'.$mime_id)
 					{
 						//error_log(__METHOD__.__LINE__.'#'.$structure_mime.'#'.$filename.'#'.array2string($attachment));
-						if (!isset($attachment['filename'])||empty($attachment['filename'])) $attachment['filename'] = $part->getName();
+						if (!isset($attachment['filename']) || empty($attachment['filename'])) $attachment['filename'] = $part->getName();
 						if (($cid = $part->getContentId())) $attachment['cid'] = $cid;
-						if (empty($attachment['filename'])) $attachment['filename'] = (isset($attachment['cid'])&&!empty($attachment['cid'])?$attachment['cid']:lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.MimeMagic::mime2ext($attachment['mimeType']);
+						if (empty($attachment['filename'])) $attachment['filename'] = (isset($attachment['cid']) && !empty($attachment['cid']) ? $attachment['cid'] : lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.MimeMagic::mime2ext($attachment['mimeType']);
 						$wmattach = $attachment;
 						$wmattach['attachment'] = $part->getContents(array('stream'=>$_stream));
 
@@ -5855,7 +5855,7 @@ 
 			if ($tnefResolved)
 			{
 				$ext = MimeMagic::mime2ext($wmattach['mimeType']);
-				if ($ext && stripos($wmattach['filename'],'.')===false && stripos($wmattach['filename'],$ext)===false) $wmattach['filename'] = trim($wmattach['filename']).'.'.$ext;
+				if ($ext && stripos($wmattach['filename'], '.') === false && stripos($wmattach['filename'], $ext) === false) $wmattach['filename'] = trim($wmattach['filename']).'.'.$ext;
 				$attachmentData = array(
 					'type'       => $wmattach['mimeType'],
 					'filename'   => $wmattach['filename'],
@@ -5879,21 +5879,21 @@ 
 	 *	true:
 	 * @return Horde_Mime_Part
 	 */
-	function getAttachmentByCID($_uid, $_cid, $_part, $_stream=null)
+	function getAttachmentByCID($_uid, $_cid, $_part, $_stream = null)
 	{
 		// some static variables to avoid fetching the same mail multiple times
-		static $uid=null, $part=null, $structure=null;
+		static $uid = null, $part = null, $structure = null;
 		//error_log(__METHOD__.' ('.__LINE__.') '.":$_uid, $_cid, $_part");
 
-		if(empty($_cid)) return false;
+		if (empty($_cid)) return false;
 
 		if ($_uid != $uid || $_part != $part)
 		{
-			$structure = $this->getStructure($uid=$_uid, $part=$_part);
+			$structure = $this->getStructure($uid = $_uid, $part = $_part);
 		}
 		/** @var Horde_Mime_Part */
 		$attachment = null;
-		foreach($structure->contentTypeMap() as $mime_id => $mime_type)
+		foreach ($structure->contentTypeMap() as $mime_id => $mime_type)
 		{
 			$part = $structure->getPart($mime_id);
 
@@ -5945,16 +5945,16 @@ 
 	 * @param string  $_mimetype to decide wether to try to fetch part as binary or not
 	 * @return Horde_Mime_Part
 	 */
-	public function fetchPartContents($_uid, Horde_Mime_Part $part=null, $_stream=false, $_preserveSeen=false, $_mimetype=null)
+	public function fetchPartContents($_uid, Horde_Mime_Part $part = null, $_stream = false, $_preserveSeen = false, $_mimetype = null)
 	{
-		if (is_null($part)) return null;//new Horde_Mime_Part;
+		if (is_null($part)) return null; //new Horde_Mime_Part;
 		$encoding = null;
 		$fetchAsBinary = true;
-		if ($_mimetype && strtolower($_mimetype)=='message/rfc822') $fetchAsBinary = false;
+		if ($_mimetype && strtolower($_mimetype) == 'message/rfc822') $fetchAsBinary = false;
 		// we need to set content on structure to decode transfer encoding
 		$part->setContents(
 			$this->getBodyPart($_uid, $part->getMimeId(), null, $_preserveSeen, $_stream, $encoding, $fetchAsBinary),
-			array('encoding' => (!$fetchAsBinary&&!$encoding?'8bit':$encoding)));
+			array('encoding' => (!$fetchAsBinary && !$encoding ? '8bit' : $encoding)));
 
 		return $part;
 	}
@@ -5972,17 +5972,17 @@ 
 	 * @return the id of the message appended or exception
 	 * @throws Exception\WrongUserinput
 	 */
-	function appendMessage($_folderName, $_header, $_body, $_flags='\\Recent')
+	function appendMessage($_folderName, $_header, $_body, $_flags = '\\Recent')
 	{
 		if (!is_resource($_header))
 		{
-			if (stripos($_header,'message-id:')===false)
+			if (stripos($_header, 'message-id:') === false)
 			{
 				$_header = 'Message-ID: <'.self::getRandomString().'@localhost>'."\n".$_header;
 			}
 			//error_log(__METHOD__.' ('.__LINE__.') '."$_folderName, $_header, $_body, $_flags");
-			$_header = ltrim(str_replace("\n","\r\n",$_header));
-			$_header .= str_replace("\n","\r\n",$_body);
+			$_header = ltrim(str_replace("\n", "\r\n", $_header));
+			$_header .= str_replace("\n", "\r\n", $_body);
 		}
 		// the recent flag is the default enforced here ; as we assume the _flags is always set,
 		// we default it to hordes default (Recent) (, other wise we should not pass the parameter
@@ -6000,7 +6000,7 @@ 
 			// searched for the message-id then returning the uid found
 			//$dataNflags[] = array('data'=>array(array('t'=>'text','v'=>"$header"."$body")), 'flags'=>array($_flags));
 			$dataNflags[] = array('data' => $_header, 'flags'=>array($_flags));
-			$messageid = $this->icServer->append($_folderName,$dataNflags);
+			$messageid = $this->icServer->append($_folderName, $dataNflags);
 		}
 		catch (\Exception $e)
 		{
@@ -6012,7 +6012,7 @@ 
 		//$messageid = true; // for debug reasons only
 		if ($messageid === true || empty($messageid)) // try to figure out the message uid
 		{
-			$list = $this->getHeaders($_folderName, $_startMessage=1, 1, 'INTERNALDATE', true, array(),null, false);
+			$list = $this->getHeaders($_folderName, $_startMessage = 1, 1, 'INTERNALDATE', true, array(), null, false);
 			if ($list)
 			{
 				if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' MessageUid:'.$messageid.' but found:'.array2string($list));
@@ -6052,27 +6052,27 @@ 
 	 *				'attachments'=>$attachments,
 	 *				'headers'=>$headers,; boolean false on failure
 	 */
-	static function get_mailcontent(&$mailClass,$uid,$partid='',$mailbox='', $preserveHTML = false, $addHeaderSection=true, $includeAttachments=true)
+	static function get_mailcontent(&$mailClass, $uid, $partid = '', $mailbox = '', $preserveHTML = false, $addHeaderSection = true, $includeAttachments = true)
 	{
 			//echo __METHOD__." called for $uid,$partid <br>";
-			$headers = $mailClass->getMessageHeader($uid,$partid,true,false,$mailbox);
+			$headers = $mailClass->getMessageHeader($uid, $partid, true, false, $mailbox);
 			if (empty($headers)) return false;
 			// dont force retrieval of the textpart, let mailClass preferences decide
-			$bodyParts = $mailClass->getMessageBody($uid,($preserveHTML?'always_display':'only_if_no_text'),$partid,null,false,$mailbox);
+			$bodyParts = $mailClass->getMessageBody($uid, ($preserveHTML ? 'always_display' : 'only_if_no_text'), $partid, null, false, $mailbox);
 			// if we do not want HTML but there is no TextRepresentation with the message itself, try converting
-			if ( !$preserveHTML && $bodyParts[0]['mimeType']=='text/html')
+			if (!$preserveHTML && $bodyParts[0]['mimeType'] == 'text/html')
 			{
-				foreach($bodyParts as $i => $part)
+				foreach ($bodyParts as $i => $part)
 				{
-					if ($bodyParts[$i]['mimeType']=='text/html')
+					if ($bodyParts[$i]['mimeType'] == 'text/html')
 					{
-						$bodyParts[$i]['body'] = Mail\Html::convertHTMLToText($bodyParts[$i]['body'],$bodyParts[$i]['charSet'],true,$stripalltags=true);
-						$bodyParts[$i]['mimeType']='text/plain';
+						$bodyParts[$i]['body'] = Mail\Html::convertHTMLToText($bodyParts[$i]['body'], $bodyParts[$i]['charSet'], true, $stripalltags = true);
+						$bodyParts[$i]['mimeType'] = 'text/plain';
 					}
 				}
 			}
 			//error_log(array2string($bodyParts));
-			$attachments = $includeAttachments?$mailClass->getMessageAttachments($uid,$partid,null,true,false,true,$mailbox):array();
+			$attachments = $includeAttachments ? $mailClass->getMessageAttachments($uid, $partid, null, true, false, true, $mailbox) : array();
 
 			if ($mailClass->isSentFolder($mailbox)) $mailaddress = $headers['TO'];
 			elseif (isset($headers['FROM'])) $mailaddress = $headers['FROM'];
@@ -6083,7 +6083,7 @@ 
 
 			$message = self::getdisplayableBody($mailClass, $bodyParts, $preserveHTML);
 			if ($preserveHTML && $mailClass->activeMimeType == 'text/plain') $message = '<pre>'.$message.'</pre>';
-			$headdata = ($addHeaderSection ? self::createHeaderInfoSection($headers, '',$preserveHTML) : '');
+			$headdata = ($addHeaderSection ? self::createHeaderInfoSection($headers, '', $preserveHTML) : '');
 			$message = $headdata.$message;
 			//echo __METHOD__.'<br>';
 			//_debug_array($attachments);
@@ -6099,25 +6099,25 @@ 
 						//_debug_array($mailClass->getMessageHeader($uid, $attachment['partID']));
 						//_debug_array($mailClass->getMessageBody($uid,'', $attachment['partID']));
 						//_debug_array($mailClass->getMessageAttachments($uid, $attachment['partID']));
-						$mailcontent = self::get_mailcontent($mailClass,$uid,$attachment['partID'],$mailbox);
-						$headdata ='';
+						$mailcontent = self::get_mailcontent($mailClass, $uid, $attachment['partID'], $mailbox);
+						$headdata = '';
 						if ($mailcontent['headers'])
 						{
-							$headdata = self::createHeaderInfoSection($mailcontent['headers'],'',$preserveHTML);
+							$headdata = self::createHeaderInfoSection($mailcontent['headers'], '', $preserveHTML);
 						}
 						if ($mailcontent['message'])
 						{
-							$tempname =tempnam($GLOBALS['egw_info']['server']['temp_dir'],$GLOBALS['egw_info']['flags']['currentapp']."_");
+							$tempname = tempnam($GLOBALS['egw_info']['server']['temp_dir'], $GLOBALS['egw_info']['flags']['currentapp']."_");
 							$attachedMessages[] = array(
 								'type' => 'TEXT/PLAIN',
 								'name' => $mailcontent['subject'].'.txt',
 								'tmp_name' => $tempname,
 							);
-							$tmpfile = fopen($tempname,'w');
-							fwrite($tmpfile,$headdata.$mailcontent['message']);
+							$tmpfile = fopen($tempname, 'w');
+							fwrite($tmpfile, $headdata.$mailcontent['message']);
 							fclose($tmpfile);
 						}
-						foreach($mailcontent['attachments'] as &$tmpval)
+						foreach ($mailcontent['attachments'] as &$tmpval)
 						{
 							$attachedMessages[] = $tmpval;
 						}
@@ -6125,36 +6125,36 @@ 
 					}
 					else
 					{
-						$attachments[$num] = array_merge($attachments[$num],$mailClass->getAttachment($uid, $attachment['partID'],0,false,false));
+						$attachments[$num] = array_merge($attachments[$num], $mailClass->getAttachment($uid, $attachment['partID'], 0, false, false));
 
-						if (empty($attachments[$num]['attachment'])&&$attachments[$num]['cid'])
+						if (empty($attachments[$num]['attachment']) && $attachments[$num]['cid'])
 						{
-							$c = $mailClass->getAttachmentByCID($uid, $attachment['cid'], $attachment['partID'],true);
+							$c = $mailClass->getAttachmentByCID($uid, $attachment['cid'], $attachment['partID'], true);
 							$attachments[$num]['attachment'] = $c->getContents();
 						}
 						// no attempt to convert, if we dont know about the charset
-						if (isset($attachments[$num]['charset'])&&!empty($attachments[$num]['charset'])) {
+						if (isset($attachments[$num]['charset']) && !empty($attachments[$num]['charset'])) {
 							// we do not try guessing the charset, if it is not set
 							//if ($attachments[$num]['charset']===false) $attachments[$num]['charset'] = Translation::detect_encoding($attachments[$num]['attachment']);
-							Translation::convert($attachments[$num]['attachment'],$attachments[$num]['charset']);
+							Translation::convert($attachments[$num]['attachment'], $attachments[$num]['charset']);
 						}
-						if(in_array($attachments[$num]['name'], $file_list))
+						if (in_array($attachments[$num]['name'], $file_list))
 						{
 							$dupe_count[$attachments[$num]['name']]++;
-							$attachments[$num]['name'] = pathinfo($attachments[$num]['name'], PATHINFO_FILENAME) .
-								' ('.($dupe_count[$attachments[$num]['name']] + 1).')' . '.' .
+							$attachments[$num]['name'] = pathinfo($attachments[$num]['name'], PATHINFO_FILENAME).
+								' ('.($dupe_count[$attachments[$num]['name']] + 1).')'.'.'.
 								pathinfo($attachments[$num]['name'], PATHINFO_EXTENSION);
 						}
 						$attachments[$num]['type'] = $attachments[$num]['mimeType'];
-						$attachments[$num]['tmp_name'] = tempnam($GLOBALS['egw_info']['server']['temp_dir'],$GLOBALS['egw_info']['flags']['currentapp']."_");
-						$tmpfile = fopen($attachments[$num]['tmp_name'],'w');
-						fwrite($tmpfile,$attachments[$num]['attachment']);
+						$attachments[$num]['tmp_name'] = tempnam($GLOBALS['egw_info']['server']['temp_dir'], $GLOBALS['egw_info']['flags']['currentapp']."_");
+						$tmpfile = fopen($attachments[$num]['tmp_name'], 'w');
+						fwrite($tmpfile, $attachments[$num]['attachment']);
 						fclose($tmpfile);
 						$file_list[] = $attachments[$num]['name'];
 						unset($attachments[$num]['attachment']);
 					}
 				}
-				if (is_array($attachedMessages)) $attachments = array_merge($attachments,$attachedMessages);
+				if (is_array($attachedMessages)) $attachments = array_merge($attachments, $attachedMessages);
 			}
 			return array(
 					'mailaddress'=>$mailaddress,
@@ -6176,10 +6176,10 @@ 
 	{
 		$c = 0;
 		// use the standardIdentity
-		foreach($_identities as $key => $acc) {
-			if ($c==0) $identity = $acc;
+		foreach ($_identities as $key => $acc) {
+			if ($c == 0) $identity = $acc;
 			//error_log(__METHOD__.__LINE__." $key == $_profile_id ");
-			if ($key==$_profile_id) $identity = $acc;
+			if ($key == $_profile_id) $identity = $acc;
 			$c++;
 		}
 		return $identity;
@@ -6191,29 +6191,29 @@ 
 	 * @param bool createHTML do it with HTML breaks
 	 * @return string a preformatted string with the information of the header worked into it
 	 */
-	static function createHeaderInfoSection($header,$headline='', $createHTML = false)
+	static function createHeaderInfoSection($header, $headline = '', $createHTML = false)
 	{
 		$headdata = null;
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($header).function_backtrace());
-		if ($header['SUBJECT']) $headdata = lang('subject').': '.$header['SUBJECT'].($createHTML?"<br />":"\n");
-		if ($header['FROM']) $headdata .= lang('from').': '.self::convertAddressArrayToString($header['FROM'], $createHTML).($createHTML?"<br />":"\n");
-		if ($header['SENDER']) $headdata .= lang('sender').': '.self::convertAddressArrayToString($header['SENDER'], $createHTML).($createHTML?"<br />":"\n");
-		if ($header['TO']) $headdata .= lang('to').': '.self::convertAddressArrayToString($header['TO'], $createHTML).($createHTML?"<br />":"\n");
-		if ($header['CC']) $headdata .= lang('cc').': '.self::convertAddressArrayToString($header['CC'], $createHTML).($createHTML?"<br />":"\n");
-		if ($header['BCC']) $headdata .= lang('bcc').': '.self::convertAddressArrayToString($header['BCC'], $createHTML).($createHTML?"<br />":"\n");
-		if ($header['DATE']) $headdata .= lang('date').': '.$header['DATE'].($createHTML?"<br />":"\n");
-		if ($header['PRIORITY'] && $header['PRIORITY'] != 'normal') $headdata .= lang('priority').': '.$header['PRIORITY'].($createHTML?"<br />":"\n");
-		if ($header['IMPORTANCE'] && $header['IMPORTANCE'] !='normal') $headdata .= lang('importance').': '.$header['IMPORTANCE'].($createHTML?"<br />":"\n");
+		if ($header['SUBJECT']) $headdata = lang('subject').': '.$header['SUBJECT'].($createHTML ? "<br />" : "\n");
+		if ($header['FROM']) $headdata .= lang('from').': '.self::convertAddressArrayToString($header['FROM'], $createHTML).($createHTML ? "<br />" : "\n");
+		if ($header['SENDER']) $headdata .= lang('sender').': '.self::convertAddressArrayToString($header['SENDER'], $createHTML).($createHTML ? "<br />" : "\n");
+		if ($header['TO']) $headdata .= lang('to').': '.self::convertAddressArrayToString($header['TO'], $createHTML).($createHTML ? "<br />" : "\n");
+		if ($header['CC']) $headdata .= lang('cc').': '.self::convertAddressArrayToString($header['CC'], $createHTML).($createHTML ? "<br />" : "\n");
+		if ($header['BCC']) $headdata .= lang('bcc').': '.self::convertAddressArrayToString($header['BCC'], $createHTML).($createHTML ? "<br />" : "\n");
+		if ($header['DATE']) $headdata .= lang('date').': '.$header['DATE'].($createHTML ? "<br />" : "\n");
+		if ($header['PRIORITY'] && $header['PRIORITY'] != 'normal') $headdata .= lang('priority').': '.$header['PRIORITY'].($createHTML ? "<br />" : "\n");
+		if ($header['IMPORTANCE'] && $header['IMPORTANCE'] != 'normal') $headdata .= lang('importance').': '.$header['IMPORTANCE'].($createHTML ? "<br />" : "\n");
 		//if ($mailcontent['headers']['ORGANIZATION']) $headdata .= lang('organization').': '.$mailcontent['headers']['ORGANIZATION']."\
 		if (!empty($headdata))
 		{
-			if (!empty($headline) && $headline != 'SUPPRESS') $headdata = "---------------------------- $headline ----------------------------".($createHTML?"<br />":"\n").$headdata;
-			if (empty($headline)) $headdata = ($headline != 'SUPPRESS'?"--------------------------------------------------------".($createHTML?"<br />":"\n"):'').$headdata;
-			$headdata .= ($headline != 'SUPPRESS'?"--------------------------------------------------------".($createHTML?"<br />":"\n"):'');
+			if (!empty($headline) && $headline != 'SUPPRESS') $headdata = "---------------------------- $headline ----------------------------".($createHTML ? "<br />" : "\n").$headdata;
+			if (empty($headline)) $headdata = ($headline != 'SUPPRESS' ? "--------------------------------------------------------".($createHTML ? "<br />" : "\n") : '').$headdata;
+			$headdata .= ($headline != 'SUPPRESS' ? "--------------------------------------------------------".($createHTML ? "<br />" : "\n") : '');
 		}
 		else
 		{
-			$headdata = ($headline != 'SUPPRESS'?"--------------------------------------------------------".($createHTML?"<br />":"\n"):'');
+			$headdata = ($headline != 'SUPPRESS' ? "--------------------------------------------------------".($createHTML ? "<br />" : "\n") : '');
 		}
 		return $headdata;
 	}
@@ -6226,8 +6226,8 @@ 
 	 */
 	static function adaptSubjectForImport($subject)
 	{
-		$subject = str_replace('$$','__',($subject?$subject:lang('(no subject)')));
-		$subject = str_ireplace(array('[FWD]','[',']','{','}','<','>'),array('Fwd:',' ',' ',' ',' ',' ',' '),trim($subject));
+		$subject = str_replace('$$', '__', ($subject ? $subject : lang('(no subject)')));
+		$subject = str_ireplace(array('[FWD]', '[', ']', '{', '}', '<', '>'), array('Fwd:', ' ', ' ', ' ', ' ', ' ', ' '), trim($subject));
 		return $subject;
 	}
 
@@ -6239,15 +6239,15 @@ 
 	static function convertAddressArrayToString($rfcAddressArray)
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($rfcAddressArray));
-		$returnAddr ='';
+		$returnAddr = '';
 		if (is_array($rfcAddressArray))
 		{
-			foreach((array)$rfcAddressArray as $addressData) {
+			foreach ((array)$rfcAddressArray as $addressData) {
 				//error_log(__METHOD__.' ('.__LINE__.') '.array2string($addressData));
-				if($addressData['MAILBOX_NAME'] == 'NIL') {
+				if ($addressData['MAILBOX_NAME'] == 'NIL') {
 					continue;
 				}
-				if(strtolower($addressData['MAILBOX_NAME']) == 'undisclosed-recipients') {
+				if (strtolower($addressData['MAILBOX_NAME']) == 'undisclosed-recipients') {
 					continue;
 				}
 				if ($addressData['RFC822_EMAIL'])
@@ -6256,7 +6256,7 @@ 
 				}
 				else
 				{
-					$emailaddress = ($addressData['PERSONAL_NAME']?$addressData['PERSONAL_NAME'].' <'.$addressData['EMAIL'].'>':$addressData['EMAIL']);
+					$emailaddress = ($addressData['PERSONAL_NAME'] ? $addressData['PERSONAL_NAME'].' <'.$addressData['EMAIL'].'>' : $addressData['EMAIL']);
 					$addressObjectA = self::parseAddressList($emailaddress);
 				}
 				$addressObject = $addressObjectA[0];
@@ -6265,10 +6265,10 @@ 
 				//$mb =(string)$addressObject->mailbox;
 				//$h = (string)$addressObject->host;
 				//$p = (string)$addressObject->personal;
-				$returnAddr .= (strlen($returnAddr)>0?',':'');
+				$returnAddr .= (strlen($returnAddr) > 0 ? ',' : '');
 				//error_log(__METHOD__.' ('.__LINE__.') '.$p.' <'.$mb.'@'.$h.'>');
 				$buff = imap_rfc822_write_address($addressObject->mailbox, Horde_Idna::decode($addressObject->host), $addressObject->personal);
-				$buff = str_replace(array('<','>','"\'','\'"'),array('[',']','"','"'),$buff);
+				$buff = str_replace(array('<', '>', '"\'', '\'"'), array('[', ']', '"', '"'), $buff);
 				//error_log(__METHOD__.' ('.__LINE__.') '.' Address: '.$returnAddr);
 				$returnAddr .= $buff;
 			}
@@ -6276,8 +6276,8 @@ 
 		else
 		{
 			// do not mess with strings, return them untouched /* ToDo: validate string as Address */
-			$rfcAddressArray = self::decode_header($rfcAddressArray,true);
-			$rfcAddressArray = str_replace(array('<','>','"\'','\'"'),array('[',']','"','"'),$rfcAddressArray);
+			$rfcAddressArray = self::decode_header($rfcAddressArray, true);
+			$rfcAddressArray = str_replace(array('<', '>', '"\'', '\'"'), array('[', ']', '"', '"'), $rfcAddressArray);
 			if (is_string($rfcAddressArray)) return $rfcAddressArray;
 		}
 		return $returnAddr;
@@ -6291,12 +6291,12 @@ 
 	 * @param string &$err error-message on error
 	 * @return string/boolean merged content or false on error
 	 */
-	static function merge($content,$ids,$mimetype='')
+	static function merge($content, $ids, $mimetype = '')
 	{
 		$mergeobj = new Contacts\Merge();
 
-		if (empty($mimetype)) $mimetype = (strlen(strip_tags($content)) == strlen($content) ?'text/plain':'text/html');
-		$rv = $mergeobj->merge_string($content,$ids,$err='',$mimetype, array(), self::$displayCharset);
+		if (empty($mimetype)) $mimetype = (strlen(strip_tags($content)) == strlen($content) ? 'text/plain' : 'text/html');
+		$rv = $mergeobj->merge_string($content, $ids, $err = '', $mimetype, array(), self::$displayCharset);
 		if (empty($rv) && !empty($content) && !empty($err)) $rv = $content;
 		if (!empty($err) && !empty($content) && !empty($ids)) error_log(__METHOD__.' ('.__LINE__.') '.' Merge failed for Ids:'.array2string($ids).' ContentType:'.$mimetype.' Content:'.$content.' Reason:'.array2string($err));
 		return $rv;
@@ -6338,12 +6338,12 @@ 
 		else
 			settype($bytes, 'integer');
 
-		return $bytes . ' ' . $type ;
+		return $bytes.' '.$type;
 	}
 
 	static function detect_qp(&$sting) {
 		$needle = '/(=[0-9][A-F])|(=[A-F][0-9])|(=[A-F][A-F])|(=[0-9][0-9])/';
-		return preg_match("$needle",$string);
+		return preg_match("$needle", $string);
 	}
 
 	/**
@@ -6356,11 +6356,11 @@ 
 	 * @param string $_methodNline - Information where the log was taken
 	 * @return void
 	 */
-	static function logRunTimes($_starttime,$_endtime=null,$_message='',$_methodNline='')
+	static function logRunTimes($_starttime, $_endtime = null, $_message = '', $_methodNline = '')
 	{
 		if (is_null($_endtime)) $_endtime = microtime(true);
 		$usagetime = microtime(true) - $_starttime;
-		if (self::$debugTimes) error_log($_methodNline.' took:'.number_format($usagetime,5).'(s) '.($_message?'Details:'.$_message:''));
+		if (self::$debugTimes) error_log($_methodNline.' took:'.number_format($usagetime, 5).'(s) '.($_message ? 'Details:'.$_message : ''));
 	}
 
 	/**
@@ -6373,9 +6373,9 @@ 
 	 *
 	 * @throws Exception\WrongUserinput
 	 */
-	static function checkFileBasics(&$_formData, $IDtoAddToFileName='', $reqMimeType='message/rfc822')
+	static function checkFileBasics(&$_formData, $IDtoAddToFileName = '', $reqMimeType = 'message/rfc822')
 	{
-		if (parse_url($_formData['file'],PHP_URL_SCHEME) == 'egw-data') return $_formData['file'];
+		if (parse_url($_formData['file'], PHP_URL_SCHEME) == 'egw-data') return $_formData['file'];
 
 		//error_log(__METHOD__.__FILE__.array2string($_formData).' Id:'.$IDtoAddToFileName.' ReqMimeType:'.$reqMimeType);
 		$importfailed = $tmpFileName = false;
@@ -6385,7 +6385,7 @@ 
 			$importfailed = true;
 			$alert_msg .= lang("Empty file %1 ignored.", $_formData['name']);
 		}
-		elseif (parse_url($_formData['file'],PHP_URL_SCHEME) == 'vfs' || is_uploaded_file($_formData['file']) ||
+		elseif (parse_url($_formData['file'], PHP_URL_SCHEME) == 'vfs' || is_uploaded_file($_formData['file']) ||
 			realpath(dirname($_formData['file'])) == realpath($GLOBALS['egw_info']['server']['temp_dir']))
 		{
 			// ensure existance of eGW temp dir
@@ -6393,7 +6393,7 @@ 
 			// and different from any other temp file location set in php.ini
 			if (!file_exists($GLOBALS['egw_info']['server']['temp_dir']))
 			{
-				@mkdir($GLOBALS['egw_info']['server']['temp_dir'],0700);
+				@mkdir($GLOBALS['egw_info']['server']['temp_dir'], 0700);
 			}
 
 			// if we were NOT able to create this temp directory, then make an ERROR report
@@ -6420,14 +6420,14 @@ 
 			// maybe its application/octet-stream -> this may mean that we could not determine the type
 			// so we check for the suffix too
 			// trust vfs mime-types, trust the mimetype if it contains a method
-			if ((substr($_formData['file'],0,6) !== 'vfs://' || $_formData['type'] == 'application/octet-stream') && stripos($_formData['type'],'method=')===false)
+			if ((substr($_formData['file'], 0, 6) !== 'vfs://' || $_formData['type'] == 'application/octet-stream') && stripos($_formData['type'], 'method=') === false)
 			{
-				$buff = explode('.',$_formData['name']);
+				$buff = explode('.', $_formData['name']);
 				$suffix = '';
 				if (is_array($buff)) $suffix = array_pop($buff); // take the last extension to check with ext2mime
 				if (!empty($suffix)) $sfxMimeType = MimeMagic::ext2mime($suffix);
 				if (!empty($suffix) && !empty($sfxMimeType) &&
-					(strlen(trim($_formData['type']))==0 || (strtolower(trim($_formData['type'])) != $sfxMimeType)))
+					(strlen(trim($_formData['type'])) == 0 || (strtolower(trim($_formData['type'])) != $sfxMimeType)))
 				{
 					error_log(__METHOD__.' ('.__LINE__.') '.' Data:'.array2string($_formData));
 					error_log(__METHOD__.' ('.__LINE__.') '.' Form reported Mimetype:'.$_formData['type'].' but seems to be:'.$sfxMimeType);
@@ -6442,13 +6442,13 @@ 
 			if ($reqMimeType)
 			{
 				// so if PHP did not pass any file_type info, then substitute the rfc default value
-				if (substr(strtolower(trim($_formData['type'])),0,strlen($mime_type_default)) != $mime_type_default)
+				if (substr(strtolower(trim($_formData['type'])), 0, strlen($mime_type_default)) != $mime_type_default)
 				{
 					if (!(strtolower(trim($_formData['type'])) == "application/octet-stream" && $sfxMimeType == $reqMimeType))
 					{
 						//error_log("Message rejected, no message/rfc. Is:".$_formData['type']);
 						$importfailed = true;
-						$alert_msg .= lang("File rejected, no %2. Is:%1",$_formData['type'],$reqMimeType);
+						$alert_msg .= lang("File rejected, no %2. Is:%1", $_formData['type'], $reqMimeType);
 					}
 					if ((strtolower(trim($_formData['type'])) != $reqMimeType && $sfxMimeType == $reqMimeType))
 					{
@@ -6457,17 +6457,17 @@ 
 				}
 			}
 			// as FreeBSD seems to have problems with the generated temp names we append some more random stuff
-			$randomString = chr(rand(65,90)).chr(rand(48,57)).chr(rand(65,90)).chr(rand(48,57)).chr(rand(65,90));
+			$randomString = chr(rand(65, 90)).chr(rand(48, 57)).chr(rand(65, 90)).chr(rand(48, 57)).chr(rand(65, 90));
 			$tmpFileName = $GLOBALS['egw_info']['user']['account_id'].
 				trim($IDtoAddToFileName).basename($_formData['file']).'_'.$randomString;
 
-			if (parse_url($_formData['file'],PHP_URL_SCHEME) == 'vfs')
+			if (parse_url($_formData['file'], PHP_URL_SCHEME) == 'vfs')
 			{
-				$tmpFileName = $_formData['file'];	// no need to store it somewhere
+				$tmpFileName = $_formData['file']; // no need to store it somewhere
 			}
 			elseif (is_uploaded_file($_formData['file']))
 			{
-				move_uploaded_file($_formData['file'], $GLOBALS['egw_info']['server']['temp_dir'].'/'.$tmpFileName);	// requirement for safe_mode!
+				move_uploaded_file($_formData['file'], $GLOBALS['egw_info']['server']['temp_dir'].'/'.$tmpFileName); // requirement for safe_mode!
 			}
 			else
 			{
@@ -6476,7 +6476,7 @@ 
 		} else {
 			//error_log("Import of message ".$_formData['file']." failes to meet basic restrictions");
 			$importfailed = true;
-			$alert_msg .= lang("Processing of file %1 failed. Failed to meet basic restrictions.",$_formData['name']);
+			$alert_msg .= lang("Processing of file %1 failed. Failed to meet basic restrictions.", $_formData['name']);
 		}
 		if ($importfailed == true)
 		{
@@ -6484,7 +6484,7 @@ 
 		}
 		else
 		{
-			if (parse_url($tmpFileName,PHP_URL_SCHEME) == 'vfs')
+			if (parse_url($tmpFileName, PHP_URL_SCHEME) == 'vfs')
 			{
 				Vfs::load_wrapper('vfs');
 			}
@@ -6509,7 +6509,7 @@ 
 		$images = null;
 		if (preg_match_all("/(src|background)=\"(.*)\"/Ui", $_html2parse, $images) && isset($images[2]))
 		{
-			foreach($images[2] as $i => $url)
+			foreach ($images[2] as $i => $url)
 			{
 				//$isData = false;
 				$basedir = $data = '';
@@ -6521,20 +6521,20 @@ 
 					$filename = basename($url);
 					if (($directory = dirname($url)) == '.') $directory = '';
 					$ext = pathinfo($filename, PATHINFO_EXTENSION);
-					$mimeType  = MimeMagic::ext2mime($ext);
-					if ( strlen($directory) > 1 && substr($directory,-1) != '/') { $directory .= '/'; }
+					$mimeType = MimeMagic::ext2mime($ext);
+					if (strlen($directory) > 1 && substr($directory, -1) != '/') { $directory .= '/'; }
 					$myUrl = $directory.$filename;
-					if ($myUrl[0]=='/') // local path -> we only allow path's that are available via http/https (or vfs)
+					if ($myUrl[0] == '/') // local path -> we only allow path's that are available via http/https (or vfs)
 					{
-						$basedir = ($_SERVER['HTTPS']?'https://':'http://'.$_SERVER['HTTP_HOST']);
+						$basedir = ($_SERVER['HTTPS'] ? 'https://' : 'http://'.$_SERVER['HTTP_HOST']);
 					}
 					// use vfs instead of url containing webdav.php
 					// ToDo: we should test if the webdav url is of our own scope, as we cannot handle foreign
 					// webdav.php urls as vfs
-					if (strpos($myUrl,'/webdav.php') !== false) // we have a webdav link, so we build a vfs/sqlfs link of it.
+					if (strpos($myUrl, '/webdav.php') !== false) // we have a webdav link, so we build a vfs/sqlfs link of it.
 					{
 						Vfs::load_wrapper('vfs');
-						list(,$myUrl) = explode('/webdav.php',$myUrl,2);
+						list(,$myUrl) = explode('/webdav.php', $myUrl, 2);
 						$basedir = 'vfs://default';
 						$needTempFile = false;
 					}
@@ -6547,11 +6547,11 @@ 
 						// Strips the url and store it into a temp for further procss
 						$tmp_url = html_entity_decode($myUrl);
 
-						parse_str(parse_url($tmp_url, PHP_URL_QUERY),$URI_params);
+						parse_str(parse_url($tmp_url, PHP_URL_QUERY), $URI_params);
 						if ($URI_params['mailbox'] && $URI_params['uid'] && $URI_params['cid'])
 						{
 							$mail_bo->reopen(base64_decode($URI_params['mailbox']));
-							$attachment = $mail_bo->getAttachmentByCID($URI_params['uid'], base64_decode($URI_params['cid']),base64_decode($URI_params['partID']),true);
+							$attachment = $mail_bo->getAttachmentByCID($URI_params['uid'], base64_decode($URI_params['cid']), base64_decode($URI_params['partID']), true);
 							$mail_bo->closeConnection();
 							if ($attachment)
 							{
@@ -6562,32 +6562,32 @@ 
 						}
 					}
 
-					if ( strlen($basedir) > 1 && substr($basedir,-1) != '/' && $myUrl[0]!='/') { $basedir .= '/'; }
-					if ($needTempFile && !$attachment && substr($myUrl,0,4) !== "http") $data = file_get_contents($basedir.urldecode($myUrl));
+					if (strlen($basedir) > 1 && substr($basedir, -1) != '/' && $myUrl[0] != '/') { $basedir .= '/'; }
+					if ($needTempFile && !$attachment && substr($myUrl, 0, 4) !== "http") $data = file_get_contents($basedir.urldecode($myUrl));
 				}
-				if (substr($url,0,strlen('data:'))=='data:')
+				if (substr($url, 0, strlen('data:')) == 'data:')
 				{
 					//error_log(__METHOD__.' ('.__LINE__.') '.' -> '.$i.': '.array2string($images[$i]));
 					// we only support base64 encoded data
-					$tmp = substr($url,strlen('data:'));
-					list($mimeType,$data_base64) = explode(';base64,',$tmp);
+					$tmp = substr($url, strlen('data:'));
+					list($mimeType, $data_base64) = explode(';base64,', $tmp);
 					$data = base64_decode($data_base64);
 					// FF currently does NOT add any mime-type
 					if (strtolower(substr($mimeType, 0, 6)) != 'image/')
 					{
 						$mimeType = MimeMagic::analyze_data($data);
 					}
-					list($what,$exactly) = explode('/',$mimeType);
+					list($what, $exactly) = explode('/', $mimeType);
 					$needTempFile = true;
-					$filename = ($what?$what:'data').$imageC++.'.'.$exactly;
+					$filename = ($what ? $what : 'data').$imageC++.'.'.$exactly;
 				}
 				if ($data || $needTempFile === false)
 				{
 					if ($needTempFile)
 					{
-						$attachment_file =tempnam($GLOBALS['egw_info']['server']['temp_dir'],$GLOBALS['egw_info']['flags']['currentapp']."_");
-						$tmpfile = fopen($attachment_file,'w');
-						fwrite($tmpfile,$data);
+						$attachment_file = tempnam($GLOBALS['egw_info']['server']['temp_dir'], $GLOBALS['egw_info']['flags']['currentapp']."_");
+						$tmpfile = fopen($attachment_file, 'w');
+						fwrite($tmpfile, $data);
 						fclose($tmpfile);
 					}
 					else
@@ -6598,7 +6598,7 @@ 
 					// (or similar) in all cases (when cut&paste). This may lead to more attached files, in case
 					// we use the same image multiple times, but, if we do this, we should try to detect that
 					// on upload. filename itself is not sufficient to determine the sameness of images
-					$cid = 'cid:' . md5($attachment_file);
+					$cid = 'cid:'.md5($attachment_file);
 					if ($_mailObject->AddEmbeddedImage($attachment_file, substr($cid, 4), urldecode($filename), $mimeType) !== null)
 					{
 						//$_html2parse = preg_replace("/".$images[1][$i]."=\"".preg_quote($url, '/')."\"/Ui", $images[1][$i]."=\"".$cid."\"", $_html2parse);
@@ -6620,10 +6620,10 @@ 
 	 * @param string& $importID ID for the imported message, used by attachments to identify them unambiguously
 	 * @return mixed array of messages with success and failed messages or exception
 	 */
-	function importMessageToMergeAndSend(Storage\Merge $bo_merge, $document, $SendAndMergeTocontacts, &$_folder, &$importID='')
+	function importMessageToMergeAndSend(Storage\Merge $bo_merge, $document, $SendAndMergeTocontacts, &$_folder, &$importID = '')
 	{
 		$importfailed = false;
-		$processStats = array('success'=>array(),'failed'=>array());
+		$processStats = array('success'=>array(), 'failed'=>array());
 		if (empty($SendAndMergeTocontacts))
 		{
 			$importfailed = true;
@@ -6664,7 +6664,7 @@ 
 				$_folder = $this->getSentFolder();
 			}
 			$delimiter = $this->getHierarchyDelimiter();
-			if($_folder=='INBOX'.$delimiter) $_folder='INBOX';
+			if ($_folder == 'INBOX'.$delimiter) $_folder = 'INBOX';
 			if ($importfailed === false)
 			{
 				$Subject = $mailObject->getHeader('Subject');
@@ -6682,9 +6682,9 @@ 
 				{
 					$mailObject->clearReplyTos();
 					$activeMailProfiles = $this->mail->getAccountIdentities($this->profileID);
-					$activeMailProfile = self::getStandardIdentityForProfile($activeMailProfiles,$this->profileID);
+					$activeMailProfile = self::getStandardIdentityForProfile($activeMailProfiles, $this->profileID);
 
-					$mailObject->addReplyTo(Horde_Idna::encode($activeMailProfile['ident_email']),Mail::generateIdentityString($activeMailProfile,false));
+					$mailObject->addReplyTo(Horde_Idna::encode($activeMailProfile['ident_email']), Mail::generateIdentityString($activeMailProfile, false));
 				}
 				foreach ($SendAndMergeTocontacts as $k => $val)
 				{
@@ -6698,12 +6698,12 @@ 
 						//error_log(__METHOD__.' ('.__LINE__.') '.array2string($mailObject));
 
 						// Parse destinations for placeholders
-						foreach(Mailer::$type2header as $type => $h)
+						foreach (Mailer::$type2header as $type => $h)
 						{
 							//error_log('ID ' . $val . ' ' .$type . ': ' . $mailObject->getHeader(Mailer::$type2header[$type]) . ' -> ' .$bo_merge->merge_string($mailObject->getHeader(Mailer::$type2header[$type]),$val,$e,'text/plain',array(),self::$displayCharset));
-							$merged = $bo_merge->merge_string($mailObject->getHeader(Mailer::$type2header[$type]),$val,$e,'text/plain',array(),self::$displayCharset);
-							$mailObject->addAddress($merged,'',$type);
-							if($type == 'to')
+							$merged = $bo_merge->merge_string($mailObject->getHeader(Mailer::$type2header[$type]), $val, $e, 'text/plain', array(), self::$displayCharset);
+							$mailObject->addAddress($merged, '', $type);
+							if ($type == 'to')
 							{
 								$email = $merged;
 							}
@@ -6716,26 +6716,26 @@ 
 							//error_log(__METHOD__.' ('.__LINE__.') '.' ID:'.$val.' Data:'.array2string($contact));
 							$email = ($contact['email'] ? $contact['email'] : $contact['email_home']);
 							$nfn = ($contact['n_fn'] ? $contact['n_fn'] : $contact['n_given'].' '.$contact['n_family']);
-							if($email)
+							if ($email)
 							{
 								$mailObject->addAddress(Horde_Idna::encode($email), $nfn);
 							}
 						}
 
 						$activeMailProfiles = $this->getAccountIdentities($this->profileID);
-						$activeMailProfile = self::getStandardIdentityForProfile($activeMailProfiles,$this->profileID);
+						$activeMailProfile = self::getStandardIdentityForProfile($activeMailProfiles, $this->profileID);
 						//error_log(__METHOD__.' ('.__LINE__.') '.array2string($activeMailProfile));
 						$mailObject->setFrom($activeMailProfile['ident_email'],
-							self::generateIdentityString($activeMailProfile,false));
+							self::generateIdentityString($activeMailProfile, false));
 
 						$mailObject->removeHeader('Message-ID');
 						$mailObject->removeHeader('Date');
 						$mailObject->clearCustomHeaders();
 						$mailObject->addHeader('Subject', $bo_merge->merge_string($Subject, $val, $e, 'text/plain', array(), self::$displayCharset));
 						//error_log(__METHOD__.' ('.__LINE__.') '.' ContentType:'.$mailObject->BodyContentType);
-						if($text_body) $text_body->setContents($bo_merge->merge_string($Body, $val, $e, 'text/plain', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+						if ($text_body) $text_body->setContents($bo_merge->merge_string($Body, $val, $e, 'text/plain', array(), self::$displayCharset), array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
 						//error_log(__METHOD__.' ('.__LINE__.') '.' Result:'.$mailObject->Body.' error:'.array2string($e));
-						if($html_body) $html_body->setContents($bo_merge->merge_string($AltBody, $val, $e, 'text/html', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+						if ($html_body) $html_body->setContents($bo_merge->merge_string($AltBody, $val, $e, 'text/html', array(), self::$displayCharset), array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
 
 						//error_log(__METHOD__.' ('.__LINE__.') '.array2string($mailObject));
 						// set a higher timeout for big messages
@@ -6744,7 +6744,7 @@ 
 						try {
 							$mailObject->send();
 						}
-						catch(Exception $e) {
+						catch (Exception $e) {
 							$sendOK = false;
 							$errorInfo = $e->getMessage();
 							//error_log(__METHOD__.' ('.__LINE__.') '.array2string($errorInfo));
@@ -6758,41 +6758,41 @@ 
 						$mailObject->clearCustomHeaders();
 
 						// Parse destinations for placeholders
-						foreach(Mailer::$type2header as $type => $h)
+						foreach (Mailer::$type2header as $type => $h)
 						{
-							$merged = $bo_merge->merge_string($mailObject->getHeader(Mailer::$type2header[$type]),$val,$e,'text/plain',array(),self::$displayCharset);
+							$merged = $bo_merge->merge_string($mailObject->getHeader(Mailer::$type2header[$type]), $val, $e, 'text/plain', array(), self::$displayCharset);
 							//error_log($type . ': ' . $mailObject->getHeader(Mailer::$type2header[$type]) . ' -> ' .$merged);
-							$mailObject->addAddress(trim($merged,'"'),'',$type);
+							$mailObject->addAddress(trim($merged, '"'), '', $type);
 						}
 
 						// No addresses from placeholders?  Treat it as just a contact ID
-						if (count($mailObject->getAddresses('to',true)) == 0 &&
+						if (count($mailObject->getAddresses('to', true)) == 0 &&
 							is_numeric($val) || $GLOBALS['egw']->accounts->name2id($val)) // do the merge
 						{
 							$contact = $bo_merge->contacts->read($val);
 							//error_log(__METHOD__.' ('.__LINE__.') '.array2string($contact));
 							$email = ($contact['email'] ? $contact['email'] : $contact['email_home']);
 							$nfn = ($contact['n_fn'] ? $contact['n_fn'] : $contact['n_given'].' '.$contact['n_family']);
-							if($email)
+							if ($email)
 							{
 								$mailObject->addAddress(Horde_Idna::encode($email), $nfn);
 							}
 						}
 						$mailObject->addHeader('Subject', $bo_merge->merge_string($Subject, $val, $e, 'text/plain', array(), self::$displayCharset));
 						//error_log(__METHOD__.' ('.__LINE__.') '.' ContentType:'.$mailObject->BodyContentType);
-						if (!empty($Body)) $text_body->setContents($bo_merge->merge_string($Body, $val, $e, 'text/plain', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+						if (!empty($Body)) $text_body->setContents($bo_merge->merge_string($Body, $val, $e, 'text/plain', array(), self::$displayCharset), array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
 						//error_log(__METHOD__.' ('.__LINE__.') '.' Result:'.$mailObject->Body.' error:'.array2string($e));
-						if (!empty($AltBody)) $html_body->setContents($bo_merge->merge_string($AltBody, $val, $e, 'text/html', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+						if (!empty($AltBody)) $html_body->setContents($bo_merge->merge_string($AltBody, $val, $e, 'text/html', array(), self::$displayCharset), array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
 						$_folder = $this->getDraftFolder();
 					}
 					if ($sendOK || $openAsDraft)
 					{
-						if ($this->folderExists($_folder,true))
+						if ($this->folderExists($_folder, true))
 						{
-						    if($this->isSentFolder($_folder))
+						    if ($this->isSentFolder($_folder))
 							{
 						        $flags = '\\Seen';
-						    } elseif($this->isDraftFolder($_folder)) {
+						    } elseif ($this->isDraftFolder($_folder)) {
 						        $flags = '\\Draft';
 						    } else {
 						        $flags = '';
@@ -6800,7 +6800,7 @@ 
 							$savefailed = false;
 							try
 							{
-								$messageUid =$this->appendMessage($_folder,
+								$messageUid = $this->appendMessage($_folder,
 									$mailObject->getRaw(),
 									null,
 									$flags);
@@ -6808,10 +6808,10 @@ 
 							catch (\Exception\WrongUserinput $e)
 							{
 								$savefailed = true;
-								$alert_msg .= lang("Save of message %1 failed. Could not save message to folder %2 due to: %3",$Subject,$_folder,$e->getMessage());
+								$alert_msg .= lang("Save of message %1 failed. Could not save message to folder %2 due to: %3", $Subject, $_folder, $e->getMessage());
 							}
 							// no send, save successful, and message_uid present
-							if ($savefailed===false && $messageUid && is_null($sendOK))
+							if ($savefailed === false && $messageUid && is_null($sendOK))
 							{
 								$importID = $messageUid;
 								$openComposeWindow = true;
@@ -6820,20 +6820,20 @@ 
 						else
 						{
 							$savefailed = true;
-							$alert_msg .= lang("Saving of message %1 failed. Destination Folder %2 does not exist.",$Subject,$_folder);
+							$alert_msg .= lang("Saving of message %1 failed. Destination Folder %2 does not exist.", $Subject, $_folder);
 						}
 						if ($sendOK)
 						{
-							$processStats['success'][$val] = 'Send succeeded to '.$nfn.'<'.$email.'>'.($savefailed?' but failed to store to Folder:'.$_folder:'');
+							$processStats['success'][$val] = 'Send succeeded to '.$nfn.'<'.$email.'>'.($savefailed ? ' but failed to store to Folder:'.$_folder : '');
 						}
 						else
 						{
-							if (!$openComposeWindow) $processStats['failed'][$val] = $errorInfo?$errorInfo:'Send failed to '.$nfn.'<'.$email.'> See error_log for details';
+							if (!$openComposeWindow) $processStats['failed'][$val] = $errorInfo ? $errorInfo : 'Send failed to '.$nfn.'<'.$email.'> See error_log for details';
 						}
 					}
-					if (!is_null($sendOK) && $sendOK===false && is_null($openComposeWindow))
+					if (!is_null($sendOK) && $sendOK === false && is_null($openComposeWindow))
 					{
-						$processStats['failed'][$val] = $errorInfo?$errorInfo:'Send failed to '.$nfn.'<'.$email.'> See error_log for details';
+						$processStats['failed'][$val] = $errorInfo ? $errorInfo : 'Send failed to '.$nfn.'<'.$email.'> See error_log for details';
 					}
 				}
 			}
@@ -6903,19 +6903,18 @@ 
 			//error_log(__METHOD__.__LINE__.':'.array2string($structure));
 
 			// unfortunately parseMessage does NOT return parsed headers (we assume header is shorter then 8k)
-			$start = is_string($message) ? substr($message, 0, 8192) :
-				(fseek($message, 0, SEEK_SET) == -1 ? '' : fread($message, 8192));
+			$start = is_string($message) ? substr($message, 0, 8192) : (fseek($message, 0, SEEK_SET) == -1 ? '' : fread($message, 8192));
 
 			$length = strpos($start, Horde_Mime_Part::RFC_EOL.Horde_Mime_Part::RFC_EOL);
-			if ($length===false) $length = strlen($start);
-			$headers = Horde_Mime_Headers::parseHeaders(substr($start, 0,$length));
+			if ($length === false) $length = strlen($start);
+			$headers = Horde_Mime_Headers::parseHeaders(substr($start, 0, $length));
 
-			foreach($headers->toArray(array('nowrap' => true)) as $header => $value)
+			foreach ($headers->toArray(array('nowrap' => true)) as $header => $value)
 			{
-				foreach((array)$value as $n => $val)
+				foreach ((array)$value as $n => $val)
 				{
 					$overwrite = !$n;
-					switch($header)
+					switch ($header)
 					{
 						case 'Content-Transfer-Encoding':
 							//as we parse the message and this sets the part with a Content-Transfer-Encoding, we
@@ -6936,7 +6935,7 @@ 
 		}
 		else
 		{
-			if (($type = gettype($message)) == 'object') $type = get_class ($message);
+			if (($type = gettype($message)) == 'object') $type = get_class($message);
 			throw new Exception\WrongParameter('Wrong parameter type for message: '.$type);
 		}
 	}
@@ -6950,50 +6949,50 @@ 
 	 * @param string $default_domain
 	 * @return Horde_Mail_Rfc822_List iteratable Horde_Mail_Rfc822_Address objects with attributes mailbox, host, personal and valid
 	 */
-	public static function parseAddressList($addresses, $default_domain=null)
+	public static function parseAddressList($addresses, $default_domain = null)
 	{
 		$rfc822 = new Horde_Mail_Rfc822();
 		$ret = $rfc822->parseAddressList($addresses, $default_domain ? array('default_domain' => $default_domain) : array());
 		//error_log(__METHOD__.__LINE__.'#'.array2string($addresses).'#'.array2string($ret).'#'.$ret->count().'#'.$ret->count.function_backtrace());
-		if ((empty($ret) || $ret->count()==0)&& is_string($addresses) && strlen($addresses)>0)
+		if ((empty($ret) || $ret->count() == 0) && is_string($addresses) && strlen($addresses) > 0)
 		{
 			$matches = array();
-			preg_match_all("/[\w\.,-.,_.,0-9.]+@[\w\.,-.,_.,0-9.]+/",$addresses,$matches);
+			preg_match_all("/[\w\.,-.,_.,0-9.]+@[\w\.,-.,_.,0-9.]+/", $addresses, $matches);
 			//error_log(__METHOD__.__LINE__.array2string($matches));
-			foreach ($matches[0] as &$match) {$match = trim($match,', ');}
-			$addresses = implode(',',$matches[0]);
+			foreach ($matches[0] as &$match) {$match = trim($match, ', '); }
+			$addresses = implode(',', $matches[0]);
 			//error_log(__METHOD__.__LINE__.array2string($addresses));
 			$ret = $rfc822->parseAddressList($addresses, $default_domain ? array('default_domain' => $default_domain) : array());
 			//error_log(__METHOD__.__LINE__.'#'.array2string($addresses).'#'.array2string($ret).'#'.$ret->count().'#'.$ret->count);
 		}
-		$previousFailed=false;
+		$previousFailed = false;
 		$ret2 = new Horde_Mail_Rfc822_List();
 		// handle known problems on emailaddresses
-		foreach($ret as $i => $adr)
+		foreach ($ret as $i => $adr)
 		{
 			//mailaddresses enclosed in single quotes like 'me@you.com' show up as 'me as mailbox and you.com' as host
-			if ($adr->mailbox && stripos($adr->mailbox,"'")== 0 &&
-					$adr->host && stripos($adr->host,"'")== (strlen($adr->host) -1))
+			if ($adr->mailbox && stripos($adr->mailbox, "'") == 0 &&
+					$adr->host && stripos($adr->host, "'") == (strlen($adr->host) - 1))
 			{
-				$adr->mailbox = str_replace("'","",$adr->mailbox);
-				$adr->host = str_replace("'","",$adr->host);
+				$adr->mailbox = str_replace("'", "", $adr->mailbox);
+				$adr->host = str_replace("'", "", $adr->host);
 			}
 			// no mailbox or host part as 'Xr\xc3\xa4hlyz, User <mailboxpart1.mailboxpart2@yourhost.com>' is parsed as 2 addresses separated by ','
 			//#'Xr\xc3\xa4hlyz, User <mailboxpart1.mailboxpart2@yourhost.com>'
 			//#Horde_Mail_Rfc822_List Object([_data:protected] => Array(
 			//[0] => Horde_Mail_Rfc822_Address Object([comment] => Array()[mailbox] => Xr\xc3\xa4hlyz[_host:protected] => [_personal:protected] => )
 			//[1] => Horde_Mail_Rfc822_Address Object([comment] => Array()[mailbox] => mailboxpart1.mailboxpart2[_host:protected] => youthost.com[_personal:protected] => User))[_filter:protected] => Array()[_ptr:protected] => )#2#,
-			if (strlen($adr->mailbox)==0||strlen($adr->host)==0)
+			if (strlen($adr->mailbox) == 0 || strlen($adr->host) == 0)
 			{
-				$remember = ($adr->mailbox?$adr->mailbox:($adr->host?$adr->host:''));
-				$previousFailed=true;
+				$remember = ($adr->mailbox ? $adr->mailbox : ($adr->host ? $adr->host : ''));
+				$previousFailed = true;
 				//error_log(__METHOD__.__LINE__."('$addresses', $default_domain) parsed $i: mailbox=$adr->mailbox, host=$adr->host, personal=$adr->personal");
 			}
 			else
 			{
-				if ($previousFailed && $remember) $adr->personal = $remember. ' ' . $adr->personal;
+				if ($previousFailed && $remember) $adr->personal = $remember.' '.$adr->personal;
 				$remember = '';
-				$previousFailed=false;
+				$previousFailed = false;
 				//error_log(__METHOD__.__LINE__."('$addresses', $default_domain) parsed $i: mailbox=$adr->mailbox, host=$adr->host, personal=$adr->personal");
 				$ret2->add($adr);
 			}
@@ -7009,7 +7008,7 @@ 
 	 * @param string $_folder
 	 * @return boolean
 	 */
-	function sendMDN($uid,$_folder)
+	function sendMDN($uid, $_folder)
 	{
 		$acc = Mail\Account::read($this->profileID);
 		$identity = Mail\Account::read_identity($acc['ident_id'], true, null, $acc);
@@ -7039,7 +7038,7 @@ 
 	 */
 	function addAccount($_hookValues)
 	{
-		error_log(__METHOD__.' ('.__LINE__.') '.' NOT DONE YET!' . ' hookValue = '. $_hookValues);
+		error_log(__METHOD__.' ('.__LINE__.') '.' NOT DONE YET!'.' hookValue = '.$_hookValues);
 
 	}
 
@@ -7053,7 +7052,7 @@ 
 	 */
 	function deleteAccount($_hookValues)
 	{
-		error_log(__METHOD__.' ('.__LINE__.') '.' NOT DONE YET!' . ' hookValue = '. $_hookValues);
+		error_log(__METHOD__.' ('.__LINE__.') '.' NOT DONE YET!'.' hookValue = '.$_hookValues);
 
 	}
 
@@ -7067,7 +7066,7 @@ 
 	 */
 	function updateAccount($_hookValues)
 	{
-		error_log(__METHOD__.' ('.__LINE__.') '.' NOT DONE YET!' . ' hookValue = '. $_hookValues);
+		error_log(__METHOD__.' ('.__LINE__.') '.' NOT DONE YET!'.' hookValue = '.$_hookValues);
 
 	}
 }

Braces +1778 added lines, -527 removed lines

@@ -199,7 +199,10 @@ 
 	public static function getInstance($_restoreSession=true, &$_profileID=0, $_validate=true, $_oldImapServerObject=false, $_reuseCache=null)
 	{
 		//$_restoreSession=false;
-		if (is_null($_reuseCache)) $_reuseCache = $_restoreSession;
+		if (is_null($_reuseCache))
+		{
+			$_reuseCache = $_restoreSession;
+		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.' RestoreSession:'.$_restoreSession.' ProfileId:'.$_profileID.'/'.Mail\Account::get_default_acc_id().' for user:'.$GLOBALS['egw_info']['user']['account_lid'].' called from:'.function_backtrace());
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($_oldImapServerObject));
 		if (isset(self::$profileDefunct[$_profileID]) && self::$profileDefunct[$_profileID]===true)
@@ -229,9 +232,15 @@ 
 			{
 				$profileID = Mail\Account::get_default_acc_id();
 			}
-			if ($profileID!=$_profileID) $_restoreSession==false;
+			if ($profileID!=$_profileID)
+			{
+				$_restoreSession==false;
+			}
 			$_profileID=$profileID;
-			if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' called with profileID==0 using '.$profileID.' instead->'.function_backtrace());
+			if (self::$debug)
+			{
+				error_log(__METHOD__.' ('.__LINE__.') '.' called with profileID==0 using '.$profileID.' instead->'.function_backtrace());
+			}
 		}
 		// no validation or restoreSession for old ImapServer Object, just fetch it and return it
 		if ($_oldImapServerObject===true)
@@ -270,7 +279,8 @@ 
 				// TODO: merge mailprefs into userprefs, for easy treatment
 				self::$instances[$_profileID]->mailPreferences = $GLOBALS['egw_info']['user']['preferences']['mail'];
 				self::$instances[$_profileID]->htmlOptions  = self::$instances[$_profileID]->mailPreferences['htmlOptions'];
-			} catch (\Exception $e)
+			}
+			catch (\Exception $e)
 			{
 				$newprofileID = Mail\Account::get_default_acc_id();
 				// try loading the default profile for the user
@@ -288,9 +298,15 @@ 
 			self::storeActiveProfileIDToPref(self::$instances[$_profileID]->icServer, $_profileID, $_validate );
 		}
 		self::$instances[$_profileID]->profileID = $_profileID;
-		if (!isset(self::$instances[$_profileID]->idna2)) self::$instances[$_profileID]->idna2 = new Horde_Idna;
+		if (!isset(self::$instances[$_profileID]->idna2))
+		{
+			self::$instances[$_profileID]->idna2 = new Horde_Idna;
+		}
 		//if ($_profileID==0); error_log(__METHOD__.' ('.__LINE__.') '.' RestoreSession:'.$_restoreSession.' ProfileId:'.$_profileID);
-		if (is_null(self::$mailConfig)) self::$mailConfig = Config::read('mail');
+		if (is_null(self::$mailConfig))
+		{
+			self::$mailConfig = Config::read('mail');
+		}
 		return self::$instances[$_profileID];
 	}
 
@@ -315,14 +331,20 @@ 
 			}
 			catch (\Exception $e)
 			{
-				if ($_profileID != Mail\Account::get_default_acc_id()) $_profileID = Mail\Account::get_default_acc_id();
+				if ($_profileID != Mail\Account::get_default_acc_id())
+				{
+					$_profileID = Mail\Account::get_default_acc_id();
+				}
 				error_log(__METHOD__.__LINE__.' '.$e->getMessage());
 				return false;
 			}
 		}
 		if ($oldProfileID != $_profileID)
 		{
-			if ($oldProfileID && $_profileID==0) $_profileID = $oldProfileID;
+			if ($oldProfileID && $_profileID==0)
+			{
+				$_profileID = $oldProfileID;
+			}
 			$GLOBALS['egw']->preferences->add('mail','ActiveProfileID',$_profileID,'user');
 			// save prefs
 			$GLOBALS['egw']->preferences->save_repository(true);
@@ -352,11 +374,17 @@ 
 				{
 					return $_acc_id;
 				}
-				if (self::$debug) error_log(__METHOD__."($_acc_id) account NOT valid, no imap-host!");
+				if (self::$debug)
+				{
+					error_log(__METHOD__."($_acc_id) account NOT valid, no imap-host!");
+				}
 			}
 			catch (\Exception $e) {
 				unset($e);
-				if (self::$debug) error_log(__METHOD__."($_acc_id) account NOT found!");
+				if (self::$debug)
+				{
+					error_log(__METHOD__."($_acc_id) account NOT found!");
+				}
 			}
 		}
 		// no account specified or specified account not found or not valid
@@ -365,11 +393,17 @@ 
 		{
 			if (!empty($imap_host) && ($account = Mail\Account::read($acc_id)) && $account->is_imap())
 			{
-				if (self::$debug && $_acc_id) error_log(__METHOD__."($_acc_id) using $acc_id instead");
+				if (self::$debug && $_acc_id)
+				{
+					error_log(__METHOD__."($_acc_id) using $acc_id instead");
+				}
 				return $acc_id;
 			}
 		}
-		if (self::$debug) error_log(__METHOD__."($_acc_id) NO valid account found!");
+		if (self::$debug)
+		{
+			error_log(__METHOD__."($_acc_id) NO valid account found!");
+		}
 		return 0;
 	}
 
@@ -385,10 +419,19 @@ 
 	 */
 	private function __construct($_displayCharset='utf-8',$_restoreSession=true, $_profileID=0, $_oldImapServerObject=false, $_reuseCache=null)
 	{
-		if (is_null($_reuseCache)) $_reuseCache = $_restoreSession;
-		if (!empty($_displayCharset)) self::$displayCharset = $_displayCharset;
+		if (is_null($_reuseCache))
+		{
+			$_reuseCache = $_restoreSession;
+		}
+		if (!empty($_displayCharset))
+		{
+			self::$displayCharset = $_displayCharset;
+		}
 		// not nummeric, we assume we only want an empty class object
-		if (!is_numeric($_profileID)) return true;
+		if (!is_numeric($_profileID))
+		{
+			return true;
+		}
 		if ($_restoreSession)
 		{
 			//error_log(__METHOD__." Session restore ".function_backtrace());
@@ -403,7 +446,10 @@ 
 			$firstMessage = $this->sessionData['previewMessage'];
 			$this->sessionData = array();
 		}
-		if (!$_reuseCache) $this->forcePrefReload($_profileID,!$_reuseCache);
+		if (!$_reuseCache)
+		{
+			$this->forcePrefReload($_profileID,!$_reuseCache);
+		}
 		try
 		{
 			$this->profileID = self::validateProfileID($_profileID);
@@ -427,7 +473,10 @@ 
 			$_profileID = $this->profileID = $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] = $this->icServer->ImapServerId;
 		}
 
-		if (is_null(self::$mailConfig)) self::$mailConfig = Config::read('mail');
+		if (is_null(self::$mailConfig))
+		{
+			self::$mailConfig = Config::read('mail');
+		}
 	}
 
 	/**
@@ -456,7 +505,10 @@ 
 		// unset the mail_preferences session object, to force the reload/rebuild
 		Cache::setSession('mail','mail_preferences',serialize(array()));
 		Cache::setSession('emailadmin','session_data',serialize(array()));
-		if ($_resetFolderObjects) self::resetFolderObjectCache($_profile_id);
+		if ($_resetFolderObjects)
+		{
+			self::resetFolderObjectCache($_profile_id);
+		}
 	}
 
 	/**
@@ -466,7 +518,10 @@ 
 	{
 		$this->sessionData = array();//Cache::getCache(Cache::SESSION,'mail','session_data',$callback=null,$callback_params=array(),$expiration=60*60*1);
 		self::$activeFolderCache = Cache::getCache(Cache::INSTANCE,'email','activeMailbox'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*10);
-		if (!empty(self::$activeFolderCache[$this->profileID])) $this->sessionData['mailbox'] = self::$activeFolderCache[$this->profileID];
+		if (!empty(self::$activeFolderCache[$this->profileID]))
+		{
+			$this->sessionData['mailbox'] = self::$activeFolderCache[$this->profileID];
+		}
 	}
 
 	/**
@@ -475,7 +530,10 @@ 
 	function saveSessionData()
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string(array_keys($this->sessionData)));
-		if (!empty($this->sessionData['mailbox'])) self::$activeFolderCache[$this->profileID]=$this->sessionData['mailbox'];
+		if (!empty($this->sessionData['mailbox']))
+		{
+			self::$activeFolderCache[$this->profileID]=$this->sessionData['mailbox'];
+		}
 		if (isset(self::$activeFolderCache) && is_array(self::$activeFolderCache))
 		{
 			Cache::setCache(Cache::INSTANCE,'email','activeMailbox'.trim($GLOBALS['egw_info']['user']['account_id']),self::$activeFolderCache, 60*60*10);
@@ -496,8 +554,14 @@ 
 	 */
 	static function unsetCachedObjects($_profileID=null)
 	{
-		if (is_null($_profileID)) $_profileID = Mail\Account::get_default_acc_id();
-		if (is_array($_profileID) && $_profileID['account_id']) $account_id = $_profileID['account_id'];
+		if (is_null($_profileID))
+		{
+			$_profileID = Mail\Account::get_default_acc_id();
+		}
+		if (is_array($_profileID) && $_profileID['account_id'])
+		{
+			$account_id = $_profileID['account_id'];
+		}
 		//error_log(__METHOD__.__LINE__.' called with ProfileID:'.array2string($_profileID).' from '.function_backtrace());
 		if (!is_array($_profileID) && (is_numeric($_profileID) || !(stripos($_profileID,'tracker_')===false)))
 		{
@@ -530,7 +594,10 @@ 
 				Cache::setCache(Cache::INSTANCE,'email','vacationNotice'.trim($account_id),$vacationCached, $expiration=60*60*24*1);
 			}
 
-			if (isset(self::$instances[$_profileID])) unset(self::$instances[$_profileID]);
+			if (isset(self::$instances[$_profileID]))
+			{
+				unset(self::$instances[$_profileID]);
+			}
 		}
 		if (is_array($_profileID) && $_profileID['location'] == 'clear_cache')
 		{
@@ -559,7 +626,10 @@ 
 	static function resetConnectionErrorCache($_ImapServerId=null,$account_id=null)
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.' for Profile:'.array2string($_ImapServerId) .' for user:'.trim($account_id));
-		if (is_null($account_id)) $account_id = $GLOBALS['egw_info']['user']['account_id'];
+		if (is_null($account_id))
+		{
+			$account_id = $GLOBALS['egw_info']['user']['account_id'];
+		}
 		if (is_array($_ImapServerId))
 		{
 			// called via hook
@@ -598,7 +668,10 @@ 
 	static function resetFolderObjectCache($_ImapServerId=null,$account_id=null)
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.' called for Profile:'.array2string($_ImapServerId).'->'.function_backtrace());
-		if (is_null($account_id)) $account_id = $GLOBALS['egw_info']['user']['account_id'];
+		if (is_null($account_id))
+		{
+			$account_id = $GLOBALS['egw_info']['user']['account_id'];
+		}
 		// on [location] => verify_settings we coud either use [prefs] => Array([ActiveProfileID] => 9, .. as $_ImapServerId
 		// or treat it as not given. we try that path
 		if (is_null($_ImapServerId)||is_array($_ImapServerId))
@@ -672,10 +745,14 @@ 
 
 		$userEMailAdresses = array($acc['ident_email']=>$acc['ident_realname']);
 
-		foreach($identities as $ik => $ident) {
+		foreach($identities as $ik => $ident)
+		{
 			//error_log(__METHOD__.' ('.__LINE__.') '.':'.$ik.'->'.array2string($ident));
 			$identity = Mail\Account::read_identity($ik);
-			if (!empty($identity['ident_email']) && !isset($userEMailAdresses[$identity['ident_email']])) $userEMailAdresses[$identity['ident_email']] = $identity['ident_realname'];
+			if (!empty($identity['ident_email']) && !isset($userEMailAdresses[$identity['ident_email']]))
+			{
+				$userEMailAdresses[$identity['ident_email']] = $identity['ident_realname'];
+			}
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($userEMailAdresses));
 		return $userEMailAdresses;
@@ -693,13 +770,20 @@ 
 		foreach(Mail\Account::search($only_current_user=($_accountToSearch?$_accountToSearch:true), $just_name=true) as $acc_id => $identity_name)
 		{
 			$acc = Mail\Account::read($acc_id,($_accountToSearch?$_accountToSearch:null));
-			if (!$resolve_placeholders) $userEMailAdresses[$acc['ident_id']] = array('acc_id'=>$acc_id,'ident_id'=>$acc['ident_id'],'ident_email'=>$acc['ident_email'],'ident_org'=>$acc['ident_org'],'ident_realname'=>$acc['ident_realname'],'ident_signature'=>$acc['ident_signature'],'ident_name'=>$acc['ident_name']);
+			if (!$resolve_placeholders)
+			{
+				$userEMailAdresses[$acc['ident_id']] = array('acc_id'=>$acc_id,'ident_id'=>$acc['ident_id'],'ident_email'=>$acc['ident_email'],'ident_org'=>$acc['ident_org'],'ident_realname'=>$acc['ident_realname'],'ident_signature'=>$acc['ident_signature'],'ident_name'=>$acc['ident_name']);
+			}
 
-			foreach(Mail\Account::identities($acc) as $ik => $ident) {
+			foreach(Mail\Account::identities($acc) as $ik => $ident)
+			{
 				//error_log(__METHOD__.' ('.__LINE__.') '.':'.$ik.'->'.array2string($ident));
 				$identity = Mail\Account::read_identity($ik,$resolve_placeholders);
 				//error_log(__METHOD__.' ('.__LINE__.') '.':'.$ik.'->'.array2string($identity));
-				if (!isset($userEMailAdresses[$identity['ident_id']])) $userEMailAdresses[$identity['ident_id']] = array('acc_id'=>$acc_id,'ident_id'=>$identity['ident_id'],'ident_email'=>$identity['ident_email'],'ident_org'=>$identity['ident_org'],'ident_realname'=>$identity['ident_realname'],'ident_signature'=>$identity['ident_signature'],'ident_name'=>$identity['ident_name']);
+				if (!isset($userEMailAdresses[$identity['ident_id']]))
+				{
+					$userEMailAdresses[$identity['ident_id']] = array('acc_id'=>$acc_id,'ident_id'=>$identity['ident_id'],'ident_email'=>$identity['ident_email'],'ident_org'=>$identity['ident_org'],'ident_realname'=>$identity['ident_realname'],'ident_signature'=>$identity['ident_signature'],'ident_name'=>$identity['ident_name']);
+				}
 			}
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($userEMailAdresses));
@@ -719,12 +803,16 @@ 
 			$account = Mail\Account::read($account);
 		}
 		$userEMailAdresses = array();
-		foreach(Mail\Account::identities($account, true, 'params') as $ik => $ident) {
+		foreach(Mail\Account::identities($account, true, 'params') as $ik => $ident)
+		{
 			//error_log(__METHOD__.' ('.__LINE__.') '.':'.$ik.'->'.array2string($ident));
 			$identity = Mail\Account::read_identity($ik,true,null,$account);
 			//error_log(__METHOD__.' ('.__LINE__.') '.':'.$ik.'->'.array2string($identity));
 			// standardIdentity has ident_id==acc_id (as it is done within account->identities)
-			if (empty($identity['ident_id'])) $identity['ident_id'] = $identity['acc_id'];
+			if (empty($identity['ident_id']))
+			{
+				$identity['ident_id'] = $identity['acc_id'];
+			}
 			if (!isset($userEMailAdresses[$identity['ident_id']]))
 			{
 				$userEMailAdresses[$identity['ident_id']] = array('acc_id'=>$identity['acc_id'],
@@ -767,15 +855,25 @@ 
 		// account select box
 		$selectedID = $this->profileID;
 		$allAccountData = Mail\Account::search($only_current_user=true, false, null);
-		if ($allAccountData) {
+		if ($allAccountData)
+		{
 			$rememberFirst=$selectedFound=null;
 			foreach ($allAccountData as $tmpkey => $icServers)
 			{
-				if (is_null($rememberFirst)) $rememberFirst = $tmpkey;
-				if ($tmpkey == $selectedID) $selectedFound=true;
+				if (is_null($rememberFirst))
+				{
+					$rememberFirst = $tmpkey;
+				}
+				if ($tmpkey == $selectedID)
+				{
+					$selectedFound=true;
+				}
 				//error_log(__METHOD__.' ('.__LINE__.') '.' Key:'.$tmpkey.'->'.array2string($icServers->acc_imap_host));
 				$host = $icServers->acc_imap_host;
-				if (empty($host)) continue;
+				if (empty($host))
+				{
+					continue;
+				}
 				$identities[$icServers->acc_id] = $icServers['ident_realname'].' '.$icServers['ident_org'].' <'.$icServers['ident_email'].'>';
 				//error_log(__METHOD__.' ('.__LINE__.') '.' Key:'.$tmpkey.'->'.array2string($identities[$icServers->acc_id]));
 			}
@@ -835,7 +933,10 @@ 
 	 */
 	function reopen($_foldername)
 	{
-		if (self::$debugTimes) $starttime = microtime (true);
+		if (self::$debugTimes)
+		{
+			$starttime = microtime (true);
+		}
 
 		//error_log(__METHOD__.' ('.__LINE__.') '."('$_foldername') ".function_backtrace());
 		// TODO: trying to reduce traffic to the IMAP Server here, introduces problems with fetching the bodies of
@@ -845,12 +946,16 @@ 
 		//{
 			//error_log( __METHOD__.' ('.__LINE__.') '." $_foldername ".function_backtrace());
 			//error_log(__METHOD__.' ('.__LINE__.') '.' Connected with icServer for Profile:'.$this->profileID.'?'.print_r($this->icServer->_connected,true));
-			if ($this->folderIsSelectable($_foldername)) {
+			if ($this->folderIsSelectable($_foldername))
+			{
 				$this->icServer->openMailbox($_foldername);
 			}
 			$folderOpened = $_foldername;
 		//}
-		if (self::$debugTimes) self::logRunTimes($starttime,null,'Folder:'.$_foldername,__METHOD__.' ('.__LINE__.') ');
+		if (self::$debugTimes)
+		{
+			self::logRunTimes($starttime,null,'Folder:'.$_foldername,__METHOD__.' ('.__LINE__.') ');
+		}
 	}
 
 
@@ -865,13 +970,22 @@ 
 	{
 		//error_log( "-------------------------->open connection ".function_backtrace());
 		//error_log(__METHOD__.' ('.__LINE__.') '.' ->'.array2string($this->icServer));
-		if (self::$debugTimes) $starttime = microtime (true);
+		if (self::$debugTimes)
+		{
+			$starttime = microtime (true);
+		}
 		$mailbox=null;
 		try
 		{
-			if(isset($this->sessionData['mailbox'])&&$this->folderExists($this->sessionData['mailbox'])) $mailbox = $this->sessionData['mailbox'];
-			if (empty($mailbox)) $mailbox = $this->icServer->getCurrentMailbox();
-/*
+			if(isset($this->sessionData['mailbox'])&&$this->folderExists($this->sessionData['mailbox']))
+			{
+				$mailbox = $this->sessionData['mailbox'];
+			}
+			if (empty($mailbox))
+			{
+				$mailbox = $this->icServer->getCurrentMailbox();
+			}
+			/*
 			if (isset(Mail\Imap::$supports_keywords[$_icServerID]))
 			{
 				$this->icServer->openMailbox($mailbox);
@@ -896,7 +1010,10 @@ 
 			error_log(__METHOD__.' ('.__LINE__.') '."->open connection for Server with profileID:".$_icServerID." trying to examine ($mailbox) failed!".$e->getMessage());
 			throw new Exception(__METHOD__." failed to ".__METHOD__." on Profile to $_icServerID while trying to examine $mailbox:".$e->getMessage());
 		}
-		if (self::$debugTimes) self::logRunTimes($starttime,null,'ProfileID:'.$_icServerID,__METHOD__.' ('.__LINE__.') ');
+		if (self::$debugTimes)
+		{
+			self::logRunTimes($starttime,null,'ProfileID:'.$_icServerID,__METHOD__.' ('.__LINE__.') ');
+		}
 	}
 
 	/**
@@ -908,7 +1025,10 @@ 
 	function getQuotaRoot()
 	{
 		static $quota;
-		if (isset($quota)) return $quota;
+		if (isset($quota))
+		{
+			return $quota;
+		}
 		if (isset(self::$profileDefunct[$this->profileID]) && self::$profileDefunct[$this->profileID]===true)
 		{
 			// something is wrong. Do not proceed. either no folder or profile is marked as defunct for this request
@@ -917,7 +1037,8 @@ 
 		try
 		{
 			$this->icServer->getCurrentMailbox();
-			if(!$this->icServer->hasCapability('QUOTA')) {
+			if(!$this->icServer->hasCapability('QUOTA'))
+			{
 				$quota = false;
 				return false;
 			}
@@ -934,12 +1055,15 @@ 
 			}
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($quota));
-		if(is_array($quota)) {
+		if(is_array($quota))
+		{
 			$quota = array(
 				'usage'	=> $quota['USED'],
 				'limit'	=> $quota['QMAX'],
 			);
-		} else {
+		}
+		else
+		{
 			$quota = false;
 		}
 		return $quota;
@@ -955,7 +1079,11 @@ 
 	static function getTimeOut($_use='IMAP')
 	{
 		$timeout = $GLOBALS['egw_info']['user']['preferences']['mail']['connectionTimeout'];
-		if (empty($timeout)) $timeout = ($_use=='SIEVE'?10:20); // this is the default value
+		if (empty($timeout))
+		{
+			$timeout = ($_use=='SIEVE'?10:20);
+		}
+		// this is the default value
 		return $timeout;
 	}
 
@@ -973,9 +1101,13 @@ 
 		$foldersNameSpace = array();
 		$delimiter = $this->getHierarchyDelimiter();
 		// TODO: cache by $this->icServer->ImapServerId
-		if (is_null($nameSpace)) $nameSpace = $this->icServer->getNameSpaceArray();
+		if (is_null($nameSpace))
+		{
+			$nameSpace = $this->icServer->getNameSpaceArray();
+		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($nameSpace));
-		if (is_array($nameSpace)) {
+		if (is_array($nameSpace))
+		{
 			foreach($nameSpace as $type => $singleNameSpaceArray)
 			{
 				foreach ($singleNameSpaceArray as $singleNameSpace)
@@ -992,7 +1124,9 @@ 
 						$_foldersNameSpace['prefix_present'] = 'forced';
 						// uw-imap server with mailbox prefix or dovecot maybe
 						$_foldersNameSpace['prefix'] = 'mail';
-					} else {
+					}
+					else
+					{
 						$_foldersNameSpace['prefix_present'] = !empty($singleNameSpace['name']);
 						$_foldersNameSpace['prefix'] = $singleNameSpace['name'];
 					}
@@ -1019,7 +1153,10 @@ 
 		foreach($nameSpace as &$singleNameSpace)
 		{
 			//if (substr($singleNameSpace['prefix'],0,strlen($folderName))==$folderName) return $singleNameSpace['prefix'];
-			if (substr($folderName,0,strlen($singleNameSpace['prefix']))==$singleNameSpace['prefix']) return $singleNameSpace['prefix'];
+			if (substr($folderName,0,strlen($singleNameSpace['prefix']))==$singleNameSpace['prefix'])
+			{
+				return $singleNameSpace['prefix'];
+			}
 		}
 		return "";
 	}
@@ -1033,8 +1170,14 @@ 
 	function getHierarchyDelimiter($_useCache=true)
 	{
 		static $HierarchyDelimiter = null;
-		if (is_null($HierarchyDelimiter)) $HierarchyDelimiter = Cache::getCache(Cache::INSTANCE,'email','HierarchyDelimiter'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*24*5);
-		if ($_useCache===false) unset($HierarchyDelimiter[$this->icServer->ImapServerId]);
+		if (is_null($HierarchyDelimiter))
+		{
+			$HierarchyDelimiter = Cache::getCache(Cache::INSTANCE,'email','HierarchyDelimiter'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*24*5);
+		}
+		if ($_useCache===false)
+		{
+			unset($HierarchyDelimiter[$this->icServer->ImapServerId]);
+		}
 		if (isset($HierarchyDelimiter[$this->icServer->ImapServerId])&&!empty($HierarchyDelimiter[$this->icServer->ImapServerId]))
 		{
 			return $HierarchyDelimiter[$this->icServer->ImapServerId];
@@ -1047,7 +1190,10 @@ 
 		}
 		catch(\Exception $e)
 		{
-			if ($e->getCode()==102) self::$profileDefunct[$this->profileID]=true;
+			if ($e->getCode()==102)
+			{
+				self::$profileDefunct[$this->profileID]=true;
+			}
 			unset($e);
 			$HierarchyDelimiter[$this->icServer->ImapServerId] = '/';
 		}
@@ -1064,14 +1210,19 @@ 
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.':'.$this->icServer->ImapServerId.' Connected:'.$this->icServer->_connected);
 		static $_specialUseFolders = null;
-		if (is_null($_specialUseFolders)||empty($_specialUseFolders)) $_specialUseFolders = Cache::getCache(Cache::INSTANCE,'email','specialUseFolders'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*24*5);
+		if (is_null($_specialUseFolders)||empty($_specialUseFolders))
+		{
+			$_specialUseFolders = Cache::getCache(Cache::INSTANCE,'email','specialUseFolders'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*24*5);
+		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($this->icServer->acc_folder_trash));
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($this->icServer->acc_folder_sent));
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($this->icServer->acc_folder_draft));
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($this->icServer->acc_folder_template));
 		self::$specialUseFolders = $_specialUseFolders[$this->icServer->ImapServerId];
 		if (isset($_specialUseFolders[$this->icServer->ImapServerId]) && !empty($_specialUseFolders[$this->icServer->ImapServerId]))
-			return $_specialUseFolders[$this->icServer->ImapServerId];
+		{
+					return $_specialUseFolders[$this->icServer->ImapServerId];
+		}
 		$_specialUseFolders[$this->icServer->ImapServerId]=array();
 		//if (!empty($this->icServer->acc_folder_trash) && !isset($_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_trash]))
 			$_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_trash]='Trash';
@@ -1099,7 +1250,8 @@ 
 	function folderIsSelectable($folderToSelect)
 	{
 		$retval = true;
-		if($folderToSelect && ($folderStatus = $this->getFolderStatus($folderToSelect,false,true))) {
+		if($folderToSelect && ($folderStatus = $this->getFolderStatus($folderToSelect,false,true)))
+		{
 			if (!empty($folderStatus['attributes']) && stripos(array2string($folderStatus['attributes']),'noselect')!==false)
 			{
 				$retval = false;
@@ -1152,7 +1304,10 @@ 
 	 */
 	function getFolderStatus($_folderName,$ignoreStatusCache=false,$basicInfoOnly=false,$fetchSubscribedInfo=true)
 	{
-		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '." called with:$_folderName,$ignoreStatusCache,$basicInfoOnly");
+		if (self::$debug)
+		{
+			error_log(__METHOD__.' ('.__LINE__.') '." called with:$_folderName,$ignoreStatusCache,$basicInfoOnly");
+		}
 		if (!is_string($_folderName) || empty($_folderName)||(isset(self::$profileDefunct[$this->profileID]) && self::$profileDefunct[$this->profileID]===true))
 		{
 			// something is wrong. Do not proceed. either no folder or profile is marked as defunct for this request
@@ -1164,7 +1319,10 @@ 
 		{
 			$folderInfoCache = $folderBasicInfo[$this->profileID];
 		}
-		if (isset($folderInfoCache[$_folderName]) && $ignoreStatusCache==false && $basicInfoOnly) return $folderInfoCache[$_folderName];
+		if (isset($folderInfoCache[$_folderName]) && $ignoreStatusCache==false && $basicInfoOnly)
+		{
+			return $folderInfoCache[$_folderName];
+		}
 		$retValue = array();
 		$retValue['subscribed'] = false;
 /*
@@ -1192,7 +1350,10 @@ 
 			if (is_array($ret))
 			{
 				$retkeys = array_keys($ret);
-				if ($retkeys[0]==$_folderName) $folderInfoCache[$_folderName] = $ret[$retkeys[0]];
+				if ($retkeys[0]==$_folderName)
+				{
+					$folderInfoCache[$_folderName] = $ret[$retkeys[0]];
+				}
 			}
 			else
 			{
@@ -1201,7 +1362,8 @@ 
 		}
 		$folderInfo = $folderInfoCache[$_folderName];
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($folderInfo).'->'.function_backtrace());
-		if($ignoreStatusCache||!$folderInfo|| !is_array($folderInfo)) {
+		if($ignoreStatusCache||!$folderInfo|| !is_array($folderInfo))
+		{
 			try
 			{
 				$folderInfo = $this->_getStatus($_folderName,$ignoreStatusCache);
@@ -1235,7 +1397,8 @@ 
 		$retValue['shortName']		= array_pop($shortNameParts);
 		$retValue['displayName']	= $_folderName;
 		$retValue['shortDisplayName']	= $retValue['shortName'];
-		if(strtoupper($retValue['shortName']) == 'INBOX') {
+		if(strtoupper($retValue['shortName']) == 'INBOX')
+		{
 			$retValue['displayName']	= lang('INBOX');
 			$retValue['shortDisplayName']	= lang('INBOX');
 		}
@@ -1244,7 +1407,10 @@ 
 		{
 			$retValue['displayName'] = $retValue['shortDisplayName'] = lang($retValue['shortName']);
 		}
-		if ($folderInfo) $folderBasicInfo[$this->profileID][$_folderName]=$retValue;
+		if ($folderInfo)
+		{
+			$folderBasicInfo[$this->profileID][$_folderName]=$retValue;
+		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.' '.$_folderName.array2string($retValue['attributes']));
 		if ($basicInfoOnly || (isset($retValue['attributes']) && stripos(array2string($retValue['attributes']),'noselect')!==false))
 		{
@@ -1256,24 +1422,34 @@ 
 		static $subscribedFolders = null;
 		static $nameSpace = null;
 		static $prefix = null;
-		if (is_null($nameSpace) || empty($nameSpace[$this->profileID])) $nameSpace[$this->profileID] = $this->_getNameSpaces();
+		if (is_null($nameSpace) || empty($nameSpace[$this->profileID]))
+		{
+			$nameSpace[$this->profileID] = $this->_getNameSpaces();
+		}
 		if (!empty($nameSpace[$this->profileID]))
 		{
 			$nsNoPersonal=array();
 			foreach($nameSpace[$this->profileID] as &$ns)
 			{
-				if ($ns['type']!='personal') $nsNoPersonal[]=$ns;
+				if ($ns['type']!='personal')
+				{
+					$nsNoPersonal[]=$ns;
+				}
 			}
 			$nameSpace[$this->profileID]=$nsNoPersonal;
 		}
-		if (is_null($prefix) || empty($prefix[$this->profileID]) || empty($prefix[$this->profileID][$_folderName])) $prefix[$this->profileID][$_folderName] = $this->getFolderPrefixFromNamespace($nameSpace[$this->profileID], $_folderName);
+		if (is_null($prefix) || empty($prefix[$this->profileID]) || empty($prefix[$this->profileID][$_folderName]))
+		{
+			$prefix[$this->profileID][$_folderName] = $this->getFolderPrefixFromNamespace($nameSpace[$this->profileID], $_folderName);
+		}
 
 		if ($fetchSubscribedInfo && is_null($subscribedFolders) || empty($subscribedFolders[$this->profileID]))
 		{
 			$subscribedFolders[$this->profileID] = $this->icServer->listSubscribedMailboxes();
 		}
 
-		if($fetchSubscribedInfo && is_array($subscribedFolders[$this->profileID]) && in_array($_folderName,$subscribedFolders[$this->profileID])) {
+		if($fetchSubscribedInfo && is_array($subscribedFolders[$this->profileID]) && in_array($_folderName,$subscribedFolders[$this->profileID]))
+		{
 			$retValue['subscribed'] = true;
 		}
 
@@ -1292,8 +1468,7 @@ 
 				(isset($this->mailPreferences['trustServersUnseenInfo']) &&
 				$this->mailPreferences['trustServersUnseenInfo']==2 &&
 				$prefix[$this->profileID][$_folderName] != '' && stripos($_folderName,$prefix[$this->profileID][$_folderName]) !== false)
-			)
-			{
+			) {
 				//error_log(__METHOD__." returned folderStatus for Folder $_folderName:".print_r($prefix,true).' TS:'.$this->mailPreferences['trustServersUnseenInfo']);
 				// we filter for the combined status of unseen and undeleted, as this is what we show in list
 				try
@@ -1304,13 +1479,19 @@ 
 				}
 				catch (\Exception $ee)
 				{
-					if (self::$debug) error_log(__METHOD__." could not fetch/calculate unseen counter for $_folderName Reason:'".$ee->getMessage()."' but requested.");
+					if (self::$debug)
+					{
+						error_log(__METHOD__." could not fetch/calculate unseen counter for $_folderName Reason:'".$ee->getMessage()."' but requested.");
+					}
 				}
 			}
 		}
 		catch (\Exception $e)
 		{
-			if (self::$debug) error_log(__METHOD__." returned folderStatus for Folder $_folderName:".print_r($e->getMessage(),true));
+			if (self::$debug)
+			{
+				error_log(__METHOD__." returned folderStatus for Folder $_folderName:".print_r($e->getMessage(),true));
+			}
 		}
 
 		return $retValue;
@@ -1335,8 +1516,14 @@ 
 	function getHeaders($_folderName, $_startMessage, $_numberOfMessages, $_sort, $_reverse, $_filter, $_thisUIDOnly=null, $_cacheResult=true, $_fetchPreviews=false)
 	{
 		//self::$debug=true;
-		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.function_backtrace());
-		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '."$_folderName,$_startMessage, $_numberOfMessages, $_sort, $_reverse, ".array2string($_filter).", $_thisUIDOnly");
+		if (self::$debug)
+		{
+			error_log(__METHOD__.' ('.__LINE__.') '.function_backtrace());
+		}
+		if (self::$debug)
+		{
+			error_log(__METHOD__.' ('.__LINE__.') '."$_folderName,$_startMessage, $_numberOfMessages, $_sort, $_reverse, ".array2string($_filter).", $_thisUIDOnly");
+		}
 		$reverse = (bool)$_reverse;
 		// get the list of messages to fetch
 		$this->reopen($_folderName);
@@ -1357,21 +1544,34 @@ 
 				//$_filter['range'] ="$start:$end";
 				//$_filter['range'] ="$_startMessage:*";
 			}
-			if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '."$_folderName, $_sort, $reverse, ".array2string($_filter).", $rByUid");
-			if (self::$debug||self::$debugTimes) $starttime = microtime (true);
+			if (self::$debug)
+			{
+				error_log(__METHOD__.' ('.__LINE__.') '."$_folderName, $_sort, $reverse, ".array2string($_filter).", $rByUid");
+			}
+			if (self::$debug||self::$debugTimes)
+			{
+				$starttime = microtime (true);
+			}
 			//see this example below for a 12 week datefilter (since)
 			//$_filter = array('status'=>array('UNDELETED'),'type'=>"SINCE",'string'=> date("d-M-Y", $starttime-(3600*24*7*12)));
 			$_sortResult = $this->getSortedList($_folderName, $_sort, $reverse, $_filter, $rByUid, $_cacheResult);
 			$sortResult = $_sortResult['match']->ids;
 			//$modseq = $_sortResult['modseq'];
 			//error_log(__METHOD__.' ('.__LINE__.') '.'Modsequence:'.$modseq);
-			if (self::$debug||self::$debugTimes) self::logRunTimes($starttime,null,' call getSortedList for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_thisUIDOnly),__METHOD__.' ('.__LINE__.') ');
+			if (self::$debug||self::$debugTimes)
+			{
+				self::logRunTimes($starttime,null,' call getSortedList for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_thisUIDOnly),__METHOD__.' ('.__LINE__.') ');
+			}
 
-			if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.array2string($sortResult));
+			if (self::$debug)
+			{
+				error_log(__METHOD__.' ('.__LINE__.') '.array2string($sortResult));
+			}
 			#$this->icServer->setDebug(false);
 			#print "</pre>";
 			// nothing found
-			if(!is_array($sortResult) || empty($sortResult)) {
+			if(!is_array($sortResult) || empty($sortResult))
+			{
 				$retValue = array();
 				$retValue['info']['total']	= 0;
 				$retValue['info']['first']	= 0;
@@ -1383,7 +1583,8 @@ 
 			#_debug_array($sortResult);
 			#_debug_array(array_slice($sortResult, -5, -2));
 			//error_log("REVERSE: $reverse");
-			if($reverse === true) {
+			if($reverse === true)
+			{
 				if  ($_startMessage<=$total)
 				{
 					$startMessage = $_startMessage-1;
@@ -1395,7 +1596,10 @@ 
 					{
 						$numberOfMessages = $total%$_numberOfMessages;
 						//$numberOfMessages = abs($_startMessage-$total-1);
-						if ($numberOfMessages>0 && $numberOfMessages<=$_numberOfMessages) $_numberOfMessages = $numberOfMessages;
+						if ($numberOfMessages>0 && $numberOfMessages<=$_numberOfMessages)
+						{
+							$_numberOfMessages = $numberOfMessages;
+						}
 						//error_log(__METHOD__.' ('.__LINE__.') '.' Start:'.$_startMessage.' NumberOfMessages:'.$_numberOfMessages.' Total:'.$total);
 					}
 					$startMessage=($total-$_numberOfMessages)-1;
@@ -1409,19 +1613,36 @@ 
 					//$retValue['info']['first'] = $startMessage;
 					//$retValue['info']['last'] = $total;
 				}
-				if($startMessage > 0) {
-					if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' StartMessage:'.(-($_numberOfMessages+$startMessage)).', '.-$startMessage.' Number of Messages:'.count($sortResult));
+				if($startMessage > 0)
+				{
+					if (self::$debug)
+					{
+						error_log(__METHOD__.' ('.__LINE__.') '.' StartMessage:'.(-($_numberOfMessages+$startMessage)).', '.-$startMessage.' Number of Messages:'.count($sortResult));
+					}
 					$sortResult = array_slice($sortResult, -($_numberOfMessages+$startMessage), -$startMessage);
-				} else {
-					if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' StartMessage:'.(-($_numberOfMessages+($_startMessage-1))).', AllTheRest, Number of Messages:'.count($sortResult));
+				}
+				else
+				{
+					if (self::$debug)
+					{
+						error_log(__METHOD__.' ('.__LINE__.') '.' StartMessage:'.(-($_numberOfMessages+($_startMessage-1))).', AllTheRest, Number of Messages:'.count($sortResult));
+					}
 					$sortResult = array_slice($sortResult, -($_numberOfMessages+($_startMessage-1)));
 				}
 				$sortResult = array_reverse($sortResult);
-			} else {
-				if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' StartMessage:'.($_startMessage-1).', '.$_numberOfMessages.' Number of Messages:'.count($sortResult));
+			}
+			else
+			{
+				if (self::$debug)
+				{
+					error_log(__METHOD__.' ('.__LINE__.') '.' StartMessage:'.($_startMessage-1).', '.$_numberOfMessages.' Number of Messages:'.count($sortResult));
+				}
 				$sortResult = array_slice($sortResult, $_startMessage-1, $_numberOfMessages);
 			}
-			if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.array2string($sortResult));
+			if (self::$debug)
+			{
+				error_log(__METHOD__.' ('.__LINE__.') '.array2string($sortResult));
+			}
 		}
 		else
 		{
@@ -1430,7 +1651,10 @@ 
 
 
 		// fetch the data for the selected messages
-		if (self::$debug||self::$debugTimes) $starttime = microtime(true);
+		if (self::$debug||self::$debugTimes)
+		{
+			$starttime = microtime(true);
+		}
 		try
 		{
 			$uidsToFetch = new Horde_Imap_Client_Ids();
@@ -1454,7 +1678,10 @@ 
 			$fquery->flags();
 			$fquery->imapDate();// needed to ensure getImapDate fetches the internaldate, not the current time
 			// if $_fetchPreviews is activated fetch part of the messages too
-			if ($_fetchPreviews) $fquery->fullText(array('peek'=>true,'length'=>((int)$_fetchPreviews<5000?5000:$_fetchPreviews),'start'=>0));
+			if ($_fetchPreviews)
+			{
+				$fquery->fullText(array('peek'=>true,'length'=>((int)$_fetchPreviews<5000?5000:$_fetchPreviews),'start'=>0));
+			}
 			$headersNew = $this->icServer->fetch($_folderName, $fquery, array(
 				'ids' => $uidsToFetch,
 			));
@@ -1477,14 +1704,20 @@ 
 
 		$cnt = 0;
 
-		foreach((array)$sortResult as $uid) {
+		foreach((array)$sortResult as $uid)
+		{
 			$sortOrder[$uid] = $cnt++;
 		}
 
 		$count = 0;
-		if (is_object($headersNew)) {
-			if (self::$debug||self::$debugTimes) $starttime = microtime(true);
-			foreach($headersNew->ids() as $id) {
+		if (is_object($headersNew))
+		{
+			if (self::$debug||self::$debugTimes)
+			{
+				$starttime = microtime(true);
+			}
+			foreach($headersNew->ids() as $id)
+			{
 				$_headerObject = $headersNew->get($id);
 				//error_log(__METHOD__.' ('.__LINE__.') '.array2string($_headerObject));
 				$headerObject = array();
@@ -1497,7 +1730,10 @@ 
 				// Get already cached headers, 'fetchHeaders' is a label matchimg above
 				$headerForPrio = $_headerObject->getHeaders('fetchHeaders',Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->toArray();
 				// Try to fetch header with key='' as some servers might have no fetchHeaders index. e.g. yandex.com
-				if (empty($headerForPrio)) $headerForPrio = $_headerObject->getHeaders('',Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->toArray();
+				if (empty($headerForPrio))
+				{
+					$headerForPrio = $_headerObject->getHeaders('',Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->toArray();
+				}
 				//fetch the fullMsg part if all conditions match to be available in case $_headerObject->getHeaders returns
 				//nothing worthwhile (as it does for googlemail accounts, when preview is switched on
 				if ($_fetchPreviews)
@@ -1508,12 +1744,16 @@ 
 					if (empty($headerForPrio)||(is_array($headerForPrio)&&count($headerForPrio)===1&&$headerForPrio['']))
 					{
 						$length = strpos($bodyPreview, Horde_Mime_Part::RFC_EOL.Horde_Mime_Part::RFC_EOL);
-						if ($length===false) $length = strlen($bodyPreview);
+						if ($length===false)
+						{
+							$length = strlen($bodyPreview);
+						}
 						$headerForPrio =  Horde_Mime_Headers::parseHeaders(substr($bodyPreview, 0,$length))->toArray();
 					}
 				}
 				$headerForPrio = array_change_key_case($headerForPrio, CASE_UPPER);
-				if (self::$debug) {
+				if (self::$debug)
+				{
 					error_log(__METHOD__.' ('.__LINE__.') '.array2string($_headerObject).'UID:'.$_headerObject->getUid().' Size:'.$_headerObject->getSize().' Date:'.$_headerObject->getImapDate().'/'.DateTime::to($_headerObject->getImapDate(),'Y-m-d H:i:s'));
 					error_log(__METHOD__.' ('.__LINE__.') '.array2string($headerForPrio));
 				}
@@ -1523,11 +1763,16 @@ 
 					$total--;
 					continue;
 				}
-				if ( isset($headerForPrio['DISPOSITION-NOTIFICATION-TO']) ) {
+				if ( isset($headerForPrio['DISPOSITION-NOTIFICATION-TO']) )
+				{
 					$headerObject['DISPOSITION-NOTIFICATION-TO'] = self::decode_header(trim($headerForPrio['DISPOSITION-NOTIFICATION-TO']));
-				} else if ( isset($headerForPrio['RETURN-RECEIPT-TO']) ) {
+				}
+				else if ( isset($headerForPrio['RETURN-RECEIPT-TO']) )
+				{
 					$headerObject['DISPOSITION-NOTIFICATION-TO'] = self::decode_header(trim($headerForPrio['RETURN-RECEIPT-TO']));
-				} else if ( isset($headerForPrio['X-CONFIRM-READING-TO']) ) {
+				}
+				else if ( isset($headerForPrio['X-CONFIRM-READING-TO']) )
+				{
 					$headerObject['DISPOSITION-NOTIFICATION-TO'] = self::decode_header(trim($headerForPrio['X-CONFIRM-READING-TO']));
 				} /*else $sent_not = "";*/
 				//error_log(__METHOD__.' ('.__LINE__.') '.array2string($headerObject));
@@ -1558,7 +1803,11 @@ 
 						$rfcAddr = self::parseAddressList($ad); // does some fixing of known problems too
 						foreach ($rfcAddr as $_rfcAddr)
 						{
-							if (!$_rfcAddr->valid)	continue; // skip. not a valid address
+							if (!$_rfcAddr->valid)
+							{
+								continue;
+							}
+							// skip. not a valid address
 							$address[] = imap_rfc822_write_address($_rfcAddr->mailbox,$_rfcAddr->host,$_rfcAddr->personal);
 						}
 					}
@@ -1574,7 +1823,10 @@ 
 				{
 					// $bodyPreview is populated at the beginning of the loop, as it may be
 					// needed to parse the Headers of the Message
-					if (empty($bodyPreview)) $bodyPreview = $_headerObject->getFullMsg();
+					if (empty($bodyPreview))
+					{
+						$bodyPreview = $_headerObject->getFullMsg();
+					}
 					//error_log(__METHOD__.' ('.__LINE__.') '.array2string($bodyPreview));
 					$base = Horde_Mime_Part::parseMessage($bodyPreview);
 					foreach($base->partIterator() as $part)
@@ -1587,7 +1839,8 @@ 
 												'encode' => Horde_Mime_Part::ENCODE_BINARY,	// otherwise we cant recode charset
 											)), $charset, 'utf-8');
 							$headerObject['BODYPREVIEW']=trim(str_replace(array("\r\n","\r","\n"),' ',mb_substr(Translation::convert_jsonsafe($buffer),0,((int)$_fetchPreviews<300?300:$_fetchPreviews))));
-						} elseif (empty($headerObject['BODYPREVIEW'])&&$part->getPrimaryType()== 'multipart')
+						}
+						elseif (empty($headerObject['BODYPREVIEW'])&&$part->getPrimaryType()== 'multipart')
 						{
 							//error_log(__METHOD__.' ('.__LINE__.') '.array2string($part));
 						}
@@ -1603,7 +1856,10 @@ 
 				$messageMimeType='';
 				foreach ($mailStructureObject->contentTypeMap() as $mime_id => $mime_type)
 				{
-					if ($mime_id==0 || $messageMimeType==='') $messageMimeType = $mime_type;
+					if ($mime_id==0 || $messageMimeType==='')
+					{
+						$messageMimeType = $mime_type;
+					}
 					$part = $mailStructureObject->getPart($mime_id);
 					$partdisposition = $part->getDisposition();
 					$partPrimaryType = $part->getPrimaryType();
@@ -1613,7 +1869,8 @@ 
 					// bodypreview could be found (multipart/....)
 					if ($_fetchPreviews && empty($headerObject['BODYPREVIEW'])&&($partPrimaryType == 'text') &&
 						((intval($mime_id) === 1) || !$mime_id) &&
-						($partdisposition !== 'attachment')) {
+						($partdisposition !== 'attachment'))
+					{
 							$_structure=$part;
 							$this->fetchPartContents($uid, $_structure, false,true);
 							$headerObject['BODYPREVIEW']=trim(str_replace(array("\r\n","\r","\n"),' ',mb_substr(Mail\Html::convertHTMLToText($_structure->getContents()),0,((int)$_fetchPreviews<300?300:$_fetchPreviews))));
@@ -1635,10 +1892,19 @@ 
 					if ($mime_type=='message/rfc822')
 					{
 						//error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$uid.'->'.$mime_id.':'.array2string($part->contentTypeMap()));
-						foreach($part->contentTypeMap() as $sub_id => $sub_type) { if ($sub_id != $mime_id) $skipParts[$sub_id] = $sub_type;}
+						foreach($part->contentTypeMap() as $sub_id => $sub_type)
+						{
+if ($sub_id != $mime_id)
+						{
+							$skipParts[$sub_id] = $sub_type;
+						}
+						}
 					}
 					//error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$uid.'->'.$mime_id.' Disp:'.$partdisposition.' Type:'.$partPrimaryType.' Skip:'.array2string($skipParts));
-					if (array_key_exists($mime_id,$skipParts)) continue;
+					if (array_key_exists($mime_id,$skipParts))
+					{
+						continue;
+					}
 					if ($partdisposition=='attachment' ||
 						($partdisposition=='inline'&&$partPrimaryType == 'image'&&$mime_type=='image/tiff') || // as we are not able to display tiffs
 						($partdisposition=='inline'&&$partPrimaryType == 'image'&&empty($cid)) ||
@@ -1649,7 +1915,10 @@ 
 						$headerObject['ATTACHMENTS'][$mime_id]['uid']=$uid;
 						$headerObject['ATTACHMENTS'][$mime_id]['cid'] = $cid;
 						$headerObject['ATTACHMENTS'][$mime_id]['partID']=$mime_id;
-						if (!isset($headerObject['ATTACHMENTS'][$mime_id]['name']))$headerObject['ATTACHMENTS'][$mime_id]['name']=$part->getName();
+						if (!isset($headerObject['ATTACHMENTS'][$mime_id]['name']))
+						{
+							$headerObject['ATTACHMENTS'][$mime_id]['name']=$part->getName();
+						}
 						if (!strcasecmp($headerObject['ATTACHMENTS'][$mime_id]['name'],'winmail.dat') ||
 							$headerObject['ATTACHMENTS'][$mime_id]['mimeType']=='application/ms-tnef')
 						{
@@ -1663,18 +1932,27 @@ 
 				//error_log(__METHOD__.' ('.__LINE__.') '.' FindBody (plain):'.array2string($mailStructureObject->findBody('plain')));
 				//error_log(__METHOD__.' ('.__LINE__.') '.' FindBody (html):'.array2string($mailStructureObject->findBody('html')));
 				//if($count == 0) error_log(__METHOD__.array2string($headerObject));
-				if (empty($headerObject['UID'])) continue;
+				if (empty($headerObject['UID']))
+				{
+					continue;
+				}
 				//$uid = ($rByUid ? $headerObject['UID'] : $headerObject['MSG_NUM']);
 				// make dates like "Mon, 23 Apr 2007 10:11:06 UT" working with strtotime
-				if(substr($headerObject['DATE'],-2) === 'UT') {
+				if(substr($headerObject['DATE'],-2) === 'UT')
+				{
 					$headerObject['DATE'] .= 'C';
 				}
-				if(substr($headerObject['INTERNALDATE'],-2) === 'UT') {
+				if(substr($headerObject['INTERNALDATE'],-2) === 'UT')
+				{
 					$headerObject['INTERNALDATE'] .= 'C';
 				}
 				//error_log(__METHOD__.' ('.__LINE__.') '.' '.$headerObject['SUBJECT'].'->'.$headerObject['DATE'].'<->'.$headerObject['INTERNALDATE'] .'#');
 				//error_log(__METHOD__.' ('.__LINE__.') '.' '.$this->decode_subject($headerObject['SUBJECT']).'->'.$headerObject['DATE']);
-				if (isset($headerObject['ATTACHMENTS']) && count($headerObject['ATTACHMENTS'])) foreach ($headerObject['ATTACHMENTS'] as &$a) { $retValue['header'][$sortOrder[$uid]]['attachments'][]=$a;}
+				if (isset($headerObject['ATTACHMENTS']) && count($headerObject['ATTACHMENTS']))
+				{
+					foreach ($headerObject['ATTACHMENTS'] as &$a) { $retValue['header'][$sortOrder[$uid]]['attachments'][]=$a;
+				}
+				}
 				$retValue['header'][$sortOrder[$uid]]['subject']	= $this->decode_subject($headerObject['SUBJECT']);
 				$retValue['header'][$sortOrder[$uid]]['size'] 		= $headerObject['SIZE'];
 				$retValue['header'][$sortOrder[$uid]]['date']		= self::_strtotime(($headerObject['DATE']&&!($headerObject['DATE']=='NIL')?$headerObject['DATE']:$headerObject['INTERNALDATE']),'ts',true);
@@ -1685,22 +1963,31 @@ 
 				$retValue['header'][$sortOrder[$uid]]['bodypreview']		= $headerObject['BODYPREVIEW'];
 				$retValue['header'][$sortOrder[$uid]]['priority']		= ($headerObject['PRIORITY']?$headerObject['PRIORITY']:3);
 				//error_log(__METHOD__.' ('.__LINE__.') '.' '.array2string($retValue['header'][$sortOrder[$uid]]));
-				if (isset($headerObject['DISPOSITION-NOTIFICATION-TO'])) $retValue['header'][$sortOrder[$uid]]['disposition-notification-to'] = $headerObject['DISPOSITION-NOTIFICATION-TO'];
-				if (is_array($headerObject['FLAGS'])) {
+				if (isset($headerObject['DISPOSITION-NOTIFICATION-TO']))
+				{
+					$retValue['header'][$sortOrder[$uid]]['disposition-notification-to'] = $headerObject['DISPOSITION-NOTIFICATION-TO'];
+				}
+				if (is_array($headerObject['FLAGS']))
+				{
 					$retValue['header'][$sortOrder[$uid]] = array_merge($retValue['header'][$sortOrder[$uid]],self::prepareFlagsArray($headerObject));
 				}
 				//error_log(__METHOD__.' ('.__LINE__.') '.$headerObject['SUBJECT'].'->'.array2string($_headerObject->getEnvelope()->__get('from')));
-				if(is_array($headerObject['FROM']) && $headerObject['FROM'][0]) {
+				if(is_array($headerObject['FROM']) && $headerObject['FROM'][0])
+				{
 					$retValue['header'][$sortOrder[$uid]]['sender_address'] = self::decode_header($headerObject['FROM'][0],true);
 				}
-				if(is_array($headerObject['TO']) && $headerObject['TO'][0]) {
+				if(is_array($headerObject['TO']) && $headerObject['TO'][0])
+				{
 					$retValue['header'][$sortOrder[$uid]]['to_address'] = self::decode_header($headerObject['TO'][0],true);
 					if (count($headerObject['TO'])>1)
 					{
 						$ki=0;
 						foreach($headerObject['TO'] as $k => $add)
 						{
-							if ($k==0) continue;
+							if ($k==0)
+							{
+								continue;
+							}
 							//error_log(__METHOD__.' ('.__LINE__.') '."-> $k:".array2string($add));
 							$retValue['header'][$sortOrder[$uid]]['additional_to_addresses'][$ki] = self::decode_header($add,true);
 							//error_log(__METHOD__.' ('.__LINE__.') '.array2string($retValue['header'][$sortOrder[$uid]]['additional_to_addresses'][$ki]));
@@ -1708,7 +1995,8 @@ 
 						}
 					}
 				}
-				if(is_array($headerObject['CC']) && count($headerObject['CC'])>0) {
+				if(is_array($headerObject['CC']) && count($headerObject['CC'])>0)
+				{
 					$ki=0;
 					foreach($headerObject['CC'] as $k => $add)
 					{
@@ -1722,27 +2010,41 @@ 
 
 				$count++;
 			}
-			if (self::$debug||self::$debugTimes) self::logRunTimes($starttime,null,' fetching Headers and stuff for Folder:'.$_folderName,__METHOD__.' ('.__LINE__.') ');
+			if (self::$debug||self::$debugTimes)
+			{
+				self::logRunTimes($starttime,null,' fetching Headers and stuff for Folder:'.$_folderName,__METHOD__.' ('.__LINE__.') ');
+			}
 			//self::$debug=false;
 			// sort the messages to the requested displayorder
-			if(is_array($retValue['header'])) {
+			if(is_array($retValue['header']))
+			{
 				$countMessages = $total;
-				if (isset($_filter['range'])) $countMessages = self::$folderStatusCache[$this->profileID][$_folderName]['messages'];
+				if (isset($_filter['range']))
+				{
+					$countMessages = self::$folderStatusCache[$this->profileID][$_folderName]['messages'];
+				}
 				ksort($retValue['header']);
 				$retValue['info']['total']	= $total;
 				//if ($_startMessage>$total) $_startMessage = $total-($count-1);
 				$retValue['info']['first']	= $_startMessage;
 				$retValue['info']['last']	= $_startMessage + $count - 1 ;
 				return $retValue;
-			} else {
+			}
+			else
+			{
 				$retValue = array();
 				$retValue['info']['total']	= 0;
 				$retValue['info']['first']	= 0;
 				$retValue['info']['last']	= 0;
 				return $retValue;
 			}
-		} else {
-			if ($headersNew == null && empty($_thisUIDOnly)) error_log(__METHOD__." -> retrieval of Message Details to Query $queryString failed: ".print_r($headersNew,TRUE));
+		}
+		else
+		{
+			if ($headersNew == null && empty($_thisUIDOnly))
+			{
+				error_log(__METHOD__." -> retrieval of Message Details to Query $queryString failed: ".print_r($headersNew,TRUE));
+			}
 			$retValue = array();
 			$retValue['info']['total']  = 0;
 			$retValue['info']['first']  = 0;
@@ -1759,7 +2061,10 @@ 
 	 */
 	static function prepareFlagsArray($headerObject)
 	{
-		if (is_array($headerObject['FLAGS'])) $headerFlags = array_map('strtolower',$headerObject['FLAGS']);
+		if (is_array($headerObject['FLAGS']))
+		{
+			$headerFlags = array_map('strtolower',$headerObject['FLAGS']);
+		}
 		$retValue = array();
 		$retValue['recent']		= in_array('\\recent', $headerFlags);
 		$retValue['flagged']	= in_array('\\flagged', $headerFlags);
@@ -1810,25 +2115,44 @@ 
 		//error_log(__METHOD__.' ('.__LINE__.') '.' Filter:'.array2string($_filter));
 		$try2useCache = true;
 		static $eMailListContainsDeletedMessages = null;
-		if (is_null($eMailListContainsDeletedMessages)) $eMailListContainsDeletedMessages = Cache::getCache(Cache::INSTANCE,'email','eMailListContainsDeletedMessages'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
+		if (is_null($eMailListContainsDeletedMessages))
+		{
+			$eMailListContainsDeletedMessages = Cache::getCache(Cache::INSTANCE,'email','eMailListContainsDeletedMessages'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
+		}
 		// this indicates, that there is no Filter set, and the returned set/subset should not contain DELETED Messages, nor filtered for UNDELETED
 		if ($setSession==true && ((strpos(array2string($_filter), 'UNDELETED') === false && strpos(array2string($_filter), 'DELETED') === false)))
 		{
-			if (self::$debugTimes) $starttime = microtime(true);
-			if (is_null($eMailListContainsDeletedMessages) || empty($eMailListContainsDeletedMessages[$this->profileID]) || empty($eMailListContainsDeletedMessages[$this->profileID][$_folderName])) $eMailListContainsDeletedMessages = Cache::getCache(Cache::INSTANCE,'email','eMailListContainsDeletedMessages'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
-			$five=true;
-			$deletedMessages = $this->getSortedList($_folderName, 0, $three=1, array('status'=>array('DELETED')),$five,false);
-			if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') Found DeletedMessages:'.array2string($eMailListContainsDeletedMessages));
-			$eMailListContainsDeletedMessages[$this->profileID][$_folderName] =$deletedMessages['count'];
+			if (self::$debugTimes)
+			{
+				$starttime = microtime(true);
+			}
+			if (is_null($eMailListContainsDeletedMessages) || empty($eMailListContainsDeletedMessages[$this->profileID]) || empty($eMailListContainsDeletedMessages[$this->profileID][$_folderName]))
+			{
+				$eMailListContainsDeletedMessages = Cache::getCache(Cache::INSTANCE,'email','eMailListContainsDeletedMessages'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
+			}
+			$five=true;
+			$deletedMessages = $this->getSortedList($_folderName, 0, $three=1, array('status'=>array('DELETED')),$five,false);
+			if (self::$debug)
+			{
+				error_log(__METHOD__.' ('.__LINE__.') Found DeletedMessages:'.array2string($eMailListContainsDeletedMessages));
+			}
+			$eMailListContainsDeletedMessages[$this->profileID][$_folderName] =$deletedMessages['count'];
 			Cache::setCache(Cache::INSTANCE,'email','eMailListContainsDeletedMessages'.trim($GLOBALS['egw_info']['user']['account_id']),$eMailListContainsDeletedMessages, 60*60*1);
-			if (self::$debugTimes) self::logRunTimes($starttime,null,'setting eMailListContainsDeletedMessages for Profile:'.$this->profileID.' Folder:'.$_folderName.' to '.$eMailListContainsDeletedMessages[$this->profileID][$_folderName],__METHOD__.' ('.__LINE__.') ');			//error_log(__METHOD__.' ('.__LINE__.') '.' Profile:'.$this->profileID.' Folder:'.$_folderName.' -> EXISTS/SessStat:'.array2string($folderStatus['MESSAGES']).'/'.self::$folderStatusCache[$this->profileID][$_folderName]['messages'].' ListContDelMsg/SessDeleted:'.$eMailListContainsDeletedMessages[$this->profileID][$_folderName].'/'.self::$folderStatusCache[$this->profileID][$_folderName]['deleted']);
+			if (self::$debugTimes)
+			{
+				self::logRunTimes($starttime,null,'setting eMailListContainsDeletedMessages for Profile:'.$this->profileID.' Folder:'.$_folderName.' to '.$eMailListContainsDeletedMessages[$this->profileID][$_folderName],__METHOD__.' ('.__LINE__.') ');
+			}
+			//error_log(__METHOD__.' ('.__LINE__.') '.' Profile:'.$this->profileID.' Folder:'.$_folderName.' -> EXISTS/SessStat:'.array2string($folderStatus['MESSAGES']).'/'.self::$folderStatusCache[$this->profileID][$_folderName]['messages'].' ListContDelMsg/SessDeleted:'.$eMailListContainsDeletedMessages[$this->profileID][$_folderName].'/'.self::$folderStatusCache[$this->profileID][$_folderName]['deleted']);
 		}
 		$try2useCache = false;
 		//self::$supportsORinQuery[$this->profileID]=true;
 		if (is_null(self::$supportsORinQuery) || !isset(self::$supportsORinQuery[$this->profileID]))
 		{
 			self::$supportsORinQuery = Cache::getCache(Cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*10);
-			if (!isset(self::$supportsORinQuery[$this->profileID])) self::$supportsORinQuery[$this->profileID]=true;
+			if (!isset(self::$supportsORinQuery[$this->profileID]))
+			{
+				self::$supportsORinQuery[$this->profileID]=true;
+			}
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($_filter).' SupportsOrInQuery:'.self::$supportsORinQuery[$this->profileID]);
 		$filter = $this->createIMAPFilter($_folderName, $_filter,self::$supportsORinQuery[$this->profileID]);
@@ -1839,15 +2163,26 @@ 
 		}
 		//_debug_array($filter);
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($filter).'#'.array2string($this->icServer->capability()));
-		if($this->icServer->hasCapability('SORT')) {
+		if($this->icServer->hasCapability('SORT'))
+		{
 			// when using an orQuery and we sort by date. sort seems to fail on certain servers => ZIMBRA with Horde_Imap_Client
 			// thus we translate the search request from date to Horde_Imap_Client::SORT_SEQUENCE (which should be the same, if
 			// there is no messing with the dates)
 			//if (self::$supportsORinQuery[$this->profileID]&&$_sort=='date'&&$_filter['type']=='quick'&&!empty($_filter['string']))$_sort='INTERNALDATE';
-			if (self::$debug) error_log(__METHOD__." Mailserver has SORT Capability, SortBy: ".array2string($_sort)." Reverse: $_reverse");
+			if (self::$debug)
+			{
+				error_log(__METHOD__." Mailserver has SORT Capability, SortBy: ".array2string($_sort)." Reverse: $_reverse");
+			}
 			$sortOrder = $this->_getSortString($_sort, $_reverse);
-			if ($_reverse && in_array(Horde_Imap_Client::SORT_REVERSE,$sortOrder)) $_reverse=false; // as we reversed the result already
-			if (self::$debug) error_log(__METHOD__." Mailserver runs SORT: SortBy:".array2string($_sort)."->".array2string($sortOrder)." Filter: ".array2string($filter));
+			if ($_reverse && in_array(Horde_Imap_Client::SORT_REVERSE,$sortOrder))
+			{
+				$_reverse=false;
+			}
+			// as we reversed the result already
+			if (self::$debug)
+			{
+				error_log(__METHOD__." Mailserver runs SORT: SortBy:".array2string($_sort)."->".array2string($sortOrder)." Filter: ".array2string($filter));
+			}
 			try
 			{
 				$sortResult = $this->icServer->search($_folderName, $filter, array(
@@ -1859,7 +2194,10 @@ 
 				//error_log(__METHOD__.'('.__LINE__.'):'.$e->getMessage());
 				$resultByUid = false;
 				$sortOrder = array(Horde_Imap_Client::SORT_SEQUENCE);
-				if ($_reverse) array_unshift($sortOrder,Horde_Imap_Client::SORT_REVERSE);
+				if ($_reverse)
+				{
+					array_unshift($sortOrder,Horde_Imap_Client::SORT_REVERSE);
+				}
 				try
 				{
 					$sortResult = $this->icServer->search($_folderName, $filter, array(
@@ -1871,9 +2209,17 @@ 
 					$sortResult = self::$folderStatusCache[$this->profileID][$_folderName]['sortResult'];
 				}
 			}
-			if (self::$debug) error_log(__METHOD__.print_r($sortResult,true));
-		} else {
-			if (self::$debug) error_log(__METHOD__." Mailserver has NO SORT Capability");
+			if (self::$debug)
+			{
+				error_log(__METHOD__.print_r($sortResult,true));
+			}
+		}
+		else
+		{
+			if (self::$debug)
+			{
+				error_log(__METHOD__." Mailserver has NO SORT Capability");
+			}
 			//$sortOrder = array(Horde_Imap_Client::SORT_SEQUENCE);
 			//if ($_reverse) array_unshift($sortOrder,Horde_Imap_Client::SORT_REVERSE);
 			try
@@ -1887,7 +2233,10 @@ 
 				// possible error OR Query. But Horde gives no detailed Info :-(
 				self::$supportsORinQuery[$this->profileID]=false;
 				Cache::setCache(Cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']),self::$supportsORinQuery,60*60*10);
-				if (self::$debug) error_log(__METHOD__.__LINE__." Mailserver seems to have NO OR Capability for Search:".$sortResult->message);
+				if (self::$debug)
+				{
+					error_log(__METHOD__.__LINE__." Mailserver seems to have NO OR Capability for Search:".$sortResult->message);
+				}
 				$filter = $this->createIMAPFilter($_folderName, $_filter, self::$supportsORinQuery[$this->profileID]);
 				try
 				{
@@ -1898,11 +2247,15 @@ 
 				{
 				}
 			}
-			if(is_array($sortResult['match'])) {
+			if(is_array($sortResult['match']))
+			{
 					// not sure that this is going so succeed as $sortResult['match'] is a hordeObject
 					sort($sortResult['match'], SORT_NUMERIC);
 			}
-			if (self::$debug) error_log(__METHOD__." using Filter:".print_r($filter,true)." ->".print_r($sortResult,true));
+			if (self::$debug)
+			{
+				error_log(__METHOD__." using Filter:".print_r($filter,true)." ->".print_r($sortResult,true));
+			}
 		}
 		if ($setSession)
 		{
@@ -1931,7 +2284,8 @@ 
 		$_reverse=false;
 		if (is_numeric($_sort))
 		{
-			switch($_sort) {
+			switch($_sort)
+			{
 				case 2:
 					$retValue = array(Horde_Imap_Client::SORT_FROM);
 					break;
@@ -1953,7 +2307,8 @@ 
 		}
 		else
 		{
-			switch(strtoupper($_sort)) {
+			switch(strtoupper($_sort))
+			{
 				case 'FROMADDRESS':
 					$retValue = array(Horde_Imap_Client::SORT_FROM);
 					break;
@@ -1979,7 +2334,10 @@ 
 					break;
 			}
 		}
-		if ($_reverse) array_unshift($retValue,Horde_Imap_Client::SORT_REVERSE);
+		if ($_reverse)
+		{
+			array_unshift($retValue,Horde_Imap_Client::SORT_REVERSE);
+		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.' '.($_reverse?'REVERSE ':'').$_sort.'->'.$retValue);
 		return $retValue;
 	}
@@ -1998,7 +2356,10 @@ 
 		$imapFilter->charset('UTF-8');
 
 		//_debug_array($_criterias);
-		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' Criterias:'.(!is_array($_criterias)?" none -> returning":array2string($_criterias)));
+		if (self::$debug)
+		{
+			error_log(__METHOD__.' ('.__LINE__.') '.' Criterias:'.(!is_array($_criterias)?" none -> returning":array2string($_criterias)));
+		}
 		if((!is_array($_criterias) || $_criterias['status']=='any') &&
 			(!isset($_criterias['string']) || empty($_criterias['string'])) &&
 			(!isset($_criterias['range'])|| empty($_criterias['range']) ||
@@ -2013,11 +2374,13 @@ 
 		// statusQuery MUST be placed first, as search for subject/mailbody and such is
 		// depending on charset. flagSearch is not BUT messes the charset if called afterwards
 		$statusQueryValid = false;
-		foreach((array)$_criterias['status'] as $k => $criteria) {
+		foreach((array)$_criterias['status'] as $k => $criteria)
+		{
 			$imapStatusFilter = new Horde_Imap_Client_Search_Query();
 			$imapStatusFilter->charset('UTF-8');
 			$criteria = strtoupper($criteria);
-			switch ($criteria) {
+			switch ($criteria)
+			{
 				case 'ANSWERED':
 				case 'DELETED':
 				case 'FLAGGED':
@@ -2100,9 +2463,11 @@ 
 		$imapSearchFilter = new Horde_Imap_Client_Search_Query();
 		$imapSearchFilter->charset('UTF-8');
 
-		if(!empty($_criterias['string'])) {
+		if(!empty($_criterias['string']))
+		{
 			$criteria = strtoupper($_criterias['type']);
-			switch ($criteria) {
+			switch ($criteria)
+			{
 				case 'BYDATE':
 				case 'QUICK':
 				case 'QUICKWITHCC':
@@ -2110,9 +2475,12 @@ 
 					//$imapSearchFilter->charset('UTF-8');
 					$imapFilter2 = new Horde_Imap_Client_Search_Query();
 					$imapFilter2->charset('UTF-8');
-					if($this->isSentFolder($_folder)) {
+					if($this->isSentFolder($_folder))
+					{
 						$imapFilter2->headerText('TO', $_criterias['string'], $not=false);
-					} else {
+					}
+					else
+					{
 						$imapFilter2->headerText('FROM', $_criterias['string'], $not=false);
 					}
 					if ($_supportsOrInQuery)
@@ -2143,7 +2511,10 @@ 
 											'GB'=>1024*1000*1000,'G'=>1024*1000*1000,
 											'TB'=>1024*1000*1000*1000,'T'=>1024*1000*1000*1000);
 						$numberinBytes=(float)$_criterias['string'];
-						if (isset($multipleBy[$unit])) $numberinBytes=(float)$_criterias['string']*$multipleBy[$unit];
+						if (isset($multipleBy[$unit]))
+						{
+							$numberinBytes=(float)$_criterias['string']*$multipleBy[$unit];
+						}
 						//error_log(__METHOD__.__LINE__.'#'.$_criterias['string'].'->'.(float)$_criterias['string'].'#'.$unit.' ='.$numberinBytes);
 						$_criterias['string']=$numberinBytes;
 					}
@@ -2180,8 +2551,14 @@ 
 					break;
 			}
 		}
-		if ($statusQueryValid && !$queryValid) $queryValid=true;
-		if ($queryValid) $imapFilter->andSearch($imapSearchFilter);
+		if ($statusQueryValid && !$queryValid)
+		{
+			$queryValid=true;
+		}
+		if ($queryValid)
+		{
+			$imapFilter->andSearch($imapSearchFilter);
+		}
 
 		if (isset($_criterias['range']) && !empty($_criterias['range']))
 		{
@@ -2196,7 +2573,8 @@ 
 				unset($_criterias['before']);
 				$criteria=$_criterias['range']='ON';
 			}
-			switch ($criteria) {
+			switch ($criteria)
+			{
 				case 'BETWEEN':
 					//try to be smart about missing
 					//enddate
@@ -2232,8 +2610,14 @@ 
 					$rangeValid = true;
 					break;
 			}
-			if ($rangeValid && !$queryValid) $queryValid=true;
-			if ($rangeValid) $imapFilter->andSearch($imapRangeFilter);
+			if ($rangeValid && !$queryValid)
+			{
+				$queryValid=true;
+			}
+			if ($rangeValid)
+			{
+				$imapFilter->andSearch($imapRangeFilter);
+			}
 		}
 		if (self::$debug)
 		{
@@ -2241,10 +2625,13 @@ 
 			$query_str = $imapFilter->build();
 			//error_log(__METHOD__.' ('.__LINE__.') '.' '.$query_str['query'].' created by Criterias:'.(!is_array($_criterias)?" none -> returning":array2string($_criterias)));
 		}
-		if($queryValid==false) {
+		if($queryValid==false)
+		{
 			$imapFilter->flag('DELETED', $set=false);
 			return $imapFilter;
-		} else {
+		}
+		else
+		{
 			return $imapFilter;
 		}
 	}
@@ -2301,7 +2688,10 @@ 
 					}
 					$stringA[] = imap_rfc822_write_address($_rfcAddr->mailbox,Horde_Idna::decode($_rfcAddr->host),$_rfcAddr->personal);
 				}
-				if (!empty($stringA)) $_string = implode(',',$stringA);
+				if (!empty($stringA))
+				{
+					$_string = implode(',',$stringA);
+				}
 			}
 			if ($_tryIDNConversion==='FORCE')
 			{
@@ -2326,7 +2716,10 @@ 
 		{
 			return 'No Subject';
 		}
-		if ($decode) $_string = self::decode_header($_string);
+		if ($decode)
+		{
+			$_string = self::decode_header($_string);
+		}
 		// make sure its utf-8
 		$test = @json_encode($_string);
 		if (($test=="null" || $test === false || is_null($test)) && strlen($_string)>0)
@@ -2364,7 +2757,8 @@ 
 	 * @param string _parent the parent foldername
 	 * @return ISO-8859-1 / UTF7-IMAP encoded string
 	 */
-	function _encodeFolderName($_folderName) {
+	function _encodeFolderName($_folderName)
+	{
 		return Translation::convert($_folderName, self::$displayCharset, 'ISO-8859-1');
 		#return Translation::convert($_folderName, self::$displayCharset, 'UTF7-IMAP');
 	}
@@ -2380,21 +2774,36 @@ 
 	 */
 	function createFolder($_parent, $_folderName, &$_error)
 	{
-		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '."->"."$_parent, $_folderName called from:".function_backtrace());
+		if (self::$debug)
+		{
+			error_log(__METHOD__.' ('.__LINE__.') '."->"."$_parent, $_folderName called from:".function_backtrace());
+		}
 		$parent		= $_parent;//$this->_encodeFolderName($_parent);
 		$folderName	= $_folderName;//$this->_encodeFolderName($_folderName);
 
-		if(empty($parent)) {
+		if(empty($parent))
+		{
 			$newFolderName = $folderName;
-		} else {
+		}
+		else
+		{
 			$HierarchyDelimiter = $this->getHierarchyDelimiter();
 			$newFolderName = $parent . $HierarchyDelimiter . $folderName;
 		}
-		if (empty($newFolderName)) return false;
-		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.'->'.$newFolderName);
+		if (empty($newFolderName))
+		{
+			return false;
+		}
+		if (self::$debug)
+		{
+			error_log(__METHOD__.' ('.__LINE__.') '.'->'.$newFolderName);
+		}
 		if ($this->folderExists($newFolderName,true))
 		{
-			if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '." Folder $newFolderName already exists.");
+			if (self::$debug)
+			{
+				error_log(__METHOD__.' ('.__LINE__.') '." Folder $newFolderName already exists.");
+			}
 			return $newFolderName;
 		}
 		try
@@ -2442,13 +2851,19 @@ 
 		$parent		= $_parent;//$this->_encodeFolderName($_parent);
 		$folderName	= $_folderName;//$this->_encodeFolderName($_folderName);
 
-		if(empty($parent)) {
+		if(empty($parent))
+		{
 			$newFolderName = $folderName;
-		} else {
+		}
+		else
+		{
 			$HierarchyDelimiter = $this->getHierarchyDelimiter();
 			$newFolderName = $parent . $HierarchyDelimiter . $folderName;
 		}
-		if (self::$debug) error_log("create folder: $newFolderName");
+		if (self::$debug)
+		{
+			error_log("create folder: $newFolderName");
+		}
 		try
 		{
 			$this->icServer->renameMailbox($oldFolderName, $newFolderName);
@@ -2522,8 +2937,14 @@ 
 	 */
 	function getFolderObjects($_subscribedOnly=false, $_getCounters=false, $_alwaysGetDefaultFolders=false,$_useCacheIfPossible=true)
 	{
-		if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' ServerID:'.$this->icServer->ImapServerId.", subscribedOnly:$_subscribedOnly, getCounters:$_getCounters, alwaysGetDefaultFolders:$_alwaysGetDefaultFolders, _useCacheIfPossible:$_useCacheIfPossible");
-		if (self::$debugTimes) $starttime = microtime (true);
+		if (self::$debug)
+		{
+			error_log(__METHOD__.' ('.__LINE__.') '.' ServerID:'.$this->icServer->ImapServerId.", subscribedOnly:$_subscribedOnly, getCounters:$_getCounters, alwaysGetDefaultFolders:$_alwaysGetDefaultFolders, _useCacheIfPossible:$_useCacheIfPossible");
+		}
+		if (self::$debugTimes)
+		{
+			$starttime = microtime (true);
+		}
 		static $folders2return;
 		//$_subscribedOnly=false;
 		// always use static on single request if info is available;
@@ -2531,23 +2952,35 @@ 
 		// set $_useCacheIfPossible to false !
 		if ($_useCacheIfPossible && isset($folders2return[$this->icServer->ImapServerId]) && !empty($folders2return[$this->icServer->ImapServerId]))
 		{
-			if (self::$debugTimes) self::logRunTimes($starttime,null,'using static',__METHOD__.' ('.__LINE__.') ');
+			if (self::$debugTimes)
+			{
+				self::logRunTimes($starttime,null,'using static',__METHOD__.' ('.__LINE__.') ');
+			}
 			return $folders2return[$this->icServer->ImapServerId];
 		}
 
 		if ($_subscribedOnly && $_getCounters===false)
 		{
-			if (is_null($folders2return)) $folders2return = Cache::getCache(Cache::INSTANCE,'email','folderObjects'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
+			if (is_null($folders2return))
+			{
+				$folders2return = Cache::getCache(Cache::INSTANCE,'email','folderObjects'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
+			}
 			if ($_useCacheIfPossible && isset($folders2return[$this->icServer->ImapServerId]) && !empty($folders2return[$this->icServer->ImapServerId]))
 			{
 				//error_log(__METHOD__.' ('.__LINE__.') '.' using Cached folderObjects'.array2string($folders2return[$this->icServer->ImapServerId]));
-				if (self::$debugTimes) self::logRunTimes($starttime,null,'from Cache',__METHOD__.' ('.__LINE__.') ');
+				if (self::$debugTimes)
+				{
+					self::logRunTimes($starttime,null,'from Cache',__METHOD__.' ('.__LINE__.') ');
+				}
 				return $folders2return[$this->icServer->ImapServerId];
 			}
 		}
 		// use $folderBasicInfo for holding attributes and other basic folderinfo $folderBasicInfo[$this->icServer->ImapServerId]
 		static $folderBasicInfo;
-		if (is_null($folderBasicInfo)||!isset($folderBasicInfo[$this->icServer->ImapServerId])) $folderBasicInfo = Cache::getCache(Cache::INSTANCE,'email','folderBasicInfo'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
+		if (is_null($folderBasicInfo)||!isset($folderBasicInfo[$this->icServer->ImapServerId]))
+		{
+			$folderBasicInfo = Cache::getCache(Cache::INSTANCE,'email','folderBasicInfo'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
+		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string(array_keys($folderBasicInfo[$this->icServer->ImapServerId])));
 
 		$delimiter = $this->getHierarchyDelimiter();
@@ -2560,7 +2993,8 @@ 
 		$inboxData->shortFolderName	= 'INBOX';
 		$inboxData->shortDisplayName	= lang('INBOX');
 		$inboxData->subscribed = true;
-		if($_getCounters == true) {
+		if($_getCounters == true)
+		{
 			$inboxData->counter = $this->getMailBoxCounters('INBOX');
 		}
 		// force unsubscribed by preference showAllFoldersInFolderPane
@@ -2579,12 +3013,14 @@ 
 		//error_log(__METHOD__.__LINE__.array2string($nameSpace));
 		if (is_array($nameSpace))
 		{
-			foreach($nameSpace as $k => $singleNameSpace) {
+			foreach($nameSpace as $k => $singleNameSpace)
+			{
 				$type = $singleNameSpace['type'];
 				// the following line (assumption that for the same namespace the delimiter should be equal) may be wrong
 				$foldersNameSpace[$type]['delimiter']  = $singleNameSpace['delimiter'];
 
-				if(is_array($singleNameSpace)&&$fetchedAllInOneGo==false) {
+				if(is_array($singleNameSpace)&&$fetchedAllInOneGo==false)
+				{
 					// fetch and sort the subscribed folders
 					// we alway fetch the subscribed, as this provides the only way to tell
 					// if a folder is subscribed or not
@@ -2635,8 +3071,12 @@ 
 							}
 						}
 						//error_log(__METHOD__.' ('.__LINE__.') '.' '.$type.'->'.array2string($foldersNameSpace[$type]['subscribed']));
-						if (!is_array($foldersNameSpace[$type]['all'])) $foldersNameSpace[$type]['all'] = array();
-						if ($_subscribedOnly == true && !empty($foldersNameSpace[$type]['subscribed'])) {
+						if (!is_array($foldersNameSpace[$type]['all']))
+						{
+							$foldersNameSpace[$type]['all'] = array();
+						}
+						if ($_subscribedOnly == true && !empty($foldersNameSpace[$type]['subscribed']))
+						{
 							continue;
 						}
 
@@ -2666,7 +3106,8 @@ 
 					}
 
 					//error_log(__METHOD__.' ('.__LINE__.') '.' '.$type.'->'.array2string($allMailboxesExt));
-					foreach ($allMailboxesExt as $mbx) {
+					foreach ($allMailboxesExt as $mbx)
+					{
 						if (!isset($folderBasicInfo[$this->icServer->ImapServerId][$mbx['MAILBOX']]))
 						{
 							$folderBasicInfo[$this->icServer->ImapServerId][$mbx['MAILBOX']]=array(
@@ -2689,20 +3130,33 @@ 
 						if (isset($allMailBoxesExtSorted[$mbx['MAILBOX']])||
 							isset($allMailBoxesExtSorted[$mbx['MAILBOX'].$foldersNameSpace[$type]['delimiter']])||
 							(substr($mbx['MAILBOX'],-1)==$foldersNameSpace[$type]['delimiter'] && isset($allMailBoxesExtSorted[substr($mbx['MAILBOX'],0,-1)]))
-						) continue;
+						)
+						{
+							continue;
+						}
 
 						//echo '#'.$mbx['MAILBOX'].':'.array2string($mbx)."#<br>";
 						$allMailBoxesExtSorted[$mbx['MAILBOX']] = $mbx;
 					}
-					if (is_array($allMailBoxesExtSorted)) ksort($allMailBoxesExtSorted);
+					if (is_array($allMailBoxesExtSorted))
+					{
+						ksort($allMailBoxesExtSorted);
+					}
 					//_debug_array(array_keys($allMailBoxesExtSorted));
 					$allMailboxes = array();
-					foreach ((array)$allMailBoxesExtSorted as $mbx) {
-						if (!in_array($mbx['MAILBOX'],$allMailboxes)) $allMailboxes[] = $mbx['MAILBOX'];
+					foreach ((array)$allMailBoxesExtSorted as $mbx)
+					{
+						if (!in_array($mbx['MAILBOX'],$allMailboxes))
+						{
+							$allMailboxes[] = $mbx['MAILBOX'];
+						}
 						//echo "Result:";_debug_array($allMailboxes);
 					}
 					$foldersNameSpace[$type]['all'] = $allMailboxes;
-					if (is_array($foldersNameSpace[$type]['all'])) sort($foldersNameSpace[$type]['all']);
+					if (is_array($foldersNameSpace[$type]['all']))
+					{
+						sort($foldersNameSpace[$type]['all']);
+					}
 				}
 			}
 		}
@@ -2711,24 +3165,50 @@ 
 		//echo "<br>FolderNameSpace To Process:";_debug_array($foldersNameSpace);
 		$autoFolderObjects = $folders = array();
 		$autofolder_exists = array();
-		foreach( array('personal', 'others', 'shared') as $type) {
-			if(isset($foldersNameSpace[$type])) {
-				if($_subscribedOnly) {
-					if( !empty($foldersNameSpace[$type]['subscribed']) ) $listOfFolders = $foldersNameSpace[$type]['subscribed'];
-				} else {
-					if( !empty($foldersNameSpace[$type]['all'])) $listOfFolders = $foldersNameSpace[$type]['all'];
-				}
-				foreach((array)$listOfFolders as $folderName) {
+		foreach( array('personal', 'others', 'shared') as $type)
+		{
+			if(isset($foldersNameSpace[$type]))
+			{
+				if($_subscribedOnly)
+				{
+					if( !empty($foldersNameSpace[$type]['subscribed']) )
+					{
+						$listOfFolders = $foldersNameSpace[$type]['subscribed'];
+					}
+				}
+				else
+				{
+					if( !empty($foldersNameSpace[$type]['all']))
+					{
+						$listOfFolders = $foldersNameSpace[$type]['all'];
+					}
+				}
+				foreach((array)$listOfFolders as $folderName)
+				{
 					//echo "<br>FolderToCheck:$folderName<br>";
 					//error_log(__METHOD__.__LINE__.'#Delimiter:'.$delimiter.':#'.$folderName);
-					if ($_subscribedOnly && empty($foldersNameSpace[$type]['all'])) continue;//when subscribedonly, we fetch all folders in one go.
-					if($_subscribedOnly && !(in_array($folderName, $foldersNameSpace[$type]['all'])||in_array($folderName.$foldersNameSpace[$type]['delimiter'], $foldersNameSpace[$type]['all']))) {
+					if ($_subscribedOnly && empty($foldersNameSpace[$type]['all']))
+					{
+						continue;
+					}
+					//when subscribedonly, we fetch all folders in one go.
+					if($_subscribedOnly && !(in_array($folderName, $foldersNameSpace[$type]['all'])||in_array($folderName.$foldersNameSpace[$type]['delimiter'], $foldersNameSpace[$type]['all'])))
+					{
 						#echo "$folderName failed to be here <br>";
 						continue;
 					}
-					if (isset($folders[$folderName])) continue;
-					if (isset($autoFolderObjects[$folderName])) continue;
-					if (empty($delimiter)||$delimiter != $foldersNameSpace[$type]['delimiter']) $delimiter = $foldersNameSpace[$type]['delimiter'];
+					if (isset($folders[$folderName]))
+					{
+						continue;
+					}
+					if (isset($autoFolderObjects[$folderName]))
+					{
+						continue;
+					}
+					if (empty($delimiter)||$delimiter != $foldersNameSpace[$type]['delimiter'])
+					{
+						$delimiter = $foldersNameSpace[$type]['delimiter'];
+					}
 					$folderParts = explode($delimiter, $folderName);
 					$shortName = array_pop($folderParts);
 
@@ -2736,17 +3216,20 @@ 
 					$folderObject->delimiter	= $delimiter;
 					$folderObject->folderName	= $folderName;
 					$folderObject->shortFolderName	= $shortName;
-					if(!$_subscribedOnly) {
+					if(!$_subscribedOnly)
+					{
 						#echo $folderName."->".$type."<br>";
 						#_debug_array($foldersNameSpace[$type]['subscribed']);
 						$folderObject->subscribed = in_array($folderName, (array)$foldersNameSpace[$type]['subscribed']);
 					}
 
-					if($_getCounters == true) {
+					if($_getCounters == true)
+					{
 						//error_log(__METHOD__.' ('.__LINE__.') '.' getCounter forFolder:'.$folderName);
 						$folderObject->counter = $this->getMailBoxCounters($folderName);
 					}
-					if(strtoupper($folderName) == 'INBOX') {
+					if(strtoupper($folderName) == 'INBOX')
+					{
 						$folderName = 'INBOX';
 						$folderObject->folderName	= 'INBOX';
 						$folderObject->shortFolderName	= 'INBOX';
@@ -2754,24 +3237,34 @@ 
 						$folderObject->shortDisplayName = lang('INBOX');
 						$folderObject->subscribed	= true;
 					// translate the automatic Folders (Sent, Drafts, ...) like the INBOX
-					} elseif (in_array($shortName,self::$autoFolders)) {
+					}
+					elseif (in_array($shortName,self::$autoFolders))
+					{
 						$tmpfolderparts = explode($delimiter,$folderObject->folderName);
 						array_pop($tmpfolderparts);
 						$folderObject->displayName = implode($delimiter,$tmpfolderparts).$delimiter.lang($shortName);
 						$folderObject->shortDisplayName = lang($shortName);
 						unset($tmpfolderparts);
-					} else {
+					}
+					else
+					{
 						$folderObject->displayName = $folderObject->folderName;
 						$folderObject->shortDisplayName = $shortName;
 					}
 					//$folderName = $folderName;
-					if (in_array($shortName,self::$autoFolders)&&self::searchValueInFolderObjects($shortName,$autoFolderObjects)===false) {
+					if (in_array($shortName,self::$autoFolders)&&self::searchValueInFolderObjects($shortName,$autoFolderObjects)===false)
+					{
 						$autoFolderObjects[$folderName] = $folderObject;
-					} else {
+					}
+					else
+					{
 						$folders[$folderName] = $folderObject;
 					}
 					//error_log(__METHOD__.' ('.__LINE__.') '.':'.$folderObject->folderName);
-					if (!isset(self::$specialUseFolders)) $this->getSpecialUseFolders ();
+					if (!isset(self::$specialUseFolders))
+					{
+						$this->getSpecialUseFolders ();
+					}
 					if (isset(self::$specialUseFolders[$folderName]))
 					{
 						$autofolder_exists[$folderName] = self::$specialUseFolders[$folderName];
@@ -2779,7 +3272,8 @@ 
 				}
 			}
 		}
-		if (is_array($autoFolderObjects) && !empty($autoFolderObjects)) {
+		if (is_array($autoFolderObjects) && !empty($autoFolderObjects))
+		{
 			uasort($autoFolderObjects,array($this,"sortByAutoFolderPos"));
 		}
 		// check if some standard folders are missing and need to be created
@@ -2788,7 +3282,10 @@ 
 			// if new folders have been created, re-read folders ignoring the cache
 			return $this->getFolderObjects($_subscribedOnly, $_getCounters, $_alwaysGetDefaultFolders, false);	// false = do NOT use cache
 		}
-		if (is_array($folders)) uasort($folders,array($this,"sortByDisplayName"));
+		if (is_array($folders))
+		{
+			uasort($folders,array($this,"sortByDisplayName"));
+		}
 		//$folders2return = array_merge($autoFolderObjects,$folders);
 		//_debug_array($folders2return); #exit;
 		$folders2return[$this->icServer->ImapServerId] = array_merge((array)$inboxFolderObject,(array)$autoFolderObjects,(array)$folders);
@@ -2800,7 +3297,10 @@ 
 			Cache::setCache(Cache::INSTANCE,'email','folderObjects'.trim($GLOBALS['egw_info']['user']['account_id']),$folders2return,$expiration=60*60*1);
 		}
 		Cache::setCache(Cache::INSTANCE,'email','folderBasicInfo'.trim($GLOBALS['egw_info']['user']['account_id']),$folderBasicInfo,$expiration=60*60*1);
-		if (self::$debugTimes) self::logRunTimes($starttime,null,function_backtrace(),__METHOD__.' ('.__LINE__.') ');
+		if (self::$debugTimes)
+		{
+			self::logRunTimes($starttime,null,function_backtrace(),__METHOD__.' ('.__LINE__.') ');
+		}
 		return $folders2return[$this->icServer->ImapServerId];
 	}
 
@@ -2828,31 +3328,44 @@ 
 
 		$folders = $nameSpace =  array();
 		$nameSpaceTmp = $this->_getNameSpaces();
-		foreach($nameSpaceTmp as $k => $singleNameSpace) {
+		foreach($nameSpaceTmp as $k => $singleNameSpace)
+		{
 			$nameSpace[$singleNameSpace['type']]=$singleNameSpace;
 		}
 		unset($nameSpaceTmp);
 
 		//error_log(__METHOD__.__LINE__.array2string($nameSpace));
 		// Get special use folders
-		if (!isset(self::$specialUseFolders)) $this->getSpecialUseFolders (); // Set self::$specialUseFolders
+		if (!isset(self::$specialUseFolders))
+		{
+			$this->getSpecialUseFolders ();
+		}
+		// Set self::$specialUseFolders
 		// topLevelQueries generally ignore the $_search param. Except for Config::examineNamespace
-		if ($_onlyTopLevel) // top level leaves
+		if ($_onlyTopLevel)
+		{
+			// top level leaves
 		{
 			// Get top mailboxes of icServer
 			$topFolders = $this->icServer->getMailboxes("", 2, true);
+		}
 			// Trigger examination of namespace to retrieve
 			// folders located in other and shared; needed only for some servers
-			if (is_null(self::$mailConfig)) self::$mailConfig = Config::read('mail');
+			if (is_null(self::$mailConfig))
+			{
+				self::$mailConfig = Config::read('mail');
+			}
 			if (self::$mailConfig['examineNamespace'])
 			{
 				$prefixes=array();
 				if (is_array($nameSpace))
 				{
-					foreach($nameSpace as $k => $singleNameSpace) {
+					foreach($nameSpace as $k => $singleNameSpace)
+					{
 						$type = $singleNameSpace['type'];
 
-						if(is_array($singleNameSpace) && $singleNameSpace['prefix']){
+						if(is_array($singleNameSpace) && $singleNameSpace['prefix'])
+						{
 							$prefixes[$type] = $singleNameSpace['prefix'];
 							//regard extra care for nameSpacequeries when configured AND respect $_search
 							$result = $this->icServer->getMailboxes($singleNameSpace['prefix'], $_search==0?0:2, true);
@@ -2928,7 +3441,10 @@ 
 							$nFolders [$path] = $folder;
 						}
 					}
-					if (is_array($aFolders)) uasort ($aFolders, array($this,'sortByAutofolder'));
+					if (is_array($aFolders))
+					{
+						uasort ($aFolders, array($this,'sortByAutofolder'));
+					}
 					//ksort($aFolders);
 
 					// Sort none auto folders base on mailbox name
@@ -2938,12 +3454,17 @@ 
 				}
 				else
 				{
-					if (is_array($subFolders)) ksort($subFolders);
+					if (is_array($subFolders))
+					{
+						ksort($subFolders);
+					}
 				}
 				$folders = array_merge($folders,(array)$mainFolder, (array)$subFolders);
 			}
 		}
-		elseif ($_nodePath) // single node
+		elseif ($_nodePath)
+		{
+			// single node
 		{
 			switch ($_search)
 			{
@@ -2951,6 +3472,7 @@ 
 				case 0:
 				case 2:
 					$path = $_nodePath.''.$delimiter;
+		}
 					break;
 				// Node itself
 				// shouldn't contain next level delimiter
@@ -2969,11 +3491,14 @@ 
 
 			uasort($folders,array($this,'sortByMailbox'));//ksort($folders);
 		}
-		elseif(!$_nodePath) // all
+		elseif(!$_nodePath)
+		{
+			// all
 		{
 			if ($_subscribedOnly)
 			{
 				$folders = $this->icServer->listSubscribedMailboxes('', 0, true);
+		}
 			}
 			else
 			{
@@ -2985,7 +3510,10 @@ 
 		{
 			// SORTING FOLDERS
 			//self::$debugTimes=true;
-			if (self::$debugTimes) $starttime = microtime (true);
+			if (self::$debugTimes)
+			{
+				$starttime = microtime (true);
+			}
 			// Merge of all auto folders and specialusefolders
 			$autoFoldersTmp = array_unique((array_merge(self::$autoFolders, array_values(self::$specialUseFolders))));
 			uasort($folders,array($this,'sortByMailbox'));//ksort($folders);
@@ -2995,73 +3523,103 @@ 
 			$isGoogleMail=false;
 			foreach($autoFoldersTmp as $afk=>$aF)
 			{
-				if (!isset($mySpecialUseFolders[$aF]) && $aF) $mySpecialUseFolders[$aF]=$this->getFolderByType($aF,false);
+				if (!isset($mySpecialUseFolders[$aF]) && $aF)
+				{
+					$mySpecialUseFolders[$aF]=$this->getFolderByType($aF,false);
+				}
 				//error_log($afk.':'.$aF.'->'.$mySpecialUseFolders[$aF]);
 			}
 			//error_log(array2string($mySpecialUseFolders));
-			foreach ($tmpFolders as $k => $f) {
+			foreach ($tmpFolders as $k => $f)
+			{
 				$sorted=false;
-				if (strtoupper(substr($k,0,5))=='INBOX') {
-					if (strtoupper($k)=='INBOX') {
+				if (strtoupper(substr($k,0,5))=='INBOX')
+				{
+					if (strtoupper($k)=='INBOX')
+					{
 						//error_log(__METHOD__.__LINE__.':'.strtoupper(substr($k,0,5)).':'.$k);
 						$inboxFolderObject[$k]=$f;
 						unset($folders[$k]);
 						$sorted=true;
-					} else {
+					}
+					else
+					{
 						$isAutoFolder=false;
 						foreach($autoFoldersTmp as $afk=>$aF)
 						{
 							//error_log(__METHOD__.__LINE__.$k.':'.$aF.'->'.$mySpecialUseFolders[$aF]);
 							if($aF && strlen($mySpecialUseFolders[$aF])&&/*strlen($k)>=strlen($mySpecialUseFolders[$aF])&&*/
 								($mySpecialUseFolders[$aF]==$k || substr($k,0,strlen($mySpecialUseFolders[$aF].$delimiter))==$mySpecialUseFolders[$aF].$delimiter || //k may be child of an autofolder
-								stristr($mySpecialUseFolders[$aF],$k.$delimiter)!==false)) // k is parent of an autofolder
+								stristr($mySpecialUseFolders[$aF],$k.$delimiter)!==false))
+							{
+								// k is parent of an autofolder
 							{
 								//error_log(__METHOD__.__LINE__.$k.'->'.$mySpecialUseFolders[$aF]);
 								$isAutoFolder=true;
+							}
 								$autoFolderObjects[$k]=$f;
 								break;
 							}
 						}
-						if ($isAutoFolder==false) $inboxSubFolderObjects[$k]=$f;
+						if ($isAutoFolder==false)
+						{
+							$inboxSubFolderObjects[$k]=$f;
+						}
 						unset($folders[$k]);
 						$sorted=true;
 					}
-				} elseif (strtoupper(substr($k,0,13))=='[GOOGLE MAIL]') {
+				}
+				elseif (strtoupper(substr($k,0,13))=='[GOOGLE MAIL]')
+				{
 					$isGoogleMail=true;
-					if (strtoupper($k)=='[GOOGLE MAIL]') {
+					if (strtoupper($k)=='[GOOGLE MAIL]')
+					{
 						$googleMailFolderObject[$k]=$f;
 						unset($folders[$k]);
 						$sorted=true;
-					} else {
+					}
+					else
+					{
 						$isAutoFolder=false;
 						foreach($autoFoldersTmp as $afk=>$aF)
 						{
 							//error_log($k.':'.$aF.'->'.$mySpecialUseFolders[$aF]);
 							if($aF && strlen($mySpecialUseFolders[$aF])&&/*strlen($k)>=strlen($mySpecialUseFolders[$aF])&&*/
 								($mySpecialUseFolders[$aF]==$k || substr($k,0,strlen($mySpecialUseFolders[$aF].$delimiter))==$mySpecialUseFolders[$aF].$delimiter|| //k may be child of an autofolder
-								stristr($mySpecialUseFolders[$aF],$k.$delimiter)!==false)) // k is parent of an autofolder
+								stristr($mySpecialUseFolders[$aF],$k.$delimiter)!==false))
+							{
+								// k is parent of an autofolder
 							{
 								//error_log($k.'->'.$mySpecialUseFolders[$aF]);
 								$isAutoFolder=true;
+							}
 								$googleAutoFolderObjects[$k]=$f;
 								break;
 							}
 						}
-						if ($isAutoFolder==false) $googleSubFolderObjects[$k]=$f;
+						if ($isAutoFolder==false)
+						{
+							$googleSubFolderObjects[$k]=$f;
+						}
 						unset($folders[$k]);
 						$sorted=true;
 					}
-				} else {
+				}
+				else
+				{
 					$isAutoFolder=false;
 					foreach($autoFoldersTmp as $afk=>$aF)
 					{
 						//error_log($k.':'.$aF.'->'.$mySpecialUseFolders[$aF]);
 						if($aF && strlen($mySpecialUseFolders[$aF])&&/*strlen($k)>=strlen($mySpecialUseFolders[$aF])&&*/
 								($mySpecialUseFolders[$aF]==$k || substr($k,0,strlen($mySpecialUseFolders[$aF].$delimiter))==$mySpecialUseFolders[$aF].$delimiter|| //k may be child of an autofolder
-								stristr($mySpecialUseFolders[$aF],$k.$delimiter)!==false)) // k is parent of an autofolder
+								stristr($mySpecialUseFolders[$aF],$k.$delimiter)!==false))
+						{
+							// k is parent of an autofolder
 						{
 							//error_log($k.'->'.$mySpecialUseFolders[$aF]);
 							$isAutoFolder=true;
+						}
 							$autoFolderObjects[$k]=$f;
 							unset($folders[$k]);
 							$sorted=true;
@@ -3077,7 +3635,8 @@ 
 						if ($nameSpace[$type]['prefix_present']&&$nameSpace[$type]['prefix'])
 						{
 							if (substr($k,0,strlen($nameSpace[$type]['prefix']))==$nameSpace[$type]['prefix']||
-								substr($k,0,strlen($nameSpace[$type]['prefix'])-strlen($nameSpace[$type]['delimiter']))==substr($nameSpace[$type]['prefix'],0,strlen($nameSpace[$type]['delimiter'])*-1)) {
+								substr($k,0,strlen($nameSpace[$type]['prefix'])-strlen($nameSpace[$type]['delimiter']))==substr($nameSpace[$type]['prefix'],0,strlen($nameSpace[$type]['delimiter'])*-1))
+							{
 								//error_log(__METHOD__.__LINE__.':'.substr($k,0,strlen($nameSpace[$type]['prefix'])).':'.$k);
 								$typeFolderObject[$type][$k]=$f;
 								unset($folders[$k]);
@@ -3104,9 +3663,12 @@ 
 				}
 			}
 			//error_log(__METHOD__.__LINE__.array2string($autoFolderObjects));
-			if (!$isGoogleMail) {
+			if (!$isGoogleMail)
+			{
 				$folders = array_merge($inboxFolderObject,$autoFolderObjects,(array)$inboxSubFolderObjects,(array)$folders,(array)$typeFolderObject['others'],(array)$typeFolderObject['shared']);
-			} else {
+			}
+			else
+			{
 				// avoid calling sortByAutoFolder as it is not regarding subfolders
 				$gAutoFolderObjectsTmp = $googleAutoFolderObjects;
 				unset($googleAutoFolderObjects);
@@ -3123,7 +3685,10 @@ 
 				}
 				$folders = array_merge($inboxFolderObject,$autoFolderObjects,(array)$folders,(array)$googleMailFolderObject,$googleAutoFolderObjects,$googleSubFolderObjects,(array)$typeFolderObject['others'],(array)$typeFolderObject['shared']);
 			}
-			if (self::$debugTimes) self::logRunTimes($starttime,null,function_backtrace(),__METHOD__.' ('.__LINE__.') Sorting:');
+			if (self::$debugTimes)
+			{
+				self::logRunTimes($starttime,null,function_backtrace(),__METHOD__.' ('.__LINE__.') Sorting:');
+			}
 			//self::$debugTimes=false;
 		}
 		// Get counter information and add them to each fetched folders array
@@ -3173,7 +3738,13 @@ 
 		$rv = false;
 		foreach ($haystack as $k => $v)
 		{
-			foreach($v as &$sv) {if (trim($sv)==trim($needle)) return $k;}
+			foreach($v as &$sv)
+			{
+if (trim($sv)==trim($needle))
+			{
+				return $k;
+			}
+			}
 		}
 		return $rv;
 	}
@@ -3200,7 +3771,10 @@ 
 	 */
 	static function pathToFolderData ($_path, $_hDelimiter)
 	{
-		if (!strpos($_path, self::DELIMITER)) $_path = self::DELIMITER.$_path;
+		if (!strpos($_path, self::DELIMITER))
+		{
+			$_path = self::DELIMITER.$_path;
+		}
 		list(,$path) = explode(self::DELIMITER, $_path);
 		$path_chain = $parts = explode($_hDelimiter, $path);
 		$name = array_pop($parts);
@@ -3229,7 +3803,10 @@ 
 		$b = self::pathToFolderData($_b['MAILBOX'], $_b['delimiter']);
 		$pos1 = array_search(trim($a['name']),self::$autoFolders);
 		$pos2 = array_search(trim($b['name']),self::$autoFolders);
-		if ($pos1 == $pos2) return 0;
+		if ($pos1 == $pos2)
+		{
+			return 0;
+		}
 		return ($pos1 < $pos2) ? -1 : 1;
 	}
 
@@ -3260,7 +3837,10 @@ 
 		// 0, 1 und -1
 		$pos1 = array_search(trim($a->shortFolderName),self::$autoFolders);
 		$pos2 = array_search(trim($b->shortFolderName),self::$autoFolders);
-		if ($pos1 == $pos2) return 0;
+		if ($pos1 == $pos2)
+		{
+			return 0;
+		}
 		return ($pos1 < $pos2) ? -1 : 1;
 	}
 
@@ -3281,11 +3861,18 @@ 
 		}
 		catch (\Exception $e)
 		{
-			if (self::$debug) error_log(__METHOD__." returned FolderStatus for Folder $folderName:".$e->getMessage());
+			if (self::$debug)
+			{
+				error_log(__METHOD__." returned FolderStatus for Folder $folderName:".$e->getMessage());
+			}
 			return false;
 		}
-		if(is_array($folderStatus)) {
-			if ($_returnObject===false) return $folderStatus;
+		if(is_array($folderStatus))
+		{
+			if ($_returnObject===false)
+			{
+				return $folderStatus;
+			}
 			$status =  new \stdClass;
 			$status->messages   = $folderStatus['MESSAGES'];
 			$status->unseen     = $folderStatus['UNSEEN'];
@@ -3312,7 +3899,8 @@ 
 	{
 		#echo __METHOD__." retrieve SubFolders for $_mailbox$delimiter <br>";
 		$maxreclevel=25;
-		if ($reclevel > $maxreclevel) {
+		if ($reclevel > $maxreclevel)
+		{
 			error_log( __METHOD__." Recursion Level Exeeded ($reclevel) while looking up $_mailbox$delimiter ");
 			return array();
 		}
@@ -3326,7 +3914,8 @@ 
 //error_log(__METHOD__.' ('.__LINE__.') '.' Delimiter:'.array2string($delimiter));
 //error_log(__METHOD__.' ('.__LINE__.') '.array2string($mbx));
 		// Example: Array([INBOX/GaGa] => Array([MAILBOX] => INBOX/GaGa[ATTRIBUTES] => Array([0] => \\unmarked)[delimiter] => /))
-		if (is_array($mbx[$mbxkeys[0]]["ATTRIBUTES"]) && (in_array('\HasChildren',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\Haschildren',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\haschildren',$mbx[$mbxkeys[0]]["ATTRIBUTES"]))) {
+		if (is_array($mbx[$mbxkeys[0]]["ATTRIBUTES"]) && (in_array('\HasChildren',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\Haschildren',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\haschildren',$mbx[$mbxkeys[0]]["ATTRIBUTES"])))
+		{
 			// if there are children fetch them
 			//echo $mbx[$mbxkeys[0]]['MAILBOX']."<br>";
 
@@ -3334,7 +3923,8 @@ 
 			//$buff = $this->icServer->getMailboxes($mbx[$mbxkeys[0]]['MAILBOX'],2,false);
 			//_debug_array($buff);
 			$allMailboxes = array();
-			foreach ($buff as $mbxname) {
+			foreach ($buff as $mbxname)
+			{
 //error_log(__METHOD__.' ('.__LINE__.') '.array2string($mbxname));
 				$mbxname = preg_replace('~'.($delimiter == '.' ? "\\".$delimiter:$delimiter).'+~s',$delimiter,$mbxname['MAILBOX']);
 				#echo "About to recur in level $reclevel:".$mbxname."<br>";
@@ -3343,9 +3933,14 @@ 
 					$allMailboxes = array_merge($allMailboxes, self::getMailBoxesRecursive($mbxname, $delimiter, $prefix, $reclevel));
 				}
 			}
-			if (!(in_array('\NoSelect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\Noselect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\noselect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]))) $allMailboxes[] = $mbx[$mbxkeys[0]]['MAILBOX'];
+			if (!(in_array('\NoSelect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\Noselect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\noselect',$mbx[$mbxkeys[0]]["ATTRIBUTES"])))
+			{
+				$allMailboxes[] = $mbx[$mbxkeys[0]]['MAILBOX'];
+			}
 			return $allMailboxes;
-		} else {
+		}
+		else
+		{
 			return array($_mailbox);
 		}
 	}
@@ -3369,14 +3964,21 @@ 
 			'Outbox'   => array('profileKey'=>'acc_folder_outbox','autoFolderName'=>'Outbox'),
 			'Archive'   => array('profileKey'=>'acc_folder_archive','autoFolderName'=>'Archive'),
 		);
-		if ($_type == 'Templates') $_type = 'Template';	// for some reason self::$autofolders uses 'Templates'!
+		if ($_type == 'Templates')
+		{
+			$_type = 'Template';
+		}
+		// for some reason self::$autofolders uses 'Templates'!
 		$created = false;
 		if (!isset($types[$_type]))
 		{
 			error_log(__METHOD__.' ('.__LINE__.') '.' '.$_type.' not supported for '.__METHOD__);
 			return false;
 		}
-		if (is_null(self::$specialUseFolders) || empty(self::$specialUseFolders)) self::$specialUseFolders = $this->getSpecialUseFolders();
+		if (is_null(self::$specialUseFolders) || empty(self::$specialUseFolders))
+		{
+			self::$specialUseFolders = $this->getSpecialUseFolders();
+		}
 
 		//highest precedence
 		try
@@ -3386,25 +3988,39 @@ 
 		catch (\Exception $e)
 		{
 			// we know that outbox is not supported, but we use this here, as we autocreate expected SpecialUseFolders in this function
-			if ($_type != 'Outbox') error_log(__METHOD__.' ('.__LINE__.') '.' Failed to retrieve Folder'.$_folderName." for ".array2string($types[$_type]).":".$e->getMessage());
+			if ($_type != 'Outbox')
+			{
+				error_log(__METHOD__.' ('.__LINE__.') '.' Failed to retrieve Folder'.$_folderName." for ".array2string($types[$_type]).":".$e->getMessage());
+			}
 			$_folderName = false;
 		}
 		// do not try to autocreate configured Archive-Folder. Return false if configured folder does not exist
-		if ($_type == 'Archive') {
-			if ($_folderName && $_checkexistance && strtolower($_folderName) !='none' && !$this->folderExists($_folderName,true)) {
+		if ($_type == 'Archive')
+		{
+			if ($_folderName && $_checkexistance && strtolower($_folderName) !='none' && !$this->folderExists($_folderName,true))
+			{
 				return false;
-			} else {
+			}
+			else
+			{
 				return $_folderName;
 			}
 
 		}
 		// does the folder exist??? (is configured/preset, but non-existent)
-		if ($_folderName && $_checkexistance && strtolower($_folderName) !='none' && !$this->folderExists($_folderName,true)) {
+		if ($_folderName && $_checkexistance && strtolower($_folderName) !='none' && !$this->folderExists($_folderName,true))
+		{
 			try
 			{
 				$error = null;
-				if (($_folderName = $this->createFolder('', $_folderName, $error))) $created = true;
-				if ($error) error_log(__METHOD__.' ('.__LINE__.') '.' Failed to create Folder '.$_folderName." for $_type:".$error);
+				if (($_folderName = $this->createFolder('', $_folderName, $error)))
+				{
+					$created = true;
+				}
+				if ($error)
+				{
+					error_log(__METHOD__.' ('.__LINE__.') '.' Failed to create Folder '.$_folderName." for $_type:".$error);
+				}
 			}
 			catch(Exception $e)
 			{
@@ -3413,9 +4029,16 @@ 
 			}
 		}
 		// not sure yet if false is the correct behavior on none
-		if ($_folderName =='none') return 'none' ; //false;
+		if ($_folderName =='none')
+		{
+			return 'none' ;
+		}
+		//false;
 		//no (valid) folder found yet; try specialUseFolders
-		if (empty($_folderName) && is_array(self::$specialUseFolders) && ($f = array_search($_type,self::$specialUseFolders))) $_folderName = $f;
+		if (empty($_folderName) && is_array(self::$specialUseFolders) && ($f = array_search($_type,self::$specialUseFolders)))
+		{
+			$_folderName = $f;
+		}
 		//no specialUseFolder; try some Defaults
 		if (empty($_folderName) && isset($types[$_type]))
 		{
@@ -3441,7 +4064,10 @@ 
 					$error = null;
 					$this->createFolder('', $prefix.$types[$_type]['autoFolderName'],$error);
 					$_folderName = $prefix.$types[$_type]['autoFolderName'];
-					if ($error) error_log(__METHOD__.' ('.__LINE__.') '.' Failed to create Folder '.$_folderName." for $_type:".$error);
+					if ($error)
+					{
+						error_log(__METHOD__.' ('.__LINE__.') '.' Failed to create Folder '.$_folderName." for $_type:".$error);
+					}
 				}
 				catch(Exception $e)
 				{
@@ -3543,17 +4169,22 @@ 
 	function isSentFolder($_folderName, $_checkexistance=TRUE)
 	{
 		$sentFolder = $this->getSentFolder($_checkexistance);
-		if(empty($sentFolder)) {
+		if(empty($sentFolder))
+		{
 			return false;
 		}
 		// does the folder exist???
-		if ($_checkexistance && !$this->folderExists($_folderName)) {
+		if ($_checkexistance && !$this->folderExists($_folderName))
+		{
 			return false;
 		}
 
-		if(false !== stripos($_folderName, $sentFolder)) {
+		if(false !== stripos($_folderName, $sentFolder))
+		{
 			return true;
-		} else {
+		}
+		else
+		{
 			return false;
 		}
 	}
@@ -3566,15 +4197,20 @@ 
 	 */
 	function isOutbox($_folderName, $_checkexistance=TRUE)
 	{
-		if (stripos($_folderName, 'Outbox')===false) {
+		if (stripos($_folderName, 'Outbox')===false)
+		{
 			return false;
 		}
 		// does the folder exist???
-		if ($_checkexistance && $GLOBALS['egw_info']['user']['apps']['activesync'] && !$this->folderExists($_folderName)) {
+		if ($_checkexistance && $GLOBALS['egw_info']['user']['apps']['activesync'] && !$this->folderExists($_folderName))
+		{
 			$outboxFolder = $this->getOutboxFolder($_checkexistance);
-			if(false !== stripos($_folderName, $outboxFolder)) {
+			if(false !== stripos($_folderName, $outboxFolder))
+			{
 				return true;
-			} else {
+			}
+			else
+			{
 				return false;
 			}
 		}
@@ -3590,17 +4226,25 @@ 
 	function isDraftFolder($_folderName, $_checkexistance=TRUE)
 	{
 		$draftFolder = $this->getDraftFolder($_checkexistance);
-		if(empty($draftFolder)) {
+		if(empty($draftFolder))
+		{
 			return false;
 		}
 		// does the folder exist???
-		if ($_checkexistance && !$this->folderExists($_folderName)) {
+		if ($_checkexistance && !$this->folderExists($_folderName))
+		{
 			return false;
 		}
-		if (is_a($_folderName,"Horde_Imap_Client_Mailbox")) $_folderName = $_folderName->utf8;
-		if(false !== stripos($_folderName, $draftFolder)) {
+		if (is_a($_folderName,"Horde_Imap_Client_Mailbox"))
+		{
+			$_folderName = $_folderName->utf8;
+		}
+		if(false !== stripos($_folderName, $draftFolder))
+		{
 			return true;
-		} else {
+		}
+		else
+		{
 			return false;
 		}
 	}
@@ -3614,17 +4258,22 @@ 
 	function isTrashFolder($_folderName, $_checkexistance=TRUE)
 	{
 		$trashFolder = $this->getTrashFolder($_checkexistance);
-		if(empty($trashFolder)) {
+		if(empty($trashFolder))
+		{
 			return false;
 		}
 		// does the folder exist???
-		if ($_checkexistance && !$this->folderExists($_folderName)) {
+		if ($_checkexistance && !$this->folderExists($_folderName))
+		{
 			return false;
 		}
 
-		if(false !== stripos($_folderName, $trashFolder)) {
+		if(false !== stripos($_folderName, $trashFolder))
+		{
 			return true;
-		} else {
+		}
+		else
+		{
 			return false;
 		}
 	}
@@ -3638,17 +4287,22 @@ 
 	function isTemplateFolder($_folderName, $_checkexistance=TRUE)
 	{
 		$templateFolder = $this->getTemplateFolder($_checkexistance);
-		if(empty($templateFolder)) {
+		if(empty($templateFolder))
+		{
 			return false;
 		}
 		// does the folder exist???
-		if ($_checkexistance && !$this->folderExists($_folderName)) {
+		if ($_checkexistance && !$this->folderExists($_folderName))
+		{
 			return false;
 		}
 
-		if(false !== stripos($_folderName, $templateFolder)) {
+		if(false !== stripos($_folderName, $templateFolder))
+		{
 			return true;
-		} else {
+		}
+		else
+		{
 			return false;
 		}
 	}
@@ -3666,15 +4320,27 @@ 
 		if (empty($_folder))
 		{
 			// this error is more or less without significance, unless we force the check
-			if ($_forceCheck===true) error_log(__METHOD__.' ('.__LINE__.') '.' Called with empty Folder:'.$_folder.function_backtrace());
+			if ($_forceCheck===true)
+			{
+				error_log(__METHOD__.' ('.__LINE__.') '.' Called with empty Folder:'.$_folder.function_backtrace());
+			}
 			return false;
 		}
 		// when check is not enforced , we assume a folder represented as Horde_Imap_Client_Mailbox as existing folder
-		if (is_a($_folder,"Horde_Imap_Client_Mailbox")&&$_forceCheck===false) return true;
-		if (is_a($_folder,"Horde_Imap_Client_Mailbox")) $_folder =  $_folder->utf8;
+		if (is_a($_folder,"Horde_Imap_Client_Mailbox")&&$_forceCheck===false)
+		{
+			return true;
+		}
+		if (is_a($_folder,"Horde_Imap_Client_Mailbox"))
+		{
+			$_folder =  $_folder->utf8;
+		}
 		// reduce traffic within the Instance per User; Expire every 5 hours
 		//error_log(__METHOD__.' ('.__LINE__.') '.' Called with Folder:'.$_folder.function_backtrace());
-		if (is_null($folderInfo)) $folderInfo = Cache::getCache(Cache::INSTANCE,'email','icServerFolderExistsInfo'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),$expiration=60*60*5);
+		if (is_null($folderInfo))
+		{
+			$folderInfo = Cache::getCache(Cache::INSTANCE,'email','icServerFolderExistsInfo'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),$expiration=60*60*5);
+		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.'Cached Info on Folder:'.$_folder.' for Profile:'.$this->profileID.($forceCheck?'(forcedCheck)':'').':'.array2string($folderInfo));
 		if (!empty($folderInfo) && isset($folderInfo[$this->profileID]) && isset($folderInfo[$this->profileID][$_folder]) && $forceCheck===false)
 		{
@@ -3692,7 +4358,8 @@ 
 
 		// does the folder exist???
 		//error_log(__METHOD__."->Connected?".$this->icServer->_connected.", ".$_folder.", ".($forceCheck?' forceCheck activated':'dont check on server'));
-		if ( $forceCheck || empty($folderInfo) || !isset($folderInfo[$this->profileID]) || !isset($folderInfo[$this->profileID][$_folder])) {
+		if ( $forceCheck || empty($folderInfo) || !isset($folderInfo[$this->profileID]) || !isset($folderInfo[$this->profileID][$_folder]))
+		{
 			//error_log(__METHOD__."->NotConnected and forceCheck with profile:".$this->profileID);
 			//return false;
 			//try to connect
@@ -3733,9 +4400,12 @@ 
 
 		$this->icServer->openMailbox($folderName);
 
-		if(strtolower($folderName) == strtolower($trashFolder) && $deleteOptions == "move_to_trash") {
+		if(strtolower($folderName) == strtolower($trashFolder) && $deleteOptions == "move_to_trash")
+		{
 			$this->deleteMessages('all',$folderName,'remove_immediately');
-		} else {
+		}
+		else
+		{
 			$this->icServer->expunge($folderName);
 		}
 	}
@@ -3754,10 +4424,16 @@ 
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.'->'.array2string($_messageUID).','.array2string($_folder).', '.$_forceDeleteMethod);
 		$oldMailbox = '';
-		if (is_null($_folder) || empty($_folder)) $_folder = $this->sessionData['mailbox'];
+		if (is_null($_folder) || empty($_folder))
+		{
+			$_folder = $this->sessionData['mailbox'];
+		}
 		if (empty($_messageUID))
 		{
-			if (self::$debug) error_log(__METHOD__." no messages Message(s): ".implode(',',$_messageUID));
+			if (self::$debug)
+			{
+				error_log(__METHOD__." no messages Message(s): ".implode(',',$_messageUID));
+			}
 			return false;
 		}
 		elseif ($_messageUID==='all')
@@ -3767,32 +4443,48 @@ 
 		else
 		{
 			$uidsToDelete = new Horde_Imap_Client_Ids();
-			if (!(is_object($_messageUID) || is_array($_messageUID))) $_messageUID = (array)$_messageUID;
+			if (!(is_object($_messageUID) || is_array($_messageUID)))
+			{
+				$_messageUID = (array)$_messageUID;
+			}
 			$uidsToDelete->add($_messageUID);
 		}
 		$deleteOptions = $_forceDeleteMethod; // use forceDeleteMethod if not "no", or unknown method
-		if ($_forceDeleteMethod === 'no' || !in_array($_forceDeleteMethod,array('move_to_trash',"mark_as_deleted","remove_immediately"))) $deleteOptions  = ($this->mailPreferences['deleteOptions']?$this->mailPreferences['deleteOptions']:"mark_as_deleted");
+		if ($_forceDeleteMethod === 'no' || !in_array($_forceDeleteMethod,array('move_to_trash',"mark_as_deleted","remove_immediately")))
+		{
+			$deleteOptions  = ($this->mailPreferences['deleteOptions']?$this->mailPreferences['deleteOptions']:"mark_as_deleted");
+		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.'->'.array2string($_messageUID).','.$_folder.'/'.$this->sessionData['mailbox'].' Option:'.$deleteOptions);
 		$trashFolder    = $this->getTrashFolder();
 		$draftFolder	= $this->getDraftFolder(); //$GLOBALS['egw_info']['user']['preferences']['mail']['draftFolder'];
 		$templateFolder = $this->getTemplateFolder(); //$GLOBALS['egw_info']['user']['preferences']['mail']['templateFolder'];
 		if((strtolower($_folder) == strtolower($trashFolder) && $deleteOptions == "move_to_trash") ||
-		   (strtolower($_folder) == strtolower($draftFolder))) {
+		   (strtolower($_folder) == strtolower($draftFolder)))
+		{
 			$deleteOptions = "remove_immediately";
 		}
-		if($this->icServer->getCurrentMailbox() != $_folder) {
+		if($this->icServer->getCurrentMailbox() != $_folder)
+		{
 			$oldMailbox = $this->icServer->getCurrentMailbox();
 			$this->icServer->openMailbox($_folder);
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.'->'.array2string($_messageUID).','.$_folder.'/'.$this->sessionData['mailbox'].' Option:'.$deleteOptions);
 		$updateCache = false;
-		switch($deleteOptions) {
+		switch($deleteOptions)
+		{
 			case "move_to_trash":
 				//error_log(__METHOD__.' ('.__LINE__.') ');
 				$updateCache = true;
-				if(!empty($trashFolder)) {
-					if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.implode(' : ', $_messageUID));
-					if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '."$trashFolder <= $_folder / ". $this->sessionData['mailbox']);
+				if(!empty($trashFolder))
+				{
+					if (self::$debug)
+					{
+						error_log(__METHOD__.' ('.__LINE__.') '.implode(' : ', $_messageUID));
+					}
+					if (self::$debug)
+					{
+						error_log(__METHOD__.' ('.__LINE__.') '."$trashFolder <= $_folder / ". $this->sessionData['mailbox']);
+					}
 					// copy messages
 					try
 					{
@@ -3808,7 +4500,10 @@ 
 			case "mark_as_deleted":
 				//error_log(__METHOD__.' ('.__LINE__.') ');
 				// mark messages as deleted
-				if (is_null($_messageUID)) $_messageUID='all';
+				if (is_null($_messageUID))
+				{
+					$_messageUID='all';
+				}
 				foreach((array)$_messageUID as $key =>$uid)
 				{
 					//flag messages, that are flagged for deletion as seen too
@@ -3816,7 +4511,10 @@ 
 					$flags = $this->getFlags($uid);
 					$this->flagMessages('delete', $uid, $_folder);
 					//error_log(__METHOD__.' ('.__LINE__.') '.array2string($flags));
-					if (strpos( array2string($flags),'Deleted')!==false) $undelete[] = $uid;
+					if (strpos( array2string($flags),'Deleted')!==false)
+					{
+						$undelete[] = $uid;
+					}
 					unset($flags);
 				}
 				foreach((array)$undelete as $key =>$uid)
@@ -3828,7 +4526,10 @@ 
 			case "remove_immediately":
 				//error_log(__METHOD__.' ('.__LINE__.') ');
 				$updateCache = true;
-				if (is_null($_messageUID)) $_messageUID='all';
+				if (is_null($_messageUID))
+				{
+					$_messageUID='all';
+				}
 				if (is_object($_messageUID))
 				{
 					$this->flagMessages('delete', $_messageUID, $_folder);
@@ -3845,7 +4546,8 @@ 
 				$this->icServer->expunge($_folder);
 				break;
 		}
-		if($oldMailbox != '') {
+		if($oldMailbox != '')
+		{
 			$this->icServer->openMailbox($oldMailbox);
 		}
 
@@ -3859,11 +4561,15 @@ 
 	 *
 	 * @return null/array flags
 	 */
-	function getFlags ($_messageUID) {
+	function getFlags ($_messageUID)
+	{
 		try
 		{
 			$uidsToFetch = new Horde_Imap_Client_Ids();
-			if (!(is_object($_messageUID) || is_array($_messageUID))) $_messageUID = (array)$_messageUID;
+			if (!(is_object($_messageUID) || is_array($_messageUID)))
+			{
+				$_messageUID = (array)$_messageUID;
+			}
 			$uidsToFetch->add($_messageUID);
 			$_folderName = $this->icServer->getCurrentMailbox();
 			$fquery = new Horde_Imap_Client_Fetch_Query();
@@ -3871,8 +4577,10 @@ 
 			$headersNew = $this->icServer->fetch($_folderName, $fquery, array(
 				'ids' => $uidsToFetch,
 			));
-			if (is_object($headersNew)) {
-				foreach($headersNew->ids() as $id) {
+			if (is_object($headersNew))
+			{
+				foreach($headersNew->ids() as $id)
+				{
 					$_headerObject = $headersNew->get($id);
 					$flags = $_headerObject->getFlags();
 				}
@@ -3897,10 +4605,16 @@ 
 	 */
 	function getNotifyFlags ($_messageUID, $flags=null)
 	{
-		if (self::$debug) error_log(__METHOD__.$_messageUID.' Flags:'.array2string($flags));
+		if (self::$debug)
+		{
+			error_log(__METHOD__.$_messageUID.' Flags:'.array2string($flags));
+		}
 		try
 		{
-			if($flags===null) $flags =  $this->getFlags($_messageUID);
+			if($flags===null)
+			{
+				$flags =  $this->getFlags($_messageUID);
+			}
 		}
 		catch (\Exception $e)
 		{
@@ -3908,10 +4622,14 @@ 
 		}
 
 		if ( stripos( array2string($flags),'MDNSent')!==false)
-			return true;
+		{
+					return true;
+		}
 
 		if ( stripos( array2string($flags),'MDNnotSent')!==false)
-			return false;
+		{
+					return false;
+		}
 
 		return null;
 	}
@@ -3932,7 +4650,10 @@ 
 		//error_log(__METHOD__.' ('.__LINE__.') '.'->' .$_flag." ".array2string($_messageUID).",$_folder /".$this->sessionData['mailbox']);
 		if (empty($_messageUID))
 		{
-			if (self::$debug) error_log(__METHOD__." no messages Message(s): ".implode(',',$_messageUID));
+			if (self::$debug)
+			{
+				error_log(__METHOD__." no messages Message(s): ".implode(',',$_messageUID));
+			}
 			return false;
 		}
 		$this->icServer->openMailbox(($_folder?$_folder:$this->sessionData['mailbox']));
@@ -3940,7 +4661,10 @@ 
 		if (is_array($_messageUID)&& count($_messageUID)>50)
 		{
 			$count = $this->getMailBoxCounters($folder,true);
-			if ($count->messages == count($_messageUID)) $_messageUID='all';
+			if ($count->messages == count($_messageUID))
+			{
+				$_messageUID='all';
+			}
 		}
 
 		if ($_messageUID==='all')
@@ -3949,7 +4673,10 @@ 
 		}
 		else
 		{
-			if (!(is_object($_messageUID) || is_array($_messageUID))) $_messageUID = (array)$_messageUID;
+			if (!(is_object($_messageUID) || is_array($_messageUID)))
+			{
+				$_messageUID = (array)$_messageUID;
+			}
 			$messageUIDs = array_chunk($_messageUID,50,true);
 		}
 		try
@@ -3965,7 +4692,8 @@ 
 					$uidsToModify = new Horde_Imap_Client_Ids();
 					$uidsToModify->add($uids);
 				}
-				switch($_flag) {
+				switch($_flag)
+				{
 					case "delete":
 						$ret = $this->icServer->store($folder, array('add'=>array('\\Deleted'), 'ids'=> $uidsToModify));
 						break;
@@ -4051,7 +4779,10 @@ 
 		{
 			error_log(__METHOD__.__LINE__.' Error, could not flag messages in folder '.$folder.' Reason:'.$e->getMessage());
 		}
-		if ($folder instanceof Horde_Imap_Client_Mailbox) $_folder = $folder->utf8;
+		if ($folder instanceof Horde_Imap_Client_Mailbox)
+		{
+			$_folder = $folder->utf8;
+		}
 		//error_log(__METHOD__.__LINE__.'#'.$this->icServer->ImapServerId.'#'.array2string($_folder).'#');
 		self::$folderStatusCache[$this->icServer->ImapServerId][(!empty($_folder)?$_folder: $this->sessionData['mailbox'])]['uidValidity'] = 0;
 
@@ -4080,7 +4811,10 @@ 
 		//$deleteOptions  = $GLOBALS['egw_info']["user"]["preferences"]["mail"]["deleteOptions"];
 		if (empty($_messageUID))
 		{
-			if (self::$debug) error_log(__METHOD__." no Message(s): ".implode(',',$_messageUID));
+			if (self::$debug)
+			{
+				error_log(__METHOD__." no Message(s): ".implode(',',$_messageUID));
+			}
 			return false;
 		}
 		elseif ($_messageUID==='all')
@@ -4092,7 +4826,10 @@ 
 		{
 			//error_log(__METHOD__." Message(s): ".implode(',',$_messageUID));
 			$uidsToMove = new Horde_Imap_Client_Ids();
-			if (!(is_object($_messageUID) || is_array($_messageUID))) $_messageUID = (array)$_messageUID;
+			if (!(is_object($_messageUID) || is_array($_messageUID)))
+			{
+				$_messageUID = (array)$_messageUID;
+			}
 			$uidsToMove->add($_messageUID);
 		}
 		$sourceFolder = (!empty($currentFolder)?$currentFolder: $this->sessionData['mailbox']);
@@ -4114,12 +4851,14 @@ 
 
 			//error_log(__METHOD__.' ('.__LINE__.') '.' Sourceserver:'.$source->ImapServerId.' mailheaders:'.array2string($headersNew));
 
-			if (is_object($headersNew)) {
+			if (is_object($headersNew))
+			{
 				$c=0;
 				$retUid = new Horde_Imap_Client_Ids();
 				// we copy chunks of 5 to avoid too much memory and/or server stress
 				// some servers seem not to allow/support the appendig of multiple messages. so we are down to one
-				foreach($headersNew as &$_headerObject) {
+				foreach($headersNew as &$_headerObject)
+				{
 					$c++;
 					$flags = $_headerObject->getFlags(); //unseen status seems to be lost when retrieving the full message
 					$date = $_headerObject->getImapDate();
@@ -4203,7 +4942,11 @@ 
 	{
 		try {
 			$date = new DateTime($_date);	// parse date & time including timezone (throws exception, if not parsable)
-			if ($convert2usertime) $date->setUser();	// convert to user-time
+			if ($convert2usertime)
+			{
+				$date->setUser();
+			}
+			// convert to user-time
 			$date2return = $date->format($format);
 		}
 		catch(\Exception $e)
@@ -4235,9 +4978,15 @@ 
 	static function htmlentities($_string, $_charset=false)
 	{
 		//setting the charset (if not given)
-		if ($_charset===false) $_charset = self::$displayCharset;
+		if ($_charset===false)
+		{
+			$_charset = self::$displayCharset;
+		}
 		$string = @htmlentities($_string, ENT_QUOTES, $_charset, false);
-		if (empty($string) && !empty($_string)) $string = @htmlentities(Translation::convert($_string,Translation::detect_encoding($_string),$_charset),ENT_QUOTES | ENT_IGNORE,$_charset, false);
+		if (empty($string) && !empty($_string))
+		{
+			$string = @htmlentities(Translation::convert($_string,Translation::detect_encoding($_string),$_charset),ENT_QUOTES | ENT_IGNORE,$_charset, false);
+		}
 		return $string;
 	}
 
@@ -4257,18 +5006,41 @@ 
 		$_html = str_replace(array('&amp;amp;','<DIV><BR></DIV>',"<DIV>&nbsp;</DIV>",'<div>&nbsp;</div>','</td></font>','<br><td>','<tr></tr>','<o:p></o:p>','<o:p>','</o:p>'),
 							 array('&amp;',    '<BR>',           '<BR>',             '<BR>',             '</font></td>','<td>',    '',         '',           '',  ''),$_html);
 		//$_html = str_replace(array('&amp;amp;'),array('&amp;'),$_html);
-		if (stripos($_html,'style')!==false) Mail\Html::replaceTagsCompletley($_html,'style'); // clean out empty or pagewide style definitions / left over tags
-		if (stripos($_html,'head')!==false) Mail\Html::replaceTagsCompletley($_html,'head'); // Strip out stuff in head
+		if (stripos($_html,'style')!==false)
+		{
+			Mail\Html::replaceTagsCompletley($_html,'style');
+		}
+		// clean out empty or pagewide style definitions / left over tags
+		if (stripos($_html,'head')!==false)
+		{
+			Mail\Html::replaceTagsCompletley($_html,'head');
+		}
+		// Strip out stuff in head
 		//if (stripos($_html,'![if')!==false && stripos($_html,'<![endif]>')!==false) Mail\Html::replaceTagsCompletley($_html,'!\[if','<!\[endif\]>',false); // Strip out stuff in ifs
 		//if (stripos($_html,'!--[if')!==false && stripos($_html,'<![endif]-->')!==false) Mail\Html::replaceTagsCompletley($_html,'!--\[if','<!\[endif\]-->',false); // Strip out stuff in ifs
 		//error_log(__METHOD__.' ('.__LINE__.') '.$_html);
 
-		if (get_magic_quotes_gpc() === 1) $_html = stripslashes($_html);
+		if (get_magic_quotes_gpc() === 1)
+		{
+			$_html = stripslashes($_html);
+		}
 		// Strip out doctype in head, as htmlLawed cannot handle it TODO: Consider extracting it and adding it afterwards
-		if (stripos($_html,'!doctype')!==false) Mail\Html::replaceTagsCompletley($_html,'!doctype');
-		if (stripos($_html,'?xml:namespace')!==false) Mail\Html::replaceTagsCompletley($_html,'\?xml:namespace','/>',false);
-		if (stripos($_html,'?xml version')!==false) Mail\Html::replaceTagsCompletley($_html,'\?xml version','\?>',false);
-		if (strpos($_html,'!CURSOR')!==false) Mail\Html::replaceTagsCompletley($_html,'!CURSOR');
+		if (stripos($_html,'!doctype')!==false)
+		{
+			Mail\Html::replaceTagsCompletley($_html,'!doctype');
+		}
+		if (stripos($_html,'?xml:namespace')!==false)
+		{
+			Mail\Html::replaceTagsCompletley($_html,'\?xml:namespace','/>',false);
+		}
+		if (stripos($_html,'?xml version')!==false)
+		{
+			Mail\Html::replaceTagsCompletley($_html,'\?xml version','\?>',false);
+		}
+		if (strpos($_html,'!CURSOR')!==false)
+		{
+			Mail\Html::replaceTagsCompletley($_html,'!CURSOR');
+		}
 		// htmLawed filter only the 'body'
 		//preg_match('`(<htm.+?<body[^>]*>)(.+?)(</body>.*?</html>)`ims', $_html, $matches);
 		//if ($matches[2])
@@ -4307,8 +5079,10 @@ 
 		//$charSet = 'iso-8859-1';//self::$displayCharset; //'iso-8859-1'; // self::displayCharset seems to be asmarter fallback than iso-8859-1
 		$CharsetFound=false;
 		//echo "#".$_mimePartObject->encoding.'#<br>';
-		if(is_array($_mimePartObject->parameters)) {
-			if(isset($_mimePartObject->parameters['CHARSET'])) {
+		if(is_array($_mimePartObject->parameters))
+		{
+			if(isset($_mimePartObject->parameters['CHARSET']))
+			{
 				$charSet = $_mimePartObject->parameters['CHARSET'];
 				$CharsetFound=true;
 			}
@@ -4329,7 +5103,10 @@ 
 	function decodeMimePart($_mimeMessage, $_encoding, $_charset = '')
 	{
 		// decode the part
-		if (self::$debug) error_log(__METHOD__."() with $_encoding and $_charset:".print_r($_mimeMessage,true));
+		if (self::$debug)
+		{
+			error_log(__METHOD__."() with $_encoding and $_charset:".print_r($_mimeMessage,true));
+		}
 		switch (strtoupper($_encoding))
 		{
 			case 'BASE64':
@@ -4369,13 +5146,19 @@ 
 		// sometimes there are 3 parts, when there is an ics/ical attached/included-> we want to show that
 		// as attachment AND as abstracted ical information (we use our notification style here).
 		$partText = $partCalendar = $partHTML = null;
-		if (self::$debug) _debug_array(array("METHOD"=>__METHOD__,"LINE"=>__LINE__,"STRUCTURE"=>$_structure));
+		if (self::$debug)
+		{
+			_debug_array(array("METHOD"=>__METHOD__,"LINE"=>__LINE__,"STRUCTURE"=>$_structure));
+		}
 		//error_log(__METHOD__.' ('.__LINE__.') ');
 		$ignore_first_part = true;
 		foreach($_structure->contentTypeMap() as $mime_id => $mime_type)
 		{
 			//error_log(__METHOD__."($_uid, ".$_structure->getMimeId().") $mime_id: $mime_type"." ignoreFirstPart:".$ignore_first_part);
-			if (self::$debug) echo __METHOD__."($_uid, partID=".$_structure->getMimeId().") $mime_id: $mime_type<br>";
+			if (self::$debug)
+			{
+				echo __METHOD__."($_uid, partID=".$_structure->getMimeId().") $mime_id: $mime_type<br>";
+			}
 
 			if ($ignore_first_part)
 			{
@@ -4391,11 +5174,17 @@ 
 					switch($mimePart->getSubType())
 					{
 						case 'plain':
-							if ($mimePart->getBytes() > 0) $partText = $mimePart;
+							if ($mimePart->getBytes() > 0)
+							{
+								$partText = $mimePart;
+							}
 							break;
 
 						case 'html':
-							if ($mimePart->getBytes() > 0)  $partHTML = $mimePart;
+							if ($mimePart->getBytes() > 0)
+							{
+								$partHTML = $mimePart;
+							}
 							break;
 					}
 					break;
@@ -4408,7 +5197,10 @@ 
 							if (count($mimePart->getParts()) > 1)
 							{
 								// in a multipart alternative we treat the multipart/related as html part
-								if (self::$debug) error_log(__METHOD__." process MULTIPART/".$mimePart->getSubType()." with array as subparts");
+								if (self::$debug)
+								{
+									error_log(__METHOD__." process MULTIPART/".$mimePart->getSubType()." with array as subparts");
+								}
 								$partHTML = $mimePart;
 								break 3; // GET OUT OF LOOP, will be processed according to type
 							}
@@ -4489,9 +5281,15 @@ 
 	 */
 	function getMultipartMixed($_uid, Horde_Mime_Part $_structure, $_htmlMode, $_preserveSeen = false, &$skipParts=array())
 	{
-		if (self::$debug) echo __METHOD__."$_uid, $_htmlMode<br>";
+		if (self::$debug)
+		{
+			echo __METHOD__."$_uid, $_htmlMode<br>";
+		}
 		$bodyPart = array();
-		if (self::$debug) _debug_array($_structure);
+		if (self::$debug)
+		{
+			_debug_array($_structure);
+		}
 
 		$ignore_first_part = true;
 		//$skipParts = array();
@@ -4499,7 +5297,10 @@ 
 		foreach($_structure->contentTypeMap() as $mime_id => $mime_type)
 		{
 			//error_log(__METHOD__."($_uid, ".$_structure->getMimeId().") $mime_id: $mime_type");
-			if (self::$debug) echo __METHOD__."($_uid, partID=".$_structure->getMimeId().") $mime_id: $mime_type<br>";
+			if (self::$debug)
+			{
+				echo __METHOD__."($_uid, partID=".$_structure->getMimeId().") $mime_id: $mime_type<br>";
+			}
 			if ($ignore_first_part)
 			{
 				$ignore_first_part = false;
@@ -4517,7 +5318,10 @@ 
 			switch($part->getPrimaryType())
 			{
 				case 'multipart':
-					if ($part->getDisposition() == 'attachment') continue;
+					if ($part->getDisposition() == 'attachment')
+					{
+						continue;
+					}
 					switch($part->getSubType())
 					{
 						case 'alternative':
@@ -4582,7 +5386,9 @@ 
 					if($part->getSubType() == 'rfc822' || $part->getDisposition() == 'attachment')
 					{
 						$skipParts[$mime_id.'.0'] = $mime_type;
-						foreach($part->contentTypeMap() as $sub_id => $sub_type){ $skipParts[$sub_id] = $sub_type;}
+						foreach($part->contentTypeMap() as $sub_id => $sub_type)
+						{
+$skipParts[$sub_id] = $sub_type;}
 						//error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$_uid.' Part:'.$mime_id.':'.array2string($skipParts));
 						//break 2;
 					}
@@ -4625,7 +5431,10 @@ 
 	 */
 	function getBodyPart($_uid, $_partID=null, $_folder=null, $_preserveSeen=false, $_stream=false, &$_encoding=null, $_tryDecodingServerside=true)
 	{
-		if (self::$debug) error_log( __METHOD__.__LINE__."(".array2string($_uid).", $_partID, $_folder, $_preserveSeen, $_stream, $_encoding, $_tryDecodingServerside)");
+		if (self::$debug)
+		{
+			error_log( __METHOD__.__LINE__."(".array2string($_uid).", $_partID, $_folder, $_preserveSeen, $_stream, $_encoding, $_tryDecodingServerside)");
+		}
 
 		if (empty($_folder))
 		{
@@ -4634,7 +5443,10 @@ 
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($_folder).'/'.$this->icServer->getCurrentMailbox().'/'. $this->sessionData['mailbox']);
 		// querying contents of body part
 		$uidsToFetch = new Horde_Imap_Client_Ids();
-		if (!(is_object($_uid) || is_array($_uid))) $_uid = (array)$_uid;
+		if (!(is_object($_uid) || is_array($_uid)))
+		{
+			$_uid = (array)$_uid;
+		}
 		$uidsToFetch->add($_uid);
 
 		$fquery = new Horde_Imap_Client_Fetch_Query();
@@ -4642,9 +5454,12 @@ 
 			'peek' => $_preserveSeen,
 			'decode' => true,	// try decode on server, does NOT neccessary work
 		);
-		if ($_tryDecodingServerside===false)// || ($_tryDecodingServerside&&$this->isDraftFolder($_folder)))
+		if ($_tryDecodingServerside===false)
+		{
+			// || ($_tryDecodingServerside&&$this->isDraftFolder($_folder)))
 		{
 			$_tryDecodingServerside=false;
+		}
 			$fetchParams = array(
 				'peek' => $_preserveSeen,
 			);
@@ -4686,7 +5501,10 @@ 
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.'->'.$_uid.':'.array2string($_structure).' '.function_backtrace());
 		$bodyPart = array();
-		if (self::$debug) _debug_array(array($_structure,function_backtrace()));
+		if (self::$debug)
+		{
+			_debug_array(array($_structure,function_backtrace()));
+		}
 
 		if($_structure->getSubType() == 'html' && !in_array($_htmlMode, array('html_only', 'always_display', 'only_if_no_text')))
 		{
@@ -4736,8 +5554,12 @@ 
 	 */
 	function getMessageBody($_uid, $_htmlOptions='', $_partID=null, Horde_Mime_Part $_structure=null, $_preserveSeen = false, $_folder = '')
 	{
-		if (self::$debug) echo __METHOD__."$_uid, $_htmlOptions, $_partID<br>";
-		if($_htmlOptions != '') {
+		if (self::$debug)
+		{
+			echo __METHOD__."$_uid, $_htmlOptions, $_partID<br>";
+		}
+		if($_htmlOptions != '')
+		{
 			$this->htmlOptions = $_htmlOptions;
 		}
 		if (empty($_folder))
@@ -4826,7 +5648,9 @@ 
 						default:
 							$bodyPart = array($this->getTextPart($_uid, $_structure, $this->htmlOptions, $_preserveSeen));
 					}
-				} else {
+				}
+				else
+				{
 					// what if the structure->disposition is attachment ,...
 				}
 				return self::normalizeBodyParts($bodyPart);
@@ -4837,13 +5661,18 @@ 
 				{
 					case 'rfc822':
 						$newStructure = $_structure->getParts();
-						if (self::$debug) {echo __METHOD__." Message -> RFC -> NewStructure:"; _debug_array($newStructure[0]);}
+						if (self::$debug)
+						{
+echo __METHOD__." Message -> RFC -> NewStructure:"; _debug_array($newStructure[0]);}
 						return self::normalizeBodyParts($this->getMessageBody($_uid, $_htmlOptions, $newStructure[0]->getMimeId(), $newStructure[0], $_preserveSeen, $_folder));
 				}
 				break;
 
 			default:
-				if (self::$debug) _debug_array($_structure);
+				if (self::$debug)
+				{
+					_debug_array($_structure);
+				}
 				return array(
 					array(
 						'body'		=> lang('The mimeparser can not parse this message.').$_structure->getType(),
@@ -4867,9 +5696,12 @@ 
 		{
 			foreach($_bodyParts as $singleBodyPart)
 			{
-				if (!isset($singleBodyPart['body'])) {
+				if (!isset($singleBodyPart['body']))
+				{
 					$buff = self::normalizeBodyParts($singleBodyPart);
-					foreach ((array)$buff as $val) { $body2return[] = $val;}
+					foreach ((array)$buff as $val)
+					{
+$body2return[] = $val;}
 					continue;
 				}
 				$body2return[] = $singleBodyPart;
@@ -4895,13 +5727,20 @@ 
 		$message='';
 		for($i=0; $i<count($bodyParts); $i++)
 		{
-			if (!isset($bodyParts[$i]['body'])) {
+			if (!isset($bodyParts[$i]['body']))
+			{
 				$bodyParts[$i]['body'] = self::getdisplayableBody($mailClass, $bodyParts[$i], $preserveHTML, $useTidy);
 				$message .= empty($bodyParts[$i]['body'])?'':$bodyParts[$i]['body'];
 				continue;
 			}
-			if (isset($bodyParts[$i]['error'])) continue;
-			if (empty($bodyParts[$i]['body'])) continue;
+			if (isset($bodyParts[$i]['error']))
+			{
+				continue;
+			}
+			if (empty($bodyParts[$i]['body']))
+			{
+				continue;
+			}
 			// some characterreplacements, as they fail to translate
 			$sar = array(
 				'@(\x84|\x93|\x94)@',
@@ -4928,13 +5767,17 @@ 
 				$bodyParts[$i]['body'] = preg_replace($sar,$rar,$bodyParts[$i]['body']);
 			}
 
-			if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = Translation::detect_encoding($bodyParts[$i]['body']);
+			if ($bodyParts[$i]['charSet']===false)
+			{
+				$bodyParts[$i]['charSet'] = Translation::detect_encoding($bodyParts[$i]['body']);
+			}
 			// add line breaks to $bodyParts
 			//error_log(__METHOD__.' ('.__LINE__.') '.' Charset:'.$bodyParts[$i]['charSet'].'->'.$bodyParts[$i]['body']);
 			$newBody  = Translation::convert_jsonsafe($bodyParts[$i]['body'], $bodyParts[$i]['charSet']);
 			//error_log(__METHOD__.' ('.__LINE__.') '.' MimeType:'.$bodyParts[$i]['mimeType'].'->'.$newBody);
 			$mailClass->activeMimeType = 'text/plain';
-			if ($bodyParts[$i]['mimeType'] == 'text/html') {
+			if ($bodyParts[$i]['mimeType'] == 'text/html')
+			{
 				$mailClass->activeMimeType = $bodyParts[$i]['mimeType'];
 				if (!$preserveHTML)
 				{
@@ -4980,15 +5823,28 @@ 
 						// as we switched off HTMLaweds tidy functionality
 						$newBody = str_replace(array('&amp;amp;','<DIV><BR></DIV>',"<DIV>&nbsp;</DIV>",'<div>&nbsp;</div>'),array('&amp;','<BR>','<BR>','<BR>'),$newBody);
 						$newBody = $htmLawed->run($newBody,self::$htmLawed_config);
-						if ($hasOther && $preserveHTML) $newBody = $matches[1]. $newBody. $matches[3];
+						if ($hasOther && $preserveHTML)
+						{
+							$newBody = $matches[1]. $newBody. $matches[3];
+						}
 						$alreadyHtmlLawed=true;
 					}
 					//error_log(__METHOD__.' ('.__LINE__.') '.' after purify:'.$newBody);
-					if ($preserveHTML==false) $newBody = Mail\Html::convertHTMLToText($newBody,self::$displayCharset,true,true);
+					if ($preserveHTML==false)
+					{
+						$newBody = Mail\Html::convertHTMLToText($newBody,self::$displayCharset,true,true);
+					}
 					//error_log(__METHOD__.' ('.__LINE__.') '.' after convertHTMLToText:'.$newBody);
-					if ($preserveHTML==false) $newBody = nl2br($newBody); // we need this, as htmLawed removes \r\n
+					if ($preserveHTML==false)
+					{
+						$newBody = nl2br($newBody);
+					}
+					// we need this, as htmLawed removes \r\n
 					/*if (!$alreadyHtmlLawed) */ $mailClass->getCleanHTML($newBody); // remove stuff we regard as unwanted
-					if ($preserveHTML==false) $newBody = str_replace("<br />","\r\n",$newBody);
+					if ($preserveHTML==false)
+					{
+						$newBody = str_replace("<br />","\r\n",$newBody);
+					}
 					//error_log(__METHOD__.' ('.__LINE__.') '.' after getClean:'.$newBody);
 				}
 				$message .= $newBody;
@@ -5025,12 +5881,12 @@ 
 				  substr($line,0,strlen($dontbreaklinesstartingwith)) != $dontbreaklinesstartingwith
 				 )
 				)
-			   )
-			{
+			   ) {
 				$s=explode(" ", $line);
 				$line = "";
 				$linecnt = 0;
-				foreach ($s as &$v) {
+				foreach ($s as &$v)
+				{
 					$cnt = strlen($v);
 					// only break long words within the wordboundaries,
 					// but it may destroy links, so we check for href and dont do it if we find one
@@ -5040,14 +5896,20 @@ 
 						$v=wordwrap($v, $allowedLength, $cut, true);
 					}
 					// the rest should be broken at the start of the new word that exceeds the limit
-					if ($linecnt+$cnt > $allowedLength) {
+					if ($linecnt+$cnt > $allowedLength)
+					{
 						$v=$cut.$v;
 						#$linecnt = 0;
 						$linecnt =strlen($v)-strlen($cut);
-					} else {
+					}
+					else
+					{
 						$linecnt += $cnt;
 					}
-					if (strlen($v)) $line .= (strlen($line) ? " " : "").$v;
+					if (strlen($v))
+					{
+						$line .= (strlen($line) ? " " : "").$v;
+					}
 				}
 			}
 			$newStr .= $line . "\n";
@@ -5068,11 +5930,18 @@ 
 	function getMessageEnvelope($_uid, $_partID = '',$decode=false, $_folder='', $_useHeaderInsteadOfEnvelope=false)
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.":$_uid,$_partID,$decode,$_folder".function_backtrace());
-		if (empty($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		if (empty($_folder))
+		{
+			$_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.":$_uid,$_partID,$decode,$_folder");
-		if((empty($_partID)||$_partID=='null')&&$_useHeaderInsteadOfEnvelope===false) {
+		if((empty($_partID)||$_partID=='null')&&$_useHeaderInsteadOfEnvelope===false)
+		{
 			$uidsToFetch = new Horde_Imap_Client_Ids();
-			if (!(is_object($_uid) || is_array($_uid))) $_uid = (array)$_uid;
+			if (!(is_object($_uid) || is_array($_uid)))
+			{
+				$_uid = (array)$_uid;
+			}
 			$uidsToFetch->add($_uid);
 
 			$fquery = new Horde_Imap_Client_Fetch_Query();
@@ -5082,8 +5951,10 @@ 
 			$headersNew = $this->icServer->fetch($_folder, $fquery, array(
 				'ids' => $uidsToFetch,
 			));
-			if (is_object($headersNew)) {
-				foreach($headersNew as &$_headerObject) {
+			if (is_object($headersNew))
+			{
+				foreach($headersNew as &$_headerObject)
+				{
 					$env = $_headerObject->getEnvelope();
 					//_debug_array($envFields->singleFields());
 					$singleFields = $envFields->singleFields();
@@ -5100,7 +5971,10 @@ 
 								//error_log(__METHOD__.' ('.__LINE__.') '.$v.'->'.array2string($env->$v->addresses));
 								$envelope[$v]=$env->$v->addresses;
 								$address = array();
-								if (!is_array($envelope[$v])) break;
+								if (!is_array($envelope[$v]))
+								{
+									break;
+								}
 								foreach ($envelope[$v] as $k => $ad)
 								{
 									if (stripos($ad,'@')===false)
@@ -5137,7 +6011,9 @@ 
 				}
 			}
 			return $envelope;
-		} else {
+		}
+		else
+		{
 
 			$headers = $this->getMessageHeader($_uid, $_partID, true,true,$_folder);
 
@@ -5148,19 +6024,43 @@ 
 				'SUBJECT'	=> ($decode ? self::decode_header($headers['SUBJECT']):$headers['SUBJECT']),
 				'MESSAGE_ID'	=> $headers['MESSAGE-ID']
 			);
-			if (isset($headers['IN-REPLY-TO'])) $newData['IN-REPLY-TO'] = $headers['IN-REPLY-TO'];
-			if (isset($headers['REFERENCES'])) $newData['REFERENCES'] = $headers['REFERENCES'];
-			if (isset($headers['THREAD-TOPIC'])) $newData['THREAD-TOPIC'] = $headers['THREAD-TOPIC'];
-			if (isset($headers['THREAD-INDEX'])) $newData['THREAD-INDEX'] = $headers['THREAD-INDEX'];
-			if (isset($headers['LIST-ID'])) $newData['LIST-ID'] = $headers['LIST-ID'];
-			if (isset($headers['SIZE'])) $newData['SIZE'] = $headers['SIZE'];
+			if (isset($headers['IN-REPLY-TO']))
+			{
+				$newData['IN-REPLY-TO'] = $headers['IN-REPLY-TO'];
+			}
+			if (isset($headers['REFERENCES']))
+			{
+				$newData['REFERENCES'] = $headers['REFERENCES'];
+			}
+			if (isset($headers['THREAD-TOPIC']))
+			{
+				$newData['THREAD-TOPIC'] = $headers['THREAD-TOPIC'];
+			}
+			if (isset($headers['THREAD-INDEX']))
+			{
+				$newData['THREAD-INDEX'] = $headers['THREAD-INDEX'];
+			}
+			if (isset($headers['LIST-ID']))
+			{
+				$newData['LIST-ID'] = $headers['LIST-ID'];
+			}
+			if (isset($headers['SIZE']))
+			{
+				$newData['SIZE'] = $headers['SIZE'];
+			}
 			//_debug_array($newData);
 			$recepientList = array('FROM', 'TO', 'CC', 'BCC', 'SENDER', 'REPLY-TO');
-			foreach($recepientList as $recepientType) {
-				if(isset($headers[$recepientType])) {
-					if ($decode) $headers[$recepientType] =  self::decode_header($headers[$recepientType],true);
+			foreach($recepientList as $recepientType)
+			{
+				if(isset($headers[$recepientType]))
+				{
+					if ($decode)
+					{
+						$headers[$recepientType] =  self::decode_header($headers[$recepientType],true);
+					}
 					//error_log(__METHOD__.__LINE__." ".$recepientType."->".array2string($headers[$recepientType]));
-					foreach(self::parseAddressList($headers[$recepientType]) as $singleAddress) {
+					foreach(self::parseAddressList($headers[$recepientType]) as $singleAddress)
+					{
 						$addressData = array(
 							'PERSONAL_NAME'		=> $singleAddress->personal ? $singleAddress->personal : 'NIL',
 							'AT_DOMAIN_LIST'	=> $singleAddress->adl ? $singleAddress->adl : 'NIL',
@@ -5168,17 +6068,25 @@ 
 							'HOST_NAME'		=> $singleAddress->host ? $singleAddress->host : 'NIL',
 							'EMAIL'			=> $singleAddress->host ? $singleAddress->mailbox.'@'.$singleAddress->host : $singleAddress->mailbox,
 						);
-						if($addressData['PERSONAL_NAME'] != 'NIL') {
+						if($addressData['PERSONAL_NAME'] != 'NIL')
+						{
 							$addressData['RFC822_EMAIL'] = imap_rfc822_write_address($singleAddress->mailbox, $singleAddress->host, $singleAddress->personal);
-						} else {
+						}
+						else
+						{
 							$addressData['RFC822_EMAIL'] = 'NIL';
 						}
 						$newData[$recepientType][] = ($addressData['RFC822_EMAIL']!='NIL'?$addressData['RFC822_EMAIL']:$addressData['EMAIL']);//$addressData;
 					}
-				} else {
-					if($recepientType == 'SENDER' || $recepientType == 'REPLY-TO') {
+				}
+				else
+				{
+					if($recepientType == 'SENDER' || $recepientType == 'REPLY-TO')
+					{
 						$newData[$recepientType] = $newData['FROM'];
-					} else {
+					}
+					else
+					{
 						$newData[$recepientType] = array();
 					}
 				}
@@ -5201,9 +6109,15 @@ 
 	function getMessageHeader($_uid, $_partID = '',$decode=false, $preserveUnSeen=false, $_folder='')
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.':'.$_uid.', '.$_partID.', '.$decode.', '.$preserveUnSeen.', '.$_folder);
-		if (empty($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		if (empty($_folder))
+		{
+			$_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		}
 		$uidsToFetch = new Horde_Imap_Client_Ids();
-		if (!(is_object($_uid) || is_array($_uid))) $_uid = (array)$_uid;
+		if (!(is_object($_uid) || is_array($_uid)))
+		{
+			$_uid = (array)$_uid;
+		}
 		$uidsToFetch->add($_uid);
 
 		$fquery = new Horde_Imap_Client_Fetch_Query();
@@ -5221,7 +6135,8 @@ 
 		$headersNew = $this->icServer->fetch($_folder, $fquery, array(
 			'ids' => $uidsToFetch,
 		));
-		if (is_object($headersNew)) {
+		if (is_object($headersNew))
+		{
 			foreach($headersNew as $_fetchObject)
 			{
 				$headers = $_fetchObject->getHeaderText(0,Horde_Imap_Client_Data_Fetch::HEADER_PARSE);
@@ -5243,11 +6158,17 @@ 
 			}
 			if ($decode === 'object')
 			{
-				if (is_object($headers)) $headers->setUserAgent('EGroupware API '.$GLOBALS['egw_info']['server']['versions']['phpgwapi']);
+				if (is_object($headers))
+				{
+					$headers->setUserAgent('EGroupware API '.$GLOBALS['egw_info']['server']['versions']['phpgwapi']);
+				}
 				return $headers;
 			}
 			$retValue = is_object($headers) ? $headers->toArray():array();
-			if ($size) $retValue['size'] = $size;
+			if ($size)
+			{
+				$retValue['size'] = $size;
+			}
 		}
 		$retValue = array_change_key_case($retValue,CASE_UPPER);
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($retValue));
@@ -5279,10 +6200,16 @@ 
 	function getMessageRawHeader($_uid, $_partID = '', $_folder = '')
 	{
 		static $rawHeaders;
-		if (empty($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		if (empty($_folder))
+		{
+			$_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		}
 		//error_log(__METHOD__.' ('.__LINE__.') '." Try Using Cache for raw Header $_uid, $_partID in Folder $_folder");
 
-		if (is_null($rawHeaders)||!is_array($rawHeaders)) $rawHeaders = Cache::getCache(Cache::INSTANCE,'email','rawHeadersCache'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
+		if (is_null($rawHeaders)||!is_array($rawHeaders))
+		{
+			$rawHeaders = Cache::getCache(Cache::INSTANCE,'email','rawHeadersCache'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*1);
+		}
 		if (isset($rawHeaders[$this->icServer->ImapServerId][(string)$_folder][$_uid][(empty($_partID)?'NIL':$_partID)]))
 		{
 			//error_log(__METHOD__.' ('.__LINE__.') '." Using Cache for raw Header $_uid, $_partID in Folder $_folder");
@@ -5290,7 +6217,10 @@ 
 		}
 		$uidsToFetch = new Horde_Imap_Client_Ids();
 		$uid = $_uid;
-		if (!(is_object($_uid) || is_array($_uid))) $uid = (array)$_uid;
+		if (!(is_object($_uid) || is_array($_uid)))
+		{
+			$uid = (array)$_uid;
+		}
 		$uidsToFetch->add($uid);
 
 		$fquery = new Horde_Imap_Client_Fetch_Query();
@@ -5306,8 +6236,10 @@ 
 		$headersNew = $this->icServer->fetch($_folder, $fquery, array(
 			'ids' => $uidsToFetch,
 		));
-		if (is_object($headersNew)) {
-			foreach($headersNew as &$_headerObject) {
+		if (is_object($headersNew))
+		{
+			foreach($headersNew as &$_headerObject)
+			{
 				$retValue = $_headerObject->getHeaderText();
 				if ($_partID != '')
 				{
@@ -5335,22 +6267,33 @@ 
 	static function &getStyles($_bodyParts)
 	{
 		$style = '';
-		if (empty($_bodyParts)) return "";
-		foreach((array)$_bodyParts as $singleBodyPart) {
-			if (!isset($singleBodyPart['body'])) {
+		if (empty($_bodyParts))
+		{
+			return "";
+		}
+		foreach((array)$_bodyParts as $singleBodyPart)
+		{
+			if (!isset($singleBodyPart['body']))
+			{
 				$singleBodyPart['body'] = self::getStyles($singleBodyPart);
 				$style .= $singleBodyPart['body'];
 				continue;
 			}
 
-			if ($singleBodyPart['charSet']===false) $singleBodyPart['charSet'] = Translation::detect_encoding($singleBodyPart['body']);
+			if ($singleBodyPart['charSet']===false)
+			{
+				$singleBodyPart['charSet'] = Translation::detect_encoding($singleBodyPart['body']);
+			}
 			$singleBodyPart['body'] = Translation::convert(
 				$singleBodyPart['body'],
 				strtolower($singleBodyPart['charSet'])
 			);
 			$ct = 0;
 			$newStyle=array();
-			if (stripos($singleBodyPart['body'],'<style')!==false)  $ct = preg_match_all('#<style(?:\s.*)?>(.+)</style>#isU', $singleBodyPart['body'], $newStyle);
+			if (stripos($singleBodyPart['body'],'<style')!==false)
+			{
+				$ct = preg_match_all('#<style(?:\s.*)?>(.+)</style>#isU', $singleBodyPart['body'], $newStyle);
+			}
 			if ($ct>0)
 			{
 				//error_log(__METHOD__.' ('.__LINE__.') '.'#'.$ct.'#'.array2string($newStyle));
@@ -5382,7 +6325,11 @@ 
 		// CSS Security
 		// http://code.google.com/p/browsersec/wiki/Part1#Cascading_stylesheets
 		$css = preg_replace('/(javascript|expression|-moz-binding)/i','',$style);
-		if (stripos($css,'script')!==false) Mail\Html::replaceTagsCompletley($css,'script'); // Strip out script that may be included
+		if (stripos($css,'script')!==false)
+		{
+			Mail\Html::replaceTagsCompletley($css,'script');
+		}
+		// Strip out script that may be included
 		// we need this, as styledefinitions are enclosed with curly brackets; and template stuff tries to replace everything between curly brackets that is having no horizontal whitespace
 		// as the comments as <!-- styledefinition --> in stylesheet are outdated, and ck-editor does not understand it, we remove it
 		$css = str_replace(array(':','<!--','-->'),array(': ','',''),$css);
@@ -5403,8 +6350,14 @@ 
 	{
 		//TODO: caching einbauen static!
 		static $rawBody;
-		if (is_null($rawBody)) $rawBody = array();
-		if (empty($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		if (is_null($rawBody))
+		{
+			$rawBody = array();
+		}
+		if (empty($_folder))
+		{
+			$_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		}
 		if (isset($rawBody[$this->icServer->ImapServerId][$_folder][$_uid][(empty($_partID)?'NIL':$_partID)]))
 		{
 			//error_log(__METHOD__.' ('.__LINE__.') '." Using Cache for raw Body $_uid, $_partID in Folder $_folder");
@@ -5413,7 +6366,10 @@ 
 
 		$uidsToFetch = new Horde_Imap_Client_Ids();
 		$uid = $_uid;
-		if (!(is_object($_uid) || is_array($_uid))) $uid = (array)$_uid;
+		if (!(is_object($_uid) || is_array($_uid)))
+		{
+			$uid = (array)$_uid;
+		}
 		$uidsToFetch->add($uid);
 
 		$fquery = new Horde_Imap_Client_Fetch_Query();
@@ -5426,8 +6382,10 @@ 
 		$headersNew = $this->icServer->fetch($_folder, $fquery, array(
 			'ids' => $uidsToFetch,
 		));
-		if (is_object($headersNew)) {
-			foreach($headersNew as &$_headerObject) {
+		if (is_object($headersNew))
+		{
+			foreach($headersNew as &$_headerObject)
+			{
 				$body = $_headerObject->getFullMsg();
 				if ($_partID != '')
 				{
@@ -5460,14 +6418,20 @@ 
 	 */
 	function getStructure($_uid, $_partID=null, $_folder=null, $_preserveSeen=false)
 	{
-		if (self::$debug) error_log( __METHOD__.' ('.__LINE__.') '.":$_uid, $_partID");
+		if (self::$debug)
+		{
+			error_log( __METHOD__.' ('.__LINE__.') '.":$_uid, $_partID");
+		}
 
 		if (empty($_folder))
 		{
 			$_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
 		}
 		$uidsToFetch = new Horde_Imap_Client_Ids();
-		if (!(is_object($_uid) || is_array($_uid))) $_uid = (array)$_uid;
+		if (!(is_object($_uid) || is_array($_uid)))
+		{
+			$_uid = (array)$_uid;
+		}
 		$uidsToFetch->add($_uid);
 		try
 		{
@@ -5476,7 +6440,10 @@ 
 	//		$fquery->envelope();
 	//		$fquery->size();
 			$_fquery->structure();
-			if ($_partID) $_fquery->bodyPart($_partID, array('peek' => $_preserveSeen));
+			if ($_partID)
+			{
+				$_fquery->bodyPart($_partID, array('peek' => $_preserveSeen));
+			}
 
 			$mail = $this->icServer->fetch($_folder, $_fquery, array(
 				'ids' => $uidsToFetch,
@@ -5507,16 +6474,28 @@ 
 	 */
 	function getMessageAttachments($_uid, $_partID=null, Horde_Mime_Part $_structure=null, $fetchEmbeddedImages=true, $fetchTextCalendar=false, $resolveTNEF=true, $_folder='')
 	{
-		if (self::$debug) error_log( __METHOD__.":$_uid, $_partID");
-		if (empty($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		if (self::$debug)
+		{
+			error_log( __METHOD__.":$_uid, $_partID");
+		}
+		if (empty($_folder))
+		{
+			$_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		}
 		$attachments = array();
 		if (!isset($_structure))
 		{
 			$_structure = $this->getStructure($_uid, $_partID,$_folder,true);
 			//error_log(__METHOD__.' ('.__LINE__.') '.':'.print_r($_structure->contentTypeMap(),true));
 		}
-		if (!$_structure || !$_structure->contentTypeMap()) return array();
-		if (!empty($_partID)) $_structure = $_structure->getPart($_partID);
+		if (!$_structure || !$_structure->contentTypeMap())
+		{
+			return array();
+		}
+		if (!empty($_partID))
+		{
+			$_structure = $_structure->getPart($_partID);
+		}
 		$skipParts = array();
 		$tnefParts = array();
 		$skip = 0;
@@ -5545,7 +6524,13 @@ 
 			if ($mime_type=='message/rfc822' && $_partID!=$mime_id)
 			{
 				//error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$uid.'->'.$mime_id.':'.array2string($part->contentTypeMap()));
-				foreach($part->contentTypeMap() as $sub_id => $sub_type) {if ($sub_id != $mime_id) $skipParts[$sub_id] = $sub_type;}
+				foreach($part->contentTypeMap() as $sub_id => $sub_type)
+				{
+if ($sub_id != $mime_id)
+				{
+					$skipParts[$sub_id] = $sub_type;
+				}
+				}
 			}
 			if (empty($partDisposition) && $partPrimaryType != 'multipart' && $partPrimaryType != 'text')
 			{
@@ -5556,7 +6541,10 @@ 
 				$partDisposition='attachment';
 			}
 			//error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$uid.' Part:'.$_partID.'->'.$mime_id.':'.array2string($skipParts));
-			if (array_key_exists($mime_id,$skipParts)) continue;
+			if (array_key_exists($mime_id,$skipParts))
+			{
+				continue;
+			}
 
 			if ($partDisposition == 'attachment' ||
 				(($partDisposition == 'inline' || empty($partDisposition)) && $partPrimaryType == 'image' && $part->getContentId()=='') ||
@@ -5567,23 +6555,41 @@ 
 			{
 				// if type is message/rfc822 and _partID is given, and MimeID equals partID
 				// we attempt to fetch "ourselves"
-				if ($_partID==$part->getMimeId() && $part->getPrimaryType()=='message') continue;
+				if ($_partID==$part->getMimeId() && $part->getPrimaryType()=='message')
+				{
+					continue;
+				}
 				$attachment = $part->getAllDispositionParameters();
 				$attachment['disposition'] = $part->getDisposition();
 				$attachment['mimeType'] = $mime_type;
 				$attachment['uid'] = $_uid;
 				$attachment['partID'] = $mime_id;
-				if (!isset($attachment['name'])||empty($attachment['name'])) $attachment['name'] = $part->getName();
+				if (!isset($attachment['name'])||empty($attachment['name']))
+				{
+					$attachment['name'] = $part->getName();
+				}
 				if ($fetchTextCalendar)
 				{
 					//error_log(__METHOD__.' ('.__LINE__.') '.array2string($part->getAllContentTypeParameters()));
 					$method = $part->getContentTypeParameter('method');
-					if ($method) $attachment['method'] = $method;
-					if (!isset($attachment['name'])) $attachment['name'] = 'event.ics';
+					if ($method)
+					{
+						$attachment['method'] = $method;
+					}
+					if (!isset($attachment['name']))
+					{
+						$attachment['name'] = 'event.ics';
+					}
 				}
 				$attachment['size'] = $part->getBytes();
-				if (($cid = $part->getContentId())) $attachment['cid'] = $cid;
-				if (empty($attachment['name'])) $attachment['name'] = (isset($attachment['cid'])&&!empty($attachment['cid'])?$attachment['cid']:lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.MimeMagic::mime2ext($mime_type);
+				if (($cid = $part->getContentId()))
+				{
+					$attachment['cid'] = $cid;
+				}
+				if (empty($attachment['name']))
+				{
+					$attachment['name'] = (isset($attachment['cid'])&&!empty($attachment['cid'])?$attachment['cid']:lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.MimeMagic::mime2ext($mime_type);
+				}
 				//error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$uid.' Part:'.$_partID.'->'.$mime_id.':'.array2string($attachment));
 				//typical winmail.dat attachment is
 				//Array([size] => 1462762[filename] => winmail.dat[mimeType] => application/ms-tnef[uid] => 100[partID] => 2[name] => winmail.dat)
@@ -5619,14 +6625,26 @@ 
 						$attachment['uid'] = $tnp['uid'];
 						$attachment['partID'] = $tnp['partID'];
 						$attachment['is_winmail'] = $tnp['uid'].'@'.$tnp['partID'].'@'.$mime_id;
-						if (!isset($attachment['name'])||empty($attachment['name'])) $attachment['name'] = $part->getName();
+						if (!isset($attachment['name'])||empty($attachment['name']))
+						{
+							$attachment['name'] = $part->getName();
+						}
 						$attachment['size'] = $part->getBytes();
-						if (($cid = $part->getContentId())) $attachment['cid'] = $cid;
-						if (empty($attachment['name'])) $attachment['name'] = (isset($attachment['cid'])&&!empty($attachment['cid'])?$attachment['cid']:lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.MimeMagic::mime2ext($attachment['mimeType']);
+						if (($cid = $part->getContentId()))
+						{
+							$attachment['cid'] = $cid;
+						}
+						if (empty($attachment['name']))
+						{
+							$attachment['name'] = (isset($attachment['cid'])&&!empty($attachment['cid'])?$attachment['cid']:lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.MimeMagic::mime2ext($attachment['mimeType']);
+						}
 						$attachments[] = $attachment;
 					}
 				}
-				if ($tnefResolved===false) $attachments[]=$tnp;
+				if ($tnefResolved===false)
+				{
+					$attachments[]=$tnp;
+				}
 			}
 		}
 		//error_log(__METHOD__.__LINE__.array2string($attachments));
@@ -5730,8 +6748,14 @@ 
 
 				$attachment = $part->getAllDispositionParameters();
 				$attachment['mimeType'] = $part->getType();
-				if (!isset($attachment['filename'])||empty($attachment['filename'])) $attachment['filename'] = $part->getName();
-				if (($cid = $part->getContentId())) $attachment['cid'] = $cid;
+				if (!isset($attachment['filename'])||empty($attachment['filename']))
+				{
+					$attachment['filename'] = $part->getName();
+				}
+				if (($cid = $part->getContentId()))
+				{
+					$attachment['cid'] = $cid;
+				}
 				if (empty($attachment['filename']))
 				{
 					$attachment['filename'] = (isset($attachment['cid'])&&!empty($attachment['cid'])?
@@ -5743,7 +6767,10 @@ 
 				$attachments[$_uid.'@'.$_partID.'@'.$mime_id] = $attachment;
 			}
 		}
-		if (!is_array($attachments)) return false;
+		if (!is_array($attachments))
+		{
+			return false;
+		}
 		return $attachments;
 	}
 
@@ -5762,10 +6789,16 @@ 
 	function getAttachment($_uid, $_partID, $_winmail_nr=0, $_returnPart=true, $_stream=false, $_folder=null)
 	{
 		//error_log(__METHOD__.__LINE__."Uid:$_uid, PartId:$_partID, WinMailNr:$_winmail_nr, ReturnPart:$_returnPart, Stream:$_stream, Folder:$_folder".function_backtrace());
-		if (!isset($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		if (!isset($_folder))
+		{
+			$_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
+		}
 
 		$uidsToFetch = new Horde_Imap_Client_Ids();
-		if (!(is_object($_uid) || is_array($_uid))) $_uid = (array)$_uid;
+		if (!(is_object($_uid) || is_array($_uid)))
+		{
+			$_uid = (array)$_uid;
+		}
 		$uidsToFetch->add($_uid);
 
 		$fquery = new Horde_Imap_Client_Fetch_Query();
@@ -5774,8 +6807,10 @@ 
 		$headersNew = $this->icServer->fetch($_folder, $fquery, array(
 			'ids' => $uidsToFetch,
 		));
-		if (is_object($headersNew)) {
-			foreach($headersNew as $id=>$_headerObject) {
+		if (is_object($headersNew))
+		{
+			foreach($headersNew as $id=>$_headerObject)
+			{
 				$body = $_headerObject->getFullMsg();
 				if ($_partID != '')
 				{
@@ -5789,7 +6824,10 @@ 
 					}
 					// if $partDisposition is empty, we assume attachment, and hope that the function
 					// itself is only triggered to fetch attachments
-					if (empty($partDisposition)) $partDisposition='attachment';
+					if (empty($partDisposition))
+					{
+						$partDisposition='attachment';
+					}
 					if ($part && ($partDisposition=='attachment' || $partDisposition=='inline' || ($part->getPrimaryType() == 'text' && $part->getSubType() == 'calendar')))
 					{
 						//$headerObject=$part->getAllDispositionParameters();//not used anywhere around here
@@ -5798,13 +6836,19 @@ 
 						$charset = $part->getContentTypeParameter('charset');
 						//$structure_bytes = $part->getBytes(); $structure_partID=$part->getMimeId(); error_log(__METHOD__.__LINE__." fetchPartContents(".array2string($_uid).", $structure_partID, $_stream, $_preserveSeen,$structure_mime)" );
 						$this->fetchPartContents($_uid, $part, $_stream, $_preserveSeen=true,$structure_mime);
-						if ($_returnPart) return $part;
+						if ($_returnPart)
+						{
+							return $part;
+						}
 					}
 				}
 			}
 		}
 		$ext = MimeMagic::mime2ext($structure_mime);
-		if ($ext && stripos($filename,'.')===false && stripos($filename,$ext)===false) $filename = trim($filename).'.'.$ext;
+		if ($ext && stripos($filename,'.')===false && stripos($filename,$ext)===false)
+		{
+			$filename = trim($filename).'.'.$ext;
+		}
 		if (!$part)
 		{
 			throw new Exception\WrongParameter("Error: Could not fetch attachment for Uid=".array2string($_uid).", PartId=$_partID, WinMailNr=$_winmail_nr, folder=$_folder");
@@ -5820,7 +6864,10 @@ 
 		);
 
 		// try guessing the mimetype, if we get the application/octet-stream
-		if (strtolower($attachmentData['type']) == 'application/octet-stream') $attachmentData['type'] = MimeMagic::filename2mime($attachmentData['filename']);
+		if (strtolower($attachmentData['type']) == 'application/octet-stream')
+		{
+			$attachmentData['type'] = MimeMagic::filename2mime($attachmentData['filename']);
+		}
 		# if the attachment holds a winmail number and is a winmail.dat then we have to handle that.
 		if ( $filename == 'winmail.dat' && $_winmail_nr)
 		{
@@ -5843,9 +6890,18 @@ 
 					if ($_winmail_nr == $wantedPart.'@'.$mime_id)
 					{
 						//error_log(__METHOD__.__LINE__.'#'.$structure_mime.'#'.$filename.'#'.array2string($attachment));
-						if (!isset($attachment['filename'])||empty($attachment['filename'])) $attachment['filename'] = $part->getName();
-						if (($cid = $part->getContentId())) $attachment['cid'] = $cid;
-						if (empty($attachment['filename'])) $attachment['filename'] = (isset($attachment['cid'])&&!empty($attachment['cid'])?$attachment['cid']:lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.MimeMagic::mime2ext($attachment['mimeType']);
+						if (!isset($attachment['filename'])||empty($attachment['filename']))
+						{
+							$attachment['filename'] = $part->getName();
+						}
+						if (($cid = $part->getContentId()))
+						{
+							$attachment['cid'] = $cid;
+						}
+						if (empty($attachment['filename']))
+						{
+							$attachment['filename'] = (isset($attachment['cid'])&&!empty($attachment['cid'])?$attachment['cid']:lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.MimeMagic::mime2ext($attachment['mimeType']);
+						}
 						$wmattach = $attachment;
 						$wmattach['attachment'] = $part->getContents(array('stream'=>$_stream));
 
@@ -5855,7 +6911,10 @@ 
 			if ($tnefResolved)
 			{
 				$ext = MimeMagic::mime2ext($wmattach['mimeType']);
-				if ($ext && stripos($wmattach['filename'],'.')===false && stripos($wmattach['filename'],$ext)===false) $wmattach['filename'] = trim($wmattach['filename']).'.'.$ext;
+				if ($ext && stripos($wmattach['filename'],'.')===false && stripos($wmattach['filename'],$ext)===false)
+				{
+					$wmattach['filename'] = trim($wmattach['filename']).'.'.$ext;
+				}
 				$attachmentData = array(
 					'type'       => $wmattach['mimeType'],
 					'filename'   => $wmattach['filename'],
@@ -5885,7 +6944,10 @@ 
 		static $uid=null, $part=null, $structure=null;
 		//error_log(__METHOD__.' ('.__LINE__.') '.":$_uid, $_cid, $_part");
 
-		if(empty($_cid)) return false;
+		if(empty($_cid))
+		{
+			return false;
+		}
 
 		if ($_uid != $uid || $_part != $part)
 		{
@@ -5910,13 +6972,19 @@ 
 					$attachment = $part;
 				}
 				// everything else we only consider after we checked all
-				if (!isset($attachment)) $attachment = $part;
+				if (!isset($attachment))
+				{
+					$attachment = $part;
+				}
 				// do we want content fetched, can be done later, if not needed
 				if (isset($_stream))
 				{
 					$this->fetchPartContents($_uid, $attachment, $_stream);
 				}
-				if (isset($attachment)) break;
+				if (isset($attachment))
+				{
+					break;
+				}
 			}
 		}
 		// set name as filename, if not set
@@ -5947,10 +7015,17 @@ 
 	 */
 	public function fetchPartContents($_uid, Horde_Mime_Part $part=null, $_stream=false, $_preserveSeen=false, $_mimetype=null)
 	{
-		if (is_null($part)) return null;//new Horde_Mime_Part;
+		if (is_null($part))
+		{
+			return null;
+		}
+		//new Horde_Mime_Part;
 		$encoding = null;
 		$fetchAsBinary = true;
-		if ($_mimetype && strtolower($_mimetype)=='message/rfc822') $fetchAsBinary = false;
+		if ($_mimetype && strtolower($_mimetype)=='message/rfc822')
+		{
+			$fetchAsBinary = false;
+		}
 		// we need to set content on structure to decode transfer encoding
 		$part->setContents(
 			$this->getBodyPart($_uid, $part->getMimeId(), null, $_preserveSeen, $_stream, $encoding, $fetchAsBinary),
@@ -5987,7 +7062,10 @@ 
 		// the recent flag is the default enforced here ; as we assume the _flags is always set,
 		// we default it to hordes default (Recent) (, other wise we should not pass the parameter
 		// for flags at all)
-		if (empty($_flags)) $_flags = '\\Recent';
+		if (empty($_flags))
+		{
+			$_flags = '\\Recent';
+		}
 		//if (!is_array($_flags) && stripos($_flags,',')!==false) $_flags=explode(',',$_flags);
 		//if (!is_array($_flags)) $_flags = (array) $_flags;
 		try
@@ -6004,18 +7082,27 @@ 
 		}
 		catch (\Exception $e)
 		{
-			if (self::$debug) error_log("Could not append Message: ".$e->getMessage());
+			if (self::$debug)
+			{
+				error_log("Could not append Message: ".$e->getMessage());
+			}
 			throw new Exception\WrongUserinput(lang("Could not append Message:").' '.$e->getMessage().': '.$e->details);
 			//return false;
 		}
 		//error_log(__METHOD__.' ('.__LINE__.') '.' appended UID:'.$messageid);
 		//$messageid = true; // for debug reasons only
-		if ($messageid === true || empty($messageid)) // try to figure out the message uid
+		if ($messageid === true || empty($messageid))
+		{
+			// try to figure out the message uid
 		{
 			$list = $this->getHeaders($_folderName, $_startMessage=1, 1, 'INTERNALDATE', true, array(),null, false);
+		}
 			if ($list)
 			{
-				if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '.' MessageUid:'.$messageid.' but found:'.array2string($list));
+				if (self::$debug)
+				{
+					error_log(__METHOD__.' ('.__LINE__.') '.' MessageUid:'.$messageid.' but found:'.array2string($list));
+				}
 				$messageid = $list['header'][0]['uid'];
 			}
 		}
@@ -6056,7 +7143,10 @@ 
 	{
 			//echo __METHOD__." called for $uid,$partid <br>";
 			$headers = $mailClass->getMessageHeader($uid,$partid,true,false,$mailbox);
-			if (empty($headers)) return false;
+			if (empty($headers))
+			{
+				return false;
+			}
 			// dont force retrieval of the textpart, let mailClass preferences decide
 			$bodyParts = $mailClass->getMessageBody($uid,($preserveHTML?'always_display':'only_if_no_text'),$partid,null,false,$mailbox);
 			// if we do not want HTML but there is no TextRepresentation with the message itself, try converting
@@ -6074,15 +7164,30 @@ 
 			//error_log(array2string($bodyParts));
 			$attachments = $includeAttachments?$mailClass->getMessageAttachments($uid,$partid,null,true,false,true,$mailbox):array();
 
-			if ($mailClass->isSentFolder($mailbox)) $mailaddress = $headers['TO'];
-			elseif (isset($headers['FROM'])) $mailaddress = $headers['FROM'];
-			elseif (isset($headers['SENDER'])) $mailaddress = $headers['SENDER'];
-			if (isset($headers['CC'])) $mailaddress .= ','.$headers['CC'];
+			if ($mailClass->isSentFolder($mailbox))
+			{
+				$mailaddress = $headers['TO'];
+			}
+			elseif (isset($headers['FROM']))
+			{
+				$mailaddress = $headers['FROM'];
+			}
+			elseif (isset($headers['SENDER']))
+			{
+				$mailaddress = $headers['SENDER'];
+			}
+			if (isset($headers['CC']))
+			{
+				$mailaddress .= ','.$headers['CC'];
+			}
 			//_debug_array(array($headers,$mailaddress));
 			$subject = $headers['SUBJECT'];
 
 			$message = self::getdisplayableBody($mailClass, $bodyParts, $preserveHTML);
-			if ($preserveHTML && $mailClass->activeMimeType == 'text/plain') $message = '<pre>'.$message.'</pre>';
+			if ($preserveHTML && $mailClass->activeMimeType == 'text/plain')
+			{
+				$message = '<pre>'.$message.'</pre>';
+			}
 			$headdata = ($addHeaderSection ? self::createHeaderInfoSection($headers, '',$preserveHTML) : '');
 			$message = $headdata.$message;
 			//echo __METHOD__.'<br>';
@@ -6133,7 +7238,8 @@ 
 							$attachments[$num]['attachment'] = $c->getContents();
 						}
 						// no attempt to convert, if we dont know about the charset
-						if (isset($attachments[$num]['charset'])&&!empty($attachments[$num]['charset'])) {
+						if (isset($attachments[$num]['charset'])&&!empty($attachments[$num]['charset']))
+						{
 							// we do not try guessing the charset, if it is not set
 							//if ($attachments[$num]['charset']===false) $attachments[$num]['charset'] = Translation::detect_encoding($attachments[$num]['attachment']);
 							Translation::convert($attachments[$num]['attachment'],$attachments[$num]['charset']);
@@ -6154,7 +7260,10 @@ 
 						unset($attachments[$num]['attachment']);
 					}
 				}
-				if (is_array($attachedMessages)) $attachments = array_merge($attachments,$attachedMessages);
+				if (is_array($attachedMessages))
+				{
+					$attachments = array_merge($attachments,$attachedMessages);
+				}
 			}
 			return array(
 					'mailaddress'=>$mailaddress,
@@ -6176,10 +7285,17 @@ 
 	{
 		$c = 0;
 		// use the standardIdentity
-		foreach($_identities as $key => $acc) {
-			if ($c==0) $identity = $acc;
+		foreach($_identities as $key => $acc)
+		{
+			if ($c==0)
+			{
+				$identity = $acc;
+			}
 			//error_log(__METHOD__.__LINE__." $key == $_profile_id ");
-			if ($key==$_profile_id) $identity = $acc;
+			if ($key==$_profile_id)
+			{
+				$identity = $acc;
+			}
 			$c++;
 		}
 		return $identity;
@@ -6195,20 +7311,53 @@ 
 	{
 		$headdata = null;
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($header).function_backtrace());
-		if ($header['SUBJECT']) $headdata = lang('subject').': '.$header['SUBJECT'].($createHTML?"<br />":"\n");
-		if ($header['FROM']) $headdata .= lang('from').': '.self::convertAddressArrayToString($header['FROM'], $createHTML).($createHTML?"<br />":"\n");
-		if ($header['SENDER']) $headdata .= lang('sender').': '.self::convertAddressArrayToString($header['SENDER'], $createHTML).($createHTML?"<br />":"\n");
-		if ($header['TO']) $headdata .= lang('to').': '.self::convertAddressArrayToString($header['TO'], $createHTML).($createHTML?"<br />":"\n");
-		if ($header['CC']) $headdata .= lang('cc').': '.self::convertAddressArrayToString($header['CC'], $createHTML).($createHTML?"<br />":"\n");
-		if ($header['BCC']) $headdata .= lang('bcc').': '.self::convertAddressArrayToString($header['BCC'], $createHTML).($createHTML?"<br />":"\n");
-		if ($header['DATE']) $headdata .= lang('date').': '.$header['DATE'].($createHTML?"<br />":"\n");
-		if ($header['PRIORITY'] && $header['PRIORITY'] != 'normal') $headdata .= lang('priority').': '.$header['PRIORITY'].($createHTML?"<br />":"\n");
-		if ($header['IMPORTANCE'] && $header['IMPORTANCE'] !='normal') $headdata .= lang('importance').': '.$header['IMPORTANCE'].($createHTML?"<br />":"\n");
+		if ($header['SUBJECT'])
+		{
+			$headdata = lang('subject').': '.$header['SUBJECT'].($createHTML?"<br />":"\n");
+		}
+		if ($header['FROM'])
+		{
+			$headdata .= lang('from').': '.self::convertAddressArrayToString($header['FROM'], $createHTML).($createHTML?"<br />":"\n");
+		}
+		if ($header['SENDER'])
+		{
+			$headdata .= lang('sender').': '.self::convertAddressArrayToString($header['SENDER'], $createHTML).($createHTML?"<br />":"\n");
+		}
+		if ($header['TO'])
+		{
+			$headdata .= lang('to').': '.self::convertAddressArrayToString($header['TO'], $createHTML).($createHTML?"<br />":"\n");
+		}
+		if ($header['CC'])
+		{
+			$headdata .= lang('cc').': '.self::convertAddressArrayToString($header['CC'], $createHTML).($createHTML?"<br />":"\n");
+		}
+		if ($header['BCC'])
+		{
+			$headdata .= lang('bcc').': '.self::convertAddressArrayToString($header['BCC'], $createHTML).($createHTML?"<br />":"\n");
+		}
+		if ($header['DATE'])
+		{
+			$headdata .= lang('date').': '.$header['DATE'].($createHTML?"<br />":"\n");
+		}
+		if ($header['PRIORITY'] && $header['PRIORITY'] != 'normal')
+		{
+			$headdata .= lang('priority').': '.$header['PRIORITY'].($createHTML?"<br />":"\n");
+		}
+		if ($header['IMPORTANCE'] && $header['IMPORTANCE'] !='normal')
+		{
+			$headdata .= lang('importance').': '.$header['IMPORTANCE'].($createHTML?"<br />":"\n");
+		}
 		//if ($mailcontent['headers']['ORGANIZATION']) $headdata .= lang('organization').': '.$mailcontent['headers']['ORGANIZATION']."\
 		if (!empty($headdata))
 		{
-			if (!empty($headline) && $headline != 'SUPPRESS') $headdata = "---------------------------- $headline ----------------------------".($createHTML?"<br />":"\n").$headdata;
-			if (empty($headline)) $headdata = ($headline != 'SUPPRESS'?"--------------------------------------------------------".($createHTML?"<br />":"\n"):'').$headdata;
+			if (!empty($headline) && $headline != 'SUPPRESS')
+			{
+				$headdata = "---------------------------- $headline ----------------------------".($createHTML?"<br />":"\n").$headdata;
+			}
+			if (empty($headline))
+			{
+				$headdata = ($headline != 'SUPPRESS'?"--------------------------------------------------------".($createHTML?"<br />":"\n"):'').$headdata;
+			}
 			$headdata .= ($headline != 'SUPPRESS'?"--------------------------------------------------------".($createHTML?"<br />":"\n"):'');
 		}
 		else
@@ -6242,12 +7391,15 @@ 
 		$returnAddr ='';
 		if (is_array($rfcAddressArray))
 		{
-			foreach((array)$rfcAddressArray as $addressData) {
+			foreach((array)$rfcAddressArray as $addressData)
+			{
 				//error_log(__METHOD__.' ('.__LINE__.') '.array2string($addressData));
-				if($addressData['MAILBOX_NAME'] == 'NIL') {
+				if($addressData['MAILBOX_NAME'] == 'NIL')
+				{
 					continue;
 				}
-				if(strtolower($addressData['MAILBOX_NAME']) == 'undisclosed-recipients') {
+				if(strtolower($addressData['MAILBOX_NAME']) == 'undisclosed-recipients')
+				{
 					continue;
 				}
 				if ($addressData['RFC822_EMAIL'])
@@ -6261,7 +7413,10 @@ 
 				}
 				$addressObject = $addressObjectA[0];
 				//error_log(__METHOD__.' ('.__LINE__.') '.array2string($addressObject));
-				if (!$addressObject->valid) continue;
+				if (!$addressObject->valid)
+				{
+					continue;
+				}
 				//$mb =(string)$addressObject->mailbox;
 				//$h = (string)$addressObject->host;
 				//$p = (string)$addressObject->personal;
@@ -6278,7 +7433,10 @@ 
 			// do not mess with strings, return them untouched /* ToDo: validate string as Address */
 			$rfcAddressArray = self::decode_header($rfcAddressArray,true);
 			$rfcAddressArray = str_replace(array('<','>','"\'','\'"'),array('[',']','"','"'),$rfcAddressArray);
-			if (is_string($rfcAddressArray)) return $rfcAddressArray;
+			if (is_string($rfcAddressArray))
+			{
+				return $rfcAddressArray;
+			}
 		}
 		return $returnAddr;
 	}
@@ -6295,10 +7453,19 @@ 
 	{
 		$mergeobj = new Contacts\Merge();
 
-		if (empty($mimetype)) $mimetype = (strlen(strip_tags($content)) == strlen($content) ?'text/plain':'text/html');
+		if (empty($mimetype))
+		{
+			$mimetype = (strlen(strip_tags($content)) == strlen($content) ?'text/plain':'text/html');
+		}
 		$rv = $mergeobj->merge_string($content,$ids,$err='',$mimetype, array(), self::$displayCharset);
-		if (empty($rv) && !empty($content) && !empty($err)) $rv = $content;
-		if (!empty($err) && !empty($content) && !empty($ids)) error_log(__METHOD__.' ('.__LINE__.') '.' Merge failed for Ids:'.array2string($ids).' ContentType:'.$mimetype.' Content:'.$content.' Reason:'.array2string($err));
+		if (empty($rv) && !empty($content) && !empty($err))
+		{
+			$rv = $content;
+		}
+		if (!empty($err) && !empty($content) && !empty($ids))
+		{
+			error_log(__METHOD__.' ('.__LINE__.') '.' Merge failed for Ids:'.array2string($ids).' ContentType:'.$mimetype.' Content:'.$content.' Reason:'.array2string($err));
+		}
 		return $rv;
 	}
 
@@ -6335,13 +7502,15 @@ 
 			settype($bytes, 'integer');
 			$bytes /= 10;
 		}
-		else
-			settype($bytes, 'integer');
+		else {
+					settype($bytes, 'integer');
+		}
 
 		return $bytes . ' ' . $type ;
 	}
 
-	static function detect_qp(&$sting) {
+	static function detect_qp(&$sting)
+	{
 		$needle = '/(=[0-9][A-F])|(=[A-F][0-9])|(=[A-F][A-F])|(=[0-9][0-9])/';
 		return preg_match("$needle",$string);
 	}
@@ -6358,9 +7527,15 @@ 
 	 */
 	static function logRunTimes($_starttime,$_endtime=null,$_message='',$_methodNline='')
 	{
-		if (is_null($_endtime)) $_endtime = microtime(true);
+		if (is_null($_endtime))
+		{
+			$_endtime = microtime(true);
+		}
 		$usagetime = microtime(true) - $_starttime;
-		if (self::$debugTimes) error_log($_methodNline.' took:'.number_format($usagetime,5).'(s) '.($_message?'Details:'.$_message:''));
+		if (self::$debugTimes)
+		{
+			error_log($_methodNline.' took:'.number_format($usagetime,5).'(s) '.($_message?'Details:'.$_message:''));
+		}
 	}
 
 	/**
@@ -6375,7 +7550,10 @@ 
 	 */
 	static function checkFileBasics(&$_formData, $IDtoAddToFileName='', $reqMimeType='message/rfc822')
 	{
-		if (parse_url($_formData['file'],PHP_URL_SCHEME) == 'egw-data') return $_formData['file'];
+		if (parse_url($_formData['file'],PHP_URL_SCHEME) == 'egw-data')
+		{
+			return $_formData['file'];
+		}
 
 		//error_log(__METHOD__.__FILE__.array2string($_formData).' Id:'.$IDtoAddToFileName.' ReqMimeType:'.$reqMimeType);
 		$importfailed = $tmpFileName = false;
@@ -6424,8 +7602,15 @@ 
 			{
 				$buff = explode('.',$_formData['name']);
 				$suffix = '';
-				if (is_array($buff)) $suffix = array_pop($buff); // take the last extension to check with ext2mime
-				if (!empty($suffix)) $sfxMimeType = MimeMagic::ext2mime($suffix);
+				if (is_array($buff))
+				{
+					$suffix = array_pop($buff);
+				}
+				// take the last extension to check with ext2mime
+				if (!empty($suffix))
+				{
+					$sfxMimeType = MimeMagic::ext2mime($suffix);
+				}
 				if (!empty($suffix) && !empty($sfxMimeType) &&
 					(strlen(trim($_formData['type']))==0 || (strtolower(trim($_formData['type'])) != $sfxMimeType)))
 				{
@@ -6473,7 +7658,9 @@ 
 			{
 				rename($_formData['file'], $GLOBALS['egw_info']['server']['temp_dir'].'/'.$tmpFileName);
 			}
-		} else {
+		}
+		else
+		{
 			//error_log("Import of message ".$_formData['file']." failes to meet basic restrictions");
 			$importfailed = true;
 			$alert_msg .= lang("Processing of file %1 failed. Failed to meet basic restrictions.",$_formData['name']);
@@ -6519,21 +7706,32 @@ 
 				if (substr($url, 0, 5) !== 'data:')
 				{
 					$filename = basename($url);
-					if (($directory = dirname($url)) == '.') $directory = '';
+					if (($directory = dirname($url)) == '.')
+					{
+						$directory = '';
+					}
 					$ext = pathinfo($filename, PATHINFO_EXTENSION);
 					$mimeType  = MimeMagic::ext2mime($ext);
-					if ( strlen($directory) > 1 && substr($directory,-1) != '/') { $directory .= '/'; }
+					if ( strlen($directory) > 1 && substr($directory,-1) != '/')
+					{
+$directory .= '/'; }
 					$myUrl = $directory.$filename;
-					if ($myUrl[0]=='/') // local path -> we only allow path's that are available via http/https (or vfs)
+					if ($myUrl[0]=='/')
+					{
+						// local path -> we only allow path's that are available via http/https (or vfs)
 					{
 						$basedir = ($_SERVER['HTTPS']?'https://':'http://'.$_SERVER['HTTP_HOST']);
 					}
+					}
 					// use vfs instead of url containing webdav.php
 					// ToDo: we should test if the webdav url is of our own scope, as we cannot handle foreign
 					// webdav.php urls as vfs
-					if (strpos($myUrl,'/webdav.php') !== false) // we have a webdav link, so we build a vfs/sqlfs link of it.
+					if (strpos($myUrl,'/webdav.php') !== false)
+					{
+						// we have a webdav link, so we build a vfs/sqlfs link of it.
 					{
 						Vfs::load_wrapper('vfs');
+					}
 						list(,$myUrl) = explode('/webdav.php',$myUrl,2);
 						$basedir = 'vfs://default';
 						$needTempFile = false;
@@ -6562,8 +7760,13 @@ 
 						}
 					}
 
-					if ( strlen($basedir) > 1 && substr($basedir,-1) != '/' && $myUrl[0]!='/') { $basedir .= '/'; }
-					if ($needTempFile && !$attachment && substr($myUrl,0,4) !== "http") $data = file_get_contents($basedir.urldecode($myUrl));
+					if ( strlen($basedir) > 1 && substr($basedir,-1) != '/' && $myUrl[0]!='/')
+					{
+$basedir .= '/'; }
+					if ($needTempFile && !$attachment && substr($myUrl,0,4) !== "http")
+					{
+						$data = file_get_contents($basedir.urldecode($myUrl));
+					}
 				}
 				if (substr($url,0,strlen('data:'))=='data:')
 				{
@@ -6664,7 +7867,10 @@ 
 				$_folder = $this->getSentFolder();
 			}
 			$delimiter = $this->getHierarchyDelimiter();
-			if($_folder=='INBOX'.$delimiter) $_folder='INBOX';
+			if($_folder=='INBOX'.$delimiter)
+			{
+				$_folder='INBOX';
+			}
 			if ($importfailed === false)
 			{
 				$Subject = $mailObject->getHeader('Subject');
@@ -6693,7 +7899,9 @@ 
 					//error_log(__METHOD__.' ('.__LINE__.') '.' Id To Merge:'.$val);
 					if (/*$GLOBALS['egw_info']['flags']['currentapp'] == 'addressbook' &&*/
 						count($SendAndMergeTocontacts) > 1 && $val &&
-						(is_numeric($val) || $GLOBALS['egw']->accounts->name2id($val))) // do the merge
+						(is_numeric($val) || $GLOBALS['egw']->accounts->name2id($val)))
+					{
+						// do the merge
 					{
 						//error_log(__METHOD__.' ('.__LINE__.') '.array2string($mailObject));
 
@@ -6702,6 +7910,7 @@ 
 						{
 							//error_log('ID ' . $val . ' ' .$type . ': ' . $mailObject->getHeader(Mailer::$type2header[$type]) . ' -> ' .$bo_merge->merge_string($mailObject->getHeader(Mailer::$type2header[$type]),$val,$e,'text/plain',array(),self::$displayCharset));
 							$merged = $bo_merge->merge_string($mailObject->getHeader(Mailer::$type2header[$type]),$val,$e,'text/plain',array(),self::$displayCharset);
+					}
 							$mailObject->addAddress($merged,'',$type);
 							if($type == 'to')
 							{
@@ -6733,9 +7942,15 @@ 
 						$mailObject->clearCustomHeaders();
 						$mailObject->addHeader('Subject', $bo_merge->merge_string($Subject, $val, $e, 'text/plain', array(), self::$displayCharset));
 						//error_log(__METHOD__.' ('.__LINE__.') '.' ContentType:'.$mailObject->BodyContentType);
-						if($text_body) $text_body->setContents($bo_merge->merge_string($Body, $val, $e, 'text/plain', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+						if($text_body)
+						{
+							$text_body->setContents($bo_merge->merge_string($Body, $val, $e, 'text/plain', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+						}
 						//error_log(__METHOD__.' ('.__LINE__.') '.' Result:'.$mailObject->Body.' error:'.array2string($e));
-						if($html_body) $html_body->setContents($bo_merge->merge_string($AltBody, $val, $e, 'text/html', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+						if($html_body)
+						{
+							$html_body->setContents($bo_merge->merge_string($AltBody, $val, $e, 'text/html', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+						}
 
 						//error_log(__METHOD__.' ('.__LINE__.') '.array2string($mailObject));
 						// set a higher timeout for big messages
@@ -6750,9 +7965,12 @@ 
 							//error_log(__METHOD__.' ('.__LINE__.') '.array2string($errorInfo));
 						}
 					}
-					elseif (!$k)	// 1. entry, further entries will fail for apps other then addressbook
+					elseif (!$k)
+					{
+						// 1. entry, further entries will fail for apps other then addressbook
 					{
 						$openAsDraft = true;
+					}
 						$mailObject->removeHeader('Message-ID');
 						$mailObject->removeHeader('Date');
 						$mailObject->clearCustomHeaders();
@@ -6767,9 +7985,12 @@ 
 
 						// No addresses from placeholders?  Treat it as just a contact ID
 						if (count($mailObject->getAddresses('to',true)) == 0 &&
-							is_numeric($val) || $GLOBALS['egw']->accounts->name2id($val)) // do the merge
+							is_numeric($val) || $GLOBALS['egw']->accounts->name2id($val))
+						{
+							// do the merge
 						{
 							$contact = $bo_merge->contacts->read($val);
+						}
 							//error_log(__METHOD__.' ('.__LINE__.') '.array2string($contact));
 							$email = ($contact['email'] ? $contact['email'] : $contact['email_home']);
 							$nfn = ($contact['n_fn'] ? $contact['n_fn'] : $contact['n_given'].' '.$contact['n_family']);
@@ -6780,9 +8001,15 @@ 
 						}
 						$mailObject->addHeader('Subject', $bo_merge->merge_string($Subject, $val, $e, 'text/plain', array(), self::$displayCharset));
 						//error_log(__METHOD__.' ('.__LINE__.') '.' ContentType:'.$mailObject->BodyContentType);
-						if (!empty($Body)) $text_body->setContents($bo_merge->merge_string($Body, $val, $e, 'text/plain', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+						if (!empty($Body))
+						{
+							$text_body->setContents($bo_merge->merge_string($Body, $val, $e, 'text/plain', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+						}
 						//error_log(__METHOD__.' ('.__LINE__.') '.' Result:'.$mailObject->Body.' error:'.array2string($e));
-						if (!empty($AltBody)) $html_body->setContents($bo_merge->merge_string($AltBody, $val, $e, 'text/html', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+						if (!empty($AltBody))
+						{
+							$html_body->setContents($bo_merge->merge_string($AltBody, $val, $e, 'text/html', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+						}
 						$_folder = $this->getDraftFolder();
 					}
 					if ($sendOK || $openAsDraft)
@@ -6790,11 +8017,15 @@ 
 						if ($this->folderExists($_folder,true))
 						{
 						    if($this->isSentFolder($_folder))
-							{
+						    {
 						        $flags = '\\Seen';
-						    } elseif($this->isDraftFolder($_folder)) {
+						    }
+						    elseif($this->isDraftFolder($_folder))
+						    {
 						        $flags = '\\Draft';
-						    } else {
+						    }
+						    else
+						    {
 						        $flags = '';
 						    }
 							$savefailed = false;
@@ -6828,7 +8059,10 @@ 
 						}
 						else
 						{
-							if (!$openComposeWindow) $processStats['failed'][$val] = $errorInfo?$errorInfo:'Send failed to '.$nfn.'<'.$email.'> See error_log for details';
+							if (!$openComposeWindow)
+							{
+								$processStats['failed'][$val] = $errorInfo?$errorInfo:'Send failed to '.$nfn.'<'.$email.'> See error_log for details';
+							}
 						}
 					}
 					if (!is_null($sendOK) && $sendOK===false && is_null($openComposeWindow))
@@ -6876,7 +8110,10 @@ 
 				$tmpFileName = $GLOBALS['egw_info']['server']['temp_dir'].'/'.basename($tmpFileName);
 				break;
 		}
-		if (!isset($message)) $message = fopen($tmpFileName, 'r');
+		if (!isset($message))
+		{
+			$message = fopen($tmpFileName, 'r');
+		}
 
 		if (!$message)
 		{
@@ -6907,7 +8144,10 @@ 
 				(fseek($message, 0, SEEK_SET) == -1 ? '' : fread($message, 8192));
 
 			$length = strpos($start, Horde_Mime_Part::RFC_EOL.Horde_Mime_Part::RFC_EOL);
-			if ($length===false) $length = strlen($start);
+			if ($length===false)
+			{
+				$length = strlen($start);
+			}
 			$headers = Horde_Mime_Headers::parseHeaders(substr($start, 0,$length));
 
 			foreach($headers->toArray(array('nowrap' => true)) as $header => $value)
@@ -6936,7 +8176,10 @@ 
 		}
 		else
 		{
-			if (($type = gettype($message)) == 'object') $type = get_class ($message);
+			if (($type = gettype($message)) == 'object')
+			{
+				$type = get_class ($message);
+			}
 			throw new Exception\WrongParameter('Wrong parameter type for message: '.$type);
 		}
 	}
@@ -6960,7 +8203,9 @@ 
 			$matches = array();
 			preg_match_all("/[\w\.,-.,_.,0-9.]+@[\w\.,-.,_.,0-9.]+/",$addresses,$matches);
 			//error_log(__METHOD__.__LINE__.array2string($matches));
-			foreach ($matches[0] as &$match) {$match = trim($match,', ');}
+			foreach ($matches[0] as &$match)
+			{
+$match = trim($match,', ');}
 			$addresses = implode(',',$matches[0]);
 			//error_log(__METHOD__.__LINE__.array2string($addresses));
 			$ret = $rfc822->parseAddressList($addresses, $default_domain ? array('default_domain' => $default_domain) : array());
@@ -6991,7 +8236,10 @@ 
 			}
 			else
 			{
-				if ($previousFailed && $remember) $adr->personal = $remember. ' ' . $adr->personal;
+				if ($previousFailed && $remember)
+				{
+					$adr->personal = $remember. ' ' . $adr->personal;
+				}
 				$remember = '';
 				$previousFailed=false;
 				//error_log(__METHOD__.__LINE__."('$addresses', $default_domain) parsed $i: mailbox=$adr->mailbox, host=$adr->host, personal=$adr->personal");
@@ -7013,7 +8261,10 @@ 
 	{
 		$acc = Mail\Account::read($this->profileID);
 		$identity = Mail\Account::read_identity($acc['ident_id'], true, null, $acc);
-		if (self::$debug) error_log(__METHOD__.__LINE__.array2string($identity));
+		if (self::$debug)
+		{
+			error_log(__METHOD__.__LINE__.array2string($identity));
+		}
 		$headers = $this->getMessageHeader($uid, '', 'object', true, $_folder);
 
 		$mdn = new Horde_Mime_Mdn($headers);