diff --git a/src/Content/Text/HTML.php b/src/Content/Text/HTML.php
index 5ad66e85ea..fd4a4b1d24 100644
--- a/src/Content/Text/HTML.php
+++ b/src/Content/Text/HTML.php
@@ -302,6 +302,7 @@ class HTML
 			self::tagToBBCode($doc, 'a', ['href' => '/(.+)/'], '[url=$1]', '[/url]');
 
 			self::tagToBBCode($doc, 'img', ['src' => '/(.+)/', 'alt' => '/(.+)/'], '[img=$1]$2', '[/img]', true);
+			self::tagToBBCode($doc, 'img', ['src' => '/(.+)/', 'title' => '/(.+)/'], '[img=$1]$2', '[/img]', true);
 			self::tagToBBCode($doc, 'img', ['src' => '/(.+)/', 'width' => '/(\d+)/', 'height' => '/(\d+)/'], '[img=$2x$3]$1', '[/img]', true);
 			self::tagToBBCode($doc, 'img', ['src' => '/(.+)/'], '[img]$1', '[/img]', true);
 
diff --git a/src/Model/GServer.php b/src/Model/GServer.php
index e40442384a..060aa77dbf 100644
--- a/src/Model/GServer.php
+++ b/src/Model/GServer.php
@@ -2207,7 +2207,7 @@ class GServer
 	 */
 	private static function analyseRootBody($curlResult, array $serverdata): array
 	{
-		if (empty($curlResult->getBody())) {
+		if (empty($curlResult->getBodyString())) {
 			return $serverdata;
 		}
 
@@ -2220,7 +2220,7 @@ class GServer
 		$platforms = array_merge($ap_platforms, $dfrn_platforms, $zap_platforms, $platforms);
 
 		$doc = new DOMDocument();
-		@$doc->loadHTML($curlResult->getBody());
+		@$doc->loadHTML($curlResult->getBodyString());
 		$xpath = new DOMXPath($doc);
 		$assigned = false;