diff --git a/backend.php b/backend.php
index 6129a17c6..194d8ccd6 100644
--- a/backend.php
+++ b/backend.php
@@ -959,14 +959,20 @@
 				$feed_kind = "Labels";
 			}
 
+			if (!$vfeed_query_part) {
+				$content_query_part = "content as content_preview,";
+			} else {
+				$content_query_part = "";
+			}
+
 			$result = db_query($link, "SELECT 
 					id,title,
 					SUBSTRING(updated,1,16) as updated,
 					unread,feed_id,marked,link,last_read,
 					SUBSTRING(last_read,1,19) as last_read_noms,
 					$vfeed_query_part
-					SUBSTRING(updated,1,19) as updated_noms,
-					content as content_preview
+					$content_query_part
+					SUBSTRING(updated,1,19) as updated_noms
 				FROM
 					ttrss_entries,ttrss_user_entries
 				WHERE
@@ -989,8 +995,8 @@
 				marked,link,last_read,
 				SUBSTRING(last_read,1,19) as last_read_noms,
 				$vfeed_query_part
-				SUBSTRING(updated,1,19) as updated_noms,
-				content
+				$content_query_part
+				SUBSTRING(updated,1,19) as updated_noms
 				FROM
 					ttrss_entries,ttrss_user_entries,ttrss_tags
 				WHERE
diff --git a/tt-rss.css b/tt-rss.css
index 1788515a4..59ff1aea3 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -710,17 +710,22 @@ span.contentPreview:hover {
 	color : #5050aa;
 }
 
-td.hlMarkedPic {
+table.headlinesList td.hlMarkedPic {
 	width : 25px;
 	text-align : center;
 }
 
+table.headlinesList td.hlfeed {
+	text-align : right;
+	font-size : small;
+}
+
 td.hlSelectRow, td.hlUpdatePic {
 	width : 25px;
 	text-align : center;
 }
 
-td.hlUpdated {
+table.headlinesList td.hlUpdated {
 	font-size : small;
 	color : gray;
 	text-align : right;