diff -urN ../z-push-2.2.3.orig/backend/imap/imap.php ./backend/imap/imap.php
--- ../z-push-2.2.3.orig/backend/imap/imap.php	2015-09-03 02:04:22.000000000 +0300
+++ ./backend/imap/imap.php	2015-09-20 00:59:26.000000000 +0300
@@ -188,6 +188,7 @@
         $forward_h_ct = "";
         $forward_h_cte = "";
         $envelopefrom = "";
+        $rpath = "";
 
         $use_orgbody = false;
 
@@ -244,6 +245,7 @@
                     else $v = $this->username . IMAP_DEFAULTFROM;
                     $envelopefrom = "-f$v";
                 }
+                $rpath = $v;
             }
 
             // check if "Return-Path"-header is set
@@ -253,7 +255,9 @@
                     if      (IMAP_DEFAULTFROM == 'username') $v = $this->username;
                     else if (IMAP_DEFAULTFROM == 'domain')   $v = $this->domain;
                     else $v = $this->username . IMAP_DEFAULTFROM;
+                    $envelopefrom = "-f$v";
                 }
+                $rpath = $v;
             }
 
             // all other headers stay
@@ -269,6 +273,7 @@
             if ($headers) $headers .= "\n";
             $headers .= 'From: '.$v;
             $envelopefrom = "-f$v";
+            $rpath = $v;
         }
 
         // set "Return-Path" header if not set on the device
@@ -465,9 +470,12 @@
         /* END fmbiete's contribution r1528, ZP-320 */
         ZLog::Write(LOGLEVEL_DEBUG, "BackendIMAP->SendMail(): body: $body");
 
+        if (preg_match('/<(.*)>/', $rpath, $matches)) $rpath = $matches[1];
+        if (!$envelopefrom) $envelopefrom = "-f".$rpath;
         if (!defined('IMAP_USE_IMAPMAIL') || IMAP_USE_IMAPMAIL == true) {
             // changed by mku ZP-330
-            $send =  @imap_mail ( $toaddr, $message->headers["subject"], $body, $headers, $ccaddr, $bccaddr);
+//            $send =  @imap_mail ( $toaddr, $message->headers["subject"], $body, $headers, $ccaddr, $bccaddr);
+            $send =  @imap_mail ( $toaddr, $message->headers["subject"], $body, $headers, $ccaddr, $bccaddr, $rpath);
         }
         else {
             if (!empty($ccaddr))  $headers .= "\nCc: $ccaddr";
@@ -1834,4 +1842,4 @@
     /* END fmbiete's contribution r1528, ZP-320 */
 };
 
-?>
\ No newline at end of file
+?>
diff -urN ../z-push-2.2.3.orig/backend/searchldap/searchldap.php ./backend/searchldap/searchldap.php
--- ../z-push-2.2.3.orig/backend/searchldap/searchldap.php	2015-09-03 02:04:22.000000000 +0300
+++ ./backend/searchldap/searchldap.php	2015-09-20 01:35:46.000000000 +0300
@@ -115,7 +115,7 @@
             $searchfilter = str_replace("SEARCHVALUE", $searchquery, LDAP_SEARCH_FILTER);
             $result = @ldap_search($this->connection, LDAP_SEARCH_BASE, $searchfilter);
             if (!$result) {
-                ZLog::Write(LOGLEVEL_ERROR, "BackendSearchLDAP: Error in search query. Search aborted");
+                ZLog::Write(LOGLEVEL_ERROR, "BackendSearchLDAP: Error in search query (base: ".LDAP_SEARCH_BASE."; filer: ".$searchfilter."; error number: ".ldap_errno($this->connection)."; error: ".ldap_error($this->connection)."). Search aborted");
                 return false;
             }
 
diff -urN ../z-push-2.2.3.orig/z-push-admin.php ./z-push-admin.php
--- ../z-push-2.2.3.orig/z-push-admin.php	2015-09-03 02:04:22.000000000 +0300
+++ ./z-push-admin.php	2015-09-20 00:59:26.000000000 +0300
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/local/bin/php
 <?php
 /***********************************************
 * File      :   z-push-admin.php
@@ -871,4 +871,4 @@
 }
 
 
-?>
\ No newline at end of file
+?>
diff -urN ../z-push-2.2.3.orig/z-push-top.php ./z-push-top.php
--- ../z-push-2.2.3.orig/z-push-top.php	2015-09-03 02:04:22.000000000 +0300
+++ ./z-push-top.php	2015-09-20 00:59:26.000000000 +0300
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/local/bin/php
 <?php
 /***********************************************
 * File      :   z-push-top.php