diff --git a/inc/functions.php b/inc/functions.php
index 8b0745d3..4c3f6a4e 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1571,11 +1571,11 @@ function markup_url($matches) {
 	foreach ($link as $attr => $value) {
 		if ($attr == 'text' || $attr == 'after')
 			continue;
-		$parts[] = $attr . '="' . htmlspecialchars($value) . '"';
+		$parts[] = $attr . '="' . $value . '"';
 	}
 	if (isset($link['after']))
 		$after = $link['after'] . $after;
-	return '<a ' . implode(' ', $parts) . '>' . utf8tohtml($link['text']) . '</a>' . $after;
+	return '<a ' . implode(' ', $parts) . '>' . $link['text'] . '</a>' . $after;
 }
 
 function unicodify($body) {