X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FEmailer.php;h=5e4d98d4c9e83e18ca46ebac609dd7e7d1b76658;hb=39a5bfc0c0ea3777b63adb57a7d6cb4b40a70e86;hp=1341aaf33e42b0de3fd933b3767a04ff4dac4564;hpb=e56a53647bd5469551bf4f9ef2df50a5dd16b943;p=friendica.git

diff --git a/src/Util/Emailer.php b/src/Util/Emailer.php
index 1341aaf33e..5e4d98d4c9 100644
--- a/src/Util/Emailer.php
+++ b/src/Util/Emailer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -65,7 +65,7 @@ class Emailer
 
 		$this->siteEmailAddress = $this->config->get('config', 'sender_email');
 		if (empty($this->siteEmailAddress)) {
-			$hostname = $this->baseUrl->getHostname();
+			$hostname = $this->baseUrl->getHost();
 			if (strpos($hostname, ':')) {
 				$hostname = substr($hostname, 0, strpos($hostname, ':'));
 			}
@@ -141,7 +141,7 @@ class Emailer
 				$countMessageId += count($value);
 			}
 		}
-		if ($countMessageId > 0) {
+		if ($countMessageId > 1) {
 			$this->logger->warning('More than one Message-ID found - RFC violation', ['email' => $email]);
 		}
 
@@ -163,9 +163,9 @@ class Emailer
 
 		// generate a multipart/alternative message header
 		$messageHeader = $email->getAdditionalMailHeaderString() .
-		                 "From: $fromName <{$fromAddress}>\n" .
-		                 "Reply-To: $fromName <{$replyTo}>\n" .
-		                 "MIME-Version: 1.0\n" .
+		                 "From: $fromName <{$fromAddress}>\r\n" .
+		                 "Reply-To: $fromName <{$replyTo}>\r\n" .
+		                 "MIME-Version: 1.0\r\n" .
 		                 "Content-Type: multipart/alternative; boundary=\"{$mimeBoundary}\"";
 
 		// assemble the final multipart message body with the text and html types included