diff --git a/privmsg.php b/privmsg.php
index e2b03977..3034f99e 100644
--- a/privmsg.php
+++ b/privmsg.php
@@ -927,17 +927,6 @@ else if ( $submit || $refresh || $mode != '' )
 			$error = TRUE;
 			$error_msg .= ( ( !empty($error_msg) ) ? '<br />' : '' ) . $lang['EMPTY_MESSAGE'];
 		}
-
-		// Check smilies limit
-		if ($bb_cfg['max_smilies_pm'])
-		{
-			$count_smilies = substr_count(bbcode2html($privmsg_message), '<img class="smile" src="'. $bb_cfg['smilies_path']);
-			if ($count_smilies > $bb_cfg['max_smilies_pm'])
-			{
-				$error = TRUE;
-				$error_msg .= ( ( !empty($error_msg) ) ? '<br />' : '' ) . sprintf($lang['MAX_SMILIES_PER_POST'], $bb_cfg['max_smilies_pm']);
-			}
-		}
 	}
 
 	if ( $submit && !$error )
@@ -1216,7 +1205,7 @@ else if ( $submit || $refresh || $mode != '' )
 	//
 	if (bf($userdata['user_opt'], 'user_opt', 'dis_pm') && $mode != 'edit')
 	{
-		bb_die($lang['CANNOT_SEND_PRIVMSG']);
+		$message = ($lang['CANNOT_SEND_PRIVMSG']);
 	}
 
 	//
@@ -1673,4 +1662,4 @@ function pm_die ($msg)
 	$msg .= sprintf($lang['CLICK_RETURN_INDEX'], '<a href="'."index.php".'">', '</a>');
 
 	bb_die($msg);
-}
+}
\ No newline at end of file