diff --git a/config/alfresco/messages/email-service.properties b/config/alfresco/messages/email-service.properties
index 95003ec12d..fd852a49f6 100644
--- a/config/alfresco/messages/email-service.properties
+++ b/config/alfresco/messages/email-service.properties
@@ -26,6 +26,8 @@ email.server.err.incorrect_message_part=Incorrect message part: {0}
 
 email.outbound.err.send.failed=Failed to send email to: {0} cause {1}
 
+email.outbound.test.send.success=Sent test message to: {0}
+
 email.outbound.err.test.no.to=Unable to send test message 'testMessageTo' is empty 
 email.outbound.err.test.no.subject=Unable to send test message 'subject' is empty
 email.outbound.err.test.no.text=Unable to send test message 'text' is empty
diff --git a/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java b/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java
index 18c556c5ad..e078e2bb8e 100644
--- a/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java
+++ b/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java
@@ -248,6 +248,11 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
         this.testMessageTo = testMessageTo;
     }
     
+    public String getTestMessageTo()
+    {
+        return testMessageTo;
+    }
+    
     public void setTestMessageSubject(String testMessageSubject)
     {
         this.testMessageSubject = testMessageSubject;
diff --git a/source/java/org/alfresco/repo/action/executer/MailActionExecuterMonitor.java b/source/java/org/alfresco/repo/action/executer/MailActionExecuterMonitor.java
index 0655837916..57f46dd130 100644
--- a/source/java/org/alfresco/repo/action/executer/MailActionExecuterMonitor.java
+++ b/source/java/org/alfresco/repo/action/executer/MailActionExecuterMonitor.java
@@ -1,6 +1,7 @@
 package org.alfresco.repo.action.executer;
 
 import org.alfresco.error.AlfrescoRuntimeException;
+import org.springframework.extensions.surf.util.I18NUtil;
 
 public class MailActionExecuterMonitor
 {
@@ -11,7 +12,9 @@ public class MailActionExecuterMonitor
         try
         {
             mailActionExceuter.sendTestMessage();
-            return "email message sent";
+            Object[] params = {mailActionExceuter.getTestMessageTo()};
+            String message = I18NUtil.getMessage("email.outbound.test.send.success", params);
+            return message;
         }
         catch
         (AlfrescoRuntimeException are)