diff --git a/gmailbackgroundlibrary/src/main/java/com/creativityapps/gmailbackgroundlibrary/util/GmailSender.java b/gmailbackgroundlibrary/src/main/java/com/creativityapps/gmailbackgroundlibrary/util/GmailSender.java
index 227f43a..3ae6506 100755
--- a/gmailbackgroundlibrary/src/main/java/com/creativityapps/gmailbackgroundlibrary/util/GmailSender.java
+++ b/gmailbackgroundlibrary/src/main/java/com/creativityapps/gmailbackgroundlibrary/util/GmailSender.java
@@ -38,7 +38,15 @@ public class GmailSender extends javax.mail.Authenticator {
     public GmailSender(String user, String password, boolean useDefaultSession) {
         this.user = user;
         this.password = password;
-
+        
+        MailSSLSocketFactory socketFactory = null;
+        try {
+            socketFactory = new MailSSLSocketFactory();
+            socketFactory.setTrustAllHosts(true);
+        } catch (GeneralSecurityException e) {
+            e.printStackTrace();
+        }
+        
         Properties props = new Properties();
         props.setProperty("mail.transport.protocol", "smtp");
         props.setProperty("mail.host", GMAIL_HOST);
@@ -48,6 +56,8 @@ public GmailSender(String user, String password, boolean useDefaultSession) {
         props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
         props.put("mail.smtp.socketFactory.fallback", "false");
         props.setProperty("mail.smtp.quitwait", "false");
+        props.put("mail.smtps.socketFactory", socketFactory);
+        props.put("mail.smtp.ssl.trust", "smtp.gmail.com");
 
         session = useDefaultSession ? Session.getDefaultInstance(props, this) : Session.getInstance(props, this);
         _multipart = new MimeMultipart();
@@ -146,4 +156,4 @@ public OutputStream getOutputStream() throws IOException {
             throw new IOException("Not Supported");
         }
     }
-}
\ No newline at end of file
+}