Index: magnolia-core/src/main/resources/mgnl-beans.properties
===================================================================
--- magnolia-core/src/main/resources/mgnl-beans.properties	(revision 39442)
+++ magnolia-core/src/main/resources/mgnl-beans.properties	(revision )
@@ -8,8 +8,6 @@
 info.magnolia.module.ModuleManager=info.magnolia.module.ModuleManagerImpl
 info.magnolia.module.ModuleRegistry=info.magnolia.module.ModuleRegistryImpl
 
-info.magnolia.module.mail.handlers.MgnlMailHandler=info.magnolia.module.mail.handlers.SimpleMailHandler
-
 info.magnolia.cms.beans.config.ServerConfiguration=info.magnolia.cms.beans.config.ServerConfiguration$InstanceFactory
 info.magnolia.cms.security.SecuritySupport=/server/security
 info.magnolia.cms.security.IPSecurityManager=info.magnolia.cms.security.IPSecurityManagerImpl$InstanceFactory
Index: magnolia-core/src/test/java/info/magnolia/objectfactory/DefaultComponentProviderTest.java
===================================================================
--- magnolia-core/src/test/java/info/magnolia/objectfactory/DefaultComponentProviderTest.java	(revision 41135)
+++ magnolia-core/src/test/java/info/magnolia/objectfactory/DefaultComponentProviderTest.java	(revision )
@@ -1,0 +1,0 @@
Index: magnolia-module-mail/src/main/resources/META-INF/magnolia/mail.xml
===================================================================
--- magnolia-module-mail/src/main/resources/META-INF/magnolia/mail.xml	(revision 40698)
+++ magnolia-module-mail/src/main/resources/META-INF/magnolia/mail.xml	(revision )
@@ -6,6 +6,14 @@
   <class>info.magnolia.module.mail.MailModule</class>
   <versionHandler>info.magnolia.module.mail.setup.MailModuleVersionHandler</versionHandler>
   <version>${project.version}</version>
+
+  <properties>
+    <property>
+      <name>info.magnolia.module.mail.handlers.MgnlMailHandler</name>
+      <value>info.magnolia.module.mail.handlers.SimpleMailHandler</value>
+    </property>
+  </properties>
+
   <dependencies>
     <dependency>
       <name>adminInterface</name>
Index: magnolia-core/src/test/java/info/magnolia/objectfactory/DefaultClassFactoryTest.java
===================================================================
--- magnolia-core/src/test/java/info/magnolia/objectfactory/DefaultClassFactoryTest.java	(revision 41135)
+++ magnolia-core/src/test/java/info/magnolia/objectfactory/DefaultClassFactoryTest.java	(revision )
@@ -1,0 +1,0 @@
Index: magnolia-core/src/test/java/info/magnolia/objectfactory/ObjectFactoryTest.java
===================================================================
--- magnolia-core/src/test/java/info/magnolia/objectfactory/ObjectFactoryTest.java	(revision 41135)
+++ magnolia-core/src/test/java/info/magnolia/objectfactory/ObjectFactoryTest.java	(revision )
@@ -1,0 +1,0 @@