diff --git a/Zotlabs/Lib/MarkdownSoap.php b/Zotlabs/Lib/MarkdownSoap.php
index a0214bbe4..534ad819f 100644
--- a/Zotlabs/Lib/MarkdownSoap.php
+++ b/Zotlabs/Lib/MarkdownSoap.php
@@ -77,15 +77,22 @@ class MarkdownSoap {
 	}
 
 	function purify($s) {
-//		$s = str_replace("\n",'<br>',$s);
-//		$s = str_replace("\t",'&nbsp;&nbsp;&nbsp;&nbsp;',$s);
-//		$s = str_replace(' ','&nbsp;',$s);
+		$s = $this->protect_autolinks($s);
 		$s = purify_html($s);
-//		$s = str_replace(['&nbsp;', mb_convert_encoding('&#x00a0;','UTF-8','HTML-ENTITIES')], [ ' ', ' ' ],$s);
-//		$s = str_replace(['<br>','<br />', '&lt;', '&gt;' ],["\n","\n", '<', '>'],$s);
+		$s = $this->unprotect_autolinks($s);
 		return $s;
 	}
 
+	function protect_autolinks($s) {
+		$s = preg_replace('/\<(https?\:\/\/)(.*?)\>/','[$1$2]($1$2)',$s);
+		return $s;
+	}
+
+	function unprotect_autolinks($s) {
+		return $s;
+
+	}
+
 	function escape($s) {
 		return htmlspecialchars($s,ENT_QUOTES);
 	}