diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index f5bb7f42..0fd1fd79 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -897,7 +897,7 @@ function statusnet_fetchtimeline(App $a, $uid)
 
 				$_REQUEST["title"] = "";
 
-				$_REQUEST["body"] = PageInfo::appendToBody($post->text, true);
+				$_REQUEST["body"] = PageInfo::searchAndAppendToBody($post->text, true);
 				if (is_string($post->place->name)) {
 					$_REQUEST["location"] = $post->place->name;
 				}
diff --git a/twitter/twitter.php b/twitter/twitter.php
index d374f1c3..948bb6be 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -1365,11 +1365,11 @@ function twitter_expand_entities($body, stdClass $status, $picture)
 		} elseif ($picture) {
 			$body .= "\n\n[img]" . $picture . "[/img]\n";
 		} else {
-			$body = PageInfo::appendToBody($body);
+			$body = PageInfo::searchAndAppendToBody($body);
 		}
 	}
 
-	return ['body' => $body, 'plain' => $plain, 'taglist' => $taglist];
+	return ['body' => $body, 'plain' => trim($plain), 'taglist' => $taglist];
 }
 
 /**