diff --git a/e107_handlers/mail.php b/e107_handlers/mail.php
index fba5b92f1..67e523f3c 100644
--- a/e107_handlers/mail.php
+++ b/e107_handlers/mail.php
@@ -1204,6 +1204,8 @@ class e107Email extends PHPMailer
 
 		$this->clearAddresses();			// In case we send another email
 		$this->clearCustomHeaders();
+		$this->clearAllRecipients();
+		$this->clearAttachments();
 
 		if ($result)
 		{