diff --git a/build.gradle b/build.gradle
index 5e778b006..31da959e1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -131,7 +131,7 @@ ext {
 	equalsverifierVersion = '1.1.3'
 	ftpServerVersion = '1.0.6'
 	apacheSshdVersion = '0.10.1'
-	greenmailVersion = '1.3.1b'
+	greenmailVersion = '1.4.1'
 	httpClientVersion = '4.2.5'
 	jcloudsVersion = '1.7.0'
 	oracleToolsVersion = '1.2.2'
diff --git a/extensions/spring-xd-extension-mail/src/main/java/org/springframework/xd/mail/MailSinkOptionsMetadata.java b/extensions/spring-xd-extension-mail/src/main/java/org/springframework/xd/mail/MailSinkOptionsMetadata.java
index 2228e9131..fef25b8ed 100644
--- a/extensions/spring-xd-extension-mail/src/main/java/org/springframework/xd/mail/MailSinkOptionsMetadata.java
+++ b/extensions/spring-xd-extension-mail/src/main/java/org/springframework/xd/mail/MailSinkOptionsMetadata.java
@@ -20,15 +20,19 @@
 
 import org.springframework.xd.module.options.spi.Mixin;
 import org.springframework.xd.module.options.spi.ModuleOption;
-
+import org.springframework.xd.module.options.spi.ProfileNamesProvider;
 
 /**
  * Captures options for the {@code mail} sink module.
  * 
  * @author Eric Bottard
+ * @author Franck Marchand
  */
 @Mixin(MailServerMixin.class)
-public class MailSinkOptionsMetadata {
+public class MailSinkOptionsMetadata implements ProfileNamesProvider {
+
+	public static final String WITH_ATTACHMENT = "with-attachment";
+	public static final String WITHOUT_ATTACHMENT = "without-attachment";
 
 	private String bcc = "null";
 
@@ -44,6 +48,61 @@ public class MailSinkOptionsMetadata {
 
 	private String to = "null";
 
+	private boolean auth = false;
+
+	private boolean starttls = false;
+
+	private boolean ssl = false;
+
+	private String attachmentExpression;
+
+	private String attachmentFilename;
+
+	public String getAttachmentExpression() {
+		return attachmentExpression;
+	}
+
+	@ModuleOption("file uri to attach to the mail")
+	public void setAttachmentExpression(String attachmentExpression) {
+		this.attachmentExpression = attachmentExpression;
+	}
+
+	public String getAttachmentFilename() {
+		return attachmentFilename;
+	}
+
+	@ModuleOption("name of the attachment that will appear in the mail")
+	public void setAttachmentFilename(String attachmentFilename) {
+		this.attachmentFilename = attachmentFilename;
+	}
+
+	public boolean isAuth() {
+		return auth;
+	}
+
+	@ModuleOption("enable authentication for mail sending connection")
+	public void setAuth(boolean auth) {
+		this.auth = auth;
+	}
+
+	public boolean isSsl() {
+		return ssl;
+	}
+
+	@ModuleOption("enable ssl for mail sending connection")
+	public void setSsl(boolean ssl) {
+		this.ssl = ssl;
+	}
+
+	public boolean isStarttls() {
+		return starttls;
+	}
+
+	@ModuleOption("enable ttl for mail sending connection")
+	public void setStarttls(boolean starttls) {
+		this.starttls = starttls;
+	}
+
 	// @NotNull as a String, but the contents can be the String
 	// "null", which is a SpEL expression in its own right.
 	@NotNull
@@ -71,7 +130,6 @@ public String getReplyTo() {
 		return replyTo;
 	}
 
-
 	@NotNull
 	public String getSubject() {
 		return subject;
@@ -117,5 +175,10 @@ public void setTo(String to) {
 		this.to = to;
 	}
 
+	@Override
+	public String[] profilesToActivate() {
+		return new String[] { (attachmentExpression != null && attachmentFilename != null) ? WITH_ATTACHMENT : WITHOUT_ATTACHMENT };
+	}
+
 
 }
diff --git a/extensions/spring-xd-extension-mail/src/main/java/org/springframework/xd/mail/MailTransformer.java b/extensions/spring-xd-extension-mail/src/main/java/org/springframework/xd/mail/MailTransformer.java
new file mode 100644
index 000000000..0d9033e3b
--- /dev/null
+++ b/extensions/spring-xd-extension-mail/src/main/java/org/springframework/xd/mail/MailTransformer.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.xd.mail;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.integration.mail.MailHeaders;
+import org.springframework.mail.MailException;
+import org.springframework.mail.javamail.JavaMailSenderImpl;
+import org.springframework.mail.javamail.MimeMessageHelper;
+import org.springframework.mail.javamail.MimeMessagePreparator;
+import org.springframework.messaging.Message;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+import java.nio.file.Paths;
+
+/**
+ * This transformer can handle ssl, tls and attachments for
+ * the mail sink.
+ *
+ * @author Franck Marchand
+ */
+public class MailTransformer {
+    public static final String MAIL_ATTACHMENT = "mail_attachment";
+
+    @Autowired
+    private JavaMailSenderImpl sender;
+
+    public Message<String> sendMail(final Message<String> msg) {
+
+        MimeMessage mimeMsg = sender.createMimeMessage();
+
+        String subject = (String) msg.getHeaders().get(MailHeaders.SUBJECT);
+        final String validSubject = subject!=null ? subject : "";
+        final String to = (String) msg.getHeaders().get(MailHeaders.TO);
+        final String cc = (String) msg.getHeaders().get(MailHeaders.CC);
+        final String bcc = (String) msg.getHeaders().get(MailHeaders.BCC);
+        final String from = (String) msg.getHeaders().get(MailHeaders.FROM);
+        final String replyTo = (String) msg.getHeaders().get(MailHeaders.REPLY_TO);
+        final String attachmentFilename = (String) msg.getHeaders().get(MailHeaders.ATTACHMENT_FILENAME);
+        final String attachment = (String) msg.getHeaders().get(MAIL_ATTACHMENT);
+
+        try {
+            sender.send(new MimeMessagePreparator() {
+                @Override
+                public void prepare(MimeMessage mimeMessage) throws Exception {
+                    MimeMessageHelper mMsg = new MimeMessageHelper(mimeMessage, true);
+
+                    mMsg.setTo(to);
+                    mMsg.setFrom(from);
+                    mMsg.setReplyTo(replyTo);
+                    mMsg.setSubject(validSubject);
+
+                    if (bcc != null)
+                        mMsg.setBcc(bcc);
+                    if (cc != null)
+                        mMsg.setCc(cc);
+
+                    mMsg.setText(msg.getPayload());
+
+                    if (attachment != null && attachmentFilename != null) {
+                        String[] attachments;
+                        if(attachment.contains(";"))
+                            attachments = StringUtils.split(attachment, ";");
+                        else attachments = new String[] { attachment };
+
+                        String[] attachmentFilenames;
+                        if(attachmentFilename.contains(";"))
+                            attachmentFilenames = StringUtils.split(attachmentFilename, ";");
+                        else attachmentFilenames = new String[] { attachmentFilename };
+
+                        for(int i=0; i<attachments.length;i++) {
+                            try {
+                                mMsg.addAttachment(attachmentFilenames[i], Paths.get(attachments[i]).toFile());
+                            } catch (MessagingException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                    }
+                }
+            });
+        } catch (MailException e) {
+            e.printStackTrace();
+        }
+
+        return msg;
+    }
+}
diff --git a/extensions/spring-xd-extension-mail/src/test/java/org/springframework/xd/mail/MailSinkIntegrationTest.java b/extensions/spring-xd-extension-mail/src/test/java/org/springframework/xd/mail/MailSinkIntegrationTest.java
new file mode 100644
index 000000000..8159fe64a
--- /dev/null
+++ b/extensions/spring-xd-extension-mail/src/test/java/org/springframework/xd/mail/MailSinkIntegrationTest.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.xd.mail;
+
+import com.icegreen.greenmail.util.*;
+import org.junit.*;
+import org.springframework.xd.dirt.server.singlenode.SingleNodeApplication;
+import org.springframework.xd.dirt.test.SingleNodeIntegrationTestSupport;
+import org.springframework.xd.dirt.test.SingletonModuleRegistry;
+import org.springframework.xd.dirt.test.process.SingleNodeProcessingChainProducer;
+import org.springframework.xd.dirt.test.process.SingleNodeProcessingChainSupport;
+import org.springframework.xd.module.ModuleType;
+import org.springframework.xd.test.RandomConfigurationSupport;
+
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMultipart;
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.security.Security;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+/**
+ * @author Franck MARCHAND
+ */
+public class MailSinkIntegrationTest {
+    public static final int              TIMEOUT = 5000;
+    private static SingleNodeApplication application;
+
+    private static GreenMail greenMail = new GreenMail(new ServerSetup[] { ServerSetupTest.SMTPS, ServerSetupTest.SMTP, ServerSetupTest.IMAPS });
+
+
+    @BeforeClass
+    public static void setUp() {
+        Security.setProperty("ssl.SocketFactory.provider", DummySSLSocketFactory.class.getName());
+        greenMail.setUser("someone@somewhere.fr", "someone@somewhere.fr", "test1");
+        greenMail.setUser("nobody@nowhere.fr", "nobody@nowhere.fr", "test1");
+        greenMail.start();
+
+        new RandomConfigurationSupport();
+        application = new SingleNodeApplication().run();
+        SingleNodeIntegrationTestSupport singleNodeIntegrationTestSupport = new SingleNodeIntegrationTestSupport(application);
+        singleNodeIntegrationTestSupport.addModuleRegistry(new SingletonModuleRegistry(ModuleType.sink, "mail"));
+    }
+
+    @Test
+    public void testSSLMailSinkWithAttachmentsIntegration() throws IOException, InterruptedException, MessagingException {
+
+        String filePath = Paths.get("src/test/resources/attachment.txt").toAbsolutePath().toString();
+        String filePath2 = Paths.get("src/test/resources/attachment2.txt").toAbsolutePath().toString();
+        String filePath3 = Paths.get("src/test/resources/attachment3.txt").toAbsolutePath().toString();
+
+        SingleNodeProcessingChainProducer chain = SingleNodeProcessingChainSupport.chainProducer(application, "testMailSink", String.format(
+                        "mail --host=localhost " + "--to='''nobody@nowhere.fr''' --from='''someone@somewhere.fr''' --replyTo='''nobody@nowhere.fr''' "
+                                + "--subject='''testXD''' --port=3465 --username='someone@somewhere.fr' --password='test1' " + "--ssl=true --auth=true --attachmentExpression='''%s;%s;%s''' "
+                        + "--attachmentFilename='''test.txt;test2.txt;test3.txt'''", filePath, filePath2, filePath3));
+
+        chain.sendPayload(filePath);
+
+        assertThat(greenMail.waitForIncomingEmail(5000, 1), is(true));
+        chain.destroy();
+
+        Message[] messages = greenMail.getReceivedMessages();
+        assertThat(messages.length, is(1));
+
+        assertThat(messages[0].getSubject(), is("testXD"));
+
+        MimeMultipart mp = (MimeMultipart)messages[0].getContent();
+
+        assertThat(mp.getCount(), is(4));
+        boolean allPartsArePresents = true;
+
+        for(int i=0;i<4;i++) {
+            try {
+                if(mp.getBodyPart(i) == null)
+                    allPartsArePresents = false;
+            } catch (MessagingException e) {
+                Assert.fail();
+            }
+        }
+
+        assertThat(allPartsArePresents, is(true));
+    }
+
+    @Test
+    public void testUnsecuredMailSinkIntegration() throws IOException, InterruptedException, MessagingException {
+        greenMail.reset();
+
+        String filePath = Paths.get("src/test/resources/attachment.txt").toAbsolutePath().toString();
+        String filePath2 = Paths.get("src/test/resources/attachment2.txt").toAbsolutePath().toString();
+        String filePath3 = Paths.get("src/test/resources/attachment3.txt").toAbsolutePath().toString();
+
+        SingleNodeProcessingChainProducer chain = SingleNodeProcessingChainSupport.chainProducer(application, "testMailSink2", String.format(
+                "mail --host=localhost " + "--to='''nobody@nowhere.fr''' --from='''nobody@nowhere.fr''' --replyTo='''nobody@nowhere.fr''' "
+                        + "--subject='''testXD2''' --port=3025 --username='someone@somewhere.fr' --password='test1' "
+                        + "--starttls=false --ssl=false --auth=true --attachmentExpression='''%s;%s;%s''' "
+                        + "--attachmentFilename='''test.txt;test2.txt;test3.txt'''",
+                filePath, filePath2,filePath3));
+
+        chain.sendPayload(filePath);
+
+        assertThat(greenMail.waitForIncomingEmail(TIMEOUT, 1), is(true));
+        chain.destroy();
+
+        Message[] messages = greenMail.getReceivedMessages();
+        assertThat(messages.length, is(1));
+
+        assertThat(messages[0].getSubject(), is("testXD2"));
+
+        MimeMultipart mp = (MimeMultipart)messages[0].getContent();
+
+        assertThat(mp.getCount(), is(4));
+
+        boolean allPartsArePresents = true;
+
+        for(int i=0;i<4;i++) {
+            try {
+                if(mp.getBodyPart(i) == null)
+                    allPartsArePresents = false;
+            } catch (MessagingException e) {
+                Assert.fail();
+            }
+        }
+
+        assertThat(allPartsArePresents, is(true));
+
+    }
+
+    @AfterClass
+    public static void tearDown() {
+        greenMail.stop();
+    }
+}
diff --git a/extensions/spring-xd-extension-mail/src/test/resources/attachment.txt b/extensions/spring-xd-extension-mail/src/test/resources/attachment.txt
new file mode 100644
index 000000000..96598e165
--- /dev/null
+++ b/extensions/spring-xd-extension-mail/src/test/resources/attachment.txt
@@ -0,0 +1 @@
+No Jim ! He's not dead !
\ No newline at end of file
diff --git a/extensions/spring-xd-extension-mail/src/test/resources/attachment2.txt b/extensions/spring-xd-extension-mail/src/test/resources/attachment2.txt
new file mode 100644
index 000000000..e970776ca
--- /dev/null
+++ b/extensions/spring-xd-extension-mail/src/test/resources/attachment2.txt
@@ -0,0 +1 @@
+No Jim ! He's not dead ! 2
\ No newline at end of file
diff --git a/extensions/spring-xd-extension-mail/src/test/resources/attachment3.txt b/extensions/spring-xd-extension-mail/src/test/resources/attachment3.txt
new file mode 100644
index 000000000..5021aa54d
--- /dev/null
+++ b/extensions/spring-xd-extension-mail/src/test/resources/attachment3.txt
@@ -0,0 +1 @@
+No Jim ! He's not dead ! 3
\ No newline at end of file
diff --git a/extensions/spring-xd-extension-mail/src/test/resources/config/mail.properties b/extensions/spring-xd-extension-mail/src/test/resources/config/mail.properties
new file mode 100644
index 000000000..6bd9a9b0d
--- /dev/null
+++ b/extensions/spring-xd-extension-mail/src/test/resources/config/mail.properties
@@ -0,0 +1,2 @@
+info.shortDescription = Sends incoming message as email.
+options_class = org.springframework.xd.mail.MailSinkOptionsMetadata
\ No newline at end of file
diff --git a/extensions/spring-xd-extension-mail/src/test/resources/config/mail.xml b/extensions/spring-xd-extension-mail/src/test/resources/config/mail.xml
new file mode 100644
index 000000000..2cc4fdbfc
--- /dev/null
+++ b/extensions/spring-xd-extension-mail/src/test/resources/config/mail.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
+			 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			 xmlns:beans="http://www.springframework.org/schema/beans"
+			 xmlns:int-mail="http://www.springframework.org/schema/integration/mail" xmlns:context="http://www.springframework.org/schema/context"
+			 xsi:schemaLocation="http://www.springframework.org/schema/integration/mail http://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+	<channel id="input"/>
+	<channel id="afterAttachmentEnricher"/>
+	<channel id="afterMailEnricher"/>
+
+	<beans:bean id="mailTransformerBean" class="org.springframework.xd.mail.MailTransformer"/>
+
+	<beans:bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
+		<beans:property name="host" value="${host}"/>
+		<beans:property name="port" value="${port}"/>
+		<beans:property name="username" value="${username}"/>
+		<beans:property name="password" value="${password}"/>
+		<beans:property name="javaMailProperties">
+			<beans:props>
+				<beans:prop key="mail.smtp.auth">${auth}</beans:prop>
+				<beans:prop key="mail.smtp.ssl.enable">${ssl}</beans:prop>
+				<beans:prop key="mail.smtp.starttls.enable">${starttls}</beans:prop>
+			</beans:props>
+		</beans:property>
+	</beans:bean>
+
+	<beans:beans profile="with-attachment">
+		<int-mail:header-enricher input-channel="input" output-channel="afterMailEnricher">
+			<int-mail:to expression="${to}"/>
+			<int-mail:from expression="${from}"/>
+			<int-mail:subject expression="${subject}"/>
+			<int-mail:cc expression="${cc}"/>
+			<int-mail:bcc expression="${bcc}"/>
+			<int-mail:reply-to expression="${replyTo}"/>
+			<int-mail:content-type expression="${contentType}"/>
+			<int-mail:attachment-filename expression="${attachmentFilename}"/>
+		</int-mail:header-enricher>
+
+		<header-enricher input-channel="afterMailEnricher" output-channel="afterAttachmentEnricher">
+			<header name="mail_attachment" expression="${attachmentExpression}"/>
+		</header-enricher>
+
+		<transformer auto-startup="false" ref="mailTransformerBean" method="sendMail" input-channel="afterAttachmentEnricher" output-channel="nullChannel"/>
+
+	</beans:beans>
+
+	<beans:beans profile="without-attachment">
+		<int-mail:header-enricher input-channel="input" output-channel="afterMailEnricher">
+			<int-mail:to expression="${to}"/>
+			<int-mail:from expression="${from}"/>
+			<int-mail:subject expression="${subject}"/>
+			<int-mail:cc expression="${cc}"/>
+			<int-mail:bcc expression="${bcc}"/>
+			<int-mail:reply-to expression="${replyTo}"/>
+			<int-mail:content-type expression="${contentType}"/>
+		</int-mail:header-enricher>
+
+		<transformer auto-startup="false" ref="mailTransformerBean" method="sendMail" input-channel="afterMailEnricher" output-channel="nullChannel"/>
+	</beans:beans>
+</beans:beans>
\ No newline at end of file
diff --git a/gradle/build-extensions.gradle b/gradle/build-extensions.gradle
index c932b86ad..4e25718f5 100644
--- a/gradle/build-extensions.gradle
+++ b/gradle/build-extensions.gradle
@@ -6,7 +6,11 @@ project('spring-xd-extension-mail') {
     description = 'Spring XD Mail'
     dependencies {
         compile "org.springframework.integration:spring-integration-mail"
+        compile "com.sun.mail:javax.mail"
         compile project(":spring-xd-module-spi")
+        compile project(":spring-xd-dirt")
+        testCompile project(":spring-xd-test")
+        testCompile "com.icegreen:greenmail:$greenmailVersion"
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 0087cd3b1..2322723c7 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 485265bf2..0f07cfa55 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Wed May 13 10:44:31 CEST 2015
+#Tue Nov 10 21:53:09 CET 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/modules/sink/mail/config/mail.xml b/modules/sink/mail/config/mail.xml
index b09ec86f8..2cc4fdbfc 100644
--- a/modules/sink/mail/config/mail.xml
+++ b/modules/sink/mail/config/mail.xml
@@ -1,32 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
-	xmlns:file="http://www.springframework.org/schema/integration/file"
-	xmlns:int-mail="http://www.springframework.org/schema/integration/mail"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration/mail http://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd
+			 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			 xmlns:beans="http://www.springframework.org/schema/beans"
+			 xmlns:int-mail="http://www.springframework.org/schema/integration/mail" xmlns:context="http://www.springframework.org/schema/context"
+			 xsi:schemaLocation="http://www.springframework.org/schema/integration/mail http://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd
 		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
-	<channel id="input" />
+	<channel id="input"/>
+	<channel id="afterAttachmentEnricher"/>
+	<channel id="afterMailEnricher"/>
 
-	<int-mail:header-enricher input-channel="input" output-channel="send">
-		<int-mail:to expression="${to:null}" />
-		<int-mail:from expression="${from:null}" />
-		<int-mail:subject expression="${subject:null}" />
-		<int-mail:cc expression="${cc:null}" />
-		<int-mail:bcc expression="${bcc:null}" />
-		<int-mail:reply-to expression="${replyTo:null}" />
-		<int-mail:content-type expression="${contentType:null}" />
-	</int-mail:header-enricher>
+	<beans:bean id="mailTransformerBean" class="org.springframework.xd.mail.MailTransformer"/>
 
-	<channel id="send" />
+	<beans:bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
+		<beans:property name="host" value="${host}"/>
+		<beans:property name="port" value="${port}"/>
+		<beans:property name="username" value="${username}"/>
+		<beans:property name="password" value="${password}"/>
+		<beans:property name="javaMailProperties">
+			<beans:props>
+				<beans:prop key="mail.smtp.auth">${auth}</beans:prop>
+				<beans:prop key="mail.smtp.ssl.enable">${ssl}</beans:prop>
+				<beans:prop key="mail.smtp.starttls.enable">${starttls}</beans:prop>
+			</beans:props>
+		</beans:property>
+	</beans:bean>
 
-	<int-mail:outbound-channel-adapter
-		channel="send" host="${host}" port="${port}" username="${username:}"
-		password="${password:}" />
+	<beans:beans profile="with-attachment">
+		<int-mail:header-enricher input-channel="input" output-channel="afterMailEnricher">
+			<int-mail:to expression="${to}"/>
+			<int-mail:from expression="${from}"/>
+			<int-mail:subject expression="${subject}"/>
+			<int-mail:cc expression="${cc}"/>
+			<int-mail:bcc expression="${bcc}"/>
+			<int-mail:reply-to expression="${replyTo}"/>
+			<int-mail:content-type expression="${contentType}"/>
+			<int-mail:attachment-filename expression="${attachmentFilename}"/>
+		</int-mail:header-enricher>
 
+		<header-enricher input-channel="afterMailEnricher" output-channel="afterAttachmentEnricher">
+			<header name="mail_attachment" expression="${attachmentExpression}"/>
+		</header-enricher>
 
-</beans:beans>
+		<transformer auto-startup="false" ref="mailTransformerBean" method="sendMail" input-channel="afterAttachmentEnricher" output-channel="nullChannel"/>
+
+	</beans:beans>
+
+	<beans:beans profile="without-attachment">
+		<int-mail:header-enricher input-channel="input" output-channel="afterMailEnricher">
+			<int-mail:to expression="${to}"/>
+			<int-mail:from expression="${from}"/>
+			<int-mail:subject expression="${subject}"/>
+			<int-mail:cc expression="${cc}"/>
+			<int-mail:bcc expression="${bcc}"/>
+			<int-mail:reply-to expression="${replyTo}"/>
+			<int-mail:content-type expression="${contentType}"/>
+		</int-mail:header-enricher>
+
+		<transformer auto-startup="false" ref="mailTransformerBean" method="sendMail" input-channel="afterMailEnricher" output-channel="nullChannel"/>
+	</beans:beans>
+</beans:beans>
\ No newline at end of file
diff --git a/spring-xd-starters/spring-xd-module-parent/publish-maven.gradle b/spring-xd-starters/spring-xd-module-parent/publish-maven.gradle
index 6dea47fe7..d3802f570 100644
--- a/spring-xd-starters/spring-xd-module-parent/publish-maven.gradle
+++ b/spring-xd-starters/spring-xd-module-parent/publish-maven.gradle
@@ -28,7 +28,7 @@ def getAllDependentProjects(project) {
 
 // load versions
 def versions = new Properties()
-def propertiesFile = new File('dependencies.properties')
+def propertiesFile = new File("${project.rootDir}/dependencies.properties")
 propertiesFile.withInputStream {
 	versions.load(it)
 }
diff --git a/spring-xd-test-fixtures/src/main/java/org/springframework/xd/test/fixtures/MailSink.java b/spring-xd-test-fixtures/src/main/java/org/springframework/xd/test/fixtures/MailSink.java
index 4ec2c8ad5..6d47eadbf 100644
--- a/spring-xd-test-fixtures/src/main/java/org/springframework/xd/test/fixtures/MailSink.java
+++ b/spring-xd-test-fixtures/src/main/java/org/springframework/xd/test/fixtures/MailSink.java
@@ -16,11 +16,10 @@
 
 package org.springframework.xd.test.fixtures;
 
-import javax.mail.internet.MimeMessage;
-
+import com.icegreen.greenmail.util.ServerSetup;
 import org.springframework.xd.test.fixtures.util.AvailableSocketPorts;
 
-import com.icegreen.greenmail.util.ServerSetup;
+import javax.mail.internet.MimeMessage;
 
 
 /**
@@ -72,16 +71,9 @@ public MailSink from(String expression) {
 
 	public MimeMessage waitForEmail() {
 		ensureStarted();
-		try {
 			if (!greenMail.waitForIncomingEmail(1)) {
 				throw new IllegalStateException("No email received");
 			}
 			return greenMail.getReceivedMessages()[0];
-		}
-		catch (InterruptedException e) {
-			throw new IllegalStateException("Interrupted while waiting for an email");
-		}
 	}
-
-
 }
diff --git a/src/docs/asciidoc/Sinks.asciidoc b/src/docs/asciidoc/Sinks.asciidoc
index a115edede..4a0e38851 100644
--- a/src/docs/asciidoc/Sinks.asciidoc
+++ b/src/docs/asciidoc/Sinks.asciidoc
@@ -1186,6 +1186,9 @@ You would then receive an email whose body contains "Hello" and whose subject is
 // THIS SNIPPET HAS BEEN GENERATED BY ModuleOptionsReferenceDoc AND MANUAL EDITS WILL BE LOST
 The **$$mail$$** $$sink$$ has the following options:
 
+$$attachmentExpression$$:: $$file uri to attach to the mail$$ *($$String$$, no default)*
+$$attachmentFilename$$:: $$name of the attachment that will appear in the mail$$ *($$String$$, no default)*
+$$auth$$:: $$enable authentication for mail sending connection$$ *($$boolean$$, default: `false`)*
 $$bcc$$:: $$the recipient(s) that should receive a blind carbon copy (SpEL)$$ *($$String$$, default: `null`)*
 $$cc$$:: $$the recipient(s) that should receive a carbon copy (SpEL)$$ *($$String$$, default: `null`)*
 $$contentType$$:: $$the content type to use when sending the email (SpEL)$$ *($$String$$, default: `null`)*
@@ -1194,6 +1197,8 @@ $$host$$:: $$the hostname of the mail server$$ *($$String$$, default: `localhost
 $$password$$:: $$the password to use to connect to the mail server $$ *($$String$$, no default)*
 $$port$$:: $$the port of the mail server$$ *($$int$$, default: `25`)*
 $$replyTo$$:: $$the address that will become the recipient if the original recipient decides to "reply to" the email (SpEL)$$ *($$String$$, default: `null`)*
+$$ssl$$:: $$enable ssl for mail sending connection$$ *($$boolean$$, default: `false`)*
+$$starttls$$:: $$enable ttl for mail sending connection$$ *($$boolean$$, default: `false`)*
 $$subject$$:: $$the email subject (SpEL)$$ *($$String$$, default: `null`)*
 $$to$$:: $$the primary recipient(s) of the email (SpEL)$$ *($$String$$, default: `null`)*
 $$username$$:: $$the username to use to connect to the mail server$$ *($$String$$, no default)*