diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php
index 291df0633..4ef05adcd 100644
--- a/workflow/engine/controllers/adminProxy.php
+++ b/workflow/engine/controllers/adminProxy.php
@@ -515,12 +515,12 @@ class adminProxy extends HttpProxyController
             case 5:
                 if ($SendaTestMail == 'true') {
                     try {
-                        $_POST['FROM_NAME'] = 'Process Maker O.S. [Test mail]';
-                        $_POST['FROM_EMAIL'] = $user;
-                        $_POST['MESS_ENGINE'] = 'PHPMAILER';
-                        $_POST['MESS_SERVER'] = $server;
-                        $_POST['MESS_PORT']   = $port;
-                        $_POST['MESS_ACCOUNT'] = $user;
+                        $_POST['FROM_NAME']     = G::LoadTranslation('ID_MESS_TEST_BODY');
+                        $_POST['FROM_EMAIL']    = $user;
+                        $_POST['MESS_ENGINE']   = 'PHPMAILER';
+                        $_POST['MESS_SERVER']   = $server;
+                        $_POST['MESS_PORT']     = $port;
+                        $_POST['MESS_ACCOUNT']  = $user;
                         $_POST['MESS_PASSWORD'] = $passwd;
                         $_POST['TO'] = $Mailto;
 
diff --git a/workflow/engine/methods/setup/emails_Ajax.php b/workflow/engine/methods/setup/emails_Ajax.php
index 98530c7a2..6b533be25 100755
--- a/workflow/engine/methods/setup/emails_Ajax.php
+++ b/workflow/engine/methods/setup/emails_Ajax.php
@@ -185,13 +185,13 @@ switch ($request) {
                 if ($send_test_mail == 'yes') {
                     try {
                         //print(SUCCESSFUL.',ok');
-                        $_POST['FROM_NAME'] = 'Process Maker O.S. [Test mail]';
-                        $_POST['FROM_EMAIL'] = $user;
+                        $_POST['FROM_NAME']     = G::LoadTranslation('ID_MESS_TEST_BODY');
+                        $_POST['FROM_EMAIL']    = $user;
 
-                        $_POST['MESS_ENGINE'] = 'PHPMAILER';
-                        $_POST['MESS_SERVER'] = $srv;
-                        $_POST['MESS_PORT'] = $port;
-                        $_POST['MESS_ACCOUNT'] = $user;
+                        $_POST['MESS_ENGINE']   = 'PHPMAILER';
+                        $_POST['MESS_SERVER']   = $srv;
+                        $_POST['MESS_PORT']     = $port;
+                        $_POST['MESS_ACCOUNT']  = $user;
                         $_POST['MESS_PASSWORD'] = $passwd;
                         $_POST['TO'] = $mail_to;
                         if ($auth_required == 'yes') {