diff --git a/inc/class_feedgeneration.php b/inc/class_feedgeneration.php
index a6b4f76379..b32bacf2a6 100644
--- a/inc/class_feedgeneration.php
+++ b/inc/class_feedgeneration.php
@@ -143,7 +143,7 @@ function generate_feed()
 					$this->xml .= "\t\t<updated>{$item['updated']}</updated>\n";
 					$this->xml .= "\t\t<link rel=\"alternate\" type=\"text/html\" href=\"{$item['link']}\" />\n";
 					$this->xml .= "\t\t<id>{$item['link']}</id>\n";
-					$this->xml .= "\t\t<title type=\"html\" xml:space=\"preserve\"><![CDATA[".$this->sanitize_content($item['title'])."]]></title>\n";
+					$this->xml .= "\t\t<title xml:space=\"preserve\"><![CDATA[".$this->sanitize_content($item['title'])."]]></title>\n";
 					$this->xml .= "\t\t<content type=\"html\" xml:space=\"preserve\" xml:base=\"{$item['link']}\"><![CDATA[".$this->sanitize_content($item['description'])."]]></content>\n";
 					$this->xml .= "\t\t<draft xmlns=\"http://purl.org/atom-blog/ns#\">false</draft>\n";
 					$this->xml .= "\t</entry>\n";
diff --git a/inc/class_parser.php b/inc/class_parser.php
index ca860ecbbb..57fe326f64 100644
--- a/inc/class_parser.php
+++ b/inc/class_parser.php
@@ -1212,7 +1212,7 @@ function mycode_parse_img($url, $dimensions=array(), $align='')
 		{
 			$alt = my_substr($alt, 0, 40).'...'.my_substr($alt, -10);
 		}
-		$alt = htmlspecialchars_uni($alt);
+		$alt = $this->encode_url($alt);
 
 		$alt = $lang->sprintf($lang->posted_image, $alt);
 		$width = $height = '';