diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php
index a0bdb95e1..e492c5486 100755
--- a/workflow/engine/classes/class.wsBase.php
+++ b/workflow/engine/classes/class.wsBase.php
@@ -971,14 +971,17 @@ class wsBase
             }
 
             $sBody = G::replaceDataGridField(file_get_contents($fileTemplate), $Fields);
-
             $hasEmailFrom = preg_match( '/(.+)@(.+)\.(.+)/', $sFrom, $match );
 
             if (!$hasEmailFrom || strpos($sFrom, $aSetup["MESS_ACCOUNT"]) === false) {
-                if (trim($aSetup["MESS_ACCOUNT"]) != "") {
+                if ($aConfiguration["MESS_ENGINE"] != "MAIL" && trim($aSetup["MESS_ACCOUNT"]) != "") {
                     $sFrom = "\"" . stripslashes($sFrom) . "\" <" . $aSetup["MESS_ACCOUNT"] . ">";
                 } else {
-                    $sFrom = "<info@" . $_SERVER["HTTP_HOST"] . ">";
+                    if ($aConfiguration["MESS_ENGINE"] = "MAIL") {
+                        $sFrom = "\"" . stripslashes($sFrom) . "\"";
+                    } else {
+                        $sFrom = $sFrom . " <info@" . ((isset($_SERVER["HTTP_HOST"]) && $_SERVER["HTTP_HOST"] != "")? $_SERVER["HTTP_HOST"] : "processmaker.com") . ">";
+                    }
                 }
             }