PMC-980 Merge remote-tracking branch 'upstream/feature/PMC-43' into bugfix/PMC-980

# Conflicts:
#	workflow/engine/classes/WsBase.php

workflow/engine/classes/SpoolRun.php

@@ -91,6 +91,26 @@ class SpoolRun
         $this->appMsgUid = $v;
     }
 
+    /**
+     * Set the $spoolId
+     *
+     * @param string
+     */
+    public function setSpoolId($v)
+    {
+        $this->spoolId = $v;
+    }
+
+    /**
+     * Get the $spoolId
+     *
+     * @return string
+     */
+    public function getSpoolId()
+    {
+        return $this->spoolId;
+    }
+
     /**
      * Get the fileData property
      *
@@ -489,11 +509,13 @@ class SpoolRun
                 switch ($this->config['MESS_ENGINE']) {
                     case 'MAIL':
                     case 'PHPMAILER':
+                    case 'IMAP':
                         switch ($this->config['MESS_ENGINE']) {
                             case 'MAIL':
                                 $phpMailer = new PHPMailer();
                                 $phpMailer->Mailer = 'mail';
                                 break;
+                            case 'IMAP':
                             case 'PHPMAILER':
                                 $phpMailer = new PHPMailer(true);
                                 $phpMailer->Mailer = 'smtp';
@@ -505,6 +527,7 @@ class SpoolRun
                         switch ($this->config['MESS_ENGINE']) {
                             case 'MAIL':
                                 break;
+                            case 'IMAP':
                             case 'PHPMAILER':
                                 //Posible Options for SMTPSecure are: "", "ssl" or "tls"
                                 if (isset($this->config['SMTPSecure']) && preg_match('/^(ssl|tls)$/', $this->config['SMTPSecure'])) {