diff --git a/api/index.php b/api/index.php
index ea267ca8e..01328b9a7 100644
--- a/api/index.php
+++ b/api/index.php
@@ -184,9 +184,11 @@
 			$show_content = (bool)db_escape_string($_REQUEST["show_content"]);
 			/* all_articles, unread, adaptive, marked, updated */
 			$view_mode = db_escape_string($_REQUEST["view_mode"]);
+			$include_attachments = (bool)db_escape_string($_REQUEST["include_attachments"]);
 
 			$headlines = api_get_headlines($link, $feed_id, $limit, $offset,
-				$filter, $is_cat, $show_excerpt, $show_content, $view_mode, false);
+				$filter, $is_cat, $show_excerpt, $show_content, $view_mode, false,
+				$include_attachments);
 
 			print api_wrap_reply(API_STATUS_OK, $seq, $headlines);
 
diff --git a/functions.php b/functions.php
index e427339e5..0a2345ff6 100644
--- a/functions.php
+++ b/functions.php
@@ -6694,7 +6694,8 @@
 	}
 
 	function api_get_headlines($link, $feed_id, $limit, $offset,
-					$filter, $is_cat, $show_excerpt, $show_content, $view_mode, $order) {
+				$filter, $is_cat, $show_excerpt, $show_content, $view_mode, $order,
+				$include_attachments) {
 
 			/* do not rely on params below */
 
@@ -6728,6 +6729,10 @@
 						"tags" => get_article_tags($link, $line["id"]),
 					);
 
+					if ($include_attachments)
+						$headline_row['attachments'] = get_article_enclosures($link,
+							$line['id']);
+
 				if ($show_excerpt) {
 					$excerpt = truncate_string(strip_tags($line["content_preview"]), 100);
 					$headline_row["excerpt"] = $excerpt;