Merge remote-tracking branch 'origin/develop' into AS14.1

src/backend/kopano/kopano.php

@@ -444,7 +444,7 @@ class BackendKopano implements IBackend, ISearchProvider {
             $senderEmail = array();
             // KOE: grep for the Sender header indicating we should send-as
             // the 'X-Push-Sender-Name' header is not used
-            if (preg_match("/^X-Push-Sender:\s(.*?)$/im", $sm->mime, $senderEmail)) {
+            if (preg_match("/^X-Push-Sender:\s(.*?)$/im", substr($sm->mime, 0, strpos($sm->mime, "\r\n\r\n")), $senderEmail)) {
                 $sendAsEmail = trim($senderEmail[1]);
                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("KopanoBackend->SendMail(): Send-As '%s' requested by KOE", $sendAsEmail));
 

src/lib/core/asdevice.php

@@ -188,7 +188,7 @@ class ASDevice extends StateObject {
         unset($this->forceSave);
         unset($this->newdevice);
         unset($this->ignoredMessageIds);
-        unset($this->backend2folderidCache);
+        $this->backend2folderidCache = false;
 
         if (isset($this->ignoredmessages) && is_array($this->ignoredmessages)) {
             $imessages = $this->ignoredmessages;