Merge pull request #12390 from annando/fixes

[friendica.git] / src / Util / Emailer.php

diff --git a/src/Util/Emailer.php b/src/Util/Emailer.php
index 1341aaf33e42b0de3fd933b3767a04ff4dac4564..81a2ac268872a863a717cd51ba9c084d4331b33d 100644 (file)
--- a/src/Util/Emailer.php
+++ b/src/Util/Emailer.php
@@ -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