diff --git a/code/game/objects/items/mail.dm b/code/game/objects/items/mail.dm
index 25740e2c50c..d3ab5eeeeed 100644
--- a/code/game/objects/items/mail.dm
+++ b/code/game/objects/items/mail.dm
@@ -113,7 +113,7 @@
 		to_chat(user, "<span class='notice'>You can't open somebody else's mail! That's <em>illegal</em>!</span>")
 		return
 
-	user.visible_message("<span class='notice'>You start to unwrap the package...</span>")
+	to_chat(user, "<span class='notice'>You start to unwrap the package...</span>")
 	if(!do_after(user, 1.5 SECONDS, target = user))
 		return
 	user.temporarilyRemoveItemFromInventory(src, TRUE)
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index 8e2cd8b9b27..4b8cf5aaf67 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -257,9 +257,12 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
 
 	//collect recipients
 	var/list/mail_recipients = list()
-	for(var/mob/living/carbon/human/player_human in GLOB.player_list)
-		if(player_human.stat != DEAD)
-			mail_recipients += player_human
+	for(var/mob/living/carbon/human/player_human in shuffle(GLOB.player_list))
+		if(player_human.stat == DEAD)
+			continue
+		if(!SSjob.GetJob(player_human.mind.assigned_role) || (player_human.mind.assigned_role in GLOB.nonhuman_positions))
+			continue //this check stops wizards and nuke ops from getting mail, which is hilarious but should definitely not happen
+		mail_recipients += player_human
 
 	//Creates mail for all the mail waiting to arrive, if there's nobody to recieve it it's just junkmail.
 	for(var/mail_iterator in 1 to SSeconomy.mail_waiting)