diff --git a/code/game/objects/items/devices/communicator/messaging.dm b/code/game/objects/items/devices/communicator/messaging.dm
index 4195d1db98..042146d359 100644
--- a/code/game/objects/items/devices/communicator/messaging.dm
+++ b/code/game/objects/items/devices/communicator/messaging.dm
@@ -95,7 +95,24 @@
 		L = loc
 
 	if(L)
+<<<<<<< HEAD
 		to_chat(L, "<span class='notice'>[bicon(src)] Message from [who].</span>")
+=======
+		to_chat(L, "<span class='notice'>[bicon(src)] Message from [who]: <b>\"[text]\"</b> (<a href='?src=\ref[src];action=Reply;target=\ref[candidate]'>Reply</a>)</span>")
+
+// This is the only Topic the communicators really uses
+/obj/item/device/communicator/Topic(href, href_list)
+	switch(href_list["action"])
+		if("Reply")
+			var/obj/item/device/communicator/comm = locate(href_list["target"])
+			var/message = input(usr, "Enter your message below.", "Reply")
+
+			if(message)
+				exonet.send_message(comm.exonet.address, "text", message)
+				im_list += list(list("address" = exonet.address, "to_address" = comm.exonet.address, "im" = message))
+				log_pda("(COMM: [src]) sent \"[message]\" to [exonet.get_atom_from_address(comm.exonet.address)]", usr)
+				to_chat(usr, "<span class='notice'>[bicon(src)] Sent message to [comm.owner], <b>\"[message]\"</b></span>")
+>>>>>>> 9d35ab996d... Merge pull request #13063 from ItsSelis/tgui-pda-fix
 
 // Verb: text_communicator()
 // Parameters: None
diff --git a/code/modules/nifsoft/software/14_commlink.dm b/code/modules/nifsoft/software/14_commlink.dm
index 93e1af799c..75a04fc589 100644
--- a/code/modules/nifsoft/software/14_commlink.dm
+++ b/code/modules/nifsoft/software/14_commlink.dm
@@ -128,4 +128,4 @@
 		return
 
 	if(ringer && nif.human)
-		nif.notify("Commlink message from [who]: \"[text]\" (<a href='?src=\ref[nifsoft];open=1'>Open</a>)")
+		nif.notify("Commlink message from [who]: \"[text]\" (<a href='?src=\ref[nifsoft];open=1'>Open</a>) (<a href='?src=\ref[src];action=Reply;target=\ref[candidate]'>Reply</a>)")