diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php
index 8afdeeb7c..95ce55a41 100755
--- a/workflow/engine/classes/class.case.php
+++ b/workflow/engine/classes/class.case.php
@@ -4882,21 +4882,13 @@ class Cases
             $hasEmailFrom = preg_match('/(.+)@(.+)\.(.+)/', $sFrom, $match);
 
             if (!$hasEmailFrom || ($aConfiguration["MESS_ACCOUNT"] != '' && strpos($sFrom, $aConfiguration["MESS_ACCOUNT"]) === false)) {
-                if (($aConfiguration['MESS_ENGINE'] != 'MAIL') && ($aConfiguration['MESS_ACCOUNT'] != '')) {
-                    $sFrom .= ' <' . $aConfiguration['MESS_ACCOUNT'] . '>';
+                if (trim($aConfiguration["MESS_ACCOUNT"]) != "") {
+                    $sFrom = "\"" . stripslashes($sFrom) . "\" <" . $aConfiguration["MESS_ACCOUNT"] . ">";
                 } else {
-                    if (($aConfiguration['MESS_ENGINE'] == 'MAIL')) {
-                        $sFrom .= ' <info@' . gethostbyaddr('127.0.0.1') . '>';
+                    if ($aConfiguration["MESS_ENGINE"] == "MAIL" && $sFrom != '') {
+                        $sFrom = "\"" . stripslashes($sFrom) . "\"";
                     } else {
-                        if ($aConfiguration['MESS_SERVER'] != '') {
-                            if (($sAux = @gethostbyaddr($aConfiguration['MESS_SERVER']))) {
-                                $sFrom .= ' <info@' . $sAux . '>';
-                            } else {
-                                $sFrom .= ' <info@' . $aConfiguration['MESS_SERVER'] . '>';
-                            }
-                        } else {
-                            $sFrom .= ' <info@processmaker.com>';
-                        }
+                        $sFrom = $sFrom . " <info@" . ((isset($_SERVER["HTTP_HOST"]) && $_SERVER["HTTP_HOST"] != "")? $_SERVER["HTTP_HOST"] : "processmaker.com") . ">";
                     }
                 }
             }
diff --git a/workflow/engine/classes/model/AppNotes.php b/workflow/engine/classes/model/AppNotes.php
index 394b21dde..b17b67e2a 100755
--- a/workflow/engine/classes/model/AppNotes.php
+++ b/workflow/engine/classes/model/AppNotes.php
@@ -206,22 +206,14 @@ class AppNotes extends BaseAppNotes
 
             $hasEmailFrom = preg_match( '/(.+)@(.+)\.(.+)/', $sFrom, $match );
 
-            if (! $hasEmailFrom || strpos( $sFrom, $aConfiguration['MESS_ACCOUNT'] ) === false) {
-                if (($aConfiguration['MESS_ENGINE'] != 'MAIL') && ($aConfiguration['MESS_ACCOUNT'] != '')) {
-                    $sFrom .= ' <' . $aConfiguration['MESS_ACCOUNT'] . '>';
+            if (!$hasEmailFrom || ($aConfiguration["MESS_ACCOUNT"] != '' && strpos($sFrom, $aConfiguration["MESS_ACCOUNT"]) === false)) {
+                if (trim($aConfiguration["MESS_ACCOUNT"]) != "") {
+                    $sFrom = "\"" . stripslashes($sFrom) . "\" <" . $aConfiguration["MESS_ACCOUNT"] . ">";
                 } else {
-                    if (($aConfiguration['MESS_ENGINE'] == 'MAIL')) {
-                        $sFrom .= ' <info@' . gethostbyaddr( '127.0.0.1' ) . '>';
+                    if ($aConfiguration["MESS_ENGINE"] == "MAIL" && $sFrom != '') {
+                        $sFrom = "\"" . stripslashes($sFrom) . "\"";
                     } else {
-                        if ($aConfiguration['MESS_SERVER'] != '') {
-                            if (($sAux = @gethostbyaddr( $aConfiguration['MESS_SERVER'] ))) {
-                                $sFrom .= ' <info@' . $sAux . '>';
-                            } else {
-                                $sFrom .= ' <info@' . $aConfiguration['MESS_SERVER'] . '>';
-                            }
-                        } else {
-                            $sFrom .= ' <info@processmaker.com>';
-                        }
+                        $sFrom = $sFrom . " <info@" . ((isset($_SERVER["HTTP_HOST"]) && $_SERVER["HTTP_HOST"] != "")? $_SERVER["HTTP_HOST"] : "processmaker.com") . ">";
                     }
                 }
             }