diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm
index a21b4bdc344..164edd55dfa 100644
--- a/code/game/machinery/computer/message.dm
+++ b/code/game/machinery/computer/message.dm
@@ -60,6 +60,15 @@
 	..()
 	return
 
+/obj/machinery/computer/message_monitor/power_change()
+	..()
+	if(stat & (NOPOWER|BROKEN))
+		return
+	if(emag || hacking)
+		icon_state = hack_icon
+	else
+		icon_state = normal_icon
+
 /obj/machinery/computer/message_monitor/process()
 	//Is the server isn't linked to a server, and there's a server available, default it to the first one in the list.
 	if(!linkedServer)
@@ -180,15 +189,15 @@
 
 			dat += {"<table border='1' width='100%'>
 					<tr><td width='20%'><A href='?src=\ref[src];select=Sender'>Sender</a></td>
+					<td width='20%'><A href='?src=\ref[src];select=RecJob'>Sender's Job</a></td>
 					<td width='20%'><A href='?src=\ref[src];select=Recepient'>Recipient</a></td>
-					<td width='20%'><A href='?src=\ref[src];select=RecJob'>Recepient Job</a></td>
 					<td width='300px' word-wrap: break-word><A href='?src=\ref[src];select=Message'>Message</a></td></tr>"}
-				//Sender   - Recepient - Message
-				//Al Green - Your Mom  - WHAT UP!?
+				//Sender  - Sender's Job  - Recepient - Message
+				//Al Green- Your Dad	  - Your Mom  - WHAT UP!?
 
 			dat += {"<tr><td width='20%'>[customsender]</td>
-			<td width='20%'>[customrecepient ? customrecepient.owner : "NONE"]</td>
 			<td width='20%'>[customjob]</td>
+			<td width='20%'>[customrecepient ? customrecepient.owner : "NONE"]</td>
 			<td width='300px'>[custommessage]</td></tr>"}
 			dat += "</table><br><center><A href='?src=\ref[src];select=Send'>Send</a>"
 
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 8d0b6fb83a0..ed17140de4a 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -184,6 +184,8 @@
 
 		t = "<font face=\"[crayonfont]\" color=[P.colour]><b>[t]</b></font>"
 
+	t = dd_replacetext(t, "#", "") // Junk converted to nothing!
+
 	//Count the fields
 	var/laststart = 1
 	while(1)
@@ -224,8 +226,8 @@
 
 	if(href_list["write"])
 		var/id = href_list["write"]
-		var/t = strip_html_simple(input(usr, "What text do you wish to add to " + (id=="end" ? "the end of the paper" : "field "+id) + "?", "[name]", null),8192) as text
-
+		//var/t = strip_html_simple(input(usr, "What text do you wish to add to " + (id=="end" ? "the end of the paper" : "field "+id) + "?", "[name]", null),8192) as message
+		var/t =  strip_html_simple(input("Enter what you want to write:", "Write", null, null)  as message, MAX_MESSAGE_LEN)
 		var/obj/item/i = usr.equipped() // Check to see if he still got that darn pen, also check if he's using a crayon or pen.
 		var/iscrayon = 0
 		if(!istype(i, /obj/item/weapon/pen))