diff --git a/modules/rss/tpl/atom10.html b/modules/rss/tpl/atom10.html
index 6e0d96b87..a68e2b3d3 100644
--- a/modules/rss/tpl/atom10.html
+++ b/modules/rss/tpl/atom10.html
@@ -1,37 +1,37 @@
 {'<?xml version="1.0" encoding="UTF-8" ?>'}
 
 <feed xmlns="http://www.w3.org/2005/Atom">
-   <title type="text">{$info->title}</title>
-   <!--@if($info->description)-->
-   <subtitle type="html">{str_replace('\'', '&apos;', htmlspecialchars($info->description, ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}</subtitle>
-   <!--@end-->
-   <updated>{$info->date}</updated>
-   <id>{$info->id}</id>
-   <link rel="alternate" type="text/html" hreflang="{$info->language}" href="{$info->link}"/>
-   <link rel="self" type="application/atom+xml" href="{$info->id}"/>
-   <generator uri="http://www.xpressengine.com/">XpressEngine</generator>
+	<title type="text">{$info->title}</title>
+	<!--@if($info->description)-->
+	<subtitle type="html">{str_replace('\'', '&apos;', htmlspecialchars($info->description, ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}</subtitle>
+	<!--@end-->
+	<updated>{$info->date}</updated>
+	<id>{$info->id}</id>
+	<link rel="alternate" type="text/html" hreflang="{$info->language}" href="{$info->link}"/>
+	<link rel="self" type="application/atom+xml" href="{$info->id}"/>
+	<generator uri="http://www.xpressengine.com/">XpressEngine</generator>
 <!--@foreach($document_list as $oDocument)-->   <entry>
-      <title>{str_replace('\'', '&apos;',htmlspecialchars($oDocument->getTitleText(), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}</title>
-      <id>{$oDocument->getPermanentUrl()}</id>
-      <published>{$oDocument->getRegdate('Y-m-d\TH:i:sP')}</published>
-      <updated>{zdate($oDocument->get('last_update'),'Y-m-d\TH:i:sP')}</updated>
-      <link rel="alternate" type="text/html" href="{$oDocument->getPermanentUrl()}"/>
-      <link rel="replies" type="text/html" href="{$oDocument->getPermanentUrl()}#comment"/>
-      <author>
-         <name>{str_replace('\'', '&apos;',$oDocument->getNickName())}</name>
-         <!--@if($oDocument->isExistsHomepage())-->
-         <uri>{$oDocument->getHomepageUrl()}</uri>
-         <!--@end-->
-      </author>
-      <!--@if($open_rss_config[$oDocument->get('module_srl')]=='Y')-->
-      <content type="html">{str_replace('\'', '&apos;', htmlspecialchars($oDocument->getTransContent(false,false,true), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}</content>
-      <!--@else-->
-      <summary type="text">{str_replace('\'', '&apos;', htmlspecialchars($oDocument->getContentText(100), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}</summary>
-      <!--@end-->
-      <!--@foreach($oDocument->get('tag_list') as $tag)-->
-      <category term="{str_replace('\'', '&apos;', htmlspecialchars($tag, ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}"/>
-      <!--@end-->
-      
-   </entry>
+		<title><![CDATA[{str_replace('\'', '&apos;', htmlspecialchars($oDocument->getTitleText(), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}]]></title>
+		<id>{$oDocument->getPermanentUrl()}</id>
+		<published>{$oDocument->getRegdate('Y-m-d\TH:i:sP')}</published>
+		<updated>{zdate($oDocument->get('last_update'),'Y-m-d\TH:i:sP')}</updated>
+		<link rel="alternate" type="text/html" href="{$oDocument->getPermanentUrl()}"/>
+		<link rel="replies" type="text/html" href="{$oDocument->getPermanentUrl()}#comment"/>
+		<author>
+			<name><![CDATA[{str_replace('\'', '&apos;',$oDocument->getNickName())}]]></name>
+			<!--@if($oDocument->isExistsHomepage())-->
+			<uri>{$oDocument->getHomepageUrl()}</uri>
+			<!--@end-->
+		</author>
+		<!--@if($open_rss_config[$oDocument->get('module_srl')]=='Y')-->
+		<content type="html"><![CDATA[{str_replace('\'', '&apos;', htmlspecialchars($oDocument->getTransContent(false,false,true), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}]]></content>
+		<!--@else-->
+		<summary type="text"><![CDATA[{str_replace('\'', '&apos;', htmlspecialchars($oDocument->getContentText(100), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}]]></summary>
+		<!--@end-->
+		<!--@foreach($oDocument->get('tag_list') as $tag)-->
+		<category term="{str_replace('\'', '&apos;', htmlspecialchars($tag, ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}"/>
+		<!--@end-->
+		
+	</entry>
 <!--@end-->
 </feed> 
diff --git a/modules/rss/tpl/rss10.html b/modules/rss/tpl/rss10.html
index 170a25346..d5de2ff95 100644
--- a/modules/rss/tpl/rss10.html
+++ b/modules/rss/tpl/rss10.html
@@ -1,26 +1,26 @@
 {'<?xml version="1.0" encoding="UTF-8" ?>'}
 
 <rdf:RDF xmlns="http://purl.org/rss/1.0/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:taxo="http://purl.org/rss/1.0/modules/taxonomy/" xmlns:sy="http://purl.org/rss/1.0/modules/syndication/">
-    <channel rdf:about="{getUrl('','mid',$mid,'module','rss','act','rss','format','rss1.0','page',Context::get('page'),'start_date',Context::get('start_date'),'end_date',Context::get('end_date'))}">
-        <title>{$info->title}</title> 
-        <link>{$info->link}</link>
-        <description>{str_replace('\'', '&apos;', htmlspecialchars($info->description, ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}</description>
-        <items>
-            <rdf:Seq>
-                <!--@foreach($document_list as $oDocument)-->
-                <rdf:li resource="{$oDocument->getPermanentUrl()}" />
-                <!--@end-->
-            </rdf:Seq>
-        </items>
-        <dc:date>{$info->date}</dc:date> 
-        <dc:language>{$info->language}</dc:language> 
+	<channel rdf:about="{getUrl('','mid',$mid,'module','rss','act','rss','format','rss1.0','page',Context::get('page'),'start_date',Context::get('start_date'),'end_date',Context::get('end_date'))}">
+		<title><![CDATA[{$info->title}]]></title> 
+		<link>{$info->link}</link>
+		<description>{str_replace('\'', '&apos;', htmlspecialchars($info->description, ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}</description>
+		<items>
+			<rdf:Seq>
+				<!--@foreach($document_list as $oDocument)-->
+				<rdf:li resource="{$oDocument->getPermanentUrl()}" />
+				<!--@end-->
+			</rdf:Seq>
+		</items>
+		<dc:date>{$info->date}</dc:date> 
+		<dc:language>{$info->language}</dc:language> 
 	</channel>
-    <!--@foreach($document_list as $oDocument)-->
-    <item rdf:about="{$oDocument->getPermanentUrl()}">
-        <title>{str_replace('\'', '&apos;',htmlspecialchars($oDocument->getTitleText(), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}</title> 
-        <link>{$oDocument->getPermanentUrl()}</link>
-        <description>{str_replace('\'', '&apos;', htmlspecialchars($oDocument->getContentText(200), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}</description>
-        <dc:date>{$oDocument->getRegdate('Y-m-d\TH:i:sP')}</dc:date> 
-    </item>
-    <!--@end-->
+	<!--@foreach($document_list as $oDocument)-->
+	<item rdf:about="{$oDocument->getPermanentUrl()}">
+		<title><![CDATA[{str_replace('\'', '&apos;',htmlspecialchars($oDocument->getTitleText(), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}]]></title> 
+		<link>{$oDocument->getPermanentUrl()}</link>
+		<description><![CDATA[{str_replace('\'', '&apos;', htmlspecialchars($oDocument->getContentText(200), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}]]></description>
+		<dc:date>{$oDocument->getRegdate('Y-m-d\TH:i:sP')}</dc:date> 
+	</item>
+	<!--@end-->
 </rdf:RDF>
diff --git a/modules/rss/tpl/rss20.html b/modules/rss/tpl/rss20.html
index 25524f78e..42d052a64 100644
--- a/modules/rss/tpl/rss20.html
+++ b/modules/rss/tpl/rss20.html
@@ -1,46 +1,46 @@
 {'<?xml version="1.0" encoding="UTF-8" ?>'}
 
 <rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:slash="http://purl.org/rss/1.0/modules/slash/">
-    <channel>
-        <title>{$info->title}</title>
-        <link>{$info->link}</link>
-        <description>{$info->description}</description>
-        <language>{$info->language}</language>
-        <pubDate>{$info->date}</pubDate>
-        <lastBuildDate>{$info->date}</lastBuildDate>
-        <generator>XpressEngine</generator>
-        <!--@if($info->feed_copyright)-->
-        <copyright>{$info->feed_copyright}</copyright>
-        <!--@end-->
-        <!--@if($info->image)-->
-        <image>
-            <url>{$info->image}</url>
-            <title>{$info->title}</title>
-            <link>{$info->link}</link>
-        </image>
-        <!--@end-->
-        <!--@foreach($document_list as $oDocument)-->
-        <item>
-            <title>{str_replace('\'', '&apos;',htmlspecialchars($oDocument->getTitleText(), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}</title>
-            <dc:creator>{str_replace('\'', '&apos;',$oDocument->getNickName())}</dc:creator>
-            <link>{$oDocument->getPermanentUrl()}</link>
-            <guid isPermaLink="true">{$oDocument->getPermanentUrl()}</guid>
-            <!--@if($oDocument->allowComment()) -->
-            <comments>{$oDocument->getPermanentUrl()}#comment</comments>
-            <!--@end-->
-            <!--@if($open_rss_config[$oDocument->get('module_srl')]=='Y')-->
-            <description>{str_replace('\'', '&apos;', htmlspecialchars($oDocument->getTransContent(false,false,true), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}</description>
-            <!--@else-->
-            <description>{str_replace('\'', '&apos;', htmlspecialchars($oDocument->getContentText(100), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}</description>
-            <!--@end-->
-            <pubDate>{$oDocument->getRegdateGM()}</pubDate>
-            <!--@foreach($oDocument->get('tag_list') as $tag)-->
-            <category>{str_replace('\'', '&apos;', htmlspecialchars($tag, ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}</category>
-            <!--@end-->
-            <!--@if($oDocument->getCommentcount()>0)-->
-            <slash:comments>{$oDocument->getCommentcount()}</slash:comments>
-            <!--@end-->
-        </item>
-        <!--@end-->
-    </channel>
+	<channel>
+		<title><![CDATA[{$info->title}]]></title>
+		<link>{$info->link}</link>
+		<description><![CDATA[{$info->description}]]></description>
+		<language>{$info->language}</language>
+		<pubDate>{$info->date}</pubDate>
+		<lastBuildDate>{$info->date}</lastBuildDate>
+		<generator>XpressEngine</generator>
+		<!--@if($info->feed_copyright)-->
+		<copyright><![CDATA[{$info->feed_copyright}]]></copyright>
+		<!--@end-->
+		<!--@if($info->image)-->
+		<image>
+			<url>{$info->image}</url>
+			<title><![CDATA[{$info->title}]]></title>
+			<link>{$info->link}</link>
+		</image>
+		<!--@end-->
+		<!--@foreach($document_list as $oDocument)-->
+		<item>
+			<title><![CDATA[{str_replace('\'', '&apos;',htmlspecialchars($oDocument->getTitleText(), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}]]></title>
+			<dc:creator><![CDATA[{str_replace('\'', '&apos;',$oDocument->getNickName())}]]></dc:creator>
+			<link>{$oDocument->getPermanentUrl()}</link>
+			<guid isPermaLink="true">{$oDocument->getPermanentUrl()}</guid>
+			<!--@if($oDocument->allowComment()) -->
+			<comments>{$oDocument->getPermanentUrl()}#comment</comments>
+			<!--@end-->
+			<!--@if($open_rss_config[$oDocument->get('module_srl')]=='Y')-->
+			<description><![CDATA[{str_replace('\'', '&apos;', htmlspecialchars($oDocument->getTransContent(false,false,true), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}]]></description>
+			<!--@else-->
+			<description><![CDATA[{str_replace('\'', '&apos;', htmlspecialchars($oDocument->getContentText(100), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}]]></description>
+			<!--@end-->
+			<pubDate>{$oDocument->getRegdateGM()}</pubDate>
+			<!--@foreach($oDocument->get('tag_list') as $tag)-->
+			<category><![CDATA[{str_replace('\'', '&apos;', htmlspecialchars($tag, ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}]]></category>
+			<!--@end-->
+			<!--@if($oDocument->getCommentcount()>0)-->
+			<slash:comments>{$oDocument->getCommentcount()}</slash:comments>
+			<!--@end-->
+		</item>
+		<!--@end-->
+	</channel>
 </rss>
diff --git a/modules/rss/tpl/xe_rss.html b/modules/rss/tpl/xe_rss.html
index 233e237b3..fbefd10cd 100644
--- a/modules/rss/tpl/xe_rss.html
+++ b/modules/rss/tpl/xe_rss.html
@@ -1,30 +1,30 @@
 {'<?xml version="1.0" encoding="UTF-8" ?>'}
 
 <rss version="1.0">
-    <channel>
-        <title>{$info->title}</title>
-        <link>{$info->link}</link>
-        <description>{str_replace('\'', '&apos;', htmlspecialchars($info->description, ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}</description>
-        <language>{$info->language}</language>
-        <pubDate>{$info->date}</pubDate>
-        <totalCount>{$info->total_count}</totalCount>
-        <totalPage>{$info->total_page}</totalPage>
-        <!--@foreach($document_list as $oDocument)-->
-        <item>
-            <title>{str_replace('\'', '&apos;',htmlspecialchars($oDocument->getTitleText(), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}</title>
-            <author>{str_replace('\'', '&apos;',$oDocument->getNickName())}</author>
-            <link>{$oDocument->getPermanentUrl()}</link>
-            <!--@if($open_rss_config[$oDocument->get('module_srl')]->open_rss=='Y')-->
-            <description>{str_replace('\'', '&apos;', htmlspecialchars($oDocument->getTransContent(false,false,true), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}</description>
-            <!--@else-->
-            <description>{str_replace('\'', '&apos;', htmlspecialchars($oDocument->getContentText(100), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}</description>
-            <!--@end-->
-            <tags>{str_replace('\'', '&apos;', htmlspecialchars($oDocument->get('tags'), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}</tags>
-            <comment_count>{$oDocument->getCommentCount()}</comment_count>
-            <trackback_count>{$oDocument->getTrackbackCount()}</trackback_count>
-            <pubDate>{$oDocument->getRegdateGM()}</pubDate>
-            <upDate>{$oDocument->getUpdateGM()}</upDate>
-        </item>
-        <!--@end-->
-    </channel>
+	<channel>
+		<title>{$info->title}</title>
+		<link>{$info->link}</link>
+		<description>{str_replace('\'', '&apos;', htmlspecialchars($info->description, ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}</description>
+		<language>{$info->language}</language>
+		<pubDate>{$info->date}</pubDate>
+		<totalCount>{$info->total_count}</totalCount>
+		<totalPage>{$info->total_page}</totalPage>
+		<!--@foreach($document_list as $oDocument)-->
+		<item>
+			<title>{str_replace('\'', '&apos;',htmlspecialchars($oDocument->getTitleText(), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}</title>
+			<author>{str_replace('\'', '&apos;',$oDocument->getNickName())}</author>
+			<link>{$oDocument->getPermanentUrl()}</link>
+			<!--@if($open_rss_config[$oDocument->get('module_srl')]->open_rss=='Y')-->
+			<description>{str_replace('\'', '&apos;', htmlspecialchars($oDocument->getTransContent(false,false,true), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}</description>
+			<!--@else-->
+			<description>{str_replace('\'', '&apos;', htmlspecialchars($oDocument->getContentText(100), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}</description>
+			<!--@end-->
+			<tags>{str_replace('\'', '&apos;', htmlspecialchars($oDocument->get('tags'), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}</tags>
+			<comment_count>{$oDocument->getCommentCount()}</comment_count>
+			<trackback_count>{$oDocument->getTrackbackCount()}</trackback_count>
+			<pubDate>{$oDocument->getRegdateGM()}</pubDate>
+			<upDate>{$oDocument->getUpdateGM()}</upDate>
+		</item>
+		<!--@end-->
+	</channel>
 </rss>