diff --git a/classes/api.php b/classes/api.php
index e3fcc8d3d..8e279521a 100644
--- a/classes/api.php
+++ b/classes/api.php
@@ -642,7 +642,7 @@ class API extends Handler {
 			$headlines = array();
 
 			while ($line = db_fetch_assoc($result)) {
-				$line["content_preview"] = truncate_string(strip_tags($line["content_preview"]), 100);
+				$line["content_preview"] = truncate_string(strip_tags($line["content"]), 100);
 				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
 					$line = $p->hook_query_headlines($line, 100, true);
 				}
diff --git a/classes/feeds.php b/classes/feeds.php
index 2c17a2257..5fc75cb2f 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -292,7 +292,7 @@ class Feeds extends Handler_Protected {
 			$expand_cdm = get_pref('CDM_EXPANDED');
 
 			while ($line = $this->dbh->fetch_assoc($result)) {
-				$line["content_preview"] =  "— " . truncate_string(strip_tags($line["content_preview"]), 250);
+				$line["content_preview"] =  "— " . truncate_string(strip_tags($line["content"]), 250);
 
 				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
 					$line = $p->hook_query_headlines($line, 250, false);
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 86e58fd68..037e6bf0f 100644
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -91,7 +91,7 @@ class Handler_Public extends Handler {
 
 			$tpl->setVariable('SELF_URL', htmlspecialchars(get_self_url_prefix()), true);
 			while ($line = $this->dbh->fetch_assoc($result)) {
-				$line["content_preview"] = truncate_string(strip_tags($line["content_preview"]), 100, '...');
+				$line["content_preview"] = truncate_string(strip_tags($line["content"]), 100, '...');
 
 				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
 					$line = $p->hook_query_headlines($line);
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 87e63cc2d..43da6d04d 100644
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -97,7 +97,7 @@ class Pref_Filters extends Handler_Protected {
 		print "<table width=\"100%\" cellspacing=\"0\" id=\"prefErrorFeedList\">";
 
 		while ($line = $this->dbh->fetch_assoc($result)) {
-			$line["content_preview"] = truncate_string(strip_tags($line["content_preview"]), 100, '...');
+			$line["content_preview"] = truncate_string(strip_tags($line["content"]), 100, '...');
 
 			foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
 					$line = $p->hook_query_headlines($line, 100);
diff --git a/include/functions.php b/include/functions.php
index 28a51b232..f7e910ad3 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2651,7 +2651,7 @@
 			}
 
 
-			$content_query_part = "content, content AS content_preview, ";
+			$content_query_part = "content, ";
 
 
 			if (is_numeric($feed)) {