diff --git a/inc/3rdparty/libraries/feedwriter/FeedItem.php b/inc/3rdparty/libraries/feedwriter/FeedItem.php
index 0eae5e0..7e467ce 100644
--- a/inc/3rdparty/libraries/feedwriter/FeedItem.php
+++ b/inc/3rdparty/libraries/feedwriter/FeedItem.php
@@ -10,177 +10,189 @@
  */
  class FeedItem
  {
-	private $elements = array();    //Collection of feed elements
-	private $version;
-	
-	/**
-	* Constructor 
-	* 
-	* @param    contant     (RSS1/RSS2/ATOM) RSS2 is default. 
-	*/ 
-	function __construct($version = RSS2)
-	{    
-		$this->version = $version;
-	}
+    private $elements = array();    //Collection of feed elements
+    private $version;
+    
+    /**
+    * Constructor 
+    * 
+    * @param    contant     (RSS1/RSS2/ATOM) RSS2 is default. 
+    */ 
+    function __construct($version = RSS2)
+    {    
+        $this->version = $version;
+    }
 
-	/**
-	* Set element (overwrites existing elements with $elementName)
-	* 
-	* @access   public
-	* @param    srting  The tag name of an element
-	* @param    srting  The content of tag
-	* @param    array   Attributes(if any) in 'attrName' => 'attrValue' format
-	* @return   void
-	*/
-	public function setElement($elementName, $content, $attributes = null)
-	{
-		if (isset($this->elements[$elementName])) {
-			unset($this->elements[$elementName]);
-		}
-		$this->addElement($elementName, $content, $attributes);
-	}	
-	
-	/**
-	* Add an element to elements array
-	* 
-	* @access   public
-	* @param    srting  The tag name of an element
-	* @param    srting  The content of tag
-	* @param    array   Attributes(if any) in 'attrName' => 'attrValue' format
-	* @return   void
-	*/
-	public function addElement($elementName, $content, $attributes = null)
-	{
-		$i = 0;
-		if (isset($this->elements[$elementName])) {
-			$i = count($this->elements[$elementName]);
-		} else {
-			$this->elements[$elementName] = array();
-		}
-		$this->elements[$elementName][$i]['name']       = $elementName;
-		$this->elements[$elementName][$i]['content']    = $content;
-		$this->elements[$elementName][$i]['attributes'] = $attributes;
-	}
-	
-	/**
-	* Set multiple feed elements from an array. 
-	* Elements which have attributes cannot be added by this method
-	* 
-	* @access   public
-	* @param    array   array of elements in 'tagName' => 'tagContent' format.
-	* @return   void
-	*/
-	public function addElementArray($elementArray)
-	{
-		if(! is_array($elementArray)) return;
-		foreach ($elementArray as $elementName => $content) 
-		{
-			$this->addElement($elementName, $content);
-		}
-	}
-	
-	/**
-	* Return the collection of elements in this feed item
-	* 
-	* @access   public
-	* @return   array
-	*/
-	public function getElements()
-	{
-		return $this->elements;
-	}
-	
-	// Wrapper functions ------------------------------------------------------
-	
-	/**
-	* Set the 'dscription' element of feed item
-	* 
-	* @access   public
-	* @param    string  The content of 'description' element
-	* @return   void
-	*/
-	public function setDescription($description) 
-	{
-		$tag = 'description'; 
-		$this->setElement($tag, $description);
-	}
-	
-	/**
-	* @desc     Set the 'title' element of feed item
-	* @access   public
-	* @param    string  The content of 'title' element
-	* @return   void
-	*/
-	public function setTitle($title) 
-	{
-		$this->setElement('title', $title);  	
-	}
-	
-	/**
-	* Set the 'date' element of feed item
-	* 
-	* @access   public
-	* @param    string  The content of 'date' element
-	* @return   void
-	*/
-	public function setDate($date) 
-	{
-		if(! is_numeric($date))
-		{
-			$date = strtotime($date);
-		}
+    /**
+    * Set element (overwrites existing elements with $elementName)
+    * 
+    * @access   public
+    * @param    srting  The tag name of an element
+    * @param    srting  The content of tag
+    * @param    array   Attributes(if any) in 'attrName' => 'attrValue' format
+    * @return   void
+    */
+    public function setElement($elementName, $content, $attributes = null)
+    {
+        if (isset($this->elements[$elementName])) {
+            unset($this->elements[$elementName]);
+        }
+        $this->addElement($elementName, $content, $attributes);
+    }    
+    
+    /**
+    * Add an element to elements array
+    * 
+    * @access   public
+    * @param    srting  The tag name of an element
+    * @param    srting  The content of tag
+    * @param    array   Attributes(if any) in 'attrName' => 'attrValue' format
+    * @return   void
+    */
+    public function addElement($elementName, $content, $attributes = null)
+    {
+        $i = 0;
+        if (isset($this->elements[$elementName])) {
+            $i = count($this->elements[$elementName]);
+        } else {
+            $this->elements[$elementName] = array();
+        }
+        $this->elements[$elementName][$i]['name']       = $elementName;
+        $this->elements[$elementName][$i]['content']    = $content;
+        $this->elements[$elementName][$i]['attributes'] = $attributes;
+    }
+    
+    /**
+    * Set multiple feed elements from an array. 
+    * Elements which have attributes cannot be added by this method
+    * 
+    * @access   public
+    * @param    array   array of elements in 'tagName' => 'tagContent' format.
+    * @return   void
+    */
+    public function addElementArray($elementArray)
+    {
+        if(! is_array($elementArray)) return;
+        foreach ($elementArray as $elementName => $content) 
+        {
+            $this->addElement($elementName, $content);
+        }
+    }
+    
+    /**
+    * Return the collection of elements in this feed item
+    * 
+    * @access   public
+    * @return   array
+    */
+    public function getElements()
+    {
+        return $this->elements;
+    }
+    
+    // Wrapper functions ------------------------------------------------------
+    
+    /**
+    * Set the 'dscription' element of feed item
+    * 
+    * @access   public
+    * @param    string  The content of 'description' element
+    * @return   void
+    */
+    public function setDescription($description) 
+    {
+        $tag = 'description'; 
+        $this->setElement($tag, $description);
+    }
+    
+    /**
+    * @desc     Set the 'title' element of feed item
+    * @access   public
+    * @param    string  The content of 'title' element
+    * @return   void
+    */
+    public function setTitle($title) 
+    {
+        $this->setElement('title', $title);      
+    }
+    
+    /**
+    * Set the 'date' element of feed item
+    * 
+    * @access   public
+    * @param    string  The content of 'date' element
+    * @return   void
+    */
+    public function setDate($date) 
+    {
+        if(! is_numeric($date))
+        {
+            $date = strtotime($date);
+        }
       
-		if($this->version == RSS2) 
-		{
-			$tag    = 'pubDate';
-			$value  = date(DATE_RSS, $date);
-		}
-		else                                
-		{
-			$tag    = 'dc:date';
-			$value  = date("Y-m-d", $date);
-		}
-		
-		$this->setElement($tag, $value);    
-	}
-	
-	/**
-	* Set the 'link' element of feed item
-	* 
-	* @access   public
-	* @param    string  The content of 'link' element
-	* @return   void
-	*/
-	public function setLink($link) 
-	{
-		if($this->version == RSS2 || $this->version == RSS1)
-		{
-			$this->setElement('link', $link);
-			$this->setElement('guid', $link);
-		}
-		else
-		{
-			$this->setElement('link','',array('href'=>$link));
-			$this->setElement('id', FeedWriter::uuid($link,'urn:uuid:'));
-		} 
-		
-	}
-	
-	/**
-	* Set the 'encloser' element of feed item
-	* For RSS 2.0 only
-	* 
-	* @access   public
-	* @param    string  The url attribute of encloser tag
-	* @param    string  The length attribute of encloser tag
-	* @param    string  The type attribute of encloser tag
-	* @return   void
-	*/
-	public function setEncloser($url, $length, $type)
-	{
-		$attributes = array('url'=>$url, 'length'=>$length, 'type'=>$type);
-		$this->setElement('enclosure','',$attributes);
-	}
-	
+        if($this->version == RSS2) 
+        {
+            $tag    = 'pubDate';
+            $value  = date(DATE_RSS, $date);
+        }
+        else                                
+        {
+            $tag    = 'dc:date';
+            $value  = date("Y-m-d", $date);
+        }
+        
+        $this->setElement($tag, $value);    
+    }
+    
+    /**
+    * Set the 'link' element of feed item
+    * 
+    * @access   public
+    * @param    string  The content of 'link' element
+    * @return   void
+    */
+    public function setLink($link) 
+    {
+        if($this->version == RSS2 || $this->version == RSS1)
+        {
+            $this->setElement('link', $link);
+            $this->setElement('guid', $link);
+        }
+        else
+        {
+            $this->setElement('link','',array('href'=>$link));
+            $this->setElement('id', FeedWriter::uuid($link,'urn:uuid:'));
+        } 
+        
+    }
+
+    /**
+    * Set the 'source' element of feed item
+    * 
+    * @access   public
+    * @param    string  The content of 'source' element
+    * @return   void
+    */
+    public function setSource($link) 
+    {
+        $this->setElement('source', $link);
+    }
+    
+    /**
+    * Set the 'encloser' element of feed item
+    * For RSS 2.0 only
+    * 
+    * @access   public
+    * @param    string  The url attribute of encloser tag
+    * @param    string  The length attribute of encloser tag
+    * @param    string  The type attribute of encloser tag
+    * @return   void
+    */
+    public function setEncloser($url, $length, $type)
+    {
+        $attributes = array('url'=>$url, 'length'=>$length, 'type'=>$type);
+        $this->setElement('enclosure','',$attributes);
+    }
+    
  } // end of class FeedItem
-?>
+?>
\ No newline at end of file
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index a662f69..a7bee65 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -828,7 +828,7 @@ class Poche
         define('IMPORT_LIMIT', 5);
       }
       if (!defined('IMPORT_DELAY')) {
-      	define('IMPORT_DELAY', 5);
+        define('IMPORT_DELAY', 5);
       }
 
       if ( isset($_FILES['file']) ) {
@@ -844,18 +844,18 @@ class Poche
           $read = 0;
           foreach (array('ol','ul') as $list) {
             foreach ($html->find($list) as $ul) {
-            	foreach ($ul->find('li') as $li) {
-            	  $tmpEntry = array();
-            		$a = $li->find('a');
-            		$tmpEntry['url'] = $a[0]->href;
-            		$tmpEntry['tags'] = $a[0]->tags;
-            		$tmpEntry['is_read'] = $read;
-            		if ($tmpEntry['url']) {
-            		  $data[] = $tmpEntry;
-            		}
-            	}
-            	# the second <ol/ul> is for read links
-            	$read = ((sizeof($data) && $read)?0:1);
+                foreach ($ul->find('li') as $li) {
+                  $tmpEntry = array();
+                    $a = $li->find('a');
+                    $tmpEntry['url'] = $a[0]->href;
+                    $tmpEntry['tags'] = $a[0]->tags;
+                    $tmpEntry['is_read'] = $read;
+                    if ($tmpEntry['url']) {
+                      $data[] = $tmpEntry;
+                    }
+                }
+                # the second <ol/ul> is for read links
+                $read = ((sizeof($data) && $read)?0:1);
             }
           }
         }
@@ -866,7 +866,7 @@ class Poche
             $data[] = $record;
             foreach ($record as $record2) {
               if (is_array($record2)) {
-              	$data[] = $record2;
+                $data[] = $record2;
               }
             }
           }
@@ -886,7 +886,7 @@ class Poche
               //increment no of records inserted
               $i++;
               if ( isset($record['tags']) && trim($record['tags']) ) {
-              	//@TODO: set tags
+                //@TODO: set tags
 
               }
             }
@@ -919,17 +919,17 @@ class Poche
           $purifier = new HTMLPurifier($config);
 
           foreach ($items as $item) {
-          	$url = new Url(base64_encode($item['url']));
-          	$content = Tools::getPageContent($url);
+            $url = new Url(base64_encode($item['url']));
+            $content = Tools::getPageContent($url);
 
-          	$title = (($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled'));
-          	$body = (($content['rss']['channel']['item']['description'] != '') ? $content['rss']['channel']['item']['description'] : _('Undefined'));
+            $title = (($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled'));
+            $body = (($content['rss']['channel']['item']['description'] != '') ? $content['rss']['channel']['item']['description'] : _('Undefined'));
 
-          	//clean content to prevent xss attack
-          	$title = $purifier->purify($title);
-          	$body = $purifier->purify($body);
+            //clean content to prevent xss attack
+            $title = $purifier->purify($title);
+            $body = $purifier->purify($body);
 
-          	$this->store->updateContentAndTitle($item['id'], $title, $body, $this->user->getId());
+            $this->store->updateContentAndTitle($item['id'], $title, $body, $this->user->getId());
           }
 
         }
@@ -944,8 +944,8 @@ class Poche
      */
     public function export()
     {
-		$filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json";
-		header('Content-Disposition: attachment; filename='.$filename);
+        $filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json";
+        header('Content-Disposition: attachment; filename='.$filename);
 
         $entries = $this->store->retrieveAll($this->user->getId());
         echo $this->tpl->render('export.twig', array(
@@ -978,13 +978,13 @@ class Poche
     public function generateToken()
     {
         if (ini_get('open_basedir') === '') {
-			if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-			echo 'This is a server using Windows!';
-			// alternative to /dev/urandom for Windows
-			$token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
-			} else {
-			$token = substr(base64_encode(file_get_contents('/dev/urandom', false, null, 0, 20)), 0, 15);
-			}
+            if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+            echo 'This is a server using Windows!';
+            // alternative to /dev/urandom for Windows
+            $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
+            } else {
+            $token = substr(base64_encode(file_get_contents('/dev/urandom', false, null, 0, 20)), 0, 15);
+            }
         }
         else {
             $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
@@ -1031,6 +1031,7 @@ class Poche
             foreach ($entries as $entry) {
                 $newItem = $feed->createNewItem();
                 $newItem->setTitle($entry['title']);
+                $newItem->setSource(Tools::getPocheUrl() . '?view=view&amp;id=' . $entry['id']);
                 $newItem->setLink($entry['url']);
                 $newItem->setDate(time());
                 $newItem->setDescription($entry['content']);