diff --git a/views/bootstrap/class.TimelineFeed.php b/views/bootstrap/class.TimelineFeed.php
index 0e0f7b9da..41bd71efb 100644
--- a/views/bootstrap/class.TimelineFeed.php
+++ b/views/bootstrap/class.TimelineFeed.php
@@ -78,7 +78,7 @@ class SeedDMS_View_TimelineFeed extends SeedDMS_Bootstrap_Style {
 		$feed->setChannelElement('pubDate', date(\DATE_RSS, strtotime('2013-04-06')));
 		// You can add additional link elements, e.g. to a PubSubHubbub server with custom relations.
 		// It's recommended to provide a backlink to the feed URL.
-		$feed->setSelfLink($baseurl.'out/out.Feed.php');
+		$feed->setSelfLink($baseurl.'out/out.TimelineFeed.php');
 //		$feed->setAtomLink('http://pubsubhubbub.appspot.com', 'hub');
 		// You can add more XML namespaces for more custom channel elements which are not defined
 		// in the RSS 2 specification. Here the 'creativeCommons' element is used. There are much more
@@ -122,7 +122,7 @@ class SeedDMS_View_TimelineFeed extends SeedDMS_Bootstrap_Style {
 					$newItem->setLink($baseurl.'out/out.ViewDocument.php?documentid='.$doc->getID());
 					$newItem->setDescription("<h2>".$item['msg']."</h2>".
 						"<p>".getMLText('comment').": <b>".$doc->getComment()."</b></p>".
-						"<p>".getMLText('owner').": <b><a href=\"mailto:".$owner->getEmail()."\">".$owner->getFullName()."</a></b></p>".
+						"<p>".getMLText('owner').": <b><a href=\"mailto:".htmlspecialchars($owner->getEmail())."\">".htmlspecialchars($owner->getFullName())."</a></b></p>".
 						"<p>".getMLText("creation_date").": <b>".getLongReadableDate($doc->getDate())."</p>"
 					);
 					$newItem->setDate(date('c', $d));