diff --git a/k9mail-library/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.java b/k9mail-library/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.java
index b45610a4c..11086eb03 100644
--- a/k9mail-library/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.java
+++ b/k9mail-library/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.java
@@ -655,26 +655,19 @@ public class SmtpTransport extends Transport {
         String responseLine = null;
         List<String> results = new ArrayList<>();
         while (noOfPipelinedResponse > 0) {
+            noOfPipelinedResponse--;
             results.clear();
             responseLine = readCommandResponseLine(results);
             try {
                 responseLineToCommandResponse(responseLine, results);
 
-            } catch (NegativeSmtpReplyException exception) {
-                //continue reading response till DATA response .
-                Timber.d("SMTP <<< " + exception.getReplyCode() + exception.getReplyText());
-
             } catch (MessagingException exception) {
+                if (noOfPipelinedResponse == 0) {
+                    throw exception;
+                }
+                Timber.d("SMTP <<< " + exception.getMessage());
                 //continue reading response till DATA response .
-
             }
-            noOfPipelinedResponse-- ;
-        }
-
-        try {
-            responseLineToCommandResponse(responseLine, results);
-        } catch (NegativeSmtpReplyException exception) {
-            throw exception;
         }
 
     }