diff --git a/phpBB/includes/emailer.php b/phpBB/includes/emailer.php
index b93e61f03c..12f1ba803e 100755
--- a/phpBB/includes/emailer.php
+++ b/phpBB/includes/emailer.php
@@ -195,7 +195,10 @@ class emailer
 			}
 			if($this->use_smtp)
 			{
-				include($phpbb_root_path . "includes/smtp.".$phpEx);
+				if(!defined('SMTP_INCLUDED')) 
+				{
+					include($phpbb_root_path . "includes/smtp.".$phpEx);
+				}
 				if(!smtpmail($this->address, $this->subject, $this->msg, $this->extra_headers))
 				{
 					message_die(GENERAL_ERROR, "Sending via SMTP failed", "", __LINE__, __FILE__);
@@ -314,4 +317,4 @@ class emailer
 
 } // class emailer
 
-?>
\ No newline at end of file
+?>
diff --git a/phpBB/includes/smtp.php b/phpBB/includes/smtp.php
index f14e836730..0e2cbf9e63 100644
--- a/phpBB/includes/smtp.php
+++ b/phpBB/includes/smtp.php
@@ -33,6 +33,7 @@
 *						to the opened socket to the server and the second the
 *						response code you are looking for.
 ****************************************************************************/
+define('SMTP_INCLUDED', 1);
 function server_parse($socket, $response)
 {
 	if(!($server_response = fgets($socket, 100)))