diff --git a/buffer/buffer.php b/buffer/buffer.php
index 27e54f55..f41ecf97 100644
--- a/buffer/buffer.php
+++ b/buffer/buffer.php
@@ -13,7 +13,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
-use Friendica\Model\Item;
+use Friendica\Model\ItemContent;
 
 function buffer_install() {
 	Addon::registerHook('post_local',           'addon/buffer/buffer.php', 'buffer_post_local');
@@ -338,7 +338,7 @@ function buffer_send(App $a, &$b)
 					$item["body"] = preg_replace("(\[s\](.*?)\[\/s\])ism",'-$1-',$item["body"]);
 				}
 
-				$post = Item::getPlaintextPost($item, $limit, $includedlinks, $htmlmode);
+				$post = ItemContent::getPlaintextPost($item, $limit, $includedlinks, $htmlmode);
 				logger("buffer_send: converted message ".$b["id"]." result: ".print_r($post, true), LOGGER_DEBUG);
 
 				// The image proxy is used as a sanitizer. Buffer seems to be really picky about pictures
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 09254f7f..8cc5caa8 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -41,7 +41,6 @@ require_once 'include/enotify.php';
 use CodebirdSN\CodebirdSN;
 use Friendica\App;
 use Friendica\Content\OEmbed;
-use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Addon;
@@ -51,6 +50,7 @@ use Friendica\Core\PConfig;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
+use Friendica\Model\ItemContent;
 use Friendica\Model\Photo;
 use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
@@ -550,7 +550,7 @@ function statusnet_post_hook(App $a, &$b)
 		PConfig::set($b['uid'], 'statusnet', 'max_char', $max_char);
 
 		$tempfile = "";
-		$msgarr = Item::getPlaintextPost($b, $max_char, true, 7);
+		$msgarr = ItemContent::getPlaintextPost($b, $max_char, true, 7);
 		$msg = $msgarr["text"];
 
 		if (($msg == "") && isset($msgarr["title"]))
@@ -709,7 +709,7 @@ function statusnet_prepare_body(App $a, &$b)
 			}
 		}
 
-		$msgarr = Item::getPlaintextPost($item, $max_char, true, 7);
+		$msgarr = ItemContent::getPlaintextPost($item, $max_char, true, 7);
 		$msg = $msgarr["text"];
 
 		if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {
diff --git a/twitter/twitter.php b/twitter/twitter.php
index c76ecf0c..5474fa5e 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -63,7 +63,6 @@
 use Abraham\TwitterOAuth\TwitterOAuth;
 use Friendica\App;
 use Friendica\Content\OEmbed;
-use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
@@ -73,6 +72,7 @@ use Friendica\Core\Worker;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
+use Friendica\Model\ItemContent;
 use Friendica\Model\Photo;
 use Friendica\Model\Queue;
 use Friendica\Model\User;
@@ -532,7 +532,7 @@ function twitter_post_hook(App $a, &$b)
 		$connection->setTimeouts(10, 30);
 
 		$max_char = 280;
-		$msgarr = Item::getPlaintextPost($b, $max_char, true, 8);
+		$msgarr = ItemContent::getPlaintextPost($b, $max_char, true, 8);
 		$msg = $msgarr["text"];
 
 		if (($msg == "") && isset($msgarr["title"])) {
@@ -766,7 +766,7 @@ function twitter_prepare_body(App $a, &$b)
 			}
 		}
 
-		$msgarr = Item::getPlaintextPost($item, $max_char, true, 8);
+		$msgarr = ItemContent::getPlaintextPost($item, $max_char, true, 8);
 		$msg = $msgarr["text"];
 
 		if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {