EGroupware / egroupware

mail/inc/class.mail_zpush.inc.php

Spacing +350 added lines, -351 removed lines

@@ -90,23 +90,23 @@ 
 		$this->backend = $backend;
 		if (!isset($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID']))
 		{
-			if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' Noprefs set: using 0 as default');
+			if ($this->debugLevel > 1) error_log(__METHOD__.__LINE__.' Noprefs set: using 0 as default');
 			// globals preferences add appname varname value
-			$GLOBALS['egw']->preferences->add('activesync','mail-ActiveSyncProfileID',0,'user');
+			$GLOBALS['egw']->preferences->add('activesync', 'mail-ActiveSyncProfileID', 0, 'user');
 			// save prefs
 			$GLOBALS['egw']->preferences->save_repository(true);
 		}
-		if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' ActiveProfileID:'.array2string(self::$profileID));
+		if ($this->debugLevel > 1) error_log(__METHOD__.__LINE__.' ActiveProfileID:'.array2string(self::$profileID));
 
 		if (is_null(self::$profileID))
 		{
-			if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' self::ProfileID isNUll:'.array2string(self::$profileID));
-			self::$profileID =& Api\Cache::getSession('mail','activeSyncProfileID');
-			if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' ActiveProfileID (after reading Cache):'.array2string(self::$profileID));
+			if ($this->debugLevel > 1) error_log(__METHOD__.__LINE__.' self::ProfileID isNUll:'.array2string(self::$profileID));
+			self::$profileID = & Api\Cache::getSession('mail', 'activeSyncProfileID');
+			if ($this->debugLevel > 1) error_log(__METHOD__.__LINE__.' ActiveProfileID (after reading Cache):'.array2string(self::$profileID));
 		}
 		if (isset($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID']))
 		{
-			if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' Pref for ProfileID:'.array2string($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID']));
+			if ($this->debugLevel > 1) error_log(__METHOD__.__LINE__.' Pref for ProfileID:'.array2string($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID']));
 			if ($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID'] == 'G')
 			{
 				self::$profileID = 'G'; // this should trigger the fetch of the first negative profile (or if no negative profile is available the firstb there is)
@@ -116,7 +116,7 @@ 
 				self::$profileID = (int)$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID'];
 			}
 		}
-		if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' Profile Selected (after reading Prefs):'.array2string(self::$profileID));
+		if ($this->debugLevel > 1) error_log(__METHOD__.__LINE__.' Profile Selected (after reading Prefs):'.array2string(self::$profileID));
 
 		// verify we are on an existing profile, if not running in setup (settings can not be static according to interface!)
 		if (!isset($GLOBALS['egw_setup']))
@@ -124,12 +124,12 @@ 
 			try {
 				Mail\Account::read(self::$profileID);
 			}
-			catch(Exception $e) {
+			catch (Exception $e) {
 				unset($e);
 				self::$profileID = Mail\Account::get_default_acc_id();
 			}
 		}
-		if ($this->debugLevel>0) error_log(__METHOD__.'::'.__LINE__.' ProfileSelected:'.self::$profileID);
+		if ($this->debugLevel > 0) error_log(__METHOD__.'::'.__LINE__.' ProfileSelected:'.self::$profileID);
 		//$this->debugLevel=0;
 	}
 
@@ -242,13 +242,13 @@ 
 			$this->__construct($this->backend);
 
 			try {
-				$this->_connect(0,true);
+				$this->_connect(0, true);
 				$this->_disconnect();
 
 				if (!$this->_wasteID) $errors[] = lang('No valid %1 folder configured!', '<b>'.lang('trash').'</b>');
 				if (!$this->_sentID) $errors[] = lang('No valid %1 folder configured!', '<b>'.lang('send').'</b>');
 			}
-			catch(Exception $e) {
+			catch (Exception $e) {
 				$errors[] = lang('Can not open IMAP connection').': '.$e->getMessage();
 			}
 			if ($errors)
@@ -266,7 +266,7 @@ 
 	 * @param int $account integer id of account to use
 	 * @todo support different accounts
 	 */
-	private function _connect($account=0)
+	private function _connect($account = 0)
 	{
 		if (!$account) $account = self::$profileID ? self::$profileID : 0;
 		if ($this->mail && $this->account != $account) $this->_disconnect();
@@ -279,7 +279,7 @@ 
 			$this->account = $account;
 			// todo: tell mail which account to use
 			//error_log(__METHOD__.__LINE__.' create object with ProfileID:'.array2string(self::$profileID));
-			$this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+			$this->mail = Mail::getInstance(false, self::$profileID, true, false, true);
 			if (self::$profileID == 0 && isset($this->mail->icServer->ImapServerId) && !empty($this->mail->icServer->ImapServerId)) self::$profileID = $this->mail->icServer->ImapServerId;
 		}
 		else
@@ -287,7 +287,7 @@ 
 			//error_log(__METHOD__.__LINE__." connect with profileID: ".self::$profileID);
 			if (self::$profileID == 0 && isset($this->mail->icServer->ImapServerId) && !empty($this->mail->icServer->ImapServerId)) self::$profileID = $this->mail->icServer->ImapServerId;
 		}
-		$this->mail->openConnection(self::$profileID,false);
+		$this->mail->openConnection(self::$profileID, false);
 
 		$this->_wasteID = $this->mail->getTrashFolder(false);
 		//error_log(__METHOD__.__LINE__.' TrashFolder:'.$this->_wasteID);
@@ -302,7 +302,7 @@ 
 	 */
 	private function _disconnect()
 	{
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__);
+		if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__);
 		if ($this->mail) $this->mail->closeConnection();
 
 		unset($this->mail);
@@ -318,24 +318,24 @@ 
 	public function GetFolderList()
 	{
 		$folderlist = array();
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__);
+		if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__);
 		/*foreach($available_accounts as $account)*/ $account = 0;
 		{
 			$this->_connect($account);
-			if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true,false,$_alwaysGetDefaultFolders=true);
-			if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($this->folders));
+			if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true, false, $_alwaysGetDefaultFolders = true);
+			if ($this->debugLevel > 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.array2string($this->folders));
 
 			foreach ($this->folders as $folder => $folderObj) {
-				if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' folder='.$folder);
+				if ($this->debugLevel > 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' folder='.$folder);
 				$folderlist[] = $f = array(
-					'id'     => $this->createID($account,$folder),
+					'id'     => $this->createID($account, $folder),
 					'mod'    => $folderObj->shortDisplayName,
-					'parent' => $this->getParentID($account,$folder),
+					'parent' => $this->getParentID($account, $folder),
 				);
-				if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."() returning ".array2string($f));
+				if ($this->debugLevel > 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."() returning ".array2string($f));
 			}
 		}
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."() returning ".array2string($folderlist));
+		if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."() returning ".array2string($folderlist));
 
 		return $folderlist;
 	}
@@ -384,86 +384,86 @@ 
 		$ClientSideMeetingRequest = false;
 		$allowSendingInvitations = 'sendifnocalnotif';
 		if (isset($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations']) &&
-			$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations']=='nosend')
+			$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations'] == 'nosend')
 		{
 			$allowSendingInvitations = false;
 		}
 		elseif (isset($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations']) &&
-			$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations']!='nosend')
+			$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations'] != 'nosend')
 		{
 			$allowSendingInvitations = $GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations'];
 		}
-		$smartdata_task = ($smartdata->replyflag?'reply':($smartdata->forwardflag?'forward':'new'));
+		$smartdata_task = ($smartdata->replyflag ? 'reply' : ($smartdata->forwardflag ? 'forward' : 'new'));
 
-   		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__ . (isset($smartdata->mime) ? $smartdata->mime : ""). "task: ".(isset($smartdata_task) ? $smartdata_task : "")." itemid: ".(isset($smartdata->source->itemid) ? $smartdata->source->itemid : "")." folder: ".(isset($smartdata->source->folderid) ? $smartdata->source->folderid : ""));
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__."): Smartdata = ".array2string($smartdata));
+   		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.(isset($smartdata->mime) ? $smartdata->mime : "")."task: ".(isset($smartdata_task) ? $smartdata_task : "")." itemid: ".(isset($smartdata->source->itemid) ? $smartdata->source->itemid : "")." folder: ".(isset($smartdata->source->folderid) ? $smartdata->source->folderid : ""));
+		if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__."): Smartdata = ".array2string($smartdata));
 		//error_log("IMAP-Sendmail: Smartdata = ".array2string($smartdata));
 
 		// initialize our Mail
-		if (!isset($this->mail)) $this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail)) $this->mail = Mail::getInstance(false, self::$profileID, true, false, true);
 		$activeMailProfiles = $this->mail->getAccountIdentities(self::$profileID);
 		// use the standardIdentity
-		$activeMailProfile = Mail::getStandardIdentityForProfile($activeMailProfiles,self::$profileID);
+		$activeMailProfile = Mail::getStandardIdentityForProfile($activeMailProfiles, self::$profileID);
 
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.")".' ProfileID:'.self::$profileID.' ActiveMailProfile:'.array2string($activeMailProfile));
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.")".' ProfileID:'.self::$profileID.' ActiveMailProfile:'.array2string($activeMailProfile));
 		// collect identity / signature for later usage, and to determine if we may have to manipulate TransferEncoding and Charset
 		try
 		{
 			$acc = Mail\Account::read($this->mail->icServer->ImapServerId);
 			//error_log(__METHOD__.__LINE__.array2string($acc));
-			$_signature = Mail\Account::read_identity($acc['ident_id'],true);
+			$_signature = Mail\Account::read_identity($acc['ident_id'], true);
 		}
 		catch (Exception $e)
 		{
-			$_signature=array();
+			$_signature = array();
 		}
 		$signature = $_signature['ident_signature'];
 		if ((isset($preferencesArray['disableRulerForSignatureSeparation']) &&
 			$preferencesArray['disableRulerForSignatureSeparation']) ||
-			empty($signature) || trim(Api\Mail\Html::convertHTMLToText($signature)) =='')
+			empty($signature) || trim(Api\Mail\Html::convertHTMLToText($signature)) == '')
 		{
 			$disableRuler = true;
 		}
 		$beforePlain = $beforeHtml = "";
-		$beforeHtml = ($disableRuler ?'&nbsp;<br>':'&nbsp;<br><hr style="border:dotted 1px silver; width:90%; border:dotted 1px silver;">');
-		$beforePlain = ($disableRuler ?"\r\n\r\n":"\r\n\r\n-- \r\n");
-		$sigText = Mail::merge($signature,array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')));
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Signature to use:'.$sigText);
+		$beforeHtml = ($disableRuler ? '&nbsp;<br>' : '&nbsp;<br><hr style="border:dotted 1px silver; width:90%; border:dotted 1px silver;">');
+		$beforePlain = ($disableRuler ? "\r\n\r\n" : "\r\n\r\n-- \r\n");
+		$sigText = Mail::merge($signature, array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'], 'person_id')));
+		if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' Signature to use:'.$sigText);
 		$sigTextHtml = $beforeHtml.$sigText;
 		$sigTextPlain = $beforePlain.Api\Mail\Html::convertHTMLToText($sigText);
 
-		$force8bit=false;
-		if (Api\Translation::detect_encoding($sigTextPlain)!='ascii') $force8bit=true;
+		$force8bit = false;
+		if (Api\Translation::detect_encoding($sigTextPlain) != 'ascii') $force8bit = true;
 		// initialize the new Api\Mailer object for sending
 		$mailObject = new Api\Mailer(self::$profileID);
 
-		$this->mail->parseRawMessageIntoMailObject($mailObject,$smartdata->mime,$force8bit);
+		$this->mail->parseRawMessageIntoMailObject($mailObject, $smartdata->mime, $force8bit);
 		// Horde SMTP Class uses utf-8 by default. as we set charset always to utf-8
-		$mailObject->Sender  = $activeMailProfile['ident_email'];
-		$mailObject->setFrom($activeMailProfile['ident_email'],Mail::generateIdentityString($activeMailProfile,false));
+		$mailObject->Sender = $activeMailProfile['ident_email'];
+		$mailObject->setFrom($activeMailProfile['ident_email'], Mail::generateIdentityString($activeMailProfile, false));
 		$mailObject->addHeader('X-Mailer', 'mail-Activesync');
 
 
 		// prepare addressee list; moved the adding of addresses to the mailobject down
 		// to
 
-		foreach(Mail::parseAddressList($mailObject->getHeader("To")) as $addressObject) {
+		foreach (Mail::parseAddressList($mailObject->getHeader("To")) as $addressObject) {
 			if (!$addressObject->valid) continue;
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") Header Sentmail To: ".array2string($addressObject) );
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") Header Sentmail To: ".array2string($addressObject));
 			//$mailObject->AddAddress($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 			$toMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal);
 		}
 		// CC
-		foreach(Mail::parseAddressList($mailObject->getHeader("Cc")) as $addressObject) {
+		foreach (Mail::parseAddressList($mailObject->getHeader("Cc")) as $addressObject) {
 			if (!$addressObject->valid) continue;
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") Header Sentmail CC: ".array2string($addressObject) );
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") Header Sentmail CC: ".array2string($addressObject));
 			//$mailObject->AddCC($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 			$ccMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal);
 		}
 		// BCC
-		foreach(Mail::parseAddressList($mailObject->getHeader("Bcc")) as $addressObject) {
+		foreach (Mail::parseAddressList($mailObject->getHeader("Bcc")) as $addressObject) {
 			if (!$addressObject->valid) continue;
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") Header Sentmail BCC: ".array2string($addressObject) );
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") Header Sentmail BCC: ".array2string($addressObject));
 			//$mailObject->AddBCC($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 			$bccMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal);
 		}
@@ -472,7 +472,7 @@ 
 		$use_orgbody = false;
 
 		$k = 'Content-Type';
-		$ContentType =$mailObject->getHeader('Content-Type');
+		$ContentType = $mailObject->getHeader('Content-Type');
 		//error_log(__METHOD__.__LINE__." Header Sentmail original Header (filtered): " . $k.  " = ".trim($ContentType));
 		// if the message is a multipart message, then we should use the sent body
 		if (preg_match("/multipart/i", $ContentType)) {
@@ -492,43 +492,43 @@ 
 			$k == "Content-Type" && preg_match("/multipart/i", $ContentType))) {
 			$use_orgbody = true;
 		}
-		$Body =  $AltBody = "";
+		$Body = $AltBody = "";
 		// get body of the transmitted message
 		// if this is a simple message, no structure at all
 		if (preg_match("/text/i", $ContentType))
 		{
-			$simpleBodyType = (preg_match("/html/i", $ContentType)?'text/html':'text/plain');
+			$simpleBodyType = (preg_match("/html/i", $ContentType) ? 'text/html' : 'text/plain');
 			$bodyObj = $mailObject->findBody(preg_match("/html/i", $ContentType) ? 'html' : 'plain');
-			$body = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i","[$2]", $bodyObj ?$bodyObj->getContents() : null);
-			if  ($simpleBodyType == "text/plain")
+			$body = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i", "[$2]", $bodyObj ? $bodyObj->getContents() : null);
+			if ($simpleBodyType == "text/plain")
 			{
 				$Body = $body;
 				$AltBody = "<pre>".nl2br($body)."</pre>";
-				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") fetched Body as :". $simpleBodyType.'=> Created AltBody');
+				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") fetched Body as :".$simpleBodyType.'=> Created AltBody');
 			}
 			else
 			{
 				$AltBody = $body;
-				$Body =  trim(Api\Mail\Html::convertHTMLToText($body));
-				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") fetched Body as :". $simpleBodyType.'=> Created Body');
+				$Body = trim(Api\Mail\Html::convertHTMLToText($body));
+				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") fetched Body as :".$simpleBodyType.'=> Created Body');
 			}
 		}
 		else
 		{
 			// if this is a structured message
 			// prefer plain over html
-			$Body = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i","[$2]",
+			$Body = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i", "[$2]",
 				($text_body = $mailObject->findBody('plain')) ? $text_body->getContents() : null);
-			$AltBody = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i","[$2]",
+			$AltBody = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i", "[$2]",
 				($html_body = $mailObject->findBody('html')) ? $html_body->getContents() : null);
 		}
-		if ($this->debugLevel>1 && $Body) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") fetched Body as with MessageContentType:". $ContentType.'=>'.$Body);
-		if ($this->debugLevel>1 && $AltBody) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") fetched AltBody as with MessageContentType:". $ContentType.'=>'.$AltBody);
+		if ($this->debugLevel > 1 && $Body) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") fetched Body as with MessageContentType:".$ContentType.'=>'.$Body);
+		if ($this->debugLevel > 1 && $AltBody) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") fetched AltBody as with MessageContentType:".$ContentType.'=>'.$AltBody);
 		//error_log(__METHOD__.__LINE__.array2string($mailObject));
 		// if this is a multipart message with a boundary, we must use the original body
 		//if ($this->debugLevel>2) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' mailObject after Inital Parse:'.array2string($mailObject));
         if ($use_orgbody) {
-    	    ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") use_orgbody = true ContentType:".$ContentType);
+    	    ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") use_orgbody = true ContentType:".$ContentType);
  			// if it is a ClientSideMeetingRequest, we report it as send at all times
 			if (($cal_body = $mailObject->findBody('calendar')) &&
 				($cSMRMethod = $cal_body->getContentTypeParameter('method')))
@@ -537,21 +537,21 @@ 
 				{
 					$organizer = calendar_ical::getIcalOrganizer($cal_body->getContents());
 				}
-				if ($this->debugLevel) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") we have a Client Side Meeting Request from organizer=$organizer");
+				if ($this->debugLevel) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") we have a Client Side Meeting Request from organizer=$organizer");
 				$ClientSideMeetingRequest = true;
 			}
         }
 		// now handle the addressee list
 		$toCount = 0;
 		//error_log(__METHOD__.__LINE__.array2string($toMailAddr));
-		foreach((array)$toMailAddr as $address) {
-			foreach(Mail::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
-				$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
+		foreach ((array)$toMailAddr as $address) {
+			foreach (Mail::parseAddressList((get_magic_quotes_gpc() ? stripslashes($address) : $address)) as $addressObject) {
+				$emailAddress = $addressObject->mailbox.($addressObject->host ? '@'.$addressObject->host : '');
 				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' &&
 					calendar_boupdate::email_update_requested($emailAddress, isset($cSMRMethod) ? $cSMRMethod : 'REQUEST',
 						$organizer && !strcasecmp($emailAddress, $organizer) ? 'CHAIR' : ''))
 				{
-					ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") skiping mail to organizer '$organizer', as it will be send by calendar app");
+					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") skiping mail to organizer '$organizer', as it will be send by calendar app");
 					continue;
 				}
 				$mailObject->AddAddress($emailAddress, $addressObject->personal);
@@ -559,29 +559,29 @@ 
 			}
 		}
 		$ccCount = 0;
-		foreach((array)$ccMailAddr as $address) {
-			foreach(Mail::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
-				$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
+		foreach ((array)$ccMailAddr as $address) {
+			foreach (Mail::parseAddressList((get_magic_quotes_gpc() ? stripslashes($address) : $address)) as $addressObject) {
+				$emailAddress = $addressObject->mailbox.($addressObject->host ? '@'.$addressObject->host : '');
 				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' && calendar_boupdate::email_update_requested($emailAddress)) continue;
 				$mailObject->AddCC($emailAddress, $addressObject->personal);
 				$ccCount++;
 			}
 		}
 		$bccCount = 0;
-		foreach((array)$bccMailAddr as $address) {
-			foreach(Mail::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
-				$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
+		foreach ((array)$bccMailAddr as $address) {
+			foreach (Mail::parseAddressList((get_magic_quotes_gpc() ? stripslashes($address) : $address)) as $addressObject) {
+				$emailAddress = $addressObject->mailbox.($addressObject->host ? '@'.$addressObject->host : '');
 				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' && calendar_boupdate::email_update_requested($emailAddress)) continue;
 				$mailObject->AddBCC($emailAddress, $addressObject->personal);
 				$bccCount++;
 			}
 		}
 		// typical organizer reply will end here with nothing send --> return true, because we suppressed the send above
-		if ($toCount+$ccCount+$bccCount == 0)
+		if ($toCount + $ccCount + $bccCount == 0)
 		{
 			return $ClientSideMeetingRequest && $allowSendingInvitations === 'sendifnocalnotif' && $organizer ? true : 0; // noone to send mail to
 		}
-		if ($ClientSideMeetingRequest === true && $allowSendingInvitations===false) return true;
+		if ($ClientSideMeetingRequest === true && $allowSendingInvitations === false) return true;
 		// as we use our mailer (horde mailer) it is detecting / setting the mimetype by itself while creating the mail
 /*
 		if ($this->debugLevel>2) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' retrieved Body:'.$body);
@@ -598,26 +598,26 @@ 
 		{
 			// now get on, and fetch the original mail
 			$uid = $smartdata->source->itemid;
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") IMAP Smartreply is called with FolderID:".$smartdata->source->folderid.' and ItemID:'.$smartdata->source->itemid);
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") IMAP Smartreply is called with FolderID:".$smartdata->source->folderid.' and ItemID:'.$smartdata->source->itemid);
 			$this->splitID($smartdata->source->folderid, $account, $folder);
 
 			$this->mail->reopen($folder);
 			$bodyStruct = $this->mail->getMessageBody($uid, 'html_only');
-			$bodyBUFFHtml = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true,false);
-			if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
-		    if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
+			$bodyBUFFHtml = $this->mail->getdisplayableBody($this->mail, $bodyStruct, true, false);
+			if ($this->debugLevel > 3) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
+		    if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType'] == 'text/html')) {
 				// may be html
-				if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
+				if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
 				$AltBody = $AltBody."</br>".$bodyBUFFHtml.$sigTextHtml;
 				$isreply = true;
 			}
 			// plain text Message part
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:plain, fetch text:');
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") MIME Body".' Type:plain, fetch text:');
 			// if the new part of the message is html, we must preserve it, and handle that the original mail is text/plain
-			$bodyStruct = $this->mail->getMessageBody($uid,'never_display');//'never_display');
-			$bodyBUFF = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
-			if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/plain')) {
-				if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
+			$bodyStruct = $this->mail->getMessageBody($uid, 'never_display'); //'never_display');
+			$bodyBUFF = $this->mail->getdisplayableBody($this->mail, $bodyStruct, false, false);
+			if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType'] == 'text/plain')) {
+				if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
 				$Body = $Body."\r\n".$bodyBUFF.$sigTextPlain;
 				$isreply = true;
 			}
@@ -625,12 +625,12 @@ 
 			{
 				$isreply = true;
 				$AltBody = $AltBody."</br><pre>".nl2br($bodyBUFF).'</pre>'.$sigTextHtml;
-				if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." no Api\Html Body found use modified plaintext body for txt/html: ".$AltBody);
+				if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." no Api\Html Body found use modified plaintext body for txt/html: ".$AltBody);
 			}
 		}
 
 		// how to forward and other prefs
-		$preferencesArray =& $GLOBALS['egw_info']['user']['preferences']['mail'];
+		$preferencesArray = & $GLOBALS['egw_info']['user']['preferences']['mail'];
 
 		// forward -------------------------------------------------------------------------
 		if ($smartdata_task == 'forward' && isset($smartdata->source->itemid) &&
@@ -640,7 +640,7 @@ 
 		{
 			//force the default for the forwarding -> asmail
 			if (is_array($preferencesArray)) {
-				if (!array_key_exists('message_forwarding',$preferencesArray)
+				if (!array_key_exists('message_forwarding', $preferencesArray)
 					|| !isset($preferencesArray['message_forwarding'])
 					|| empty($preferencesArray['message_forwarding'])) $preferencesArray['message_forwarding'] = 'asmail';
 			} else {
@@ -648,18 +648,18 @@ 
 			}
 			// construct the uid of the message out of the itemid - seems to be the uid, no construction needed
 			$uid = $smartdata->source->itemid;
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.")IMAP Smartfordward is called with FolderID:".$smartdata->source->folderid.' and ItemID:'.$smartdata->source->itemid);
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.")IMAP Smartfordward is called with FolderID:".$smartdata->source->folderid.' and ItemID:'.$smartdata->source->itemid);
 			$this->splitID($smartdata->source->folderid, $account, $folder);
 
 			$this->mail->reopen($folder);
             // receive entire mail (header + body)
 			// get message headers for specified message
-			$headers	= $this->mail->getMessageEnvelope($uid, $_partID, true, $folder);
+			$headers = $this->mail->getMessageEnvelope($uid, $_partID, true, $folder);
 			// build a new mime message, forward entire old mail as file
 			if ($preferencesArray['message_forwarding'] == 'asmail')
 			{
-				$rawHeader      = $this->mail->getMessageRawHeader($smartdata->source->itemid, $_partID,$folder);
-				$rawBody        = $this->mail->getMessageRawBody($smartdata->source->itemid, $_partID,$folder);
+				$rawHeader      = $this->mail->getMessageRawHeader($smartdata->source->itemid, $_partID, $folder);
+				$rawBody        = $this->mail->getMessageRawBody($smartdata->source->itemid, $_partID, $folder);
 				$mailObject->AddStringAttachment($rawHeader.$rawBody, $headers['SUBJECT'].'.eml', 'message/rfc822');
 				$AltBody = $AltBody."</br>".lang("See Attachments for Content of the Orignial Mail").$sigTextHtml;
 				$Body = $Body."\r\n".lang("See Attachments for Content of the Orignial Mail").$sigTextPlain;
@@ -669,50 +669,50 @@ 
 			{
 				// now get on, and fetch the original mail
 				$uid = $smartdata->source->itemid;
-				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") IMAP Smartreply is called with FolderID:".$smartdata->source->folderid.' and ItemID:'.$smartdata->source->itemid);
+				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") IMAP Smartreply is called with FolderID:".$smartdata->source->folderid.' and ItemID:'.$smartdata->source->itemid);
 				$this->splitID($smartdata->source->folderid, $account, $folder);
 
 				$this->mail->reopen($folder);
 				$bodyStruct = $this->mail->getMessageBody($uid, 'html_only');
-				$bodyBUFFHtml = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true,false);
-				if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
-				if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
+				$bodyBUFFHtml = $this->mail->getdisplayableBody($this->mail, $bodyStruct, true, false);
+				if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
+				if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType'] == 'text/html')) {
 					// may be html
-					if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
+					if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
 					$AltBody = $AltBody."</br>".$bodyBUFFHtml.$sigTextHtml;
 					$isforward = true;
 				}
 				// plain text Message part
-				if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:plain, fetch text:');
+				if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") MIME Body".' Type:plain, fetch text:');
 				// if the new part of the message is html, we must preserve it, and handle that the original mail is text/plain
-				$bodyStruct = $this->mail->getMessageBody($uid,'never_display');//'never_display');
-				$bodyBUFF = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
-				if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/plain')) {
-					if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
+				$bodyStruct = $this->mail->getMessageBody($uid, 'never_display'); //'never_display');
+				$bodyBUFF = $this->mail->getdisplayableBody($this->mail, $bodyStruct, false, false);
+				if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType'] == 'text/plain')) {
+					if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
 					$Body = $Body."\r\n".$bodyBUFF.$sigTextPlain;
 					$isforward = true;
 				}
 				if (!empty($bodyBUFF) && empty($bodyBUFFHtml) && !empty($AltBody))
 				{
 					$AltBody = $AltBody."</br><pre>".nl2br($bodyBUFF).'</pre>'.$sigTextHtml;
-					if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." no html Body found use modified plaintext body for txt/html: ".$AltBody);
+					if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." no html Body found use modified plaintext body for txt/html: ".$AltBody);
 					$isforward = true;
 				}
 				// get all the attachments and add them too.
 				// start handle Attachments
 				//												$_uid, $_partID=null, Horde_Mime_Part $_structure=null, $fetchEmbeddedImages=true, $fetchTextCalendar=false, $resolveTNEF=true, $_folderName=''
-				$attachments = $this->mail->getMessageAttachments($uid, null,          null,								true,						false,				 true			, $folder);
+				$attachments = $this->mail->getMessageAttachments($uid, null, null, true, false, true, $folder);
 				$attachmentNames = false;
-				if (is_array($attachments) && count($attachments)>0)
+				if (is_array($attachments) && count($attachments) > 0)
 				{
-					ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' gather Attachments for BodyCreation of/for MessageID:'.$uid.' found:'.count($attachments));
-					foreach((array)$attachments as $key => $attachment)
+					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' gather Attachments for BodyCreation of/for MessageID:'.$uid.' found:'.count($attachments));
+					foreach ((array)$attachments as $key => $attachment)
 					{
-						if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attachment));
+						if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attachment));
 						$attachmentNames .= $attachment['name']."\n";
-						$attachmentData	= $this->mail->getAttachment($uid, $attachment['partID'],0,false,false,$folder);
+						$attachmentData = $this->mail->getAttachment($uid, $attachment['partID'], 0, false, false, $folder);
 						/*$x =*/ $mailObject->AddStringAttachment($attachmentData['attachment'], $attachment['name'], $attachment['mimeType']);
-						ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' added part with number:'.$x);
+						ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' added part with number:'.$x);
 					}
 				}
 			}
@@ -727,38 +727,38 @@ 
 		// now set the body
 		if ($AltBody && ($html_body = $mailObject->findBody('html')))
 		{
-			if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' -> '.$AltBody);
+			if ($this->debugLevel > 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' -> '.$AltBody);
 			//error_log(__METHOD__.__LINE__.' html:'.$AltBody);
-			$html_body->setContents($AltBody,array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+			$html_body->setContents($AltBody, array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
 		}
 		if ($Body && ($text_body = $mailObject->findBody('plain')))
 		{
-			if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' -> '.$Body);
+			if ($this->debugLevel > 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' -> '.$Body);
 			//error_log(__METHOD__.__LINE__.' text:'.$Body);
-			$text_body->setContents($Body,array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+			$text_body->setContents($Body, array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
 		}
 		//advanced debugging
 		// Horde SMTP Class uses utf-8 by default.
         //ZLog::Write(LOGLEVEL_DEBUG, "IMAP-SendMail: parsed message: ". print_r($message,1));
-		if ($this->debugLevel>2) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__."): MailObject:".array2string($mailObject));
+		if ($this->debugLevel > 2) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__."): MailObject:".array2string($mailObject));
 
 		// set a higher timeout for big messages
 		@set_time_limit(120);
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' -> '.' about to send ....');
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' -> '.' about to send ....');
 		// send
 		$send = true;
 		try {
 			$mailObject->Send();
 		}
-		catch(Exception $e) {
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") The email could not be sent. Last-SMTP-error: ". $e->getMessage());
+		catch (Exception $e) {
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") The email could not be sent. Last-SMTP-error: ".$e->getMessage());
 			$send = false;
 		}
 
-		if (( $smartdata_task == 'reply' || $smartdata_task == 'forward') && $send == true)
+		if (($smartdata_task == 'reply' || $smartdata_task == 'forward') && $send == true)
 		{
 			$uid = $smartdata->source->itemid;
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' tASK:'.$smartdata_task." FolderID:".$smartdata->source->folderid.' and ItemID:'.$smartdata->source->itemid);
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' tASK:'.$smartdata_task." FolderID:".$smartdata->source->folderid.' and ItemID:'.$smartdata->source->itemid);
 			$this->splitID($smartdata->source->folderid, $account, $folder);
 			//error_log(__METHOD__.__LINE__.' Folder:'.$folder.' Uid:'.$uid);
 			$this->mail->reopen($folder);
@@ -766,89 +766,89 @@ 
 			// unless your templatefolder is a subfolder of your draftfolder, and the message is in there
 			if ($this->mail->isDraftFolder($folder) && !$this->mail->isTemplateFolder($folder))
 			{
-				$this->mail->deleteMessages(array($uid),$folder);
+				$this->mail->deleteMessages(array($uid), $folder);
 			} else {
-				$this->mail->flagMessages("answered", array($uid),$folder);
-				if ($smartdata_task== "forward")
+				$this->mail->flagMessages("answered", array($uid), $folder);
+				if ($smartdata_task == "forward")
 				{
-					$this->mail->flagMessages("forwarded", array($uid),$folder);
+					$this->mail->flagMessages("forwarded", array($uid), $folder);
 				}
 			}
 		}
 
-		$asf = ($send ? true:false); // initalize accordingly
-		if (/*($smartdata->saveinsent==1 || !isset($smartdata->saveinsent)) && */  $send==true && $this->mail->mailPreferences['sendOptions'] != 'send_only')
+		$asf = ($send ? true : false); // initalize accordingly
+		if (/*($smartdata->saveinsent==1 || !isset($smartdata->saveinsent)) && */  $send == true && $this->mail->mailPreferences['sendOptions'] != 'send_only')
 		{
 			$asf = false;
 			$sentFolder = $this->mail->getSentFolder();
 			if ($this->_sentID) {
 				$folderArray[] = $this->_sentID;
 			}
-			else if(isset($sentFolder) && $sentFolder != 'none')
+			else if (isset($sentFolder) && $sentFolder != 'none')
 			{
 				$folderArray[] = $sentFolder;
 			}
 			// No Sent folder set, try defaults
 			else
 			{
-				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") IMAP-SendMail: No Sent mailbox set");
+				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__.") IMAP-SendMail: No Sent mailbox set");
 				// we dont try guessing
 				$asf = true;
 			}
 			if (count($folderArray) > 0) {
-				foreach((array)$bccMailAddr as $address) {
-					foreach(Mail::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
-						$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
+				foreach ((array)$bccMailAddr as $address) {
+					foreach (Mail::parseAddressList((get_magic_quotes_gpc() ? stripslashes($address) : $address)) as $addressObject) {
+						$emailAddress = $addressObject->mailbox.($addressObject->host ? '@'.$addressObject->host : '');
 						$mailAddr[] = array($emailAddress, $addressObject->personal);
 					}
 				}
-				$BCCmail='';
-				if (count($mailAddr)>0) $BCCmail = $mailObject->AddrAppend("Bcc",$mailAddr);
-				foreach($folderArray as $folderName) {
-					if($this->mail->isSentFolder($folderName)) {
+				$BCCmail = '';
+				if (count($mailAddr) > 0) $BCCmail = $mailObject->AddrAppend("Bcc", $mailAddr);
+				foreach ($folderArray as $folderName) {
+					if ($this->mail->isSentFolder($folderName)) {
 						$flags = '\\Seen';
-					} elseif($this->mail->isDraftFolder($folderName)) {
+					} elseif ($this->mail->isDraftFolder($folderName)) {
 						$flags = '\\Draft';
 					} else {
 						$flags = '';
 					}
 					$asf = true;
 					//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.'->'.array2string($this->mail->icServer));
-					$this->mail->openConnection(self::$profileID,false);
+					$this->mail->openConnection(self::$profileID, false);
 					if ($this->mail->folderExists($folderName)) {
 						try
 						{
-							$this->mail->appendMessage($folderName,$mailObject->getRaw(), null,
+							$this->mail->appendMessage($folderName, $mailObject->getRaw(), null,
 									$flags);
 						}
 						catch (Api\Exception\WrongUserinput $e)
 						{
 							//$asf = false;
-							ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Could not save message to folder %2 due to: %3",$mailObject->getHeader('Subject'),$folderName,$e->getMessage()));
+							ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Could not save message to folder %2 due to: %3", $mailObject->getHeader('Subject'), $folderName, $e->getMessage()));
 						}
 					}
 					else
 					{
 						//$asf = false;
-						ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Destination Folder %2 does not exist.",$mailObject->getHeader('Subject'),$folderName));
+						ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Destination Folder %2 does not exist.", $mailObject->getHeader('Subject'), $folderName));
 					}
-			        ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__."): Outgoing mail saved in configured 'Sent' folder '".$folderName."': ". (($asf)?"success":"failed"));
+			        ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(".__LINE__."): Outgoing mail saved in configured 'Sent' folder '".$folderName."': ".(($asf) ? "success" : "failed"));
 				}
 				//$this->mail->closeConnection();
 			}
 		}
 
-		$this->debugLevel=0;
+		$this->debugLevel = 0;
 
 		if ($send && $asf)
 		{
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' -> send successfully');
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' -> send successfully');
 			return true;
 		}
 		else
 		{
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__." returning ".($ClientSideMeetingRequest ? true : 120)." (MailSubmissionFailed)".($ClientSideMeetingRequest ?" is ClientSideMeetingRequest (we ignore the failure)":""));
-			return ($ClientSideMeetingRequest ? true : 120);   //MAIL Submission failed, see MS-ASCMD
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." returning ".($ClientSideMeetingRequest ? true : 120)." (MailSubmissionFailed)".($ClientSideMeetingRequest ? " is ClientSideMeetingRequest (we ignore the failure)" : ""));
+			return ($ClientSideMeetingRequest ? true : 120); //MAIL Submission failed, see MS-ASCMD
 		}
 	}
 
@@ -866,43 +866,43 @@ 
 	public function GetMessage($folderid, $id, $contentparameters)
 	{
 		//$this->debugLevel=4;
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' FolderID:'.$folderid.' ID:'.$id.' ContentParams='.array2string($contentparameters));
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' FolderID:'.$folderid.' ID:'.$id.' ContentParams='.array2string($contentparameters));
 		$truncsize = Utils::GetTruncSize($contentparameters->GetTruncation());
 		$mimesupport = $contentparameters->GetMimeSupport();
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."() truncsize=$truncsize, mimeSupport=".array2string($mimesupport));
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."() truncsize=$truncsize, mimeSupport=".array2string($mimesupport));
 		$bodypreference = $contentparameters->GetBodyPreference(); /* fmbiete's contribution r1528, ZP-320 */
 
 		// fix for z-push bug returning additional bodypreference type 4, even if only 1 is requested and mimessupport = 0
 		if (!$mimesupport && ($key = array_search('4', $bodypreference))) unset($bodypreference[$key]);
 
 		//$this->debugLevel=4;
-		if (!isset($this->mail)) $this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' FolderID:'.$folderid.' ID:'.$id.' TruncSize:'.$truncsize.' Bodypreference: '.array2string($bodypreference));
+		if (!isset($this->mail)) $this->mail = Mail::getInstance(false, self::$profileID, true, false, true);
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' FolderID:'.$folderid.' ID:'.$id.' TruncSize:'.$truncsize.' Bodypreference: '.array2string($bodypreference));
 		$account = $_folderName = $xid = null;
-		$this->splitID($folderid,$account,$_folderName,$xid);
+		$this->splitID($folderid, $account, $_folderName, $xid);
 		$this->mail->reopen($_folderName);
-		$messages = $this->fetchMessages($folderid, NULL, $id, true);	// true: return all headers
+		$messages = $this->fetchMessages($folderid, NULL, $id, true); // true: return all headers
 		$headers = $messages[$id];
-		if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($headers));
+		if ($this->debugLevel > 3) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.array2string($headers));
 		// StatMessage should reopen the folder in question, so we dont need folderids in the following statements.
 		if ($headers)
 		{
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." Message $id with stat ".array2string($headers));
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." Message $id with stat ".array2string($headers));
 			// initialize the object
 			$output = new SyncMail();
 			//$rawHeaders = $this->mail->getMessageRawHeader($id);
 			// simple style
 			// start AS12 Stuff (bodypreference === false) case = old behaviour
-			if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__. ' for message with ID:'.$id.' with headers:'.array2string($headers));
+			if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' for message with ID:'.$id.' with headers:'.array2string($headers));
 
 			if ($bodypreference === false) {
-				$bodyStruct = $this->mail->getMessageBody($id, 'only_if_no_text', '', null, true,$_folderName);
-				$raw_body = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
+				$bodyStruct = $this->mail->getMessageBody($id, 'only_if_no_text', '', null, true, $_folderName);
+				$raw_body = $this->mail->getdisplayableBody($this->mail, $bodyStruct, false, false);
 				//$body = html_entity_decode($body,ENT_QUOTES,$this->mail->detect_encoding($body));
-				if (stripos($raw_body,'<style')!==false) $body = preg_replace("/<style.*?<\/style>/is", "", $raw_body); // in case there is only a html part
+				if (stripos($raw_body, '<style') !== false) $body = preg_replace("/<style.*?<\/style>/is", "", $raw_body); // in case there is only a html part
 				// remove all other html
 				$body = strip_tags($raw_body);
-				if(strlen($body) > $truncsize) {
+				if (strlen($body) > $truncsize) {
 					$body = Utils::Utf8_truncate($body, $truncsize);
 					$output->bodytruncated = 1;
 				}
@@ -916,7 +916,7 @@ 
 			else // style with bodypreferences
 			{
 				//Select body type preference
-				$bpReturnType = 1;//SYNC_BODYPREFERENCE_PLAIN;
+				$bpReturnType = 1; //SYNC_BODYPREFERENCE_PLAIN;
 				if ($bodypreference !== false) {
 					// bodypreference can occur multiple times
 					// usually we would use Utils::GetBodyPreferenceBestMatch($bodypreference);
@@ -930,12 +930,12 @@ 
 					}
 */
 				}
-				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." getBodyPreferenceBestMatch: ".array2string($bpReturnType));
+				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." getBodyPreferenceBestMatch: ".array2string($bpReturnType));
 				// set the protocoll class
 				$output->asbody = new SyncBaseBody();
 
 				// return full mime-message without any (charset) conversation directly as stream
-				if ($bpReturnType==SYNC_BODYPREFERENCE_MIME)
+				if ($bpReturnType == SYNC_BODYPREFERENCE_MIME)
 				{
 					//SYNC_BODYPREFERENCE_MIME
 					$output->asbody->type = SYNC_BODYPREFERENCE_MIME;
@@ -944,58 +944,58 @@ 
 					fseek($stream, 0, SEEK_SET);
 					$output->asbody->data = $stream;
 					$output->asbody->estimatedDataSize = $fstat['size'];
-					ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." bodypreference 4=SYNC_BODYPREFERENCE_MIME=full mime message requested, size=$fstat[size]");
+					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." bodypreference 4=SYNC_BODYPREFERENCE_MIME=full mime message requested, size=$fstat[size]");
 				}
 				else
 				{
 					// fetch the body (try to gather data only once)
-					$css ='';
-					$bodyStruct = $this->mail->getMessageBody($id, 'html_only', '', null, true,$_folderName);
-					if ($this->debugLevel>2) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only Struct:'.array2string($bodyStruct));
-					$body = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true,false);
-					if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only:'.$body);
-					if ($body != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
+					$css = '';
+					$bodyStruct = $this->mail->getMessageBody($id, 'html_only', '', null, true, $_folderName);
+					if ($this->debugLevel > 2) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' html_only Struct:'.array2string($bodyStruct));
+					$body = $this->mail->getdisplayableBody($this->mail, $bodyStruct, true, false);
+					if ($this->debugLevel > 3) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' html_only:'.$body);
+					if ($body != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType'] == 'text/html')) {
 						// may be html
-						if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "MIME Body".' Type:html (fetched with html_only)');
+						if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, "MIME Body".' Type:html (fetched with html_only)');
 						$css = $this->mail->getStyles($bodyStruct);
-						$output->nativebodytype=2;
+						$output->nativebodytype = 2;
 					} else {
 						// plain text Message
-						if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "MIME Body".' Type:plain, fetch text (HTML, if no text available)');
-						$output->nativebodytype=1;
-						$bodyStruct = $this->mail->getMessageBody($id,'never_display', '', null, true,$_folderName); //'only_if_no_text');
-						if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' plain text Struct:'.array2string($bodyStruct));
-						$body = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
-						if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' never display html(plain text only):'.$body);
+						if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, "MIME Body".' Type:plain, fetch text (HTML, if no text available)');
+						$output->nativebodytype = 1;
+						$bodyStruct = $this->mail->getMessageBody($id, 'never_display', '', null, true, $_folderName); //'only_if_no_text');
+						if ($this->debugLevel > 3) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' plain text Struct:'.array2string($bodyStruct));
+						$body = $this->mail->getdisplayableBody($this->mail, $bodyStruct, false, false);
+						if ($this->debugLevel > 3) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' never display html(plain text only):'.$body);
 					}
 					// whatever format decode (using the correct encoding)
-					if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__."MIME Body".' Type:'.($output->nativebodytype==2?' html ':' plain ').$body);
+					if ($this->debugLevel > 3) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__."MIME Body".' Type:'.($output->nativebodytype == 2 ? ' html ' : ' plain ').$body);
 					//$body = html_entity_decode($body,ENT_QUOTES,$this->mail->detect_encoding($body));
 					// prepare plaintextbody
-					$plainBody='';
+					$plainBody = '';
 					if ($output->nativebodytype == 2)
 					{
-						$bodyStructplain = $this->mail->getMessageBody($id,'never_display', '', null, true,$_folderName); //'only_if_no_text');
-						if(isset($bodyStructplain[0])&&isset($bodyStructplain[0]['error'])&&$bodyStructplain[0]['error']==1)
+						$bodyStructplain = $this->mail->getMessageBody($id, 'never_display', '', null, true, $_folderName); //'only_if_no_text');
+						if (isset($bodyStructplain[0]) && isset($bodyStructplain[0]['error']) && $bodyStructplain[0]['error'] == 1)
 						{
 							$plainBody = Api\Mail\Html::convertHTMLToText($body); // always display with preserved HTML
 						}
 						else
 						{
-							$plainBody = $this->mail->getdisplayableBody($this->mail,$bodyStructplain,false,false);
+							$plainBody = $this->mail->getdisplayableBody($this->mail, $bodyStructplain, false, false);
 						}
 					}
 					//if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "MIME Body".$body);
-					$plainBody = preg_replace("/<style.*?<\/style>/is", "", (strlen($plainBody)?$plainBody:$body));
+					$plainBody = preg_replace("/<style.*?<\/style>/is", "", (strlen($plainBody) ? $plainBody : $body));
 					// remove all other html
-					$plainBody = preg_replace("/<br.*>/is","\r\n",$plainBody);
+					$plainBody = preg_replace("/<br.*>/is", "\r\n", $plainBody);
 					$plainBody = strip_tags($plainBody);
-					if ($this->debugLevel>3 && $output->nativebodytype==1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Plain Text:'.$plainBody);
+					if ($this->debugLevel > 3 && $output->nativebodytype == 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' Plain Text:'.$plainBody);
 					//$body = str_replace("\n","\r\n", str_replace("\r","",$body)); // do we need that?
 
-					if ($bpReturnType==2) //SYNC_BODYPREFERENCE_HTML
+					if ($bpReturnType == 2) //SYNC_BODYPREFERENCE_HTML
 					{
-						if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "HTML Body with requested pref 2");
+						if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, "HTML Body with requested pref 2");
 						// Send HTML if requested and native type was html
 						$output->asbody->type = 2;
 						$htmlbody = '<html>'.
@@ -1005,23 +1005,23 @@ 
 							$css.
 							'</head>'.
 							'<body>';
-						if ($output->nativebodytype==2)
+						if ($output->nativebodytype == 2)
 						{
-							if ($css) Api\Mail\Html::replaceTagsCompletley($body,'style');
+							if ($css) Api\Mail\Html::replaceTagsCompletley($body, 'style');
 							// as we fetch html, and body is HTML, we may not need to handle this
 							$htmlbody .= $body;
 						}
 						else
 						{
 							// html requested but got only plaintext, so fake html
-							$htmlbody .= str_replace("\n","<BR>",str_replace("\r","<BR>", str_replace("\r\n","<BR>",$plainBody)));
+							$htmlbody .= str_replace("\n", "<BR>", str_replace("\r", "<BR>", str_replace("\r\n", "<BR>", $plainBody)));
 						}
 						$htmlbody .= '</body>'.
 								'</html>';
 
-						if(isset($truncsize) && strlen($htmlbody) > $truncsize)
+						if (isset($truncsize) && strlen($htmlbody) > $truncsize)
 						{
-							$htmlbody = Utils::Utf8_truncate($htmlbody,$truncsize);
+							$htmlbody = Utils::Utf8_truncate($htmlbody, $truncsize);
 							$output->asbody->truncated = 1;
 						}
 						// output->nativebodytype is used as marker that the original message was of type ... but is now converted to, as type 2 is requested.
@@ -1032,7 +1032,7 @@ 
 					else
 					{
 						// Send Plaintext as Fallback or if original body is plainttext
-						if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "Plaintext Body:".$plainBody);
+						if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, "Plaintext Body:".$plainBody);
 						/* we use plainBody (set above) instead
 						$bodyStruct = $this->mail->getMessageBody($id,'only_if_no_text'); //'never_display');
 						$plain = $this->mail->getdisplayableBody($this->mail,$bodyStruct);
@@ -1042,7 +1042,7 @@ 
 						*/
 						$output->asbody->type = 1;
 						$output->nativebodytype = 1;
-						if(isset($truncsize) &&
+						if (isset($truncsize) &&
 							strlen($plainBody) > $truncsize)
 						{
 							$plainBody = Utils::Utf8_truncate($plainBody, $truncsize);
@@ -1061,7 +1061,7 @@ 
 				}
 			}
 			// end AS12 Stuff
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' gather Header info:'.$headers['subject'].' from:'.$headers['date']);
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' gather Header info:'.$headers['subject'].' from:'.$headers['date']);
 			$output->read = $headers["flags"];
 
 			$output->flag = new SyncMailFlags();
@@ -1081,9 +1081,8 @@ 
 				$output->lastverexecuted = AS_FORWARD;
 			}
 			$output->subject = $headers['subject'];
-			$output->importance = $headers['priority'] > 3 ? 0 :
-				($headers['priority'] < 3 ? 2 : 1) ;
-			$output->datereceived = $this->mail->_strtotime($headers['date'],'ts',true);
+			$output->importance = $headers['priority'] > 3 ? 0 : ($headers['priority'] < 3 ? 2 : 1);
+			$output->datereceived = $this->mail->_strtotime($headers['date'], 'ts', true);
 			$output->to = $headers['to_address'];
 			if ($headers['to']) $output->displayto = $headers['to_address']; //$headers['FETCHED_HEADER']['to_name']
 			$output->from = $headers['sender_address'];
@@ -1091,8 +1090,8 @@ 
 			if (isset($headers['reply_to_address']) && $headers['reply_to_address']) $output->reply_to = $headers['reply_to_address'];
 
 			$output->messageclass = "IPM.Note";
-			if (stripos($headers['mimetype'],'multipart')!== false &&
-				stripos($headers['mimetype'],'signed')!== false)
+			if (stripos($headers['mimetype'], 'multipart') !== false &&
+				stripos($headers['mimetype'], 'signed') !== false)
 			{
 				$output->messageclass = "IPM.Note.SMIME.MultipartSigned";
 			}
@@ -1101,20 +1100,20 @@ 
 			}
 
 			// start handle Attachments (include text/calendar multipart alternative)
-			$attachments = $this->mail->getMessageAttachments($id, $_partID='', $_structure=null, $fetchEmbeddedImages=true, $fetchTextCalendar=true, true, $_folderName);
+			$attachments = $this->mail->getMessageAttachments($id, $_partID = '', $_structure = null, $fetchEmbeddedImages = true, $fetchTextCalendar = true, true, $_folderName);
 			// Attachments should not needed for MIME messages, so skip this part if bpReturnType==4
-			if (/*$bpReturnType != SYNC_BODYPREFERENCE_MIME &&*/ is_array($attachments) && count($attachments)>0)
+			if (/*$bpReturnType != SYNC_BODYPREFERENCE_MIME &&*/ is_array($attachments) && count($attachments) > 0)
 			{
-				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' gather Attachments for MessageID:'.$id.' found:'.count($attachments));
+				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' gather Attachments for MessageID:'.$id.' found:'.count($attachments));
 				//error_log(__METHOD__.__LINE__.array2string($attachments));
 				foreach ($attachments as $key => $attach)
 				{
-					if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attach));
+					if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attach));
 
 					// pass meeting requests to calendar plugin
 					if (strtolower($attach['mimeType']) == 'text/calendar' && strtolower($attach['method']) == 'request' &&
 						isset($GLOBALS['egw_info']['user']['apps']['calendar']) &&
-						($attachment = $this->mail->getAttachment($id, $attach['partID'],0,false,false,$_folderName)) &&
+						($attachment = $this->mail->getAttachment($id, $attach['partID'], 0, false, false, $_folderName)) &&
 						($output->meetingrequest = calendar_zpush::meetingRequest($attachment['attachment'])))
 					{
 						//overwrite the globalobjId from calendar object, as: if you delete the mail, that is
@@ -1124,7 +1123,7 @@ 
 						$output->messageclass = "IPM.Schedule.Meeting.Request";
 						//$output->messageclass = "IPM.Schedule.Meeting";
 						unset($attachment);
-						continue;	// do NOT add attachment as attachment
+						continue; // do NOT add attachment as attachment
 					}
 					if (Request::GetProtocolVersion() >= 12.0) {
 						$attachment = new SyncBaseAttachment();
@@ -1132,33 +1131,33 @@ 
 							$output->asattachments = array();
 						$attachment->estimatedDataSize = $attach['size'];
 						$attachment->method = 1;
-						$attachment->filereference = $folderid . ":" . $id . ":" . $attach['partID'];
+						$attachment->filereference = $folderid.":".$id.":".$attach['partID'];
 					} else {
 						$attachment = new SyncAttachment();
 						if (!isset($output->attachments) || !is_array($output->attachments))
 							$output->attachments = array();
 						$attachment->attsize = $attach['size'];
 						$attachment->attmethod = 1;
-						$attachment->attname = $folderid . ":" . $id . ":" . $attach['partID'];//$key;
+						$attachment->attname = $folderid.":".$id.":".$attach['partID']; //$key;
 					}
 
 					$attachment->displayname = $attach['name'];
 					//error_log(__METHOD__.__LINE__.'->'.$folderid . ":" . $id . ":" . $attach['partID']);
 
-					$attachment->attoid = "";//isset($part->headers['content-id']) ? trim($part->headers['content-id']) : "";
+					$attachment->attoid = ""; //isset($part->headers['content-id']) ? trim($part->headers['content-id']) : "";
 					//$attachment->isinline=0; // if not inline, do not use isinline
-					if (!empty($attach['cid']) && $attach['cid'] <> 'NIL' )
+					if (!empty($attach['cid']) && $attach['cid'] <> 'NIL')
 					{
 						if ($bpReturnType != 4 && $attach['disposition'] == 'inline')
 						{
 							$attachment->isinline = true;
 						}
 						if (Request::GetProtocolVersion() >= 12.0) {
-							$attachment->method=1;
-							$attachment->contentid= str_replace(array("<",">"), "",$attach['cid']);
+							$attachment->method = 1;
+							$attachment->contentid = str_replace(array("<", ">"), "", $attach['cid']);
 						} else {
-							$attachment->attmethod=6;
-							$attachment->attoid = str_replace(array("<",">"), "",$attach['cid']);
+							$attachment->attmethod = 6;
+							$attachment->attoid = str_replace(array("<", ">"), "", $attach['cid']);
 						}
 						//	ZLog::Write(LOGLEVEL_DEBUG, "'".$part->headers['content-id']."'  ".$attachment->contentid);
 						$attachment->contenttype = trim($attach['mimeType']);
@@ -1179,7 +1178,7 @@ 
             // Language Code Page ID: http://msdn.microsoft.com/en-us/library/windows/desktop/dd317756%28v=vs.85%29.aspx
             $output->internetcpid = INTERNET_CPID_UTF8;
 
-			if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($output));
+			if ($this->debugLevel > 3) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.array2string($output));
 //$this->debugLevel=0;
 			return $output;
 		}
@@ -1202,30 +1201,30 @@ 
 	{
 		if (!class_exists('calendar_zpush'))
 		{
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(...) no EGroupware calendar installed!");
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."(...) no EGroupware calendar installed!");
 			return null;
 		}
 		if (!($stat = $this->StatMessage($folderid, $requestid)))
 		{
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."($requestid, '$folderid', $response) returning FALSE (can NOT stat message)");
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($requestid, '$folderid', $response) returning FALSE (can NOT stat message)");
 			return false;
 		}
 		$ret = false;
-		foreach($this->mail->getMessageAttachments($requestid, $_partID='', $_structure=null, $fetchEmbeddedImages=true, $fetchTextCalendar=true) as $key => $attach)
+		foreach ($this->mail->getMessageAttachments($requestid, $_partID = '', $_structure = null, $fetchEmbeddedImages = true, $fetchTextCalendar = true) as $key => $attach)
 		{
 			if (strtolower($attach['mimeType']) == 'text/calendar' && strtolower($attach['method']) == 'request' &&
-				($attachment = $this->mail->getAttachment($requestid, $attach['partID'],0,false)))
+				($attachment = $this->mail->getAttachment($requestid, $attach['partID'], 0, false)))
 			{
-				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."($requestid, '$folderid', $response) iCal found, calling now backend->MeetingResponse('$attachment[attachment]')");
+				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($requestid, '$folderid', $response) iCal found, calling now backend->MeetingResponse('$attachment[attachment]')");
 
 				// calling backend again with iCal attachment, to let calendar add the event
 				$ret = $this->backend->MeetingResponse($attachment['attachment'],
-					$this->backend->createID('calendar',$GLOBALS['egw_info']['user']['account_id']),
+					$this->backend->createID('calendar', $GLOBALS['egw_info']['user']['account_id']),
 					$response);
 				break;
 			}
 		}
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."($requestid, '$folderid', $response) returning ".array2string($ret));
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($requestid, '$folderid', $response) returning ".array2string($ret));
 		return $ret;
 	}
 
@@ -1239,9 +1238,9 @@ 
      * @param string $attname - should contain (folder)id
 	 * @return SyncItemOperationsAttachment-object
 	 */
-	function GetAttachmentData($fid,$attname) {
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.": $fid (attname: '$attname')");
-		return $this->_GetAttachmentData($fid,$attname);
+	function GetAttachmentData($fid, $attname) {
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.": $fid (attname: '$attname')");
+		return $this->_GetAttachmentData($fid, $attname);
 	}
 
 	/**
@@ -1254,9 +1253,9 @@ 
      * @param string $attname - should contain (folder)id
 	 * @return SyncItemOperationsAttachment-object
 	 */
-	function ItemOperationsGetAttachmentData($fid,$attname) {
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.": $fid (attname: '$attname')");
-		return $this->_GetAttachmentData($fid,$attname);
+	function ItemOperationsGetAttachmentData($fid, $attname) {
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.": $fid (attname: '$attname')");
+		return $this->_GetAttachmentData($fid, $attname);
 	}
 
 	/**
@@ -1268,23 +1267,23 @@ 
      * @param string $attname - should contain (folder)id
 	 * @return SyncItemOperationsAttachment-object
 	 */
-	private function _GetAttachmentData($fid,$attname)
+	private function _GetAttachmentData($fid, $attname)
 	{
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.": $fid (attname: '$attname')".function_backtrace());
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.": $fid (attname: '$attname')".function_backtrace());
 		//error_log(__METHOD__.__LINE__." Fid: $fid (attname: '$attname')");
 		list($folderid, $id, $part) = explode(":", $attname);
 
 		$this->splitID($folderid, $account, $folder);
 
-		if (!isset($this->mail)) $this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail)) $this->mail = Mail::getInstance(false, self::$profileID, true, false, true);
 
 		$this->mail->reopen($folder);
-		$attachment = $this->mail->getAttachment($id,$part,0,false,true,$folder);
+		$attachment = $this->mail->getAttachment($id, $part, 0, false, true, $folder);
 		$SIOattachment = new SyncItemOperationsAttachment();
-		fseek($attachment['attachment'], 0, SEEK_SET);	// z-push requires stream seeked to start
+		fseek($attachment['attachment'], 0, SEEK_SET); // z-push requires stream seeked to start
 		$SIOattachment->data = $attachment['attachment'];
 		//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.": $fid (attname: '$attname') Data:".$attachment['attachment']);
-		if (isset($attachment['type']) )
+		if (isset($attachment['type']))
 			$SIOattachment->contenttype = $attachment['type'];
 
 		unset($attachment);
@@ -1327,17 +1326,17 @@ 
 	 */
 	function ChangeMessage($folderid, $id, $message, $contentParameters)
 	{
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." $folderid, $id,".array2string($message).",".array2string($contentParameters));
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." $folderid, $id,".array2string($message).",".array2string($contentParameters));
 		//unset($folderid, $id, $message, $contentParameters);
 		$account = $folder = null;
 		$this->splitID($folderid, $account, $folder);
 		if (isset($message->flag)) {
 			if (isset($message->flag->flagstatus) && $message->flag->flagstatus == 2) {
-				$rv = $this->mail->flagMessages((($message->flag->flagstatus == 2) ? "flagged" : "unflagged"), $id,$folder);
-				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__." -> set ".array2string($id).' in Folder '.$folder." as " . (($message->flag->flagstatus == 2) ? "flagged" : "unflagged") . "-->". $rv);
+				$rv = $this->mail->flagMessages((($message->flag->flagstatus == 2) ? "flagged" : "unflagged"), $id, $folder);
+				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." -> set ".array2string($id).' in Folder '.$folder." as ".(($message->flag->flagstatus == 2) ? "flagged" : "unflagged")."-->".$rv);
 			} else {
-				$rv = $this->mail->flagMessages("unflagged", $id,$folder);
-				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__." -> set ".array2string($id).' in Folder '.$folder." as " . "unflagged" . "-->". $rv);
+				$rv = $this->mail->flagMessages("unflagged", $id, $folder);
+				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." -> set ".array2string($id).' in Folder '.$folder." as "."unflagged"."-->".$rv);
 			}
 		}
 		return $this->StatMessage($folderid, $id);
@@ -1359,23 +1358,23 @@ 
 	 */
 	public function MoveMessage($folderid, $id, $newfolderid, $contentParameters)
 	{
-		unset($contentParameters);	// not used, but required by function signature
+		unset($contentParameters); // not used, but required by function signature
 		ZLog::Write(LOGLEVEL_DEBUG, "IMAP-MoveMessage: (sfid: '$folderid'  id: '$id'  dfid: '$newfolderid' )");
 		$account = $srcFolder = $destFolder = null;
 		$this->splitID($folderid, $account, $srcFolder);
 		$this->splitID($newfolderid, $account, $destFolder);
 		ZLog::Write(LOGLEVEL_DEBUG, "IMAP-MoveMessage: (SourceFolder: '$srcFolder'  id: '$id'  DestFolder: '$destFolder' )");
-		if (!isset($this->mail)) $this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail)) $this->mail = Mail::getInstance(false, self::$profileID, true, false, true);
 		$this->mail->reopen($destFolder);
 		$status = $this->mail->getFolderStatus($destFolder);
 		$uidNext = $status['uidnext'];
 		$this->mail->reopen($srcFolder);
 
 		// move message
-		$rv = $this->mail->moveMessages($destFolder,(array)$id,true,$srcFolder,true);
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.": New Status of $destFolder :".array2string($status).", ReturnValOf moveMessage".array2string($rv)); // this may be true, so try using the nextUID value by examine
+		$rv = $this->mail->moveMessages($destFolder, (array)$id, true, $srcFolder, true);
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.": New Status of $destFolder :".array2string($status).", ReturnValOf moveMessage".array2string($rv)); // this may be true, so try using the nextUID value by examine
 		// return the new id "as string"
-		return ($rv===true ? $uidNext : $rv[$id]) . "";
+		return ($rv === true ? $uidNext : $rv[$id])."";
 	}
 
 	/**
@@ -1383,7 +1382,7 @@ 
 	 *
 	 *  @param int $cutoffdate =null timestamp with cutoffdate, default 12 weeks
 	 */
-	public function GetMessageList($folderid, $cutoffdate=NULL)
+	public function GetMessageList($folderid, $cutoffdate = NULL)
 	{
 		if ($cutoffdate > 0)
 		{
@@ -1396,8 +1395,8 @@ 
 			{
 				$maximumSyncRangeInDays = $GLOBALS['egw_info']['user']['preferences']['activesync']['mail-maximumSyncRange'];
 			}
-			$cutoffdate = (is_numeric($maximumSyncRangeInDays) ? Api\DateTime::to('now','ts')-(3600*24*$maximumSyncRangeInDays):null);
-			if (is_numeric($maximumSyncRangeInDays)) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.' Client set no truncationdate. Using '.$maximumSyncRangeInDays.' days.'.date("d-M-Y", $cutoffdate));
+			$cutoffdate = (is_numeric($maximumSyncRangeInDays) ? Api\DateTime::to('now', 'ts') - (3600 * 24 * $maximumSyncRangeInDays) : null);
+			if (is_numeric($maximumSyncRangeInDays)) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.' Client set no truncationdate. Using '.$maximumSyncRangeInDays.' days.'.date("d-M-Y", $cutoffdate));
 		}
 		return $this->fetchMessages($folderid, $cutoffdate);
 	}
@@ -1415,11 +1414,11 @@ 
 	 * @param boolean $return_all_headers =false true: additinal contain all headers eg. "subject"
 	 * @return array uid => array StatMessage($folderid, $_id)
 	 */
-	private function fetchMessages($folderid, $cutoffdate=NULL, $_id=NULL, $return_all_headers=false)
+	private function fetchMessages($folderid, $cutoffdate = NULL, $_id = NULL, $return_all_headers = false)
 	{
 		static $headers = array();
 
-		if ($this->debugLevel>1) $gstarttime = microtime (true);
+		if ($this->debugLevel > 1) $gstarttime = microtime(true);
 		//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__);
 		$rv_messages = array();
 		// if the message is still available within the class, we use it instead of fetching it again
@@ -1430,64 +1429,64 @@ 
 		}
 		else
 		{
-			$headers = array();	// clear cache to not use too much memory
+			$headers = array(); // clear cache to not use too much memory
 
-			if ($this->debugLevel>1) $starttime = microtime (true);
+			if ($this->debugLevel > 1) $starttime = microtime(true);
 			$this->_connect($this->account);
-			if ($this->debugLevel>1)
+			if ($this->debugLevel > 1)
 			{
 				$endtime = microtime(true) - $starttime;
-				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__. " connect took : ".$endtime.' for account:'.$this->account);
+				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." connect took : ".$endtime.' for account:'.$this->account);
 			}
 			$messagelist = $_filter = array();
 			// if not connected, any further action must fail
-			if (!empty($cutoffdate)) $_filter = array('status'=>array('UNDELETED'),'range'=>"SINCE",'date'=> date("d-M-Y", $cutoffdate));
-			if ($this->debugLevel>1) $starttime = microtime (true);
+			if (!empty($cutoffdate)) $_filter = array('status'=>array('UNDELETED'), 'range'=>"SINCE", 'date'=> date("d-M-Y", $cutoffdate));
+			if ($this->debugLevel > 1) $starttime = microtime(true);
 			$account = $_folderName = $id = null;
-			$this->splitID($folderid,$account,$_folderName,$id);
-			if ($this->debugLevel>1)
+			$this->splitID($folderid, $account, $_folderName, $id);
+			if ($this->debugLevel > 1)
 			{
 				$endtime = microtime(true) - $starttime;
-				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__. " splitID took : ".$endtime.' for FolderID:'.$folderid);
+				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." splitID took : ".$endtime.' for FolderID:'.$folderid);
 			}
-			if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_id).'/'.$id);
-			if ($this->debugLevel>1) $starttime = microtime (true);
-			$_numberOfMessages = (empty($cutoffdate)?250:99999);
-			$rv_messages = $this->mail->getHeaders($_folderName, $_startMessage=1, $_numberOfMessages, $_sort=0, $_reverse=false, $_filter, $_id);
-			if ($this->debugLevel>1)
+			if ($this->debugLevel > 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_id).'/'.$id);
+			if ($this->debugLevel > 1) $starttime = microtime(true);
+			$_numberOfMessages = (empty($cutoffdate) ? 250 : 99999);
+			$rv_messages = $this->mail->getHeaders($_folderName, $_startMessage = 1, $_numberOfMessages, $_sort = 0, $_reverse = false, $_filter, $_id);
+			if ($this->debugLevel > 1)
 			{
 				$endtime = microtime(true) - $starttime;
-				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__. " getHeaders call took : ".$endtime.' for FolderID:'.$_folderName);
+				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." getHeaders call took : ".$endtime.' for FolderID:'.$_folderName);
 			}
 		}
-		if ($_id == NULL && $this->debugLevel>1)  ZLog::Write(LOGLEVEL_DEBUG,__METHOD__." found :". count($rv_messages['header']));
+		if ($_id == NULL && $this->debugLevel > 1)  ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." found :".count($rv_messages['header']));
 		//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Result:'.array2string($rv_messages));
 		$messagelist = array();
-		if (!isset($rv_messages['header'])||empty($rv_messages['header'])) return $messagelist;
+		if (!isset($rv_messages['header']) || empty($rv_messages['header'])) return $messagelist;
 		//if ($_returnModHash) $messageFolderHash = array();
 		foreach ((array)$rv_messages['header'] as $k => $vars)
 		{
-			if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' ID to process:'.$vars['uid'].' Subject:'.$vars['subject']);
+			if ($this->debugLevel > 3) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' ID to process:'.$vars['uid'].' Subject:'.$vars['subject']);
 			$headers[$vars['uid']] = $vars;
-			if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' MailID:'.$k.'->'.array2string($vars));
+			if ($this->debugLevel > 3) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' MailID:'.$k.'->'.array2string($vars));
 			if (!empty($vars['deleted'])) continue; // cut of deleted messages
 			if ($cutoffdate && $vars['date'] < $cutoffdate) continue; // message is out of range for cutoffdate, ignore it
-			if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' ID to report:'.$vars['uid'].' Subject:'.$vars['subject']);
+			if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' ID to report:'.$vars['uid'].' Subject:'.$vars['subject']);
 			$mess = $return_all_headers ? $vars : array();
 			$mess["mod"] = self::doFlagsMod($vars).$vars['date'];
 			$mess["id"] = $vars['uid'];
 			// 'seen' aka 'read' is the only flag we want to know about
 			$mess["flags"] = 0;
 			// outlook supports additional flags, set them to 0
-			if($vars["seen"]) $mess["flags"] = 1;
-			if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($mess));
+			if ($vars["seen"]) $mess["flags"] = 1;
+			if ($this->debugLevel > 3) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.array2string($mess));
 			$messagelist[$vars['uid']] = $mess;
 			unset($mess);
 		}
-		if ($this->debugLevel>1)
+		if ($this->debugLevel > 1)
 		{
 			$endtime = microtime(true) - $gstarttime;
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__. " total time used : ".$endtime.' for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_id).'/'.$id);
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." total time used : ".$endtime.' for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_id).'/'.$id);
 		}
 		return $messagelist;
 	}
@@ -1538,32 +1537,32 @@ 
 	public function getSearchResultsMailbox($_searchquery)
 	{
 		//$this->debugLevel=1;
-		$searchquery=$_searchquery->GetDataArray();
+		$searchquery = $_searchquery->GetDataArray();
 		if (!is_array($searchquery)) return array();
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($searchquery));
+		if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.array2string($searchquery));
 
 		if (isset($searchquery['searchrebuildresults'])) {
 			$rebuildresults = $searchquery['searchrebuildresults'];
 		} else {
 			$rebuildresults = false;
 		}
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,  'RebuildResults ['.$rebuildresults.']' );
+		if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, 'RebuildResults ['.$rebuildresults.']');
 
 		if (isset($searchquery['deeptraversal'])) {
 			$deeptraversal = $searchquery['deeptraversal'];
 		} else {
 			$deeptraversal = false;
 		}
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,  'DeepTraversal ['.$deeptraversal.']' );
+		if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, 'DeepTraversal ['.$deeptraversal.']');
 
 		if (isset($searchquery['searchrange'])) {
-			$range = explode("-",$_searchquery->GetSearchRange());
-			$start =$range[0] + 1;
+			$range = explode("-", $_searchquery->GetSearchRange());
+			$start = $range[0] + 1;
 			$limit = $range[1] - $range[0] + 1;
 		} else {
 			$range = false;
 		}
-		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,  'Range ['.print_r($range, true).']' );
+		if ($this->debugLevel > 0) ZLog::Write(LOGLEVEL_DEBUG, 'Range ['.print_r($range, true).']');
 
 		//foreach($searchquery['query'] as $k => $value) {
 		//	$query = $value;
@@ -1586,15 +1585,15 @@ 
 		}
 		if (!$folderid)
 		{
-			$_folderName = ($this->mail->sessionData['mailbox']?$this->mail->sessionData['mailbox']:'INBOX');
-			$folderid = $this->createID($account=0,$_folderName);
+			$_folderName = ($this->mail->sessionData['mailbox'] ? $this->mail->sessionData['mailbox'] : 'INBOX');
+			$folderid = $this->createID($account = 0, $_folderName);
 		}
-		$rv = $this->splitID($folderid,$account,$_folderName,$id);
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' ProfileID:'.self::$profileID.' FolderID:'.$folderid.' Foldername:'.$_folderName);
+		$rv = $this->splitID($folderid, $account, $_folderName, $id);
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' ProfileID:'.self::$profileID.' FolderID:'.$folderid.' Foldername:'.$_folderName);
 		$this->_connect($account);
 		// this should not be needed ???
-		Mail::$supportsORinQuery[self::$profileID]=true; // trigger quicksearch (if possible)
-		$_filter = array('type'=> (Mail::$supportsORinQuery[self::$profileID]?'quick':'subject'),
+		Mail::$supportsORinQuery[self::$profileID] = true; // trigger quicksearch (if possible)
+		$_filter = array('type'=> (Mail::$supportsORinQuery[self::$profileID] ? 'quick' : 'subject'),
 						 'string'=> $searchText,
 						 'status'=>'any'
 						);
@@ -1609,22 +1608,22 @@ 
 		 * 		[searchvalueless] => 2015-07-14T15:11:00.000Z , BEFORE
 		 */
 			$_filter['range'] = "BETWEEN";
-			list($sincedate,$crap) = explode('T',$searchquery['searchvaluegreater']);
-			list($beforedate,$crap) = explode('T',$searchquery['searchvalueless']);
-			$_filter['before'] = date("d-M-Y", Api\DateTime::to($beforedate,'ts'));
-			$_filter['since'] = date("d-M-Y", Api\DateTime::to($sincedate,'ts'));
+			list($sincedate, $crap) = explode('T', $searchquery['searchvaluegreater']);
+			list($beforedate, $crap) = explode('T', $searchquery['searchvalueless']);
+			$_filter['before'] = date("d-M-Y", Api\DateTime::to($beforedate, 'ts'));
+			$_filter['since'] = date("d-M-Y", Api\DateTime::to($sincedate, 'ts'));
 		}
 		//$_filter[] = array('type'=>"SINCE",'string'=> date("d-M-Y", $cutoffdate));
-		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter));
-		$rv_messages = $this->mail->getHeaders($_folderName, $_startMessage=($range?$start:1), $_numberOfMessages=($limit?$limit:9999999), $_sort=0, $_reverse=false, $_filter, $_id=NULL);
+		if ($this->debugLevel > 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter));
+		$rv_messages = $this->mail->getHeaders($_folderName, $_startMessage = ($range ? $start : 1), $_numberOfMessages = ($limit ? $limit : 9999999), $_sort = 0, $_reverse = false, $_filter, $_id = NULL);
 		//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($rv_messages));
-		$list=array();
+		$list = array();
 
 		$cnt = count($rv_messages['header']);
 		//$list['status'] = 1;
 		$list['searchtotal'] = $cnt;
 		$list["range"] = $_searchquery->GetSearchRange();
-		foreach((array)$rv_messages['header'] as $i => $vars)
+		foreach ((array)$rv_messages['header'] as $i => $vars)
 		{
 			$list[] = array(
 				"class" => "Email",
@@ -1644,20 +1643,20 @@ 
 	 * @param string $folder
 	 * @return string
 	 */
-	private function getParentID($account,$folder)
+	private function getParentID($account, $folder)
 	{
 		$this->_connect($account);
-		if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true,false);
+		if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true, false);
 
 		$mailFolder = $this->folders[$folder];
 		if (!isset($mailFolder)) return false;
-		$delimiter = (isset($mailFolder->delimiter)?$mailFolder->delimiter:$this->mail->getHierarchyDelimiter());
-		$parent = explode($delimiter,$folder);
+		$delimiter = (isset($mailFolder->delimiter) ? $mailFolder->delimiter : $this->mail->getHierarchyDelimiter());
+		$parent = explode($delimiter, $folder);
 		array_pop($parent);
-		$parent = implode($delimiter,$parent);
+		$parent = implode($delimiter, $parent);
 
 		$id = $parent && $this->folders[$parent] ? $this->createID($account, $parent) : '0';
-		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."('$folder') --> parent=$parent --> $id");
+		if ($this->debugLevel > 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folder') --> parent=$parent --> $id");
 		return $id;
 	}
 
@@ -1677,48 +1676,48 @@ 
 			$account = $folder = null;
 			$this->splitID($id, $account, $folder);
 		}
-		catch(Exception $e) {
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' failed for '.$e->getMessage());
-			return $folderObj=false;
+		catch (Exception $e) {
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' failed for '.$e->getMessage());
+			return $folderObj = false;
 		}
 		$this->_connect($account);
-		if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true,false);
+		if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true, false);
 
 		$mailFolder = $this->folders[$folder];
-		if (!isset($mailFolder)) return $folderObj=false;
+		if (!isset($mailFolder)) return $folderObj = false;
 
 		$folderObj = new SyncFolder();
 		$folderObj->serverid = $id;
-		$folderObj->parentid = $this->getParentID($account,$folder);
+		$folderObj->parentid = $this->getParentID($account, $folder);
 		$folderObj->displayname = $mailFolder->shortDisplayName;
-		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." ID: $id, Account:$account, Folder:$folder");
+		if ($this->debugLevel > 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." ID: $id, Account:$account, Folder:$folder");
 		// get folder-type
-		foreach($this->folders as $inbox => $mailFolder) break;
+		foreach ($this->folders as $inbox => $mailFolder) break;
 		if ($folder == $inbox)
 		{
 			$folderObj->type = SYNC_FOLDER_TYPE_INBOX;
 		}
-		elseif($this->mail->isDraftFolder($folder, false, true))
+		elseif ($this->mail->isDraftFolder($folder, false, true))
 		{
 			//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.' isDraft');
 			$folderObj->type = SYNC_FOLDER_TYPE_DRAFTS;
 			$folderObj->parentid = 0; // required by devices
 		}
-		elseif($this->mail->isTrashFolder($folder, false, true))
+		elseif ($this->mail->isTrashFolder($folder, false, true))
 		{
 			$folderObj->type = SYNC_FOLDER_TYPE_WASTEBASKET;
 			$this->_wasteID = $folder;
 			//error_log(__METHOD__.__LINE__.' TrashFolder:'.$this->_wasteID);
 			$folderObj->parentid = 0; // required by devices
 		}
-		elseif($this->mail->isSentFolder($folder, false, true))
+		elseif ($this->mail->isSentFolder($folder, false, true))
 		{
 			$folderObj->type = SYNC_FOLDER_TYPE_SENTMAIL;
 			$folderObj->parentid = 0; // required by devices
 			$this->_sentID = $folder;
 			//error_log(__METHOD__.__LINE__.' SentFolder:'.$this->_sentID);
 		}
-		elseif($this->mail->isOutbox($folder, false, true))
+		elseif ($this->mail->isOutbox($folder, false, true))
 		{
 			//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.' isOutbox');
 			$folderObj->type = SYNC_FOLDER_TYPE_OUTBOX;
@@ -1730,7 +1729,7 @@ 
 			$folderObj->type = SYNC_FOLDER_TYPE_USER_MAIL;
 		}
 
-		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."($id) --> $folder --> type=$folderObj->type, parentID=$folderObj->parentid, displayname=$folderObj->displayname");
+		if ($this->debugLevel > 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($id) --> $folder --> type=$folderObj->type, parentID=$folderObj->parentid, displayname=$folderObj->displayname");
 		return $folderObj;
 	}
 
@@ -1778,18 +1777,18 @@ 
 
 		if ($type != 'mail') return false;
 
-		if (!isset($this->mail)) $this->mail = Mail::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail)) $this->mail = Mail::getInstance(false, self::$profileID, true, false, true);
 
         $this->mail->reopen($folder);
 
-		if (!($status = $this->mail->getFolderStatus($folder,$ignoreStatusCache=true)))
+		if (!($status = $this->mail->getFolderStatus($folder, $ignoreStatusCache = true)))
 		{
-            ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.": could not stat folder $folder ");
+            ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.": could not stat folder $folder ");
             return false;
         }
-		$syncstate = "M:". $status['messages'] ."-R:". $status['recent'] ."-U:". $status['unseen']."-NUID:".$status['uidnext']."-UIDV:".$status['uidvalidity'];
+		$syncstate = "M:".$status['messages']."-R:".$status['recent']."-U:".$status['unseen']."-NUID:".$status['uidnext']."-UIDV:".$status['uidvalidity'];
 
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."($folderid, ...) $folder ($account) returning ".array2string($syncstate));
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($folderid, ...) $folder ($account) returning ".array2string($syncstate));
 		return array();
 	}
 
@@ -1802,8 +1801,8 @@ 
 	function GetWasteBasket()
 	{
 		$this->_connect($this->account);
-		$id = $this->createID($account=0, $this->_wasteID);
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__."() account=$this->account returned $id for folder $this->_wasteID");
+		$id = $this->createID($account = 0, $this->_wasteID);
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__."() account=$this->account returned $id for folder $this->_wasteID");
 		return $id;
 	}
 
@@ -1824,7 +1823,7 @@ 
      */
     public function DeleteMessage($folderid, $id, $contentParameters)
 	{
-		unset($contentParameters);	// not used, but required by function signature
+		unset($contentParameters); // not used, but required by function signature
 		ZLog::Write(LOGLEVEL_DEBUG, "IMAP-DeleteMessage: (fid: '$folderid'  id: '$id' )");
 		/*
 		$this->imap_reopenFolder($folderid);
@@ -1835,7 +1834,7 @@ 
 		// we may have to split folderid
 		$account = $folder = null;
 		$this->splitID($folderid, $account, $folder);
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' '.$folderid.'->'.$folder);
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__.' '.$folderid.'->'.$folder);
 		$_messageUID = (array)$id;
 
 		$this->_connect($this->account);
@@ -1847,9 +1846,9 @@ 
 		catch (Api\Exception $e)
 		{
 			$error = $e->getMessage();
-			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." $_messageUID, $folder ->".$error);
+			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." $_messageUID, $folder ->".$error);
 			// if the server thinks the message does not exist report deletion as success
-			if (stripos($error,'[NONEXISTENT]')!==false) return true;
+			if (stripos($error, '[NONEXISTENT]') !== false) return true;
 			return false;
 		}
 
@@ -1883,15 +1882,15 @@ 
      */
     public function SetReadFlag($folderid, $id, $flags, $contentParameters)
 	{
-		unset($contentParameters);	// not used, but required by function signature
+		unset($contentParameters); // not used, but required by function signature
 		// ZLog::Write(LOGLEVEL_DEBUG, "IMAP-SetReadFlag: (fid: '$folderid'  id: '$id'  flags: '$flags' )");
 		$account = $folder = null;
 		$this->splitID($folderid, $account, $folder);
 
 		$_messageUID = (array)$id;
 		$this->_connect($this->account);
-		$rv = $this->mail->flagMessages((($flags) ? "read" : "unread"), $_messageUID,$folder);
-		ZLog::Write(LOGLEVEL_DEBUG, "IMAP-SetReadFlag -> set ".array2string($_messageUID).' in Folder '.$folder." as " . (($flags) ? "read" : "unread") . "-->". $rv);
+		$rv = $this->mail->flagMessages((($flags) ? "read" : "unread"), $_messageUID, $folder);
+		ZLog::Write(LOGLEVEL_DEBUG, "IMAP-SetReadFlag -> set ".array2string($_messageUID).' in Folder '.$folder." as ".(($flags) ? "read" : "unread")."-->".$rv);
 
 		return $rv;
 	}
@@ -1909,7 +1908,7 @@ 
 	 */
 	public function ChangeFolder($id, $oldid, $displayname, $type)
 	{
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."('$id', '$oldid', '$displayname', $type)");
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$id', '$oldid', '$displayname', $type)");
 		$account = $parent_id = null;
 		$this->splitID($id, $account, $parentFolder, $app);
 
@@ -1926,17 +1925,17 @@ 
 			$this->splitID($oldid, $account, $oldFolder, $app);
 			$old_hash = $this->folder2hash($account, $oldFolder);
 		}
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.":{$action}Folder('$id'=>($parentFolder ($parent_id)), '$oldid'".($oldid?"=>($oldFolder ($old_hash))":'').", '$displayname', $type)");
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.":{$action}Folder('$id'=>($parentFolder ($parent_id)), '$oldid'".($oldid ? "=>($oldFolder ($old_hash))" : '').", '$displayname', $type)");
 		$this->_connect($this->account);
 		try
 		{
-			if ($action=='rename')
+			if ($action == 'rename')
 			{
 				$newFolderName = $this->mail->renameFolder($oldFolder, $parentFolder, $displayname);
 			}
-			elseif ($action=='create')
+			elseif ($action == 'create')
 			{
-				$error=null;
+				$error = null;
 				$newFolderName = $this->mail->createFolder($parentFolder, $displayname, $error);
 			}
 		}
@@ -1948,7 +1947,7 @@ 
 		$newHash = $this->rename_folder_hash($account, $old_hash, $newFolderName);
 		$newID = $this->createID($account, $newHash);
 
-		ZLog::Write(LOGLEVEL_DEBUG,":{$action}Folder('$id'=>($parentFolder), '$oldid'".($oldid?"=>($oldFolder)":'').", '$displayname' => $newFolderName (ID:$newID))");
+		ZLog::Write(LOGLEVEL_DEBUG, ":{$action}Folder('$id'=>($parentFolder), '$oldid'".($oldid ? "=>($oldFolder)" : '').", '$displayname' => $newFolderName (ID:$newID))");
 		return $this->StatFolder($newID);
 	}
 
@@ -1961,13 +1960,13 @@ 
 	 * @throws StatusException              could throw specific SYNC_FSSTATUS_* exceptions
 	 * @return boolean true or false on error
 	 */
-	public function DeleteFolder($id, $parentid=false)
+	public function DeleteFolder($id, $parentid = false)
 	{
 		$account = $parent_id = $app = null;
 		$this->splitID($id, $account, $folder, $app);
 		$old_hash = $this->folder2hash($account, $folder);
 		if ($parentid) $this->splitID($parentid, $account, $parentfolder, $app);
-		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."( '$id (-> $folder)','$parentid ".($parentid?'(->'.$parentfolder.')':'')."') called!");
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."( '$id (-> $folder)','$parentid ".($parentid ? '(->'.$parentfolder.')' : '')."') called!");
 		$ret = $this->mail->deleteFolder($folder);
 		if ($ret) $newHash = $this->rename_folder_hash($account, $old_hash, "##Dele#edFolder#$folder##");
 		return $ret;
@@ -1989,8 +1988,8 @@ 
 		$this->_connect($this->account);
 		$account = $folder = null;
 		$this->splitID($folderid, $account, $folder);
-		$rv = $this->mail->flagMessages((($flags->flagstatus == 2) ? "flagged" : "unflagged"), $_messageUID,$folder);
-		ZLog::Write(LOGLEVEL_DEBUG, "IMAP-SetFlaggedFlag -> set ".array2string($_messageUID).' in Folder '.$folder." as " . (($flags->flagstatus == 2) ? "flagged" : "unflagged") . "-->". $rv);
+		$rv = $this->mail->flagMessages((($flags->flagstatus == 2) ? "flagged" : "unflagged"), $_messageUID, $folder);
+		ZLog::Write(LOGLEVEL_DEBUG, "IMAP-SetFlaggedFlag -> set ".array2string($_messageUID).' in Folder '.$folder." as ".(($flags->flagstatus == 2) ? "flagged" : "unflagged")."-->".$rv);
 
 		return $rv;
 	}
@@ -2004,17 +2003,17 @@ 
 	 * @return string
 	 * @throws Api\Exception\WrongParameter
 	 */
-	private function createID($account,$folder,$id=0)
+	private function createID($account, $folder, $id = 0)
 	{
 		if (!is_numeric($folder))
 		{
 			// convert string $folder in numeric id
-			$folder = $this->folder2hash($account,$f=$folder);
+			$folder = $this->folder2hash($account, $f = $folder);
 		}
 
 		$str = $this->backend->createID($account, $folder, $id);
 
-		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."($account,'$f',$id) type=$account, folder=$folder --> '$str'");
+		if ($this->debugLevel > 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($account,'$f',$id) type=$account, folder=$folder --> '$str'");
 
 		return $str;
 	}
@@ -2028,14 +2027,14 @@ 
 	 * @param int &$appid=null (for mail=mail is to be expected)
 	 * @throws Api\Exception\WrongParameter
 	 */
-	private function splitID($str,&$account,&$folder,&$appid=null)
+	private function splitID($str, &$account, &$folder, &$appid = null)
 	{
 		$this->backend->splitID($str, $account, $folder, $appid);
 
 		// convert numeric folder-id back to folder name
-		$folder = $this->hash2folder($account,$f=$folder);
+		$folder = $this->hash2folder($account, $f = $folder);
 
-		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."('$str','$account','$folder',$appid)");
+		if ($this->debugLevel > 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$str','$account','$folder',$appid)");
 	}
 
 	/**
@@ -2052,9 +2051,9 @@ 
 	 * @param string $folder
 	 * @return int
 	 */
-	private function folder2hash($account,$folder)
+	private function folder2hash($account, $folder)
 	{
-		if(!isset($this->folderHashes)) $this->readFolderHashes();
+		if (!isset($this->folderHashes)) $this->readFolderHashes();
 
 		if (($index = array_search($folder, (array)$this->folderHashes[$account])) === false)
 		{
@@ -2075,9 +2074,9 @@ 
 	 * @param int $index
 	 * @return string NULL if not used so far
 	 */
-	private function hash2folder($account,$index)
+	private function hash2folder($account, $index)
 	{
-		if(!isset($this->folderHashes)) $this->readFolderHashes();
+		if (!isset($this->folderHashes)) $this->readFolderHashes();
 
 		return isset($this->folderHashes[$account]) ? $this->folderHashes[$account][$index] : null;
 	}
@@ -2133,9 +2132,9 @@ 
 			if ((file_exists($file = $this->hashFile()) || file_exists($file = $this->hashFile(true))) &&
 				($hashes = file_get_contents($file)))
 			{
-				$this->folderHashes = json_decode($hashes,true);
+				$this->folderHashes = json_decode($hashes, true);
 				// fallback in case hashes have been serialized instead of being json-encoded
-				if (json_last_error()!=JSON_ERROR_NONE)
+				if (json_last_error() != JSON_ERROR_NONE)
 				{
 					//error_log(__METHOD__.__LINE__." error decoding with json");
 					$this->folderHashes = unserialize($hashes);
@@ -2181,9 +2180,9 @@ 
 	 * @param boolean $old =false true: return old / pre-15 hash-file
 	 * @throws Api\Exception\AssertionFailed
 	 */
-	private function hashFile($old=false)
+	private function hashFile($old = false)
 	{
-		if (!($dev_id=Request::GetDeviceID()))
+		if (!($dev_id = Request::GetDeviceID()))
 		{
 			throw new Api\Exception\AssertionFailed(__METHOD__."() no DeviceID set!");
 		}