2 files changed, 3 insertions, 1 deletions
diff --git a/Postman/Phpmailer/PostsmtpMailer.php b/Postman/Phpmailer/PostsmtpMailer.php
index eb0246f..c7587bb 100644
--- a/Postman/Phpmailer/PostsmtpMailer.php
+++ b/Postman/Phpmailer/PostsmtpMailer.php
@@ -47,6 +47,7 @@ class PostsmtpMailer extends PHPMailer {
     }
 
     public function get_mail_args( $atts ) {
+        $this->mail_args = array();
         $this->mail_args[] = $atts['to'];
         $this->mail_args[] = $atts['subject'];
         $this->mail_args[] = $atts['message'];
diff --git a/Postman/Postman-Email-Log/PostmanEmailLogService.php b/Postman/Postman-Email-Log/PostmanEmailLogService.php
index ec50745..457baf9 100644
--- a/Postman/Postman-Email-Log/PostmanEmailLogService.php
+++ b/Postman/Postman-Email-Log/PostmanEmailLogService.php
@@ -167,8 +167,9 @@ if ( ! class_exists( 'PostmanEmailLogService' ) ) {
                     $message = $post_id->get_error_message();
 
                     printf( '<div class="%1$s"><p>%2$s</p></div>', esc_attr( $class ), esc_html( $message ) );
-                    return;
                 });
+
+			    return;
             }
 
 			$this->logger->debug( sprintf( 'Saved message #%s to the database', $post_id ) );