From 2f204f0e833e9ed710919890cef31e4194a6fa5b Mon Sep 17 00:00:00 2001
From: "Tristan B. Kildaire" <deavmi@disroot.org>
Date: Mon, 20 Jul 2020 20:41:48 +0200
Subject: [PATCH] Fixed error report sending code placement.

---
 source/client/client.d | 49 +++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/source/client/client.d b/source/client/client.d
index 77cf02f..65942b0 100644
--- a/source/client/client.d
+++ b/source/client/client.d
@@ -675,35 +675,36 @@ public final class ButterflyClient : Thread
                 }
             }
 
-            /**
-            * If there are failed sends then send an error message
-            * to the sender.
-            */
-            if(failedRecipients.length)
-            {
-                /* Create the error message */
-                JSONValue deliveryReport;
-                JSONValue[] errorRecipients = [JSONValue(mailbox.username~"@"~server.domain)];
-                deliveryReport["recipients"] = errorRecipients;
-
-                /* TODO: Make more indepth, and have copy of the mail that was tried to be sent */
-                string errorMessage = "There was an error delivery the mail to: "~to!(string)(recipients)~"\n";
-                errorMessage ~= "\nThe message was:\n\n"~mailBlock.toPrettyString();
-                deliveryReport["message"] = errorMessage;
-
-                writeln(deliveryReport);
-
-                /* Deliver the error message */
-                sendMail(deliveryReport);
-
-                writeln("Mail delivery report sent: "~deliveryReport.toPrettyString());
-            }
-
             writeln("Sent mail message");
         }
 
         writeln("Mail delivered");
 
+        /**
+        * If there are failed sends then send an error message
+        * to the sender.
+        */
+        if(failedRecipients.length)
+        {
+            /* Create the error message */
+            JSONValue deliveryReport;
+            JSONValue[] errorRecipients = [JSONValue(mailbox.username~"@"~server.domain)];
+            deliveryReport["recipients"] = errorRecipients;
+
+            /* TODO: Make more indepth, and have copy of the mail that was tried to be sent */
+            string errorMessage = "There was an error delivery the mail to: "~to!(string)(recipients)~"\n";
+            errorMessage ~= "\nThe message was:\n\n"~mailBlock.toPrettyString();
+            deliveryReport["message"] = errorMessage;
+
+            writeln(deliveryReport);
+
+            /* Deliver the error message */
+            sendMail(deliveryReport);
+
+            writeln("Mail delivery report sent: "~deliveryReport.toPrettyString());
+        }
+
+
         /* Store the message in this user's "Sent" folder */
         Folder sentFolder = new Folder(mailbox, "Sent");