From 8a6f22b04c7f3a336d22cb179d1caf87cbb22bd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Thu, 23 May 2019 13:37:04 +0200 Subject: [PATCH] Fix smtp envelop coding for mail notifications --- mailnotification/smtpclient.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/mailnotification/smtpclient.cpp b/mailnotification/smtpclient.cpp index 8be95602..d6769aef 100644 --- a/mailnotification/smtpclient.cpp +++ b/mailnotification/smtpclient.cpp @@ -312,17 +312,18 @@ void SmtpClient::sendEmailInternally(const Message &message) m_messageData.clear(); // Create plain message content - m_messageData = "To: " + m_rcpt + "\n"; - m_messageData.append("From: " + m_sender + "\n"); - m_messageData.append("Subject: " + message.subject + "\n"); - m_messageData.append("Date: " + createDateString() + "\n"); - m_messageData.append("Content-Type: text/plain; charset=\"UTF-8\"\n"); - m_messageData.append("Content-Transfer-Encoding: quoted-printable\n"); - m_messageData.append("MIME-Version: 1.0\n"); - m_messageData.append("X-Mailer: nymea;\n"); + m_messageData = "To: " + m_rcpt + "\r\n"; + m_messageData.append("From: " + m_sender + "\r\n"); + m_messageData.append("Subject: " + message.subject + "\r\n"); + m_messageData.append("Date: " + createDateString() + "\r\n"); + m_messageData.append("Content-Type: text/plain; charset=\"UTF-8\"\r\n"); + m_messageData.append("Content-Transfer-Encoding: quoted-printable\r\n"); + m_messageData.append("MIME-Version: 1.0\r\n"); + m_messageData.append("X-Mailer: nymea;\r\n"); + m_messageData.append("\r\n"); m_messageData.append(message.body); - m_messageData.replace( QString::fromLatin1( "\n" ), QString::fromLatin1( "\r\n" ) ); - m_messageData.replace( QString::fromLatin1( "\r\n.\r\n" ), QString::fromLatin1( "\r\n..\r\n" ) ); + //m_messageData.replace(QString::fromLatin1("\n"), QString::fromLatin1("\r\n")); + //m_messageData.replace(QString::fromLatin1("\r\n.\r\n"), QString::fromLatin1("\r\n..\r\n")); m_messageData.append("\r\n.\r\n"); setState(StateInitialize);