diff --git a/fbpost/fbpost.php b/fbpost/fbpost.php
index 51bed7ebb..bef8117e5 100644
--- a/fbpost/fbpost.php
+++ b/fbpost/fbpost.php
@@ -1078,8 +1078,8 @@ function fbpost_fetchwall($a, $uid) {
 
 		// Only import the picture when the message is no video
 		// oembed display a picture of the video as well
-		//if ($item->type != "video") {
-		if (($item->type != "video") and ($item->type != "photo")) {
+		if ($item->type != "video") {
+		//if (($item->type != "video") and ($item->type != "photo")) {
 			if(isset($item->picture) && isset($item->link))
 				$_REQUEST["body"] .= "\n".'[url='.$item->link.'][img]'.fpost_cleanpicture($item->picture).'[/img][/url]';
 			else {
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index b5d55ed7c..6a00d3df8 100755
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -448,6 +448,20 @@ function statusnet_shortenmsg($b, $max_char) {
 	if ($b["title"] != "")
 		$body = $b["title"]."\n\n".$body;
 
+	if (strpos($body, "[bookmark") !== false) {
+		// splitting the text in two parts:
+		// before and after the bookmark
+		$pos = strpos($body, "[bookmark");
+		$body1 = substr($body, 0, $pos);
+		$body2 = substr($body, $pos);
+
+		// Removing all quotes after the bookmark
+		// they are mostly only the content after the bookmark.
+		$body2 = preg_replace("/\[quote\=([^\]]*)\](.*?)\[\/quote\]/ism",'',$body2);
+		$body2 = preg_replace("/\[quote\](.*?)\[\/quote\]/ism",'',$body2);
+		$body = $body1.$body2;
+	}
+
 	// Add some newlines so that the message could be cut better
 	$body = str_replace(array("[quote", "[bookmark", "[/bookmark]", "[/quote]"),
 				array("\n[quote", "\n[bookmark", "[/bookmark]\n", "[/quote]\n"), $body);
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 2be686b30..26c684f14 100755
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -306,6 +306,20 @@ function twitter_shortenmsg($b) {
 	if ($b["title"] != "")
 		$body = $b["title"]."\n\n".$body;
 
+	if (strpos($body, "[bookmark") !== false) {
+		// splitting the text in two parts:
+		// before and after the bookmark
+		$pos = strpos($body, "[bookmark");
+		$body1 = substr($body, 0, $pos);
+		$body2 = substr($body, $pos);
+
+		// Removing all quotes after the bookmark
+		// they are mostly only the content after the bookmark.
+		$body2 = preg_replace("/\[quote\=([^\]]*)\](.*?)\[\/quote\]/ism",'',$body2);
+		$body2 = preg_replace("/\[quote\](.*?)\[\/quote\]/ism",'',$body2);
+		$body = $body1.$body2;
+	}
+
 	// Add some newlines so that the message could be cut better
 	$body = str_replace(array("[quote", "[bookmark", "[/bookmark]", "[/quote]"),
 			array("\n[quote", "\n[bookmark", "[/bookmark]\n", "[/quote]\n"), $body);