diff --git a/core-java-modules/core-java-networking-2/pom.xml b/core-java-modules/core-java-networking-2/pom.xml
index d79320eaef..89a98bbf8b 100644
--- a/core-java-modules/core-java-networking-2/pom.xml
+++ b/core-java-modules/core-java-networking-2/pom.xml
@@ -35,6 +35,12 @@
             <artifactId>async-http-client</artifactId>
             <version>${async-http-client.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.icegreen</groupId>
+            <artifactId>greenmail</artifactId>
+            <version>1.5.8</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/core-java-modules/core-java-networking-2/src/main/java/com/baeldung/mail/mailwithattachment/MailWithAttachmentService.java b/core-java-modules/core-java-networking-2/src/main/java/com/baeldung/mail/mailwithattachment/MailWithAttachmentService.java
new file mode 100644
index 0000000000..7d4dc57f10
--- /dev/null
+++ b/core-java-modules/core-java-networking-2/src/main/java/com/baeldung/mail/mailwithattachment/MailWithAttachmentService.java
@@ -0,0 +1,83 @@
+package com.baeldung.mail.mailwithattachment;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Properties;
+import javax.mail.BodyPart;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.Multipart;
+import javax.mail.PasswordAuthentication;
+import javax.mail.Session;
+import javax.mail.Transport;
+import javax.mail.internet.AddressException;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeBodyPart;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMultipart;
+
+public class MailWithAttachmentService {
+
+    private String username = "";
+    private String password = "";
+    private String host = "";
+    private String port = "";
+
+    MailWithAttachmentService() {
+    }
+
+    MailWithAttachmentService(String username, String password, String host, String port) {
+        this.username = username;
+        this.password = password;
+        this.host = host;
+        this.port = port;
+    }
+
+    public Session getSession() {
+        Properties props = new Properties();
+        props.put("mail.smtp.auth", "true");
+        props.put("mail.smtp.starttls.enable", "true");
+        props.put("mail.smtp.host", this.host);
+        props.put("mail.smtp.port", this.port);
+
+        Session session = Session.getInstance(props, new javax.mail.Authenticator() {
+            protected PasswordAuthentication getPasswordAuthentication() {
+                return new PasswordAuthentication(username, password);
+            }
+        });
+        return session;
+    }
+
+    public Message createMail(Session session) throws AddressException, MessagingException, IOException {
+        Message message = new MimeMessage(session);
+        message.setFrom(new InternetAddress("mail@gmail.com"));
+        message.setRecipients(Message.RecipientType.TO, InternetAddress.parse("mail@gmail.com"));
+        message.setSubject("Testing Subject");
+
+        BodyPart messageBodyPart = new MimeBodyPart();
+        messageBodyPart.setText("This is message body");
+
+        Multipart multipart = new MimeMultipart();
+        multipart.addBodyPart(messageBodyPart);
+
+        MimeBodyPart attachmentPart = new MimeBodyPart();
+        MimeBodyPart attachmentPart2 = new MimeBodyPart();
+
+        attachmentPart.attachFile(new File("C:\\Document1.txt"));
+        attachmentPart2.attachFile(new File("C:\\Document2.txt"));
+
+        multipart.addBodyPart(attachmentPart);
+        multipart.addBodyPart(attachmentPart2);
+
+        message.setContent(multipart);
+
+        return message;
+    }
+
+    public void sendMail(Session session) throws MessagingException, IOException {
+
+        Message message = createMail(session);
+        Transport.send(message);
+    }
+
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-networking-2/src/test/java/com/baeldung/mail/mailwithattachment/MailWithAttachmentServiceLiveTest.java b/core-java-modules/core-java-networking-2/src/test/java/com/baeldung/mail/mailwithattachment/MailWithAttachmentServiceLiveTest.java
new file mode 100644
index 0000000000..ef82657ab5
--- /dev/null
+++ b/core-java-modules/core-java-networking-2/src/test/java/com/baeldung/mail/mailwithattachment/MailWithAttachmentServiceLiveTest.java
@@ -0,0 +1,48 @@
+package com.baeldung.mail.mailwithattachment;
+
+import static org.junit.Assert.*;
+import javax.annotation.Resource;
+import javax.mail.Session;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.baeldung.mail.mailwithattachment.MailWithAttachmentService;
+import com.icegreen.greenmail.util.GreenMail;
+import com.icegreen.greenmail.util.ServerSetupTest;
+
+public class MailWithAttachmentServiceLiveTest {
+
+    @Resource
+    private MailWithAttachmentService emailService;
+    private GreenMail greenMail;
+
+    @Before
+    public void startMailServer() {
+        emailService = new MailWithAttachmentService();
+        greenMail = new GreenMail(ServerSetupTest.SMTP);
+        greenMail.start();
+    }
+
+    @After
+    public void stopMailServer() {
+        greenMail.stop();
+        emailService = null;
+    }
+
+    @Test
+    public void canSendMail() {
+        try {
+            Session testSession = greenMail.getSmtp()
+                .createSession();
+            emailService.sendMail(testSession);
+            assertEquals(1, greenMail.getReceivedMessages().length);
+            
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+}