diff --git a/phpBB/includes/emailer.php b/phpBB/includes/emailer.php
index fd7075c97f..b8c0314faf 100755
--- a/phpBB/includes/emailer.php
+++ b/phpBB/includes/emailer.php
@@ -160,12 +160,20 @@ class emailer
 			$this->subject = (trim($match[2]) != '') ? trim($match[2]) : (($this->subject != '') ? $this->subject : 'No Subject');
 			$drop_header .= '[\r\n]*?' . phpbb_preg_quote($match[1], '#');
 		}
+		else
+		{
+			$this->subject = (($this->subject != '') ? $this->subject : 'No Subject');
+		}
 
 		if (preg_match('#^(Charset:(.*?))$#m', $this->msg, $match))
 		{
 			$this->encoding = (trim($match[2]) != '') ? trim($match[2]) : trim($lang['ENCODING']);
 			$drop_header .= '[\r\n]*?' . phpbb_preg_quote($match[1], '#');
 		}
+		else
+		{
+			$this->encoding = trim($lang['ENCODING']);
+		}
 
 		if ($drop_header != '')
 		{