diff --git a/e107_handlers/mail.php b/e107_handlers/mail.php
index 8e8e6c9c6..ca2077be0 100644
--- a/e107_handlers/mail.php
+++ b/e107_handlers/mail.php
@@ -949,7 +949,7 @@ class e107Email extends PHPMailer
 	 *  @param boolean $bulkmail - set TRUE if this email is one of a bulk send; FALSE if an isolated email
 	 *	@return boolean|string - TRUE if success, error message if failure
 	 */
-	public function sendEmail($send_to, $to_name, $eml = '', $bulkmail = false)
+	public function sendEmail($send_to, $to_name, $eml = array(), $bulkmail = false)
 	{
 		if (count($eml))
 		{	
@@ -1081,7 +1081,7 @@ class e107Email extends PHPMailer
 	 *	
 	 *	@return string none (message saved ready to send)
 	 */
-	public function MsgHTML($message, $basedir = '') 
+	public function MsgHTML($message, $basedir = '', $advanced=false)
 	{
 		$tp = e107::getParser();
 
diff --git a/e107_plugins/pm/pm_class.php b/e107_plugins/pm/pm_class.php
index d5b49ddc9..abe07c1aa 100755
--- a/e107_plugins/pm/pm_class.php
+++ b/e107_plugins/pm/pm_class.php
@@ -263,9 +263,11 @@ class private_message
 			{
 				$info['pm_id'] = $pmid;
 				e107::getEvent()->trigger('user_pm_sent', $info);
-				if(check_class($this->pmPrefs['notify_class'], $vars['to_info']['user_class']))
+
+
+				if(check_class($this->pmPrefs['notify_class'], null, $vars['to_info']['user_id']))
 				{
-					set_time_limit(30);
+					set_time_limit(20);
 					$this->pm_send_notify($vars['to_info']['user_id'], $vars, $pmid, count($a_list));
 				}
 				$ret .= LAN_PM_40.": {$vars['to_info']['user_name']}<br />";