EGroupware / egroupware

mail/inc/class.mail_ui.inc.php

Braces +806 added lines, -222 removed lines

@@ -114,9 +114,15 @@ 
 	function __construct($run_constructor=true)
 	{
 		$this->mail_tree = new mail_tree($this);
-		if (!$run_constructor) return;
+		if (!$run_constructor)
+		{
+			return;
+		}
 
-		if (mail_bo::$debugTimes) $starttime = microtime (true);
+		if (mail_bo::$debugTimes)
+		{
+			$starttime = microtime (true);
+		}
 		// no autohide of the sidebox, as we use it for folderlist now.
 		unset($GLOBALS['egw_info']['user']['preferences']['common']['auto_hide_sidebox']);
 
@@ -127,13 +133,19 @@ 
 		if ($_GET["resetConnection"])
 		{
 			unset($_GET["resetConnection"]);
-			if (mail_bo::$debug) error_log(__METHOD__.__LINE__.' Connection Reset triggered: for Profile with ID:'.self::$icServerID);
+			if (mail_bo::$debug)
+			{
+				error_log(__METHOD__.__LINE__.' Connection Reset triggered: for Profile with ID:'.self::$icServerID);
+			}
 			emailadmin_imapbase::unsetCachedObjects(self::$icServerID);
 		}
 
 		try {
 			$this->mail_bo = mail_bo::getInstance(true,self::$icServerID, true, false, true);
-			if (mail_bo::$debug) error_log(__METHOD__.__LINE__.' Fetched IC Server:'.self::$icServerID.'/'.$this->mail_bo->profileID.':'.function_backtrace());
+			if (mail_bo::$debug)
+			{
+				error_log(__METHOD__.__LINE__.' Fetched IC Server:'.self::$icServerID.'/'.$this->mail_bo->profileID.':'.function_backtrace());
+			}
 			//error_log(__METHOD__.__LINE__.array2string($this->mail_bo->icServer));
 
 			// RegEx to minimize extra openConnection
@@ -150,7 +162,10 @@ 
 			// redirect to mail wizard to handle it (redirect works for ajax too)
 			self::callWizard($e->getMessage(),true,'error');
 		}
-		if (mail_bo::$debugTimes) mail_bo::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
+		if (mail_bo::$debugTimes)
+		{
+			mail_bo::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
+		}
 	}
 
 	/**
@@ -209,16 +224,28 @@ 
 	 */
 	function changeProfile($_icServerID,$unsetCache=false)
 	{
-		if (mail_bo::$debugTimes) $starttime = microtime (true);
+		if (mail_bo::$debugTimes)
+		{
+			$starttime = microtime (true);
+		}
 		if (self::$icServerID != $_icServerID)
 		{
 			self::$icServerID = $_icServerID;
 		}
-		if (mail_bo::$debug) error_log(__METHOD__.__LINE__.'->'.self::$icServerID.'<->'.$_icServerID);
+		if (mail_bo::$debug)
+		{
+			error_log(__METHOD__.__LINE__.'->'.self::$icServerID.'<->'.$_icServerID);
+		}
 
-		if ($unsetCache) emailadmin_imapbase::unsetCachedObjects(self::$icServerID);
+		if ($unsetCache)
+		{
+			emailadmin_imapbase::unsetCachedObjects(self::$icServerID);
+		}
 		$this->mail_bo = mail_bo::getInstance(false,self::$icServerID,true, false, true);
-		if (mail_bo::$debug) error_log(__METHOD__.__LINE__.' Fetched IC Server:'.self::$icServerID.'/'.$this->mail_bo->profileID.':'.function_backtrace());
+		if (mail_bo::$debug)
+		{
+			error_log(__METHOD__.__LINE__.' Fetched IC Server:'.self::$icServerID.'/'.$this->mail_bo->profileID.':'.function_backtrace());
+		}
 		// no icServer Object: something failed big time
 		if (!isset($this->mail_bo->icServer) || $this->mail_bo->icServer->ImapServerId<>$_icServerID)
 		{
@@ -228,14 +255,20 @@ 
 
 		// save session varchar
 		$oldicServerID =& egw_cache::getSession('mail','activeProfileID');
-		if ($oldicServerID <> self::$icServerID) $this->mail_bo->openConnection(self::$icServerID);
+		if ($oldicServerID <> self::$icServerID)
+		{
+			$this->mail_bo->openConnection(self::$icServerID);
+		}
 		$oldicServerID = self::$icServerID;
 		if (!emailadmin_imapbase::storeActiveProfileIDToPref($this->mail_bo->icServer, self::$icServerID, true ))
 		{
 			throw new egw_exception(__METHOD__." failed to change Profile to $_icServerID");
 		}
 
-		if (mail_bo::$debugTimes) mail_bo::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
+		if (mail_bo::$debugTimes)
+		{
+			mail_bo::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
+		}
 	}
 
 	/**
@@ -276,7 +309,8 @@ 
 		// got subscribed or unsubscribed by the user
 		try {
 			$subscribed = $this->mail_bo->icServer->listSubscribedMailboxes('',0,true);
-		} catch (Exception $ex) {
+		}
+		catch (Exception $ex) {
 			egw_framework::message($ex->getMessage());
 		}
 
@@ -310,9 +344,18 @@ 
 						list(,$node) = explode($profileId.self::$delimiter, $path);
 						if ($node)
 						{
-							if (is_array($subscribed) && $subscribed[$node] && !$value['value']) $to_unsubscribe []= $node;
-							if (is_array($subscribed) && !$subscribed[$node] && $value['value']) $to_subscribe [] = $node;
-							if ($value['value']) $cont[] = $path;
+							if (is_array($subscribed) && $subscribed[$node] && !$value['value'])
+							{
+								$to_unsubscribe []= $node;
+							}
+							if (is_array($subscribed) && !$subscribed[$node] && $value['value'])
+							{
+								$to_subscribe [] = $node;
+							}
+							if ($value['value'])
+							{
+								$cont[] = $path;
+							}
 						}
 
 					}
@@ -400,7 +443,10 @@ 
 	{
 		try	{
 				//error_log(__METHOD__.__LINE__.function_backtrace());
-				if (mail_bo::$debugTimes) $starttime = microtime (true);
+				if (mail_bo::$debugTimes)
+				{
+					$starttime = microtime (true);
+				}
 				$this->mail_bo->restoreSessionData();
 				$sessionFolder = $this->mail_bo->sessionData['mailbox'];
 				if ($this->mail_bo->folderExists($sessionFolder))
@@ -455,13 +501,16 @@ 
 				}
 				// call getQuotaRoot asynchronously in getRows by initiating a client Server roundtrip
 				$quota = false;//$this->mail_bo->getQuotaRoot();
-				if($quota !== false && $quota['limit'] != 'NOT SET') {
+				if($quota !== false && $quota['limit'] != 'NOT SET')
+				{
 					$quotainfo = $this->quotaDisplay($quota['usage'], $quota['limit']);
 					$content[self::$nm_index]['quota'] = $sel_options[self::$nm_index]['quota'] = $quotainfo['text'];
 					$content[self::$nm_index]['quotainpercent'] = $sel_options[self::$nm_index]['quotainpercent'] =  (string)$quotainfo['percent'];
 					$content[self::$nm_index]['quotaclass'] = $sel_options[self::$nm_index]['quotaclass'] = $quotainfo['class'];
 					$content[self::$nm_index]['quotanotsupported'] = $sel_options[self::$nm_index]['quotanotsupported'] = "";
-				} else {
+				}
+				else
+				{
 					$content[self::$nm_index]['quota'] = $sel_options[self::$nm_index]['quota'] = lang("Quota not provided by server");
 					$content[self::$nm_index]['quotaclass'] = $sel_options[self::$nm_index]['quotaclass'] = "mail_DisplayNone";
 					$content[self::$nm_index]['quotanotsupported'] = $sel_options[self::$nm_index]['quotanotsupported'] = "mail_DisplayNone";
@@ -469,7 +518,8 @@ 
 				// call gatherVacation asynchronously in getRows by initiating a client Server roundtrip
 				$vacation = false;//$this->gatherVacation();
 				//error_log(__METHOD__.__LINE__.' Server:'.self::$icServerID.' Sieve Enabled:'.array2string($vacation));
-				if($vacation) {
+				if($vacation)
+				{
 					if (is_array($vacation) && ($vacation['status'] == 'on' || $vacation['status']=='by_date' && $vacation['end_date'] > time()))
 					{
 						$dtfrmt = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat']/*.' '.($GLOBALS['egw_info']['user']['preferences']['common']['timeformat']!='24'?'h:i a':'H:i')*/;
@@ -503,21 +553,36 @@ 
 					$keywords = array('keyword1','keyword2','keyword3','keyword4','keyword5');
 					foreach($keywords as &$k)
 					{
-						if (array_key_exists($k,$this->statusTypes)) unset($this->statusTypes[$k]);
+						if (array_key_exists($k,$this->statusTypes))
+						{
+							unset($this->statusTypes[$k]);
+						}
 					}
 				}
 
-				if (!isset($content[self::$nm_index]['foldertree'])) $content[self::$nm_index]['foldertree'] = $this->mail_bo->profileID.self::$delimiter.'INBOX';
-				if (!isset($content[self::$nm_index]['selectedFolder'])) $content[self::$nm_index]['selectedFolder'] = $this->mail_bo->profileID.self::$delimiter.'INBOX';
+				if (!isset($content[self::$nm_index]['foldertree']))
+				{
+					$content[self::$nm_index]['foldertree'] = $this->mail_bo->profileID.self::$delimiter.'INBOX';
+				}
+				if (!isset($content[self::$nm_index]['selectedFolder']))
+				{
+					$content[self::$nm_index]['selectedFolder'] = $this->mail_bo->profileID.self::$delimiter.'INBOX';
+				}
 
 				$content[self::$nm_index]['foldertree'] = $content[self::$nm_index]['selectedFolder'];
 
 				if (is_null(emailadmin_imapbase::$supportsORinQuery) || !isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]))
 				{
 					emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-					if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
+					if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]))
+					{
+						emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
+					}
+				}
+				if (!emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])
+				{
+					unset($this->searchTypes['quick']);
 				}
-				if (!emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]) unset($this->searchTypes['quick']);
 				$sel_options['filter2'] = $this->searchTypes;
 				$sel_options['filter'] = $this->statusTypes;
 
@@ -712,18 +777,30 @@ 
 				$etpl->setElementAttribute(self::$nm_index.'[foldertree]','actions', $tree_actions);
 
 				// sending preview toolbar actions
-				if ($content['mailSplitter']) $etpl->setElementAttribute('mailPreview[toolbar]', 'actions', $this->get_toolbar_actions());
+				if ($content['mailSplitter'])
+				{
+					$etpl->setElementAttribute('mailPreview[toolbar]', 'actions', $this->get_toolbar_actions());
+				}
 
-				if (empty($content[self::$nm_index]['filter2']) || empty($content[self::$nm_index]['search'])) $content[self::$nm_index]['filter2']=(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject');
+				if (empty($content[self::$nm_index]['filter2']) || empty($content[self::$nm_index]['search']))
+				{
+					$content[self::$nm_index]['filter2']=(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject');
+				}
 				$readonlys = $preserv = array();
-				if (mail_bo::$debugTimes) mail_bo::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
+				if (mail_bo::$debugTimes)
+				{
+					mail_bo::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
+				}
 		}
 		catch (Exception $e)
 		{
 			self::callWizard($e->getMessage(),true, 'error');
 		}
 		// Check preview pane is enabled, then show spliter
-		if ($this->mail_bo->mailPreferences['previewPane']) $etpl->setElementAttribute('mail.index.spliter', 'template', 'mail.index.nospliter');
+		if ($this->mail_bo->mailPreferences['previewPane'])
+		{
+			$etpl->setElementAttribute('mail.index.spliter', 'template', 'mail.index.nospliter');
+		}
 
 		return $etpl->exec('mail.mail_ui.index',$content,$sel_options,$readonlys,$preserv);
 	}
@@ -762,12 +839,18 @@ 
 	public function ajax_foldertree($_nodeID = null,$_subscribedOnly=null)
 	{
 		$nodeID = $_GET['id'];
-		if (!is_null($_nodeID)) $nodeID = $_nodeID;
+		if (!is_null($_nodeID))
+		{
+			$nodeID = $_nodeID;
+		}
 		$subscribedOnly = (bool)(!is_null($_subscribedOnly)?$_subscribedOnly:!$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
 		$fetchCounters = !is_null($_nodeID);
 		list($_profileID,$_folderName) = explode(self::$delimiter,$nodeID,2);
 
-		if (!empty($_folderName)) $fetchCounters = true;
+		if (!empty($_folderName))
+		{
+			$fetchCounters = true;
+		}
 
 		// Check if it is called for refresh root
 		// then we need to reinitialized the index tree
@@ -779,7 +862,10 @@ 
 		{
 			$data = $this->mail_tree->getTree($nodeID,$_profileID,0, false,$subscribedOnly,!$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
 		}
-		if (!is_null($_nodeID)) return $data;
+		if (!is_null($_nodeID))
+		{
+			return $data;
+		}
 		etemplate_widget_tree::send_quote_json($data);
 	}
 
@@ -844,7 +930,10 @@ 
 				$accArray[$acc_id] = str_replace(array('<','>'),array('[',']'),$identity_name);// as angle brackets are quoted, display in Javascript messages when used is ugly, so use square brackets instead
 			}
 		}
-		if (!is_array($lastFoldersUsedForMoveCont)) $lastFoldersUsedForMoveCont=array();
+		if (!is_array($lastFoldersUsedForMoveCont))
+		{
+			$lastFoldersUsedForMoveCont=array();
+		}
 		foreach ($lastFoldersUsedForMoveCont as $pid => $info)
 		{
 			if ($this->mail_bo->profileID==$pid && isset($lastFoldersUsedForMoveCont[$this->mail_bo->profileID]))
@@ -859,9 +948,12 @@ 
 					{
 						$moveaction .= $lastFolderUsedForMoveCont;
 
-						if ($this->mail_bo->folderExists($i)) // only 10 entries per mailaccount.Control this on setting the buffered folders
+						if ($this->mail_bo->folderExists($i))
+						{
+							// only 10 entries per mailaccount.Control this on setting the buffered folders
 						{
 							$fS['profileID'] = $this->mail_bo->profileID;
+						}
 							$fS['profileName'] = $accArray[$this->mail_bo->profileID];
 							$fS['shortDisplayName'] = $i;
 							$moveactions[$moveaction] = $fS;
@@ -881,9 +973,12 @@ 
 				foreach ($lastFoldersUsedForMoveCont[$pid] as $i => $lastFolderUsedForMoveCont)
 				{
 					//error_log(__METHOD__.__LINE__."$i => $lastFolderUsedForMoveCont");
-					if (!empty($lastFolderUsedForMoveCont)) // only 10 entries per mailaccount.Control this on setting the buffered folders
+					if (!empty($lastFolderUsedForMoveCont))
+					{
+						// only 10 entries per mailaccount.Control this on setting the buffered folders
 					{
 						$moveaction = 'move_';
+					}
 						$fS = array();
 						$fS['profileID'] = $pid;
 						$fS['profileName'] = $accArray[$pid];
@@ -1241,22 +1336,34 @@ 
 					$rows=array();
 					return 0;
 				}
-				if (empty($folderName)) $query['selectedFolder'] = $_profileID.self::$delimiter.'INBOX';
+				if (empty($folderName))
+				{
+					$query['selectedFolder'] = $_profileID.self::$delimiter.'INBOX';
+				}
 			}
 		}
 		if (!isset($mail_ui))
 		{
 			$mail_ui = new mail_ui(true);	// run constructor for current profile
-			if (empty($query['selectedFolder'])) $query['selectedFolder'] = $mail_ui->mail_bo->profileID.self::$delimiter.'INBOX';
+			if (empty($query['selectedFolder']))
+			{
+				$query['selectedFolder'] = $mail_ui->mail_bo->profileID.self::$delimiter.'INBOX';
+			}
 		}
 
 		//error_log(__METHOD__.__LINE__.' SelectedFolder:'.$query['selectedFolder'].' Start:'.$query['start'].' NumRows:'.$query['num_rows'].array2string($query['order']).'->'.array2string($query['sort']));
 		//mail_bo::$debugTimes=true;
-		if (mail_bo::$debugTimes) $starttime = microtime(true);
+		if (mail_bo::$debugTimes)
+		{
+			$starttime = microtime(true);
+		}
 		//$query['search'] is the phrase in the searchbox
 
 		$mail_ui->mail_bo->restoreSessionData();
-		if (isset($query['selectedFolder'])) $mail_ui->mail_bo->sessionData['mailbox']=$query['selectedFolder'];
+		if (isset($query['selectedFolder']))
+		{
+			$mail_ui->mail_bo->sessionData['mailbox']=$query['selectedFolder'];
+		}
 
 		$sRToFetch = null;
 		list($_profileID,$_folderName) = explode(self::$delimiter,$query['selectedFolder'],2);
@@ -1266,7 +1373,10 @@ 
 			unset($app);
 		}
 		//save selected Folder to sessionData (mailbox)->currentFolder
-		if (isset($query['selectedFolder'])) $mail_ui->mail_bo->sessionData['mailbox']=$_folderName;
+		if (isset($query['selectedFolder']))
+		{
+			$mail_ui->mail_bo->sessionData['mailbox']=$_folderName;
+		}
 		$toSchema = false;//decides to select list schema with column to selected (if false fromaddress is default)
 		if ($mail_ui->mail_bo->folderExists($_folderName))
 		{
@@ -1327,7 +1437,10 @@ 
 				$rowsFetched['messages'] = $_sR['count'];
 				$sR = $_sR['match']->ids;
 				// if $sR is false, something failed fundamentally
-				if($reverse === true) $sR = ($sR===false?array():array_reverse((array)$sR));
+				if($reverse === true)
+				{
+					$sR = ($sR===false?array():array_reverse((array)$sR));
+				}
 				$sR = array_slice((array)$sR,($offset==0?0:$offset-1),$maxMessages); // we need only $maxMessages of uids
 				$sRToFetch = $sR;//array_slice($sR,0,50); // we fetch only the headers of a subset of the fetched uids
 				//error_log(__METHOD__.__LINE__.' Rows fetched (UID only):'.count($sR).' Data:'.array2string($sR));
@@ -1393,7 +1506,10 @@ 
 				}
 				else
 				{
-					if (!empty($v)) $sortResult['header'][] = array('uid'=>$v);
+					if (!empty($v))
+					{
+						$sortResult['header'][] = array('uid'=>$v);
+					}
 				}
 			}
 		}
@@ -1402,15 +1518,24 @@ 
 			$sortResult = $sortResultwH;
 		}
 		$rowsFetched['rowsFetched'] = count($sortResult['header']);
-		if (empty($rowsFetched['messages'])) $rowsFetched['messages'] = $rowsFetched['rowsFetched'];
+		if (empty($rowsFetched['messages']))
+		{
+			$rowsFetched['messages'] = $rowsFetched['rowsFetched'];
+		}
 
 		//error_log(__METHOD__.__LINE__.' Rows fetched:'.$rowsFetched.' Data:'.array2string($sortResult));
 		$cols = array('row_id','uid','status','attachments','subject','address','toaddress','fromaddress','ccaddress','additionaltoaddress','date','size','modified','bodypreview');
-		if ($GLOBALS['egw_info']['user']['preferences']['common']['select_mode']=='EGW_SELECTMODE_TOGGLE') unset($cols[0]);
+		if ($GLOBALS['egw_info']['user']['preferences']['common']['select_mode']=='EGW_SELECTMODE_TOGGLE')
+		{
+			unset($cols[0]);
+		}
 		$rows = $mail_ui->header2gridelements($sortResult['header'],$cols, $_folderName, $folderType=$toSchema);
 		//error_log(__METHOD__.__LINE__.array2string($rows));
 
-		if (mail_bo::$debugTimes) mail_bo::logRunTimes($starttime,null,'Folder:'.$_folderName.' Start:'.$query['start'].' NumRows:'.$query['num_rows'],__METHOD__.__LINE__);
+		if (mail_bo::$debugTimes)
+		{
+			mail_bo::logRunTimes($starttime,null,'Folder:'.$_folderName.' Start:'.$query['start'].' NumRows:'.$query['num_rows'],__METHOD__.__LINE__);
+		}
 		return $rowsFetched['messages'];
 	}
 
@@ -1512,7 +1637,10 @@ 
 					$actionsenabled[$act]= $actions['mark']['children']['setLabel']['children'][$act];
 					break;
 				default:
-					if (isset($actions[$act])) $actionsenabled[$act]=$actions[$act];
+					if (isset($actions[$act]))
+					{
+						$actionsenabled[$act]=$actions[$act];
+					}
 			}
 		}
 		unset($actionsenabled['drag_mail']);
@@ -1534,7 +1662,10 @@ 
 	 */
 	public function header2gridelements($_headers, $cols, $_folderName, $_folderType=0)
 	{
-		if (mail_bo::$debugTimes) $starttime = microtime(true);
+		if (mail_bo::$debugTimes)
+		{
+			$starttime = microtime(true);
+		}
 		$rv = array();
 		$i=0;
 		foreach((array)$_headers as $header)
@@ -1547,17 +1678,50 @@ 
 			$data['row_id']=$this->createRowID($_folderName,$message_uid);
 
 			$flags = "";
-			if(!empty($header['recent'])) $flags .= "R";
-			if(!empty($header['flagged'])) $flags .= "F";
-			if(!empty($header['answered'])) $flags .= "A";
-			if(!empty($header['forwarded'])) $flags .= "W";
-			if(!empty($header['deleted'])) $flags .= "D";
-			if(!empty($header['seen'])) $flags .= "S";
-			if(!empty($header['label1'])) $flags .= "1";
-			if(!empty($header['label2'])) $flags .= "2";
-			if(!empty($header['label3'])) $flags .= "3";
-			if(!empty($header['label4'])) $flags .= "4";
-			if(!empty($header['label5'])) $flags .= "5";
+			if(!empty($header['recent']))
+			{
+				$flags .= "R";
+			}
+			if(!empty($header['flagged']))
+			{
+				$flags .= "F";
+			}
+			if(!empty($header['answered']))
+			{
+				$flags .= "A";
+			}
+			if(!empty($header['forwarded']))
+			{
+				$flags .= "W";
+			}
+			if(!empty($header['deleted']))
+			{
+				$flags .= "D";
+			}
+			if(!empty($header['seen']))
+			{
+				$flags .= "S";
+			}
+			if(!empty($header['label1']))
+			{
+				$flags .= "1";
+			}
+			if(!empty($header['label2']))
+			{
+				$flags .= "2";
+			}
+			if(!empty($header['label3']))
+			{
+				$flags .= "3";
+			}
+			if(!empty($header['label4']))
+			{
+				$flags .= "4";
+			}
+			if(!empty($header['label5']))
+			{
+				$flags .= "5";
+			}
 
 			$data["status"] = "<span class=\"status_img\"></span>";
 			//error_log(__METHOD__.array2string($header).' Flags:'.$flags);
@@ -1565,41 +1729,53 @@ 
 			// the css for this row
 			$is_recent=false;
 			$css_styles = array("mail");
-			if ($header['deleted']) {
+			if ($header['deleted'])
+			{
 				$css_styles[] = 'deleted';
 			}
-			if ($header['recent'] && !($header['deleted'] || $header['seen'] || $header['answered'] || $header['forwarded'])) {
+			if ($header['recent'] && !($header['deleted'] || $header['seen'] || $header['answered'] || $header['forwarded']))
+			{
 				$css_styles[] = 'recent';
 				$is_recent=true;
 			}
-			if ($header['priority'] < 3) {
+			if ($header['priority'] < 3)
+			{
 				$css_styles[] = 'prio_high';
 			}
-			if ($header['flagged']) {
+			if ($header['flagged'])
+			{
 				$css_styles[] = 'flagged';
 			}
-			if (!$header['seen']) {
+			if (!$header['seen'])
+			{
 				$css_styles[] = 'unseen'; // different status image for recent // solved via css !important
 			}
-			if ($header['answered']) {
+			if ($header['answered'])
+			{
 				$css_styles[] = 'replied';
 			}
-			if ($header['forwarded']) {
+			if ($header['forwarded'])
+			{
 				$css_styles[] = 'forwarded';
 			}
-			if ($header['label1']) {
+			if ($header['label1'])
+			{
 				$css_styles[] = 'labelone';
 			}
-			if ($header['label2']) {
+			if ($header['label2'])
+			{
 				$css_styles[] = 'labeltwo';
 			}
-			if ($header['label3']) {
+			if ($header['label3'])
+			{
 				$css_styles[] = 'labelthree';
 			}
-			if ($header['label4']) {
+			if ($header['label4'])
+			{
 				$css_styles[] = 'labelfour';
 			}
-			if ($header['label5']) {
+			if ($header['label5'])
+			{
 				$css_styles[] = 'labelfive';
 			}
 
@@ -1616,10 +1792,13 @@ 
 				$header['subject'] = preg_replace($search,$replace,$header['subject']);
 				// curly brackets get messed up by the template!
 
-				if (!empty($header['subject'])) {
+				if (!empty($header['subject']))
+				{
 					// make the subject shorter if it is to long
 					$subject = $header['subject'];
-				} else {
+				}
+				else
+				{
 					$subject = '('. lang('no subject') .')';
 				}
 
@@ -1661,15 +1840,22 @@ 
 					}
 
 					$attachmentFlag = $image;
-				} else {
+				}
+				else
+				{
 					$attachmentFlag ='&nbsp;';
 				}
 				// show priority flag
-				if ($header['priority'] < 3) {
+				if ($header['priority'] < 3)
+				{
 					 $image = html::image('mail','prio_high');
-				} elseif ($header['priority'] > 3) {
+				}
+				elseif ($header['priority'] > 3)
+				{
 					$image = html::image('mail','prio_low');
-				} else {
+				}
+				else
+				{
 					$image = '';
 				}
 				// show a flag for flagged messages
@@ -1711,26 +1897,53 @@ 
 			}
 
 			if (in_array("size", $cols))
-				$data["size"] = $header['size']; /// size
+			{
+							$data["size"] = $header['size'];
+			}
+			/// size
 
 			$data["class"] = implode(' ', $css_styles);
 			//translate style-classes back to flags
 			$data['flags'] = Array();
-			if ($header['seen']) $data["flags"]['read'] = 'read';
-			foreach ($css_styles as &$flag) {
+			if ($header['seen'])
+			{
+				$data["flags"]['read'] = 'read';
+			}
+			foreach ($css_styles as &$flag)
+			{
 				if ($flag!='mail')
 				{
-					if ($flag=='labelone') {$data["flags"]['label1'] = 'label1';}
-					elseif ($flag=='labeltwo') {$data["flags"]['label2'] = 'label2';}
-					elseif ($flag=='labelthree') {$data["flags"]['label3'] = 'label3';}
-					elseif ($flag=='labelfour') {$data["flags"]['label4'] = 'label4';}
-					elseif ($flag=='labelfive') {$data["flags"]['label5'] = 'label5';}
-					elseif ($flag=='unseen') {unset($data["flags"]['read']);}
-					else $data["flags"][$flag] = $flag;
+					if ($flag=='labelone')
+					{
+$data["flags"]['label1'] = 'label1';}
+					elseif ($flag=='labeltwo')
+					{
+$data["flags"]['label2'] = 'label2';}
+					elseif ($flag=='labelthree')
+					{
+$data["flags"]['label3'] = 'label3';}
+					elseif ($flag=='labelfour')
+					{
+$data["flags"]['label4'] = 'label4';}
+					elseif ($flag=='labelfive')
+					{
+$data["flags"]['label5'] = 'label5';}
+					elseif ($flag=='unseen')
+					{
+unset($data["flags"]['read']);}
+					else {
+						$data["flags"][$flag] = $flag;
+					}
 				}
 			}
-			if ($header['disposition-notification-to']) $data['dispositionnotificationto'] = $header['disposition-notification-to'];
-			if (($header['mdnsent']||$header['mdnnotsent']|$header['seen'])&&isset($data['dispositionnotificationto'])) unset($data['dispositionnotificationto']);
+			if ($header['disposition-notification-to'])
+			{
+				$data['dispositionnotificationto'] = $header['disposition-notification-to'];
+			}
+			if (($header['mdnsent']||$header['mdnnotsent']|$header['seen'])&&isset($data['dispositionnotificationto']))
+			{
+				unset($data['dispositionnotificationto']);
+			}
 			$data['attachmentsBlock'] = $imageHTMLBlock;
 			$data['address'] = ($_folderType?$data["toaddress"]:$data["fromaddress"]);
 			if (in_array("bodypreview", $cols)&&$header['bodypreview'])
@@ -1740,7 +1953,10 @@ 
 			$rv[] = $data;
 			//error_log(__METHOD__.__LINE__.array2string($data));
 		}
-		if (mail_bo::$debugTimes) mail_bo::logRunTimes($starttime,null,'Folder:'.$_folderName,__METHOD__.__LINE__);
+		if (mail_bo::$debugTimes)
+		{
+			mail_bo::logRunTimes($starttime,null,'Folder:'.$_folderName,__METHOD__.__LINE__);
+		}
 
 		// ToDo: call this ONLY if labels change
 		etemplate_widget::setElementAttribute('toolbar', 'actions', $this->get_toolbar_actions());
@@ -1755,8 +1971,14 @@ 
 	 */
 	function displayHeader()
 	{
-		if(isset($_GET['id'])) $rowID	= $_GET['id'];
-		if(isset($_GET['part'])) $partID = $_GET['part'];
+		if(isset($_GET['id']))
+		{
+			$rowID	= $_GET['id'];
+		}
+		if(isset($_GET['part']))
+		{
+			$partID = $_GET['part'];
+		}
 
 		$hA = self::splitRowID($rowID);
 		$uid = $hA['msgUID'];
@@ -1780,7 +2002,8 @@ 
 		$rawheaders 	= "";
 		// create it new, with good line breaks
 		reset($newRawHeaders);
-		while(list($key,$value) = @each($newRawHeaders)) {
+		while(list($key,$value) = @each($newRawHeaders))
+		{
 			$rawheaders .= wordwrap($value, 90, "\n     ");
 		}
 
@@ -1803,12 +2026,24 @@ 
 	 */
 	function displayMessage($_requesteddata = null)
 	{
-		if (is_null($_requesteddata)) $_requesteddata = $_GET;
+		if (is_null($_requesteddata))
+		{
+			$_requesteddata = $_GET;
+		}
 
 		$preventRedirect=false;
-		if(isset($_requesteddata['id'])) $rowID	= $_requesteddata['id'];
-		if(isset($_requesteddata['part'])) $partID = $_requesteddata['part']!='null'?$_requesteddata['part']:null;
-		if(isset($_requesteddata['mode'])) $preventRedirect   = (($_requesteddata['mode']=='display' || $_requesteddata['mode'] == 'print')?true:false);
+		if(isset($_requesteddata['id']))
+		{
+			$rowID	= $_requesteddata['id'];
+		}
+		if(isset($_requesteddata['part']))
+		{
+			$partID = $_requesteddata['part']!='null'?$_requesteddata['part']:null;
+		}
+		if(isset($_requesteddata['mode']))
+		{
+			$preventRedirect   = (($_requesteddata['mode']=='display' || $_requesteddata['mode'] == 'print')?true:false);
+		}
 
 		$hA = self::splitRowID($rowID);
 		$uid = $hA['msgUID'];
@@ -1821,8 +2056,14 @@ 
 			$this->changeProfile($icServerID);
 		}
 		$htmlOptions = $this->mail_bo->htmlOptions;
-		if (!empty($_requesteddata['tryastext'])) $htmlOptions  = "only_if_no_text";
-		if (!empty($_requesteddata['tryashtml'])) $htmlOptions  = "always_display";
+		if (!empty($_requesteddata['tryastext']))
+		{
+			$htmlOptions  = "only_if_no_text";
+		}
+		if (!empty($_requesteddata['tryashtml']))
+		{
+			$htmlOptions  = "always_display";
+		}
 
 		//error_log(__METHOD__.__LINE__.array2string($hA));
 		if (($this->mail_bo->isDraftFolder($mailbox)) && $_requesteddata['mode'] == 'print')
@@ -1846,14 +2087,20 @@ 
 			$error_msg[] = lang("In Mailbox: %1, with ID: %2, and PartID: %3",$mailbox,$uid,$partID);
 			egw_framework::message($e->getMessage(), 'error');
 		}
-		if (!empty($uid)) $this->mail_bo->getFlags($uid);
+		if (!empty($uid))
+		{
+			$this->mail_bo->getFlags($uid);
+		}
 		$envelope	= $this->mail_bo->getMessageEnvelope($uid, $partID,true,$mailbox);
 		//error_log(__METHOD__.__LINE__.array2string($envelope));
 		$this->mail_bo->getMessageRawHeader($uid, $partID,$mailbox);
 		$fetchEmbeddedImages = false;
 		// if we are in HTML so its likely that we should show the embedded images; as a result
 		// we do NOT want to see those, that are embedded in the list of attachments
-		if ($htmlOptions !='always_display') $fetchEmbeddedImages = true;
+		if ($htmlOptions !='always_display')
+		{
+			$fetchEmbeddedImages = true;
+		}
 		$attachments	= $this->mail_bo->getMessageAttachments($uid, $partID, null, $fetchEmbeddedImages,true,true,$mailbox);
 		//error_log(__METHOD__.__LINE__.array2string($attachments));
 		$attachmentHTMLBlock = self::createAttachmentBlock($attachments, $rowID, $uid, $mailbox);
@@ -1869,10 +2116,16 @@ 
 		$subject = $this->mail_bo->decode_subject(preg_replace($nonDisplayAbleCharacters,'',$envelope['SUBJECT']),false);
 
 		// Set up data for taglist widget(s)
-		if ($envelope['FROM']==$envelope['SENDER']) unset($envelope['SENDER']);
+		if ($envelope['FROM']==$envelope['SENDER'])
+		{
+			unset($envelope['SENDER']);
+		}
 		foreach(array('SENDER','FROM','TO','CC','BCC') as $field)
 		{
-			if (!isset($envelope[$field])) continue;
+			if (!isset($envelope[$field]))
+			{
+				continue;
+			}
 			foreach($envelope[$field] as $field_data)
 			{
 				//error_log(__METHOD__.__LINE__.array2string($field_data));
@@ -1886,7 +2139,10 @@ 
 		}
 		$actionsenabled = $this->getDisplayToolbarActions();
 		$content['displayToolbaractions'] = json_encode($actionsenabled);
-		if (empty($subject)) $subject = lang('no subject');
+		if (empty($subject))
+		{
+			$subject = lang('no subject');
+		}
 		$content['msg'] = (is_array($error_msg)?implode("<br>",$error_msg):$error_msg);
 		// Send mail ID so we can use it for actions
 		$content['mail_id'] = $rowID;
@@ -1897,8 +2153,14 @@ 
 		$content['mail_displaydate'] = mail_bo::_strtotime($headers['DATE'],'ts',true);
 		$content['mail_displaysubject'] = $subject;
 		$linkData = array('menuaction'=>"mail.mail_ui.loadEmailBody","_messageID"=>$rowID);
-		if (!empty($partID)) $linkData['_partID']=$partID;
-		if ($htmlOptions != $this->mail_bo->htmlOptions) $linkData['_htmloptions']=$htmlOptions;
+		if (!empty($partID))
+		{
+			$linkData['_partID']=$partID;
+		}
+		if ($htmlOptions != $this->mail_bo->htmlOptions)
+		{
+			$linkData['_htmloptions']=$htmlOptions;
+		}
 		$content['mailDisplayBodySrc'] = egw::link('/index.php',$linkData);
 		$content['mail_displayattachments'] = $attachmentHTMLBlock;
 		$content['mail_id']=$rowID;
@@ -1966,7 +2228,8 @@ 
 	{
 		$attachmentHTMLBlock='';
 		$attachmentHTML = array();
-		if (is_array($attachments) && count($attachments) > 0) {
+		if (is_array($attachments) && count($attachments) > 0)
+		{
 			$url_img_vfs = html::image('filemanager','navbar', lang('Filemanager'), ' height="16"');
 			$url_img_vfs_save_all = html::image('mail','save_all', lang('Save all'));
 
@@ -1976,7 +2239,10 @@ 
 				$attachmentHTML[$key]['filename'] = translation::convert_jsonsafe($attachmentHTML[$key]['filename'],'utf-8');
 				//error_log(array2string($value));
 				//error_log(strtoupper($value['mimeType']) .'<->'. mime_magic::filename2mime($attachmentHTML[$key]['filename']));
-				if (strtoupper($value['mimeType']=='APPLICATION/OCTET-STREAM')) $value['mimeType'] = mime_magic::filename2mime($attachmentHTML[$key]['filename']);
+				if (strtoupper($value['mimeType']=='APPLICATION/OCTET-STREAM'))
+				{
+					$value['mimeType'] = mime_magic::filename2mime($attachmentHTML[$key]['filename']);
+				}
 				$attachmentHTML[$key]['type']=$value['mimeType'];
 				$attachmentHTML[$key]['mimetype']=mime_magic::mime2label($value['mimeType']);
 				$hA = self::splitRowID($rowID);
@@ -2019,8 +2285,15 @@ 
 						$sfxMimeType = $value['mimeType'];
 						$buff = explode('.',$value['name']);
 						$suffix = '';
-						if (is_array($buff)) $suffix = array_pop($buff); // take the last extension to check with ext2mime
-						if (!empty($suffix)) $sfxMimeType = mime_magic::ext2mime($suffix);
+						if (is_array($buff))
+						{
+							$suffix = array_pop($buff);
+						}
+						// take the last extension to check with ext2mime
+						if (!empty($suffix))
+						{
+							$sfxMimeType = mime_magic::ext2mime($suffix);
+						}
 						if (strtoupper($sfxMimeType) == 'TEXT/VCARD' || strtoupper($sfxMimeType) == 'TEXT/X-VCARD')
 						{
 							$attachments[$key]['mimeType'] = $sfxMimeType;
@@ -2190,9 +2463,12 @@ 
 	function quotaDisplay($_usage, $_limit)
 	{
 
-		if($_limit == 0) {
+		if($_limit == 0)
+		{
 			$quotaPercent=100;
-		} else {
+		}
+		else
+		{
 			$quotaPercent=round(($_usage*100)/$_limit);
 		}
 
@@ -2200,22 +2476,33 @@ 
 		$quotaUsage=mail_bo::show_readable_size($_usage*1024);
 
 
-		if($quotaPercent > 90 && $_limit>0) {
+		if($quotaPercent > 90 && $_limit>0)
+		{
 			$quotaBG='mail-index_QuotaRed';
-		} elseif($quotaPercent > 80 && $_limit>0) {
+		}
+		elseif($quotaPercent > 80 && $_limit>0)
+		{
 			$quotaBG='mail-index_QuotaYellow';
-		} else {
+		}
+		else
+		{
 			$quotaBG='mail-index_QuotaGreen';
 		}
 
-		if($_limit > 0) {
+		if($_limit > 0)
+		{
 			$quotaText = $quotaUsage .'/'.$quotaLimit;
-		} else {
+		}
+		else
+		{
 			$quotaText = $quotaUsage;
 		}
 
-		if($quotaPercent > 50) {
-		} else {
+		if($quotaPercent > 50)
+		{
+		}
+		else
+		{
 		}
 		$quota['class'] = $quotaBG;
 		$quota['text'] = lang('Quota: %1',$quotaText);
@@ -2233,7 +2520,10 @@ 
 		$uid	= $_GET['uid'];
 		$cid	= base64_decode($_GET['cid']);
 		$partID = urldecode($_GET['partID']);
-		if (!empty($_GET['mailbox'])) $mailbox  = base64_decode($_GET['mailbox']);
+		if (!empty($_GET['mailbox']))
+		{
+			$mailbox  = base64_decode($_GET['mailbox']);
+		}
 
 		//error_log(__METHOD__.__LINE__.":$uid, $cid, $partID");
 		$this->mail_bo->reopen($mailbox);
@@ -2265,7 +2555,10 @@ 
 
 	function getAttachment()
 	{
-		if(isset($_GET['id'])) $rowID	= $_GET['id'];
+		if(isset($_GET['id']))
+		{
+			$rowID	= $_GET['id'];
+		}
 
 		$hA = self::splitRowID($rowID);
 		$uid = $hA['msgUID'];
@@ -2298,10 +2591,20 @@ 
 				$sfxMimeType = $attachment['type'];
 				$buff = explode('.',$attachment['filename']);
 				$suffix = '';
-				if (is_array($buff)) $suffix = array_pop($buff); // take the last extension to check with ext2mime
-				if (!empty($suffix)) $sfxMimeType = mime_magic::ext2mime($suffix);
+				if (is_array($buff))
+				{
+					$suffix = array_pop($buff);
+				}
+				// take the last extension to check with ext2mime
+				if (!empty($suffix))
+				{
+					$sfxMimeType = mime_magic::ext2mime($suffix);
+				}
 				$attachment['type'] = $sfxMimeType;
-				if (strtoupper($sfxMimeType) == 'TEXT/VCARD' || strtoupper($sfxMimeType) == 'TEXT/X-VCARD') $attachment['type'] = strtoupper($sfxMimeType);
+				if (strtoupper($sfxMimeType) == 'TEXT/VCARD' || strtoupper($sfxMimeType) == 'TEXT/X-VCARD')
+				{
+					$attachment['type'] = strtoupper($sfxMimeType);
+				}
 			}
 			//error_log(__METHOD__.print_r($attachment,true));
 			if (strtoupper($attachment['type']) == 'TEXT/CALENDAR' || strtoupper($attachment['type']) == 'TEXT/X-VCALENDAR')
@@ -2310,7 +2613,10 @@ 
 				$calendar_ical = new calendar_ical();
 				$eventid = $calendar_ical->search($attachment['attachment'],-1);
 				//error_log(__METHOD__.array2string($eventid));
-				if (!$eventid) $eventid = -1;
+				if (!$eventid)
+				{
+					$eventid = -1;
+				}
 				$event = $calendar_ical->importVCal($attachment['attachment'],(is_array($eventid)?$eventid[0]:$eventid),null,true,0,'',null,$attachment['charset']);
 				//error_log(__METHOD__.$event);
 				if ((int)$event > 0)
@@ -2336,7 +2642,10 @@ 
 					//error_log(__METHOD__.__LINE__.print_r($vcard,true));
 					$contact = $addressbook_vcal->find_contact($vcard,false);
 				}
-				if (!$contact) $contact = null;
+				if (!$contact)
+				{
+					$contact = null;
+				}
 				// if there are not enough fields in the vcard (or the parser was unable to correctly parse the vcard (as of VERSION:3.0 created by MSO))
 				if ($contact || count($vcard)>2)
 				{
@@ -2370,9 +2679,18 @@ 
 	function saveMessage()
 	{
 		$display = false;
-		if(isset($_GET['id'])) $rowID	= $_GET['id'];
-		if(isset($_GET['part'])) $partID = $_GET['part'];
-		if (isset($_GET['location'])&& ($_GET['location']=='display'||$_GET['location']=='filemanager')) $display	= $_GET['location'];
+		if(isset($_GET['id']))
+		{
+			$rowID	= $_GET['id'];
+		}
+		if(isset($_GET['part']))
+		{
+			$partID = $_GET['part'];
+		}
+		if (isset($_GET['location'])&& ($_GET['location']=='display'||$_GET['location']=='filemanager'))
+		{
+			$display	= $_GET['location'];
+		}
 
 		$hA = self::splitRowID($rowID);
 		$uid = $hA['msgUID'];
@@ -2461,7 +2779,10 @@ 
 			{
 				$succeeded = true;
 			}
-			if ($fp) fclose($fp);
+			if ($fp)
+			{
+				fclose($fp);
+			}
 			if ($succeeded)
 			{
 				unset($headers['SUBJECT']);//already in filename
@@ -2511,7 +2832,8 @@ 
 		 *
 		 * @return array an array of parameters
 		 */
-		$getParams = function ($id) {
+		$getParams = function ($id)
+		{
 			list($app,$user,$serverID,$mailbox,$uid,$part,$is_winmail,$name) = explode('::',$id,8);
 			$lId = implode('::',array($app,$user,$serverID,$mailbox,$uid));
 			$hA = mail_ui::splitRowID($lId);
@@ -2547,7 +2869,10 @@ 
 		{
 			$params = $getParams($id);
 			// when downloading a single file, name is not set
-			if (!$params['name']&&isset($_GET['name'])&&!$isMultipleDownload) $params['name'] = $_GET['name'];
+			if (!$params['name']&&isset($_GET['name'])&&!$isMultipleDownload)
+			{
+				$params['name'] = $_GET['name'];
+			}
 			if ($params['icServer'] && $params['icServer'] != $this->mail_bo->profileID)
 			{
 				//error_log(__METHOD__.__LINE__.' change Profile to ->'.$icServerID);
@@ -2560,7 +2885,10 @@ 
 				// Try to find the right content for file id
 				foreach ($attachments as $key => $val)
 				{
-					if ($key == $params['is_winmail']) $attachment = $val;
+					if ($key == $params['is_winmail'])
+					{
+						$attachment = $val;
+					}
 				}
 			}
 			else
@@ -2607,7 +2935,10 @@ 
 	{
 		//error_log(__METHOD__.__LINE__.array2string($_GET));
 		// First, get all attachment IDs
-		if(isset($_GET['id'])) $message_id	= $_GET['id'];
+		if(isset($_GET['id']))
+		{
+			$message_id	= $_GET['id'];
+		}
 		//error_log(__METHOD__.__LINE__.$message_id);
 		$rememberServerID = $this->mail_bo->profileID;
 		if(!is_numeric($message_id))
@@ -2634,7 +2965,10 @@ 
 		//get_home_dir may fetch the users startfolder if set; if not writeable, action will fail. TODO: use temp_dir
 		$homedir = '/home/'.$GLOBALS['egw_info']['user']['account_lid'];
 		$temp_path = $homedir/*egw_vfs::get_home_dir()*/ . "/.mail_$message_id";
-		if(egw_vfs::is_dir($temp_path)) egw_vfs::remove ($temp_path);
+		if(egw_vfs::is_dir($temp_path))
+		{
+			egw_vfs::remove ($temp_path);
+		}
 
 		// Add subject to path, so it gets used as the file name
 		$path = $temp_path . '/' . ($header['SUBJECT'] ? egw_vfs::encodePathComponent($header['SUBJECT']) : lang('mail')) .'/';
@@ -2658,7 +2992,10 @@ 
 				foreach ($tnefAttachments as $key => $val)
 				{
 					error_log(__METHOD__.' winmail = '.$key);
-					if ($key == $file['is_winmail']) $attachment = $val;
+					if ($key == $file['is_winmail'])
+					{
+						$attachment = $val;
+					}
 				}
 			}
 			else
@@ -2666,15 +3003,24 @@ 
 				$attachment = $this->mail_bo->getAttachment($message_id,$file['partID'],$file['is_winmail'],false,true);
 			}
 			$success=true;
-			if (empty($file['filename'])) $file['filename'] = $file['name'];
+			if (empty($file['filename']))
+			{
+				$file['filename'] = $file['name'];
+			}
 			if (!($fp = egw_vfs::fopen($path.$file['filename'],'wb')) ||
 				!(!fseek($attachment['attachment'], 0, SEEK_SET) && stream_copy_to_stream($attachment['attachment'], $fp)))
 			{
 				$success=false;
 				egw_framework::message("Unable to zip {$file['filename']}",'error');
 			}
-			if ($success) $file_list[] = $path.$file['filename'];
-			if ($fp) fclose($fp);
+			if ($success)
+			{
+				$file_list[] = $path.$file['filename'];
+			}
+			if ($fp)
+			{
+				fclose($fp);
+			}
 		}
 		$this->mail_bo->closeConnection();
 		if ($rememberServerID != $this->mail_bo->profileID)
@@ -2701,7 +3047,10 @@ 
 		$this->uid = $uid;
 		$this->partID = $partID;
 		$bufferHtmlOptions = $this->mail_bo->htmlOptions;
-		if (empty($htmlOptions)) $htmlOptions = $this->mail_bo->htmlOptions;
+		if (empty($htmlOptions))
+		{
+			$htmlOptions = $this->mail_bo->htmlOptions;
+		}
 		// fetching structure now, to supply it to getMessageBody and getMessageAttachment, so it does not get fetched twice
 		$structure = $this->mail_bo->getStructure($uid, $partID, $mailbox, false);
 		$bodyParts	= $this->mail_bo->getMessageBody($uid, ($htmlOptions?$htmlOptions:''), $partID, $structure, false, $mailbox);
@@ -2765,10 +3114,16 @@ 
 <table width="100%" style="table-layout:fixed"><tr><td class="td_display">';
 
 		$EndBody = '</td></tr></table></div>';
-		if ($fullPageTags) $EndBody .= "</body></html>";
-		if ($print)	{
+		if ($fullPageTags)
+		{
+			$EndBody .= "</body></html>";
+		}
+		if ($print)
+		{
 			print $BeginBody. $body .$EndBody;
-		} else {
+		}
+		else
+		{
 			return $BeginBody. $body .$EndBody;
 		}
 	}
@@ -2784,9 +3139,14 @@ 
 		$body = '';
 
 		//error_log(__METHOD__.array2string($bodyParts)); //exit;
-		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'] = $this->getdisplayableBody($singleBodyPart,$modifyURI,$useTidy);
 				$body .= $singleBodyPart['body'];
 				continue;
@@ -2797,7 +3157,8 @@ 
 				$body .= '';
 				continue;
 			}
-			if(!empty($body)) {
+			if(!empty($body))
+			{
 				$body .= '<hr style="border:dotted 1px silver;">';
 			}
 			//error_log($singleBodyPart['body']);
@@ -2835,16 +3196,25 @@ 
 				$newBody	= @htmlentities($singleBodyPart['body'],ENT_QUOTES, strtoupper(mail_bo::$displayCharset));
 				//error_log(__METHOD__.__LINE__.'..'.$newBody);
 				// if empty and charset is utf8 try sanitizing the string in question
-				if (empty($newBody) && strtolower($singleBodyPart['charSet'])=='utf-8') $newBody = @htmlentities(iconv('utf-8', 'utf-8', $singleBodyPart['body']),ENT_QUOTES, strtoupper(mail_bo::$displayCharset));
+				if (empty($newBody) && strtolower($singleBodyPart['charSet'])=='utf-8')
+				{
+					$newBody = @htmlentities(iconv('utf-8', 'utf-8', $singleBodyPart['body']),ENT_QUOTES, strtoupper(mail_bo::$displayCharset));
+				}
 				// if the conversion to htmlentities fails somehow, try without specifying the charset, which defaults to iso-
-				if (empty($newBody)) $newBody    = htmlentities($singleBodyPart['body'],ENT_QUOTES);
+				if (empty($newBody))
+				{
+					$newBody    = htmlentities($singleBodyPart['body'],ENT_QUOTES);
+				}
 
 				// search http[s] links and make them as links available again
 				// to understand what's going on here, have a look at
 				// http://www.php.net/manual/en/function.preg-replace.php
 
 				// create links for websites
-				if ($modifyURI) $newBody = html::activate_links($newBody);
+				if ($modifyURI)
+				{
+					$newBody = html::activate_links($newBody);
+				}
 				//error_log(__METHOD__.__LINE__.'..'.$newBody);
 				// redirect links for websites if you use no cookies
 				#if (!($GLOBALS['egw_info']['server']['usecookies']))
@@ -2911,7 +3281,10 @@ 
 					// 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->egw_htmLawed($newBody,mail_bo::$htmLawed_config);
-					if ($hasOther && $preserveHTML) $newBody = $matches[1]. $newBody. $matches[3];
+					if ($hasOther && $preserveHTML)
+					{
+						$newBody = $matches[1]. $newBody. $matches[3];
+					}
 					$alreadyHtmlLawed=true;
 				}
 				// do the cleanup, set for the use of purifier
@@ -3016,7 +3389,10 @@ 
 		*/
 		$replace_callback = function ($matches) use ($_mailbox,$_uid, $_partID,  $_type)
 		{
-			if (!$_type)	return false;
+			if (!$_type)
+			{
+				return false;
+			}
 			$CID = '';
 			// Build up matches according to selected type
 			switch ($_type)
@@ -3059,9 +3435,12 @@ 
 							$attachment = $bo->getAttachmentByCID($_uid, $CID, $_partID);
 
 							// only use data uri for "smaller" images, as otherwise the first display of the mail takes to long
-							if (($attachment instanceof Horde_Mime_Part) && $attachment->getBytes() < 8192)	// msie=8 allows max 32k data uris
+							if (($attachment instanceof Horde_Mime_Part) && $attachment->getBytes() < 8192)
+							{
+								// msie=8 allows max 32k data uris
 							{
 								$bo->fetchPartContents($_uid, $attachment);
+							}
 								$cache[$imageURL] = 'data:'.$attachment->getType().';base64,'.base64_encode($attachment->getContents());
 							}
 							else
@@ -3133,7 +3512,10 @@ 
 			}
 			$destination = $content['FOLDER'][0];
 
-			if (stripos($destination,self::$delimiter)!==false) list($icServerID,$destination) = explode(self::$delimiter,$destination,2);
+			if (stripos($destination,self::$delimiter)!==false)
+			{
+				list($icServerID,$destination) = explode(self::$delimiter,$destination,2);
+			}
 			if ($icServerID && $icServerID != $this->mail_bo->profileID)
 			{
 				//error_log(__METHOD__.__LINE__.' change Profile to ->'.$icServerID);
@@ -3158,14 +3540,26 @@ 
 			if (!$importFailed)
 			{
 				list($width, $height) = explode('x', egw_link::get_registry('mail', 'add_popup'));
-				if ($width > 0 && $height > 0) egw_json_response::get()->call('resizeTo', $width, $height);
+				if ($width > 0 && $height > 0)
+				{
+					egw_json_response::get()->call('resizeTo', $width, $height);
+				}
 				ExecMethod2('mail.mail_ui.displayMessage',$linkData);
 				return;
 			}
 		}
-		if (!is_array($content)) $content = array();
-		if (empty($content['FOLDER'])) $content['FOLDER']=(array)$this->mail_bo->getDraftFolder();
-		if (!empty($content['FOLDER'])) $sel_options['FOLDER']=mail_compose::ajax_searchFolder(0,true);
+		if (!is_array($content))
+		{
+			$content = array();
+		}
+		if (empty($content['FOLDER']))
+		{
+			$content['FOLDER']=(array)$this->mail_bo->getDraftFolder();
+		}
+		if (!empty($content['FOLDER']))
+		{
+			$sel_options['FOLDER']=mail_compose::ajax_searchFolder(0,true);
+		}
 
 		$etpl = new etemplate_new('mail.importMessage');
 		$etpl->setElementAttribute('uploadForImport','onFinish','app.mail.uploadForImport');
@@ -3185,7 +3579,10 @@ 
 	{
 		$importfailed = false;
 		//error_log(__METHOD__.__LINE__.array2string($_formData));
-		if (empty($_formData['file'])) $_formData['file'] = $_formData['tmp_name'];
+		if (empty($_formData['file']))
+		{
+			$_formData['file'] = $_formData['tmp_name'];
+		}
 		// check if formdata meets basic restrictions (in tmp dir, or vfs, mimetype, etc.)
 		try
 		{
@@ -3216,10 +3613,14 @@ 
 				$alert_msg .= lang("Import of message %1 failed. Destination Folder not set.",$_formData['name']);
 			}
 			$delimiter = $this->mail_bo->getHierarchyDelimiter();
-			if($_folder=='INBOX'.$delimiter) $_folder='INBOX';
+			if($_folder=='INBOX'.$delimiter)
+			{
+				$_folder='INBOX';
+			}
 			if ($importfailed === false)
 			{
-				if ($this->mail_bo->folderExists($_folder,true)) {
+				if ($this->mail_bo->folderExists($_folder,true))
+				{
 					try
 					{
 						$messageUid = $this->mail_bo->appendMessage($_folder,
@@ -3280,7 +3681,10 @@ 
 	 */
 	function importMessageFromVFS2DraftAndDisplay($formData='',$mode='display')
 	{
-		if (empty($formData)) if (isset($_REQUEST['formData'])) $formData = $_REQUEST['formData'];
+		if (empty($formData))
+		{
+			if (isset($_REQUEST['formData'])) $formData = $_REQUEST['formData'];
+		}
 		//error_log(__METHOD__.__LINE__.':'.array2string($formData).' Mode:'.$mode.'->'.function_backtrace());
 		$draftFolder = $this->mail_bo->getDraftFolder(false);
 		$importID = mail_bo::getRandomString();
@@ -3294,15 +3698,26 @@ 
 		if (parse_url($formData['file'],PHP_URL_SCHEME) == 'vfs' && empty($formData['name']))
 		{
 			$buff = explode('/',$formData['file']);
-			if (is_array($buff)) $formData['name'] = array_pop($buff); // take the last part as name
+			if (is_array($buff))
+			{
+				$formData['name'] = array_pop($buff);
+			}
+			// take the last part as name
 		}
 		// type should be set to meet the requirements of checkFileBasics
 		if (parse_url($formData['file'],PHP_URL_SCHEME) == 'vfs' && empty($formData['type']))
 		{
 			$buff = explode('.',$formData['file']);
 			$suffix = '';
-			if (is_array($buff)) $suffix = array_pop($buff); // take the last extension to check with ext2mime
-			if (!empty($suffix)) $formData['type'] = mime_magic::ext2mime($suffix);
+			if (is_array($buff))
+			{
+				$suffix = array_pop($buff);
+			}
+			// take the last extension to check with ext2mime
+			if (!empty($suffix))
+			{
+				$formData['type'] = mime_magic::ext2mime($suffix);
+			}
 		}
 		// size should be set to meet the requirements of checkFileBasics
 		if (parse_url($formData['file'],PHP_URL_SCHEME) == 'vfs' && !isset($formData['size']))
@@ -3345,17 +3760,35 @@ 
 	function loadEmailBody($_messageID=null,$_partID=null,$_htmloptions=null)
 	{
 		//error_log(__METHOD__.__LINE__.array2string($_GET));
-		if (!$_messageID && !empty($_GET['_messageID'])) $_messageID = $_GET['_messageID'];
-		if (!$_partID && !empty($_GET['_partID'])) $_partID = $_GET['_partID'];
-		if (!$_htmloptions && !empty($_GET['_htmloptions'])) $_htmloptions = $_GET['_htmloptions'];
-		if(mail_bo::$debug) error_log(__METHOD__."->".print_r($_messageID,true).",$_partID,$_htmloptions");
-		if (empty($_messageID)) return "";
+		if (!$_messageID && !empty($_GET['_messageID']))
+		{
+			$_messageID = $_GET['_messageID'];
+		}
+		if (!$_partID && !empty($_GET['_partID']))
+		{
+			$_partID = $_GET['_partID'];
+		}
+		if (!$_htmloptions && !empty($_GET['_htmloptions']))
+		{
+			$_htmloptions = $_GET['_htmloptions'];
+		}
+		if(mail_bo::$debug)
+		{
+			error_log(__METHOD__."->".print_r($_messageID,true).",$_partID,$_htmloptions");
+		}
+		if (empty($_messageID))
+		{
+			return "";
+		}
 		$uidA = self::splitRowID($_messageID);
 		$folder = $uidA['folder']; // all messages in one set are supposed to be within the same folder
 		$messageID = $uidA['msgUID'];
 		$icServerID = $uidA['profileID'];
 		//something went wrong. there is a $_messageID but no $messageID: means $_messageID is crippeled
-		if (empty($messageID)) return "";
+		if (empty($messageID))
+		{
+			return "";
+		}
 		if ($icServerID && $icServerID != $this->mail_bo->profileID)
 		{
 			//error_log(__METHOD__.__LINE__.' change Profile to ->'.$icServerID);
@@ -3388,11 +3821,18 @@ 
 				list($profileID,$folderName) = explode(self::$delimiter,$_folderName,2);
 				if (is_numeric($profileID))
 				{
-					if ($profileID != $this->mail_bo->profileID) continue; // only current connection
+					if ($profileID != $this->mail_bo->profileID)
+					{
+						continue;
+					}
+					// only current connection
 					if ($folderName)
 					{
 						$fS = $this->mail_bo->getFolderStatus($folderName,false,false,false);
-						if (in_array($fS['shortDisplayName'],mail_bo::$autoFolders)) $fS['shortDisplayName']=lang($fS['shortDisplayName']);
+						if (in_array($fS['shortDisplayName'],mail_bo::$autoFolders))
+						{
+							$fS['shortDisplayName']=lang($fS['shortDisplayName']);
+						}
 						//error_log(__METHOD__.__LINE__.array2string($fS));
 						if ($fS['unseen'])
 						{
@@ -3433,7 +3873,11 @@ 
 			list($profileID,$parentFolderName) = explode(self::$delimiter,$decodedFolderName,2);
 			if (is_numeric($profileID))
 			{
-				if ($profileID != $this->mail_bo->profileID) return; // only current connection
+				if ($profileID != $this->mail_bo->profileID)
+				{
+					return;
+				}
+				// only current connection
 				$del = $this->mail_bo->getHierarchyDelimiter(false);
 				//$del = $prefix = '';
 				//$nameSpace = $this->mail_bo->_getNameSpaces();
@@ -3473,7 +3917,10 @@ 
 				$nA = explode($del,$_newName);
 
 				//error_log(__METHOD__.__LINE__."$folderName, $parentFolder, $_newName");
-				if (!!empty($parentFolderName)) $oldFolderInfo = $this->mail_bo->getFolderStatus($parentFolderName,false);
+				if (!!empty($parentFolderName))
+				{
+					$oldFolderInfo = $this->mail_bo->getFolderStatus($parentFolderName,false);
+				}
 				//error_log(__METHOD__.__LINE__.array2string($oldFolderInfo));
 
 				$this->mail_bo->reopen('INBOX');
@@ -3494,9 +3941,15 @@ 
 							$errorMessage .= $error;
 						}
 					}
-					if ($c==count($nA)) $created=true;
+					if ($c==count($nA))
+					{
+						$created=true;
+					}
+				}
+				if (!empty($parentName))
+				{
+					$this->mail_bo->reopen($parentName);
 				}
-				if (!empty($parentName)) $this->mail_bo->reopen($parentName);
 			}
 			//error_log(__METHOD__.__LINE__.array2string($oA));
 			if ($created===true)
@@ -3532,7 +3985,10 @@ 
 	 */
 	function ajax_renameFolder($_folderName, $_newName)
 	{
-		if (mail_bo::$debug) error_log(__METHOD__.__LINE__.' OldFolderName:'.array2string($_folderName).' NewName:'.array2string($_newName));
+		if (mail_bo::$debug)
+		{
+			error_log(__METHOD__.__LINE__.' OldFolderName:'.array2string($_folderName).' NewName:'.array2string($_newName));
+		}
 		if ($_folderName)
 		{
 			translation::add_app('mail');
@@ -3544,7 +4000,11 @@ 
 			$hasChildren = false;
 			if (is_numeric($profileID))
 			{
-				if ($profileID != $this->mail_bo->profileID) return; // only current connection
+				if ($profileID != $this->mail_bo->profileID)
+				{
+					return;
+				}
+				// only current connection
 				$pA = explode($del,$folderName);
 				array_pop($pA);
 				$parentFolder = implode($del,$pA);
@@ -3685,8 +4145,15 @@ 
 		list($profileID,$folderName) = explode(self::$delimiter,$decodedFolderName,2);
 		// if pref and required mode dont match -> reset the folderObject cache to ensure
 		// that we get what we request
-		if ($_subscribedOnly != $oldPrefForSubscribedOnly) $this->mail_bo->resetFolderObjectCache($profileID);
-		if ($profileID != $this->mail_bo->profileID) return; // only current connection
+		if ($_subscribedOnly != $oldPrefForSubscribedOnly)
+		{
+			$this->mail_bo->resetFolderObjectCache($profileID);
+		}
+		if ($profileID != $this->mail_bo->profileID)
+		{
+			return;
+		}
+		// only current connection
 		if (!empty($folderName))
 		{
 			$parentFolder=(!empty($folderName)?$folderName:'INBOX');
@@ -3761,7 +4228,10 @@ 
 	 */
 	function ajax_MoveFolder($_folderName, $_target)
 	{
-		if (mail_bo::$debug) error_log(__METHOD__.__LINE__."Move Folder: $_folderName to Target: $_target");
+		if (mail_bo::$debug)
+		{
+			error_log(__METHOD__.__LINE__."Move Folder: $_folderName to Target: $_target");
+		}
 		if ($_folderName)
 		{
 			$decodedFolderName = $this->mail_bo->decodeEntityFolderName($_folderName);
@@ -3772,7 +4242,11 @@ 
 			$hasChildren = false;
 			if (is_numeric($profileID))
 			{
-				if ($profileID != $this->mail_bo->profileID || $profileID != $newProfileID) return; // only current connection
+				if ($profileID != $this->mail_bo->profileID || $profileID != $newProfileID)
+				{
+					return;
+				}
+				// only current connection
 				$pA = explode($del,$folderName);
 				$namePart = array_pop($pA);
 				$_newName = $namePart;
@@ -3783,10 +4257,13 @@ 
 					(($oldParentFolder === $parentFolder) || //$oldParentFolder == $parentFolder means move on same level
 					(($oldParentFolder != $parentFolder &&
 					strlen($parentFolder)>0 && strlen($folderName)>0 &&
-					strpos($parentFolder,$folderName)===false)))) // indicates that we move the older up the tree within its own branch
+					strpos($parentFolder,$folderName)===false))))
+				{
+					// indicates that we move the older up the tree within its own branch
 				{
 					//error_log(__METHOD__.__LINE__."$folderName, $parentFolder, $_newName");
 					$oldFolderInfo = $this->mail_bo->getFolderStatus($folderName,false,false,false);
+				}
 					//error_log(__METHOD__.__LINE__.array2string($oldFolderInfo));
 					if (!empty($oldFolderInfo['attributes']) && stripos(array2string($oldFolderInfo['attributes']),'\hasnochildren')=== false)
 					{
@@ -3869,8 +4346,14 @@ 
 					$profileID.self::$delimiter.$oldParentFolder=>$oldFolderInfo['shortDisplayName'],
 					$profileID.self::$delimiter.$parentFolder=>$folderInfo['shortDisplayName']);
 				// if we move the folder within the same parent-branch of the tree, there is no need no refresh the upper part
-				if (strlen($parentFolder)>strlen($oldParentFolder) && strpos($parentFolder,$oldParentFolder)!==false) unset($refreshData[$profileID.self::$delimiter.$parentFolder]);
-				if (count($refreshData)>1 && strlen($oldParentFolder)>strlen($parentFolder) && strpos($oldParentFolder,$parentFolder)!==false) unset($refreshData[$profileID.self::$delimiter.$oldParentFolder]);
+				if (strlen($parentFolder)>strlen($oldParentFolder) && strpos($parentFolder,$oldParentFolder)!==false)
+				{
+					unset($refreshData[$profileID.self::$delimiter.$parentFolder]);
+				}
+				if (count($refreshData)>1 && strlen($oldParentFolder)>strlen($parentFolder) && strpos($oldParentFolder,$parentFolder)!==false)
+				{
+					unset($refreshData[$profileID.self::$delimiter.$oldParentFolder]);
+				}
 
 				// Send full info back in the response
 				foreach($refreshData as $folder => &$name)
@@ -3906,7 +4389,11 @@ 
 			$hasChildren = false;
 			if (is_numeric($profileID))
 			{
-				if ($profileID != $this->mail_bo->profileID) return; // only current connection
+				if ($profileID != $this->mail_bo->profileID)
+				{
+					return;
+				}
+				// only current connection
 				$pA = explode($del,$folderName);
 				array_pop($pA);
 				if (strtoupper($folderName)!= 'INBOX')
@@ -3932,7 +4419,9 @@ 
 						}
 						krsort($ftD,SORT_NUMERIC);//sort per level
 						//we iterate per level of depth of the subtree, deepest nesting is to be deleted first, and then up the tree
-						foreach($ftD as $k => $lc)//collection per level
+						foreach($ftD as $k => $lc)
+						{
+							//collection per level
 						{
 							foreach($lc as $i => $f)//folders contained in that level
 							{
@@ -3940,8 +4429,12 @@ 
 								{
 									//error_log(__METHOD__.__LINE__.array2string($f).'<->'.$folderName);
 									$this->mail_bo->deleteFolder($f);
+						}
 									$success = true;
-									if ($f==$folderName) $oA[$_folderName] = $oldFolderInfo['shortDisplayName'];
+									if ($f==$folderName)
+									{
+										$oA[$_folderName] = $oldFolderInfo['shortDisplayName'];
+									}
 								}
 								catch (Exception $e)
 								{
@@ -3971,7 +4464,10 @@ 
 					$msg = lang("refused to delete folder INBOX");
 				}
 			}
-			if ($_return) return $success;
+			if ($_return)
+			{
+				return $success;
+			}
 			$response = egw_json_response::get();
 			if ($success)
 			{
@@ -4056,19 +4552,29 @@ 
 			// Create mail app object
 			$mail = new mail_ui();
 
-			if (empty($icServerID)) $icServerID = $mail->mail_bo->profileID;
-			if ($icServerID != $mail->mail_bo->profileID) return;
+			if (empty($icServerID))
+			{
+				$icServerID = $mail->mail_bo->profileID;
+			}
+			if ($icServerID != $mail->mail_bo->profileID)
+			{
+				return;
+			}
 
 			$vacation = $mail->gatherVacation($cachedVacations);
 		}
 
-		if($vacation) {
+		if($vacation)
+		{
 			if (is_array($vacation) && ($vacation['status'] == 'on' || $vacation['status']=='by_date'))
 			{
 				$dtfrmt = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
 				$refreshData['vacationnotice'] = lang('Vacation notice is active');
 				$refreshData['vacationrange'] = ($vacation['status']=='by_date'? common::show_date($vacation['start_date'],$dtfrmt,true).($vacation['end_date']>$vacation['start_date']?'->'.common::show_date($vacation['end_date']+ 24*3600-1,$dtfrmt,true):''):'');
-				if ($vacation['status'] == 'by_date' && $vacation['end_date']+ 24*3600 < time())$refreshData = '';
+				if ($vacation['status'] == 'by_date' && $vacation['end_date']+ 24*3600 < time())
+				{
+					$refreshData = '';
+				}
 			}
 		}
 		if ($vacation==false)
@@ -4090,11 +4596,17 @@ 
 	function ajax_refreshFilters($icServerID=null)
 	{
 		//error_log(__METHOD__.__LINE__.array2string($icServerId));
-		if (empty($icServerID)) $icServerID = $this->mail_bo->profileID;
+		if (empty($icServerID))
+		{
+			$icServerID = $this->mail_bo->profileID;
+		}
 		if (is_null(emailadmin_imapbase::$supportsORinQuery) || !isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]))
 		{
 			emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-			if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
+			if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]))
+			{
+				emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
+			}
 		}
 		if (!emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])
 		{
@@ -4115,7 +4627,10 @@ 
 			$keywords = array('keyword1','keyword2','keyword3','keyword4','keyword5');
 			foreach($keywords as &$k)
 			{
-				if (array_key_exists($k,$this->statusTypes)) unset($this->statusTypes[$k]);
+				if (array_key_exists($k,$this->statusTypes))
+				{
+					unset($this->statusTypes[$k]);
+				}
 			}
 		}
 
@@ -4134,7 +4649,10 @@ 
 	{
 		//error_log(__METHOD__.__LINE__.array2string($icServerID));
 		translation::add_app('mail');
-		if (is_null($icServerID)) $icServerID = $this->mail_bo->profileID;
+		if (is_null($icServerID))
+		{
+			$icServerID = $this->mail_bo->profileID;
+		}
 		$rememberServerID = $this->mail_bo->profileID;
 		if ($icServerID && $icServerID != $this->mail_bo->profileID)
 		{
@@ -4144,18 +4662,22 @@ 
 		try
 		{
 			$quota = $this->mail_bo->getQuotaRoot();
-		} catch (Exception $e) {
+		}
+		catch (Exception $e) {
 			$quota['limit'] = 'NOT SET';
 			error_log(__METHOD__.__LINE__." ".$e->getMessage());
 		}
 
-		if($quota !== false && $quota['limit'] != 'NOT SET') {
+		if($quota !== false && $quota['limit'] != 'NOT SET')
+		{
 			$quotainfo = $this->quotaDisplay($quota['usage'], $quota['limit']);
 			$content['quota'] = $sel_options[self::$nm_index]['quota'] = $quotainfo['text'];
 			$content['quotainpercent'] = $sel_options[self::$nm_index]['quotainpercent'] =  (string)$quotainfo['percent'];
 			$content['quotaclass'] = $sel_options[self::$nm_index]['quotaclass'] = $quotainfo['class'];
 			$content['quotanotsupported'] = $sel_options[self::$nm_index]['quotanotsupported'] = "";
-		} else {
+		}
+		else
+		{
 			$content['quota'] = $sel_options[self::$nm_index]['quota'] = lang("Quota not provided by server");
 			$content['quotaclass'] = $sel_options[self::$nm_index]['quotaclass'] = "mail_DisplayNone";
 			$content['quotanotsupported'] = $sel_options[self::$nm_index]['quotanotsupported'] = "mail_DisplayNone";
@@ -4188,7 +4710,8 @@ 
 			$this->changeProfile($icServerID);
 		}
 		$junkFolder = $this->mail_bo->getJunkFolder();
-		if(!empty($junkFolder)) {
+		if(!empty($junkFolder))
+		{
 			if ($selectedFolder == $icServerID.self::$delimiter.$junkFolder)
 			{
 				// Lock the tree if the active folder is junk folder
@@ -4238,7 +4761,8 @@ 
 			$this->changeProfile($icServerID);
 		}
 		$trashFolder = $this->mail_bo->getTrashFolder();
-		if(!empty($trashFolder)) {
+		if(!empty($trashFolder))
+		{
 			if ($selectedFolder == $icServerID.self::$delimiter.$trashFolder)
 			{
 				// Lock the tree if the active folder is Trash folder
@@ -4284,7 +4808,10 @@ 
 		$decodedFolderName = $this->mail_bo->decodeEntityFolderName($_folderName);
 		list($icServerID,$folderName) = explode(self::$delimiter,$decodedFolderName,2);
 
-		if (empty($folderName)) $folderName = $this->mail_bo->sessionData['mailbox'];
+		if (empty($folderName))
+		{
+			$folderName = $this->mail_bo->sessionData['mailbox'];
+		}
 		if ($this->mail_bo->folderExists($folderName))
 		{
 			$rememberServerID = $this->mail_bo->profileID;
@@ -4293,7 +4820,8 @@ 
 				//error_log(__METHOD__.__LINE__.' change Profile to ->'.$icServerID);
 				$this->changeProfile($icServerID);
 			}
-			if(!empty($_folderName)) {
+			if(!empty($_folderName))
+			{
 				$this->mail_bo->compressFolder($folderName);
 			}
 			if ($rememberServerID != $this->mail_bo->profileID)
@@ -4315,7 +4843,10 @@ 
 	 */
 	function ajax_sendMDN($_messageList)
 	{
-		if(mail_bo::$debug) error_log(__METHOD__."->".array2string($_messageList));
+		if(mail_bo::$debug)
+		{
+			error_log(__METHOD__."->".array2string($_messageList));
+		}
 		$uidA = self::splitRowID($_messageList['msg'][0]);
 		$folder = $uidA['folder']; // all messages in one set are supposed to be within the same folder
 		$this->mail_bo->sendMDN($uidA['msgUID'],$folder);
@@ -4332,7 +4863,10 @@ 
 	 */
 	function ajax_flagMessages($_flag, $_messageList, $_sendJsonResponse=true)
 	{
-		if(mail_bo::$debug) error_log(__METHOD__."->".$_flag.':'.array2string($_messageList));
+		if(mail_bo::$debug)
+		{
+			error_log(__METHOD__."->".$_flag.':'.array2string($_messageList));
+		}
 		translation::add_app('mail');
 		$alreadyFlagged=false;
 		$flag2check='';
@@ -4353,7 +4887,10 @@ 
 						if (is_null(emailadmin_imapbase::$supportsORinQuery) || !isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]))
 						{
 							emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-							if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
+							if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]))
+							{
+								emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
+							}
 						}
 						$filter = $filter2toggle = array('filterName' => (emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?lang('quicksearch'):lang('subject')),'type' => ($query['filter2']?$query['filter2']:(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject')),'string' => $query['search'],'status' => 'any');
 					}
@@ -4399,13 +4936,19 @@ 
 						if (count($messageListForToggle)>0)
 						{
 							$flag2set = (strtolower($_flag));
-							if(mail_bo::$debug) error_log(__METHOD__.__LINE__." toggle un$_flag -> $flag2set ".array2string($filter2toggle).array2string($messageListForToggle));
+							if(mail_bo::$debug)
+							{
+								error_log(__METHOD__.__LINE__." toggle un$_flag -> $flag2set ".array2string($filter2toggle).array2string($messageListForToggle));
+							}
 							$this->mail_bo->flagMessages($flag2set, $messageListForToggle,$folder);
 						}
 						if (count($messageList)>0)
 						{
 							$flag2set = 'un'.$_flag;
-							if(mail_bo::$debug) error_log(__METHOD__.__LINE__." $_flag -> $flag2set ".array2string($filter).array2string($messageList));
+							if(mail_bo::$debug)
+							{
+								error_log(__METHOD__.__LINE__." $_flag -> $flag2set ".array2string($filter).array2string($messageList));
+							}
 							$this->mail_bo->flagMessages($flag2set, $messageList,$folder);
 						}
 						$alreadyFlagged=true;
@@ -4421,7 +4964,10 @@ 
 							// since we toggle and we toggle by the filtered flag we must must change _flag
 							$_flag = ($query['filter']=='unseen' && $_flag=='read' ? 'read' : ($query['filter']=='seen'&& $_flag=='read'?'unread':($_flag==$query['filter']?'un'.$_flag:$_flag)));
 						}
-						if(mail_bo::$debug) error_log(__METHOD__.__LINE__." flag all with $_flag on filter used:".array2string($filter));
+						if(mail_bo::$debug)
+						{
+							error_log(__METHOD__.__LINE__." flag all with $_flag on filter used:".array2string($filter));
+						}
 						$_sR = $this->mail_bo->getSortedList(
 							$folder,
 							$sort=0,
@@ -4436,7 +4982,10 @@ 
 					}
 					else
 					{
-						if(mail_bo::$debug) error_log(__METHOD__.__LINE__." $_flag all ".array2string($filter));
+						if(mail_bo::$debug)
+						{
+							error_log(__METHOD__.__LINE__." $_flag all ".array2string($filter));
+						}
 						$alreadyFlagged=true;
 						$uidA = self::splitRowID($_messageList['msg'][0]);
 						$folder = $uidA['folder']; // all messages in one set are supposed to be within the same folder
@@ -4456,13 +5005,19 @@ 
 					$hA = self::splitRowID($rowID);
 					$messageList[] = $hA['msgUID'];
 				}
-				if(mail_bo::$debug) error_log(__METHOD__.__LINE__." $_flag in $folder:".array2string(((isset($_messageList['all']) && $_messageList['all']) ? 'all':$messageList)));
+				if(mail_bo::$debug)
+				{
+					error_log(__METHOD__.__LINE__." $_flag in $folder:".array2string(((isset($_messageList['all']) && $_messageList['all']) ? 'all':$messageList)));
+				}
 				$this->mail_bo->flagMessages($_flag, ((isset($_messageList['all']) && $_messageList['all']) ? 'all':$messageList),$folder);
 			}
 		}
 		else
 		{
-			if(mail_bo::$debug) error_log(__METHOD__."-> No messages selected.");
+			if(mail_bo::$debug)
+			{
+				error_log(__METHOD__."-> No messages selected.");
+			}
 		}
 
 		if ($_sendJsonResponse)
@@ -4499,7 +5054,10 @@ 
 	 */
 	function ajax_deleteMessages($_messageList,$_forceDeleteMethod=null)
 	{
-		if(mail_bo::$debug) error_log(__METHOD__."->".print_r($_messageList,true).' Method:'.$_forceDeleteMethod);
+		if(mail_bo::$debug)
+		{
+			error_log(__METHOD__."->".print_r($_messageList,true).' Method:'.$_forceDeleteMethod);
+		}
 		$error = null;
 		$filtered =  false;
 		if ($_messageList=='all' || !empty($_messageList['msg']))
@@ -4518,7 +5076,10 @@ 
 						if (is_null(emailadmin_imapbase::$supportsORinQuery) || !isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]))
 						{
 							emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-							if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
+							if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]))
+							{
+								emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
+							}
 						}
 						$filtered =  true;
 						$filter = array('filterName' => (emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?lang('quicksearch'):lang('subject')),'type' => ($query['filter2']?$query['filter2']:(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject')),'string' => $query['search'],'status' => (!empty($query['filter'])?$query['filter']:'any'));
@@ -4587,7 +5148,10 @@ 
 		}
 		else
 		{
-			if(mail_bo::$debug) error_log(__METHOD__."-> No messages selected.");
+			if(mail_bo::$debug)
+			{
+				error_log(__METHOD__."-> No messages selected.");
+			}
 		}
 	}
 
@@ -4602,11 +5166,17 @@ 
 	 */
 	function ajax_copyMessages($_folderName, $_messageList, $_copyOrMove='copy')
 	{
-		if(mail_bo::$debug) error_log(__METHOD__."->".$_folderName.':'.print_r($_messageList,true).' Method:'.$_copyOrMove);
+		if(mail_bo::$debug)
+		{
+			error_log(__METHOD__."->".$_folderName.':'.print_r($_messageList,true).' Method:'.$_copyOrMove);
+		}
 		translation::add_app('mail');
 		$_folderName = $this->mail_bo->decodeEntityFolderName($_folderName);
 		// only copy or move are supported as method
-		if (!($_copyOrMove=='copy' || $_copyOrMove=='move')) $_copyOrMove='copy';
+		if (!($_copyOrMove=='copy' || $_copyOrMove=='move'))
+		{
+			$_copyOrMove='copy';
+		}
 		list($targetProfileID,$targetFolder) = explode(self::$delimiter,$_folderName,2);
 		$lastFoldersUsedForMoveCont = egw_cache::getCache(egw_cache::INSTANCE,'email','lastFolderUsedForMove'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),$expiration=60*60*1);
 		$changeFolderActions = false;
@@ -4617,8 +5187,13 @@ 
 				$keys = array_keys($lastFoldersUsedForMoveCont[$targetProfileID]);
 				foreach( $keys as &$f)
 				{
-					if (count($lastFoldersUsedForMoveCont[$targetProfileID])>9) unset($lastFoldersUsedForMoveCont[$targetProfileID][$f]);
-					else break;
+					if (count($lastFoldersUsedForMoveCont[$targetProfileID])>9)
+					{
+						unset($lastFoldersUsedForMoveCont[$targetProfileID][$f]);
+					}
+					else {
+						break;
+					}
 				}
 				//error_log(__METHOD__.__LINE__.array2string($lastFoldersUsedForMoveCont[$targetProfileID]));
 			}
@@ -4644,7 +5219,10 @@ 
 						if (is_null(emailadmin_imapbase::$supportsORinQuery) || !isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]))
 						{
 							emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-							if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
+							if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]))
+							{
+								emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
+							}
 						}
 						$filtered = true;
 						$filter = array('filterName' => (emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?lang('quicksearch'):lang('subject')),'type' => ($query['filter2']?$query['filter2']:(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject')),'string' => $query['search'],'status' => (!empty($query['filter'])?$query['filter']:'any'));
@@ -4702,7 +5280,10 @@ 
 						$hA = self::splitRowID($rowID);
 
 						// If folder changes, stop and move what we've got
-						if($hA['folder'] != $folder) break;
+						if($hA['folder'] != $folder)
+						{
+							break;
+						}
 
 						array_shift($_messageList['msg']);
 						$messageList[] = $hA['msgUID'];
@@ -4757,7 +5338,10 @@ 
 		}
 		else
 		{
-			if(mail_bo::$debug) error_log(__METHOD__."-> No messages selected.");
+			if(mail_bo::$debug)
+			{
+				error_log(__METHOD__."-> No messages selected.");
+			}
 		}
 	}