From c15e98083b6e21b0f42a918fbfb567b95627f085 Mon Sep 17 00:00:00 2001
From: polytan02 <polytan02@mcgva.org>
Date: Sun, 17 Apr 2016 09:01:30 +0100
Subject: [PATCH] Update to latest sources

---
 sources/backend/imap/imap.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sources/backend/imap/imap.php b/sources/backend/imap/imap.php
index 3c1b7ad..3889f05 100644
--- a/sources/backend/imap/imap.php
+++ b/sources/backend/imap/imap.php
@@ -2550,14 +2550,14 @@ class BackendIMAP extends BackendDiff implements ISearchProvider {
     private function setFromHeaderValue(&$headers) {
         $from = getDefaultFromValue($this->username, $this->domain);
 
-        if (isset($headers["from"])) {
+        if (isset($headers["from"]) && strlen($headers["from"]) > 0) {
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendIMAP->getFromHeaderValue(): from defined: %s", $headers["from"]));
             if (strlen(IMAP_DEFAULTFROM) > 0) {
                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendIMAP->getFromHeaderValue(): Overwriting From: %s", $from));
                 $headers["from"] = $from;
             }
         }
-        elseif (isset($headers["From"])) {
+        elseif (isset($headers["From"]) && strlen($headers["From"]) > 0) {
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendIMAP->getFromHeaderValue(): From defined: %s", $headers["From"]));
             if (strlen(IMAP_DEFAULTFROM) > 0) {
                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendIMAP->getFromHeaderValue(): Overwriting From: %s", $from));