diff --git a/boot.php b/boot.php
index 683daf4016..2f2e28cebd 100755
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1298' );
+define ( 'FRIENDICA_VERSION',      '2.3.1299' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1134      );
 
diff --git a/include/items.php b/include/items.php
index 8f8b3ccd00..ee69605349 100755
--- a/include/items.php
+++ b/include/items.php
@@ -435,8 +435,15 @@ function get_atom_elements($feed,$item) {
 
 		$res['body'] = @html2bbcode($res['body']);
 	}
-//	else
-//		$res['body'] = escape_tags($res['body']);
+	elseif(! $have_real_body) {
+
+		// it's not one of our messages and it has no tags
+		// so it's probably just text. We'll escape it just to be safe.
+
+		$res['body'] = escape_tags($res['body']);
+	}
+
+	// this tag is obsolete but we keep it for really old sites
 
 	$allow = $item->get_item_tags(NAMESPACE_DFRN,'comment-allow');
 	if($allow && $allow[0]['data'] == 1)