diff -ubBr --exclude=uploads --exclude=images --exclude=images_pcf --exclude=config.php --exclude=languages --exclude=settings.php Upload/member.php forum/member.php
--- Upload/member.php	2006-09-03 15:09:02.000000000 +0200
+++ forum/member.php	2006-09-11 15:25:14.000000000 +0200
@@ -1071,7 +1071,8 @@
 		$avatar = '';
 	}

-	if($memprofile['hideemail'] != "yes")
+//	if($memprofile['hideemail'] != "yes") // KK (admin_see_emails.mod)
+	if($mybb->usergroup['cancp'] == "yes" || $memprofile['hideemail'] != "yes")
 	{
 		eval("\$sendemail = \"".$templates->get("member_profile_email")."\";");
 	}
# Zawiera 2 wersje jednej zmiany. Jedna jesli zastosowales moja
# late "05_spam_email_send2_unactivated.bug", a druga jesli nie. Przy patchowaniu pojawi
# sie na pewno jedno "HUNK FAILED", ale to OK. Jesli beda dwa HUNK FAILED, to juz zle.
diff -ubBr --exclude=uploads --exclude=images --exclude=images_pcf --exclude=config.php --exclude=languages --exclude=settings.php Upload/member.php forum/member.php
--- Upload/member.php	2006-09-03 15:09:02.000000000 +0200
+++ forum/member.php	2006-09-11 15:25:14.000000000 +0200
@@ -1370,12 +1396,13 @@
 	}
 	if($mybb->input['uid'])
 	{
 		$emailto = $db->fetch_array($query);
 		if(!$emailto['username'])
 		{
 			error($lang->error_invalidpmrecipient);
 		}
-		if($emailto['hideemail'] != "no")
+//		if($emailto['hideemail'] != "no")  // KK (admin_see_emails.mod)
+		if($mybb->usergroup['cancp'] != "yes" && $emailto['hideemail'] != "no")
 		{
 			error($lang->error_hideemail);
 		}
@@ -1392,7 +1396,8 @@
 			error($lang->error_cannot_receive_emails);
 		}
 		// KK^
-		if($emailto['hideemail'] != "no")
+//		if($emailto['hideemail'] != "no")  // KK (admin_see_emails.mod)
+		if($mybb->usergroup['cancp'] != "yes" && $emailto['hideemail'] != "no")
 		{
 			error($lang->error_hideemail);
 		}
@@ -1405,7 +1435,8 @@
 	{
 		error($lang->error_invalidpmrecipient);
 	}
-	if($emailto['hideemail'] != "no")
+//	if($emailto['hideemail'] != "no") // KK (admin_see_emails.mod)
+	if($mybb->usergroup['cancp'] != "yes" && $emailto['hideemail'] != "no")
 	{
 		error($lang->error_hideemail);
 	}