diff --git a/bridges/InstagramBridge.php b/bridges/InstagramBridge.php
index 679c4c0e..0a6dbaad 100644
--- a/bridges/InstagramBridge.php
+++ b/bridges/InstagramBridge.php
@@ -123,6 +123,12 @@ class InstagramBridge extends BridgeAbstract {
 				$item['title'] = substr($item['title'], 0, $titleLinePos) . '...';
 			}
 
+			if($directLink) {
+				$mediaURI = $media->display_url;
+			} else {
+				$mediaURI = self::URI . 'p/' . $media->shortcode . '/media?size=l';
+			}
+
 			switch($media->__typename) {
 				case 'GraphSidecar':
 					$data = $this->getInstagramSidecarData($item['uri'], $item['title']);
@@ -130,24 +136,20 @@ class InstagramBridge extends BridgeAbstract {
 					$item['enclosures'] = $data[1];
 					break;
 				case 'GraphImage':
-					if($directLink) {
-						$mediaURI = $media->display_url;
-					} else {
-						$mediaURI = self::URI . 'p/' . $media->shortcode . '/media?size=l';
-					}
 					$item['content'] = '<a href="' . htmlentities($item['uri']) . '" target="_blank">';
 					$item['content'] .= '<img src="' . htmlentities($mediaURI) . '" alt="' . $item['title'] . '" />';
 					$item['content'] .= '</a><br><br>' . nl2br(htmlentities($textContent));
 					$item['enclosures'] = array($mediaURI);
 					break;
 				case 'GraphVideo':
-					$data = $this->getInstagramVideoData($item['uri']);
+					$data = $this->getInstagramVideoData($item['uri'], $mediaURI);
 					$item['content'] = $data[0];
 					if($directLink) {
 						$item['enclosures'] = $data[1];
 					} else {
-						$item['enclosures'] = array(self::URI . 'p/' . $media->shortcode . '/media?size=l');
+						$item['enclosures'] = array($mediaURI);
 					}
+					$item['thumbnail'] = $mediaURI;
 					break;
 				default: break;
 			}
@@ -185,11 +187,14 @@ class InstagramBridge extends BridgeAbstract {
 	}
 
 	// returns Video post's contents and enclosures
-	protected function getInstagramVideoData($uri) {
+	protected function getInstagramVideoData($uri, $mediaURI) {
 		$mediaInfo = $this->getSinglePostData($uri);
 
 		$textContent = $this->getTextContent($mediaInfo);
-		$content = '<video controls><source src="' . $mediaInfo->video_url . '" type="video/mp4"></video><br>';
+		$content = '<video controls>';
+		$content .= '<source src="' . $mediaInfo->video_url . '" poster="' . $mediaURI . '" type="video/mp4">';
+		$content .= '<img src="' . $mediaURI . '" alt="">';
+		$content .= '</video><br>';
 		$content .= '<br>' . nl2br(htmlentities($textContent));
 
 		return array($content, array($mediaInfo->video_url));
diff --git a/formats/AtomFormat.php b/formats/AtomFormat.php
index a1ecfcf4..c1bde25f 100644
--- a/formats/AtomFormat.php
+++ b/formats/AtomFormat.php
@@ -89,6 +89,10 @@ class AtomFormat extends FormatAbstract{
 				. PHP_EOL;
 			}
 
+			$entryThumbnail = $item->thumbnail;
+			if (!empty($entryThumbnail))
+				$entryThumbnail = '<media:thumbnail url="' . $this->xml_encode($entryThumbnail) . '"/>';
+
 			$entryLinkAlternate = '';
 			if (!empty($entryUri)) {
 				$entryLinkAlternate = '<link rel="alternate" type="text/html" href="'
@@ -114,6 +118,7 @@ class AtomFormat extends FormatAbstract{
 		<content type="html">{$entryContent}</content>
 		{$entryEnclosures}
 		{$entryCategories}
+		{$entryThumbnail}
 	</entry>
 
 EOD;