Index: pom.xml
===================================================================
--- pom.xml	(revision 34027)
+++ pom.xml	(working copy)
@@ -87,7 +87,7 @@
     </mailingLists>
 
     <properties>
-        <mail.version>1.4.2</mail.version>
+        <mail.version>1.4.3-rc1</mail.version>
         <management-api.version>1.1-rev-1</management-api.version>
         <jms-api.version>1.1-rev-1</jms-api.version>
         <jsp-api.version>2.1.3-b06</jsp-api.version>
@@ -1159,6 +1159,11 @@
                 <artifactId>junit</artifactId>
                 <version>4.3.1</version>
             </dependency>
+            <dependency>
+                <groupId>javax.mail</groupId>
+                <artifactId>mail</artifactId>
+                <version>${mail.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <!--  End:   Dependency management -->
Index: javaee-api/javax.javaee/compact/pom.xml
===================================================================
--- javaee-api/javax.javaee/compact/pom.xml	(revision 34027)
+++ javaee-api/javax.javaee/compact/pom.xml	(working copy)
@@ -42,9 +42,9 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>org.glassfish</groupId>
-                  <artifactId>javax.mail</artifactId>
-                  <version>${project.version}</version>
+                  <groupId>javax.mail</groupId>
+                  <artifactId>mail</artifactId>
+                  <version>${mail.version}</version>
                   <type>jar</type>
                   <overWrite>false</overWrite>
                   <outputDirectory>${project.build.directory}/tmp</outputDirectory>
Index: javaee-api/javax.javaee/src/main/assembly/web-api-assembly.xml
===================================================================
--- javaee-api/javax.javaee/src/main/assembly/web-api-assembly.xml	(revision 34027)
+++ javaee-api/javax.javaee/src/main/assembly/web-api-assembly.xml	(working copy)
@@ -48,7 +48,7 @@
                 <include>org.glassfish:javax.security.jacc</include>
                 <include>org.glassfish:javax.transaction</include>
                 <include>org.glassfish:javax.xml.stream</include>
-                <include>org.glassfish:javax.mail</include>
+                <include>javax.mail:mail</include>
                 <include>org.glassfish:javax.xml.rpc</include>
                 <include>org.glassfish:javax.activation</include>
                 <include>org.glassfish:javax.xml.bind</include>
Index: javaee-api/javax.javaee/src/main/assembly/api-assembly.xml
===================================================================
--- javaee-api/javax.javaee/src/main/assembly/api-assembly.xml	(revision 34027)
+++ javaee-api/javax.javaee/src/main/assembly/api-assembly.xml	(working copy)
@@ -48,7 +48,7 @@
                 <include>org.glassfish:javax.security.jacc</include>
                 <include>org.glassfish:javax.transaction</include>
                 <include>org.glassfish:javax.xml.stream</include>
-                <include>org.glassfish:javax.mail</include>
+                <include>javax.mail:mail</include>
                 <include>org.glassfish:javax.xml.rpc</include>
                 <include>org.glassfish:javax.activation</include>
                 <include>org.glassfish:javax.xml.bind</include>
Index: javaee-api/javax.javaee/pom.xml
===================================================================
--- javaee-api/javax.javaee/pom.xml	(revision 34027)
+++ javaee-api/javax.javaee/pom.xml	(working copy)
@@ -196,9 +196,9 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>javax.mail</artifactId>
-            <version>${project.version}</version>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+            <version>${mail.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
Index: javaee-api/javax.mail/osgi.bundle
===================================================================
--- javaee-api/javax.mail/osgi.bundle	(revision 34027)
+++ javaee-api/javax.mail/osgi.bundle	(working copy)
@@ -1,4 +0,0 @@
-Import-Package: javax.activation; version="1.1", *
--exportcontents: \
-	com.sun.mail.handlers; version="1.4"
-
Index: javaee-api/javax.mail/pom.xml
===================================================================
--- javaee-api/javax.mail/pom.xml	(revision 34027)
+++ javaee-api/javax.mail/pom.xml	(working copy)
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/* 
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. 
-* 
-* Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
-* 
-* The contents of this file are subject to the terms of either the GNU 
-* General Public License Version 2 only ("GPL") or the Common Development 
-* and Distribution License("CDDL") (collectively, the "License").  You 
-* may not use this file except in compliance with the License. You can obtain 
-* a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html 
-* or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific 
-* language governing permissions and limitations under the License. 
-* 
-* When distributing the software, include this License Header Notice in each 
-* file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. 
-* Sun designates this particular file as subject to the "Classpath" exception 
-* as provided by Sun in the GPL Version 2 section of the License file that 
-* accompanied this code.  If applicable, add the following below the License 
-* Header, with the fields enclosed by brackets [] replaced by your own 
-* identifying information: "Portions Copyrighted [year] 
-* [name of copyright owner]" 
-* 
-* Contributor(s): 
-* 
-* If you wish your version of this file to be governed by only the CDDL or 
-* only the GPL Version 2, indicate your decision by adding "[Contributor] 
-* elects to include this software in this distribution under the [CDDL or GPL 
-* Version 2] license."  If you don't indicate a single choice of license, a 
-* recipient has the option to distribute your version of this file under 
-* either the CDDL, the GPL Version 2 or to extend the choice of license to 
-* its licensees as provided above.  However, if you add GPL Version 2 code 
-* and therefore, elected the GPL Version 2 license, then the option applies 
-* only if the new code is made subject to such option by the copyright 
-* holder. 
-*/ 
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <parent>
-        <groupId>org.glassfish</groupId>
-        <artifactId>javaee-api</artifactId>
-        <version>3.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.glassfish</groupId>
-    <properties>
-        <extension.name>javax.mail</extension.name>
-        <spec.version>1.4</spec.version>
-    </properties>
-    <artifactId>${extension.name}</artifactId>
-    <packaging>jar</packaging>
-    <name>${extension.name} API v.${spec.version}</name>
-
-    <description>Java EE Mail API Repackaged as OSGi bundle in GlassFish</description>
-    <dependencies>
-        <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-            <version>${mail.version}</version>
-            <optional>true</optional>
-        </dependency>
-    </dependencies>
-</project>
Index: javaee-api/pom.xml
===================================================================
--- javaee-api/pom.xml	(revision 34027)
+++ javaee-api/pom.xml	(working copy)
@@ -141,7 +141,6 @@
         <module>javax.annotation</module>
         <module>javax.jms</module>
         <module>javax.jws</module>
-        <module>javax.mail</module>
         <module>javax.servlet.jsp</module>
         <module>javax.servlet.jsp.jstl</module>
         <module>javax.xml.bind</module>
Index: javadoc.xml
===================================================================
--- javadoc.xml	(revision 34027)
+++ javadoc.xml	(working copy)
@@ -128,9 +128,9 @@
 	</exec>
   </target>
 
-  <target name="javamail.download" description="Download JavaMail 1.4.2" depends="initialize.maven">
+  <target name="javamail.download" description="Download JavaMail 1.4.3" depends="initialize.maven">
       <artifact:dependencies sourcesFilesetId="sources.dependency.javamail">
-          <dependency groupId="javax.mail" artifactId="mail" version="1.4.2"/>
+          <dependency groupId="javax.mail" artifactId="mail" version="1.4.3-rc1"/>
           <remoteRepository refid="nexus.repository" />
           <localRepository path="${maven.repo.local}"/>
       </artifact:dependencies>
Index: packager/glassfish-common-tmp/build.xml
===================================================================
--- packager/glassfish-common-tmp/build.xml	(revision 34027)
+++ packager/glassfish-common-tmp/build.xml	(working copy)
@@ -44,7 +44,6 @@
        <!-- brute force cleanup at this point, need to look into extended ant
            plugin and fix the issue at the source -->
            
-       <delete file="target/stage/${install.dir.name}/glassfish/modules/mail.jar" failonerror="false"/>
        <delete file="target/stage/${install.dir.name}/glassfish/modules/activation.jar" failonerror="false" />
        
        <mkdir dir="target/stage/${install.dir.name}/glassfish/modules/endorsed"/>
Index: web/web-naming/pom.xml
===================================================================
--- web/web-naming/pom.xml	(revision 34027)
+++ web/web-naming/pom.xml	(working copy)
@@ -76,9 +76,9 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>javax.mail</artifactId>
-            <version>${project.version}</version>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+            <version>${mail.version}</version>
         </dependency>
     </dependencies>
 </project>
Index: webservices/webservices-scripts/src/main/resources/glassfish/bin/wscompile
===================================================================
--- webservices/webservices-scripts/src/main/resources/glassfish/bin/wscompile	(revision 34027)
+++ webservices/webservices-scripts/src/main/resources/glassfish/bin/wscompile	(working copy)
@@ -7,6 +7,6 @@
 
 AS_INSTALL=`dirname $0`/..
 AS_INSTALL_LIB=$AS_INSTALL/modules
-JAVAX_MAIL_JAR=$AS_INSTALL_LIB/javax.mail.jar
+JAVAX_MAIL_JAR=$AS_INSTALL_LIB/mail.jar
 
 java -Djava.endorsed.dirs="$AS_INSTALL_LIB/endorsed" -cp "$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jaxb-osgi.jar:$JAVAX_MAIL_JAR:$JAVA_HOME/lib/tools.jar" com.sun.xml.rpc.tools.wscompile.Main "$@"
Index: webservices/webservices-scripts/src/main/resources/glassfish/bin/wsdeploy
===================================================================
--- webservices/webservices-scripts/src/main/resources/glassfish/bin/wsdeploy	(revision 34027)
+++ webservices/webservices-scripts/src/main/resources/glassfish/bin/wsdeploy	(working copy)
@@ -7,6 +7,6 @@
 
 AS_INSTALL=`dirname $0`/..
 AS_INSTALL_LIB=$AS_INSTALL/modules
-JAVAX_MAIL_JAR=$AS_INSTALL_LIB/javax.mail.jar
+JAVAX_MAIL_JAR=$AS_INSTALL_LIB/mail.jar
 
 java -Djava.endorsed.dirs="$AS_INSTALL_LIB/endorsed" -cp "$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jaxb-osgi.jar:$JAVAX_MAIL_JAR:$JAVA_HOME/lib/tools.jar" com.sun.xml.rpc.tools.wsdeploy.Main "$@"
Index: webservices/webservices-scripts/src/main/resources/glassfish/bin/wscompile.bat
===================================================================
--- webservices/webservices-scripts/src/main/resources/glassfish/bin/wscompile.bat	(revision 34027)
+++ webservices/webservices-scripts/src/main/resources/glassfish/bin/wscompile.bat	(working copy)
@@ -5,4 +5,4 @@
 REM Use is subject to license terms.
 REM
 
-java -Djava.endorsed.dirs="%~dp0..\modules\endorsed" -cp "%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jaxb-osgi.jar;%~dp0..\modules\javax.mail.jar;%JAVA_HOME%/lib/tools.jar" com.sun.xml.rpc.tools.wscompile.Main "%*"
+java -Djava.endorsed.dirs="%~dp0..\modules\endorsed" -cp "%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jaxb-osgi.jar;%~dp0..\modules\mail.jar;%JAVA_HOME%/lib/tools.jar" com.sun.xml.rpc.tools.wscompile.Main "%*"
Index: webservices/webservices-scripts/src/main/resources/glassfish/bin/wsdeploy.bat
===================================================================
--- webservices/webservices-scripts/src/main/resources/glassfish/bin/wsdeploy.bat	(revision 34027)
+++ webservices/webservices-scripts/src/main/resources/glassfish/bin/wsdeploy.bat	(working copy)
@@ -5,4 +5,4 @@
 REM Use is subject to license terms.
 REM
 
-java -Djava.endorsed.dirs="%~dp0..\modules\endorsed" -cp "%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jaxb-osgi.jar;%~dp0..\modules\javax.mail.jar;%JAVA_HOME%/lib/tools.jar" com.sun.xml.rpc.tools.wsdeploy.Main "%*"
+java -Djava.endorsed.dirs="%~dp0..\modules\endorsed" -cp "%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jaxb-osgi.jar;%~dp0..\modules\mail.jar;%JAVA_HOME%/lib/tools.jar" com.sun.xml.rpc.tools.wsdeploy.Main "%*"
Index: webservices/jsr109-impl/src/main/resources/wscompile
===================================================================
--- webservices/jsr109-impl/src/main/resources/wscompile	(revision 34027)
+++ webservices/jsr109-impl/src/main/resources/wscompile	(working copy)
@@ -7,6 +7,6 @@
 
 AS_INSTALL=`dirname $0`/..
 AS_INSTALL_LIB=$AS_INSTALL/modules
-JAVAX_MAIL_JAR=$AS_INSTALL_LIB/javax.mail.jar
+JAVAX_MAIL_JAR=$AS_INSTALL_LIB/mail.jar
 
 java -cp "$AS_INSTALL_LIB/webservices.jar:$AS_INSTALL_LIB/jaxb.jar:$JAVAX_MAIL_JAR:$JAVA_HOME/lib/tools.jar" com.sun.xml.rpc.tools.wscompile.Main "$@"
Index: webservices/jsr109-impl/src/main/resources/wsdeploy
===================================================================
--- webservices/jsr109-impl/src/main/resources/wsdeploy	(revision 34027)
+++ webservices/jsr109-impl/src/main/resources/wsdeploy	(working copy)
@@ -7,6 +7,6 @@
 
 AS_INSTALL=`dirname $0`/..
 AS_INSTALL_LIB=$AS_INSTALL/modules
-JAVAX_MAIL_JAR=$AS_INSTALL_LIB/javax.mail.jar
+JAVAX_MAIL_JAR=$AS_INSTALL_LIB/mail.jar
 
 java -cp "$AS_INSTALL_LIB/webservices.jar:$AS_INSTALL_LIB/jaxb.jar:$JAVAX_MAIL_JAR:$JAVA_HOME/lib/tools.jar" com.sun.xml.rpc.tools.wsdeploy.Main "$@"
Index: webservices/jsr109-impl/src/main/resources/wscompile.bat
===================================================================
--- webservices/jsr109-impl/src/main/resources/wscompile.bat	(revision 34027)
+++ webservices/jsr109-impl/src/main/resources/wscompile.bat	(working copy)
@@ -5,4 +5,4 @@
 REM Use is subject to license terms.
 REM
 
-java -cp "%~dp0..\modules\jaxb.jar;%~dp0..\modules\webservices.jar;%~dp0..\modules\javax.mail.jar;%JAVA_HOME%/lib/tools.jar" com.sun.xml.rpc.tools.wscompile.Main "%*"
+java -cp "%~dp0..\modules\jaxb.jar;%~dp0..\modules\webservices.jar;%~dp0..\modules\mail.jar;%JAVA_HOME%/lib/tools.jar" com.sun.xml.rpc.tools.wscompile.Main "%*"
Index: webservices/jsr109-impl/src/main/resources/wsdeploy.bat
===================================================================
--- webservices/jsr109-impl/src/main/resources/wsdeploy.bat	(revision 34027)
+++ webservices/jsr109-impl/src/main/resources/wsdeploy.bat	(working copy)
@@ -5,4 +5,4 @@
 REM Use is subject to license terms.
 REM
 
-java -cp "%~dp0..\modules\jaxb.jar;%~dp0..\modules\webservices.jar;%~dp0..\modules\javax.mail.jar;%JAVA_HOME%/lib/tools.jar" com.sun.xml.rpc.tools.wsdeploy.Main "%*"
+java -cp "%~dp0..\modules\jaxb.jar;%~dp0..\modules\webservices.jar;%~dp0..\modules\mail.jar;%JAVA_HOME%/lib/tools.jar" com.sun.xml.rpc.tools.wsdeploy.Main "%*"
Index: common/container-common/pom.xml
===================================================================
--- common/container-common/pom.xml	(revision 34027)
+++ common/container-common/pom.xml	(working copy)
@@ -120,9 +120,9 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>javax.mail</artifactId>
-            <version>${project.version}</version>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+            <version>${mail.version}</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.security</groupId>