diff --git a/boot.php b/boot.php
index b38855f358..61384a4276 100644
--- a/boot.php
+++ b/boot.php
@@ -7,7 +7,7 @@ require_once('include/text.php');
 require_once("include/pgettext.php");
 
 
-define ( 'FRIENDIKA_VERSION',      '2.3.1109' );
+define ( 'FRIENDIKA_VERSION',      '2.3.1110' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1091      );
 
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 5b240bdd24..3d6408bcfe 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -3,30 +3,14 @@
 require_once("include/oembed.php");
 require_once('include/event.php');
 
-
-
+require_once('library/markdown.php');
+require_once('include/html2bbcode.php');
 
 function diaspora2bb($s) {
 
-	// bug #127
-	$s = preg_replace('/\[(.+?)\]\((.+?)[^\\\]_(.+?)\)/','[$1]($2\\_$3)',$s);
-
-
-	$s = str_replace(array('\\**','\\__','\\*','\\_'), array('-^doublestar^-','-^doublescore-^','-^star^-','-^score^-'),$s);
-	$s = preg_replace("/\*\*\*(.+?)\*\*\*/", '[b][i]$1[/i][/b]', $s);
-	$s = preg_replace("/\_\_\_(.+?)\_\_\_/", '[b][i]$1[/i][/b]', $s);
-	$s = preg_replace("/\*\*(.+?)\*\*/", '[b]$1[/b]', $s);
-	$s = preg_replace("/\_\_(.+?)\_\_/", '[b]$1[/b]', $s);
-	$s = preg_replace("/\*(.+?)\*/", '[i]$1[/i]', $s);
-	$s = preg_replace("/\_(.+?)\_/", '[i]$1[/i]', $s);
-
-	$s = str_replace(array('-^doublestar^-','-^doublescore-^','-^star^-','-^score^-'), array('**','__','*','_'), $s);
-	$s = preg_replace('/\!\[(.+?)\]\((.+?)\)/','[img]$2[/img]',$s);
-	$s = preg_replace('/\[(.+?)\]\((.+?)\)/','[url=$2]$1[/url]',$s);
 	$s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s);
-
-
-	$s = escape_tags($s);
+	$s = Markdown($s);
+	$s = html2bbcode($s);
 	return $s;
 
 }
@@ -188,8 +172,7 @@ function bb2diaspora($Text,$preserve_nl = false) {
 
 	$Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&amp\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text);
 
-	$Text = preg_replace('/\[(.*?)\\\\_(.*?)\]\((.*?)\)/ism','[$1_$2]($3)',$Text);
-	$Text = preg_replace('/\[(.*?)\\\\\*(.*?)\]\((.*?)\)/ism','[$1*$2]($3)',$Text);
+	$Text = preg_replace('/\[(.*?)\]\((.*?)\\\\_(.*?)\)/ism','[$1]($2_$3)',$Text);
 	
 	call_hooks('bb2diaspora',$Text);
 
diff --git a/library/markdown.php b/library/markdown.php
index d51dceecaf..343153186a 100644
--- a/library/markdown.php
+++ b/library/markdown.php
@@ -1528,7 +1528,7 @@ class Markdown_Parser {
 				|
 					<\?.*?\?> | <%.*?%>		# processing instruction
 				|
-					<[/!$]?[-a-zA-Z0-9:]+	# regular tags
+					<[/!$]?[-a-zA-Z0-9:_]+	# regular tags
 					(?>
 						\s
 						(?>[^"\'>]+|"[^"]*"|\'[^\']*\')*
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 1555950561..dd07dc318a 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -163,7 +163,7 @@ function initEditor(cb) {
 		if(reply && reply.length) {
 			reply = bin2hex(reply);
 			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
+			$.get('parse_url?binurl=' + reply, function(data) {
 				tinyMCE.execCommand('mceInsertRawHTML',false,data);
 				$('#profile-rotator').hide();
 			});