diff --git a/wppost/wppost.php b/wppost/wppost.php
index 264a342c..28e4e369 100755
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -168,6 +168,24 @@ function wppost_send(&$a,&$b) {
 	if($wp_username && $wp_password && $wp_blog) {
 
 		require_once('include/bbcode.php');
+		require_once('include/html2plain.php');
+
+		// If the title is empty then try to guess
+		if ($b['title'] == '') {
+			// Take the description from the bookmark
+			if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches))
+				$b['title'] = $matches[2];
+
+			// If no bookmark is found then take the first line
+			if ($b['title'] == '') {
+				$title = html2plain(bbcode($b['body']), 0, true);
+				$pos = strpos($title, "\n");
+				if (($pos == 0) or ($pos > 60))
+					$pos = 60;
+
+				$b['title'] = substr($title, 0, $pos);
+			}
+		}
 
 		$title = '<title>' . (($b['title']) ? $b['title'] : t('Post from Friendica')) . '</title>';
 		$post = $title . bbcode($b['body']);