diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 4631577172e..36d52246b36 100755
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -619,8 +619,9 @@ var/global/list/obj/item/device/pda/PDAs = list()
 				if (in_range(src, U) && loc == U)
 					n = copytext(adminscrub(n), 1, MAX_MESSAGE_LEN)
 					if (mode == 1)
-						note = replacetext(n, "\n", "<BR>")
-						notehtml = n
+						note = html_decode(n)
+						notehtml = note
+						note = replacetext(note, "\n", "<br>")
 				else
 					ui.close()
 			if("Toggle Messenger")
diff --git a/nano/templates/pda.tmpl b/nano/templates/pda.tmpl
index 81b77742451..eb0432cf417 100644
--- a/nano/templates/pda.tmpl
+++ b/nano/templates/pda.tmpl
@@ -165,7 +165,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
 			<b>Notes</b>:
 		</div>
 	</div>
-	<div class="statusDisplay" style="height: 225px; overflow: auto;">
+	<div class="statusDisplayRecords" style="height: 225px">
 	        <div class="item">
 	                <div class="itemContent" style="width: 100%;">
                                 <span class="average">{^{:note}}</span>