From 42bac15c1b461333359cdce5aaa94fe1135aa1dc Mon Sep 17 00:00:00 2001
From: Andre Heinecke <aheinecke@intevation.de>
Date: Wed, 25 Nov 2015 11:55:16 +0100
Subject: [PATCH 31/74] Quote comma in from address

As KPIMUtils::normalizeAddressesAndEncodeIdn also handles
multiple comma seperated E-Mail addresses it does not escape
the comma itself.

When we use it for a single email like from here we should make
sure that we escape the comma.
---
 messagecomposer/job/skeletonmessagejob.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/messagecomposer/job/skeletonmessagejob.cpp b/messagecomposer/job/skeletonmessagejob.cpp
index c32bad5047..98201d9a65 100644
--- a/messagecomposer/job/skeletonmessagejob.cpp
+++ b/messagecomposer/job/skeletonmessagejob.cpp
@@ -71,7 +71,10 @@ void SkeletonMessageJobPrivate::doStart()
     {
         KMime::Headers::From *from = new KMime::Headers::From( message );
         KMime::Types::Mailbox address;
-        address.fromUnicodeString( KPIMUtils::normalizeAddressesAndEncodeIdn( infoPart->from() ) );
+        // From is expected to be a single e-mail address and a list of comma seperated
+        // addresses. So we quote the comma here.
+        address.fromUnicodeString( KPIMUtils::normalizeAddressesAndEncodeIdn( infoPart->from().replace( QLatin1String( "," ),
+                                                                                                        QLatin1String( "\\," ) ) ) );
         from->addAddress( address );
         message->setHeader( from );
     }
-- 
2.14.1