diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index a3468565a36..2c285796166 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -84,13 +84,12 @@ var/const/HOLOPAD_MODE = RANGE_BASED
 For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 /obj/machinery/hologram/holopad/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq)
 	if(speaker && masters.len && !radio_freq)//Master is mostly a safety in case lag hits or something. Radio_freq so AIs dont hear holopad stuff through radios.
-		for (var/mob/living/silicon/ai/master in masters)
+		for(var/mob/living/silicon/ai/master in masters)
 			if(masters[master] && speaker != master)
 				raw_message = master.lang_treat(speaker, message_langs, raw_message)
 				var/name_used = speaker.GetVoice()
-				var/rendered = "<i><span class='game say'>Holopad received, <span class='name'>[name_used]</span> <span class='message'>[speaker.say_quote(raw_message)]</span></span></i>"
+				var/rendered = "<i><span class='game say'>Holopad received, <span class='name'>[name_used]</span> <span class='message'>[raw_message]</span></span></i>"
 				master.show_message(rendered, 2)
-	return
 
 /obj/machinery/hologram/holopad/proc/create_holo(mob/living/silicon/ai/A, turf/T = loc)
 	var/obj/effect/overlay/h = new(T)//Spawn a blank effect at the location.
diff --git a/code/modules/mob/living/carbon/human/whisper.dm b/code/modules/mob/living/carbon/human/whisper.dm
index 387b05a546f..77be26fc621 100644
--- a/code/modules/mob/living/carbon/human/whisper.dm
+++ b/code/modules/mob/living/carbon/human/whisper.dm
@@ -14,7 +14,7 @@
 	if(!can_speak(message))
 		return
 
-	message = "<i>[message]</i>"
+	message = "[message]"
 	log_whisper("[src.name]/[src.key] : [message]")
 
 	if (src.client)
@@ -49,9 +49,9 @@
 		if(M.stat == DEAD && ((M.client.prefs.toggles & CHAT_GHOSTWHISPER) || (get_dist(M, src) <= 7)))
 			listening_dead |= M
 
-	var/list/listening = get_hear(1, src)
+	var/list/listening = get_hearers_in_view(1, src)
 	listening |= listening_dead
-	var/list/eavesdropping = hearers(2, src)
+	var/list/eavesdropping = get_hearers_in_view(2, src)
 	eavesdropping -= listening
 	var/list/watching  = hearers(5, src)
 	watching  -= listening
@@ -63,13 +63,13 @@
 	for(var/mob/M in watching)
 		M.show_message(rendered, 2)
 
-	rendered = "<span class='game say'><span class='name'>[GetVoice()]</span>[alt_name] [whispers], <span class='message'>\"[message]\"</span></span>"
+	rendered = "<span class='game say'><span class='name'>[GetVoice()]</span>[alt_name] [whispers], <span class='message'>\"<i>[message]</i>\"</span></span>"
 
 	for(var/mob/M in listening)
 		M.Hear(rendered, src, languages, message)
 
 	message = stars(message)
-	rendered = "<span class='game say'><span class='name'>[GetVoice()]</span>[alt_name] [whispers], <span class='message'>\"[message]\"</span></span>"
+	rendered = "<span class='game say'><span class='name'>[GetVoice()]</span>[alt_name] [whispers], <span class='message'>\"<i>[message]</i>\"</span></span>"
 	for(var/mob/M in eavesdropping)
 		M.Hear(rendered, src, languages, message)
 
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 7d5fdb53a04..7252eafa2bb 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -182,7 +182,7 @@ proc/isorgan(A)
 		return 0
 
 /proc/stars(n, pr)
-	n = html_decode(n)
+	n = strip_html_properly(n)
 	if (pr == null)
 		pr = 25
 	if (pr <= 0)