X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FMail.php;h=75515c5df53c8166e5d0240ea570a4120f6525cf;hb=235eab0d99891eb1d0bf401856dfb162c6f1ea20;hp=7b18ac3c3144f8507150d9af63a2d0336fec6335;hpb=4495e83eca67986ecbd5e083509c782116d77c6c;p=friendica.git

diff --git a/src/Model/Mail.php b/src/Model/Mail.php
index 7b18ac3c31..75515c5df5 100644
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -74,9 +74,7 @@ class Mail
 			return false;
 		}
 
-		if ($msg['reply']) {
-			$reply = DBA::selectFirst('mail', ['uri', 'uri-id'], ['parent-uri' => $msg['parent-uri'], 'reply' => false]);
-
+		if ($msg['reply'] && DBA::isResult($reply = DBA::selectFirst('mail', ['uri', 'uri-id'], ['parent-uri' => $msg['parent-uri'], 'reply' => false]))) {
 			$msg['thr-parent']    = $reply['uri'];
 			$msg['thr-parent-id'] = $reply['uri-id'];
 		} else {
@@ -173,7 +171,7 @@ class Mail
 			$recip_host = substr($recip_host, 0, strpos($recip_host, '/'));
 
 			$recip_handle = (($contact['addr']) ? $contact['addr'] : $contact['nick'] . '@' . $recip_host);
-			$sender_handle = $a->getUserNickname() . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
+			$sender_handle = $a->getLoggedInUserNickname() . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
 
 			$conv_guid = System::createUUID();
 			$convuri = $recip_handle . ':' . $conv_guid;