diff --git a/src/java/davmail/smtp/SmtpConnection.java b/src/java/davmail/smtp/SmtpConnection.java
index 646aba43..2813f8db 100644
--- a/src/java/davmail/smtp/SmtpConnection.java
+++ b/src/java/davmail/smtp/SmtpConnection.java
@@ -157,7 +157,8 @@ public class SmtpConnection extends AbstractConnection {
 
                         if (state == State.STARTMAIL ||
                                 state == State.RECIPIENT ||
-                                state == State.MAILDATA) {
+                                state == State.MAILDATA ||
+                                state == State.AUTHENTICATED) {
                             state = State.AUTHENTICATED;
                         } else {
                             state = State.INITIAL;