EGroupware / egroupware

mail/inc/class.mail_compose.inc.php

Braces +807 added lines, -270 removed lines

@@ -82,7 +82,10 @@ 
 		{
 			$this->mailPreferences['message_forwarding'] = 'asmail';
 		}
-		if (is_null(Mail::$mailConfig)) Mail::$mailConfig = Api\Config::read('mail');
+		if (is_null(Mail::$mailConfig))
+		{
+			Mail::$mailConfig = Api\Config::read('mail');
+		}
 
 		$this->mailPreferences  =& $this->mail_bo->mailPreferences;
 	}
@@ -96,11 +99,21 @@ 
 	{
 		if ($this->mail_bo->profileID!=$_icServerID)
 		{
-			if (Mail::$debug) error_log(__METHOD__.__LINE__.'->'.$this->mail_bo->profileID.'<->'.$_icServerID);
+			if (Mail::$debug)
+			{
+				error_log(__METHOD__.__LINE__.'->'.$this->mail_bo->profileID.'<->'.$_icServerID);
+			}
 			$this->mail_bo = Mail::getInstance(false,$_icServerID);
-			if (Mail::$debug) error_log(__METHOD__.__LINE__.' Fetched IC Server:'.$this->mail_bo->profileID.':'.function_backtrace());
+			if (Mail::$debug)
+			{
+				error_log(__METHOD__.__LINE__.' Fetched IC Server:'.$this->mail_bo->profileID.':'.function_backtrace());
+			}
 			// no icServer Object: something failed big time
-			if (!isset($this->mail_bo->icServer)) exit; // ToDo: Exception or the dialog for setting up a server config
+			if (!isset($this->mail_bo->icServer))
+			{
+				exit;
+			}
+			// ToDo: Exception or the dialog for setting up a server config
 			$this->mail_bo->openConnection($this->mail_bo->profileID);
 			$this->mailPreferences  =& $this->mail_bo->mailPreferences;
 		}
@@ -242,7 +255,8 @@ 
 		{
 			foreach (array_keys($actions) as $key)
 			{
-				if (!in_array($key, array('send','button[saveAsDraft]','uploadForCompose' ))) {
+				if (!in_array($key, array('send','button[saveAsDraft]','uploadForCompose' )))
+				{
 					$actions[$key]['toolbarDefault'] = false;
 				}
 			}
@@ -268,7 +282,10 @@ 
 	 */
 	function compose(array $_content=null,$msg=null, $_focusElement='to',$suppressSigOnTop=false, $isReply=false)
 	{
-		if ($msg) Framework::message($msg);
+		if ($msg)
+		{
+			Framework::message($msg);
+		}
 
 		if (!empty($GLOBALS['egw_info']['user']['preferences']['mail']['LastSignatureIDUsed']))
 		{
@@ -289,8 +306,14 @@ 
 		//error_log(__METHOD__.__LINE__.array2string($_content).function_backtrace());
 		$_contentHasSigID = $_content?array_key_exists('mailidentity',(array)$_content):false;
 		$_contentHasMimeType = $_content? array_key_exists('mimeType',(array)$_content):false;
-		if (isset($_GET['reply_id'])) $replyID = $_GET['reply_id'];
-		if (!$replyID && isset($_GET['id'])) $replyID = $_GET['id'];
+		if (isset($_GET['reply_id']))
+		{
+			$replyID = $_GET['reply_id'];
+		}
+		if (!$replyID && isset($_GET['id']))
+		{
+			$replyID = $_GET['id'];
+		}
 
 		// Process different places we can use as a start for composing an email
 		$actionToProcess = 'compose';
@@ -357,7 +380,10 @@ 
 			$suppressSigOnTop = true;
 			foreach ($_content['uploadForCompose'] as $i => &$upload)
 			{
-				if (!isset($upload['file'])) $upload['file'] = $upload['tmp_name'];
+				if (!isset($upload['file']))
+				{
+					$upload['file'] = $upload['tmp_name'];
+				}
 				try
 				{
 					$upload['file'] = $upload['tmp_name'] = Mail::checkFileBasics($upload,$this->composeID,false);
@@ -391,9 +417,15 @@ 
 				$remove=false;
 				foreach(array_keys($toDelete) as $k)
 				{
-					if ($att['tmp_name']==$k) $remove=true;
+					if ($att['tmp_name']==$k)
+					{
+						$remove=true;
+					}
+				}
+				if (!$remove)
+				{
+					$_content['attachments'][] = $att;
 				}
-				if (!$remove) $_content['attachments'][] = $att;
 			}
 		}
 		// someone clicked something like send, or saveAsDraft
@@ -408,8 +440,7 @@ 
 		//error_log(__METHOD__.__LINE__.array2string($_content));
 		if (!empty($_content['serverID']) && $_content['serverID'] != $this->mail_bo->profileID &&
 			($_content['composeToolbar'] === 'send' || $_content['button']['saveAsDraft']||$_content['button']['saveAsDraftAndPrint'])
-		)
-		{
+		) {
 			$this->changeProfile($_content['serverID']);
 			$composeProfile = $this->mail_bo->profileID;
 		}
@@ -489,7 +520,10 @@ 
 							//$this->sessionData['uid'][] = $fhA['msgUID'];
 							//$this->sessionData['forwardedUID'][] = $fhA['msgUID'];
 							$idsForRefresh[] = mail_ui::generateRowID($fhA['profileID'], $fhA['folder'], $fhA['msgUID'], $_prependApp=false);
-							if (!empty($fhA['folder'])) $workingFolder = $fhA['folder'];
+							if (!empty($fhA['folder']))
+							{
+								$workingFolder = $fhA['folder'];
+							}
 						}
 					}
 					if ($_content['mode']=='reply' && !empty($_content['processedmail_id']))
@@ -540,7 +574,10 @@ 
 			}
 		}
 
-		if ($activeProfile != $composeProfile) $this->changeProfile($activeProfile);
+		if ($activeProfile != $composeProfile)
+		{
+			$this->changeProfile($activeProfile);
+		}
 		$insertSigOnTop = false;
 		$content = (is_array($_content)?$_content:array());
 		if ($_contentHasMimeType)
@@ -569,7 +606,10 @@ 
 				{
 					foreach ($contentArr as $k =>&$elem)
 					{
-						if (stripos($elem,'<pre>')!==false) $elem = str_replace(array("\r\n","\n","\r"),array("<br>","<br>","<br>"),$elem);
+						if (stripos($elem,'<pre>')!==false)
+						{
+							$elem = str_replace(array("\r\n","\n","\r"),array("<br>","<br>","<br>"),$elem);
+						}
 					}
 					$content['mail_htmltext'] = implode('',$contentArr);
 				}
@@ -611,8 +651,7 @@ 
 		if ( !empty($content['body']) &&
 			(!empty($composeCache['mailaccount']) && !empty($_content['mailaccount']) && $_content['mailaccount'] != $composeCache['mailaccount']) ||
 			(!empty($composeCache['mailidentity']) && !empty($_content['mailidentity']) && $_content['mailidentity'] != $composeCache['mailidentity'])
-		)
-		{
+		) {
 			$buttonClicked = true;
 			$suppressSigOnTop = true;
 			if (!empty($composeCache['mailaccount']) && !empty($_content['mailaccount']) && $_content['mailaccount'] != $composeCache['mailaccount'])
@@ -628,7 +667,10 @@ 
 				else
 				{
 					$newSig = $this->mail_bo->getDefaultIdentity();
-					if ($newSig === false) $newSig = -2;
+					if ($newSig === false)
+					{
+						$newSig = -2;
+					}
 				}
 			}
 			$_oldSig = $composeCache['mailidentity'];
@@ -636,7 +678,10 @@ 
 
 			if ($_oldSig != $_signatureid)
 			{
-				if($this->_debug) error_log(__METHOD__.__LINE__.' old,new ->'.$_oldSig.','.$_signatureid.'#'.$content['body']);
+				if($this->_debug)
+				{
+					error_log(__METHOD__.__LINE__.' old,new ->'.$_oldSig.','.$_signatureid.'#'.$content['body']);
+				}
 				// prepare signatures, the selected sig may be used on top of the body
 				try
 				{
@@ -666,7 +711,10 @@ 
 				{
 					$oldSigText = $this->convertHTMLToText($oldSigText,true,true);
 					$sigText = $this->convertHTMLToText($sigText,true,true);
-					if($this->_debug) error_log(__METHOD__." Old signature:".$oldSigText);
+					if($this->_debug)
+					{
+						error_log(__METHOD__." Old signature:".$oldSigText);
+					}
 				}
 
 				//$oldSigText = Mail::merge($oldSigText,array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')));
@@ -682,7 +730,11 @@ 
 				{
 					$content['body'] = str_replace("\n",'\n',$content['body']);	// dont know why, but \n screws up preg_replace
 					$styles = Mail::getStyles(array(array('body'=>$content['body'])));
-					if (stripos($content['body'],'style')!==false) Api\Mail\Html::replaceTagsCompletley($content['body'],'style',$endtag='',true); // clean out empty or pagewide style definitions / left over tags
+					if (stripos($content['body'],'style')!==false)
+					{
+						Api\Mail\Html::replaceTagsCompletley($content['body'],'style',$endtag='',true);
+					}
+					// clean out empty or pagewide style definitions / left over tags
 				}
 				$content['body'] = str_replace(array("\r", "\t", "<br />\n", ": "), array("", "", "<br />", ":"),
 					$_currentMode == 'html' ? Api\Html::purify($content['body'], Mail::$htmLawed_config, array(), true) : $content['body']);
@@ -727,8 +779,14 @@ 
 
 				if ($found === false)
 				{
-					if($this->_debug) error_log(__METHOD__." Old Signature failed to match:".$oldSigTextCleaned);
-					if($this->_debug) error_log(__METHOD__." Compare content:".$content['body']);
+					if($this->_debug)
+					{
+						error_log(__METHOD__." Old Signature failed to match:".$oldSigTextCleaned);
+					}
+					if($this->_debug)
+					{
+						error_log(__METHOD__." Compare content:".$content['body']);
+					}
 				}
 				else
 				{
@@ -746,7 +804,10 @@ 
 		$_currentMode == 'html' ? Api\Html::purify($content['body'], Mail::$htmLawed_config, array(), true) : $content['body']);
 
 		// do not double insert a signature on a server roundtrip
-		if ($buttonClicked) $suppressSigOnTop = true;
+		if ($buttonClicked)
+		{
+			$suppressSigOnTop = true;
+		}
 		if ($isFirstLoad)
 		{
 			$alwaysAttachVCardAtCompose = false; // we use this to eliminate double attachments, if users VCard is already present/attached
@@ -785,7 +846,8 @@ 
 							}
 						}
 						$content['subject'] = lang($app).' #'.$res['id'].': ';
-						foreach(array('subject','body','mimetype') as $name) {
+						foreach(array('subject','body','mimetype') as $name)
+						{
 							$sName = $name;
 							if ($name=='mimetype'&&$res[$name])
 							{
@@ -794,7 +856,10 @@ 
 							}
 							else
 							{
-								if ($res[$name]) $content[$sName] .= (strlen($content[$sName])>0 ? ' ':'') .$res[$name];
+								if ($res[$name])
+								{
+									$content[$sName] .= (strlen($content[$sName])>0 ? ' ':'') .$res[$name];
+								}
 							}
 						}
 					}
@@ -805,7 +870,8 @@ 
 			{
 				$alreadyProcessed=array();
 				//_debug_array($_REQUEST);
-				if ($_REQUEST['preset']['mailto']) {
+				if ($_REQUEST['preset']['mailto'])
+				{
 					// handle mailto strings such as
 					// mailto:larry,dan?cc=mike&bcc=sue&subject=test&body=type+your&body=message+here
 					// the above string may be htmlentyty encoded, then multiple body tags are supported
@@ -813,10 +879,12 @@ 
 					$tmp_send_to = (stripos($_REQUEST['preset']['mailto'],'mailto')===false?$_REQUEST['preset']['mailto']:trim(substr(html_entity_decode($_REQUEST['preset']['mailto']),7)));
 					// check if there is more than the to address
 					$mailtoArray = explode('?',$tmp_send_to,2);
-					if ($mailtoArray[1]) {
+					if ($mailtoArray[1])
+					{
 						// check if there are more than one requests
 						$addRequests = explode('&',$mailtoArray[1]);
-						foreach ($addRequests as $key => $reqval) {
+						foreach ($addRequests as $key => $reqval)
+						{
 							// the additional requests should have a =, to separate key from value.
 							$keyValuePair = explode('=',$reqval,2);
 							$content[$keyValuePair[0]] .= (strlen($content[$keyValuePair[0]])>0 ? ' ':'') . $keyValuePair[1];
@@ -825,17 +893,24 @@ 
 					$content['to']=$mailtoArray[0];
 					$alreadyProcessed['to']='to';
 					// if the mailto string is not htmlentity decoded the arguments are passed as simple requests
-					foreach(array('cc','bcc','subject','body') as $name) {
+					foreach(array('cc','bcc','subject','body') as $name)
+					{
 						$alreadyProcessed[$name]=$name;
-						if ($_REQUEST[$name]) $content[$name] .= (strlen($content[$name])>0 ? ( $name == 'cc' || $name == 'bcc' ? ',' : ' ') : '') . $_REQUEST[$name];
+						if ($_REQUEST[$name])
+						{
+							$content[$name] .= (strlen($content[$name])>0 ? ( $name == 'cc' || $name == 'bcc' ? ',' : ' ') : '') . $_REQUEST[$name];
+						}
 					}
 				}
 
-				if ($_REQUEST['preset']['mailtocontactbyid']) {
-					if ($GLOBALS['egw_info']['user']['apps']['addressbook']) {
+				if ($_REQUEST['preset']['mailtocontactbyid'])
+				{
+					if ($GLOBALS['egw_info']['user']['apps']['addressbook'])
+					{
 						$contacts_obj = new Api\Contacts();
 						$addressbookprefs =& $GLOBALS['egw_info']['user']['preferences']['addressbook'];
-						if (method_exists($contacts_obj,'search')) {
+						if (method_exists($contacts_obj,'search'))
+						{
 
 							$addressArray = explode(',',$_REQUEST['preset']['mailtocontactbyid']);
 							foreach ((array)$addressArray as $id => $addressID)
@@ -850,7 +925,10 @@ 
 							{
 								$_searchCond = array('contact_id'=>$addressArray);
 								//error_log(__METHOD__.__LINE__.$_searchString);
-								if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) $showAccounts=false;
+								if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'])
+								{
+									$showAccounts=false;
+								}
 								$filter = ($showAccounts?array():array('account_id' => null));
 								$filter['cols_to_search']=array('n_fn','email','email_home');
 								$contacts = $contacts_obj->search($_searchCond,array('n_fn','email','email_home'),'n_fn','','%',false,'OR',array(0,100),$filter);
@@ -873,21 +951,28 @@ 
 									unset($accounts);
 								}
 							}
-							if(is_array($contacts)) {
+							if(is_array($contacts))
+							{
 								$mailtoArray = array();
 								$primary = $addressbookprefs['distributionListPreferredMail'];
-								if ($primary != 'email' && $primary != 'email_home') $primary = 'email';
+								if ($primary != 'email' && $primary != 'email_home')
+								{
+									$primary = 'email';
+								}
 								$secondary = ($primary == 'email'?'email_home':'email');
 								//error_log(__METHOD__.__LINE__.array2string($contacts));
-								foreach($contacts as $contact) {
+								foreach($contacts as $contact)
+								{
 									$innerCounter=0;
-									foreach(array($contact[$primary],$contact[$secondary]) as $email) {
+									foreach(array($contact[$primary],$contact[$secondary]) as $email)
+									{
 										// use pref distributionListPreferredMail for the primary address
 										// avoid wrong addresses, if an rfc822 encoded address is in addressbook
 										$email = preg_replace("/(^.*<)([a-zA-Z0-9_\-]+@[a-zA-Z0-9_\-\.]+)(.*)/",'$2',$email);
 										$contact['n_fn'] = str_replace(array(',','@'),' ',$contact['n_fn']);
 										$completeMailString = addslashes(trim($contact['n_fn'] ? $contact['n_fn'] : $contact['fn']) .' <'. trim($email) .'>');
-										if($innerCounter==0 && !empty($email) && in_array($completeMailString ,$mailtoArray) === false) {
+										if($innerCounter==0 && !empty($email) && in_array($completeMailString ,$mailtoArray) === false)
+										{
 											$i++;
 											$innerCounter++;
 											$mailtoArray[$i] = $completeMailString;
@@ -979,7 +1064,10 @@ 
 							}
 						}
 					}
-					if(!empty($remember)) $content = array_merge($content,$remember);
+					if(!empty($remember))
+					{
+						$content = array_merge($content,$remember);
+					}
 				}
 				foreach(array('to','cc','bcc','subject','body','mimeType') as $name)
 				{
@@ -989,9 +1077,15 @@ 
 						$_content[$name]=$content[$name]=$_REQUEST['preset'][$name];
 					}
 					//skip if already processed by "preset Routines"
-					if ($alreadyProcessed[$name]) continue;
+					if ($alreadyProcessed[$name])
+					{
+						continue;
+					}
 					//error_log(__METHOD__.__LINE__.':'.$name.'->'. $_REQUEST['preset'][$name]);
-					if ($_REQUEST['preset'][$name]) $content[$name] = $_REQUEST['preset'][$name];
+					if ($_REQUEST['preset'][$name])
+					{
+						$content[$name] = $_REQUEST['preset'][$name];
+					}
 				}
 			}
 			// is the to address set already?
@@ -999,7 +1093,10 @@ 
 			{
 				$content['to'] = base64_decode($_REQUEST['send_to']);
 				// first check if there is a questionmark or ampersand
-				if (strpos($content['to'],'?')!== false) list($content['to'],$rest) = explode('?',$content['to'],2);
+				if (strpos($content['to'],'?')!== false)
+				{
+					list($content['to'],$rest) = explode('?',$content['to'],2);
+				}
 				$content['to'] = html_entity_decode($content['to']);
 				if (($at_pos = strpos($content['to'],'@')) !== false)
 				{
@@ -1012,9 +1109,15 @@ 
 						$content['to'] = $email;
 					}
 				}
-				if (strpos($content['to'],'%40')!== false) $content['to'] = Api\Html::purify(str_replace('%40','@',$content['to']));
+				if (strpos($content['to'],'%40')!== false)
+				{
+					$content['to'] = Api\Html::purify(str_replace('%40','@',$content['to']));
+				}
 				$rarr = array(Api\Html::purify($rest));
-				if (isset($rest)&&!empty($rest) && strpos($rest,'&')!== false) $rarr = explode('&',$rest);
+				if (isset($rest)&&!empty($rest) && strpos($rest,'&')!== false)
+				{
+					$rarr = explode('&',$rest);
+				}
 				//error_log(__METHOD__.__LINE__.$content['to'].'->'.array2string($rarr));
 				$karr = array();
 				foreach ($rarr as &$rval)
@@ -1030,9 +1133,15 @@ 
 				//error_log(__METHOD__.__LINE__.$content['to'].'->'.array2string($karr));
 				foreach(array('cc','bcc','subject','body') as $name)
 				{
-					if ($karr[$name]) $content[$name] = $karr[$name];
+					if ($karr[$name])
+					{
+						$content[$name] = $karr[$name];
+					}
+				}
+				if (!empty($_REQUEST['subject']))
+				{
+					$content['subject'] = Api\Html::purify(trim(html_entity_decode($_REQUEST['subject'])));
 				}
-				if (!empty($_REQUEST['subject'])) $content['subject'] = Api\Html::purify(trim(html_entity_decode($_REQUEST['subject'])));
 			}
 		}
 		//error_log(__METHOD__.__LINE__.array2string($content));
@@ -1050,7 +1159,10 @@ 
 				$_content['mimeType'] = $content['mimeType']  = 'html';
 				$content['body'] = "<pre>".$content['body']."</pre>";
 				// take care this assumption is made on the creation of the reply header in bocompose::getReplyData
-				if (strpos($content['body'],"<pre> \r\n \r\n---")===0) $content['body'] = substr_replace($content['body']," <br>\r\n<pre>---",0,strlen("<pre> \r\n \r\n---")-1);
+				if (strpos($content['body'],"<pre> \r\n \r\n---")===0)
+				{
+					$content['body'] = substr_replace($content['body']," <br>\r\n<pre>---",0,strlen("<pre> \r\n \r\n---")-1);
+				}
 			}
 		}
 		else
@@ -1070,7 +1182,10 @@ 
 					$_content['mimeType'] = $content['mimeType']  = 'html';
 					$content['body'] = "<pre>".$content['body']."</pre>";
 					// take care this assumption is made on the creation of the reply header in bocompose::getReplyData
-					if (strpos($content['body'],"<pre> \r\n \r\n---")===0) $content['body'] = substr_replace($content['body']," <br>\r\n<pre>---",0,strlen("<pre> \r\n \r\n---")-1);
+					if (strpos($content['body'],"<pre> \r\n \r\n---")===0)
+					{
+						$content['body'] = substr_replace($content['body']," <br>\r\n<pre>---",0,strlen("<pre> \r\n \r\n---")-1);
+					}
 				}
 			}
 		}
@@ -1110,24 +1225,33 @@ 
 			$disableRuler = true;
 		}
 		$font_span = $font_part = '';
-		if($content['mimeType'] == 'html' /*&& trim($content['body'])==''*/) {
+		if($content['mimeType'] == 'html' /*&& trim($content['body'])==''*/)
+		{
 			// User preferences for style
 			$font = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font'];
 			$font_size = Api\Html\CkEditorConfig::font_size_from_prefs();
 			$font_part = '<span style="width:100%; display: inline; '.($font?'font-family:'.$font.'; ':'').($font_size?'font-size:'.$font_size.'; ':'').'">';
 			$font_span = $font_part.'&#8203;</span>';
-			if (empty($font) && empty($font_size)) $font_span = '';
+			if (empty($font) && empty($font_size))
+			{
+				$font_span = '';
+			}
 		}
 		// the font span should only be applied on first load or on switch plain->html and the absence of the font_part of the span
-		if (!$isFirstLoad && !empty($font_span) && stripos($content['body'],$font_part)===false) $font_span = '';
+		if (!$isFirstLoad && !empty($font_span) && stripos($content['body'],$font_part)===false)
+		{
+			$font_span = '';
+		}
 		//remove possible html header stuff
-		if (stripos($content['body'],'<html><head></head><body>')!==false) $content['body'] = str_ireplace(array('<html><head></head><body>','</body></html>'),array('',''),$content['body']);
+		if (stripos($content['body'],'<html><head></head><body>')!==false)
+		{
+			$content['body'] = str_ireplace(array('<html><head></head><body>','</body></html>'),array('',''),$content['body']);
+		}
 		//error_log(__METHOD__.__LINE__.array2string($this->mailPreferences));
 		$blockElements = array('address','blockquote','center','del','dir','div','dl','fieldset','form','h1','h2','h3','h4','h5','h6','hr','ins','isindex','menu','noframes','noscript','ol','p','pre','table','ul');
 		if ($this->mailPreferences['insertSignatureAtTopOfMessage']!='no_belowaftersend' &&
 			!(isset($_POST['mySigID']) && !empty($_POST['mySigID']) ) && !$suppressSigOnTop
-		)
-		{
+		) {
 			// ON tOP OR BELOW? pREF CAN TELL
 			/*
 				Signature behavior preference changed. New default, if not set -> 0
@@ -1142,14 +1266,23 @@ 
 				$sigTextStartsWithBlockElement = ($disableRuler?false:true);
 				foreach($blockElements as $e)
 				{
-					if ($sigTextStartsWithBlockElement) break;
-					if (stripos(trim($sigText),'<'.$e)===0) $sigTextStartsWithBlockElement = true;
+					if ($sigTextStartsWithBlockElement)
+					{
+						break;
+					}
+					if (stripos(trim($sigText),'<'.$e)===0)
+					{
+						$sigTextStartsWithBlockElement = true;
+					}
 				}
 			}
-			if($content['mimeType'] == 'html') {
+			if($content['mimeType'] == 'html')
+			{
 				$before = $disableRuler ? '' : '<hr style="border:1px dotted silver; width:100%;">';
 				$inbetween = '';
-			} else {
+			}
+			else
+			{
 				$before = ($disableRuler ?"\r\n\r\n":"\r\n\r\n-- \r\n");
 				$inbetween = "\r\n";
 			}
@@ -1183,7 +1316,10 @@ 
 		foreach(Mail\Account::search(true,false) as $acc_id => $account)
 		{
 			// do NOT add SMTP only accounts as identities
-			if (!$account->is_imap(false)) continue;
+			if (!$account->is_imap(false))
+			{
+				continue;
+			}
 
 			foreach($account->identities($acc_id) as $ident_id => $identity)
 			{
@@ -1196,16 +1332,24 @@ 
 		//$content['bcc'] = array('kl@egroupware.org','kl@leithoff.net');
 		// address stuff like from, to, cc, replyto
 		$destinationRows = 0;
-		foreach(self::$destinations as $destination) {
+		foreach(self::$destinations as $destination)
+		{
 			if (!is_array($content[$destination]))
 			{
-				if (!empty($content[$destination])) $content[$destination] = (array)$content[$destination];
+				if (!empty($content[$destination]))
+				{
+					$content[$destination] = (array)$content[$destination];
+				}
 			}
 			$addr_content = $content[strtolower($destination)];
 			// we clear the given address array and rebuild it
 			unset($content[strtolower($destination)]);
-			foreach((array)$addr_content as $key => $value) {
-				if ($value=="NIL@NIL") continue;
+			foreach((array)$addr_content as $key => $value)
+			{
+				if ($value=="NIL@NIL")
+				{
+					continue;
+				}
 				if ($destination=='replyto' && str_replace('"','',$value) ==
 					str_replace('"','',$identities[$this->mail_bo->getDefaultIdentity()]))
 				{
@@ -1215,8 +1359,12 @@ 
 				}
 				//error_log(__METHOD__.__LINE__.array2string(array('key'=>$key,'value'=>$value)));
 				$value = str_replace("\"\"",'"', htmlspecialchars_decode($value, ENT_COMPAT));
-				foreach(Mail::parseAddressList($value) as $addressObject) {
-					if ($addressObject->host == '.SYNTAX-ERROR.') continue;
+				foreach(Mail::parseAddressList($value) as $addressObject)
+				{
+					if ($addressObject->host == '.SYNTAX-ERROR.')
+					{
+						continue;
+					}
 					$address = imap_rfc822_write_address($addressObject->mailbox,$addressObject->host,$addressObject->personal);
 					//$address = Mail::htmlentities($address, $this->displayCharset);
 					$content[strtolower($destination)][]=$address;
@@ -1227,11 +1375,20 @@ 
 		if ($_content)
 		{
 			//input array of _content had no signature information but was seeded later, and content has a valid setting
-			if (!$_contentHasSigID && $content['mailidentity'] && array_key_exists('mailidentity',$_content)) unset($_content['mailidentity']);
+			if (!$_contentHasSigID && $content['mailidentity'] && array_key_exists('mailidentity',$_content))
+			{
+				unset($_content['mailidentity']);
+			}
 			$content = array_merge($content,$_content);
 
-			if (!empty($content['folder'])) $sel_options['folder']=$this->ajax_searchFolder(0,true);
-			if (empty($content['mailaccount'])) $content['mailaccount'] = $this->mail_bo->profileID;
+			if (!empty($content['folder']))
+			{
+				$sel_options['folder']=$this->ajax_searchFolder(0,true);
+			}
+			if (empty($content['mailaccount']))
+			{
+				$content['mailaccount'] = $this->mail_bo->profileID;
+			}
 		}
 		else
 		{
@@ -1274,11 +1431,17 @@ 
 		//error_log(__METHOD__.__LINE__.' ComposeID:'.$preserv['composeID']);
 		$preserv['is_html'] = $content['is_html'];
 		$preserv['is_plain'] = $content['is_plain'];
-		if (isset($content['mimeType'])) $preserv['mimeType'] = $content['mimeType'];
+		if (isset($content['mimeType']))
+		{
+			$preserv['mimeType'] = $content['mimeType'];
+		}
 		$sel_options['mimeType'] = self::$mimeTypes;
 		$sel_options['priority'] = self::$priorities;
 		$sel_options['filemode'] = Vfs\Sharing::$modes;
-		if (!isset($content['priority']) || empty($content['priority'])) $content['priority']=3;
+		if (!isset($content['priority']) || empty($content['priority']))
+		{
+			$content['priority']=3;
+		}
 		//$GLOBALS['egw_info']['flags']['currentapp'] = 'mail';//should not be needed
 		$etpl = new Etemplate('mail.compose');
 
@@ -1325,9 +1488,12 @@ 
 		$preserv['list-id'] = $content['list-id'];
 		$preserv['mode'] = $content['mode'];
 		// convert it back to checkbox expectations
-		if($content['mimeType'] == 'html') {
+		if($content['mimeType'] == 'html')
+		{
 			$content['mimeType']=1;
-		} else {
+		}
+		else
+		{
 			$content['mimeType']=0;
 		}
 		// set the current selected mailaccount as param for folderselection
@@ -1352,7 +1518,10 @@ 
 		// Resolve distribution list before send content to client
 		foreach(array('to', 'cc', 'bcc', 'replyto')  as $f)
 		{
-			if (is_array($content[$f])) $content[$f]= self::resolveEmailAddressList ($content[$f]);
+			if (is_array($content[$f]))
+			{
+				$content[$f]= self::resolveEmailAddressList ($content[$f]);
+			}
 		}
 
 		$content['to'] = self::resolveEmailAddressList($content['to']);
@@ -1400,7 +1569,10 @@ 
 				case 'composefromdraft':
 				case 'composeasnew':
 					$content = $this->getDraftData($icServer, $folder, $msgUID, $part_id);
-					if ($from =='composefromdraft') $content['mode'] = 'composefromdraft';
+					if ($from =='composefromdraft')
+					{
+						$content['mode'] = 'composefromdraft';
+					}
 					$content['processedmail_id'] = $mail_id;
 
 					$_focusElement = 'body';
@@ -1448,7 +1620,10 @@ 
 			$document_merge = new $merge_class();
 			$this->mail_bo->openConnection();
 			$merge_ids = $_REQUEST['preset']['mailtocontactbyid'] ? $_REQUEST['preset']['mailtocontactbyid'] : $mail_id;
-			if (!is_array($merge_ids)) $merge_ids = explode(',',$merge_ids);
+			if (!is_array($merge_ids))
+			{
+				$merge_ids = explode(',',$merge_ids);
+			}
 			try
 			{
 				$merged_mail_id = '';
@@ -1479,7 +1654,10 @@ 
 				{
 					$success = implode(', ',$results['success']);
 					$fail = implode(', ', $results['failed']);
-					if($success) Framework::message($success, 'success');
+					if($success)
+					{
+						Framework::message($success, 'success');
+					}
 					Framework::window_close($fail);
 				}
 			}
@@ -1511,17 +1689,25 @@ 
 	{
 		$stripalltags = true;
 		// third param is stripalltags, we may not need that, if the source is already in ascii
-		if (!$sourceishtml) $stripalltags=false;
+		if (!$sourceishtml)
+		{
+			$stripalltags=false;
+		}
 		return Api\Mail\Html::convertHTMLToText($_html,$this->displayCharset,$stripcrl,$stripalltags);
 	}
 
 	function generateRFC822Address($_addressObject)
 	{
-		if($_addressObject->personal && $_addressObject->mailbox && $_addressObject->host) {
+		if($_addressObject->personal && $_addressObject->mailbox && $_addressObject->host)
+		{
 			return sprintf('"%s" <%s@%s>', $this->mail_bo->decode_header($_addressObject->personal), $_addressObject->mailbox, $this->mail_bo->decode_header($_addressObject->host,'FORCE'));
-		} elseif($_addressObject->mailbox && $_addressObject->host) {
+		}
+		elseif($_addressObject->mailbox && $_addressObject->host)
+		{
 			return sprintf("%s@%s", $_addressObject->mailbox, $this->mail_bo->decode_header($_addressObject->host,'FORCE'));
-		} else {
+		}
+		else
+		{
 			return $this->mail_bo->decode_header($_addressObject->mailbox,true);
 		}
 	}
@@ -1555,16 +1741,28 @@ 
 		//if ($addHeadInfo['THREAD-TOPIC']) $this->sessionData['thread-topic'] = $addHeadInfo['THREAD-TOPIC'];
 
 		//error_log(__METHOD__.__LINE__.array2string($headers));
-		if (!empty($addHeadInfo['X-MAILFOLDER'])) {
-			foreach ( explode('|',$addHeadInfo['X-MAILFOLDER']) as $val ) {
+		if (!empty($addHeadInfo['X-MAILFOLDER']))
+		{
+			foreach ( explode('|',$addHeadInfo['X-MAILFOLDER']) as $val )
+			{
 				$fval=$val;
 				$icServerID = $mail_bo->icServer->ImapServerId;
-				if (stripos($val,'::')!==false) list($icServerID,$fval) = explode('::',$val,2);
-				if ($icServerID != $mail_bo->icServer->ImapServerId) continue;
-				if ($mail_bo->folderExists($fval)) $this->sessionData['folder'][] = $val;
+				if (stripos($val,'::')!==false)
+				{
+					list($icServerID,$fval) = explode('::',$val,2);
+				}
+				if ($icServerID != $mail_bo->icServer->ImapServerId)
+				{
+					continue;
+				}
+				if ($mail_bo->folderExists($fval))
+				{
+					$this->sessionData['folder'][] = $val;
+				}
 			}
 		}
-		if (!empty($addHeadInfo['X-MAILIDENTITY'])) {
+		if (!empty($addHeadInfo['X-MAILIDENTITY']))
+		{
 			// with the new system it would be the identity
 			try
 			{
@@ -1580,7 +1778,8 @@ 
 			$this->sessionData['stationeryID'] = $addHeadInfo['X-STATIONERY'];
 		}
 		*/
-		if (!empty($addHeadInfo['X-MAILACCOUNT'])) {
+		if (!empty($addHeadInfo['X-MAILACCOUNT']))
+		{
 			// with the new system it would the identity is the account id
 			try
 			{
@@ -1595,27 +1794,38 @@ 
 			}
 		}
 		// if the message is located within the draft folder, add it as last drafted version (for possible cleanup on abort))
-		if ($mail_bo->isDraftFolder($_folder)) $this->sessionData['lastDrafted'] = mail_ui::generateRowID($this->mail_bo->profileID, $_folder, $_uid);//array('uid'=>$_uid,'folder'=>$_folder);
+		if ($mail_bo->isDraftFolder($_folder))
+		{
+			$this->sessionData['lastDrafted'] = mail_ui::generateRowID($this->mail_bo->profileID, $_folder, $_uid);
+		}
+		//array('uid'=>$_uid,'folder'=>$_folder);
 		$this->sessionData['uid'] = $_uid;
 		$this->sessionData['messageFolder'] = $_folder;
 		$this->sessionData['isDraft'] = true;
 		$foundAddresses = array();
-		foreach((array)$headers['CC'] as $val) {
+		foreach((array)$headers['CC'] as $val)
+		{
 			$rfcAddr=Mail::parseAddressList($val);
 			$_rfcAddr = $rfcAddr[0];
-			if (!$_rfcAddr->valid) continue;
-			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (!$_rfcAddr->mailbox && !$_rfcAddr->host) ) {
+			if (!$_rfcAddr->valid)
+			{
+				continue;
+			}
+			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (!$_rfcAddr->mailbox && !$_rfcAddr->host) )
+			{
 				continue;
 			}
 			$keyemail=$_rfcAddr->mailbox.'@'.$_rfcAddr->host;
-			if(!$foundAddresses[$keyemail]) {
+			if(!$foundAddresses[$keyemail])
+			{
 				$address = $this->mail_bo->decode_header($val,true);
 				$this->sessionData['cc'][] = $val;
 				$foundAddresses[$keyemail] = true;
 			}
 		}
 
-		foreach((array)$headers['TO'] as $val) {
+		foreach((array)$headers['TO'] as $val)
+		{
 			if(!is_array($val))
 			{
 				$this->sessionData['to'][] = $val;
@@ -1623,42 +1833,59 @@ 
 			}
 			$rfcAddr=Mail::parseAddressList($val);
 			$_rfcAddr = $rfcAddr[0];
-			if (!$_rfcAddr->valid) continue;
-			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (!$_rfcAddr->mailbox && !$_rfcAddr->host) ) {
+			if (!$_rfcAddr->valid)
+			{
+				continue;
+			}
+			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (!$_rfcAddr->mailbox && !$_rfcAddr->host) )
+			{
 				continue;
 			}
 			$keyemail=$_rfcAddr->mailbox.'@'.$_rfcAddr->host;
-			if(!$foundAddresses[$keyemail]) {
+			if(!$foundAddresses[$keyemail])
+			{
 				$address = $this->mail_bo->decode_header($val,true);
 				$this->sessionData['to'][] = $val;
 				$foundAddresses[$keyemail] = true;
 			}
 		}
 
-		foreach((array)$headers['REPLY-TO'] as $val) {
+		foreach((array)$headers['REPLY-TO'] as $val)
+		{
 			$rfcAddr=Mail::parseAddressList($val);
 			$_rfcAddr = $rfcAddr[0];
-			if (!$_rfcAddr->valid) continue;
-			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (empty($_rfcAddr->mailbox) && empty($_rfcAddr->host)) ) {
+			if (!$_rfcAddr->valid)
+			{
+				continue;
+			}
+			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (empty($_rfcAddr->mailbox) && empty($_rfcAddr->host)) )
+			{
 				continue;
 			}
 			$keyemail=$_rfcAddr->mailbox.'@'.$_rfcAddr->host;
-			if(!$foundAddresses[$keyemail]) {
+			if(!$foundAddresses[$keyemail])
+			{
 				$address = $this->mail_bo->decode_header($val,true);
 				$this->sessionData['replyto'][] = $val;
 				$foundAddresses[$keyemail] = true;
 			}
 		}
 
-		foreach((array)$headers['BCC'] as $val) {
+		foreach((array)$headers['BCC'] as $val)
+		{
 			$rfcAddr=Mail::parseAddressList($val);
 			$_rfcAddr = $rfcAddr[0];
-			if (!$_rfcAddr->valid) continue;
-			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (empty($_rfcAddr->mailbox) && empty($_rfcAddr->host)) ) {
+			if (!$_rfcAddr->valid)
+			{
+				continue;
+			}
+			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (empty($_rfcAddr->mailbox) && empty($_rfcAddr->host)) )
+			{
 				continue;
 			}
 			$keyemail=$_rfcAddr->mailbox.'@'.$_rfcAddr->host;
-			if(!$foundAddresses[$keyemail]) {
+			if(!$foundAddresses[$keyemail])
+			{
 				$address = $this->mail_bo->decode_header($val,true);
 				$this->sessionData['bcc'][] = $val;
 				$foundAddresses[$keyemail] = true;
@@ -1672,32 +1899,46 @@ 
 		$bodyParts = $mail_bo->getMessageBody($_uid,'always_display', $_partID);
 		//_debug_array($bodyParts);
 		#$fromAddress = ($headers['FROM'][0]['PERSONAL_NAME'] != 'NIL') ? $headers['FROM'][0]['RFC822_EMAIL'] : $headers['FROM'][0]['EMAIL'];
-		if($bodyParts['0']['mimeType'] == 'text/html') {
+		if($bodyParts['0']['mimeType'] == 'text/html')
+		{
 			$this->sessionData['mimeType'] 	= 'html';
 
-			for($i=0; $i<count($bodyParts); $i++) {
-				if($i>0) {
+			for($i=0; $i<count($bodyParts); $i++)
+			{
+				if($i>0)
+				{
 					$this->sessionData['body'] .= '<hr>';
 				}
-				if($bodyParts[$i]['mimeType'] == 'text/plain') {
+				if($bodyParts[$i]['mimeType'] == 'text/plain')
+				{
 					#$bodyParts[$i]['body'] = nl2br($bodyParts[$i]['body']);
 					$bodyParts[$i]['body'] = "<pre>".$bodyParts[$i]['body']."</pre>";
 				}
-				if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
+				if ($bodyParts[$i]['charSet']===false)
+				{
+					$bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
+				}
 				$bodyParts[$i]['body'] = Api\Translation::convert_jsonsafe($bodyParts[$i]['body'], $bodyParts[$i]['charSet']);
 				#error_log( "GetDraftData (HTML) CharSet:".mb_detect_encoding($bodyParts[$i]['body'] . 'a' , strtoupper($bodyParts[$i]['charSet']).','.strtoupper($this->displayCharset).',UTF-8, ISO-8859-1'));
 				$this->sessionData['body'] .= ($i>0?"<br>":""). $bodyParts[$i]['body'] ;
 			}
 			$this->sessionData['body'] = mail_ui::resolve_inline_images($this->sessionData['body'], $_folder, $_uid, $_partID);
 
-		} else {
+		}
+		else
+		{
 			$this->sessionData['mimeType']	= 'plain';
 
-			for($i=0; $i<count($bodyParts); $i++) {
-				if($i>0) {
+			for($i=0; $i<count($bodyParts); $i++)
+			{
+				if($i>0)
+				{
 					$this->sessionData['body'] .= "<hr>";
 				}
-				if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
+				if ($bodyParts[$i]['charSet']===false)
+				{
+					$bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
+				}
 				$bodyParts[$i]['body'] = Api\Translation::convert_jsonsafe($bodyParts[$i]['body'], $bodyParts[$i]['charSet']);
 				#error_log( "GetDraftData (Plain) CharSet".mb_detect_encoding($bodyParts[$i]['body'] . 'a' , strtoupper($bodyParts[$i]['charSet']).','.strtoupper($this->displayCharset).',UTF-8, ISO-8859-1'));
 				$this->sessionData['body'] .= ($i>0?"\r\n":""). $bodyParts[$i]['body'] ;
@@ -1705,8 +1946,10 @@ 
 			$this->sessionData['body'] = mail_ui::resolve_inline_images($this->sessionData['body'], $_folder, $_uid, $_partID,'plain');
 		}
 
-		if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID))) {
-			foreach($attachments as $attachment) {
+		if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID)))
+		{
+			foreach($attachments as $attachment)
+			{
 				//error_log(__METHOD__.__LINE__.array2string($attachment));
 				$cid = $attachment['cid'];
 				$match=null;
@@ -1729,7 +1972,8 @@ 
 
 	function getErrorInfo()
 	{
-		if(isset($this->errorInfo)) {
+		if(isset($this->errorInfo))
+		{
 			$errorInfo = $this->errorInfo;
 			unset($this->errorInfo);
 			return $errorInfo;
@@ -1744,7 +1988,8 @@ 
 			$modebuff = $this->mailPreferences['message_forwarding'];
 			$this->mailPreferences['message_forwarding'] = $_mode;
 		}
-		if  ($this->mailPreferences['message_forwarding'] == 'inline') {
+		if  ($this->mailPreferences['message_forwarding'] == 'inline')
+		{
 			$this->getReplyData('forward', $_icServer, $_folder, $_uid, $_partID);
 		}
 		$mail_bo    = $this->mail_bo;
@@ -1761,12 +2006,16 @@ 
 		//$this->sessionData['sourceFolder']=$_folder;
 		//$this->sessionData['forwardFlag']='forwarded';
 		//$this->sessionData['forwardedUID']=$_uid;
-		if  ($this->mailPreferences['message_forwarding'] == 'asmail') {
+		if  ($this->mailPreferences['message_forwarding'] == 'asmail')
+		{
 			$this->sessionData['mimeType']  = $this->mailPreferences['composeOptions'];
 			if($headers['SIZE'])
-				$size				= $headers['SIZE'];
-			else
-				$size				= lang('unknown');
+			{
+							$size				= $headers['SIZE'];
+			}
+			else {
+							$size				= lang('unknown');
+			}
 
 			$this->addMessageAttachment($_uid, $_partID, $_folder,
 				$mail_bo->decode_header(($headers['SUBJECT']?$headers['SUBJECT']:lang('no subject'))).'.eml',
@@ -1777,9 +2026,11 @@ 
 			unset($this->sessionData['in-reply-to']);
 			unset($this->sessionData['to']);
 			unset($this->sessionData['cc']);
-			if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID,null,true,false,false))) {
+			if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID,null,true,false,false)))
+			{
 				//error_log(__METHOD__.__LINE__.':'.array2string($attachments));
-				foreach($attachments as $attachment) {
+				foreach($attachments as $attachment)
+				{
 					if (!($attachment['cid'] && preg_match("/image\//",$attachment['mimeType'])) || $attachment['disposition'] == 'attachment')
 					{
 						$this->addMessageAttachment($_uid, $attachment['partID'],
@@ -1835,7 +2086,10 @@ 
 			{
 				if ($attach['name'] && $attach['name'] == $_formData['name'] &&
 					strtolower($_formData['type'])== strtolower($attach['type']) &&
-					stripos($_formData['file'],'vfs://') !== false) return;
+					stripos($_formData['file'],'vfs://') !== false)
+				{
+					return;
+				}
 			}
 		}
 		if ($attachfailed === false)
@@ -1847,7 +2101,10 @@ 
 				'tmp_name'	=> $tmpFileName,
 				'size'	=> $_formData['size']
 			);
-			if (!is_array($_content['attachments'])) $_content['attachments']=array();
+			if (!is_array($_content['attachments']))
+			{
+				$_content['attachments']=array();
+			}
 			$_content['attachments'][] = $buffer;
 			unset($buffer);
 		}
@@ -1878,7 +2135,10 @@ 
 		{
 			foreach($request->preserv['attachments'] as $attachment)
 			{
-				if ($_GET['tmpname'] === $attachment['tmp_name']) break;
+				if ($_GET['tmpname'] === $attachment['tmp_name'])
+				{
+					break;
+				}
 			}
 		}
 		if (!$request || $_GET['tmpname'] !== $attachment['tmp_name'])
@@ -1912,10 +2172,20 @@ 
 				$sfxMimeType = $attachment['type'];
 				$buff = explode('.',$attachment['tmp_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);
+				if (is_array($buff))
+				{
+					$suffix = array_pop($buff);
+				}
+				// take the last extension to check with ext2mime
+				if (!empty($suffix))
+				{
+					$sfxMimeType = Api\MimeMagic::ext2mime($suffix);
+				}
 				$attachment['type'] = $sfxMimeType;
-				if (strtoupper($sfxMimeType) == 'TEXT/VCARD' || strtoupper($sfxMimeType) == 'TEXT/X-VCARD') $attachment['type'] = strtoupper($sfxMimeType);
+				if (strtoupper($sfxMimeType) == 'TEXT/VCARD' || strtoupper($sfxMimeType) == 'TEXT/X-VCARD')
+				{
+					$attachment['type'] = strtoupper($sfxMimeType);
+				}
 			}
 			//error_log(__METHOD__.print_r($attachment,true));
 			if (strtoupper($attachment['type']) == 'TEXT/CALENDAR' || strtoupper($attachment['type']) == 'TEXT/X-VCALENDAR')
@@ -1924,7 +2194,10 @@ 
 				$calendar_ical = new calendar_ical();
 				$eventid = $calendar_ical->search($attachment['attachment'],-1);
 				//error_log(__METHOD__.array2string($eventid));
-				if (!$eventid) $eventid = -1;
+				if (!$eventid)
+				{
+					$eventid = -1;
+				}
 				$event = $calendar_ical->importVCal($attachment['attachment'],(is_array($eventid)?$eventid[0]:$eventid),null,true);
 				//error_log(__METHOD__.$event);
 				if ((int)$event > 0)
@@ -1950,7 +2223,10 @@ 
 					//error_log(__METHOD__.__LINE__.print_r($vcard,true));
 					$contact = $addressbook_vcal->find_contact($vcard,false);
 				}
-				if (!$contact) $contact = null;
+				if (!$contact)
+				{
+					$contact = null;
+				}
 				// if there are not enough fields in the vcard (or the parser was unable to correctly parse the vcard (as of VERSION:3.0 created by MSO))
 				if ($contact || count($vcard)>2)
 				{
@@ -1981,7 +2257,8 @@ 
 	 * @param string haystack
 	 * @return boolean
 	 */
-	function testIfOneKeyInArrayDoesExistInString($arrayToTestAgainst,$haystack) {
+	function testIfOneKeyInArrayDoesExistInString($arrayToTestAgainst,$haystack)
+	{
 		foreach (array_keys($arrayToTestAgainst) as $k)
 		{
 			//error_log(__METHOD__.__LINE__.':'.$k.'<->'.$haystack);
@@ -2038,21 +2315,34 @@ 
 		// thread-topic is a proprietary microsoft header and deprecated with the current version
 		// horde does not support the encoding of thread-topic, and probably will not no so in the future
 		//if ($headers['THREAD-TOPIC']) $this->sessionData['thread-topic'] = $headers['THREAD-TOPIC'];
-		if ($headers['THREAD-INDEX']) $this->sessionData['thread-index'] = $headers['THREAD-INDEX'];
-		if ($headers['LIST-ID']) $this->sessionData['list-id'] = $headers['LIST-ID'];
+		if ($headers['THREAD-INDEX'])
+		{
+			$this->sessionData['thread-index'] = $headers['THREAD-INDEX'];
+		}
+		if ($headers['LIST-ID'])
+		{
+			$this->sessionData['list-id'] = $headers['LIST-ID'];
+		}
 		//error_log(__METHOD__.__LINE__.' Mode:'.$_mode.':'.array2string($headers));
 		// check for Reply-To: header and use if available
-		if(!empty($headers['REPLY-TO']) && ($headers['REPLY-TO'] != $headers['FROM'])) {
-			foreach($headers['REPLY-TO'] as $val) {
-				if(!$foundAddresses[$val]) {
+		if(!empty($headers['REPLY-TO']) && ($headers['REPLY-TO'] != $headers['FROM']))
+		{
+			foreach($headers['REPLY-TO'] as $val)
+			{
+				if(!$foundAddresses[$val])
+				{
 					$oldTo[] = $val;
 					$foundAddresses[$val] = true;
 				}
 			}
 			$oldToAddress	= (is_array($headers['REPLY-TO'])?$headers['REPLY-TO'][0]:$headers['REPLY-TO']);
-		} else {
-			foreach($headers['FROM'] as $val) {
-				if(!$foundAddresses[$val]) {
+		}
+		else
+		{
+			foreach($headers['FROM'] as $val)
+			{
+				if(!$foundAddresses[$val])
+				{
 					$oldTo[] = $val;
 					$foundAddresses[$val] = true;
 				}
@@ -2060,18 +2350,23 @@ 
 			$oldToAddress	= (is_array($headers['FROM'])?$headers['FROM'][0]:$headers['FROM']);
 		}
 		//error_log(__METHOD__.__LINE__.' OldToAddress:'.$oldToAddress.'#');
-		if($_mode != 'all' || ($_mode == 'all' && !empty($oldToAddress) && !$this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$oldToAddress)) ) {
+		if($_mode != 'all' || ($_mode == 'all' && !empty($oldToAddress) && !$this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$oldToAddress)) )
+		{
 			$this->sessionData['to'] = $oldTo;
 		}
 
-		if($_mode == 'all') {
+		if($_mode == 'all')
+		{
 			// reply to any address which is cc, but not to my self
 			#if($headers->cc) {
-				foreach($headers['CC'] as $val) {
-					if($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$val)) {
+				foreach($headers['CC'] as $val)
+				{
+					if($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$val))
+					{
 						continue;
 					}
-					if(!$foundAddresses[$val]) {
+					if(!$foundAddresses[$val])
+					{
 						$this->sessionData['cc'][] = $val;
 						$foundAddresses[$val] = true;
 					}
@@ -2080,11 +2375,14 @@ 
 
 			// reply to any address which is to, but not to my self
 			#if($headers->to) {
-				foreach($headers['TO'] as $val) {
-					if($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$val)) {
+				foreach($headers['TO'] as $val)
+				{
+					if($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$val))
+					{
 						continue;
 					}
-					if(!$foundAddresses[$val]) {
+					if(!$foundAddresses[$val])
+					{
 						$this->sessionData['to'][] = $val;
 						$foundAddresses[$val] = true;
 					}
@@ -2092,12 +2390,15 @@ 
 			#}
 
 			#if($headers->from) {
-				foreach($headers['FROM'] as $val) {
-					if($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$val)) {
+				foreach($headers['FROM'] as $val)
+				{
+					if($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$val))
+					{
 						continue;
 					}
 					//error_log(__METHOD__.__LINE__.' '.$val);
-					if(!$foundAddresses[$val]) {
+					if(!$foundAddresses[$val])
+					{
 						$this->sessionData['to'][] = $val;
 						$foundAddresses[$val] = true;
 					}
@@ -2106,9 +2407,12 @@ 
 		}
 
 		// check for Re: in subject header
-		if(strtolower(substr(trim($mail_bo->decode_header($headers['SUBJECT'])), 0, 3)) == "re:") {
+		if(strtolower(substr(trim($mail_bo->decode_header($headers['SUBJECT'])), 0, 3)) == "re:")
+		{
 			$this->sessionData['subject'] = $mail_bo->decode_header($headers['SUBJECT']);
-		} else {
+		}
+		else
+		{
 			$this->sessionData['subject'] = "Re: " . $mail_bo->decode_header($headers['SUBJECT']);
 		}
 
@@ -2122,7 +2426,8 @@ 
 
 		$toAddressA = array();
 		$toAddress = '';
-		foreach ($headers['TO'] as $mailheader) {
+		foreach ($headers['TO'] as $mailheader)
+		{
 			$toAddressA[] =  $mailheader;
 		}
 		if (count($toAddressA)>0)
@@ -2132,7 +2437,8 @@ 
 		}
 		$ccAddressA = array();
 		$ccAddress = '';
-		foreach ($headers['CC'] as $mailheader) {
+		foreach ($headers['CC'] as $mailheader)
+		{
 			$ccAddressA[] =  $mailheader;
 		}
 		if (count($ccAddressA)>0)
@@ -2140,25 +2446,35 @@ 
 			$ccAddress = implode(', ', str_replace(array('<','>'),array('[',']'),$ccAddressA));
 			$ccAddress = @htmlspecialchars(lang("cc")).": ".$ccAddress.($bodyParts['0']['mimeType'] == 'text/html'?"<br>":"\r\n");
 		}
-		if($bodyParts['0']['mimeType'] == 'text/html') {
+		if($bodyParts['0']['mimeType'] == 'text/html')
+		{
 			$this->sessionData['body']	= /*"<br>".*//*"&nbsp;".*/"<div>".'----------------'.lang("original message").'-----------------'."".'<br>'.
 				@htmlspecialchars(lang("from")).": ".$fromAddress."<br>".
 				$toAddress.$ccAddress.
 				@htmlspecialchars(lang("date").": ".$headers['DATE'],ENT_QUOTES | ENT_IGNORE,Mail::$displayCharset, false)."<br>".
 				'----------------------------------------------------------'."</div>";
 			$this->sessionData['mimeType'] 	= 'html';
-			if (!empty($styles)) $this->sessionData['body'] .= $styles;
+			if (!empty($styles))
+			{
+				$this->sessionData['body'] .= $styles;
+			}
 			$this->sessionData['body']	.= '<blockquote type="cite">';
 
-			for($i=0; $i<count($bodyParts); $i++) {
-				if($i>0) {
+			for($i=0; $i<count($bodyParts); $i++)
+			{
+				if($i>0)
+				{
 					$this->sessionData['body'] .= '<hr>';
 				}
-				if($bodyParts[$i]['mimeType'] == 'text/plain') {
+				if($bodyParts[$i]['mimeType'] == 'text/plain')
+				{
 					#$bodyParts[$i]['body'] = nl2br($bodyParts[$i]['body'])."<br>";
 					$bodyParts[$i]['body'] = "<pre>".$bodyParts[$i]['body']."</pre>";
 				}
-				if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
+				if ($bodyParts[$i]['charSet']===false)
+				{
+					$bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
+				}
 
 				$_htmlConfig = Mail::$htmLawed_config;
 				Mail::$htmLawed_config['comment'] = 2;
@@ -2170,7 +2486,9 @@ 
 
 			$this->sessionData['body']	.= '</blockquote><br>';
 			$this->sessionData['body'] =  mail_ui::resolve_inline_images($this->sessionData['body'], $_folder, $_uid, $_partID, 'html');
-		} else {
+		}
+		else
+		{
 			//$this->sessionData['body']	= @htmlspecialchars(lang("on")." ".$headers['DATE']." ".$mail_bo->decode_header($fromAddress), ENT_QUOTES) . " ".lang("wrote").":\r\n";
 			// take care the way the ReplyHeader is created here, is used later on in uicompose::compose, in case you force replys to be HTML (prefs)
             $this->sessionData['body']  = " \r\n \r\n".'----------------'.lang("original message").'-----------------'."\r\n".
@@ -2180,8 +2498,10 @@ 
                 '-------------------------------------------------'."\r\n \r\n ";
 			$this->sessionData['mimeType']	= 'plain';
 
-			for($i=0; $i<count($bodyParts); $i++) {
-				if($i>0) {
+			for($i=0; $i<count($bodyParts); $i++)
+			{
+				if($i>0)
+				{
 					$this->sessionData['body'] .= "<hr>";
 				}
 
@@ -2192,7 +2512,8 @@ 
 				$this->sessionData['body'] .= "\r\n";
 				$hasSignature = false;
 				// create body new, with good line breaks and indention
-				foreach(explode("\n",$newBody) as $value) {
+				foreach(explode("\n",$newBody) as $value)
+				{
 					// the explode is removing the character
 					//$value .= 'ee';
 
@@ -2203,8 +2524,12 @@ 
 						continue;
 					}
 
-					if ($hasSignature)	continue;
-					if (trim($value) != '') {
+					if ($hasSignature)
+					{
+						continue;
+					}
+					if (trim($value) != '')
+					{
 						#if ($value != "\r") $value .= "\n";
 					}
 					$numberOfChars = strspn(trim($value), ">");
@@ -2212,9 +2537,12 @@ 
 
 					$bodyAppend = $this->mail_bo->wordwrap($value, 76-strlen("\r\n$appendString "), "\r\n$appendString ",'>');
 
-					if($bodyAppend[0] == '>') {
+					if($bodyAppend[0] == '>')
+					{
 						$bodyAppend = '>'. $bodyAppend;
-					} else {
+					}
+					else
+					{
 						$bodyAppend = '> '. $bodyAppend;
 					}
 
@@ -2263,9 +2591,12 @@ 
 
 	static function _getHostName()
 	{
-		if (isset($_SERVER['SERVER_NAME'])) {
+		if (isset($_SERVER['SERVER_NAME']))
+		{
 			$result = $_SERVER['SERVER_NAME'];
-		} else {
+		}
+		else
+		{
 			$result = 'localhost.localdomain';
 		}
 		return $result;
@@ -2303,11 +2634,16 @@ 
 
 		$_mailObject->addHeader('X-Priority', $_formData['priority']);
 		$_mailObject->addHeader('X-Mailer', 'EGroupware-Mail');
-		if(!empty($_formData['in-reply-to'])) {
-			if (stripos($_formData['in-reply-to'],'<')===false) $_formData['in-reply-to']='<'.trim($_formData['in-reply-to']).'>';
+		if(!empty($_formData['in-reply-to']))
+		{
+			if (stripos($_formData['in-reply-to'],'<')===false)
+			{
+				$_formData['in-reply-to']='<'.trim($_formData['in-reply-to']).'>';
+			}
 			$_mailObject->addHeader('In-Reply-To', $_formData['in-reply-to']);
 		}
-		if(!empty($_formData['references'])) {
+		if(!empty($_formData['references']))
+		{
 			if (stripos($_formData['references'],'<')===false)
 			{
 				$_formData['references']='<'.trim($_formData['references']).'>';
@@ -2315,28 +2651,38 @@ 
 			$_mailObject->addHeader('References', $_formData['references']);
 		}
 
-		if(!empty($_formData['thread-index'])) {
+		if(!empty($_formData['thread-index']))
+		{
 			$_mailObject->addHeader('Thread-Index', $_formData['thread-index']);
 		}
-		if(!empty($_formData['list-id'])) {
+		if(!empty($_formData['list-id']))
+		{
 			$_mailObject->addHeader('List-Id', $_formData['list-id']);
 		}
-		if($_formData['disposition']=='on') {
+		if($_formData['disposition']=='on')
+		{
 			$_mailObject->addHeader('Disposition-Notification-To', $_identity['ident_email']);
 		}
 
 		// Expand any mailing lists
 		foreach(array('to', 'cc', 'bcc', 'replyto')  as $field)
 		{
-			if ($field != 'replyto') $_formData[$field] = self::resolveEmailAddressList($_formData[$field]);
+			if ($field != 'replyto')
+			{
+				$_formData[$field] = self::resolveEmailAddressList($_formData[$field]);
+			}
 
-			if ($_formData[$field]) $_mailObject->addAddress($_formData[$field], '', $field);
+			if ($_formData[$field])
+			{
+				$_mailObject->addAddress($_formData[$field], '', $field);
+			}
 		}
 
 		$_mailObject->addHeader('Subject', $_formData['subject']);
 
 		// this should never happen since we come from the edit dialog
-		if (Mail::detect_qp($_formData['body'])) {
+		if (Mail::detect_qp($_formData['body']))
+		{
 			$_formData['body'] = preg_replace('/=\r\n/', '', $_formData['body']);
 			$_formData['body'] = quoted_printable_decode($_formData['body']);
 		}
@@ -2389,7 +2735,10 @@ 
 				$_mailObject->setBody($this->convertHTMLToText($body, true, true));
 			}
 			// convert URL Images to inline images - if possible
-			if (!$_autosaving) $inline_images = Mail::processURL2InlineImages($_mailObject, $body, $mail_bo);
+			if (!$_autosaving)
+			{
+				$inline_images = Mail::processURL2InlineImages($_mailObject, $body, $mail_bo);
+			}
 			if (strpos($body,"<!-- HTMLSIGBEGIN -->")!==false)
 			{
 				$body = str_replace(array('<!-- HTMLSIGBEGIN -->','<!-- HTMLSIGEND -->'),'',$body);
@@ -2404,10 +2753,14 @@ 
 		{
 			$body = $this->convertHTMLToText($_formData['body'],false);
 
-			if ($attachment_links) $body .= $attachment_links;
+			if ($attachment_links)
+			{
+				$body .= $attachment_links;
+			}
 
 			#$_mailObject->Body = $_formData['body'];
-			if(!empty($signature)) {
+			if(!empty($signature))
+			{
 				$body .= ($disableRuler ?"\r\n":"\r\n-- \r\n").
 					$this->convertHTMLToText($signature,true,true);
 			}
@@ -2418,10 +2771,12 @@ 
 		{
 			$connection_opened = false;
 			$tnfattachments = null;
-			foreach((array)$_formData['attachments'] as $attachment) {
+			foreach((array)$_formData['attachments'] as $attachment)
+			{
 				if(is_array($attachment))
 				{
-					if (!empty($attachment['uid']) && !empty($attachment['folder'])) {
+					if (!empty($attachment['uid']) && !empty($attachment['folder']))
+					{
 						/* Example:
 						Array([0] => Array(
 						[uid] => 21178
@@ -2437,14 +2792,18 @@ 
 							$connection_opened = true;
 						}
 						$mail_bo->reopen($attachment['folder']);
-						switch(strtoupper($attachment['type'])) {
+						switch(strtoupper($attachment['type']))
+						{
 							case 'MESSAGE/RFC':
 							case 'MESSAGE/RFC822':
 								$rawBody='';
-								if (isset($attachment['partID'])) {
+								if (isset($attachment['partID']))
+								{
 									$eml = $mail_bo->getAttachment($attachment['uid'],$attachment['partID'],0,false,true,$attachment['folder']);
 									$rawBody=$eml['attachment'];
-								} else {
+								}
+								else
+								{
 									$rawBody        = $mail_bo->getMessageRawBody($attachment['uid'], $attachment['partID'],$attachment['folder']);
 								}
 								$_mailObject->addStringAttachment($rawBody, $attachment['name'], 'message/rfc822');
@@ -2453,7 +2812,10 @@ 
 								$attachmentData	= $mail_bo->getAttachment($attachment['uid'], $attachment['partID'],0,false);
 								if ($attachmentData['type'] == 'APPLICATION/MS-TNEF')
 								{
-									if (!is_array($tnfattachments)) $tnfattachments = $mail_bo->decode_winmail($attachment['uid'], $attachment['partID']);
+									if (!is_array($tnfattachments))
+									{
+										$tnfattachments = $mail_bo->decode_winmail($attachment['uid'], $attachment['partID']);
+									}
 									foreach ($tnfattachments as $k)
 									{
 										if ($k['name'] == $attachment['name'])
@@ -2488,7 +2850,10 @@ 
 					}
 				}
 			}
-			if ($connection_opened) $mail_bo->closeConnection();
+			if ($connection_opened)
+			{
+				$mail_bo->closeConnection();
+			}
 		}
 		return is_array($inline_images)?$inline_images:array();
 	}
@@ -2508,13 +2873,20 @@ 
 	 */
 	protected function getAttachmentLinks(array $attachments, $filemode, $html, $recipients=array(), $expiration=null, $password=null)
 	{
-		if ($filemode == Vfs\Sharing::ATTACH) return '';
+		if ($filemode == Vfs\Sharing::ATTACH)
+		{
+			return '';
+		}
 
 		$links = array();
 		foreach($attachments as $attachment)
 		{
 			$path = $attachment['file'];
-			if (empty($path)) continue;	// we only care about file attachments, not forwarded messages or parts
+			if (empty($path))
+			{
+				continue;
+			}
+			// we only care about file attachments, not forwarded messages or parts
 			if (parse_url($attachment['file'],PHP_URL_SCHEME) != 'vfs')
 			{
 				$path = $GLOBALS['egw_info']['server']['temp_dir'].'/'.basename($path);
@@ -2617,13 +2989,19 @@ 
 								$success = false;
 								error_log(__METHOD__.__LINE__.$msg);
 							}
-						} else {
+						}
+						else
+						{
 							error_log(__METHOD__.__LINE__.': original message ('.$pMuid.') has attachments and lastDrafted ID ('.$duid.') equals the former');
 						}
-					} else {
+					}
+					else
+					{
 						error_log(__METHOD__.__LINE__." No current draftID (".$draft_id."), or no lastDrafted Info (".$content['lastDrafted'].") or the former being equal:".array2string($content)."(, action=$action)");
 					}
-				} else {
+				}
+				else
+				{
 					error_log(__METHOD__.__LINE__.' No headerdata found for messageUID='.$messageUid.' in Folder:'.$folder.':'.array2string($content)."(, action=$action)");
 				}
 			}
@@ -2639,7 +3017,10 @@ 
 			$success = false;
 		}
 
-		if ($success) $msg = lang('Message saved successfully.');
+		if ($success)
+		{
+			$msg = lang('Message saved successfully.');
+		}
 
 		// Include new information to json respose, because we need them in client-side callback
 		$response->data(array(
@@ -2663,7 +3044,10 @@ 
 		{
 			if(is_int($address))
 			{
-				if (!isset($contacts_obs)) $contacts_obj = new Api\Contacts();
+				if (!isset($contacts_obs))
+				{
+					$contacts_obj = new Api\Contacts();
+				}
 				// List was selected, expand to addresses
 				unset($_emailAddressList[$ak]);
 				$list = $contacts_obj->search('',array('n_fn','n_prefix','n_given','n_family','org_name','email','email_home'),'','','',False,'AND',false,array('list' =>(int)$address));
@@ -2678,7 +3062,10 @@ 
 		{
 			foreach ($addrFromList as $addr)
 			{
-				if (!empty($addr)) $_emailAddressList[]=$addr;
+				if (!empty($addr))
+				{
+					$_emailAddressList[]=$addr;
+				}
 			}
 		}
 		return is_array($_emailAddressList) ? array_values($_emailAddressList) : (array)$_emailAddressList;
@@ -2732,7 +3119,10 @@ 
 		// decide where to save the message (default to draft folder, if we find nothing else)
 		// if the current folder is in draft or template folder save it there
 		// if it is called from printview then save it with the draft folder
-		if (empty($savingDestination)) $savingDestination = $mail_bo->getDraftFolder();
+		if (empty($savingDestination))
+		{
+			$savingDestination = $mail_bo->getDraftFolder();
+		}
 		if (empty($this->sessionData['messageFolder']) && !empty($this->sessionData['mailbox']))
 		{
 			$this->sessionData['messageFolder'] = $this->sessionData['mailbox'];
@@ -2743,13 +3133,17 @@ 
 			$savingDestination = $this->sessionData['messageFolder'];
 			//error_log(__METHOD__.__LINE__.' SavingDestination:'.$savingDestination);
 		}
-		if (  !empty($_formData['printit']) && $_formData['printit'] == 0 ) $savingDestination = $mail_bo->getDraftFolder();
+		if (  !empty($_formData['printit']) && $_formData['printit'] == 0 )
+		{
+			$savingDestination = $mail_bo->getDraftFolder();
+		}
 
 		// normaly Bcc is only added to recipients, but not as header visible to all recipients
 		$mail->forceBccHeader();
 
 		$mail_bo->openConnection();
-		if ($mail_bo->folderExists($savingDestination,true)) {
+		if ($mail_bo->folderExists($savingDestination,true))
+		{
 			try
 			{
 				$messageUid = $mail_bo->appendMessage($savingDestination, $mail->getRaw(), null, $flags);
@@ -2760,7 +3154,9 @@ 
 				return false;
 			}
 
-		} else {
+		}
+		else
+		{
 			error_log(__METHOD__.__LINE__."->".lang("folder")." ". $savingDestination." ".lang("does not exist on IMAP Server."));
 			return false;
 		}
@@ -2808,7 +3204,10 @@ 
 					$fhA = mail_ui::splitRowID($rowid);
 					$this->sessionData['uid'][] = $fhA['msgUID'];
 					$this->sessionData['forwardedUID'][] = $fhA['msgUID'];
-					if (!empty($fhA['folder'])) $this->sessionData['sourceFolder'] = $fhA['folder'];
+					if (!empty($fhA['folder']))
+					{
+						$this->sessionData['sourceFolder'] = $fhA['folder'];
+					}
 				}
 			}
 			if ($_formData['mode']=='reply' && !empty($_formData['processedmail_id']))
@@ -2840,7 +3239,8 @@ 
 			#error_log($this->sessionData['body']);
 		}
 		if(empty($this->sessionData['to']) && empty($this->sessionData['cc']) &&
-		   empty($this->sessionData['bcc']) && empty($this->sessionData['folder'])) {
+		   empty($this->sessionData['bcc']) && empty($this->sessionData['folder']))
+		{
 		   	$messageIsDraft = true;
 		}
 		try
@@ -2856,7 +3256,11 @@ 
 		// create the messages and store inline images
 		$inline_images = $this->createMessage($mail, $_formData, $identity);
 		// remember the identity
-		if ($_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on') $fromAddress = $mail->From;//$mail->FromName.($mail->FromName?' <':'').$mail->From.($mail->FromName?'>':'');
+		if ($_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on')
+		{
+			$fromAddress = $mail->From;
+		}
+		//$mail->FromName.($mail->FromName?' <':'').$mail->From.($mail->FromName?'>':'');
 		#print "<pre>". $mail->getMessageHeader() ."</pre><hr><br>";
 		#print "<pre>". $mail->getMessageBody() ."</pre><hr><br>";
 		#exit;
@@ -2869,7 +3273,10 @@ 
 		{
 			$fval=$f;
 			$icServerID = $_formData['serverID'];//folders always assumed with serverID
-			if (stripos($f,'::')!==false) list($icServerID,$fval) = explode('::',$f,2);
+			if (stripos($f,'::')!==false)
+			{
+				list($icServerID,$fval) = explode('::',$f,2);
+			}
 			if ($_formData['serverID']!=$_formData['mailaccount'])
 			{
 				if ($icServerID == $_formData['serverID'] )
@@ -2910,13 +3317,19 @@ 
 			// sentFolder is account specific
 			$sentFolder = $this->mail_bo->getSentFolder();
 			//error_log(__METHOD__.__LINE__.' SentFolder configured:'.$sentFolder.'#');
-			if ($sentFolder&& $sentFolder!= 'none' && !$this->mail_bo->folderExists($sentFolder, true)) $sentFolder=false;
+			if ($sentFolder&& $sentFolder!= 'none' && !$this->mail_bo->folderExists($sentFolder, true))
+			{
+				$sentFolder=false;
+			}
 		}
 		else
 		{
 			$sentFolder = $mail_bo->getSentFolder();
 			//error_log(__METHOD__.__LINE__.' SentFolder configured:'.$sentFolder.'#');
-			if ($sentFolder&& $sentFolder!= 'none' && !$mail_bo->folderExists($sentFolder, true)) $sentFolder=false;
+			if ($sentFolder&& $sentFolder!= 'none' && !$mail_bo->folderExists($sentFolder, true))
+			{
+				$sentFolder=false;
+			}
 		}
 		//error_log(__METHOD__.__LINE__.' SentFolder configured:'.$sentFolder.'#');
 
@@ -2952,19 +3365,30 @@ 
 		{
 			if (((!isset($sentFolder)||$sentFolder==false) && $this->mailPreferences['sendOptions'] != 'send_only') ||
 				($this->mailPreferences['sendOptions'] != 'send_only' &&
-				$sentFolder != 'none')) $this->errorInfo = lang("No Send Folder set in preferences");
+				$sentFolder != 'none'))
+			{
+				$this->errorInfo = lang("No Send Folder set in preferences");
+			}
 		}
 		// draftFolder is on Server we start from
-		if($messageIsDraft == true) {
+		if($messageIsDraft == true)
+		{
 			$draftFolder = $mail_bo->getDraftFolder();
-			if(!empty($draftFolder) && $mail_bo->folderExists($draftFolder,true)) {
+			if(!empty($draftFolder) && $mail_bo->folderExists($draftFolder,true))
+			{
 				$this->sessionData['folder'] = array($draftFolder);
 				$folderOnServerID[] = $draftFolder;
 				$folder[$draftFolder] = $draftFolder;
 			}
 		}
-		if ($folderOnServerID) $folderOnServerID = array_unique($folderOnServerID);
-		if ($folderOnMailAccount) $folderOnMailAccount = array_unique($folderOnMailAccount);
+		if ($folderOnServerID)
+		{
+			$folderOnServerID = array_unique($folderOnServerID);
+		}
+		if ($folderOnMailAccount)
+		{
+			$folderOnMailAccount = array_unique($folderOnMailAccount);
+		}
 		if (($this->mailPreferences['sendOptions'] != 'send_only' && $sentFolder != 'none') &&
 			!( count($folder) > 0) &&
 			!($_formData['to_infolog']=='on' || $_formData['to_tracker']=='on'))
@@ -2978,7 +3402,8 @@ 
 		@set_time_limit(120);
 		//$mail->SMTPDebug = 10;
 		//error_log("Folder:".count(array($this->sessionData['folder']))."To:".count((array)$this->sessionData['to'])."CC:". count((array)$this->sessionData['cc']) ."bcc:".count((array)$this->sessionData['bcc']));
-		if(count((array)$this->sessionData['to']) > 0 || count((array)$this->sessionData['cc']) > 0 || count((array)$this->sessionData['bcc']) > 0) {
+		if(count((array)$this->sessionData['to']) > 0 || count((array)$this->sessionData['cc']) > 0 || count((array)$this->sessionData['bcc']) > 0)
+		{
 			try {
 				$mail->send();
 			}
@@ -2988,10 +3413,15 @@ 
 				$this->errorInfo = $e->getMessage().($e->details?'<br/>'.$e->details:'');
 				return false;
 			}
-		} else {
-			if (count(array($this->sessionData['folder']))>0 && !empty($this->sessionData['folder'])) {
+		}
+		else
+		{
+			if (count(array($this->sessionData['folder']))>0 && !empty($this->sessionData['folder']))
+			{
 				//error_log(__METHOD__.__LINE__."Folders:".print_r($this->sessionData['folder'],true));
-			} else {
+			}
+			else
+			{
 				$this->errorInfo = lang("Error: ").lang("No Address TO/CC/BCC supplied, and no folder to save message to provided.");
 				//error_log(__METHOD__.__LINE__.$this->errorInfo);
 				return false;
@@ -3001,14 +3431,16 @@ 
 		//error_log(__METHOD__.__LINE__."Number of Folders to move copy the message to:".count($folder));
 		//error_log(__METHOD__.__LINE__.array2string($folder));
 		if ((count($folder) > 0) || (isset($this->sessionData['uid']) && isset($this->sessionData['messageFolder']))
-            || (isset($this->sessionData['forwardFlag']) && isset($this->sessionData['sourceFolder']))) {
+            || (isset($this->sessionData['forwardFlag']) && isset($this->sessionData['sourceFolder'])))
+		{
 			$mail_bo = $this->mail_bo;
 			$mail_bo->openConnection();
 			//$mail_bo->reopen($this->sessionData['messageFolder']);
 			#error_log("(re)opened Connection");
 		}
 		// if copying mail to folder, or saving mail to infolog, we need to gather the needed information
-		if (count($folder) > 0 || $_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on') {
+		if (count($folder) > 0 || $_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on')
+		{
 			//error_log(__METHOD__.__LINE__.array2string($this->sessionData['bcc']));
 
 			// normaly Bcc is only added to recipients, but not as header visible to all recipients
@@ -3017,17 +3449,28 @@ 
 		// copying mail to folder
 		if (count($folder) > 0)
 		{
-			foreach($folderOnServerID as $folderName) {
-				if (is_array($folderName)) $folderName = array_shift($folderName); // should not happen at all
+			foreach($folderOnServerID as $folderName)
+			{
+				if (is_array($folderName))
+				{
+					$folderName = array_shift($folderName);
+				}
+				// should not happen at all
 				//error_log(__METHOD__.__LINE__." attempt to save message to:".array2string($folderName));
 				// if $_formData['serverID']!=$_formData['mailaccount'] skip copying to sentfolder on serverID
 				// if($_formData['serverID']!=$_formData['mailaccount'] && $folderName==$sentFolder && $changeProfileOnSentFolderNeeded) continue;
-				if ($mail_bo->folderExists($folderName,true)) {
-					if($mail_bo->isSentFolder($folderName)) {
+				if ($mail_bo->folderExists($folderName,true))
+				{
+					if($mail_bo->isSentFolder($folderName))
+					{
 						$flags = '\\Seen';
-					} elseif($mail_bo->isDraftFolder($folderName)) {
+					}
+					elseif($mail_bo->isDraftFolder($folderName))
+					{
 						$flags = '\\Draft';
-					} else {
+					}
+					else
+					{
 						$flags = '\\Seen';
 					}
 					#$mailHeader=explode('From:',$mail->getMessageHeader());
@@ -3050,18 +3493,32 @@ 
 				}
 			}
 			// if we choose to send from a differing profile
-			if ($folderOnMailAccount)  $this->changeProfile($_formData['mailaccount']);
-			foreach($folderOnMailAccount as $folderName) {
-				if (is_array($folderName)) $folderName = array_shift($folderName); // should not happen at all
+			if ($folderOnMailAccount)
+			{
+				$this->changeProfile($_formData['mailaccount']);
+			}
+			foreach($folderOnMailAccount as $folderName)
+			{
+				if (is_array($folderName))
+				{
+					$folderName = array_shift($folderName);
+				}
+				// should not happen at all
 				//error_log(__METHOD__.__LINE__." attempt to save message to:".array2string($folderName));
 				// if $_formData['serverID']!=$_formData['mailaccount'] skip copying to sentfolder on serverID
 				// if($_formData['serverID']!=$_formData['mailaccount'] && $folderName==$sentFolder && $changeProfileOnSentFolderNeeded) continue;
-				if ($this->mail_bo->folderExists($folderName,true)) {
-					if($this->mail_bo->isSentFolder($folderName)) {
+				if ($this->mail_bo->folderExists($folderName,true))
+				{
+					if($this->mail_bo->isSentFolder($folderName))
+					{
 						$flags = '\\Seen';
-					} elseif($this->mail_bo->isDraftFolder($folderName)) {
+					}
+					elseif($this->mail_bo->isDraftFolder($folderName))
+					{
 						$flags = '\\Draft';
-					} else {
+					}
+					else
+					{
 						$flags = '\\Seen';
 					}
 					#$mailHeader=explode('From:',$mail->getMessageHeader());
@@ -3083,7 +3540,10 @@ 
 					error_log(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Destination Folder %2 does not exist.",$this->sessionData['subject'],$folderName));
 				}
 			}
-			if ($folderOnMailAccount)  $this->changeProfile($_formData['serverID']);
+			if ($folderOnMailAccount)
+			{
+				$this->changeProfile($_formData['serverID']);
+			}
 
 			//$mail_bo->closeConnection();
 		}
@@ -3095,10 +3555,16 @@ 
 			$dhA = mail_ui::splitRowID($this->sessionData['lastDrafted']);
 			$lastDrafted['uid'] = $dhA['msgUID'];
 			$lastDrafted['folder'] = $dhA['folder'];
-			if (isset($lastDrafted['uid']) && !empty($lastDrafted['uid'])) $lastDrafted['uid']=trim($lastDrafted['uid']);
+			if (isset($lastDrafted['uid']) && !empty($lastDrafted['uid']))
+			{
+				$lastDrafted['uid']=trim($lastDrafted['uid']);
+			}
 			// manually drafted, do not delete
 			// will be handled later on IF mode was $_formData['mode']=='composefromdraft'
-			if (isset($lastDrafted['uid']) && (empty($lastDrafted['uid']) || $lastDrafted['uid'] == $this->sessionData['uid'])) $lastDrafted=false;
+			if (isset($lastDrafted['uid']) && (empty($lastDrafted['uid']) || $lastDrafted['uid'] == $this->sessionData['uid']))
+			{
+				$lastDrafted=false;
+			}
 			//error_log(__METHOD__.__LINE__.array2string($lastDrafted));
 		}
 		if ($lastDrafted && is_array($lastDrafted) && $mail_bo->isDraftFolder($lastDrafted['folder']))
@@ -3124,7 +3590,8 @@ 
 
 		//error_log("handling draft messages, flagging and such");
 		if((isset($this->sessionData['uid']) && isset($this->sessionData['messageFolder']))
-			|| (isset($this->sessionData['forwardFlag']) && isset($this->sessionData['sourceFolder']))) {
+			|| (isset($this->sessionData['forwardFlag']) && isset($this->sessionData['sourceFolder'])))
+		{
 			// mark message as answered
 			$mail_bo->openConnection();
 			$mail_bo->reopen(($this->sessionData['messageFolder']?$this->sessionData['messageFolder']:$this->sessionData['sourceFolder']));
@@ -3146,7 +3613,9 @@ 
 					//error_log(__METHOD__.__LINE__." ". str_replace('"',"'",$e->getMessage()));
 					unset($e);
 				}
-			} else {
+			}
+			else
+			{
 				$mail_bo->flagMessages("answered", $this->sessionData['uid'],($this->sessionData['messageFolder']?$this->sessionData['messageFolder']:$this->sessionData['sourceFolder']));
 				//error_log(__METHOD__.__LINE__.array2string(array_keys($this->sessionData)).':'.array2string($this->sessionData['forwardedUID']).' F:'.$this->sessionData['sourceFolder']);
 				if (array_key_exists('forwardFlag',$this->sessionData) && $this->sessionData['forwardFlag']=='forwarded')
@@ -3165,7 +3634,10 @@ 
 			}
 			//$mail_bo->closeConnection();
 		}
-		if ($mail_bo) $mail_bo->closeConnection();
+		if ($mail_bo)
+		{
+			$mail_bo->closeConnection();
+		}
 		//error_log("performing Infolog Stuff");
 		//error_log(print_r($this->sessionData['to'],true));
 		//error_log(print_r($this->sessionData['cc'],true));
@@ -3178,9 +3650,18 @@ 
 		{
 			$mailaddresses = array();
 		}
-		if (is_array($this->sessionData['cc'])) $mailaddresses['cc'] = $this->sessionData['cc'];
-		if (is_array($this->sessionData['bcc'])) $mailaddresses['bcc'] = $this->sessionData['bcc'];
-		if (!empty($mailaddresses)) $mailaddresses['from'] = Mail\Html::decodeMailHeader($fromAddress);
+		if (is_array($this->sessionData['cc']))
+		{
+			$mailaddresses['cc'] = $this->sessionData['cc'];
+		}
+		if (is_array($this->sessionData['bcc']))
+		{
+			$mailaddresses['bcc'] = $this->sessionData['bcc'];
+		}
+		if (!empty($mailaddresses))
+		{
+			$mailaddresses['from'] = Mail\Html::decodeMailHeader($fromAddress);
+		}
 
 		if ($_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on' || $_formData['to_calendar'] == 'on' )
 		{
@@ -3212,7 +3693,10 @@ 
 							$_formData['serverID']),true),
 						'app' => $app_name
 					);
-					if ($entryid) $target['entry_id'] = $entryid;
+					if ($entryid)
+					{
+						$target['entry_id'] = $entryid;
+					}
 					// Open the app called for integration in a popup
 					// and store the mail raw data as egw_data, in order to
 					// be stored from registered app method later
@@ -3223,8 +3707,11 @@ 
 		// only clean up temp-files, if we dont need them for mail_integration::integrate
 		elseif(is_array($this->sessionData['attachments']))
 		{
-			foreach($this->sessionData['attachments'] as $value) {
-				if (!empty($value['file']) && parse_url($value['file'],PHP_URL_SCHEME) != 'vfs') {	// happens when forwarding mails
+			foreach($this->sessionData['attachments'] as $value)
+			{
+				if (!empty($value['file']) && parse_url($value['file'],PHP_URL_SCHEME) != 'vfs')
+				{
+// happens when forwarding mails
 					unlink($GLOBALS['egw_info']['server']['temp_dir'].'/'.$value['file']);
 				}
 			}
@@ -3261,7 +3748,10 @@ 
 				$default_identity = null;
 				foreach(Mail\Account::identities($this->mail_bo->profileID, true, 'params') as $identity)
 				{
-					if (!isset($default_identity)) $default_identity = $identity['ident_id'];
+					if (!isset($default_identity))
+					{
+						$default_identity = $identity['ident_id'];
+					}
 					if (!empty($identity['ident_signature']))
 					{
 						$content['mailidentity'] = $identity['ident_id'];
@@ -3269,12 +3759,18 @@ 
 					}
 				}
 			}
-			if (empty($content['mailidentity'])) $content['mailidentity'] = $default_identity;
+			if (empty($content['mailidentity']))
+			{
+				$content['mailidentity'] = $default_identity;
+			}
 		}
 		if (!isset($content['mimeType']) || empty($content['mimeType']))
 		{
 			$content['mimeType'] = 'html';
-			if (!empty($this->mailPreferences['composeOptions']) && $this->mailPreferences['composeOptions']=="text") $content['mimeType']  = 'plain';
+			if (!empty($this->mailPreferences['composeOptions']) && $this->mailPreferences['composeOptions']=="text")
+			{
+				$content['mimeType']  = 'plain';
+			}
 		}
 		return $content;
 
@@ -3282,9 +3778,12 @@ 
 
 	function stripSlashes($_string)
 	{
-		if (get_magic_quotes_gpc()) {
+		if (get_magic_quotes_gpc())
+		{
 			return stripslashes($_string);
-		} else {
+		}
+		else
+		{
 			return $_string;
 		}
 	}
@@ -3297,15 +3796,25 @@ 
 	 * @param boolean $_noPrefixId = false, if set to true folders name does not get prefixed by account id
 	 * @return type
 	 */
-	function ajax_searchFolder($_searchStringLength=2, $_returnList=false, $_mailaccountToSearch=null, $_noPrefixId=false) {
+	function ajax_searchFolder($_searchStringLength=2, $_returnList=false, $_mailaccountToSearch=null, $_noPrefixId=false)
+	{
 		//error_log(__METHOD__.__LINE__.':'.array2string($_REQUEST));
 		static $useCacheIfPossible = null;
-		if (is_null($useCacheIfPossible)) $useCacheIfPossible = true;
+		if (is_null($useCacheIfPossible))
+		{
+			$useCacheIfPossible = true;
+		}
 		$_searchString = trim($_REQUEST['query']);
 		$results = array();
 		$rememberServerID = $this->mail_bo->icServer->ImapServerId;
-		if (is_null($_mailaccountToSearch) && !empty($_REQUEST['mailaccount'])) $_mailaccountToSearch = $_REQUEST['mailaccount'];
-		if (empty($_mailaccountToSearch)) $_mailaccountToSearch = $this->mail_bo->icServer->ImapServerId;
+		if (is_null($_mailaccountToSearch) && !empty($_REQUEST['mailaccount']))
+		{
+			$_mailaccountToSearch = $_REQUEST['mailaccount'];
+		}
+		if (empty($_mailaccountToSearch))
+		{
+			$_mailaccountToSearch = $this->mail_bo->icServer->ImapServerId;
+		}
 		if ($this->mail_bo->icServer && $_mailaccountToSearch && $this->mail_bo->icServer->ImapServerId != $_mailaccountToSearch)
 		{
 			$this->changeProfile($_mailaccountToSearch);
@@ -3316,7 +3825,8 @@ 
 			$this->mail_bo->openConnection($this->mail_bo->icServer->ImapServerId);
 			//error_log(__METHOD__.__LINE__.array2string($_searchString).'<->'.$searchString);
 			$folderObjects = $this->mail_bo->getFolderObjects(true,false,true,$useCacheIfPossible);
-			if (count($folderObjects)<=1) {
+			if (count($folderObjects)<=1)
+			{
 				$useCacheIfPossible = false;
 			}
 			else
@@ -3367,7 +3877,8 @@ 
 		exit();
 	}
 
-	public static function ajax_searchAddress($_searchStringLength=2) {
+	public static function ajax_searchAddress($_searchStringLength=2)
+	{
 		//error_log(__METHOD__. "request from seachAddress " . $_REQUEST['query']);
 		$_searchString = trim($_REQUEST['query']);
 		$include_lists = (boolean)$_REQUEST['include_lists'];
@@ -3380,7 +3891,8 @@ 
 		{
 			$lists = array_filter(
 				$contacts_obj->get_lists(Acl::READ),
-				function($element) use($_searchString) {
+				function($element) use($_searchString)
+				{
 					return (stripos($element, $_searchString) !== false);
 				}
 			);
@@ -3395,7 +3907,10 @@ 
 					'title' => lang('Mailinglist'),
 					'data'	=> $key
 				);
-				if($list_count++ > 5) break;
+				if($list_count++ > 5)
+				{
+					break;
+				}
 			}
 		}
 
@@ -3406,7 +3921,10 @@ 
 			$search = explode(' ', $_searchString);
 			foreach ($search as $k => $v)
 			{
-				if (mb_strlen($v) < 3) unset($search[$k]);
+				if (mb_strlen($v) < 3)
+				{
+					unset($search[$k]);
+				}
 			}
 			$search_str = implode(' +', $search);	// tell contacts/so_sql to AND search patterns
 			//error_log(__METHOD__.__LINE__.$_searchString);
@@ -3436,9 +3954,12 @@ 
 			}
 		}
 		
-		if(is_array($contacts)) {
-			foreach($contacts as $contact) {
-				foreach(array($contact['email'],$contact['email_home']) as $email) {
+		if(is_array($contacts))
+		{
+			foreach($contacts as $contact)
+			{
+				foreach(array($contact['email'],$contact['email_home']) as $email)
+				{
 					// avoid wrong addresses, if an rfc822 encoded address is in addressbook
 					//$email = preg_replace("/(^.*<)([a-zA-Z0-9_\-]+@[a-zA-Z0-9_\-\.]+)(.*)/",'$2',$email);
 					$rfcAddr = Mail::parseAddressList($email);
@@ -3452,10 +3973,22 @@ 
 					if (method_exists($contacts_obj,'search'))
 					{
 						$contact['n_fn']='';
-						if (!empty($contact['n_prefix'])) $contact['n_fn'] = $contact['n_prefix'];
-						if (!empty($contact['n_given'])) $contact['n_fn'] .= ($contact['n_fn']?' ':'').$contact['n_given'];
-						if (!empty($contact['n_family'])) $contact['n_fn'] .= ($contact['n_fn']?' ':'').$contact['n_family'];
-						if (!empty($contact['org_name'])) $contact['n_fn'] .= ($contact['n_fn']?' ':'').'('.$contact['org_name'].')';
+						if (!empty($contact['n_prefix']))
+						{
+							$contact['n_fn'] = $contact['n_prefix'];
+						}
+						if (!empty($contact['n_given']))
+						{
+							$contact['n_fn'] .= ($contact['n_fn']?' ':'').$contact['n_given'];
+						}
+						if (!empty($contact['n_family']))
+						{
+							$contact['n_fn'] .= ($contact['n_fn']?' ':'').$contact['n_family'];
+						}
+						if (!empty($contact['org_name']))
+						{
+							$contact['n_fn'] .= ($contact['n_fn']?' ':'').'('.$contact['org_name'].')';
+						}
 						$contact['n_fn'] = str_replace(array(',','@'),' ',$contact['n_fn']);
 					}
 					else
@@ -3465,7 +3998,8 @@ 
 					$args = explode('@', trim($email));
 					$args[] = trim($contact['n_fn'] ? $contact['n_fn'] : $contact['fn']);
 					$completeMailString = call_user_func_array('imap_rfc822_write_address', $args);
-					if(!empty($email) && in_array($completeMailString ,$results) === false) {
+					if(!empty($email) && in_array($completeMailString ,$results) === false)
+					{
 						$results[] = array(
 							'id'=>$completeMailString,
 							'label' => $completeMailString,
@@ -3484,7 +4018,10 @@ 
 		foreach($groups as $g_id => $name)
 		{
 			$group = $GLOBALS['egw']->accounts->read($g_id);
-			if(!$group['account_email']) continue;
+			if(!$group['account_email'])
+			{
+				continue;
+			}
 			$args = explode('@', trim($group['account_email']));
 			$args[] = $name;
 			$completeMailString = call_user_func_array('imap_rfc822_write_address', $args);