diff --git a/fbpost/fbpost.php b/fbpost/fbpost.php
index 1167376a8..be9fc2902 100644
--- a/fbpost/fbpost.php
+++ b/fbpost/fbpost.php
@@ -529,40 +529,6 @@ function fbpost_post_hook(&$a,&$b) {
 				// if($b['verb'] == ACTIVITY_DISLIKE)
 				//	$msg = trim(strip_tags(bbcode($msg)));
 
-				// Old code
-				/*$search_str = $a->get_baseurl() . '/search';
-
-				if(preg_match("/\[url=(.*?)\](.*?)\[\/url\]/is",$msg,$matches)) {
-
-					// don't use hashtags for message link
-
-					if(strpos($matches[2],$search_str) === false) {
-						$link = $matches[1];
-						if(substr($matches[2],0,5) != '[img]')
-							$linkname = $matches[2];
-					}
-				}
-
-				// strip tag links to avoid link clutter, this really should be 
-				// configurable because we're losing information
-
-				$msg = preg_replace("/\#\[url=(.*?)\](.*?)\[\/url\]/is",'#$2',$msg);
-
-				// provide the link separately for normal links
-				$msg = preg_replace("/\[url=(.*?)\](.*?)\[\/url\]/is",'$2 $1',$msg);
-
-				if(preg_match("/\[img\](.*?)\[\/img\]/is",$msg,$matches))
-					$image = $matches[1];
-
-				$msg = preg_replace("/\[img\](.*?)\[\/img\]/is", t('Image: ') . '$1', $msg);
-
-				if((strpos($link,z_root()) !== false) && (! $image))
-					$image = $a->get_baseurl() . '/images/friendica-64.jpg';
-
-				$msg = trim(strip_tags(bbcode($msg)));*/
-
-				// New code
-
 				// Looking for the first image
 				$image = '';
 				if(preg_match("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/is",$b['body'],$matches))
diff --git a/wppost/wppost.php b/wppost/wppost.php
index b0c3dd91f..a6574cc2f 100755
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -189,7 +189,7 @@ function wppost_send(&$a,&$b) {
 
 			// If no bookmark is found then take the first line
 			if ($wptitle == '') {
-				$title = html2plain(bbcode($b['body']), 0, true)."\n";
+				$title = html2plain(bbcode($b['body'], false, false), 0, true)."\n";
 				$pos = strpos($title, "\n");
 				$trailer = "";
 				if (($pos == 0) or ($pos > 100)) {
@@ -202,11 +202,17 @@ function wppost_send(&$a,&$b) {
 		}
 
 		$title = '<title>' . (($wptitle) ? $wptitle : t('Post from Friendica')) . '</title>';
-		$post = $title . bbcode($b['body']);
+		$post = bbcode($b['body'], false, false);
+
+		// If a link goes to youtube then remove the stuff around it. Wordpress detects youtube links and embeds it
+		$post = preg_replace('/<a.*?href="(https?:\/\/www.youtube.com\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$post);
+		$post = preg_replace('/<a.*?href="(https?:\/\/youtu.be\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$post);
+
+		$post = $title.$post;
 
 		$wp_backlink = intval(get_pconfig($b['uid'],'wppost','backlink'));
 		if($wp_backlink && $b['plink'])
-			$post .= EOL . EOL . '<a href="' . $b['plink'] . '">' 
+			$post .= EOL . EOL . '<a href="' . $b['plink'] . '">'
 				. t('Read the original post and comment stream on Friendica') . '</a>' . EOL . EOL;
 
 		$post = xmlify($post);