diff --git a/app/src/main/java/com/sun/mail/smtp/SMTPTransport.java b/app/src/main/java/com/sun/mail/smtp/SMTPTransport.java
index 3525c9e6c3..2587cb652c 100644
--- a/app/src/main/java/com/sun/mail/smtp/SMTPTransport.java
+++ b/app/src/main/java/com/sun/mail/smtp/SMTPTransport.java
@@ -16,6 +16,8 @@
 
 package com.sun.mail.smtp;
 
+import android.text.TextUtils;
+
 import java.io.*;
 import java.net.*;
 import java.util.*;
@@ -864,6 +866,9 @@ public class SMTPTransport extends Transport {
 	    }
 	}
 
+	if (TextUtils.isEmpty(passwd))
+		return true;
+
 	if (mex != null) {
 	    closeConnection();
 	    throw mex;