diff --git a/source/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java b/source/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java
index 8af8005d82..057c86fe64 100644
--- a/source/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java
+++ b/source/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java
@@ -24,6 +24,7 @@ import org.alfresco.opencmis.dictionary.CMISDictionaryService;
 import org.alfresco.opencmis.search.CMISQueryService;
 import org.alfresco.repo.admin.SysAdminParams;
 import org.alfresco.repo.forms.FormService;
+import org.alfresco.repo.i18n.MessageService;
 import org.alfresco.repo.imap.ImapService;
 import org.alfresco.repo.lock.JobLockService;
 import org.alfresco.repo.nodelocator.NodeLocatorService;
@@ -466,6 +467,12 @@ public class ServiceDescriptorRegistry
         return (FacetLabelDisplayHandlerRegistry) beanFactory.getBean(beanName);
     }
 
+    @Override
+    public MessageService getMessageService() {
+        return (MessageService)getService(MESSAGE_SERVICE);
+    }
+
+
     @Override
     public DocumentLinkService getDocumentLinkService() {
         return (DocumentLinkService)getService(DOCUMENT_LINK_SERVICE);
diff --git a/source/java/org/alfresco/service/ServiceRegistry.java b/source/java/org/alfresco/service/ServiceRegistry.java
index 25b7d54e6a..de8183e7af 100644
--- a/source/java/org/alfresco/service/ServiceRegistry.java
+++ b/source/java/org/alfresco/service/ServiceRegistry.java
@@ -25,6 +25,7 @@ import org.alfresco.opencmis.dictionary.CMISDictionaryService;
 import org.alfresco.opencmis.search.CMISQueryService;
 import org.alfresco.repo.admin.SysAdminParams;
 import org.alfresco.repo.forms.FormService;
+import org.alfresco.repo.i18n.MessageService;
 import org.alfresco.repo.imap.ImapService;
 import org.alfresco.repo.lock.JobLockService;
 import org.alfresco.repo.nodelocator.NodeLocatorService;
@@ -143,6 +144,7 @@ public interface ServiceRegistry
     static final QName NOTIFICATION_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "NotificationService");
     static final QName DOCUMENT_LINK_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "DocumentLinkService");
     
+    static final QName MESSAGE_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "MessageService");
     // CMIS
     static final QName CMIS_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "CMISService");
     static final QName CMIS_DICTIONARY_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "OpenCMISDictionaryService");
@@ -521,6 +523,13 @@ public interface ServiceRegistry
     @NotAuditable
     FacetLabelDisplayHandlerRegistry getFacetLabelDisplayHandlerRegistry();
     
+    /**
+     * Get the Message service bean.
+     * @return the Message service bean
+     */
+    @NotAuditable
+    MessageService getMessageService();
+
     /**
      *  Get the document link service
      * @return the document link service
diff --git a/source/test-java/org/alfresco/repo/rendition/MockedTestServiceRegistry.java b/source/test-java/org/alfresco/repo/rendition/MockedTestServiceRegistry.java
index c67efdbf29..c774b1a3e4 100644
--- a/source/test-java/org/alfresco/repo/rendition/MockedTestServiceRegistry.java
+++ b/source/test-java/org/alfresco/repo/rendition/MockedTestServiceRegistry.java
@@ -26,6 +26,7 @@ import org.alfresco.opencmis.dictionary.CMISDictionaryService;
 import org.alfresco.opencmis.search.CMISQueryService;
 import org.alfresco.repo.admin.SysAdminParams;
 import org.alfresco.repo.forms.FormService;
+import org.alfresco.repo.i18n.MessageService;
 import org.alfresco.repo.imap.ImapService;
 import org.alfresco.repo.lock.JobLockService;
 import org.alfresco.repo.nodelocator.NodeLocatorService;
@@ -486,6 +487,13 @@ public class MockedTestServiceRegistry implements ServiceRegistry
     {
         // TODO Auto-generated method stub
         return null;
+
+    @Override
+    public MessageService getMessageService()
+    {
+        // A mock response
+        return null;
+    }
     }
 
     @Override