Merge pull request #14 in ZP/z-push from...

Merge pull request #14 in ZP/z-push from bugfix/ZP-647-backendcombined-sendmail-source--folderid to develop

* commit 'bfc4c616':
  fix(ZP-647): BackendCombined: SendMail source->folderid

src/backend/combined/combined.php

@@ -274,6 +274,10 @@ class BackendCombined extends Backend {
      */
     public function SendMail($sm) {
         ZLog::Write(LOGLEVEL_DEBUG, "Combined->SendMail()");
+        // Convert source folderid
+        if (isset($sm->source->folderid)) {
+            $sm->source->folderid = $this->GetBackendFolder($sm->source->folderid);
+        }
         foreach ($this->backends as $i => $b){
             if($this->backends[$i]->SendMail($sm) == true){
                 return true;