diff --git a/manifest.json b/manifest.json
index bced614..fc7b050 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
 
   "manifest_version": 2,
   "name": "RSSPreview",
-  "version": "2.7",
+  "version": "2.8",
   "author": "Aurelien David",
   "homepage_url": "https://github.com/aureliendavid/rsspreview",
 
diff --git a/rss.xsl b/rss.xsl
index b77fa04..db81416 100644
--- a/rss.xsl
+++ b/rss.xsl
@@ -2,77 +2,76 @@
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:atom="http://www.w3.org/2005/Atom"
+    xmlns:atom03="http://purl.org/atom/ns#"
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     xmlns:rss1="http://purl.org/rss/1.0/"
     xmlns:media="http://search.yahoo.com/mrss/"
-    exclude-result-prefixes="atom rdf rss1 media" >
+    exclude-result-prefixes="atom atom03 rdf rss1 media" >
 
     <xsl:output method="html" indent="yes" encoding="utf-8" />
 
 
-    <xsl:template match="channel | atom:feed | rss1:channel">
+    <xsl:template match="channel | atom:feed | atom03:feed | rss1:channel">
 
 
       <div id="feedTitle">
         <a id="feedTitleLink">
-          <img id="feedTitleImage" src="{image/url | atom:logo | rss1:image/rss1:url }" />
+          <img id="feedTitleImage" src="{image/url | atom:logo | atom03:logo | rss1:image/rss1:url }" />
         </a>
         <div id="feedTitleContainer">
           <h1 id="feedTitleText" >
-            <a href="{link | atom:link[@rel='alternate']/@href | rss1:link}" target="_blank">
-            <!--img data-src="icons/home.png" class="extImg headerIcon" /-->
-            <xsl:value-of select="title | atom:title | rss1:title" />
+            <a href="{link | atom:link[@rel='alternate']/@href | atom03:link[@rel='alternate']/@href | rss1:link}" target="_blank">
+            <xsl:value-of select="title | atom:title | atom03:title | rss1:title" />
             </a>
           </h1>
-          <h2 id="feedSubtitleRaw" ><xsl:value-of select="description | atom:subtitle | rss1:description" /></h2>
-          <!--div class="lastUpdated">Last updated: <xsl:value-of select="lastBuildDate | atom:updated" /></div-->
+          <h2 id="feedSubtitleRaw" ><xsl:value-of select="description | atom:subtitle | atom03:subtitle | rss1:description" /></h2>
         </div>
       </div>
 
 
       <div id="feedContent">
-        <xsl:apply-templates select="item | atom:entry " />
+        <xsl:apply-templates select="item | atom:entry | atom03:entry " />
       </div>
 
     </xsl:template>
 
-    <xsl:template match="item | atom:entry | rss1:item">
+    <xsl:template match="item | atom:entry | atom03:entry | rss1:item">
 
         <div class="entry">
 
             <h3>
                 <xsl:choose>
-                  <xsl:when test="link | atom:link/@href | rss1:link">
-                    <a href="{link | atom:link/@href | rss1:link}" target="_blank">
-                        <span class="entrytitle"><xsl:value-of select="title | atom:title | rss1:title" /></span>
+                  <xsl:when test="link | atom:link/@href | atom03:link/@href | rss1:link">
+                    <a href="{link | atom:link/@href | atom03:link/@href | rss1:link}" target="_blank">
+                        <span class="entrytitle"><xsl:value-of select="title | atom:title | atom03:title | rss1:title" /></span>
                     </a>
                   </xsl:when>
                   <xsl:otherwise>
-                    <span class="entrytitle"><xsl:value-of select="title | atom:title | rss1:link" /></span>
+                    <span class="entrytitle"><xsl:value-of select="title | atom:title | atom03:title | rss1:link" /></span>
                   </xsl:otherwise>
                 </xsl:choose>
 
-                <div class="lastUpdated"><xsl:value-of select="pubDate | atom:updated | rss1:pubDate" /></div>
+                <div class="lastUpdated"><xsl:value-of select="pubDate | atom:updated | atom03:updated | rss1:pubDate" /></div>
             </h3>
 
             <xsl:if test='.//media:thumbnail/@url'>
                 <img class="mediaThumb" src="{ .//media:thumbnail/@url }" width="{ .//media:thumbnail/@width }" height="{ .//media:thumbnail/@height }" />
             </xsl:if>
             <xsl:choose>
-              <xsl:when test="atom:summary">
-                <div class="feedRawContent" desctype="{atom:summary/@type}">
-                    <xsl:copy-of select="atom:summary"  />
+              <xsl:when test="atom:summary | atom03:summary">
+                <div class="feedRawContent" desctype="{atom:summary/@type | atom03:summary/@type }">
+                    <xsl:copy-of select="atom:summary | atom03:summary"  />
                 </div>
               </xsl:when>
               <xsl:otherwise>
-                <div class="feedRawContent" desctype="{atom:content/@type}">
-                    <xsl:copy-of select="description | atom:content | rss1:description"  />
+                <div class="feedRawContent" desctype="{atom:content/@type | atom03:content/@type }">
+                    <xsl:copy-of select="description | atom:content | atom03:content | rss1:description"  />
                 </div>
               </xsl:otherwise>
             </xsl:choose>
 
             <div class="enclosures">
-                <xsl:for-each select="enclosure | atom:link[@rel='enclosure'] | rss1:enclosure">
+                <xsl:for-each select="enclosure | atom:link[@rel='enclosure'] | atom03:link[@rel='enclosure'] | rss1:enclosure">
 
                   <div class="enclosure">
                       <img data-src="icons/file.png" class="extImg enclosureIcon" />
@@ -90,7 +89,7 @@
 
 
     <xsl:template match="/">
-         <xsl:apply-templates select="//channel | //atom:feed | //rss1:channel " />
+         <xsl:apply-templates select="//channel | //atom:feed | //atom03:feed | //rss1:channel " />
          <xsl:apply-templates select="//rss1:item " />
     </xsl:template>
 
diff --git a/rsspreview.js b/rsspreview.js
index 76dfb02..d0bcddf 100644
--- a/rsspreview.js
+++ b/rsspreview.js
@@ -75,10 +75,16 @@
       // in case of xhtml the content is already parsed
       if (tohtml[i].getAttribute('desctype') != 'xhtml') {
         try {
-          let html_desc = html_parser.parseFromString(
-            '<div class="feedEntryContent">' + tohtml[i].innerText + '</div>',
-            'text/html'
-          );
+
+          let html_txt = '';
+          if (tohtml[i].getAttribute('desctype') == 'text/plain') {
+            html_txt = '<div class="feedEntryContent" style="white-space: pre-wrap;" >' + tohtml[i].innerHTML + '</div>';
+          }
+          else {
+            html_txt = '<div class="feedEntryContent">' + tohtml[i].innerText + '</div>';
+          }
+
+          let html_desc = html_parser.parseFromString(html_txt, 'text/html');
           let xml_desc = xml_parser.serializeToString(
             html_desc.body.firstChild
           );