diff --git a/config/alfresco/subsystems/email/InboundSMTP/inboundSMTP.properties b/config/alfresco/subsystems/email/InboundSMTP/inboundSMTP.properties
index 3957d20eea..9f81f53309 100755
--- a/config/alfresco/subsystems/email/InboundSMTP/inboundSMTP.properties
+++ b/config/alfresco/subsystems/email/InboundSMTP/inboundSMTP.properties
@@ -1,12 +1,12 @@
 #
 # Alfresco Email Service and Email Server
-#  - See the sample config for descriptions of the properties
+#  - See the subsystem configuration for descriptions of the properties
 #
 
 email.inbound.unknownUser=anonymous
 email.inbound.enabled=true
 
-email.server.enabled=true
+email.server.enabled=false
 email.server.port=25
 email.server.domain=alfresco.com
 email.server.allowed.senders=.*
diff --git a/source/java/org/alfresco/repo/invitation/InvitationServiceImplTest.java b/source/java/org/alfresco/repo/invitation/InvitationServiceImplTest.java
index 6d9c9574f9..1252b5c3e2 100644
--- a/source/java/org/alfresco/repo/invitation/InvitationServiceImplTest.java
+++ b/source/java/org/alfresco/repo/invitation/InvitationServiceImplTest.java
@@ -24,6 +24,7 @@ import java.util.List;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.action.executer.MailActionExecuter;
+import org.alfresco.repo.management.subsystems.ApplicationContextFactory;
 import org.alfresco.repo.security.authentication.AuthenticationComponent;
 import org.alfresco.repo.site.SiteModel;
 import org.alfresco.service.cmr.invitation.Invitation;
@@ -82,7 +83,8 @@ public class InvitationServiceImplTest extends BaseAlfrescoSpringTest
         // TODO MER 20/11/2009 Bodge - turn off email sending to prevent errors
         // during unit testing
         // (or sending out email by accident from tests)
-        MailActionExecuter mail = (MailActionExecuter) this.applicationContext.getBean("mail");
+        MailActionExecuter mail = (MailActionExecuter) ((ApplicationContextFactory) this.applicationContext
+                .getBean("OutboundSMTP")).getApplicationContext().getBean("mail");
         mail.setTestMode(true);
 
         createPerson(USER_MANAGER, USER_MANAGER + "@alfrescotesting.com", PERSON_FIRSTNAME, PERSON_LASTNAME);