EGroupware / egroupware

mail/inc/class.mail_ui.inc.php

Spacing +821 added lines, -828 removed lines

@@ -40,8 +40,7 @@ 
 	 *
 	 * @var array
 	 */
-	var $public_functions = array
-	(
+	var $public_functions = array(
 		'index' => True,
 		'displayHeader'	=> True,
 		'displayMessage'	=> True,
@@ -92,17 +91,17 @@ 
 	 * @var array
 	 */
 	var $searchTypes = array(
-		'quick'		=> 'quicksearch',	// lang('quicksearch')
-		'quickwithcc'=> 'quicksearch (with cc)',	// lang('quicksearch (with cc)')
-		'subject'	=> 'subject',		// lang('subject')
-		'body'		=> 'message body',	// lang('message body')
-		'from'		=> 'from',			// lang('from')
-		'to'		=> 'to',			// lang('to')
-		'cc'		=> 'cc',			// lang('cc')
-		'text'		=> 'whole message',	// lang('whole message')
-		'larger'		=> 'greater than',	// lang('greater than')
-		'smaller'		=> 'less than',	// lang('less than')
-		'bydate' 	=> 'Selected date range (with quicksearch)',// lang('Selected date range (with quicksearch)')
+		'quick'		=> 'quicksearch', // lang('quicksearch')
+		'quickwithcc'=> 'quicksearch (with cc)', // lang('quicksearch (with cc)')
+		'subject'	=> 'subject', // lang('subject')
+		'body'		=> 'message body', // lang('message body')
+		'from'		=> 'from', // lang('from')
+		'to'		=> 'to', // lang('to')
+		'cc'		=> 'cc', // lang('cc')
+		'text'		=> 'whole message', // lang('whole message')
+		'larger'		=> 'greater than', // lang('greater than')
+		'smaller'		=> 'less than', // lang('less than')
+		'bydate' 	=> 'Selected date range (with quicksearch)', // lang('Selected date range (with quicksearch)')
 	);
 
 	/**
@@ -111,12 +110,12 @@ 
 	 * @var array
 	 */
 	var $statusTypes = array(
-		'any'		=> 'any status',// lang('any status')
-		'flagged'	=> 'flagged',	// lang('flagged')
-		'unseen'	=> 'unread',	// lang('unread')
-		'answered'	=> 'replied',	// lang('replied')
-		'seen'		=> 'read',		// lang('read')
-		'deleted'	=> 'deleted',	// lang('deleted')
+		'any'		=> 'any status', // lang('any status')
+		'flagged'	=> 'flagged', // lang('flagged')
+		'unseen'	=> 'unread', // lang('unread')
+		'answered'	=> 'replied', // lang('replied')
+		'seen'		=> 'read', // lang('read')
+		'deleted'	=> 'deleted', // lang('deleted')
 	);
 
 	/**
@@ -124,12 +123,12 @@ 
 	 *
 	 * @param boolean $run_constructor =true false: no not run constructor and therefore do NOT connect to imap server
 	 */
-	function __construct($run_constructor=true)
+	function __construct($run_constructor = true)
 	{
 		$this->mail_tree = new mail_tree($this);
 		if (!$run_constructor) return;
 
-		if (Mail::$debugTimes) $starttime = microtime (true);
+		if (Mail::$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']);
 
@@ -145,13 +144,13 @@ 
 		}
 
 		try {
-			$this->mail_bo = Mail::getInstance(true,self::$icServerID, true, false, true);
+			$this->mail_bo = Mail::getInstance(true, self::$icServerID, true, false, true);
 			if (Mail::$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
 			$needle = '/^(?!mail)/';
-			if (!preg_match($needle,$_GET['menuaction']) && !Api\Json\Request::isJSONRequest())
+			if (!preg_match($needle, $_GET['menuaction']) && !Api\Json\Request::isJSONRequest())
 			{
 				//error_log(__METHOD__.__LINE__.' Fetched IC Server openConnection:'.self::$icServerID.'/'.$this->mail_bo->profileID.':'.function_backtrace());
 				//openConnection gathers SpecialUseFolderInformation and Delimiter Info
@@ -164,12 +163,12 @@ 
 			if (Api\Json\Request::isJSONRequest() && $_GET['menuaction'] != 'mail.mail_ui.index')
 			{
 				$response = Api\Json\Response::get();
-				$response->call('egw.message',$e->getMessage(),'error');
+				$response->call('egw.message', $e->getMessage(), 'error');
 			}
 			// redirect to mail wizard to handle it (redirect works for ajax too), unless index is called. we want the sidebox
-			if ($_GET['menuaction'] != 'mail.mail_ui.index') self::callWizard($e->getMessage(),true,'error',false);
+			if ($_GET['menuaction'] != 'mail.mail_ui.index') self::callWizard($e->getMessage(), true, 'error', false);
 		}
-		if (Mail::$debugTimes) Mail::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
+		if (Mail::$debugTimes) Mail::logRunTimes($starttime, null, '', __METHOD__.__LINE__);
 	}
 
 	/**
@@ -179,10 +178,10 @@ 
 	 * @param boolean $exit If true, will call exit() after opening the wizardpopup
 	 * @param string $msg_type = 'success' message type
 	 */
-	static function callWizard($message, $exit=true, $msg_type='success',$reset_sidebox_on_index=true)
+	static function callWizard($message, $exit = true, $msg_type = 'success', $reset_sidebox_on_index = true)
 	{
 		//error_log(__METHOD__."('$message', $exit) ".function_backtrace());
-		$linkData=(self::$icServerID ? array(
+		$linkData = (self::$icServerID ? array(
 				'menuaction' => 'mail.mail_wizard.edit',
 				'acc_id' => self::$icServerID,
 			) : array(
@@ -196,11 +195,11 @@ 
 		{
 			$response = Api\Json\Response::get();
 			$windowName = "editMailAccount".self::$icServerID;
-			$response->call("egw.open_link", Egw::link('/index.php', $linkData), $windowName, "600x480",null,true);
+			$response->call("egw.open_link", Egw::link('/index.php', $linkData), $windowName, "600x480", null, true);
 			Framework::message($message, 'error');
 			if ($_GET['menuaction'] == 'mail.mail_ui.index' && $reset_sidebox_on_index)
 			{
-				$response->call('framework.setSidebox','mail',array(),'md5');
+				$response->call('framework.setSidebox', 'mail', array(), 'md5');
 			}
 			if ($exit)
 			{
@@ -210,8 +209,8 @@ 
 		else	// regular GET request eg. in idots template
 		{
 			$windowName = "editMailAccount".self::$icServerID;
-			Framework::popup(Framework::link('/index.php',$linkData),$windowName);
-			$GLOBALS['egw']->framework->render($message,'',true);
+			Framework::popup(Framework::link('/index.php', $linkData), $windowName);
+			$GLOBALS['egw']->framework->render($message, '', true);
 			if ($exit)
 			{
 				exit();
@@ -227,9 +226,9 @@ 
 	 *
 	 * @throws Api\Exception
 	 */
-	function changeProfile($_icServerID,$unsetCache=false)
+	function changeProfile($_icServerID, $unsetCache = false)
 	{
-		if (Mail::$debugTimes) $starttime = microtime (true);
+		if (Mail::$debugTimes) $starttime = microtime(true);
 		if (self::$icServerID != $_icServerID)
 		{
 			self::$icServerID = $_icServerID;
@@ -237,35 +236,35 @@ 
 		if (Mail::$debug) error_log(__METHOD__.__LINE__.'->'.self::$icServerID.'<->'.$_icServerID);
 
 		if ($unsetCache) Mail::unsetCachedObjects(self::$icServerID);
-		$this->mail_bo = Mail::getInstance(false,self::$icServerID,true, false, true);
+		$this->mail_bo = Mail::getInstance(false, self::$icServerID, true, false, true);
 		if (Mail::$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) || !isset($this->mail_bo->icServer) || $this->mail_bo->icServer->ImapServerId<>$_icServerID)
+		if (!isset($this->mail_bo) || !isset($this->mail_bo->icServer) || $this->mail_bo->icServer->ImapServerId <> $_icServerID)
 		{
 			self::$icServerID = $_icServerID;
 			throw new Api\Exception('Profile change failed!');
 		}
 
 		// save session varchar
-		$oldicServerID =& Api\Cache::getSession('mail','activeProfileID');
+		$oldicServerID = & Api\Cache::getSession('mail', 'activeProfileID');
 		if ($oldicServerID <> self::$icServerID) $this->mail_bo->openConnection(self::$icServerID);
 		if (true) $oldicServerID = self::$icServerID;
-		if (!Mail::storeActiveProfileIDToPref($this->mail_bo->icServer, self::$icServerID, true ))
+		if (!Mail::storeActiveProfileIDToPref($this->mail_bo->icServer, self::$icServerID, true))
 		{
 			throw new Api\Exception(__METHOD__." failed to change Profile to $_icServerID");
 		}
 
-		if (Mail::$debugTimes) Mail::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
+		if (Mail::$debugTimes) Mail::logRunTimes($starttime, null, '', __METHOD__.__LINE__);
 	}
 
 	/**
 	 * Ajax function to request next branch of a tree branch
 	 */
-	static function ajax_tree_autoloading ($_id = null)
+	static function ajax_tree_autoloading($_id = null)
 	{
 		$mail_ui = new mail_ui();
 		$id = $_id ? $_id : $_GET['id'];
-		Etemplate\Widget\Tree::send_quote_json($mail_ui->mail_tree->getTree($id,'',1,false));
+		Etemplate\Widget\Tree::send_quote_json($mail_ui->mail_tree->getTree($id, '', 1, false));
 	}
 
 	/**
@@ -274,11 +273,11 @@ 
 	 * @param array $content
 	 * @param type $msg
 	 */
-	function subscription(array $content=null ,$msg=null)
+	function subscription(array $content = null, $msg = null)
 	{
 		$stmpl = new Etemplate('mail.subscribe');
 
-		if(is_array($content))
+		if (is_array($content))
 		{
 			$profileId = $content['profileId'];
 		}
@@ -288,14 +287,14 @@ 
 		}
 		// Initial tree's options, the rest would be loaded dynamicaly by autoloading,
 		// triggered from client-side. Also, we keep this here as
-		$sel_options['foldertree'] =  $this->mail_tree->getTree(null,$profileId,1,true,false,true);
+		$sel_options['foldertree'] = $this->mail_tree->getTree(null, $profileId, 1, true, false, true);
 
 		//Get all subscribed folders
 		// as getting all subscribed folders is very fast operation
 		// we can use it to get a comparison base for folders which
 		// got subscribed or unsubscribed by the user
 		try {
-			$subscribed = $this->mail_bo->icServer->listSubscribedMailboxes('',0,true);
+			$subscribed = $this->mail_bo->icServer->listSubscribedMailboxes('', 0, true);
 		} catch (Exception $ex) {
 			Framework::message($ex->getMessage());
 		}
@@ -306,7 +305,7 @@ 
 
 			foreach ($subscribed as $folder)
 			{
-				$folderName = $profileId . self::$delimiter . $folder['MAILBOX'];
+				$folderName = $profileId.self::$delimiter.$folder['MAILBOX'];
 				array_push($content['foldertree'], $folderName);
 			}
 		}
@@ -320,9 +319,9 @@ 
 				{
 					// do not let user (un)subscribe namespace roots eg. "other", "user" or "INBOX", same for tree-root/account itself
 					$namespace_roots = array($profileId);
-					foreach($this->mail_bo->_getNameSpaces() as $namespace)
+					foreach ($this->mail_bo->_getNameSpaces() as $namespace)
 					{
-						$namespace_roots[] = $profileId . self::$delimiter . str_replace($namespace['delimiter'], '', $namespace['prefix']);
+						$namespace_roots[] = $profileId.self::$delimiter.str_replace($namespace['delimiter'], '', $namespace['prefix']);
 					}
 					$to_unsubscribe = $to_subscribe = array();
 					foreach ($content['foldertree'] as $path => $value)
@@ -330,7 +329,7 @@ 
 						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_unsubscribe [] = $node;
 							if (is_array($subscribed) && !$subscribed[$node] && $value['value']) $to_subscribe [] = $node;
 							if ($value['value']) $cont[] = $path;
 						}
@@ -340,7 +339,7 @@ 
 					// set foldertree options to basic node in order to avoid initial autoloading
 					// from client side, as no options would trigger that.
 					$sel_options['foldertree'] = array('id' => '0', 'item'=> array());
-					foreach(array_merge($to_subscribe, $to_unsubscribe) as $mailbox)
+					foreach (array_merge($to_subscribe, $to_unsubscribe) as $mailbox)
 					{
 						if (in_array($profileId.self::$delimiter.$mailbox, $namespace_roots, true))
 						{
@@ -376,18 +375,18 @@ 
 						}
 					}
 					// update foldertree in main window
-					$parentFolder='INBOX';
+					$parentFolder = 'INBOX';
 					$refreshData = array(
 						$profileId => lang($parentFolder),
 					);
 					$response = Api\Json\Response::get();
-					foreach($refreshData as $folder => &$name)
+					foreach ($refreshData as $folder => &$name)
 					{
-						$name = $this->mail_tree->getTree($folder, $profileId,1,true,true,true);
+						$name = $this->mail_tree->getTree($folder, $profileId, 1, true, true, true);
 					}
 					// give success/error message to opener and popup itself
 					//$response->call('opener.app.mail.subscription_refresh',$refreshData);
-					$response->call('opener.app.mail.mail_reloadNode',$refreshData);
+					$response->call('opener.app.mail.mail_reloadNode', $refreshData);
 
 					Framework::refresh_opener($msg, 'mail', null, null, null, null, null, $msg_type);
 					if ($button == 'apply')
@@ -407,7 +406,7 @@ 
 
 		$readonlys = array();
 
-		$stmpl->exec('mail.mail_ui.subscription', $content,$sel_options,$readonlys,$preserv,2);
+		$stmpl->exec('mail.mail_ui.subscription', $content, $sel_options, $readonlys, $preserv, 2);
 	}
 
 	/**
@@ -416,13 +415,13 @@ 
 	 * @param array $content
 	 * @param string $msg
 	 */
-	function index(array $content=null,$msg=null)
+	function index(array $content = null, $msg = null)
 	{
 		//error_log(__METHOD__.__LINE__.array2string($content));
-		try	{
+		try {
 				if (!isset($this->mail_bo)) throw new Api\Exception\WrongUserinput(lang('Initialization of mail failed. Please use the Wizard to cope with the problem.')); 
 				//error_log(__METHOD__.__LINE__.function_backtrace());
-				if (Mail::$debugTimes) $starttime = microtime (true);
+				if (Mail::$debugTimes) $starttime = microtime(true);
 				$this->mail_bo->restoreSessionData();
 				$sessionFolder = $this->mail_bo->sessionData['mailbox'];
 				if ($this->mail_bo->folderExists($sessionFolder))
@@ -443,26 +442,26 @@ 
 					{
 						// These only set on first load
 						$content[self::$nm_index] = array(
-							'filter'         => 'any',	// filter is used to choose the mailbox
-							'lettersearch'   => false,	// I  show a lettersearch
-							'searchletter'   =>	false,	// I0 active letter of the lettersearch or false for [all]
-							'start'          =>	0,		// IO position in list
-							'order'          =>	'date',	// IO name of the column to sort after (optional for the sortheaders)
-							'sort'           =>	'DESC',	// IO direction of the sort: 'ASC' or 'DESC'
+							'filter'         => 'any', // filter is used to choose the mailbox
+							'lettersearch'   => false, // I  show a lettersearch
+							'searchletter'   =>	false, // I0 active letter of the lettersearch or false for [all]
+							'start'          =>	0, // IO position in list
+							'order'          =>	'date', // IO name of the column to sort after (optional for the sortheaders)
+							'sort'           =>	'DESC', // IO direction of the sort: 'ASC' or 'DESC'
 						);
 					}
 					if (Api\Header\UserAgent::mobile()) $content[self::$nm_index]['header_row'] = 'mail.index.header_right';
 				}
 
 				// These must always be set, even if $content is an array
-				$content[self::$nm_index]['cat_is_select'] = true;    // Category select is just a normal selectbox
-				$content[self::$nm_index]['no_filter2'] = false;       // Disable second filter
+				$content[self::$nm_index]['cat_is_select'] = true; // Category select is just a normal selectbox
+				$content[self::$nm_index]['no_filter2'] = false; // Disable second filter
 				$content[self::$nm_index]['actions'] = self::get_actions();
-				$content[self::$nm_index]['row_id'] = 'row_id';	     // is a concatenation of trim($GLOBALS['egw_info']['user']['account_id']):profileID:base64_encode(FOLDERNAME):uid
+				$content[self::$nm_index]['row_id'] = 'row_id'; // is a concatenation of trim($GLOBALS['egw_info']['user']['account_id']):profileID:base64_encode(FOLDERNAME):uid
 				$content[self::$nm_index]['placeholder_actions'] = array('composeasnew');
 				$content[self::$nm_index]['get_rows'] = 'mail_ui::get_rows';
-				$content[self::$nm_index]['num_rows'] = 0;      // Do not send any rows with initial request
-				$content[self::$nm_index]['default_cols'] = 'status,attachments,subject,address,date,size';	// I  columns to use if there's no user or default pref (! as first char uses all but the named columns), default all columns
+				$content[self::$nm_index]['num_rows'] = 0; // Do not send any rows with initial request
+				$content[self::$nm_index]['default_cols'] = 'status,attachments,subject,address,date,size'; // I  columns to use if there's no user or default pref (! as first char uses all but the named columns), default all columns
 				$content[self::$nm_index]['csv_fields'] = false;
 				if ($msg)
 				{
@@ -474,11 +473,11 @@ 
 					unset($content['msg']);
 				}
 				// call getQuotaRoot asynchronously in getRows by initiating a client Server roundtrip
-				$quota = false;//$this->mail_bo->getQuotaRoot();
-				if($quota !== false && $quota['limit'] != 'NOT SET') {
+				$quota = false; //$this->mail_bo->getQuotaRoot();
+				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]['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 {
@@ -487,43 +486,43 @@ 
 					$content[self::$nm_index]['quotanotsupported'] = $sel_options[self::$nm_index]['quotanotsupported'] = "mail_DisplayNone";
 				}
 				// call gatherVacation asynchronously in getRows by initiating a client Server roundtrip
-				$vacation = false;//$this->gatherVacation();
+				$vacation = false; //$this->gatherVacation();
 				//error_log(__METHOD__.__LINE__.' Server:'.self::$icServerID.' Sieve Enabled:'.array2string($vacation));
-				if($vacation) {
-					if (is_array($vacation) && ($vacation['status'] == 'on' || $vacation['status']=='by_date' && $vacation['end_date'] > time()))
+				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')*/;
 						$content[self::$nm_index]['vacationnotice'] = $sel_options[self::$nm_index]['vacationnotice'] = lang('Vacation notice is active');
-						$content[self::$nm_index]['vacationrange'] = $sel_options[self::$nm_index]['vacationrange'] = ($vacation['status']=='by_date'? Api\DateTime::server2user($vacation['start_date'],$dtfrmt,true).($vacation['end_date']>$vacation['start_date']?'->'.Api\DateTime::server2user($vacation['end_date']+ 24*3600-1,$dtfrmt,true):''):'');
+						$content[self::$nm_index]['vacationrange'] = $sel_options[self::$nm_index]['vacationrange'] = ($vacation['status'] == 'by_date' ? Api\DateTime::server2user($vacation['start_date'], $dtfrmt, true).($vacation['end_date'] > $vacation['start_date'] ? '->'.Api\DateTime::server2user($vacation['end_date'] + 24 * 3600 - 1, $dtfrmt, true) : '') : '');
 					}
 				}
-				if ($vacation==false)
+				if ($vacation == false)
 				{
 					$content[self::$nm_index]['vacationnotice'] = $sel_options[self::$nm_index]['vacationnotice'] = '';
 					$content[self::$nm_index]['vacationrange'] = $sel_options[self::$nm_index]['vacationrange'] = '';
 				}
 				//$zstarttime = microtime (true);
-				$sel_options[self::$nm_index]['foldertree'] = $this->mail_tree->getInitialIndexTree(null, $this->mail_bo->profileID, null, !$this->mail_bo->mailPreferences['showAllFoldersInFolderPane'],!$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
+				$sel_options[self::$nm_index]['foldertree'] = $this->mail_tree->getInitialIndexTree(null, $this->mail_bo->profileID, null, !$this->mail_bo->mailPreferences['showAllFoldersInFolderPane'], !$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
 				//$zendtime = microtime(true) - $zstarttime;
 				//error_log(__METHOD__.__LINE__. " time used: ".$zendtime);
-				$content[self::$nm_index]['selectedFolder'] = $this->mail_bo->profileID.self::$delimiter.(!empty($this->mail_bo->sessionData['mailbox'])?$this->mail_bo->sessionData['mailbox']:'INBOX');
+				$content[self::$nm_index]['selectedFolder'] = $this->mail_bo->profileID.self::$delimiter.(!empty($this->mail_bo->sessionData['mailbox']) ? $this->mail_bo->sessionData['mailbox'] : 'INBOX');
 				// since we are connected,(and selected the folder) we check for capabilities SUPPORTS_KEYWORDS to eventually add the keyword filters
-				if ( $this->mail_bo->icServer->hasCapability('SUPPORTS_KEYWORDS'))
+				if ($this->mail_bo->icServer->hasCapability('SUPPORTS_KEYWORDS'))
 				{
-					$this->statusTypes = array_merge($this->statusTypes,array(
-						'keyword1'	=> 'important',//lang('important'),
-						'keyword2'	=> 'job',	//lang('job'),
-						'keyword3'	=> 'personal',//lang('personal'),
-						'keyword4'	=> 'to do',	//lang('to do'),
-						'keyword5'	=> 'later',	//lang('later'),
+					$this->statusTypes = array_merge($this->statusTypes, array(
+						'keyword1'	=> 'important', //lang('important'),
+						'keyword2'	=> 'job', //lang('job'),
+						'keyword3'	=> 'personal', //lang('personal'),
+						'keyword4'	=> 'to do', //lang('to do'),
+						'keyword5'	=> 'later', //lang('later'),
 					));
 				}
 				else
 				{
-					$keywords = array('keyword1','keyword2','keyword3','keyword4','keyword5');
-					foreach($keywords as &$k)
+					$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]);
 					}
 				}
 
@@ -534,8 +533,8 @@ 
 
 				if (is_null(Mail::$supportsORinQuery) || !isset(Mail::$supportsORinQuery[$this->mail_bo->profileID]))
 				{
-					Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-					if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID]=true;
+					Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 10);
+					if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID] = true;
 				}
 				if (!Mail::$supportsORinQuery[$this->mail_bo->profileID])
 				{
@@ -547,14 +546,14 @@ 
 				//error_log(__METHOD__.__LINE__.array2string($GLOBALS['egw_info']['user']['preferences']['mail']['ActiveSearchType']));
 				$content[self::$nm_index]['cat_id'] = $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveSearchType'];
 				$sel_options['filter'] = $this->statusTypes;
-				$sel_options['filter2'] = array(''=>lang('No details'),1=>lang('Details'));
+				$sel_options['filter2'] = array(''=>lang('No details'), 1=>lang('Details'));
 				$content[self::$nm_index]['filter2'] = $GLOBALS['egw_info']['user']['preferences']['mail']['ShowDetails'];
 
 				$etpl = new Etemplate('mail.index');
 				//apply infolog_filter_change javascript method (hide/show of date filter form) over onchange filter
 				$content[self::$nm_index]['cat_id_onchange'] = "app.mail.mail_searchtype_change()";
 				// set the actions on tree
-				$etpl->setElementAttribute(self::$nm_index.'[foldertree]','actions', $this->get_tree_actions());
+				$etpl->setElementAttribute(self::$nm_index.'[foldertree]', 'actions', $this->get_tree_actions());
 
 				// sending preview toolbar actions
 				if ($content['mailSplitter']) $etpl->setElementAttribute('mailPreview[toolbar]', 'actions', $this->get_toolbar_actions());
@@ -565,34 +564,34 @@ 
 				//we use the category "filter" option as specifier where we want to search (quick, subject, from, to, etc. ....)
 				if (empty($content[self::$nm_index]['cat_id']) || empty($content[self::$nm_index]['search']))
 				{
-					$content[self::$nm_index]['cat_id']=($content[self::$nm_index]['cat_id']?(!Mail::$supportsORinQuery[$this->mail_bo->profileID]&&($content[self::$nm_index]['cat_id']=='quick'||$content[self::$nm_index]['cat_id']=='quickwithcc')?'subject':$content[self::$nm_index]['cat_id']):(Mail::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject'));
+					$content[self::$nm_index]['cat_id'] = ($content[self::$nm_index]['cat_id'] ? (!Mail::$supportsORinQuery[$this->mail_bo->profileID] && ($content[self::$nm_index]['cat_id'] == 'quick' || $content[self::$nm_index]['cat_id'] == 'quickwithcc') ? 'subject' : $content[self::$nm_index]['cat_id']) : (Mail::$supportsORinQuery[$this->mail_bo->profileID] ? 'quick' : 'subject'));
 				}
 				$readonlys = $preserv = array();
-				if (Mail::$debugTimes) Mail::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
+				if (Mail::$debugTimes) Mail::logRunTimes($starttime, null, '', __METHOD__.__LINE__);
 		}
 		catch (Exception $e)
 		{
 			// do not exit here. mail-tree should be build. if we exit here, we never get there.
-			error_log(__METHOD__.__LINE__.$e->getMessage().($e->details?', '.$e->details:'').' Menuaction:'.$_GET['menuaction'].'.'.function_backtrace());
+			error_log(__METHOD__.__LINE__.$e->getMessage().($e->details ? ', '.$e->details : '').' Menuaction:'.$_GET['menuaction'].'.'.function_backtrace());
 			if (isset($this->mail_bo))
 			{
 				if (empty($etpl))
 				{
-					$sel_options[self::$nm_index]['foldertree'] = $this->mail_tree->getInitialIndexTree(null, $this->mail_bo->profileID, null, !$this->mail_bo->mailPreferences['showAllFoldersInFolderPane'],!$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
+					$sel_options[self::$nm_index]['foldertree'] = $this->mail_tree->getInitialIndexTree(null, $this->mail_bo->profileID, null, !$this->mail_bo->mailPreferences['showAllFoldersInFolderPane'], !$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
 					$etpl = new Etemplate('mail.index');
 				}
-				$etpl->setElementAttribute(self::$nm_index.'[foldertree]','actions', $this->get_tree_actions(false));
+				$etpl->setElementAttribute(self::$nm_index.'[foldertree]', 'actions', $this->get_tree_actions(false));
 			}
 			$readonlys = $preserv = array();
-			if (empty($content)) $content=array();
+			if (empty($content)) $content = array();
 
-			self::callWizard($e->getMessage().($e->details?', '.$e->details:''),(isset($this->mail_bo)?false:true), 'error',false);
+			self::callWizard($e->getMessage().($e->details ? ', '.$e->details : ''), (isset($this->mail_bo) ? false : true), 'error', false);
 			//return false;
 		}
 		// Check preview pane is enabled, then show spliter
 		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);
+		return $etpl->exec('mail.mail_ui.index', $content, $sel_options, $readonlys, $preserv);
 	}
 
 	/**
@@ -602,11 +601,11 @@ 
 	 * @param {boolean} $imap_actions set to false if you want to avoid to talk to the imap-server
 	 * @return array
 	 */
-	function get_tree_actions($imap_actions=true)
+	function get_tree_actions($imap_actions = true)
 	{
 		// Start at 2 so auto-added copy+paste actions show up as second group
 		// Needed because there's no 'select all' action to push things down
-		$group=1;
+		$group = 1;
 		// Set tree actions
 		$tree_actions = array(
 			'drop_move_mail' => array(
@@ -687,12 +686,12 @@ 
 				'onExecute' => 'javaScript:app.mail.edit_sieve',
 
 				'enabled'	=> 'javaScript:app.mail.sieve_enabled',
-				'icon' => 'mail/filter',	// funnel
+				'icon' => 'mail/filter', // funnel
 				'hideOnMobile' => true
 			),
 			'vacation' => array(
 				'caption' => 'Vacation notice',
-				'icon' => 'mail/navbar',	// mail as in admin
+				'icon' => 'mail/navbar', // mail as in admin
 				'onExecute' => 'javaScript:app.mail.edit_vacation',
 				'enabled'	=> 'javaScript:app.mail.sieve_enabled',
 			),
@@ -733,8 +732,8 @@ 
 			unset($tree_actions['subscribe']);
 			unset($tree_actions['unsubscribe']);
 		}
-		++$group;	// put delete in own group
-		switch($GLOBALS['egw_info']['user']['preferences']['mail']['deleteOptions'])
+		++$group; // put delete in own group
+		switch ($GLOBALS['egw_info']['user']['preferences']['mail']['deleteOptions'])
 		{
 			case 'move_to_trash':
 				$tree_actions['empty_trash'] = array(
@@ -753,7 +752,7 @@ 
 				);
 				break;
 		}
-		$junkFolder = ($imap_actions?$this->mail_bo->getJunkFolder():null);
+		$junkFolder = ($imap_actions ? $this->mail_bo->getJunkFolder() : null);
 
 		//error_log(__METHOD__.__LINE__.$junkFolder);
 		if ($junkFolder && !empty($junkFolder))
@@ -766,8 +765,8 @@ 
 				'group'	=> $group,
 			);
 		}
-		$tree_actions['sieve']['group']	= $tree_actions['vacation']['group'] = ++$group;	// new group for filter
-		$tree_actions['edit_account']['group'] = $tree_actions['edit_acl']['group']	= ++$group;
+		$tree_actions['sieve']['group'] = $tree_actions['vacation']['group'] = ++$group; // new group for filter
+		$tree_actions['edit_account']['group'] = $tree_actions['edit_acl']['group'] = ++$group;
 
 
 		// enforce global (group-specific) ACL
@@ -802,19 +801,19 @@ 
 	 * @param {string} $_folderName name of mailbox needs to be subcribe or unsubscribed
 	 * @param {boolean} $_status set true for subscribe and false to unsubscribe
 	 */
-	public function ajax_foldersubscription($_acc_id,$_folderName, $_status)
+	public function ajax_foldersubscription($_acc_id, $_folderName, $_status)
 	{
 		//Change the Mail object to related profileId
 		$this->changeProfile($_acc_id);
 
-		if($this->mail_bo->icServer->subscribeMailbox($_folderName, $_status))
+		if ($this->mail_bo->icServer->subscribeMailbox($_folderName, $_status))
 		{
 			$this->mail_bo->resetFolderObjectCache($_acc_id);
-			$this->ajax_reloadNode($_acc_id,!$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
+			$this->ajax_reloadNode($_acc_id, !$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
 		}
 		else
 		{
-			error_log(__METHOD__.__LINE__."()". lang('Folder %1 %2 failed!',$_folderName,$_status?'subscribed':'unsubscribed'));
+			error_log(__METHOD__.__LINE__."()".lang('Folder %1 %2 failed!', $_folderName, $_status ? 'subscribed' : 'unsubscribed'));
 		}
 	}
 
@@ -826,25 +825,25 @@ 
 	 * @param string $_nodeID if of node whos children are requested
 	 * @param boolean $_subscribedOnly flag to tell wether to fetch all or only subscribed (default)
 	 */
-	public function ajax_foldertree($_nodeID = null,$_subscribedOnly=null)
+	public function ajax_foldertree($_nodeID = null, $_subscribedOnly = null)
 	{
 		$nodeID = $_GET['id'];
 		if (!is_null($_nodeID)) $nodeID = $_nodeID;
-		$subscribedOnly = (bool)(!is_null($_subscribedOnly)?$_subscribedOnly:!$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
+		$subscribedOnly = (bool)(!is_null($_subscribedOnly) ? $_subscribedOnly : !$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
 		$fetchCounters = !is_null($_nodeID);
-		list($_profileID,$_folderName) = explode(self::$delimiter,$nodeID,2);
+		list($_profileID, $_folderName) = explode(self::$delimiter, $nodeID, 2);
 
 		if (!empty($_folderName)) $fetchCounters = true;
 
 		// Check if it is called for refresh root
 		// then we need to reinitialized the index tree
-		if(!$nodeID && !$_profileID)
+		if (!$nodeID && !$_profileID)
 		{
-			$data = $this->mail_tree->getInitialIndexTree(null,null,null,null,true,!$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
+			$data = $this->mail_tree->getInitialIndexTree(null, null, null, null, true, !$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
 		}
 		else
 		{
-			$data = $this->mail_tree->getTree($nodeID,$_profileID,0, false,$subscribedOnly,!$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
+			$data = $this->mail_tree->getTree($nodeID, $_profileID, 0, false, $subscribedOnly, !$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
 		}
 		if (!is_null($_nodeID)) return $data;
 		Etemplate\Widget\Tree::send_quote_json($data);
@@ -860,17 +859,17 @@ 
 	 */
 	static function findNode($_out, $_nodeID, $childElements = false)
 	{
-		foreach($_out['item'] as $node)
+		foreach ($_out['item'] as $node)
 		{
-			if (strcmp($node['id'],$_nodeID)===0)
+			if (strcmp($node['id'], $_nodeID) === 0)
 			{
 				//error_log(__METHOD__.__LINE__.':'.$_nodeID.'->'.$node['id']);
-				return ($childElements?$node['item']:$node);
+				return ($childElements ? $node['item'] : $node);
 			}
-			elseif (is_array($node['item']) && strncmp($node['id'],$_nodeID,strlen($node['id']))===0 && strlen($_nodeID)>strlen($node['id']))
+			elseif (is_array($node['item']) && strncmp($node['id'], $_nodeID, strlen($node['id'])) === 0 && strlen($_nodeID) > strlen($node['id']))
 			{
 				//error_log(__METHOD__.__LINE__.' descend into '.$node['id']);
-				return self::findNode($node,$_nodeID,$childElements);
+				return self::findNode($node, $_nodeID, $childElements);
 			}
 		}
 	}
@@ -884,7 +883,7 @@ 
 	 */
 	private function get_actions()
 	{
-		static $accArray=array(); // buffer identity names on single request
+		static $accArray = array(); // buffer identity names on single request
 		// duplicated from mail_hooks
 		static $deleteOptions = array(
 			'move_to_trash'		=> 'move to trash',
@@ -895,12 +894,12 @@ 
 		$lastFolderUsedForMove = null;
 		$moveactions = array();
 		$archiveFolder = $this->mail_bo->getArchiveFolder();
-		$lastFoldersUsedForMoveCont = Api\Cache::getCache(Api\Cache::INSTANCE,'email','lastFolderUsedForMove'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),$expiration=60*60*1);
+		$lastFoldersUsedForMoveCont = Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'lastFolderUsedForMove'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), $expiration = 60 * 60 * 1);
 		//error_log(__METHOD__.__LINE__." StoredFolders->".array2string($lastFoldersUsedForMoveCont));
 		//error_log(__METHOD__.__LINE__.' ProfileId:'.$this->mail_bo->profileID." StoredFolders->(".count($lastFoldersUsedForMoveCont[$this->mail_bo->profileID]).") ".array2string($lastFoldersUsedForMoveCont[$this->mail_bo->profileID]));
 		if (is_null($accArray))
 		{
-			foreach(Mail\Account::search($only_current_user=true, false) as $acc_id => $accountObj)
+			foreach (Mail\Account::search($only_current_user = true, false) as $acc_id => $accountObj)
 			{
 				//error_log(__METHOD__.__LINE__.array2string($accountObj));
 				if (!$accountObj->is_imap())
@@ -908,22 +907,22 @@ 
 					// not to be used for IMAP Foldertree, as there is no Imap host
 					continue;
 				}
-				$identity_name = Mail\Account::identity_name($accountObj,true,$GLOBALS['egw_info']['user']['acount_id']);
-				$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
+				$identity_name = Mail\Account::identity_name($accountObj, true, $GLOBALS['egw_info']['user']['acount_id']);
+				$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 (array_keys($lastFoldersUsedForMoveCont) as $pid)
 		{
-			if ($this->mail_bo->profileID==$pid && isset($lastFoldersUsedForMoveCont[$this->mail_bo->profileID]))
+			if ($this->mail_bo->profileID == $pid && isset($lastFoldersUsedForMoveCont[$this->mail_bo->profileID]))
 			{
 				$_folder = $this->mail_bo->icServer->getCurrentMailbox();
 				//error_log(__METHOD__.__LINE__.' '.$_folder."<->".$lastFoldersUsedForMoveCont[$this->mail_bo->profileID].function_backtrace());
-				$counter =1;
+				$counter = 1;
 				foreach ($lastFoldersUsedForMoveCont[$this->mail_bo->profileID] as $i => $lastFolderUsedForMoveCont)
 				{
 					$moveaction = 'move_';
-					if ($_folder!=$i)
+					if ($_folder != $i)
 					{
 						$moveaction .= $lastFolderUsedForMoveCont;
 						//error_log(__METHOD__.__LINE__.'#'.$moveaction);
@@ -934,7 +933,7 @@ 
 							$fS['profileName'] = $accArray[$this->mail_bo->profileID];
 							$fS['shortDisplayName'] = $i;
 							$moveactions[$moveaction] = $fS;
-							$counter ++;
+							$counter++;
 						}
 						else
 						{
@@ -944,9 +943,9 @@ 
 					}
 				}
 			}
-			elseif ($this->mail_bo->profileID!=$pid && isset($lastFoldersUsedForMoveCont[$pid]) && !empty($lastFoldersUsedForMoveCont[$pid]))
+			elseif ($this->mail_bo->profileID != $pid && isset($lastFoldersUsedForMoveCont[$pid]) && !empty($lastFoldersUsedForMoveCont[$pid]))
 			{
-				$counter =1;
+				$counter = 1;
 				foreach ($lastFoldersUsedForMoveCont[$pid] as $i => $lastFolderUsedForMoveCont)
 				{
 					//error_log(__METHOD__.__LINE__."$i => $lastFolderUsedForMoveCont");
@@ -959,19 +958,19 @@ 
 						$fS['profileName'] = $accArray[$pid];
 						$fS['shortDisplayName'] = $i;
 						$moveactions[$moveaction] = $fS;
-						$counter ++;
+						$counter++;
 					}
 				}
 			}
 		}
-		Api\Cache::setCache(Api\Cache::INSTANCE,'email','lastFolderUsedForMove'.trim($GLOBALS['egw_info']['user']['account_id']),$lastFoldersUsedForMoveCont, $expiration=60*60*1);
+		Api\Cache::setCache(Api\Cache::INSTANCE, 'email', 'lastFolderUsedForMove'.trim($GLOBALS['egw_info']['user']['account_id']), $lastFoldersUsedForMoveCont, $expiration = 60 * 60 * 1);
 		$group = 0;
-		$actions =  array(
+		$actions = array(
 			'open' => array(
 				'caption' => lang('Open'),
 				'icon' => 'view',
 				'group' => ++$group,
-				'onExecute' => Api\Header\UserAgent::mobile()?'javaScript:app.mail.mobileView':'javaScript:app.mail.mail_open',
+				'onExecute' => Api\Header\UserAgent::mobile() ? 'javaScript:app.mail.mobileView' : 'javaScript:app.mail.mail_open',
 				'allowOnMultiple' => false,
 				'default' => true,
 				'mobileViewTemplate' => 'view?'.filemtime(Api\Etemplate\Widget\Template::rel2path('/mail/templates/mobile/view.xet'))
@@ -1024,20 +1023,20 @@ 
 				'allowOnMultiple' => false,
 			)
 		);
-		$macounter=0;
+		$macounter = 0;
 		if (!empty($moveactions))
 		{
 			//error_log(__METHOD__.__LINE__.array2string($moveactions));
-			$children=array();
-			$pID=0;
+			$children = array();
+			$pID = 0;
 			foreach ($moveactions as $moveaction => $lastFolderUsedForMove)
 			{
-				$group = ($pID != $lastFolderUsedForMove['profileID'] && $macounter>0? $group+1 : $group);
+				$group = ($pID != $lastFolderUsedForMove['profileID'] && $macounter > 0 ? $group + 1 : $group);
 				//error_log(__METHOD__.__LINE__."#$pID != ".$lastFolderUsedForMove['profileID']."#".$macounter.'#'.$groupCounter.'#');
 				$children = array_merge($children,
 					array(
 						$moveaction => array(
-							'caption' => (!empty($lastFolderUsedForMove['profileName'])?$lastFolderUsedForMove['profileName']:'('.$lastFolderUsedForMove['profileID'].')').': '.(isset($lastFolderUsedForMove['shortDisplayName'])?$lastFolderUsedForMove['shortDisplayName']:''),
+							'caption' => (!empty($lastFolderUsedForMove['profileName']) ? $lastFolderUsedForMove['profileName'] : '('.$lastFolderUsedForMove['profileID'].')').': '.(isset($lastFolderUsedForMove['shortDisplayName']) ? $lastFolderUsedForMove['shortDisplayName'] : ''),
 							'icon' => 'move',
 							'group' => $group,
 							'onExecute' => 'javaScript:app.mail.mail_move2folder',
@@ -1048,7 +1047,7 @@ 
 				$pID = $lastFolderUsedForMove['profileID'];
 				$macounter++;
 			}
-			$actions['moveto'] =	array(
+			$actions['moveto'] = array(
 				'caption' => lang('Move selected to'),
 				'icon' => 'move',
 				'group' => $group,
@@ -1091,7 +1090,7 @@ 
 				'icon' => 'tracker/navbar',
 				'onExecute' => 'javaScript:app.mail.mail_integrate',
 				'popup' => Link::get_registry('tracker', 'add_popup'),
-				'mail_import' => Api\Hooks::single(array('location' => 'mail_import'),'tracker'),
+				'mail_import' => Api\Hooks::single(array('location' => 'mail_import'), 'tracker'),
 				'allowOnMultiple' => false,
 			),
 			'calendar' => array(
@@ -1310,25 +1309,25 @@ 
 	 * @param array &$rows
 	 * @param array &$readonlys
 	 */
-	public static function get_rows(&$query,&$rows,&$readonlys)
+	public static function get_rows(&$query, &$rows, &$readonlys)
 	{
-		unset($readonlys);	// not used, but required by function signature
+		unset($readonlys); // not used, but required by function signature
 
 		// handle possible profile change in get_rows
 		if (!empty($query['selectedFolder']))
 		{
-			list($_profileID,$folderName) = explode(self::$delimiter, $query['selectedFolder'], 2);
+			list($_profileID, $folderName) = explode(self::$delimiter, $query['selectedFolder'], 2);
 			if (is_numeric(($_profileID)) && $_profileID != $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'])
 			{
 				try {
-					$mail_ui = new mail_ui(false);	// do NOT run constructor, as we change profile anyway
+					$mail_ui = new mail_ui(false); // do NOT run constructor, as we change profile anyway
 					$mail_ui->changeProfile($_profileID);
 					$query['actions'] = $mail_ui->get_actions();
 				}
-				catch(Exception $e)
+				catch (Exception $e)
 				{
 					unset($e);
-					$rows=array();
+					$rows = array();
 					return 0;
 				}
 				if (empty($folderName)) $query['selectedFolder'] = $_profileID.self::$delimiter.'INBOX';
@@ -1338,12 +1337,12 @@ 
 		{
 			try
 			{
-				$mail_ui = new mail_ui(true);	// run constructor for current profile
+				$mail_ui = new mail_ui(true); // run constructor for current profile
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
 				unset($e);
-				$rows=array();
+				$rows = array();
 				return 0;
 			}
 			if (empty($query['selectedFolder'])) $query['selectedFolder'] = $mail_ui->mail_bo->profileID.self::$delimiter.'INBOX';
@@ -1354,68 +1353,68 @@ 
 		//$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'];
 		$mail_ui->mail_bo->saveSessionData();
 
 		$sRToFetch = null;
-		list($_profileID,$_folderName) = explode(self::$delimiter,$query['selectedFolder'],2);
-		if (strpos($_folderName,self::$delimiter)!==false)
+		list($_profileID, $_folderName) = explode(self::$delimiter, $query['selectedFolder'], 2);
+		if (strpos($_folderName, self::$delimiter) !== false)
 		{
-			list($app,$_profileID,$_folderName) = explode(self::$delimiter,$_folderName,3);
+			list($app, $_profileID, $_folderName) = explode(self::$delimiter, $_folderName, 3);
 			unset($app);
 		}
 		//save selected Folder to sessionData (mailbox)->currentFolder
-		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 (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))
 		{
-			$toSchema = $mail_ui->mail_bo->isDraftFolder($_folderName,false)||$mail_ui->mail_bo->isSentFolder($_folderName,false)||$mail_ui->mail_bo->isTemplateFolder($_folderName,false);
+			$toSchema = $mail_ui->mail_bo->isDraftFolder($_folderName, false) || $mail_ui->mail_bo->isSentFolder($_folderName, false) || $mail_ui->mail_bo->isTemplateFolder($_folderName, false);
 		}
 		else
 		{
 			// take the extra time on failure
-			if (!$mail_ui->mail_bo->folderExists($_folderName,true))
+			if (!$mail_ui->mail_bo->folderExists($_folderName, true))
 			{
 				//error_log(__METHOD__.__LINE__.' Test on Folder:'.$_folderName.' failed; Using INBOX instead');
-				$query['selectedFolder']=$mail_ui->mail_bo->sessionData['mailbox']=$_folderName='INBOX';
+				$query['selectedFolder'] = $mail_ui->mail_bo->sessionData['mailbox'] = $_folderName = 'INBOX';
 			}
 		}
 		$mail_ui->mail_bo->saveSessionData();
 		$rowsFetched['messages'] = null;
-		$offset = $query['start']+1; // we always start with 1
+		$offset = $query['start'] + 1; // we always start with 1
 		$maxMessages = $query['num_rows'];
 		//error_log(__METHOD__.__LINE__.array2string($query));
-		$sort = ($query['order']=='address'?($toSchema?'toaddress':'fromaddress'):$query['order']);
-		if (!empty($query['search'])||($query['cat_id']=='bydate' && (!empty($query['startdate'])||!empty($query['enddate']))))
+		$sort = ($query['order'] == 'address' ? ($toSchema ? 'toaddress' : 'fromaddress') : $query['order']);
+		if (!empty($query['search']) || ($query['cat_id'] == 'bydate' && (!empty($query['startdate']) || !empty($query['enddate']))))
 		{
 			if (is_null(Mail::$supportsORinQuery) || !isset(Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]))
 			{
-				Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
+				Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 10);
 				if (!isset(Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]))
 				{
-					Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]=true;
+					Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID] = true;
 				}
 			}
 			//error_log(__METHOD__.__LINE__.' Startdate:'.$query['startdate'].' Enddate'.$query['enddate']);
 			$cutoffdate = $cutoffdate2 = null;
-			if ($query['startdate']) $cutoffdate = Api\DateTime::to($query['startdate'],'ts');//SINCE, enddate
-			if ($query['enddate']) $cutoffdate2 = Api\DateTime::to($query['enddate'],'ts');//BEFORE, startdate
+			if ($query['startdate']) $cutoffdate = Api\DateTime::to($query['startdate'], 'ts'); //SINCE, enddate
+			if ($query['enddate']) $cutoffdate2 = Api\DateTime::to($query['enddate'], 'ts'); //BEFORE, startdate
 			//error_log(__METHOD__.__LINE__.' Startdate:'.$cutoffdate2.' Enddate'.$cutoffdate);
 			$filter = array(
-				'filterName' => (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?lang('quicksearch'):lang('subject')),
-				'type' => ($query['cat_id']?$query['cat_id']:(Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?'quick':'subject')),
+				'filterName' => (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID] ? lang('quicksearch') : lang('subject')),
+				'type' => ($query['cat_id'] ? $query['cat_id'] : (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID] ? 'quick' : 'subject')),
 				'string' => $query['search'],
 				'status' => 'any',
 				//'range'=>"BETWEEN",'since'=> date("d-M-Y", $cutoffdate),'before'=> date("d-M-Y", $cutoffdate2)
 			);
-			if ($query['enddate']||$query['startdate']) {
+			if ($query['enddate'] || $query['startdate']) {
 				$filter['range'] = "BETWEEN";
 				if ($cutoffdate) {
-					$filter[(empty($cutoffdate2)?'date':'since')] =  date("d-M-Y", $cutoffdate);
+					$filter[(empty($cutoffdate2) ? 'date' : 'since')] = date("d-M-Y", $cutoffdate);
 					if (empty($cutoffdate2)) $filter['range'] = "SINCE";
 				}
 				if ($cutoffdate2) {
-					$filter[(empty($cutoffdate)?'date':'before')] =  date("d-M-Y", $cutoffdate2);
+					$filter[(empty($cutoffdate) ? 'date' : 'before')] = date("d-M-Y", $cutoffdate2);
 					if (empty($cutoffdate)) $filter['range'] = "BEFORE";
 				}
 			}
@@ -1428,17 +1427,17 @@ 
 		{
 			$filter['status'] = $query['filter'];
 		}
-		$reverse = ($query['sort']=='ASC'?false:true);
+		$reverse = ($query['sort'] == 'ASC' ? false : true);
 		$prefchanged = false;
-		if (!isset($GLOBALS['egw_info']['user']['preferences']['mail']['ActiveSearchType']) || ($query['cat_id'] !=$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveSearchType']))
+		if (!isset($GLOBALS['egw_info']['user']['preferences']['mail']['ActiveSearchType']) || ($query['cat_id'] != $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveSearchType']))
 		{
 			//error_log(__METHOD__.__LINE__.' Changing userPref ActivesearchType:'.$query['cat_id']);
-			$GLOBALS['egw']->preferences->add('mail','ActiveSearchType',$query['cat_id'],'user');
+			$GLOBALS['egw']->preferences->add('mail', 'ActiveSearchType', $query['cat_id'], 'user');
 			$prefchanged = true;
 		}
-		if (!isset($GLOBALS['egw_info']['user']['preferences']['mail']['ShowDetails']) || ($query['filter2'] !=$GLOBALS['egw_info']['user']['preferences']['mail']['ShowDetails']))
+		if (!isset($GLOBALS['egw_info']['user']['preferences']['mail']['ShowDetails']) || ($query['filter2'] != $GLOBALS['egw_info']['user']['preferences']['mail']['ShowDetails']))
 		{
-			$GLOBALS['egw']->preferences->add('mail','ShowDetails',$query['filter2'],'user');
+			$GLOBALS['egw']->preferences->add('mail', 'ShowDetails', $query['filter2'], 'user');
 			$prefchanged = true;
 		}
 		if ($prefchanged)
@@ -1469,13 +1468,13 @@ 
 				$rowsFetched['messages'] = $_sR['count'];
 				$ids = $_sR['match']->ids;
 				// if $sR is false, something failed fundamentally
-				if($reverse === true) $ids = ($ids===false?array():array_reverse((array)$ids));
-				$sR = array_slice((array)$ids,($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
+				if ($reverse === true) $ids = ($ids === false ? array() : array_reverse((array)$ids));
+				$sR = array_slice((array)$ids, ($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));
 				$maxMessages = 75;
 				$sortResultwH['header'] = array();
-				if (count($sRToFetch)>0)
+				if (count($sRToFetch) > 0)
 				{
 					//error_log(__METHOD__.__LINE__.' Headers to fetch with UIDs:'.count($sRToFetch).' Data:'.array2string($sRToFetch));
 					$sortResult = array();
@@ -1489,7 +1488,7 @@ 
 						$filter,
 						$sRToFetch,
 						true, //cacheResult
-						($query['filter2']?true:false) // fetchPreview
+						($query['filter2'] ? true : false) // fetchPreview
 					);
 				}
 			}
@@ -1506,30 +1505,30 @@ 
 					$filter,
 					null, // this uids only
 					true, // cacheResult
-					($query['filter2']?true:false) // fetchPreview
+					($query['filter2'] ? true : false) // fetchPreview
 				);
 				$rowsFetched['messages'] = $sortResultwH['info']['total'];
 			}
 		}
 		catch (Exception $e)
 		{
-			$sortResultwH=array();
-			$sR=array();
+			$sortResultwH = array();
+			$sR = array();
 			self::callWizard($e->getMessage(), false, 'error');
 		}
 		$response = Api\Json\Response::get();
 		// unlock immediately after fetching the rows
-		if (stripos($_GET['menuaction'],'ajax_get_rows')!==false)
+		if (stripos($_GET['menuaction'], 'ajax_get_rows') !== false)
 		{
 			//error_log(__METHOD__.__LINE__.' unlock tree ->'.$_GET['menuaction']);
 			$response->call('app.mail.unlock_tree');
 		}
 
-		if (is_array($sR) && count($sR)>0)
+		if (is_array($sR) && count($sR) > 0)
 		{
 			foreach ((array)$sR as $key => $v)
 			{
-				if (array_key_exists($key,(array)$sortResultwH['header'])==true)
+				if (array_key_exists($key, (array)$sortResultwH['header']) == true)
 				{
 					$sortResult['header'][] = $sortResultwH['header'][$key];
 				}
@@ -1547,12 +1546,12 @@ 
 		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]);
-		$rows = $mail_ui->header2gridelements($sortResult['header'],$cols, $_folderName, $folderType=$toSchema);
+		$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]);
+		$rows = $mail_ui->header2gridelements($sortResult['header'], $cols, $_folderName, $folderType = $toSchema);
 		//error_log(__METHOD__.__LINE__.array2string($rows));
 
-		if (Mail::$debugTimes) Mail::logRunTimes($starttime,null,'Folder:'.$_folderName.' Start:'.$query['start'].' NumRows:'.$query['num_rows'],__METHOD__.__LINE__);
+		if (Mail::$debugTimes) Mail::logRunTimes($starttime, null, 'Folder:'.$_folderName.' Start:'.$query['start'].' NumRows:'.$query['num_rows'], __METHOD__.__LINE__);
 		return $rowsFetched['messages'];
 	}
 
@@ -1564,7 +1563,7 @@ 
 	 * @param boolean $_prependApp to indicate that the app 'mail' is to be used for creating the rowID
 	 * @return string - a colon separated string in the form [app:]accountID:profileID:folder:message_uid
 	 */
-	function createRowID($_folderName, $message_uid, $_prependApp=false)
+	function createRowID($_folderName, $message_uid, $_prependApp = false)
 	{
 		return self::generateRowID($this->mail_bo->profileID, $_folderName, $message_uid, $_prependApp);
 	}
@@ -1578,9 +1577,9 @@ 
 	 * @param boolean $_prependApp to indicate that the app 'mail' is to be used for creating the rowID
 	 * @return string - a colon separated string in the form [app:]accountID:profileID:folder:message_uid
 	 */
-	static function generateRowID($_profileID, $_folderName, $message_uid, $_prependApp=false)
+	static function generateRowID($_profileID, $_folderName, $message_uid, $_prependApp = false)
 	{
-		return ($_prependApp?'mail'.self::$delimiter:'').trim($GLOBALS['egw_info']['user']['account_id']).self::$delimiter.$_profileID.self::$delimiter.base64_encode($_folderName).self::$delimiter.$message_uid;
+		return ($_prependApp ? 'mail'.self::$delimiter : '').trim($GLOBALS['egw_info']['user']['account_id']).self::$delimiter.$_profileID.self::$delimiter.base64_encode($_folderName).self::$delimiter.$message_uid;
 	}
 
 	/**
@@ -1591,13 +1590,13 @@ 
 	 */
 	static function splitRowID($_rowID)
 	{
-		$res = explode(self::$delimiter,$_rowID);
+		$res = explode(self::$delimiter, $_rowID);
 		// as a rowID is perceeded by app::, should be mail!
 		//error_log(__METHOD__.__LINE__.array2string($res).' [0] isInt:'.is_int($res[0]).' [0] isNumeric:'.is_numeric($res[0]).' [0] isString:'.is_string($res[0]).' Count:'.count($res));
-		if (count($res)==4 && is_numeric($res[0]) )
+		if (count($res) == 4 && is_numeric($res[0]))
 		{
 			// we have an own created rowID; prepend app=mail
-			array_unshift($res,'mail');
+			array_unshift($res, 'mail');
 		}
 		return array('app'=>$res[0], 'accountID'=>$res[1], 'profileID'=>$res[2], 'folder'=>base64_decode($res[3]), 'msgUID'=>$res[4]);
 	}
@@ -1611,56 +1610,56 @@ 
 	{
 		$actions = $this->get_actions();
 		$arrActions = array('composeasnew', 'reply', 'reply_all', 'forward', 'flagged', 'delete', 'print',
-			'infolog', 'tracker', 'calendar', 'save', 'view', 'read', 'label1',	'label2', 'label3',	'label4', 'label5');
-		foreach( $arrActions as &$act)
+			'infolog', 'tracker', 'calendar', 'save', 'view', 'read', 'label1', 'label2', 'label3', 'label4', 'label5');
+		foreach ($arrActions as &$act)
 		{
 			//error_log(__METHOD__.__LINE__.' '.$act.'->'.array2string($actions[$act]));
 			switch ($act)
 			{
 				case 'forward':
-					$actionsenabled[$act]=$actions[$act];
+					$actionsenabled[$act] = $actions[$act];
 					break;
 				case 'save':
-					$actionsenabled[$act]=$actions[$act];
+					$actionsenabled[$act] = $actions[$act];
 
 					break;
 				case 'view':
-					$actionsenabled[$act]=$actions[$act];
+					$actionsenabled[$act] = $actions[$act];
 					break;
 				case 'flagged':
-					$actionsenabled[$act]= $actions['mark']['children'][$act];
+					$actionsenabled[$act] = $actions['mark']['children'][$act];
 					break;
 				case 'read':
-					$actionsenabled[$act]= $actions['mark']['children'][$act];
+					$actionsenabled[$act] = $actions['mark']['children'][$act];
 					break;
 				case 'label1':
 					$actions['mark']['children']['setLabel']['children'][$act]['caption'] = lang('important');
-					$actionsenabled[$act]= $actions['mark']['children']['setLabel']['children'][$act];
+					$actionsenabled[$act] = $actions['mark']['children']['setLabel']['children'][$act];
 					break;
 				case 'label2':
 					$actions['mark']['children']['setLabel']['children'][$act]['caption'] = lang('job');
-					$actionsenabled[$act]= $actions['mark']['children']['setLabel']['children'][$act];
+					$actionsenabled[$act] = $actions['mark']['children']['setLabel']['children'][$act];
 					break;
 				case 'label3':
 					$actions['mark']['children']['setLabel']['children'][$act]['caption'] = lang('personal');
-					$actionsenabled[$act]= $actions['mark']['children']['setLabel']['children'][$act];
+					$actionsenabled[$act] = $actions['mark']['children']['setLabel']['children'][$act];
 					break;
 				case 'label4':
 					$actions['mark']['children']['setLabel']['children'][$act]['caption'] = lang('to do');
-					$actionsenabled[$act]= $actions['mark']['children']['setLabel']['children'][$act];
+					$actionsenabled[$act] = $actions['mark']['children']['setLabel']['children'][$act];
 					break;
 				case 'label5':
 					$actions['mark']['children']['setLabel']['children'][$act]['caption'] = lang('later');
-					$actionsenabled[$act]= $actions['mark']['children']['setLabel']['children'][$act];
+					$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']);
 		//error_log(array2string($actionsenabled['view']));
-		unset($actionsenabled['view']['children']['openastext']);//not supported in preview
-		unset($actionsenabled['view']['children']['openashtml']);//not supported in preview
+		unset($actionsenabled['view']['children']['openastext']); //not supported in preview
+		unset($actionsenabled['view']['children']['openashtml']); //not supported in preview
 
 		return $actionsenabled;
 	}
@@ -1674,45 +1673,45 @@ 
 	 * @param array $_folderType used to determine if we need to populate from/to
 	 * @return array populated result array
 	 */
-	public function header2gridelements($_headers, $cols, $_folderName, $_folderType=0)
+	public function header2gridelements($_headers, $cols, $_folderName, $_folderType = 0)
 	{
 		if (Mail::$debugTimes) $starttime = microtime(true);
 		$rv = array();
-		$i=0;
-		foreach((array)$_headers as $header)
+		$i = 0;
+		foreach ((array)$_headers as $header)
 		{
 			$i++;
 			$data = array();
 			//error_log(__METHOD__.array2string($header));
 			$message_uid = $header['uid'];
 			$data['uid'] = $message_uid;
-			$data['row_id']=$this->createRowID($_folderName,$message_uid);
+			$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);
 
 			// the css for this row
-			$is_recent=false;
+			$is_recent = false;
 			$css_styles = array("mail");
 			if ($header['deleted']) {
 				$css_styles[] = 'deleted';
 			}
 			if ($header['recent'] && !($header['deleted'] || $header['seen'] || $header['answered'] || $header['forwarded'])) {
 				$css_styles[] = 'recent';
-				$is_recent=true;
+				$is_recent = true;
 			}
 			if ($header['priority'] < 3) {
 				$css_styles[] = 'prio_high';
@@ -1750,19 +1749,19 @@ 
 			if (in_array("subject", $cols))
 			{
 				// filter out undisplayable characters
-				$search = array('[\016]','[\017]',
-					'[\020]','[\021]','[\022]','[\023]','[\024]','[\025]','[\026]','[\027]',
-					'[\030]','[\031]','[\032]','[\033]','[\034]','[\035]','[\036]','[\037]');
+				$search = array('[\016]', '[\017]',
+					'[\020]', '[\021]', '[\022]', '[\023]', '[\024]', '[\025]', '[\026]', '[\027]',
+					'[\030]', '[\031]', '[\032]', '[\033]', '[\034]', '[\035]', '[\036]', '[\037]');
 				$replace = '';
 
-				$header['subject'] = preg_replace($search,$replace,$header['subject']);
+				$header['subject'] = preg_replace($search, $replace, $header['subject']);
 				// curly brackets get messed up by the template!
 
 				if (!empty($header['subject'])) {
 					// make the subject shorter if it is to long
 					$subject = $header['subject'];
 				} else {
-					$subject = '('. lang('no subject') .')';
+					$subject = '('.lang('no subject').')';
 				}
 
 				$data["subject"] = $subject; // the mailsubject
@@ -1772,53 +1771,53 @@ 
 			//error_log(__METHOD__.__LINE__.array2string($header));
 			if (in_array("attachments", $cols))
 			{
-				if($header['mimetype'] == 'multipart/mixed' ||
+				if ($header['mimetype'] == 'multipart/mixed' ||
 					$header['mimetype'] == 'multipart/signed' ||
 					$header['mimetype'] == 'multipart/related' ||
 					$header['mimetype'] == 'multipart/report' ||
 					$header['mimetype'] == 'text/calendar' ||
 					$header['mimetype'] == 'text/html' ||
-					substr($header['mimetype'],0,11) == 'application' ||
-					substr($header['mimetype'],0,5) == 'audio' ||
-					substr($header['mimetype'],0,5) == 'video' ||
+					substr($header['mimetype'], 0, 11) == 'application' ||
+					substr($header['mimetype'], 0, 5) == 'audio' ||
+					substr($header['mimetype'], 0, 5) == 'video' ||
 					$header['mimetype'] == 'multipart/alternative')
 				{
-					$image = Api\Html::image('mail','attach');
+					$image = Api\Html::image('mail', 'attach');
 					$imageHTMLBlock = '';
-					$datarowid = $this->createRowID($_folderName,$message_uid,true);
+					$datarowid = $this->createRowID($_folderName, $message_uid, true);
 					$attachments = $header['attachments'];
-					if (count($attachments)<1)
+					if (count($attachments) < 1)
 					{
 						$image = '&nbsp;';
 					}
-					if (count($attachments)==1)
+					if (count($attachments) == 1)
 					{
-						$imageHTMLBlock = self::createAttachmentBlock($attachments, $datarowid, $header['uid'],$_folderName);
-						$image = Api\Html::image('mail','attach',$attachments[0]['name'].(!empty($attachments[0]['mimeType'])?' ('.$attachments[0]['mimeType'].')':''));
+						$imageHTMLBlock = self::createAttachmentBlock($attachments, $datarowid, $header['uid'], $_folderName);
+						$image = Api\Html::image('mail', 'attach', $attachments[0]['name'].(!empty($attachments[0]['mimeType']) ? ' ('.$attachments[0]['mimeType'].')' : ''));
 					}
-					if (count($attachments)>1)
+					if (count($attachments) > 1)
 					{
-						$imageHTMLBlock = self::createAttachmentBlock($attachments, $datarowid, $header['uid'],$_folderName);
-						$image = Api\Html::image('mail','attach',lang('%1 attachments',count($attachments)));
+						$imageHTMLBlock = self::createAttachmentBlock($attachments, $datarowid, $header['uid'], $_folderName);
+						$image = Api\Html::image('mail', 'attach', lang('%1 attachments', count($attachments)));
 					}
 
 					$attachmentFlag = $image;
 				} else {
-					$attachmentFlag ='&nbsp;';
+					$attachmentFlag = '&nbsp;';
 				}
 				// show priority flag
 				if ($header['priority'] < 3) {
-					 $image = Api\Html::image('mail','prio_high');
+					 $image = Api\Html::image('mail', 'prio_high');
 				} elseif ($header['priority'] > 3) {
-					$image = Api\Html::image('mail','prio_low');
+					$image = Api\Html::image('mail', 'prio_low');
 				} else {
 					$image = '';
 				}
 				// show a flag for flagged messages
-				$imageflagged ='';
+				$imageflagged = '';
 				if ($header['flagged'])
 				{
-					$imageflagged = Api\Html::image('mail','unread_flagged_small');
+					$imageflagged = Api\Html::image('mail', 'unread_flagged_small');
 				}
 				$data["attachments"] = $image.$attachmentFlag.$imageflagged; // icon for attachments available
 			}
@@ -1827,7 +1826,7 @@ 
 			if (in_array("toaddress", $cols))
 			{
 				// sent or drafts or template folder means foldertype > 0, use to address instead of from
-				$data["toaddress"] = $header['to_address'];//Mail::htmlentities($header['to_address'],$this->charset);
+				$data["toaddress"] = $header['to_address']; //Mail::htmlentities($header['to_address'],$this->charset);
 			}
 
 			if (in_array("additionaltoaddress", $cols))
@@ -1860,29 +1859,29 @@ 
 			$data['flags'] = Array();
 			if ($header['seen']) $data["flags"]['read'] = 'read';
 			foreach ($css_styles as &$flag) {
-				if ($flag!='mail')
+				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']);}
+					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['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'])
+			$data['address'] = ($_folderType ? $data["toaddress"] : $data["fromaddress"]);
+			if (in_array("bodypreview", $cols) && $header['bodypreview'])
 			{
 				$data["bodypreview"] = $header['bodypreview'];
 			}
 			$rv[] = $data;
 			//error_log(__METHOD__.__LINE__.array2string($data));
 		}
-		if (Mail::$debugTimes) Mail::logRunTimes($starttime,null,'Folder:'.$_folderName,__METHOD__.__LINE__);
+		if (Mail::$debugTimes) Mail::logRunTimes($starttime, null, 'Folder:'.$_folderName, __METHOD__.__LINE__);
 
 		// ToDo: call this ONLY if labels change
 		Etemplate\Widget::setElementAttribute('toolbar', 'actions', $this->get_toolbar_actions());
@@ -1897,8 +1896,8 @@ 
 	 */
 	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'];
@@ -1912,17 +1911,17 @@ 
 		}
 
 		$this->mail_bo->reopen($mailbox);
-		$headers_in	= $this->mail_bo->getMessageRawHeader($uid, $partID);
+		$headers_in = $this->mail_bo->getMessageRawHeader($uid, $partID);
 
 		// add line breaks to $rawheaders
-		$newRawHeaders = explode("\n",$headers_in);
+		$newRawHeaders = explode("\n", $headers_in);
 		reset($newRawHeaders);
 
 		// reset $rawheaders
-		$rawheaders 	= "";
+		$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     ");
 		}
 
@@ -1934,7 +1933,7 @@ 
 		}
 
 		header('Content-type: text/html; charset=iso-8859-1');
-		print '<pre>'. htmlspecialchars($rawheaders, ENT_NOQUOTES, 'iso-8859-1') .'</pre>';
+		print '<pre>'.htmlspecialchars($rawheaders, ENT_NOQUOTES, 'iso-8859-1').'</pre>';
 
 	}
 
@@ -1947,10 +1946,10 @@ 
 	{
 		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);
+		$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);
 
 		$hA = self::splitRowID($rowID);
 		$uid = $hA['msgUID'];
@@ -1974,79 +1973,79 @@ 
 		}
 		if (!$preventRedirect && ($this->mail_bo->isDraftFolder($mailbox) || $this->mail_bo->isTemplateFolder($mailbox)))
 		{
-			Egw::redirect_link('/index.php',array('menuaction'=>'mail.mail_compose.compose','id'=>$rowID,'from'=>'composefromdraft'));
+			Egw::redirect_link('/index.php', array('menuaction'=>'mail.mail_compose.compose', 'id'=>$rowID, 'from'=>'composefromdraft'));
 		}
 		$this->mail_bo->reopen($mailbox);
 		// retrieve the flags of the message, before touching it.
 		try
 		{
-			$headers	= $this->mail_bo->getMessageHeader($uid, $partID,true,true,$mailbox);
+			$headers = $this->mail_bo->getMessageHeader($uid, $partID, true, true, $mailbox);
 		}
 		catch (Api\Exception $e)
 		{
 			$error_msg[] = lang("ERROR: Message could not be displayed.");
-			$error_msg[] = lang("In Mailbox: %1, with ID: %2, and PartID: %3",$mailbox,$uid,$partID);
+			$error_msg[] = lang("In Mailbox: %1, with ID: %2, and PartID: %3", $mailbox, $uid, $partID);
 			Framework::message($e->getMessage(), 'error');
 		}
 		if (!empty($uid)) $this->mail_bo->getFlags($uid);
-		$envelope	= $this->mail_bo->getMessageEnvelope($uid, $partID,true,$mailbox);
+		$envelope = $this->mail_bo->getMessageEnvelope($uid, $partID, true, $mailbox);
 		//error_log(__METHOD__.__LINE__.array2string($envelope));
-		$this->mail_bo->getMessageRawHeader($uid, $partID,$mailbox);
+		$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;
-		$attachments	= $this->mail_bo->getMessageAttachments($uid, $partID, null, $fetchEmbeddedImages,true,true,$mailbox);
+		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);
 
-		$nonDisplayAbleCharacters = array('[\016]','[\017]',
-				'[\020]','[\021]','[\022]','[\023]','[\024]','[\025]','[\026]','[\027]',
-				'[\030]','[\031]','[\032]','[\033]','[\034]','[\035]','[\036]','[\037]');
+		$nonDisplayAbleCharacters = array('[\016]', '[\017]',
+				'[\020]', '[\021]', '[\022]', '[\023]', '[\024]', '[\025]', '[\026]', '[\027]',
+				'[\030]', '[\031]', '[\032]', '[\033]', '[\034]', '[\035]', '[\036]', '[\037]');
 
 		//error_log(__METHOD__.__LINE__.$mailBody);
 		$this->mail_bo->closeConnection();
 		//$GLOBALS['egw_info']['flags']['currentapp'] = 'mail';//should not be needed
 		$etpl = new Etemplate('mail.display');
-		$subject = $this->mail_bo->decode_subject(preg_replace($nonDisplayAbleCharacters,'',$envelope['SUBJECT']),false);
+		$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']);
 		$sel_options = array();
-		foreach(array('SENDER','FROM','TO','CC','BCC') as $field)
+		foreach (array('SENDER', 'FROM', 'TO', 'CC', 'BCC') as $field)
 		{
 			if (!isset($envelope[$field])) continue;
-			foreach($envelope[$field] as $field_data)
+			foreach ($envelope[$field] as $field_data)
 			{
 				//error_log(__METHOD__.__LINE__.array2string($field_data));
 				$content[$field][] = $field_data;
 				$sel_options[$field][] = array(
 					// taglist requires these - not optional
 					'id' => $field_data,
-					'label' => str_replace('"',"'",$field_data),
+					'label' => str_replace('"', "'", $field_data),
 				);
 			}
 		}
 		$actionsenabled = $this->getDisplayToolbarActions();
 		$content['displayToolbaractions'] = json_encode($actionsenabled);
 		if (empty($subject)) $subject = lang('no subject');
-		$content['msg'] = (is_array($error_msg)?implode("<br>",$error_msg):$error_msg);
+		$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;
 		if (!is_array($headers) || !isset($headers['DATE']))
 		{
-			$headers['DATE'] = (is_array($envelope)&&$envelope['DATE']?$envelope['DATE']:'');
+			$headers['DATE'] = (is_array($envelope) && $envelope['DATE'] ? $envelope['DATE'] : '');
 		}
-		$content['mail_displaydate'] = Mail::_strtotime($headers['DATE'],'ts',true);
+		$content['mail_displaydate'] = Mail::_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;
-		$content['mailDisplayBodySrc'] = Egw::link('/index.php',$linkData);
+		$linkData = array('menuaction'=>"mail.mail_ui.loadEmailBody", "_messageID"=>$rowID);
+		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;
-		$content['mailDisplayContainerClass']=(count($attachments)?"mailDisplayContainer mailDisplayContainerFixedHeight":"mailDisplayContainer mailDisplayContainerFullHeight");
-		$content['mailDisplayAttachmentsClass']=(count($attachments)?"mailDisplayAttachments":"mail_DisplayNone");
+		$content['mail_id'] = $rowID;
+		$content['mailDisplayContainerClass'] = (count($attachments) ? "mailDisplayContainer mailDisplayContainerFixedHeight" : "mailDisplayContainer mailDisplayContainerFullHeight");
+		$content['mailDisplayAttachmentsClass'] = (count($attachments) ? "mailDisplayAttachments" : "mail_DisplayNone");
 
 		// DRAG attachments actions
 		$etpl->setElementAttribute('mail_displayattachments', 'actions', array(
@@ -2063,22 +2062,22 @@ 
 			$this->changeProfile($rememberServerID);
 		}
 
-		$etpl->exec('mail.mail_ui.displayMessage',$content,$sel_options,$readonlys,$preserv,2);
+		$etpl->exec('mail.mail_ui.displayMessage', $content, $sel_options, $readonlys, $preserv, 2);
 	}
 
 	/**
 	 * Build actions for display toolbar
 	 */
-	function getDisplayToolbarActions ()
+	function getDisplayToolbarActions()
 	{
 		$actions = $this->get_toolbar_actions();
-		$actions['mark']['children']['flagged']=array(
+		$actions['mark']['children']['flagged'] = array(
 			'group' => $actions['mark']['children']['flagged']['group'],
 			'caption' => 'Flagged',
 			'icon' => 'unread_flagged_small',
 			'onExecute' => 'javaScript:app.mail.mail_flag',
 		);
-		$actions['mark']['children']['unflagged']=array(
+		$actions['mark']['children']['unflagged'] = array(
 			'group' => $actions['mark']['children']['flagged']['group'],
 			'caption' => 'Unflagged',
 			'icon' => 'read_flagged_small',
@@ -2090,9 +2089,9 @@ 
 		$compose = $actions['composeasnew'];
 		unset($actions['composeasnew']);
 
-		$actions2 = array_reverse($actions,true);
-		$actions2['composeasnew']= $compose;
-		return array_reverse($actions2,true);
+		$actions2 = array_reverse($actions, true);
+		$actions2['composeasnew'] = $compose;
+		return array_reverse($actions2, true);
 	}
 
 	/**
@@ -2105,22 +2104,22 @@ 
 	 * @param boolean $_returnFullHTML flag wether to return HTML or data array
 	 * @return array|string data array or html or empty string
 	 */
-	static function createAttachmentBlock($attachments, $rowID, $uid, $mailbox,$_returnFullHTML=false)
+	static function createAttachmentBlock($attachments, $rowID, $uid, $mailbox, $_returnFullHTML = false)
 	{
-		$attachmentHTMLBlock='';
+		$attachmentHTMLBlock = '';
 		$attachmentHTML = array();
 		if (is_array($attachments) && count($attachments) > 0) {
-			$url_img_vfs = Api\Html::image('filemanager','navbar', lang('Filemanager'), ' height="16"');
-			$url_img_vfs_save_all = Api\Html::image('mail','save_all', lang('Save all'));
+			$url_img_vfs = Api\Html::image('filemanager', 'navbar', lang('Filemanager'), ' height="16"');
+			$url_img_vfs_save_all = Api\Html::image('mail', 'save_all', lang('Save all'));
 
 			foreach ($attachments as $key => $value)
 			{
-				$attachmentHTML[$key]['filename']= ($value['name'] ? ( $value['filename'] ? $value['filename'] : $value['name'] ) : lang('(no subject)'));
-				$attachmentHTML[$key]['filename'] = Api\Translation::convert_jsonsafe($attachmentHTML[$key]['filename'],'utf-8');
+				$attachmentHTML[$key]['filename'] = ($value['name'] ? ($value['filename'] ? $value['filename'] : $value['name']) : lang('(no subject)'));
+				$attachmentHTML[$key]['filename'] = Api\Translation::convert_jsonsafe($attachmentHTML[$key]['filename'], 'utf-8');
 				//error_log(array2string($value));
 				//error_log(strtoupper($value['mimeType']) .'<->'. Api\MimeMagic::filename2mime($attachmentHTML[$key]['filename']));
-				if (strtoupper($value['mimeType']=='APPLICATION/OCTET-STREAM')) $value['mimeType'] = Api\MimeMagic::filename2mime($attachmentHTML[$key]['filename']);
-				$attachmentHTML[$key]['type']=$value['mimeType'];
+				if (strtoupper($value['mimeType'] == 'APPLICATION/OCTET-STREAM')) $value['mimeType'] = Api\MimeMagic::filename2mime($attachmentHTML[$key]['filename']);
+				$attachmentHTML[$key]['type'] = $value['mimeType'];
 				$attachmentHTML[$key]['mimetype'] = Api\MimeMagic::mime2label($value['mimeType']);
 				$hA = self::splitRowID($rowID);
 				$uid = $hA['msgUID'];
@@ -2130,26 +2129,25 @@ 
 				$attachmentHTML[$key]['mime_data'] = Link::set_data($value['mimeType'], 'EGroupware\\Api\\Mail::getAttachmentAccount', array(
 					$acc_id, $mailbox, $uid, $value['partID'], $value['is_winmail'], true
 				));
-				$attachmentHTML[$key]['size']=Vfs::hsize($value['size']);
-				$attachmentHTML[$key]['attachment_number']=$key;
-				$attachmentHTML[$key]['partID']=$value['partID'];
+				$attachmentHTML[$key]['size'] = Vfs::hsize($value['size']);
+				$attachmentHTML[$key]['attachment_number'] = $key;
+				$attachmentHTML[$key]['partID'] = $value['partID'];
 				$attachmentHTML[$key]['mail_id'] = $rowID;
-				$attachmentHTML[$key]['winmailFlag']=$value['is_winmail'];
+				$attachmentHTML[$key]['winmailFlag'] = $value['is_winmail'];
 				$attachmentHTML[$key]['classSaveAllPossiblyDisabled'] = "mail_DisplayNone";
 
-				switch(strtoupper($value['mimeType']))
+				switch (strtoupper($value['mimeType']))
 				{
 					case 'MESSAGE/RFC822':
-						$linkData = array
-						(
+						$linkData = array(
 							'menuaction'	=> 'mail.mail_ui.displayMessage',
 							'mode'		=> 'display', //message/rfc822 attachments should be opened in display mode
 							'id'		=> $rowID,
 							'part'		=> $value['partID'],
 							'is_winmail'    => $value['is_winmail']
 						);
-						$windowName = 'displayMessage_'. $rowID.'_'.$value['partID'];
-						$linkView = "egw_openWindowCentered('".Egw::link('/index.php',$linkData)."','$windowName',700,egw_getWindowOuterHeight());";
+						$windowName = 'displayMessage_'.$rowID.'_'.$value['partID'];
+						$linkView = "egw_openWindowCentered('".Egw::link('/index.php', $linkData)."','$windowName',700,egw_getWindowOuterHeight());";
 						break;
 					case 'IMAGE/JPEG':
 					case 'IMAGE/PNG':
@@ -2160,7 +2158,7 @@ 
 					case 'TEXT/HTML':
 					case 'TEXT/DIRECTORY':
 						$sfxMimeType = $value['mimeType'];
-						$buff = explode('.',$value['name']);
+						$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 = Api\MimeMagic::ext2mime($suffix);
@@ -2173,49 +2171,47 @@ 
 					case 'TEXT/VCARD':
 					case 'TEXT/CALENDAR':
 					case 'TEXT/X-VCALENDAR':
-						$linkData = array
-						(
+						$linkData = array(
 							'menuaction'	=> 'mail.mail_ui.getAttachment',
 							'id'		=> $rowID,
 							'part'		=> $value['partID'],
 							'is_winmail'    => $value['is_winmail'],
 							'mailbox'   => base64_encode($mailbox),
 						);
-						$windowName = 'displayAttachment_'. $uid;
+						$windowName = 'displayAttachment_'.$uid;
 						$reg = '800x600';
 						// handle calendar/vcard
-						if (strtoupper($value['mimeType'])=='TEXT/CALENDAR')
+						if (strtoupper($value['mimeType']) == 'TEXT/CALENDAR')
 						{
-							$windowName = 'displayEvent_'. $rowID;
-							$reg2 = Link::get_registry('calendar','view_popup');
-							$attachmentHTML[$key]['popup']=(!empty($reg2) ? $reg2 : $reg);
+							$windowName = 'displayEvent_'.$rowID;
+							$reg2 = Link::get_registry('calendar', 'view_popup');
+							$attachmentHTML[$key]['popup'] = (!empty($reg2) ? $reg2 : $reg);
 						}
-						if (strtoupper($value['mimeType'])=='TEXT/X-VCARD' || strtoupper($value['mimeType'])=='TEXT/VCARD')
+						if (strtoupper($value['mimeType']) == 'TEXT/X-VCARD' || strtoupper($value['mimeType']) == 'TEXT/VCARD')
 						{
-							$windowName = 'displayContact_'. $rowID;
-							$reg2 = Link::get_registry('addressbook','add_popup');
-							$attachmentHTML[$key]['popup']=(!empty($reg2) ? $reg2 : $reg);
+							$windowName = 'displayContact_'.$rowID;
+							$reg2 = Link::get_registry('addressbook', 'add_popup');
+							$attachmentHTML[$key]['popup'] = (!empty($reg2) ? $reg2 : $reg);
 						}
 						// apply to action
-						list($width,$height) = explode('x',(!empty($reg2) ? $reg2 : $reg));
-						$linkView = "egw_openWindowCentered('".Egw::link('/index.php',$linkData)."','$windowName',$width,$height);";
+						list($width, $height) = explode('x', (!empty($reg2) ? $reg2 : $reg));
+						$linkView = "egw_openWindowCentered('".Egw::link('/index.php', $linkData)."','$windowName',$width,$height);";
 						break;
 					default:
-						$linkData = array
-						(
+						$linkData = array(
 							'menuaction'	=> 'mail.mail_ui.getAttachment',
 							'id'		=> $rowID,
 							'part'		=> $value['partID'],
 							'is_winmail'    => $value['is_winmail'],
 							'mailbox'   => base64_encode($mailbox),
 						);
-						$linkView = "window.location.href = '".Egw::link('/index.php',$linkData)."';";
+						$linkView = "window.location.href = '".Egw::link('/index.php', $linkData)."';";
 						break;
 				}
 				// we either use mime_data for server-side supported mime-types or mime_url for client-side or download
 				if (empty($attachmentHTML[$key]['mime_data']))
 				{
-					$attachmentHTML[$key]['mime_url'] = Egw::link('/index.php',$linkData);
+					$attachmentHTML[$key]['mime_url'] = Egw::link('/index.php', $linkData);
 					unset($attachmentHTML[$key]['mime_data']);
 				}
 				$attachmentHTML[$key]['windowName'] = $windowName;
@@ -2225,8 +2221,7 @@ 
 					($value['name'] ? $value['name'] : lang('(no subject)')).
 					'</b></a>';
 
-				$linkData = array
-				(
+				$linkData = array(
 					'menuaction'	=> 'mail.mail_ui.getAttachment',
 					'mode'		=> 'save',
 					'id'		=> $rowID,
@@ -2234,11 +2229,11 @@ 
 					'is_winmail'    => $value['is_winmail'],
 					'mailbox'   => base64_encode($mailbox),
 				);
-				$attachmentHTML[$key]['link_save'] ="<a href='".Egw::link('/index.php',$linkData)."' title='".$attachmentHTML[$key]['filename']."'>".Api\Html::image('mail','fileexport')."</a>";
+				$attachmentHTML[$key]['link_save'] = "<a href='".Egw::link('/index.php', $linkData)."' title='".$attachmentHTML[$key]['filename']."'>".Api\Html::image('mail', 'fileexport')."</a>";
 
 				if ($GLOBALS['egw_info']['user']['apps']['filemanager'])
 				{
-					$link_vfs_save = Egw::link('/index.php',array(
+					$link_vfs_save = Egw::link('/index.php', array(
 						'menuaction' => 'filemanager.filemanager_select.select',
 						'mode' => 'saveas',
 						'name' => $value['name'],
@@ -2257,19 +2252,19 @@ 
 							//$rowID
 							$ids["id[$ikey]"] = $rowID.'::'.$value['partID'].'::'.$value['is_winmail'].'::'.$value['name'];
 						}
-						$link_vfs_save = Egw::link('/index.php',array(
+						$link_vfs_save = Egw::link('/index.php', array(
 							'menuaction' => 'filemanager.filemanager_select.select',
 							'mode' => 'select-dir',
 							'method' => 'mail.mail_ui.vfsSaveAttachment',
 							'label' => lang('Save all'),
-						)+$ids);
+						) + $ids);
 						$vfs_save .= "<a href='#' onclick=\"egw_openWindowCentered('$link_vfs_save','vfs_save_attachment','640','530',window.outerWidth/2,window.outerHeight/2); return false;\">$url_img_vfs_save_all</a>";
 					}
 					$attachmentHTML[$key]['link_save'] .= $vfs_save;
 					//error_log(__METHOD__.__LINE__.$attachmentHTML[$key]['link_save']);
 				}
 			}
-			$attachmentHTMLBlock="<table width='100%'>";
+			$attachmentHTMLBlock = "<table width='100%'>";
 			foreach ((array)$attachmentHTML as $row)
 			{
 				$attachmentHTMLBlock .= "<tr><td><div class='useEllipsis'>".$row['link_view'].'</div></td>';
@@ -2287,7 +2282,7 @@ 
 				unset($attachmentHTML[$ikey]['link_save']);
 			}
 		}
-		return ($_returnFullHTML?$attachmentHTMLBlock:$attachmentHTML);
+		return ($_returnFullHTML ? $attachmentHTMLBlock : $attachmentHTML);
 	}
 
 	/**
@@ -2298,7 +2293,7 @@ 
 	 */
 	function gatherVacation($cachedVacations = array())
 	{
-		$isVacationEnabled = $this->mail_bo->icServer->acc_sieve_enabled && ($this->mail_bo->icServer->acc_sieve_host||$this->mail_bo->icServer->acc_imap_host);
+		$isVacationEnabled = $this->mail_bo->icServer->acc_sieve_enabled && ($this->mail_bo->icServer->acc_sieve_host || $this->mail_bo->icServer->acc_imap_host);
 		//error_log(__METHOD__.__LINE__.' Server:'.self::$icServerID.' Sieve Enabled:'.array2string($vacation));
 
 		if ($isVacationEnabled)
@@ -2311,7 +2306,7 @@ 
 
 				$cachedVacations = array($sieveServer->acc_id => $vacation) + (array)$cachedVacations;
 				// Set vacation to the instance cache for particular account with expiration of one day
-				Api\Cache::setCache(Api\Cache::INSTANCE, 'email', 'vacationNotice'.$GLOBALS['egw_info']['user']['account_lid'], $cachedVacations, 60*60*24);
+				Api\Cache::setCache(Api\Cache::INSTANCE, 'email', 'vacationNotice'.$GLOBALS['egw_info']['user']['account_lid'], $cachedVacations, 60 * 60 * 24);
 			}
 			catch (PEAR_Exception $ex)
 			{
@@ -2332,36 +2327,36 @@ 
 	function quotaDisplay($_usage, $_limit)
 	{
 
-		if($_limit == 0) {
-			$quotaPercent=100;
+		if ($_limit == 0) {
+			$quotaPercent = 100;
 		} else {
-			$quotaPercent=round(($_usage*100)/$_limit);
+			$quotaPercent = round(($_usage * 100) / $_limit);
 		}
 
-		$quotaLimit=Mail::show_readable_size($_limit*1024);
-		$quotaUsage=Mail::show_readable_size($_usage*1024);
+		$quotaLimit = Mail::show_readable_size($_limit * 1024);
+		$quotaUsage = Mail::show_readable_size($_usage * 1024);
 
 
-		if($quotaPercent > 90 && $_limit>0) {
-			$quotaBG='mail-index_QuotaRed';
-		} elseif($quotaPercent > 80 && $_limit>0) {
-			$quotaBG='mail-index_QuotaYellow';
+		if ($quotaPercent > 90 && $_limit > 0) {
+			$quotaBG = 'mail-index_QuotaRed';
+		} elseif ($quotaPercent > 80 && $_limit > 0) {
+			$quotaBG = 'mail-index_QuotaYellow';
 		} else {
-			$quotaBG='mail-index_QuotaGreen';
+			$quotaBG = 'mail-index_QuotaGreen';
 		}
 
-		if($_limit > 0) {
-			$quotaText = $quotaUsage .'/'.$quotaLimit;
+		if ($_limit > 0) {
+			$quotaText = $quotaUsage.'/'.$quotaLimit;
 		} else {
 			$quotaText = $quotaUsage;
 		}
 
-		if($quotaPercent > 50) {
+		if ($quotaPercent > 50) {
 		} else {
 		}
 		$quota['class'] = $quotaBG;
-		$quota['text'] = lang('Quota: %1',$quotaText);
-		$quota['percent'] = (string)round(($_usage*100)/$_limit);
+		$quota['text'] = lang('Quota: %1', $quotaText);
+		$quota['percent'] = (string)round(($_usage * 100) / $_limit);
 		return $quota;
 	}
 
@@ -2375,12 +2370,12 @@ 
 		$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);
 
-		$attachment = $this->mail_bo->getAttachmentByCID($uid, $cid, $partID, true);	// true get contents as stream
+		$attachment = $this->mail_bo->getAttachmentByCID($uid, $cid, $partID, true); // true get contents as stream
 
 		$this->mail_bo->closeConnection();
 
@@ -2388,8 +2383,8 @@ 
 
 		if ($attachment)
 		{
-			header("Content-Type: ". $attachment->getType());
-			header('Content-Disposition: inline; filename="'. $attachment->getDispositionParameter('filename') .'"');
+			header("Content-Type: ".$attachment->getType());
+			header('Content-Disposition: inline; filename="'.$attachment->getDispositionParameter('filename').'"');
 			//header("Expires: 0");
 			// the next headers are for IE and SSL
 			//header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
@@ -2407,7 +2402,7 @@ 
 
 	function getAttachment()
 	{
-		if(isset($_GET['id'])) $rowID	= $_GET['id'];
+		if (isset($_GET['id'])) $rowID = $_GET['id'];
 
 		$hA = self::splitRowID($rowID);
 		$uid = $hA['msgUID'];
@@ -2419,11 +2414,11 @@ 
 			//error_log(__METHOD__.__LINE__.' change Profile to ->'.$icServerID);
 			$this->changeProfile($icServerID);
 		}
-		$part		= $_GET['part'];
+		$part = $_GET['part'];
 		$is_winmail = $_GET['is_winmail'] ? $_GET['is_winmail'] : 0;
 
 		$this->mail_bo->reopen($mailbox);
-		$attachment = $this->mail_bo->getAttachment($uid,$part,$is_winmail,false);
+		$attachment = $this->mail_bo->getAttachment($uid, $part, $is_winmail, false);
 		$this->mail_bo->closeConnection();
 		if ($rememberServerID != $this->mail_bo->profileID)
 		{
@@ -2438,7 +2433,7 @@ 
 			if (strtoupper($attachment['type']) == 'TEXT/DIRECTORY' || empty($attachment['type']))
 			{
 				$sfxMimeType = $attachment['type'];
-				$buff = explode('.',$attachment['filename']);
+				$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 = Api\MimeMagic::ext2mime($suffix);
@@ -2450,10 +2445,10 @@ 
 			{
 				//error_log(__METHOD__."about to call calendar_ical");
 				$calendar_ical = new calendar_ical();
-				$eventid = $calendar_ical->search($attachment['attachment'],-1);
+				$eventid = $calendar_ical->search($attachment['attachment'], -1);
 				//error_log(__METHOD__.array2string($eventid));
 				if (!$eventid) $eventid = -1;
-				$event = $calendar_ical->importVCal($attachment['attachment'],(is_array($eventid)?$eventid[0]:$eventid),null,true,0,'',null,$attachment['charset']);
+				$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)
 				{
@@ -2461,7 +2456,7 @@ 
 						'menuaction'      => 'calendar.calendar_uiforms.edit',
 						'cal_id'      => $event,
 					);
-					Egw::redirect_link('../index.php',$vars);
+					Egw::redirect_link('../index.php', $vars);
 				}
 				//Import failed, download content anyway
 			}
@@ -2476,13 +2471,13 @@ 
 				{
 					$vcard['uid'] = trim($vcard['uid']);
 					//error_log(__METHOD__.__LINE__.print_r($vcard,true));
-					$contact = $addressbook_vcal->find_contact($vcard,false);
+					$contact = $addressbook_vcal->find_contact($vcard, false);
 				}
 				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)
+				if ($contact || count($vcard) > 2)
 				{
-					$contact = $addressbook_vcal->addVCard($attachment['attachment'],(is_array($contact)?array_shift($contact):$contact),true,$attachment['charset']);
+					$contact = $addressbook_vcal->addVCard($attachment['attachment'], (is_array($contact) ? array_shift($contact) : $contact), true, $attachment['charset']);
 				}
 				if ((int)$contact > 0)
 				{
@@ -2490,14 +2485,14 @@ 
 						'menuaction'	=> 'addressbook.addressbook_ui.edit',
 						'contact_id'	=> $contact,
 					);
-					Egw::redirect_link('../index.php',$vars);
+					Egw::redirect_link('../index.php', $vars);
 				}
 				//Import failed, download content anyway
 			}
 		}
 		//error_log(__METHOD__.__LINE__.'->'.array2string($attachment));
-		$filename = ($attachment['name']?$attachment['name']:($attachment['filename']?$attachment['filename']:$mailbox.'_uid'.$uid.'_part'.$part));
-		Api\Header\Content::safe($attachment['attachment'], $filename, $attachment['type'], $size=0, True, $_GET['mode'] == "save");
+		$filename = ($attachment['name'] ? $attachment['name'] : ($attachment['filename'] ? $attachment['filename'] : $mailbox.'_uid'.$uid.'_part'.$part));
+		Api\Header\Content::safe($attachment['attachment'], $filename, $attachment['type'], $size = 0, True, $_GET['mode'] == "save");
 		echo $attachment['attachment'];
 
 		exit();
@@ -2512,9 +2507,9 @@ 
 	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'];
@@ -2542,14 +2537,14 @@ 
 		if (!$display)
 		{
 			$headers = Horde_Mime_Headers::parseHeaders($message);
-			$subject = str_replace('$$','__',Mail::decode_header($headers['SUBJECT']));
-			Api\Header\Content::safe($message, $subject.".eml", $mime='message/rfc822', $size=0, true, true);
+			$subject = str_replace('$$', '__', Mail::decode_header($headers['SUBJECT']));
+			Api\Header\Content::safe($message, $subject.".eml", $mime = 'message/rfc822', $size = 0, true, true);
 			echo $message;
 		}
 		else
 		{
-			Api\Header\Content::safe($message, $subject.".eml", $mime='text/html', $size=0, true, false);
-			print '<pre>'. htmlspecialchars($message, ENT_NOQUOTES|ENT_SUBSTITUTE, 'utf-8') .'</pre>';
+			Api\Header\Content::safe($message, $subject.".eml", $mime = 'text/html', $size = 0, true, false);
+			print '<pre>'.htmlspecialchars($message, ENT_NOQUOTES|ENT_SUBSTITUTE, 'utf-8').'</pre>';
 		}
 	}
 
@@ -2561,18 +2556,18 @@ 
 	 * @param boolean $close Return javascript to close the window
 	 * @return string|boolean javascript eg. to close the selector window if $close is true, or success/fail if $close is false
 	 */
-	function vfsSaveMessage($ids,$path, $close = true)
+	function vfsSaveMessage($ids, $path, $close = true)
 	{
 		//error_log(__METHOD__.' IDs:'.array2string($ids).' SaveToPath:'.$path);
 
 		if (is_array($ids) && !Vfs::is_writable($path) || !is_array($ids) && !Vfs::is_writable(dirname($path)))
 		{
-			return 'alert("'.addslashes(lang('%1 is NOT writable by you!',$path)).'"); Egw(window).close();';
+			return 'alert("'.addslashes(lang('%1 is NOT writable by you!', $path)).'"); Egw(window).close();';
 		}
 		Api\Translation::add_app('mail');
 
 		$rememberServerID = $this->mail_bo->profileID;
-		foreach((array)$ids as $id)
+		foreach ((array)$ids as $id)
 		{
 			$hA = self::splitRowID($id);
 			$uid = $hA['msgUID'];
@@ -2583,20 +2578,20 @@ 
 				//error_log(__METHOD__.__LINE__.' change Profile to ->'.$icServerID);
 				$this->changeProfile($icServerID);
 			}
-			$message = $this->mail_bo->getMessageRawBody($uid, $partID='', $mailbox);
-			$err=null;
-			if(Vfs::is_dir($path))
+			$message = $this->mail_bo->getMessageRawBody($uid, $partID = '', $mailbox);
+			$err = null;
+			if (Vfs::is_dir($path))
 			{
-				$headers = $this->mail_bo->getMessageHeader($uid,$partID,true,false,$mailbox);
-				$file = $path . '/'.preg_replace('/[\f\n\t\v\\:*#?<>\|]/',"_",$headers['SUBJECT']).'.eml';
+				$headers = $this->mail_bo->getMessageHeader($uid, $partID, true, false, $mailbox);
+				$file = $path.'/'.preg_replace('/[\f\n\t\v\\:*#?<>\|]/', "_", $headers['SUBJECT']).'.eml';
 			}
 			else
 			{
 				$file = $path;
 			}
-			if (!($fp = Vfs::fopen($file,'wb')) || !fwrite($fp,$message))
+			if (!($fp = Vfs::fopen($file, 'wb')) || !fwrite($fp, $message))
 			{
-				$err .= lang('Error saving %1!',$file);
+				$err .= lang('Error saving %1!', $file);
 				$succeeded = false;
 			}
 			else
@@ -2606,10 +2601,10 @@ 
 			if ($fp) fclose($fp);
 			if ($succeeded)
 			{
-				unset($headers['SUBJECT']);//already in filename
+				unset($headers['SUBJECT']); //already in filename
 				$infoSection = Mail::createHeaderInfoSection($headers, 'SUPPRESS', false);
-				$props = array(array('name' => 'comment','val' => $infoSection));
-				Vfs::proppatch($file,$props);
+				$props = array(array('name' => 'comment', 'val' => $infoSection));
+				Vfs::proppatch($file, $props);
 			}
 		}
 		if ($rememberServerID != $this->mail_bo->profileID)
@@ -2618,9 +2613,9 @@ 
 			$this->changeProfile($rememberServerID);
 		}
 
-		if($close)
+		if ($close)
 		{
-			Framework::window_close(($err?$err:null));
+			Framework::window_close(($err ? $err : null));
 		}
 		else
 		{
@@ -2635,15 +2630,15 @@ 
 	 * @param string $path path in vfs (no Vfs::PREFIX!), only directory for multiple id's ($ids is an array)
 	 * @return string javascript eg. to close the selector window
 	 */
-	function vfsSaveAttachment($ids,$path)
+	function vfsSaveAttachment($ids, $path)
 	{
 		//error_log(__METHOD__.__LINE__.'("'.array2string($ids).'","'.$path."\")');");
 
 		if (is_array($ids) && !Vfs::is_writable($path) || !is_array($ids) && !Vfs::is_writable(dirname($path)))
 		{
-			return 'alert("'.addslashes(lang('%1 is NOT writable by you!',$path)).'"); Egw(window).close();';
+			return 'alert("'.addslashes(lang('%1 is NOT writable by you!', $path)).'"); Egw(window).close();';
 		}
-		$err=null;
+		$err = null;
 		$dupe_count = array();
 		$rememberServerID = $this->mail_bo->profileID;
 
@@ -2653,12 +2648,12 @@ 
 		 *
 		 * @return array an array of parameters
 		 */
-		$getParams = function ($id) {
-			list($app,$user,$serverID,$mailbox,$uid,$part,$is_winmail,$name) = explode('::',$id,8);
-			$lId = implode('::',array($app,$user,$serverID,$mailbox,$uid));
+		$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);
 			return array(
-				'is_winmail' => $is_winmail == "null" || !$is_winmail?false:$is_winmail,
+				'is_winmail' => $is_winmail == "null" || !$is_winmail ? false : $is_winmail,
 				'user' => $user,
 				'name' => $name,
 				'part' => $part,
@@ -2670,8 +2665,8 @@ 
 
 		//Examine the first attachment to see if attachment
 		//is winmail.dat embedded attachments.
-		$isMultipleDownload=is_array($ids);
-		$p = $getParams((is_array($ids)?$ids[0]:$ids));
+		$isMultipleDownload = is_array($ids);
+		$p = $getParams((is_array($ids) ? $ids[0] : $ids));
 		if ($p['is_winmail'])
 		{
 			if ($p['icServer'] && $p['icServer'] != $this->mail_bo->profileID)
@@ -2682,14 +2677,14 @@ 
 			// Retrive all embedded attachments at once
 			// avoids to fetch heavy winmail.dat content
 			// for each file.
-			$attachments = $this->mail_bo->getTnefAttachments($p['uid'],$p['part']);
+			$attachments = $this->mail_bo->getTnefAttachments($p['uid'], $p['part']);
 		}
 
-		foreach((array)$ids as $id)
+		foreach ((array)$ids as $id)
 		{
 			$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);
@@ -2707,25 +2702,25 @@ 
 			}
 			else
 			{
-				$attachment = $this->mail_bo->getAttachment($params['uid'],$params['part'],$params['is_winmail'],false);
+				$attachment = $this->mail_bo->getAttachment($params['uid'], $params['part'], $params['is_winmail'], false);
 			}
 
 			$file = $params['name'];
 			// when $isMultipleDownload the path holds no filename
-			while(Vfs::file_exists($path.($file && $isMultipleDownload ? '/'.$file : '')))
+			while (Vfs::file_exists($path.($file && $isMultipleDownload ? '/'.$file : '')))
 			{
 				$dupe_count[$params['name']]++;
-				$file = pathinfo($params['name'], PATHINFO_FILENAME) .
-					' ('.($dupe_count[$params['name']] + 1).')' . '.' .
+				$file = pathinfo($params['name'], PATHINFO_FILENAME).
+					' ('.($dupe_count[$params['name']] + 1).')'.'.'.
 					pathinfo($params['name'], PATHINFO_EXTENSION);
 			}
 			$params['name'] = $file;
 			//error_log(__METHOD__.__LINE__.array2string($attachment));
 			// when $isMultipleDownload the path holds no filename
-			if (!($fp = Vfs::fopen($file=$path.($params['name'] && $isMultipleDownload ? '/'.$params['name'] : ''),'wb')) ||
-				!fwrite($fp,$attachment['attachment']))
+			if (!($fp = Vfs::fopen($file = $path.($params['name'] && $isMultipleDownload ? '/'.$params['name'] : ''), 'wb')) ||
+				!fwrite($fp, $attachment['attachment']))
 			{
-				$err .= lang('Error saving %1!',$file);
+				$err .= lang('Error saving %1!', $file);
 			}
 			if ($fp)
 			{
@@ -2738,21 +2733,21 @@ 
 			//error_log(__METHOD__.__LINE__.' change Profile back to where we came from ->'.$rememberServerID);
 			$this->changeProfile($rememberServerID);
 		}
-		Framework::window_close(($err?$err:null));
+		Framework::window_close(($err ? $err : null));
 	}
 
 	/**
 	 * Zip all attachments and send to user
 	 * @param string $message_id = null
 	 */
-	function download_zip($message_id=null)
+	function download_zip($message_id = null)
 	{
 		//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))
+		if (!is_numeric($message_id))
 		{
 			$hA = self::splitRowID($message_id);
 			$message_id = $hA['msgUID'];
@@ -2770,30 +2765,30 @@ 
 		}
 		// always fetch all, even inline (images)
 		$fetchEmbeddedImages = true;
-		$attachments = $this->mail_bo->getMessageAttachments($message_id,null, null, $fetchEmbeddedImages, true,true,$mailbox);
+		$attachments = $this->mail_bo->getMessageAttachments($message_id, null, null, $fetchEmbeddedImages, true, true, $mailbox);
 		// put them in VFS so they can be zipped
-		$header = $this->mail_bo->getMessageHeader($message_id,'',true,false,$mailbox);
+		$header = $this->mail_bo->getMessageHeader($message_id, '', true, false, $mailbox);
 		//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/*Vfs::get_home_dir()*/ . "/.mail_$message_id";
-		if(Vfs::is_dir($temp_path)) Vfs::remove ($temp_path);
+		$temp_path = $homedir/*Vfs::get_home_dir()*/."/.mail_$message_id";
+		if (Vfs::is_dir($temp_path)) Vfs::remove($temp_path);
 
 		// Add subject to path, so it gets used as the file name
-		$path = $temp_path . '/' . ($header['SUBJECT'] ? Vfs::encodePathComponent($header['SUBJECT']) : lang('mail')) .'/';
-		if(!Vfs::mkdir($path, 0700, true))
+		$path = $temp_path.'/'.($header['SUBJECT'] ? Vfs::encodePathComponent($header['SUBJECT']) : lang('mail')).'/';
+		if (!Vfs::mkdir($path, 0700, true))
 		{
-			Framework::message("Unable to open temp directory $path",'error');
+			Framework::message("Unable to open temp directory $path", 'error');
 			return;
 		}
 
 		$file_list = array();
 		$dupe_count = array();
 		$this->mail_bo->reopen($mailbox);
-		if ($attachments[0]['is_winmail'] && $attachments[0]['is_winmail']!='null')
+		if ($attachments[0]['is_winmail'] && $attachments[0]['is_winmail'] != 'null')
 		{
-			$tnefAttachments = $this->mail_bo->getTnefAttachments($message_id, $attachments[0]['partID'],true);
+			$tnefAttachments = $this->mail_bo->getTnefAttachments($message_id, $attachments[0]['partID'], true);
 		}
-		foreach($attachments as $file)
+		foreach ($attachments as $file)
 		{
 			if ($file['is_winmail'])
 			{
@@ -2806,22 +2801,22 @@ 
 			}
 			else
 			{
-				$attachment = $this->mail_bo->getAttachment($message_id,$file['partID'],$file['is_winmail'],false,true);
+				$attachment = $this->mail_bo->getAttachment($message_id, $file['partID'], $file['is_winmail'], false, true);
 			}
-			$success=true;
+			$success = true;
 			if (empty($file['filename'])) $file['filename'] = $file['name'];
-			if(in_array($path.$file['filename'], $file_list))
+			if (in_array($path.$file['filename'], $file_list))
 			{
 				$dupe_count[$path.$file['filename']]++;
-				$file['filename'] = pathinfo($file['filename'], PATHINFO_FILENAME) .
-					' ('.($dupe_count[$path.$file['filename']] + 1).')' . '.' .
+				$file['filename'] = pathinfo($file['filename'], PATHINFO_FILENAME).
+					' ('.($dupe_count[$path.$file['filename']] + 1).')'.'.'.
 					pathinfo($file['filename'], PATHINFO_EXTENSION);
 			}
-			if (!($fp = Vfs::fopen($path.$file['filename'],'wb')) ||
+			if (!($fp = Vfs::fopen($path.$file['filename'], 'wb')) ||
 				!(!fseek($attachment['attachment'], 0, SEEK_SET) && stream_copy_to_stream($attachment['attachment'], $fp)))
 			{
-				$success=false;
-				Framework::message("Unable to zip {$file['filename']}",'error');
+				$success = false;
+				Framework::message("Unable to zip {$file['filename']}", 'error');
 			}
 			if ($success) $file_list[] = $path.$file['filename'];
 			if ($fp) fclose($fp);
@@ -2842,7 +2837,7 @@ 
 		exit();
 	}
 
-	function get_load_email_data($uid, $partID, $mailbox,$htmlOptions=null)
+	function get_load_email_data($uid, $partID, $mailbox, $htmlOptions = null)
 	{
 		// seems to be needed, as if we open a mail from notification popup that is
 		// located in a different folder, we experience: could not parse message
@@ -2854,19 +2849,19 @@ 
 		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);
+		$bodyParts	= $this->mail_bo->getMessageBody($uid, ($htmlOptions ? $htmlOptions : ''), $partID, $structure, false, $mailbox);
 
 		//error_log(__METHOD__.__LINE__.array2string($bodyParts));
 		// attachments here are only fetched to determine if there is a meeting request
 		// and if. use the appropriate action. so we do not need embedded images
 		$fetchEmbeddedImages = false;
-		$attachments = (array)$this->mail_bo->getMessageAttachments($uid, $partID, $structure, $fetchEmbeddedImages, true,true,$mailbox);
+		$attachments = (array)$this->mail_bo->getMessageAttachments($uid, $partID, $structure, $fetchEmbeddedImages, true, true, $mailbox);
 		//error_log(__METHOD__.__LINE__.array2string($attachments));
 		foreach ($attachments as &$attach)
 		{
 			if (strtolower($attach['mimeType']) == 'text/calendar' &&
 				isset($GLOBALS['egw_info']['user']['apps']['calendar']) &&
-				($attachment = $this->mail_bo->getAttachment($uid, $attach['partID'],$attach['is_winmail'],(strtolower($attach['mimeType']) == 'text/calendar'?false:true))))
+				($attachment = $this->mail_bo->getAttachment($uid, $attach['partID'], $attach['is_winmail'], (strtolower($attach['mimeType']) == 'text/calendar' ? false : true))))
 			{
 				//error_log(__METHOD__.__LINE__.array2string($attachment));
 				Api\Cache::setSession('calendar', 'ical', array(
@@ -2877,28 +2872,28 @@ 
 				));
 				$this->mail_bo->htmlOptions = $bufferHtmlOptions;
 				Api\Translation::add_app('calendar');
-				return ExecMethod( 'calendar.calendar_uiforms.meeting',
-					array('event'=>null,'msg'=>'','useSession'=>true)
+				return ExecMethod('calendar.calendar_uiforms.meeting',
+					array('event'=>null, 'msg'=>'', 'useSession'=>true)
 				);
 			}
 		}
 		// Compose the content of the frame
 		$frameHtml =
 			$this->get_email_header($this->mail_bo->getStyles($bodyParts)).
-			$this->showBody($this->getdisplayableBody($bodyParts,true,false), false);
+			$this->showBody($this->getdisplayableBody($bodyParts, true, false), false);
 		//IE10 eats away linebreaks preceeded by a whitespace in PRE sections
-		$frameHtml = str_replace(" \r\n","\r\n",$frameHtml);
+		$frameHtml = str_replace(" \r\n", "\r\n", $frameHtml);
 		$this->mail_bo->htmlOptions = $bufferHtmlOptions;
 
 		return $frameHtml;
 	}
 
-	static function get_email_header($additionalStyle='')
+	static function get_email_header($additionalStyle = '')
 	{
 		// egw_info[flags][css] already include <style> tags
 		$GLOBALS['egw_info']['flags']['css'] = preg_replace('|</?style[^>]*>|i', '', $additionalStyle);
-		$GLOBALS['egw_info']['flags']['nofooter']=true;
-		$GLOBALS['egw_info']['flags']['nonavbar']=true;
+		$GLOBALS['egw_info']['flags']['nofooter'] = true;
+		$GLOBALS['egw_info']['flags']['nonavbar'] = true;
 		// do NOT include any default CSS
 		Framework::includeCSS('mail', 'preview', true, true);
 
@@ -2909,35 +2904,35 @@ 
 		return $GLOBALS['egw']->framework->header();
 	}
 
-	function showBody(&$body, $print=true,$fullPageTags=true)
+	function showBody(&$body, $print = true, $fullPageTags = true)
 	{
 		$BeginBody = '<div class="mailDisplayBody">
 <table width="100%" style="table-layout:fixed"><tr><td class="td_display">';
 
 		$EndBody = '</td></tr></table></div>';
 		if ($fullPageTags) $EndBody .= "</body></html>";
-		if ($print)	{
-			print $BeginBody. $body .$EndBody;
+		if ($print) {
+			print $BeginBody.$body.$EndBody;
 		} else {
-			return $BeginBody. $body .$EndBody;
+			return $BeginBody.$body.$EndBody;
 		}
 	}
 
-	function &getdisplayableBody($_bodyParts,$modifyURI=true,$useTidy = true)
+	function &getdisplayableBody($_bodyParts, $modifyURI = true, $useTidy = true)
 	{
-		$bodyParts	= $_bodyParts;
+		$bodyParts = $_bodyParts;
 
-		$nonDisplayAbleCharacters = array('[\016]','[\017]',
-				'[\020]','[\021]','[\022]','[\023]','[\024]','[\025]','[\026]','[\027]',
-				'[\030]','[\031]','[\032]','[\033]','[\034]','[\035]','[\036]','[\037]');
+		$nonDisplayAbleCharacters = array('[\016]', '[\017]',
+				'[\020]', '[\021]', '[\022]', '[\023]', '[\024]', '[\025]', '[\026]', '[\027]',
+				'[\030]', '[\031]', '[\032]', '[\033]', '[\034]', '[\035]', '[\036]', '[\037]');
 
 		$body = '';
 
 		//error_log(__METHOD__.array2string($bodyParts)); //exit;
 		if (empty($bodyParts)) return "";
-		foreach((array)$bodyParts as $singleBodyPart) {
+		foreach ((array)$bodyParts as $singleBodyPart) {
 			if (!isset($singleBodyPart['body'])) {
-				$singleBodyPart['body'] = $this->getdisplayableBody($singleBodyPart,$modifyURI,$useTidy);
+				$singleBodyPart['body'] = $this->getdisplayableBody($singleBodyPart, $modifyURI, $useTidy);
 				$body .= $singleBodyPart['body'];
 				continue;
 			}
@@ -2947,7 +2942,7 @@ 
 				$body .= '';
 				continue;
 			}
-			if(!empty($body)) {
+			if (!empty($body)) {
 				$body .= '<hr style="border:dotted 1px silver;">';
 			}
 			//error_log($singleBodyPart['body']);
@@ -2972,22 +2967,22 @@ 
 				'(R)',
 			);
 
-			if(($singleBodyPart['mimeType'] == 'text/html' || $singleBodyPart['mimeType'] == 'text/plain') &&
+			if (($singleBodyPart['mimeType'] == 'text/html' || $singleBodyPart['mimeType'] == 'text/plain') &&
 				strtoupper($singleBodyPart['charSet']) != 'UTF-8')
 			{
-				$singleBodyPart['body'] = preg_replace($sar,$rar,$singleBodyPart['body']);
+				$singleBodyPart['body'] = preg_replace($sar, $rar, $singleBodyPart['body']);
 			}
 			//error_log(__METHOD__.__LINE__.'reports:'.$singleBodyPart['charSet']);
-			$singleBodyPart['body'] = Api\Translation::convert_jsonsafe($singleBodyPart['body'],$singleBodyPart['charSet']);
+			$singleBodyPart['body'] = Api\Translation::convert_jsonsafe($singleBodyPart['body'], $singleBodyPart['charSet']);
 			//error_log(__METHOD__.__LINE__.array2string($singleBodyPart));
-			if($singleBodyPart['mimeType'] == 'text/plain')
+			if ($singleBodyPart['mimeType'] == 'text/plain')
 			{
-				$newBody	= @htmlentities($singleBodyPart['body'],ENT_QUOTES, strtoupper(Mail::$displayCharset));
+				$newBody = @htmlentities($singleBodyPart['body'], ENT_QUOTES, strtoupper(Mail::$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::$displayCharset));
+				if (empty($newBody) && strtolower($singleBodyPart['charSet']) == 'utf-8') $newBody = @htmlentities(iconv('utf-8', 'utf-8', $singleBodyPart['body']), ENT_QUOTES, strtoupper(Mail::$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
@@ -3015,20 +3010,20 @@ 
 				// since we do not display the message as HTML anymore we may want to insert good linebreaking (for visibility).
 				//error_log(__METHOD__.__LINE__.'..'.$newBody);
 				// dont break lines that start with > (&gt; as the text was processed with htmlentities before)
-				$newBody	= "<pre>".Mail::wordwrap($newBody,90,"\n",'&gt;')."</pre>";
+				$newBody = "<pre>".Mail::wordwrap($newBody, 90, "\n", '&gt;')."</pre>";
 			}
 			else
 			{
-				$alreadyHtmlLawed=false;
-				$newBody	= $singleBodyPart['body'];
+				$alreadyHtmlLawed = false;
+				$newBody = $singleBodyPart['body'];
 				//TODO:$newBody	= $this->highlightQuotes($newBody);
 				#error_log(print_r($newBody,true));
 				if ($useTidy && extension_loaded('tidy'))
 				{
 					$tidy = new tidy();
-					$cleaned = $tidy->repairString($newBody, Mail::$tidy_config,'utf8');
+					$cleaned = $tidy->repairString($newBody, Mail::$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);
 					}
@@ -3039,7 +3034,7 @@ 
 					if (!$preserveHTML)	// ToDo KL: $preserveHTML is NOT initialised, so always if is dead code
 					{
 						// filter only the 'body', as we only want that part, if we throw away the Api\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;
@@ -3050,7 +3045,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;
@@ -3059,10 +3054,10 @@ 
 					$htmLawed = new Api\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,Mail::$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, Mail::$htmLawed_config);
+					if ($hasOther && $preserveHTML) $newBody = $matches[1].$newBody.$matches[3];
+					$alreadyHtmlLawed = true;
 				}
 				// do the cleanup, set for the use of purifier
 				//$newBodyBuff = $newBody;
@@ -3084,8 +3079,8 @@ 
 				}
 */
 				// removes stuff between http and ?http
-				$Protocol = '(http:\/\/|(ftp:\/\/|https:\/\/))';    // only http:// gets removed, other protocolls are shown
-				$newBody = preg_replace('~'.$Protocol.'[^>]*\?'.$Protocol.'~sim','$1',$newBody); // removes stuff between http:// and ?http://
+				$Protocol = '(http:\/\/|(ftp:\/\/|https:\/\/))'; // only http:// gets removed, other protocolls are shown
+				$newBody = preg_replace('~'.$Protocol.'[^>]*\?'.$Protocol.'~sim', '$1', $newBody); // removes stuff between http:// and ?http://
 				// TRANSFORM MAILTO LINKS TO EMAILADDRESS ONLY, WILL BE SUBSTITUTED BY parseEmail TO CLICKABLE LINK
 				$newBody = preg_replace('/(?<!"|href=|href\s=\s|href=\s|href\s=)'.'mailto:([a-z0-9._-]+)@([a-z0-9_-]+)\.([a-z0-9._-]+)/i',
 					"\\1@\\2.\\3",
@@ -3098,7 +3093,7 @@ 
 				// create links for inline images
 				if ($modifyURI)
 				{
-					$newBody = self::resolve_inline_images ($newBody, $this->mailbox, $this->uid, $this->partID);
+					$newBody = self::resolve_inline_images($newBody, $this->mailbox, $this->uid, $this->partID);
 				}
 				// email addresses / mailto links get now activated on client-side
 			}
@@ -3110,7 +3105,7 @@ 
 		$body = preg_replace("/(\\\\\\\\)([\w,\\\\,-]+)/i",
 			"<a href=\"file:$1$2\" target=\"_blank\"><font color=\"blue\">$1$2</font></a>", $body);
 
-		$body = preg_replace($nonDisplayAbleCharacters,'',$body);
+		$body = preg_replace($nonDisplayAbleCharacters, '', $body);
 
 		return $body;
 	}
@@ -3125,7 +3120,7 @@ 
 	 * @param string $_messageType = 'html', message type is either html or plain
 	 * @return string message body including all CID images replaced
 	 */
-	public static function resolve_inline_images ($_body,$_mailbox, $_uid, $_partID, $_messageType = 'html')
+	public static function resolve_inline_images($_body, $_mailbox, $_uid, $_partID, $_messageType = 'html')
 	{
 		if ($_messageType === 'plain')
 		{
@@ -3133,7 +3128,7 @@ 
 		}
 		else
 		{
-			foreach(array('src','url','background') as $type)
+			foreach (array('src', 'url', 'background') as $type)
 			{
 				$_body = self::resolve_inline_image_byType($_body, $_mailbox, $_uid, $_partID, $type);
 			}
@@ -3152,7 +3147,7 @@ 
 	 *	- types: {plain|src|url|background}
 	 * @return string returns body content including all CID replacements
 	 */
-	public static function resolve_inline_image_byType ($_body,$_mailbox, $_uid, $_partID, $_type ='src')
+	public static function resolve_inline_image_byType($_body, $_mailbox, $_uid, $_partID, $_type = 'src')
 	{
 		/**
 		 * Callback for preg_replace_callback function
@@ -3164,7 +3159,7 @@ 
 		 * @param string $_type
 		 * @return string|boolean returns the replace
 		*/
-		$replace_callback = function ($matches) use ($_mailbox,$_uid, $_partID,  $_type)
+		$replace_callback = function($matches) use ($_mailbox, $_uid, $_partID, $_type)
 		{
 			if (!$_type)	return false;
 			$CID = '';
@@ -3186,11 +3181,11 @@ 
 					break;
 			}
 
-			static $cache = array();	// some caching, if mails containing the same image multiple times
+			static $cache = array(); // some caching, if mails containing the same image multiple times
 
 			if (is_array($matches) && $CID)
 			{
-				$linkData = array (
+				$linkData = array(
 					'menuaction'    => 'mail.mail_ui.displayImage',
 					'uid'		=> $_uid,
 					'mailbox'	=> base64_encode($_mailbox),
@@ -3203,7 +3198,7 @@ 
 				{
 					if (!isset($cache[$imageURL]))
 					{
-						if ($_type !="background")
+						if ($_type != "background")
 						{
 							$bo = Mail::getInstance(false, mail_ui::$icServerID);
 							$attachment = $bo->getAttachmentByCID($_uid, $CID, $_partID);
@@ -3244,16 +3239,16 @@ 
 		};
 
 		// return new body content base on chosen type
-		switch($_type)
+		switch ($_type)
 		{
 			case"plain":
-				return preg_replace_callback("/\[cid:(.*)\]/iU",$replace_callback,$_body);
+				return preg_replace_callback("/\[cid:(.*)\]/iU", $replace_callback, $_body);
 			case "src":
-				return preg_replace_callback("/src=(\"|\')cid:(.*)(\"|\')/iU",$replace_callback,$_body);
+				return preg_replace_callback("/src=(\"|\')cid:(.*)(\"|\')/iU", $replace_callback, $_body);
 			case "url":
-				return preg_replace_callback("/url\(cid:(.*)\);/iU",$replace_callback,$_body);
+				return preg_replace_callback("/url\(cid:(.*)\);/iU", $replace_callback, $_body);
 			case "background":
-				return preg_replace_callback("/background=(\"|\')cid:(.*)(\"|\')/iU",$replace_callback,$_body);
+				return preg_replace_callback("/background=(\"|\')cid:(.*)(\"|\')/iU", $replace_callback, $_body);
 		}
 	}
 
@@ -3261,7 +3256,7 @@ 
 	 * importMessage
 	 * @param array $content = null an array of content
 	 */
-	function importMessage($content=null)
+	function importMessage($content = null)
 	{
 		//error_log(__METHOD__.__LINE__.$this->mail_bo->getDraftFolder());
 
@@ -3283,7 +3278,7 @@ 
 			}
 			$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);
@@ -3294,32 +3289,31 @@ 
 			$importFailed = false;
 			try
 			{
-				$messageUid = $this->importMessageToFolder($file,$destination,$importID);
-			    $linkData = array
-			    (
+				$messageUid = $this->importMessageToFolder($file, $destination, $importID);
+			    $linkData = array(
 					'id' => $this->createRowID($destination, $messageUid, true),
 			    );
 			}
 			catch (Api\Exception\WrongUserinput $e)
 			{
-					$importFailed=true;
-					$content['msg']		= $e->getMessage();
+					$importFailed = true;
+					$content['msg'] = $e->getMessage();
 			}
 			if (!$importFailed)
 			{
 				list($width, $height) = explode('x', Link::get_registry('mail', 'add_popup'));
 				if ($width > 0 && $height > 0) Api\Json\Response::get()->call('resizeTo', $width, $height);
-				ExecMethod2('mail.mail_ui.displayMessage',$linkData);
+				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 (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('mail.importMessage');
-		$etpl->setElementAttribute('uploadForImport','onFinish','app.mail.uploadForImport');
-		$etpl->exec('mail.mail_ui.importMessage',$content,$sel_options,array(),array(),2);
+		$etpl->setElementAttribute('uploadForImport', 'onFinish', 'app.mail.uploadForImport');
+		$etpl->exec('mail.mail_ui.importMessage', $content, $sel_options, array(), array(), 2);
 	}
 
 	/**
@@ -3331,7 +3325,7 @@ 
 	 * @param string $importID ID for the imported message, used by attachments to identify them unambiguously
 	 * @return mixed $messageUID or exception
 	 */
-	function importMessageToFolder($_formData,&$_folder,$importID='')
+	function importMessageToFolder($_formData, &$_folder, $importID = '')
 	{
 		$importfailed = false;
 		//error_log(__METHOD__.__LINE__.array2string($_formData));
@@ -3339,7 +3333,7 @@ 
 		// check if formdata meets basic restrictions (in tmp dir, or vfs, mimetype, etc.)
 		try
 		{
-			$tmpFileName = Mail::checkFileBasics($_formData,$importID);
+			$tmpFileName = Mail::checkFileBasics($_formData, $importID);
 		}
 		catch (Api\Exception\WrongUserinput $e)
 		{
@@ -3363,29 +3357,29 @@ 
 			if (empty($_folder))
 			{
 				$importfailed = true;
-				$alert_msg .= lang("Import of message %1 failed. Destination Folder not set.",$_formData['name']);
+				$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,
 							$mailObject->getRaw(),
-							null,'\\Seen');
+							null, '\\Seen');
 					}
 					catch (Api\Exception\WrongUserinput $e)
 					{
 						$importfailed = true;
-						$alert_msg .= lang("Import of message %1 failed. Could not save message to folder %2 due to: %3",$_formData['name'],$_folder,$e->getMessage());
+						$alert_msg .= lang("Import of message %1 failed. Could not save message to folder %2 due to: %3", $_formData['name'], $_folder, $e->getMessage());
 					}
 				}
 				else
 				{
 					$importfailed = true;
-					$alert_msg .= lang("Import of message %1 failed. Destination Folder %2 does not exist.",$_formData['name'],$_folder);
+					$alert_msg .= lang("Import of message %1 failed. Destination Folder %2 does not exist.", $_formData['name'], $_folder);
 				}
 			}
 		}
@@ -3411,9 +3405,9 @@ 
 	 *								 $formData['size']	= 2136;
 	 * @return void
 	 */
-	function importMessageFromVFS2DraftAndEdit($formData='')
+	function importMessageFromVFS2DraftAndEdit($formData = '')
 	{
-		$this->importMessageFromVFS2DraftAndDisplay($formData,'edit');
+		$this->importMessageFromVFS2DraftAndDisplay($formData, 'edit');
 	}
 
 	/**
@@ -3428,7 +3422,7 @@ 
 	 * @param string $mode mode to open ImportedMessage display and edit are supported
 	 * @return void
 	 */
-	function importMessageFromVFS2DraftAndDisplay($formData='',$mode='display')
+	function importMessageFromVFS2DraftAndDisplay($formData = '', $mode = 'display')
 	{
 		if (empty($formData)) if (isset($_REQUEST['formData'])) $formData = $_REQUEST['formData'];
 		//error_log(__METHOD__.__LINE__.':'.array2string($formData).' Mode:'.$mode.'->'.function_backtrace());
@@ -3441,43 +3435,42 @@ 
 			$formData['file'] = 'egw-data://'.$formData['data'];
 		}
 		// name should be set to meet the requirements of checkFileBasics
-		if (parse_url($formData['file'],PHP_URL_SCHEME) == 'vfs' && empty($formData['name']))
+		if (parse_url($formData['file'], PHP_URL_SCHEME) == 'vfs' && empty($formData['name']))
 		{
-			$buff = explode('/',$formData['file']);
+			$buff = explode('/', $formData['file']);
 			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']))
+		if (parse_url($formData['file'], PHP_URL_SCHEME) == 'vfs' && empty($formData['type']))
 		{
-			$buff = explode('.',$formData['file']);
+			$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'] = Api\MimeMagic::ext2mime($suffix);
 		}
 		// size should be set to meet the requirements of checkFileBasics
-		if (parse_url($formData['file'],PHP_URL_SCHEME) == 'vfs' && !isset($formData['size']))
+		if (parse_url($formData['file'], PHP_URL_SCHEME) == 'vfs' && !isset($formData['size']))
 		{
 			$formData['size'] = strlen($formData['file']); // set some size, to meet requirements of checkFileBasics
 		}
 		try
 		{
-			$messageUid = $this->importMessageToFolder($formData,$draftFolder,$importID);
-			$linkData = array
-			(
-		        'menuaction'    => ($mode=='display'?'mail.mail_ui.displayMessage':'mail.mail_compose.composeFromDraft'),
-				'id'		=> $this->createRowID($draftFolder,$messageUid,true),
+			$messageUid = $this->importMessageToFolder($formData, $draftFolder, $importID);
+			$linkData = array(
+		        'menuaction'    => ($mode == 'display' ? 'mail.mail_ui.displayMessage' : 'mail.mail_compose.composeFromDraft'),
+				'id'		=> $this->createRowID($draftFolder, $messageUid, true),
 				'deleteDraftOnClose' => 1,
 			);
-			if ($mode!='display')
+			if ($mode != 'display')
 			{
 				unset($linkData['deleteDraftOnClose']);
-				$linkData['method']	='importMessageToMergeAndSend';
+				$linkData['method'] = 'importMessageToMergeAndSend';
 			}
 			else
 			{
-				$linkData['mode']=$mode;
+				$linkData['mode'] = $mode;
 			}
-			Egw::redirect_link('/index.php',$linkData);
+			Egw::redirect_link('/index.php', $linkData);
 		}
 		catch (Api\Exception\WrongUserinput $e)
 		{
@@ -3492,13 +3485,13 @@ 
 	 *
 	 * @return xajax response
 	 */
-	function loadEmailBody($_messageID=null,$_partID=null,$_htmloptions=null)
+	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::$debug) error_log(__METHOD__."->".print_r($_messageID,true).",$_partID,$_htmloptions");
+		if (Mail::$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
@@ -3512,7 +3505,7 @@ 
 			$this->changeProfile($icServerID);
 		}
 
-		$bodyResponse = $this->get_load_email_data($messageID,$_partID,$folder,$_htmloptions);
+		$bodyResponse = $this->get_load_email_data($messageID, $_partID, $folder, $_htmloptions);
 		Api\Session::cache_control(true);
 		//error_log(array2string($bodyResponse));
 		echo $bodyResponse;
@@ -3535,7 +3528,7 @@ 
 			$oA = array();
 			foreach ($_folder as $_folderName)
 			{
-				list($profileID,$folderName) = explode(self::$delimiter,$_folderName,2);
+				list($profileID, $folderName) = explode(self::$delimiter, $_folderName, 2);
 				if (is_numeric($profileID))
 				{
 					if ($profileID != $this->mail_bo->profileID) continue; // only current connection
@@ -3543,19 +3536,19 @@ 
 					{
 						try
 						{
-							$fS = $this->mail_bo->getFolderStatus($folderName,false,false,false);
+							$fS = $this->mail_bo->getFolderStatus($folderName, false, false, false);
 						}
 						catch (Exception $e)
 						{
 							continue;
 						}
-						if (in_array($fS['shortDisplayName'],Mail::$autoFolders)) $fS['shortDisplayName']=lang($fS['shortDisplayName']);
+						if (in_array($fS['shortDisplayName'], Mail::$autoFolders)) $fS['shortDisplayName'] = lang($fS['shortDisplayName']);
 						//error_log(__METHOD__.__LINE__.array2string($fS));
 						if ($fS['unseen'])
 						{
 							$oA[$_folderName] = $fS['shortDisplayName'].' ('.$fS['unseen'].')';
 						}
-						if ($fS['unseen']==0 && $fS['shortDisplayName'])
+						if ($fS['unseen'] == 0 && $fS['shortDisplayName'])
 						{
 							$oA[$_folderName] = $fS['shortDisplayName'];
 						}
@@ -3566,7 +3559,7 @@ 
 			if ($oA)
 			{
 				$response = Api\Json\Response::get();
-				$response->call('app.mail.mail_setFolderStatus',$oA);
+				$response->call('app.mail.mail_setFolderStatus', $oA);
 			}
 		}
 	}
@@ -3580,14 +3573,14 @@ 
 	function ajax_addFolder($_parentFolderName, $_newName)
 	{
 		//error_log(__METHOD__.__LINE__.' ParentFolderName:'.array2string($_parentFolderName).' NewName/Folder:'.array2string($_newName));
-		$errorMessage='';
+		$errorMessage = '';
 		if ($_parentFolderName)
 		{
 			$created = false;
 			$decodedFolderName = $this->mail_bo->decodeEntityFolderName($_parentFolderName);
 			//the conversion is handeled by horde, frontend interaction is all utf-8
 			$_newName = $this->mail_bo->decodeEntityFolderName($_newName);
-			list($profileID,$parentFolderName) = explode(self::$delimiter,$decodedFolderName,2);
+			list($profileID, $parentFolderName) = explode(self::$delimiter, $decodedFolderName, 2);
 			if (is_numeric($profileID))
 			{
 				if ($profileID != $this->mail_bo->profileID) return; // only current connection
@@ -3627,10 +3620,10 @@ 
 
 				if (empty($del)) $del = $this->mail_bo->getHierarchyDelimiter(false);
 				*/
-				$nA = explode($del,$_newName);
+				$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');
@@ -3638,11 +3631,11 @@ 
 				// if newName has delimiter ($del) in it, we need to create the subtree
 				if (!empty($nA))
 				{
-					$c=0;
-					foreach($nA as $sTName)
+					$c = 0;
+					foreach ($nA as $sTName)
 					{
-						$error=null;
-						if(($parentFolderName = $this->mail_bo->createFolder($parentFolderName, $sTName, $error)))
+						$error = null;
+						if (($parentFolderName = $this->mail_bo->createFolder($parentFolderName, $sTName, $error)))
 						{
 							$c++;
 						}
@@ -3651,16 +3644,16 @@ 
 							$errorMessage .= $error;
 						}
 					}
-					if ($c==count($nA)) $created=true;
+					if ($c == count($nA)) $created = true;
 				}
 				if (!empty($parentName)) $this->mail_bo->reopen($parentName);
 			}
 			//error_log(__METHOD__.__LINE__.array2string($oA));
-			if ($created===true)
+			if ($created === true)
 			{
 				$this->mail_bo->resetFolderObjectCache($profileID);
 				$response = Api\Json\Response::get();
-				if ( $oldFolderInfo['shortDisplayName'])
+				if ($oldFolderInfo['shortDisplayName'])
 				{
 					$nodeInfo = array($_parentFolderName=>$oldFolderInfo['shortDisplayName']);
 				}
@@ -3668,14 +3661,14 @@ 
 				{
 					$nodeInfo = array($profileID=>lang('INBOX'));
 				}
-				$response->call('app.mail.mail_reloadNode',$nodeInfo);
+				$response->call('app.mail.mail_reloadNode', $nodeInfo);
 			}
 			else
 			{
 				if ($errorMessage)
 				{
 					$response = Api\Json\Response::get();
-					$response->call('egw.message',$errorMessage);
+					$response->call('egw.message', $errorMessage);
 				}
 			}
 		}
@@ -3697,22 +3690,22 @@ 
 			$_newName = $this->mail_bo->decodeEntityFolderName($_newName);
 			$del = $this->mail_bo->getHierarchyDelimiter(false);
 			$oA = array();
-			list($profileID,$folderName) = explode(self::$delimiter,$decodedFolderName,2);
+			list($profileID, $folderName) = explode(self::$delimiter, $decodedFolderName, 2);
 			$hasChildren = false;
 			if (is_numeric($profileID))
 			{
 				if ($profileID != $this->mail_bo->profileID) return; // only current connection
-				$pA = explode($del,$folderName);
+				$pA = explode($del, $folderName);
 				array_pop($pA);
-				$parentFolder = implode($del,$pA);
-				if (strtoupper($folderName)!= 'INBOX')
+				$parentFolder = implode($del, $pA);
+				if (strtoupper($folderName) != 'INBOX')
 				{
 					//error_log(__METHOD__.__LINE__."$folderName, $parentFolder, $_newName");
-					$oldFolderInfo = $this->mail_bo->getFolderStatus($folderName,false);
+					$oldFolderInfo = $this->mail_bo->getFolderStatus($folderName, false);
 					//error_log(__METHOD__.__LINE__.array2string($oldFolderInfo));
-					if (!empty($oldFolderInfo['attributes']) && stripos(array2string($oldFolderInfo['attributes']),'\hasnochildren')=== false)
+					if (!empty($oldFolderInfo['attributes']) && stripos(array2string($oldFolderInfo['attributes']), '\hasnochildren') === false)
 					{
-						$hasChildren=true; // translates to: hasChildren -> dynamicLoading
+						$hasChildren = true; // translates to: hasChildren -> dynamicLoading
 						$delimiter = $this->mail_bo->getHierarchyDelimiter();
 						$nameSpace = $this->mail_bo->_getNameSpaces();
 						$prefix = $this->mail_bo->getFolderPrefixFromNamespace($nameSpace, $folderName);
@@ -3729,7 +3722,7 @@ 
 							else
 							{
 								$rv = $this->mail_bo->icServer->subscribeMailbox($folder, false);
-								$fragments[$profileID.self::$delimiter.$folder] = substr($folder,strlen($folderName));
+								$fragments[$profileID.self::$delimiter.$folder] = substr($folder, strlen($folderName));
 							}
 						}
 						//error_log(__METHOD__.__LINE__.' Fetched Subfolders->'.array2string($fragments));
@@ -3739,7 +3732,7 @@ 
 					$success = false;
 					try
 					{
-						if(($newFolderName = $this->mail_bo->renameFolder($folderName, $parentFolder, $_newName)))
+						if (($newFolderName = $this->mail_bo->renameFolder($folderName, $parentFolder, $_newName)))
 						{
 							$this->mail_bo->resetFolderObjectCache($profileID);
 							//enforce the subscription to the newly named server, as it seems to fail for names with umlauts
@@ -3750,11 +3743,11 @@ 
 					}
 					catch (Exception $e)
 					{
-						$newFolderName=$folderName;
+						$newFolderName = $folderName;
 						$msg = $e->getMessage();
 					}
 					$this->mail_bo->reopen($newFolderName);
-					$fS = $this->mail_bo->getFolderStatus($newFolderName,false);
+					$fS = $this->mail_bo->getFolderStatus($newFolderName, false);
 					//error_log(__METHOD__.__LINE__.array2string($fS));
 					if ($hasChildren)
 					{
@@ -3785,12 +3778,12 @@ 
 					{
 						$oA[$_folderName]['desc'] = $fS['shortDisplayName'];
 					}
-					foreach($fragments as $oldFolderName => $fragment)
+					foreach ($fragments as $oldFolderName => $fragment)
 					{
 						//error_log(__METHOD__.__LINE__.':'.$oldFolderName.'->'.$profileID.self::$delimiter.$newFolderName.$fragment);
 						$oA[$oldFolderName]['id'] = $profileID.self::$delimiter.$newFolderName.$fragment;
 						$oA[$oldFolderName]['olddesc'] = '#skip-user-interaction-message#';
-						$fS = $this->mail_bo->getFolderStatus($newFolderName.$fragment,false);
+						$fS = $this->mail_bo->getFolderStatus($newFolderName.$fragment, false);
 						if ($fS['unseen'])
 						{
 							$oA[$oldFolderName]['desc'] = $fS['shortDisplayName'].' ('.$fS['unseen'].')';
@@ -3803,20 +3796,20 @@ 
 					}
 				}
 			}
-			if ($folderName==$this->mail_bo->sessionData['mailbox'])
+			if ($folderName == $this->mail_bo->sessionData['mailbox'])
 			{
-				$this->mail_bo->sessionData['mailbox']=$newFolderName;
+				$this->mail_bo->sessionData['mailbox'] = $newFolderName;
 				$this->mail_bo->saveSessionData();
 			}
 			//error_log(__METHOD__.__LINE__.array2string($oA));
 			$response = Api\Json\Response::get();
 			if ($oA && $success)
 			{
-				$response->call('app.mail.mail_setLeaf',$oA);
+				$response->call('app.mail.mail_setLeaf', $oA);
 			}
 			else
 			{
-				$response->call('egw.refresh',lang('failed to rename %1 ! Reason: %2',$oldFolderName,$msg),'mail');
+				$response->call('egw.refresh', lang('failed to rename %1 ! Reason: %2', $oldFolderName, $msg), 'mail');
 			}
 		}
 	}
@@ -3828,7 +3821,7 @@ 
 	 * @param boolean $_subscribedOnly = true
 	 * @return void
 	 */
-	function ajax_reloadNode($_folderName,$_subscribedOnly=true)
+	function ajax_reloadNode($_folderName, $_subscribedOnly = true)
 	{
 		Api\Translation::add_app('mail');
 		$oldPrefForSubscribedOnly = !$this->mail_bo->mailPreferences['showAllFoldersInFolderPane'];
@@ -3839,20 +3832,20 @@ 
 
 		$decodedFolderName = $this->mail_bo->decodeEntityFolderName($_folderName);
 		$this->mail_bo->getHierarchyDelimiter(false);
-		list($profileID,$folderName) = explode(self::$delimiter,$decodedFolderName,2);
+		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 (!empty($folderName))
 		{
-			$parentFolder=(!empty($folderName)?$folderName:'INBOX');
-			$folderInfo = $this->mail_bo->getFolderStatus($parentFolder,false,false,false);
+			$parentFolder = (!empty($folderName) ? $folderName : 'INBOX');
+			$folderInfo = $this->mail_bo->getFolderStatus($parentFolder, false, false, false);
 			if ($folderInfo['unseen'])
 			{
 				$folderInfo['shortDisplayName'] = $folderInfo['shortDisplayName'].' ('.$folderInfo['unseen'].')';
 			}
-			if ($folderInfo['unseen']==0 && $folderInfo['shortDisplayName'])
+			if ($folderInfo['unseen'] == 0 && $folderInfo['shortDisplayName'])
 			{
 				$folderInfo['shortDisplayName'] = $folderInfo['shortDisplayName'];
 			}
@@ -3868,11 +3861,11 @@ 
 		}
 		// Send full info back in the response
 		$response = Api\Json\Response::get();
-		foreach($refreshData as $folder => &$name)
+		foreach ($refreshData as $folder => &$name)
 		{
-			$name = $this->mail_tree->getTree($folder,$profileID,1,false, $_subscribedOnly,true);
+			$name = $this->mail_tree->getTree($folder, $profileID, 1, false, $_subscribedOnly, true);
 		}
-		$response->call('app.mail.mail_reloadNode',$refreshData);
+		$response->call('app.mail.mail_reloadNode', $refreshData);
 
 	}
 
@@ -3888,7 +3881,7 @@ 
 	 * @param type $_rowid row id from nm
 	 *
 	 */
-	function ajax_resolveWinmail ($_rowid)
+	function ajax_resolveWinmail($_rowid)
 	{
 		$response = Api\Json\Response::get();
 
@@ -3896,7 +3889,7 @@ 
 		$uid = $idParts['msgUID'];
 		$mbox = $idParts['folder'];
 
-		$attachments = $this->mail_bo->getMessageAttachments($uid, null, null, false,true,true,$mbox);
+		$attachments = $this->mail_bo->getMessageAttachments($uid, null, null, false, true, true, $mbox);
 		if (is_array($attachments))
 		{
 			$attachments = $this->createAttachmentBlock($attachments, $_rowid, $uid, $mbox, false);
@@ -3924,30 +3917,30 @@ 
 			$decodedFolderName = $this->mail_bo->decodeEntityFolderName($_folderName);
 			$_newLocation2 = $this->mail_bo->decodeEntityFolderName($_target);
 			$del = $this->mail_bo->getHierarchyDelimiter(false);
-			list($profileID,$folderName) = explode(self::$delimiter,$decodedFolderName,2);
-			list($newProfileID,$_newLocation) = explode(self::$delimiter,$_newLocation2,2);
+			list($profileID, $folderName) = explode(self::$delimiter, $decodedFolderName, 2);
+			list($newProfileID, $_newLocation) = explode(self::$delimiter, $_newLocation2, 2);
 			$hasChildren = false;
 			if (is_numeric($profileID))
 			{
 				if ($profileID != $this->mail_bo->profileID || $profileID != $newProfileID) return; // only current connection
-				$pA = explode($del,$folderName);
+				$pA = explode($del, $folderName);
 				$namePart = array_pop($pA);
 				$_newName = $namePart;
-				$oldParentFolder = implode($del,$pA);
+				$oldParentFolder = implode($del, $pA);
 				$parentFolder = $_newLocation;
 
-				if (strtoupper($folderName)!= 'INBOX' &&
+				if (strtoupper($folderName) != 'INBOX' &&
 					(($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
+					strlen($parentFolder) > 0 && strlen($folderName) > 0 &&
+					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);
+					$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)
+					if (!empty($oldFolderInfo['attributes']) && stripos(array2string($oldFolderInfo['attributes']), '\hasnochildren') === false)
 					{
-						$hasChildren=true; // translates to: hasChildren -> dynamicLoading
+						$hasChildren = true; // translates to: hasChildren -> dynamicLoading
 						$delimiter = $this->mail_bo->getHierarchyDelimiter();
 						$nameSpace = $this->mail_bo->_getNameSpaces();
 						$prefix = $this->mail_bo->getFolderPrefixFromNamespace($nameSpace, $folderName);
@@ -3972,7 +3965,7 @@ 
 					$success = false;
 					try
 					{
-						if(($newFolderName = $this->mail_bo->renameFolder($folderName, $parentFolder, $_newName)))
+						if (($newFolderName = $this->mail_bo->renameFolder($folderName, $parentFolder, $_newName)))
 						{
 							$this->mail_bo->resetFolderObjectCache($profileID);
 							//enforce the subscription to the newly named server, as it seems to fail for names with umlauts
@@ -3984,11 +3977,11 @@ 
 					}
 					catch (Exception $e)
 					{
-						$newFolderName=$folderName;
+						$newFolderName = $folderName;
 						$msg = $e->getMessage();
 					}
 					$this->mail_bo->reopen($parentFolder);
-					$this->mail_bo->getFolderStatus($parentFolder,false,false,false);
+					$this->mail_bo->getFolderStatus($parentFolder, false, false, false);
 					//error_log(__METHOD__.__LINE__.array2string($fS));
 					if ($hasChildren)
 					{
@@ -4009,9 +4002,9 @@ 
 					}
 				}
 			}
-			if ($folderName==$this->mail_bo->sessionData['mailbox'])
+			if ($folderName == $this->mail_bo->sessionData['mailbox'])
 			{
-				$this->mail_bo->sessionData['mailbox']=$newFolderName;
+				$this->mail_bo->sessionData['mailbox'] = $newFolderName;
 				$this->mail_bo->saveSessionData();
 			}
 			//error_log(__METHOD__.__LINE__.array2string($oA));
@@ -4020,26 +4013,26 @@ 
 			{
 				Api\Translation::add_app('mail');
 
-				$oldFolderInfo = $this->mail_bo->getFolderStatus($oldParentFolder,false,false,false);
-				$folderInfo = $this->mail_bo->getFolderStatus($parentFolder,false,false,false);
+				$oldFolderInfo = $this->mail_bo->getFolderStatus($oldParentFolder, false, false, false);
+				$folderInfo = $this->mail_bo->getFolderStatus($parentFolder, false, false, false);
 				$refreshData = array(
 					$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)
+				foreach ($refreshData as $folder => &$name)
 				{
-					$name = $this->mail_tree->getTree($folder,$profileID,1,false,!$this->mail_bo->mailPreferences['showAllFoldersInFolderPane'],true);
+					$name = $this->mail_tree->getTree($folder, $profileID, 1, false, !$this->mail_bo->mailPreferences['showAllFoldersInFolderPane'], true);
 				}
-				$response->call('app.mail.mail_reloadNode',$refreshData);
+				$response->call('app.mail.mail_reloadNode', $refreshData);
 
 			}
 			else
 			{
-				$response->call('egw.refresh',lang('failed to move %1 ! Reason: %2',$folderName,$msg),'mail');
+				$response->call('egw.refresh', lang('failed to move %1 ! Reason: %2', $folderName, $msg), 'mail');
 			}
 		}
 	}
@@ -4059,23 +4052,23 @@ 
 			$decodedFolderName = $this->mail_bo->decodeEntityFolderName($_folderName);
 			$del = $this->mail_bo->getHierarchyDelimiter(false);
 			$oA = array();
-			list($profileID,$folderName) = explode(self::$delimiter,$decodedFolderName,2);
+			list($profileID, $folderName) = explode(self::$delimiter, $decodedFolderName, 2);
 			$hasChildren = false;
 			if (is_numeric($profileID))
 			{
 				if ($profileID != $this->mail_bo->profileID) return; // only current connection
-				$pA = explode($del,$folderName);
+				$pA = explode($del, $folderName);
 				array_pop($pA);
-				if (strtoupper($folderName)!= 'INBOX')
+				if (strtoupper($folderName) != 'INBOX')
 				{
 					//error_log(__METHOD__.__LINE__."$folderName,  implode($del,$pA), $_newName");
 					$oA = array();
 					$subFolders = array();
-					$oldFolderInfo = $this->mail_bo->getFolderStatus($folderName,false,false,false);
+					$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)
+					if (!empty($oldFolderInfo['attributes']) && stripos(array2string($oldFolderInfo['attributes']), '\hasnochildren') === false)
 					{
-						$hasChildren=true; // translates to: hasChildren -> dynamicLoading
+						$hasChildren = true; // translates to: hasChildren -> dynamicLoading
 						$ftD = array();
 						$delimiter = $this->mail_bo->getHierarchyDelimiter();
 						$nameSpace = $this->mail_bo->_getNameSpaces();
@@ -4085,24 +4078,24 @@ 
 						//error_log(__METHOD__.__LINE__.'->'."$folderName, $delimiter, $prefix");
 						foreach ($subFolders as $k => $f)
 						{
-							$ftD[substr_count($f,$delimiter)][]=$f;
+							$ftD[substr_count($f, $delimiter)][] = $f;
 						}
-						krsort($ftD,SORT_NUMERIC);//sort per level
+						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 $f)//folders contained in that level
+							foreach ($lc as $f)//folders contained in that level
 							{
 								try
 								{
 									//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)
 								{
-									$msg .= ($msg?' ':'').lang("Failed to delete %1. Server responded:",$f).$e->getMessage();
+									$msg .= ($msg ? ' ' : '').lang("Failed to delete %1. Server responded:", $f).$e->getMessage();
 									$success = false;
 								}
 							}
@@ -4133,11 +4126,11 @@ 
 			if ($success)
 			{
 				//error_log(__METHOD__.__LINE__.array2string($oA));
-				$response->call('app.mail.mail_removeLeaf',$oA);
+				$response->call('app.mail.mail_removeLeaf', $oA);
 			}
 			else
 			{
-				$response->call('egw.refresh',lang('failed to delete %1 ! Reason: %2',$oldFolderInfo['shortDisplayName'],$msg),'mail');
+				$response->call('egw.refresh', lang('failed to delete %1 ! Reason: %2', $oldFolderInfo['shortDisplayName'], $msg), 'mail');
 			}
 		}
 	}
@@ -4151,7 +4144,7 @@ 
 	 * @param bool $getFolders The client needs the folders for the profile
 	 * @return nothing
 	 */
-	public static function ajax_changeProfile($icServerID, $getFolders = true, $exec_id=null)
+	public static function ajax_changeProfile($icServerID, $getFolders = true, $exec_id = null)
 	{
 		$response = Api\Json\Response::get();
 
@@ -4159,7 +4152,7 @@ 
 
 		if ($icServerID && $icServerID != $previous_id)
 		{
-			$mail_ui = new mail_ui(false);	// do NOT run constructor, as we call changeProfile anyway
+			$mail_ui = new mail_ui(false); // do NOT run constructor, as we call changeProfile anyway
 			try
 			{
 				$mail_ui->changeProfile($icServerID);
@@ -4175,23 +4168,23 @@ 
 				}
 			}
 			catch (Exception $e) {
-				self::callWizard($e->getMessage(),true, 'error');
+				self::callWizard($e->getMessage(), true, 'error');
 			}
 		}
 		else
 		{
-			$mail_ui = new mail_ui(true);	// run constructor
+			$mail_ui = new mail_ui(true); // run constructor
 		}
 
 		// Send full info back in the response
-		if($getFolders)
+		if ($getFolders)
 		{
 			Api\Translation::add_app('mail');
 
 			$refreshData = array(
-				$icServerID => $mail_ui->mail_tree->getTree(null,$icServerID,1,false,!$mail_ui->mail_bo->mailPreferences['showAllFoldersInFolderPane'],!$mail_ui->mail_bo->mailPreferences['showAllFoldersInFolderPane'])
+				$icServerID => $mail_ui->mail_tree->getTree(null, $icServerID, 1, false, !$mail_ui->mail_bo->mailPreferences['showAllFoldersInFolderPane'], !$mail_ui->mail_bo->mailPreferences['showAllFoldersInFolderPane'])
 			);
-			$response->call('app.mail.mail_reloadNode',$refreshData);
+			$response->call('app.mail.mail_reloadNode', $refreshData);
 		}
 	}
 
@@ -4202,7 +4195,7 @@ 
 	 *						if other than active profile; nothing is done!
 	 * @return nothing
 	 */
-	public static function ajax_refreshVacationNotice($icServerID=null)
+	public static function ajax_refreshVacationNotice($icServerID = null)
 	{
 		//Get vacation from cache if it's available
 		$cachedVacations = Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'vacationNotice'.$GLOBALS['egw_info']['user']['account_lid']);
@@ -4220,28 +4213,28 @@ 
 
 				$vacation = $mail->gatherVacation($cachedVacations);
 			} catch (Exception $e) {
-				$vacation=false;
+				$vacation = false;
 				error_log(__METHOD__.__LINE__." ".$e->getMessage());
 				unset($e);
 			}
 		}
 
-		if($vacation) {
-			if (is_array($vacation) && ($vacation['status'] == 'on' || $vacation['status']=='by_date'))
+		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'? Api\DateTime::server2user($vacation['start_date'],$dtfrmt,true).($vacation['end_date']>$vacation['start_date']?'->'.Api\DateTime::server2user($vacation['end_date']+ 24*3600-1,$dtfrmt,true):''):'');
-				if ($vacation['status'] == 'by_date' && $vacation['end_date']+ 24*3600 < time())$refreshData = '';
+				$refreshData['vacationrange'] = ($vacation['status'] == 'by_date' ? Api\DateTime::server2user($vacation['start_date'], $dtfrmt, true).($vacation['end_date'] > $vacation['start_date'] ? '->'.Api\DateTime::server2user($vacation['end_date'] + 24 * 3600 - 1, $dtfrmt, true) : '') : '');
+				if ($vacation['status'] == 'by_date' && $vacation['end_date'] + 24 * 3600 < time())$refreshData = '';
 			}
 		}
-		if ($vacation==false)
+		if ($vacation == false)
 		{
-			$refreshData['vacationnotice'] =  '';
-			$refreshData['vacationrange'] =  '';
+			$refreshData['vacationnotice'] = '';
+			$refreshData['vacationrange'] = '';
 		}
 		$response = Api\Json\Response::get();
-		$response->call('app.mail.mail_refreshVacationNotice',$refreshData);
+		$response->call('app.mail.mail_refreshVacationNotice', $refreshData);
 	}
 
 	/**
@@ -4251,43 +4244,43 @@ 
 	 *						if other than active profile; nothing is done!
 	 * @return nothing
 	 */
-	function ajax_refreshFilters($icServerID=null)
+	function ajax_refreshFilters($icServerID = null)
 	{
 		//error_log(__METHOD__.__LINE__.array2string($icServerId));
 		if (empty($icServerID)) $icServerID = $this->mail_bo->profileID;
 		if (is_null(Mail::$supportsORinQuery) || !isset(Mail::$supportsORinQuery[$this->mail_bo->profileID]))
 		{
-			Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-			if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID]=true;
+			Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 10);
+			if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID] = true;
 		}
 		if (!Mail::$supportsORinQuery[$this->mail_bo->profileID])
 		{
 			unset($this->searchTypes['quick']);
 			unset($this->searchTypes['quickwithcc']);
 		}
-		if ( $this->mail_bo->icServer->hasCapability('SUPPORTS_KEYWORDS'))
+		if ($this->mail_bo->icServer->hasCapability('SUPPORTS_KEYWORDS'))
 		{
-			$this->statusTypes = array_merge($this->statusTypes,array(
-				'keyword1'	=> 'important',//lang('important'),
-				'keyword2'	=> 'job',	//lang('job'),
-				'keyword3'	=> 'personal',//lang('personal'),
-				'keyword4'	=> 'to do',	//lang('to do'),
-				'keyword5'	=> 'later',	//lang('later'),
+			$this->statusTypes = array_merge($this->statusTypes, array(
+				'keyword1'	=> 'important', //lang('important'),
+				'keyword2'	=> 'job', //lang('job'),
+				'keyword3'	=> 'personal', //lang('personal'),
+				'keyword4'	=> 'to do', //lang('to do'),
+				'keyword5'	=> 'later', //lang('later'),
 			));
 		}
 		else
 		{
-			$keywords = array('keyword1','keyword2','keyword3','keyword4','keyword5');
-			foreach($keywords as &$k)
+			$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]);
 			}
 		}
 
 		$response = Api\Json\Response::get();
-		$response->call('app.mail.mail_refreshCatIdOptions',$this->searchTypes);
-		$response->call('app.mail.mail_refreshFilterOptions',$this->statusTypes);
-		$response->call('app.mail.mail_refreshFilter2Options',array(''=>lang('No details'),1=>lang('Details')));
+		$response->call('app.mail.mail_refreshCatIdOptions', $this->searchTypes);
+		$response->call('app.mail.mail_refreshFilterOptions', $this->statusTypes);
+		$response->call('app.mail.mail_refreshFilter2Options', array(''=>lang('No details'), 1=>lang('Details')));
 
 	}
 
@@ -4296,7 +4289,7 @@ 
 	 *
 	 * @return nothing
 	 */
-	function ajax_refreshQuotaDisplay($icServerID=null)
+	function ajax_refreshQuotaDisplay($icServerID = null)
 	{
 		//error_log(__METHOD__.__LINE__.array2string($icServerID));
 		Api\Translation::add_app('mail');
@@ -4316,10 +4309,10 @@ 
 			unset($e);
 		}
 
-		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['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 {
@@ -4339,7 +4332,7 @@ 
 			}
 		}
 		$response = Api\Json\Response::get();
-		$response->call('app.mail.mail_setQuotaDisplay',array('data'=>$content));
+		$response->call('app.mail.mail_setQuotaDisplay', array('data'=>$content));
 	}
 
 	/**
@@ -4361,34 +4354,34 @@ 
 			$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
 				$response->call('app.mail.lock_tree');
 			}
-			$this->mail_bo->deleteMessages('all',$junkFolder,'remove_immediately');
+			$this->mail_bo->deleteMessages('all', $junkFolder, 'remove_immediately');
 
 			$heirarchyDelimeter = $this->mail_bo->getHierarchyDelimiter(true);
-			$fShortName =  array_pop(explode($heirarchyDelimeter, $junkFolder));
+			$fShortName = array_pop(explode($heirarchyDelimeter, $junkFolder));
 			$fStatus = array(
 				$icServerID.self::$delimiter.$junkFolder => lang($fShortName)
 			);
 			//Call to reset folder status counter, after junkFolder triggered not from Junk folder
 			//-as we don't have junk folder specific information available on client-side we need to deal with it on server
-			$response->call('app.mail.mail_setFolderStatus',$fStatus);
+			$response->call('app.mail.mail_setFolderStatus', $fStatus);
 		}
 		if ($rememberServerID != $this->mail_bo->profileID)
 		{
-			$oldFolderInfo = $this->mail_bo->getFolderStatus($junkFolder,false,false,false);
-			$response->call('egw.message',lang('empty junk'));
-			$response->call('app.mail.mail_reloadNode',array($icServerID.self::$delimiter.$junkFolder=>$oldFolderInfo['shortDisplayName']));
+			$oldFolderInfo = $this->mail_bo->getFolderStatus($junkFolder, false, false, false);
+			$response->call('egw.message', lang('empty junk'));
+			$response->call('app.mail.mail_reloadNode', array($icServerID.self::$delimiter.$junkFolder=>$oldFolderInfo['shortDisplayName']));
 			//error_log(__METHOD__.__LINE__.' change Profile to ->'.$rememberServerID);
 			$this->changeProfile($rememberServerID);
 		}
 		else if ($selectedFolder == $icServerID.self::$delimiter.$junkFolder)
 		{
-			$response->call('egw.refresh',lang('empty junk'),'mail');
+			$response->call('egw.refresh', lang('empty junk'), 'mail');
 		}
 	}
 
@@ -4411,7 +4404,7 @@ 
 			$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
@@ -4420,25 +4413,25 @@ 
 			$this->mail_bo->compressFolder($trashFolder);
 
 			$heirarchyDelimeter = $this->mail_bo->getHierarchyDelimiter(true);
-			$fShortName =  array_pop(explode($heirarchyDelimeter, $trashFolder));
+			$fShortName = array_pop(explode($heirarchyDelimeter, $trashFolder));
 			$fStatus = array(
 				$icServerID.self::$delimiter.$trashFolder => lang($fShortName)
 			);
 			//Call to reset folder status counter, after emptyTrash triggered not from Trash folder
 			//-as we don't have trash folder specific information available on client-side we need to deal with it on server
-			$response->call('app.mail.mail_setFolderStatus',$fStatus);
+			$response->call('app.mail.mail_setFolderStatus', $fStatus);
 		}
 		if ($rememberServerID != $this->mail_bo->profileID)
 		{
-			$oldFolderInfo = $this->mail_bo->getFolderStatus($trashFolder,false,false,false);
-			$response->call('egw.message',lang('empty trash'));
-			$response->call('app.mail.mail_reloadNode',array($icServerID.self::$delimiter.$trashFolder=>$oldFolderInfo['shortDisplayName']));
+			$oldFolderInfo = $this->mail_bo->getFolderStatus($trashFolder, false, false, false);
+			$response->call('egw.message', lang('empty trash'));
+			$response->call('app.mail.mail_reloadNode', array($icServerID.self::$delimiter.$trashFolder=>$oldFolderInfo['shortDisplayName']));
 			//error_log(__METHOD__.__LINE__.' change Profile to ->'.$rememberServerID);
 			$this->changeProfile($rememberServerID);
 		}
 		else if ($selectedFolder == $icServerID.self::$delimiter.$trashFolder)
 		{
-			$response->call('egw.refresh',lang('empty trash'),'mail');
+			$response->call('egw.refresh', lang('empty trash'), 'mail');
 		}
 	}
 
@@ -4455,7 +4448,7 @@ 
 
 		$this->mail_bo->restoreSessionData();
 		$decodedFolderName = $this->mail_bo->decodeEntityFolderName($_folderName);
-		list($icServerID,$folderName) = explode(self::$delimiter,$decodedFolderName,2);
+		list($icServerID, $folderName) = explode(self::$delimiter, $decodedFolderName, 2);
 
 		if (empty($folderName)) $folderName = $this->mail_bo->sessionData['mailbox'];
 		if ($this->mail_bo->folderExists($folderName))
@@ -4466,7 +4459,7 @@ 
 				//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)
@@ -4475,7 +4468,7 @@ 
 				$this->changeProfile($rememberServerID);
 			}
 			$response = Api\Json\Response::get();
-			$response->call('egw.refresh',lang('compress folder').': '.$folderName,'mail');
+			$response->call('egw.refresh', lang('compress folder').': '.$folderName, 'mail');
 		}
 	}
 
@@ -4488,10 +4481,10 @@ 
 	 */
 	function ajax_sendMDN($_messageList)
 	{
-		if(Mail::$debug) error_log(__METHOD__."->".array2string($_messageList));
+		if (Mail::$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);
+		$this->mail_bo->sendMDN($uidA['msgUID'], $folder);
 	}
 
 	/**
@@ -4503,14 +4496,14 @@ 
 	 *
 	 * @return xajax response
 	 */
-	function ajax_flagMessages($_flag, $_messageList, $_sendJsonResponse=true)
+	function ajax_flagMessages($_flag, $_messageList, $_sendJsonResponse = true)
 	{
-		if(Mail::$debug) error_log(__METHOD__."->".$_flag.':'.array2string($_messageList));
+		if (Mail::$debug) error_log(__METHOD__."->".$_flag.':'.array2string($_messageList));
 		Api\Translation::add_app('mail');
-		$alreadyFlagged=false;
-		$flag2check='';
+		$alreadyFlagged = false;
+		$flag2check = '';
 		$filter2toggle = $query = array();
-		if ($_messageList=='all' || !empty($_messageList['msg']))
+		if ($_messageList == 'all' || !empty($_messageList['msg']))
 		{
 			if (isset($_messageList['all']) && $_messageList['all'])
 			{
@@ -4520,34 +4513,34 @@ 
 				if (isset($_messageList['activeFilters']) && $_messageList['activeFilters'])
 				{
 					$query = $_messageList['activeFilters'];
-					if (!empty($query['search']) || !empty($query['filter'])||($query['cat_id']=='bydate' && (!empty($query['startdate'])||!empty($query['enddate']))))
+					if (!empty($query['search']) || !empty($query['filter']) || ($query['cat_id'] == 'bydate' && (!empty($query['startdate']) || !empty($query['enddate']))))
 					{
 						//([filterName] => Schnellsuche[type] => quick[string] => ebay[status] => any
 						if (is_null(Mail::$supportsORinQuery) || !isset(Mail::$supportsORinQuery[$this->mail_bo->profileID]))
 						{
-							Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-							if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID]=true;
+							Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 10);
+							if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID] = true;
 						}
 						//error_log(__METHOD__.__LINE__.' Startdate:'.$query['startdate'].' Enddate'.$query['enddate']);
 						$cutoffdate = $cutoffdate2 = null;
-						if ($query['startdate']) $cutoffdate = Api\DateTime::to($query['startdate'],'ts');//SINCE, enddate
-						if ($query['enddate']) $cutoffdate2 = Api\DateTime::to($query['enddate'],'ts');//BEFORE, startdate
+						if ($query['startdate']) $cutoffdate = Api\DateTime::to($query['startdate'], 'ts'); //SINCE, enddate
+						if ($query['enddate']) $cutoffdate2 = Api\DateTime::to($query['enddate'], 'ts'); //BEFORE, startdate
 						//error_log(__METHOD__.__LINE__.' Startdate:'.$cutoffdate2.' Enddate'.$cutoffdate);
 						$filter = array(
-							'filterName' => (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?lang('quicksearch'):lang('subject')),
-							'type' => ($query['cat_id']?$query['cat_id']:(Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?'quick':'subject')),
+							'filterName' => (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID] ? lang('quicksearch') : lang('subject')),
+							'type' => ($query['cat_id'] ? $query['cat_id'] : (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID] ? 'quick' : 'subject')),
 							'string' => $query['search'],
-							'status' => 'any',//this is a status change. status will be manipulated later on
+							'status' => 'any', //this is a status change. status will be manipulated later on
 							//'range'=>"BETWEEN",'since'=> date("d-M-Y", $cutoffdate),'before'=> date("d-M-Y", $cutoffdate2)
 						);
-						if ($query['enddate']||$query['startdate']) {
+						if ($query['enddate'] || $query['startdate']) {
 							$filter['range'] = "BETWEEN";
 							if ($cutoffdate) {
-								$filter[(empty($cutoffdate2)?'date':'since')] =  date("d-M-Y", $cutoffdate);
+								$filter[(empty($cutoffdate2) ? 'date' : 'since')] = date("d-M-Y", $cutoffdate);
 								if (empty($cutoffdate2)) $filter['range'] = "SINCE";
 							}
 							if ($cutoffdate2) {
-								$filter[(empty($cutoffdate)?'date':'before')] =  date("d-M-Y", $cutoffdate2);
+								$filter[(empty($cutoffdate) ? 'date' : 'before')] = date("d-M-Y", $cutoffdate2);
 								if (empty($cutoffdate)) $filter['range'] = "BEFORE";
 							}
 						}
@@ -4560,12 +4553,12 @@ 
 					// flags read,flagged,label1,label2,label3,label4,label5 can be toggled: handle this when all mails in a folder
 					// should be affected serverside. here.
 					$messageList = $messageListForToggle = array();
-					$flag2check = ($_flag=='read'?'seen':$_flag);
-					if (in_array($_flag,array('read','flagged','label1','label2','label3','label4','label5')) &&
-						!($flag2check==$query['filter'] || stripos($query['filter'],$flag2check)!==false))
+					$flag2check = ($_flag == 'read' ? 'seen' : $_flag);
+					if (in_array($_flag, array('read', 'flagged', 'label1', 'label2', 'label3', 'label4', 'label5')) &&
+						!($flag2check == $query['filter'] || stripos($query['filter'], $flag2check) !== false))
 					{
 						$filter2toggle['status'] = array('un'.$_flag);
-						if ($query['filter'] && $query['filter']!='any')
+						if ($query['filter'] && $query['filter'] != 'any')
 						{
 							$filter2toggle['status'][] = $query['filter'];
 						}
@@ -4573,7 +4566,7 @@ 
 						$reverse = 1;
 						$_sRt = $this->mail_bo->getSortedList(
 							$folder,
-							$sort=0,
+							$sort = 0,
 							$reverse,
 							$filter2toggle,
 							$rByUid,
@@ -4581,52 +4574,52 @@ 
 						);
 						$messageListForToggle = $_sRt['match']->ids;
 						$filter['status'] = array($_flag);
-						if ($query['filter'] && $query['filter'] !='any')
+						if ($query['filter'] && $query['filter'] != 'any')
 						{
 							$filter['status'][] = $query['filter'];
 						}
-						$rByUid=true;
+						$rByUid = true;
 						$reverse = 1;
 						$_sR = $this->mail_bo->getSortedList(
 							$folder,
-							$sort=0,
+							$sort = 0,
 							$reverse,
 							$filter,
 							$rByUid,
 							false
 						);
 						$messageList = $_sR['match']->ids;
-						if (count($messageListForToggle)>0)
+						if (count($messageListForToggle) > 0)
 						{
 							$flag2set = (strtolower($_flag));
-							if(Mail::$debug) error_log(__METHOD__.__LINE__." toggle un$_flag -> $flag2set ".array2string($filter2toggle).array2string($messageListForToggle));
-							$this->mail_bo->flagMessages($flag2set, $messageListForToggle,$folder);
+							if (Mail::$debug) error_log(__METHOD__.__LINE__." toggle un$_flag -> $flag2set ".array2string($filter2toggle).array2string($messageListForToggle));
+							$this->mail_bo->flagMessages($flag2set, $messageListForToggle, $folder);
 						}
-						if (count($messageList)>0)
+						if (count($messageList) > 0)
 						{
 							$flag2set = 'un'.$_flag;
-							if(Mail::$debug) error_log(__METHOD__.__LINE__." $_flag -> $flag2set ".array2string($filter).array2string($messageList));
-							$this->mail_bo->flagMessages($flag2set, $messageList,$folder);
+							if (Mail::$debug) error_log(__METHOD__.__LINE__." $_flag -> $flag2set ".array2string($filter).array2string($messageList));
+							$this->mail_bo->flagMessages($flag2set, $messageList, $folder);
 						}
-						$alreadyFlagged=true;
+						$alreadyFlagged = true;
 					}
 					elseif (!empty($filter) &&
-						(!in_array($_flag,array('read','flagged','label1','label2','label3','label4','label5')) ||
-						(in_array($_flag,array('read','flagged','label1','label2','label3','label4','label5')) &&
-						($flag2check==$query['filter'] || stripos($query['filter'],$flag2check)!==false))))
+						(!in_array($_flag, array('read', 'flagged', 'label1', 'label2', 'label3', 'label4', 'label5')) ||
+						(in_array($_flag, array('read', 'flagged', 'label1', 'label2', 'label3', 'label4', 'label5')) &&
+						($flag2check == $query['filter'] || stripos($query['filter'], $flag2check) !== false))))
 					{
-						if ($query['filter'] && $query['filter'] !='any')
+						if ($query['filter'] && $query['filter'] != 'any')
 						{
 							$filter['status'] = $query['filter'];
 							// 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)));
+							$_flag = ($query['filter'] == 'unseen' && $_flag == 'read' ? 'read' : ($query['filter'] == 'seen' && $_flag == 'read' ? 'unread' : ($_flag == $query['filter'] ? 'un'.$_flag : $_flag)));
 						}
-						if(Mail::$debug) error_log(__METHOD__.__LINE__." flag all with $_flag on filter used:".array2string($filter));
+						if (Mail::$debug) error_log(__METHOD__.__LINE__." flag all with $_flag on filter used:".array2string($filter));
 						$rByUid = true;
 						$reverse = 1;
 						$_sR = $this->mail_bo->getSortedList(
 							$folder,
-							$sort=0,
+							$sort = 0,
 							$reverse,
 							$filter,
 							$rByUid,
@@ -4638,8 +4631,8 @@ 
 					}
 					else
 					{
-						if(Mail::$debug) error_log(__METHOD__.__LINE__." $_flag all ".array2string($filter));
-						$alreadyFlagged=true;
+						if (Mail::$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
 						$this->mail_bo->flagMessages($_flag, 'all', $folder);
@@ -4653,41 +4646,41 @@ 
 			}
 			if (!$alreadyFlagged)
 			{
-				foreach($_messageList['msg'] as $rowID)
+				foreach ($_messageList['msg'] as $rowID)
 				{
 					$hA = self::splitRowID($rowID);
 					$messageList[] = $hA['msgUID'];
 				}
-				if(Mail::$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);
+				if (Mail::$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::$debug) error_log(__METHOD__."-> No messages selected.");
+			if (Mail::$debug) error_log(__METHOD__."-> No messages selected.");
 		}
 
 		if ($_sendJsonResponse)
 		{
-			$flag=array(
-				'label1'	=> 'important',//lang('important'),
-				'label2'	=> 'job',	//lang('job'),
-				'label3'	=> 'personal',//lang('personal'),
-				'label4'	=> 'to do',	//lang('to do'),
-				'label5'	=> 'later',	//lang('later'),
+			$flag = array(
+				'label1'	=> 'important', //lang('important'),
+				'label2'	=> 'job', //lang('job'),
+				'label3'	=> 'personal', //lang('personal'),
+				'label4'	=> 'to do', //lang('to do'),
+				'label5'	=> 'later', //lang('later'),
 			);
 			$response = Api\Json\Response::get();
 			if (isset($_messageList['msg']) && $_messageList['popup'])
 			{
-				$response->call('egw.refresh',lang('flagged %1 messages as %2 in %3',$_messageList['msg'],lang(($flag[$_flag]?$flag[$_flag]:$_flag)),$folder),'mail', $_messageList['msg'], 'update');
+				$response->call('egw.refresh', lang('flagged %1 messages as %2 in %3', $_messageList['msg'], lang(($flag[$_flag] ? $flag[$_flag] : $_flag)), $folder), 'mail', $_messageList['msg'], 'update');
 			}
-			else if ((isset($_messageList['all']) && $_messageList['all']) || ($query['filter'] && ($flag2check==$query['filter'] || stripos($query['filter'],$flag2check)!==false)))
+			else if ((isset($_messageList['all']) && $_messageList['all']) || ($query['filter'] && ($flag2check == $query['filter'] || stripos($query['filter'], $flag2check) !== false)))
 			{
-				$response->call('egw.refresh',lang('flagged %1 messages as %2 in %3',(isset($_messageList['all']) && $_messageList['all']?lang('all'):count($_messageList['msg'])),lang(($flag[$_flag]?$flag[$_flag]:$_flag)),$folder),'mail');
+				$response->call('egw.refresh', lang('flagged %1 messages as %2 in %3', (isset($_messageList['all']) && $_messageList['all'] ? lang('all') : count($_messageList['msg'])), lang(($flag[$_flag] ? $flag[$_flag] : $_flag)), $folder), 'mail');
 			}
 			else
 			{
-				$response->call('egw.message',lang('flagged %1 messages as %2 in %3',(isset($_messageList['all']) && $_messageList['all']?lang('all'):count($_messageList['msg'])),lang(($flag[$_flag]?$flag[$_flag]:$_flag)),$folder));
+				$response->call('egw.message', lang('flagged %1 messages as %2 in %3', (isset($_messageList['all']) && $_messageList['all'] ? lang('all') : count($_messageList['msg'])), lang(($flag[$_flag] ? $flag[$_flag] : $_flag)), $folder));
 			}
 		}
 	}
@@ -4699,12 +4692,12 @@ 
 	 * @param string _forceDeleteMethod - method of deletion to be enforced
 	 * @return xajax response
 	 */
-	function ajax_deleteMessages($_messageList,$_forceDeleteMethod=null)
+	function ajax_deleteMessages($_messageList, $_forceDeleteMethod = null)
 	{
-		if(Mail::$debug) error_log(__METHOD__."->".print_r($_messageList,true).' Method:'.$_forceDeleteMethod);
+		if (Mail::$debug) error_log(__METHOD__."->".print_r($_messageList, true).' Method:'.$_forceDeleteMethod);
 		$error = null;
-		$filtered =  false;
-		if ($_messageList=='all' || !empty($_messageList['msg']))
+		$filtered = false;
+		if ($_messageList == 'all' || !empty($_messageList['msg']))
 		{
 			if (isset($_messageList['all']) && $_messageList['all'])
 			{
@@ -4714,34 +4707,34 @@ 
 				if (isset($_messageList['activeFilters']) && $_messageList['activeFilters'])
 				{
 					$query = $_messageList['activeFilters'];
-					if (!empty($query['search']) || !empty($query['filter'])||($query['cat_id']=='bydate' && (!empty($query['startdate'])||!empty($query['enddate']))))
+					if (!empty($query['search']) || !empty($query['filter']) || ($query['cat_id'] == 'bydate' && (!empty($query['startdate']) || !empty($query['enddate']))))
 					{
 						//([filterName] => Schnellsuche[type] => quick[string] => ebay[status] => any
 						if (is_null(Mail::$supportsORinQuery) || !isset(Mail::$supportsORinQuery[$this->mail_bo->profileID]))
 						{
-							Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-							if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID]=true;
+							Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 10);
+							if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID] = true;
 						}
-						$filtered =  true;
+						$filtered = true;
 						$cutoffdate = $cutoffdate2 = null;
-						if ($query['startdate']) $cutoffdate = Api\DateTime::to($query['startdate'],'ts');//SINCE, enddate
-						if ($query['enddate']) $cutoffdate2 = Api\DateTime::to($query['enddate'],'ts');//BEFORE, startdate
+						if ($query['startdate']) $cutoffdate = Api\DateTime::to($query['startdate'], 'ts'); //SINCE, enddate
+						if ($query['enddate']) $cutoffdate2 = Api\DateTime::to($query['enddate'], 'ts'); //BEFORE, startdate
 						//error_log(__METHOD__.__LINE__.' Startdate:'.$cutoffdate2.' Enddate'.$cutoffdate);
 						$filter = array(
-							'filterName' => (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?lang('quicksearch'):lang('subject')),
-							'type' => ($query['cat_id']?$query['cat_id']:(Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?'quick':'subject')),
+							'filterName' => (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID] ? lang('quicksearch') : lang('subject')),
+							'type' => ($query['cat_id'] ? $query['cat_id'] : (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID] ? 'quick' : 'subject')),
 							'string' => $query['search'],
-							'status' => (!empty($query['filter'])?$query['filter']:'any'),
+							'status' => (!empty($query['filter']) ? $query['filter'] : 'any'),
 							//'range'=>"BETWEEN",'since'=> date("d-M-Y", $cutoffdate),'before'=> date("d-M-Y", $cutoffdate2)
 						);
-						if ($query['enddate']||$query['startdate']) {
+						if ($query['enddate'] || $query['startdate']) {
 							$filter['range'] = "BETWEEN";
 							if ($cutoffdate) {
-								$filter[(empty($cutoffdate2)?'date':'since')] =  date("d-M-Y", $cutoffdate);
+								$filter[(empty($cutoffdate2) ? 'date' : 'since')] = date("d-M-Y", $cutoffdate);
 								if (empty($cutoffdate2)) $filter['range'] = "SINCE";
 							}
 							if ($cutoffdate2) {
-								$filter[(empty($cutoffdate)?'date':'before')] =  date("d-M-Y", $cutoffdate2);
+								$filter[(empty($cutoffdate) ? 'date' : 'before')] = date("d-M-Y", $cutoffdate2);
 								if (empty($cutoffdate)) $filter['range'] = "BEFORE";
 							}
 						}
@@ -4755,7 +4748,7 @@ 
 					$rByUid = true;
 					$_sR = $this->mail_bo->getSortedList(
 						$folder,
-						$sort=0,
+						$sort = 0,
 						$reverse,
 						$filter,
 						$rByUid,
@@ -4765,23 +4758,23 @@ 
 				}
 				else
 				{
-					$messageList='all';
+					$messageList = 'all';
 				}
 				try
 				{
 					//error_log(__METHOD__.__LINE__."->".print_r($messageList,true).' folder:'.$folder.' Method:'.$_forceDeleteMethod);
-					$this->mail_bo->deleteMessages(($messageList=='all' ? 'all':$messageList),$folder,(empty($_forceDeleteMethod)?'no':$_forceDeleteMethod));
+					$this->mail_bo->deleteMessages(($messageList == 'all' ? 'all' : $messageList), $folder, (empty($_forceDeleteMethod) ? 'no' : $_forceDeleteMethod));
 				}
 				catch (Api\Exception $e)
 				{
-					$error = str_replace('"',"'",$e->getMessage());
+					$error = str_replace('"', "'", $e->getMessage());
 				}
 			}
 			else
 			{
 				$uidA = self::splitRowID($_messageList['msg'][0]);
 				$folder = $uidA['folder']; // all messages in one set are supposed to be within the same folder
-				foreach($_messageList['msg'] as $rowID)
+				foreach ($_messageList['msg'] as $rowID)
 				{
 					$hA = self::splitRowID($rowID);
 					$messageList[] = $hA['msgUID'];
@@ -4789,27 +4782,27 @@ 
 				try
 				{
 					//error_log(__METHOD__.__LINE__."->".print_r($messageList,true).' folder:'.$folder.' Method:'.$_forceDeleteMethod);
-					$this->mail_bo->deleteMessages($messageList,$folder,(empty($_forceDeleteMethod)?'no':$_forceDeleteMethod));
+					$this->mail_bo->deleteMessages($messageList, $folder, (empty($_forceDeleteMethod) ? 'no' : $_forceDeleteMethod));
 				}
 				catch (Api\Exception $e)
 				{
-					$error = str_replace('"',"'",$e->getMessage());
+					$error = str_replace('"', "'", $e->getMessage());
 				}
 			}
 			$response = Api\Json\Response::get();
 			if (empty($error))
 			{
-				$response->call('app.mail.mail_deleteMessagesShowResult',array('egw_message'=>lang('deleted %1 messages in %2',($messageList=='all'||$_messageList['all']?($filtered?lang('all filtered'):lang('all')):count($_messageList['msg'])),$folder),'msg'=>$_messageList['msg']));
+				$response->call('app.mail.mail_deleteMessagesShowResult', array('egw_message'=>lang('deleted %1 messages in %2', ($messageList == 'all' || $_messageList['all'] ? ($filtered ? lang('all filtered') : lang('all')) : count($_messageList['msg'])), $folder), 'msg'=>$_messageList['msg']));
 			}
 			else
 			{
-				$error = str_replace('\n',"\n",lang('mailserver reported:\n%1 \ndo you want to proceed by deleting the selected messages immediately (click ok)?\nif not, please try to empty your trashfolder before continuing. (click cancel)',$error));
-				$response->call('app.mail.mail_retryForcedDelete',array('response'=>$error,'messageList'=>$_messageList));
+				$error = str_replace('\n', "\n", lang('mailserver reported:\n%1 \ndo you want to proceed by deleting the selected messages immediately (click ok)?\nif not, please try to empty your trashfolder before continuing. (click cancel)', $error));
+				$response->call('app.mail.mail_retryForcedDelete', array('response'=>$error, 'messageList'=>$_messageList));
 			}
 		}
 		else
 		{
-			if(Mail::$debug) error_log(__METHOD__."-> No messages selected.");
+			if (Mail::$debug) error_log(__METHOD__."-> No messages selected.");
 		}
 	}
 
@@ -4823,48 +4816,48 @@ 
 	 *
 	 * @return xajax response
 	 */
-	function ajax_copyMessages($_folderName, $_messageList, $_copyOrMove='copy', $_move2ArchiveMarker='_')
+	function ajax_copyMessages($_folderName, $_messageList, $_copyOrMove = 'copy', $_move2ArchiveMarker = '_')
 	{
-		if(Mail::$debug) error_log(__METHOD__."->".$_folderName.':'.print_r($_messageList,true).' Method:'.$_copyOrMove.' ArchiveMarker:'.$_move2ArchiveMarker);
+		if (Mail::$debug) error_log(__METHOD__."->".$_folderName.':'.print_r($_messageList, true).' Method:'.$_copyOrMove.' ArchiveMarker:'.$_move2ArchiveMarker);
 		Api\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';
-		list($targetProfileID,$targetFolder) = explode(self::$delimiter,$folderName,2);
+		if (!($_copyOrMove == 'copy' || $_copyOrMove == 'move')) $_copyOrMove = 'copy';
+		list($targetProfileID, $targetFolder) = explode(self::$delimiter, $folderName, 2);
 		// check if move2archive was called with the correct archiveFolder
 		$archiveFolder = $this->mail_bo->getArchiveFolder();
-		if ($_move2ArchiveMarker=='2' && $targetFolder != $archiveFolder)
+		if ($_move2ArchiveMarker == '2' && $targetFolder != $archiveFolder)
 		{
 			error_log(__METHOD__.__LINE__."#Move to Archive called with:"."$targetProfileID,$targetFolder");
 			$targetProfileID = $this->mail_bo->profileID;
 			$targetFolder = $archiveFolder;
 			error_log(__METHOD__.__LINE__."#Fixed ArchiveFolder:"."$targetProfileID,$targetFolder");
 		}
-		$lastFoldersUsedForMoveCont = Api\Cache::getCache(Api\Cache::INSTANCE,'email','lastFolderUsedForMove'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),$expiration=60*60*1);
+		$lastFoldersUsedForMoveCont = Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'lastFolderUsedForMove'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), $expiration = 60 * 60 * 1);
 		$changeFolderActions = false;
 		//error_log(__METHOD__.__LINE__."#"."$targetProfileID,$targetFolder");
 		//error_log(__METHOD__.__LINE__.array2string($lastFoldersUsedForMoveCont));
 		if (!isset($lastFoldersUsedForMoveCont[$targetProfileID][$targetFolder]))
 		{
 			//error_log(__METHOD__.__LINE__.array2string($lastFoldersUsedForMoveCont[$targetProfileID][$targetFolder]));
-			if ($lastFoldersUsedForMoveCont[$targetProfileID] && count($lastFoldersUsedForMoveCont[$targetProfileID])>3)
+			if ($lastFoldersUsedForMoveCont[$targetProfileID] && count($lastFoldersUsedForMoveCont[$targetProfileID]) > 3)
 			{
 				$keys = array_keys($lastFoldersUsedForMoveCont[$targetProfileID]);
-				foreach( $keys as &$f)
+				foreach ($keys as &$f)
 				{
-					if (count($lastFoldersUsedForMoveCont[$targetProfileID])>9) unset($lastFoldersUsedForMoveCont[$targetProfileID][$f]);
+					if (count($lastFoldersUsedForMoveCont[$targetProfileID]) > 9) unset($lastFoldersUsedForMoveCont[$targetProfileID][$f]);
 					else break;
 				}
 				//error_log(__METHOD__.__LINE__.array2string($lastFoldersUsedForMoveCont[$targetProfileID]));
 			}
 			//error_log(__METHOD__.__LINE__."#"."$targetProfileID,$targetFolder = $_folderName");
-			$lastFoldersUsedForMoveCont[$targetProfileID][$targetFolder]=$folderName;
+			$lastFoldersUsedForMoveCont[$targetProfileID][$targetFolder] = $folderName;
 			$changeFolderActions = true;
 		}
 		$filtered = false;
-		if ($_messageList=='all' || !empty($_messageList['msg']))
+		if ($_messageList == 'all' || !empty($_messageList['msg']))
 		{
-			$error=false;
+			$error = false;
 			if (isset($_messageList['all']) && $_messageList['all'])
 			{
 				// we have both messageIds AND allFlag folder information
@@ -4874,34 +4867,34 @@ 
 				if (isset($_messageList['activeFilters']) && $_messageList['activeFilters'])
 				{
 					$query = $_messageList['activeFilters'];
-					if (!empty($query['search']) || !empty($query['filter'])||($query['cat_id']=='bydate' && (!empty($query['startdate'])||!empty($query['enddate']))))
+					if (!empty($query['search']) || !empty($query['filter']) || ($query['cat_id'] == 'bydate' && (!empty($query['startdate']) || !empty($query['enddate']))))
 					{
 						//([filterName] => Schnellsuche[type] => quick[string] => ebay[status] => any
 						if (is_null(Mail::$supportsORinQuery) || !isset(Mail::$supportsORinQuery[$this->mail_bo->profileID]))
 						{
-							Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
-							if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID]=true;
+							Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60 * 60 * 10);
+							if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID] = true;
 						}
 						$filtered = true;
 						$cutoffdate = $cutoffdate2 = null;
-						if ($query['startdate']) $cutoffdate = Api\DateTime::to($query['startdate'],'ts');//SINCE, enddate
-						if ($query['enddate']) $cutoffdate2 = Api\DateTime::to($query['enddate'],'ts');//BEFORE, startdate
+						if ($query['startdate']) $cutoffdate = Api\DateTime::to($query['startdate'], 'ts'); //SINCE, enddate
+						if ($query['enddate']) $cutoffdate2 = Api\DateTime::to($query['enddate'], 'ts'); //BEFORE, startdate
 						//error_log(__METHOD__.__LINE__.' Startdate:'.$cutoffdate2.' Enddate'.$cutoffdate);
 						$filter = array(
-							'filterName' => (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?lang('quicksearch'):lang('subject')),
-							'type' => ($query['cat_id']?$query['cat_id']:(Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?'quick':'subject')),
+							'filterName' => (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID] ? lang('quicksearch') : lang('subject')),
+							'type' => ($query['cat_id'] ? $query['cat_id'] : (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID] ? 'quick' : 'subject')),
 							'string' => $query['search'],
-							'status' => (!empty($query['filter'])?$query['filter']:'any'),
+							'status' => (!empty($query['filter']) ? $query['filter'] : 'any'),
 							//'range'=>"BETWEEN",'since'=> date("d-M-Y", $cutoffdate),'before'=> date("d-M-Y", $cutoffdate2)
 						);
-						if ($query['enddate']||$query['startdate']) {
+						if ($query['enddate'] || $query['startdate']) {
 							$filter['range'] = "BETWEEN";
 							if ($cutoffdate) {
-								$filter[(empty($cutoffdate2)?'date':'since')] =  date("d-M-Y", $cutoffdate);
+								$filter[(empty($cutoffdate2) ? 'date' : 'since')] = date("d-M-Y", $cutoffdate);
 								if (empty($cutoffdate2)) $filter['range'] = "SINCE";
 							}
 							if ($cutoffdate2) {
-								$filter[(empty($cutoffdate)?'date':'before')] =  date("d-M-Y", $cutoffdate2);
+								$filter[(empty($cutoffdate) ? 'date' : 'before')] = date("d-M-Y", $cutoffdate2);
 								if (empty($cutoffdate)) $filter['range'] = "BEFORE";
 							}
 						}
@@ -4914,70 +4907,70 @@ 
 					$rByUid = true;
 					$_sR = $this->mail_bo->getSortedList(
 						$folder,
-						$sort=0,
+						$sort = 0,
 						$reverse,
 						$filter,
-						$rByUid=true,
+						$rByUid = true,
 						false
 					);
 					$messageList = $_sR['match']->ids;
-					foreach($messageList as $uID)
+					foreach ($messageList as $uID)
 					{
 						//error_log(__METHOD__.__LINE__.$uID);
-						if ($_copyOrMove=='move')
+						if ($_copyOrMove == 'move')
 						{
-							$messageListForRefresh[] = self::generateRowID($sourceProfileID, $folderName, $uID, $_prependApp=false);
+							$messageListForRefresh[] = self::generateRowID($sourceProfileID, $folderName, $uID, $_prependApp = false);
 						}
 					}
 				}
 				else
 				{
-					$messageList='all';
+					$messageList = 'all';
 				}
 				try
 				{
 					//error_log(__METHOD__.__LINE__."->".print_r($messageList,true).' folder:'.$folder.' Method:'.$_forceDeleteMethod.' '.$targetProfileID.'/'.$sourceProfileID);
-					$this->mail_bo->moveMessages($targetFolder,$messageList,($_copyOrMove=='copy'?false:true),$folder,false,$sourceProfileID,($targetProfileID!=$sourceProfileID?$targetProfileID:null));
+					$this->mail_bo->moveMessages($targetFolder, $messageList, ($_copyOrMove == 'copy' ? false : true), $folder, false, $sourceProfileID, ($targetProfileID != $sourceProfileID ? $targetProfileID : null));
 				}
 				catch (Api\Exception $e)
 				{
-					$error = str_replace('"',"'",$e->getMessage());
+					$error = str_replace('"', "'", $e->getMessage());
 				}
 			}
 			else
 			{
 				$messageList = array();
-				while(count($_messageList['msg']) > 0)
+				while (count($_messageList['msg']) > 0)
 				{
 					$uidA = self::splitRowID($_messageList['msg'][0]);
 					$folder = $uidA['folder']; // all messages in one set are supposed to be within the same folder
 					$sourceProfileID = $uidA['profileID'];
 					$moveList = array();
-					foreach($_messageList['msg'] as $rowID)
+					foreach ($_messageList['msg'] as $rowID)
 					{
 						$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'];
 						$moveList[] = $hA['msgUID'];
-						if ($_copyOrMove=='move')
+						if ($_copyOrMove == 'move')
 						{
-							$helpvar = explode(self::$delimiter,$rowID);
+							$helpvar = explode(self::$delimiter, $rowID);
 							array_shift($helpvar);
-							$messageListForRefresh[]= implode(self::$delimiter,$helpvar);
+							$messageListForRefresh[] = implode(self::$delimiter, $helpvar);
 						}
 					}
 					try
 					{
 						//error_log(__METHOD__.__LINE__."->".print_r($moveList,true).' folder:'.$folder.' Method:'.$_forceDeleteMethod.' '.$targetProfileID.'/'.$sourceProfileID);
-						$this->mail_bo->moveMessages($targetFolder,$moveList,($_copyOrMove=='copy'?false:true),$folder,false,$sourceProfileID,($targetProfileID!=$sourceProfileID?$targetProfileID:null));
+						$this->mail_bo->moveMessages($targetFolder, $moveList, ($_copyOrMove == 'copy' ? false : true), $folder, false, $sourceProfileID, ($targetProfileID != $sourceProfileID ? $targetProfileID : null));
 					}
 					catch (Api\Exception $e)
 					{
-						$error = str_replace('"',"'",$e->getMessage());
+						$error = str_replace('"', "'", $e->getMessage());
 					}
 				}
 			}
@@ -4990,30 +4983,30 @@ 
 					unset($lastFoldersUsedForMoveCont[$targetProfileID][$targetFolder]);
 					$changeFolderActions = true;
 				}
-				$response->call('egw.message',$error,"error");
+				$response->call('egw.message', $error, "error");
 			}
 			else
 			{
-				if ($_copyOrMove=='copy')
+				if ($_copyOrMove == 'copy')
 				{
-					$response->call('egw.message',lang('copied %1 message(s) from %2 to %3',($messageList=='all'||$_messageList['all']?($filtered?lang('all filtered'):lang('all')):count($messageList)),$folder,$targetFolder));
+					$response->call('egw.message', lang('copied %1 message(s) from %2 to %3', ($messageList == 'all' || $_messageList['all'] ? ($filtered ? lang('all filtered') : lang('all')) : count($messageList)), $folder, $targetFolder));
 				}
 				else
 				{
-					$response->call('egw.refresh',lang('moved %1 message(s) from %2 to %3',($messageList=='all'||$_messageList['all']?($filtered?lang('all filtered'):lang('all')):count($messageList)),$folder,$targetFolder),'mail',$messageListForRefresh,'delete');
+					$response->call('egw.refresh', lang('moved %1 message(s) from %2 to %3', ($messageList == 'all' || $_messageList['all'] ? ($filtered ? lang('all filtered') : lang('all')) : count($messageList)), $folder, $targetFolder), 'mail', $messageListForRefresh, 'delete');
 				}
 			}
 			if ($changeFolderActions == true)
 			{
 				//error_log(__METHOD__.__LINE__.array2string($lastFoldersUsedForMoveCont));
-				Api\Cache::setCache(Api\Cache::INSTANCE,'email','lastFolderUsedForMove'.trim($GLOBALS['egw_info']['user']['account_id']),$lastFoldersUsedForMoveCont, $expiration=60*60*1);
+				Api\Cache::setCache(Api\Cache::INSTANCE, 'email', 'lastFolderUsedForMove'.trim($GLOBALS['egw_info']['user']['account_id']), $lastFoldersUsedForMoveCont, $expiration = 60 * 60 * 1);
 				$actionsnew = Etemplate\Widget\Nextmatch::egw_actions(self::get_actions());
-				$response->call('app.mail.mail_rebuildActionsOnList',$actionsnew);
+				$response->call('app.mail.mail_rebuildActionsOnList', $actionsnew);
 			}
 		}
 		else
 		{
-			if(Mail::$debug) error_log(__METHOD__."-> No messages selected.");
+			if (Mail::$debug) error_log(__METHOD__."-> No messages selected.");
 		}
 	}
 
@@ -5023,11 +5016,11 @@ 
 	 *
 	 * @param type $_id
 	 */
-	function ajax_folderMgmtTree_autoloading ($_id = null)
+	function ajax_folderMgmtTree_autoloading($_id = null)
 	{
 		$mail_ui = new mail_ui();
-		$id = $_id? $_id : $_GET['id'];
-		Etemplate\Widget\Tree::send_quote_json($mail_ui->mail_tree->getTree($id,'',1,true,false,false,false));
+		$id = $_id ? $_id : $_GET['id'];
+		Etemplate\Widget\Tree::send_quote_json($mail_ui->mail_tree->getTree($id, '', 1, true, false, false, false));
 	}
 
 	/**
@@ -5035,15 +5028,15 @@ 
 	 *
 	 * @param array $content content of dialog
 	 */
-	function folderManagement (array $content = null)
+	function folderManagement(array $content = null)
 	{
 		$dtmpl = new Etemplate('mail.folder_management');
-		$profileID = $_GET['acc_id']? $_GET['acc_id']: $content['acc_id'];
-		$sel_options['tree'] = $this->mail_tree->getTree(null,$profileID, 1, true, false, false);
+		$profileID = $_GET['acc_id'] ? $_GET['acc_id'] : $content['acc_id'];
+		$sel_options['tree'] = $this->mail_tree->getTree(null, $profileID, 1, true, false, false);
 
 		if (!is_array($content))
 		{
-			$content = array ('acc_id' => $profileID);
+			$content = array('acc_id' => $profileID);
 		}
 
 		$readonlys = array();
@@ -5051,7 +5044,7 @@ 
 		$preserv = array(
 			'acc_id' => $content['acc_id'] // preserve acc id to be used in client-side
 		);
-		$dtmpl->exec('mail.mail_ui.folderManagement', $content,$sel_options,$readonlys,$preserv,2);
+		$dtmpl->exec('mail.mail_ui.folderManagement', $content, $sel_options, $readonlys, $preserv, 2);
 	}
 
 	/**
@@ -5061,11 +5054,11 @@ 
 	 *
 	 * @param type $_folderName
 	 */
-	function ajax_folderMgmt_delete ($_folderName)
+	function ajax_folderMgmt_delete($_folderName)
 	{
 		if ($_folderName)
 		{
-			$success = $this->ajax_deleteFolder($_folderName,true);
+			$success = $this->ajax_deleteFolder($_folderName, true);
 			$response = Api\Json\Response::get();
 			list(,$folderName) = explode(self::$delimiter, $_folderName);
 			if ($success)
@@ -5074,7 +5067,7 @@ 
 			}
 			else
 			{
-				$res = lang("Failed to delete %1",$folderName);
+				$res = lang("Failed to delete %1", $folderName);
 			}
 			$response->data($res);
 		}