diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php
index 9a155a00..114da1da 100644
--- a/forumdirectory/forumdirectory.php
+++ b/forumdirectory/forumdirectory.php
@@ -8,6 +8,7 @@
  * Note: Please use Group Directory instead
  */
 
+use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Content\Widget;
@@ -15,8 +16,8 @@ use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Profile;
 use Friendica\Model\User;
-use Friendica\Security\OpenWebAuth;
 
 global $forumdirectory_search;
 
@@ -81,7 +82,7 @@ function forumdirectory_content()
 	$gdirpath = '';
 	$dirurl = DI::config()->get('system', 'directory');
 	if (strlen($dirurl)) {
-		$gdirpath = OpenWebAuth::getZrlUrl($dirurl, true);
+		$gdirpath = Profile::zrl($dirurl, true);
 	}
 
 	$sql_extra = '';
diff --git a/groupdirectory/groupdirectory.php b/groupdirectory/groupdirectory.php
index 615d7024..6d562cdc 100644
--- a/groupdirectory/groupdirectory.php
+++ b/groupdirectory/groupdirectory.php
@@ -13,8 +13,8 @@ use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Profile;
 use Friendica\Model\User;
-use Friendica\Security\OpenWebAuth;
 
 global $groupdirectory_search;
 
@@ -79,7 +79,7 @@ function groupdirectory_content()
 	$gdirpath = '';
 	$dirurl   = DI::config()->get('system', 'directory');
 	if (strlen($dirurl)) {
-		$gdirpath = OpenWebAuth::getZrlUrl($dirurl, true);
+		$gdirpath = Profile::zrl($dirurl, true);
 	}
 
 	$sql_extra = '';
diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index 4056aac6..b513cf36 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -220,11 +220,6 @@ function mailstream_do_images(array &$item, array &$attachments)
 		$cookiejar = tempnam(System::getTempPath(), 'cookiejar-mailstream-');
 		try {
 			$curlResult = DI::httpClient()->fetchFull($url, HttpClientAccept::DEFAULT, 0, $cookiejar);
-			if (!$curlResult->isSuccess()) {
-				Logger::debug('mailstream: fetch image url failed', [
-					'url' => $url, 'item_id' => $item['id'], 'return_code' => $curlResult->getReturnCode()]);
-				continue;
-			}
 		} catch (InvalidArgumentException $e) {
 			Logger::error('mailstream_do_images exception fetching url', ['url' => $url, 'item_id' => $item['id']]);
 			continue;