diff --git a/archiva-plexus-runtime/src/conf/plexus.xml b/archiva-plexus-runtime/src/conf/plexus.xml
index 8bd749ea2..a67359be4 100644
--- a/archiva-plexus-runtime/src/conf/plexus.xml
+++ b/archiva-plexus-runtime/src/conf/plexus.xml
@@ -29,6 +29,26 @@
       <role-hint>dataSources</role-hint>
       <configuration>
         <resources>
+          <!------------------>
+          <!-- Mail Session -->
+          <!------------------>
+          <resource>
+            <name>mail/Session</name>
+            <type>javax.mail.Session</type>
+            <properties>
+              <property>
+                <name>mail.smtp.host</name>
+                <value>localhost</value>
+              </property>
+              <property>
+                <name>mail.smtp.port</name>
+                <value>25</value>
+              </property>
+            </properties>
+          </resource>
+          <!------------------>
+          <!-- Datasources  -->
+          <!------------------>
           <resource>
             <name>jdbc/users</name>
             <type>javax.sql.DataSource</type>
diff --git a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
index a8da86775..b688a95f2 100644
--- a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
+++ b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
@@ -30,6 +30,14 @@
       </configuration>
     </component>
 
+    <component>
+      <role>org.codehaus.plexus.mailsender.MailSender</role>
+      <implementation>org.codehaus.plexus.mailsender.javamail.JndiJavamailMailSender</implementation>
+      <configuration>
+        <jndiSessionName>java:comp/env/mail/Session</jndiSessionName>
+      </configuration>
+    </component>
+
     <!--
      | Logger manager
      -->