diff --git a/index.php b/index.php
index 222dc3c..91d73c1 100644
--- a/index.php
+++ b/index.php
@@ -1198,20 +1198,26 @@ echo <<< HTML
 	<body>
 		<ul>
 HTML;
+
+		//	HTML is *probably* sanitised by the sender. But let's not risk it, eh?
+		//	Using the allow-list from https://docs.joinmastodon.org/spec/activitypub/#sanitization
+		$allowed_elements = ["p", "span", "br", "a", "del", "pre", "code", "em", "strong", "b", "i", "u", "ul", "ol", "li", "blockquote"];
+		
 		//	Print the items in a list
 		foreach ( $inbox_ordered as $published=>$inbox_message ) {
 			
 			//	Set up the common components
 			$object    = $inbox_message["object"];
+			if ( isset( $inbox_message["object"]["id"] ) ) {
+				$id     = $inbox_message["object"]["id"];
+			} else {
+				$id = "";
+			}
 			$actor     = $inbox_message["actor"];
 			$actorName = end( explode("/", $actor ) );
 			$actorHTML = "<a href=\"$actor\">@{$actorName}</a>";
-			$timeHTML  = "<time datetime=\"{$published}\">{$published}</time>";
+			$timeHTML  = "<time datetime=\"{$published}\"><a href=\"{$id}\">{$published}</a></time>";
 
-			//	HTML is *probably* sanitised by the sender. But let's not risk it, eh?
-			//	Using the allow-list from https://docs.joinmastodon.org/spec/activitypub/#sanitization
-			$allowed_elements = ["p", "span", "br", "a", "del", "pre", "code", "em", "strong", "b", "i", "u", "ul", "ol", "li", "blockquote"];
-		
 			//	What type of message is this?
 			$type = $inbox_message["type"];
 
@@ -1219,7 +1225,23 @@ HTML;
 			if ( "Create" == $type || "Update" == $type ) {
 				//	Get the HTML content and sanitise it.
 				$content   = $object["content"];
-				$content   = strip_tags($content, $allowed_elements);
+				$content   = strip_tags( $content, $allowed_elements );
+
+				//	Is this a reply to something?
+				if ( isset( $object["inReplyTo"] ) ) {
+					$replyToURl = $object["inReplyTo"];
+					$replyTo = " in reply to <a href=\"{$replyToURl}\">$replyToURl</a>";
+				} else {
+					$replyTo = "";
+				}
+
+				//	Check to see if there is a Content Warning
+				if ( isset( $object["summary"] ) ) {
+					$summary = $object["summary"];
+					$summary = strip_tags( $summary, $allowed_elements );
+
+					$content = "<details><summary>{$summary}</summary>{$content}</details>"; 
+				}
 				
 				//	Add any images
 				if ( isset( $object["attachment"] ) ) {
@@ -1249,9 +1271,9 @@ HTML;
 				"Create" == $type ? $verb = "wrote" : $verb = "updated";
 				if ( $reply ) {
 					//	Highlight that this is a reply
-					echo "<li><mark>{$timeHTML} {$actorHTML} {$verb}:</mark> <blockquote>{$content}</blockquote></li>";
+					echo "<li><mark>{$timeHTML} {$actorHTML} {$verb}{$replyTo}:</mark> <blockquote>{$content}</blockquote></li>";
 				} else {
-					echo "<li>{$timeHTML} {$actorHTML} {$verb}: <blockquote>{$content}</blockquote></li>";
+					echo "<li>{$timeHTML} {$actorHTML} {$verb}{$replyTo}: <blockquote>{$content}</blockquote></li>";
 				}
 				
 			} else if ( "Like" == $type ) {
