Another simpler attempt to fix regression related to NB#2721772011W40_3

Use existing sendingId member variable.

2 files changed, 1 insertions, 8 deletions

diff --git a/src/plugins/messageservices/smtp/smtpclient.cpp b/src/plugins/messageservices/smtp/smtpclient.cpp
index 2d5b0b8a..3104577a 100644
--- a/src/plugins/messageservices/smtp/smtpclient.cpp
+++ b/src/plugins/messageservices/smtp/smtpclient.cpp
@@ -379,10 +379,6 @@ void SmtpClient::nextAction(const QString &response)
     {
         if (responseCode == 220) {
             mailItr = mailList.begin();
-            statusMailId = QMailMessageId();
-            if (mailItr != mailList.end()) {
-                statusMailId = mailItr->mail.id();
-            }
             capabilities.clear();
 
             // We need to know if extensions are supported
@@ -769,11 +765,9 @@ void SmtpClient::nextAction(const QString &response)
             mailItr++;
             if (mailItr == mailList.end()) {
                 status = Quit;
-                statusMailId = QMailMessageId();
             } else {
                 // More messages to send
                 status = MetaData;
-                statusMailId = mailItr->mail.id();
             }
             nextAction(QString());
         } else {
@@ -854,7 +848,7 @@ void SmtpClient::operationFailed(int code, const QString &text)
 void SmtpClient::operationFailed(QMailServiceAction::Status::ErrorCode code, const QString &text)
 {
     QMailServiceAction::Status actionStatus;
-    actionStatus.messageId = statusMailId;
+    actionStatus.messageId = sendingId;
     actionStatus.errorCode = code;
 
     if (code != QMailServiceAction::Status::ErrNoError) {
diff --git a/src/plugins/messageservices/smtp/smtpclient.h b/src/plugins/messageservices/smtp/smtpclient.h
index 31d4a8d7..df072802 100644
--- a/src/plugins/messageservices/smtp/smtpclient.h
+++ b/src/plugins/messageservices/smtp/smtpclient.h
@@ -122,7 +122,6 @@ private:
     TransferStatus status;
     QList<RawEmail> mailList;
     QList<RawEmail>::Iterator mailItr;
-    statusMailId;
     QList<QMailMessage::MessageChunk> mailChunks;
     QMailMessageId sendingId;
     uint messageLength;