From 8110fab096e2293e523602836a4aa872378a1e86 Mon Sep 17 00:00:00 2001
From: Patrick Simpson <p.simpson@etosis.com>
Date: Wed, 24 May 2017 17:02:38 +0200
Subject: [PATCH] [KOE-23] Added MimeKit (https://github.com/jstedfast/MimeKit,
 MIT licensed) to properly parse RFC2047 headers in BCC fields

---
 .../AcaciaZPushPlugin/AcaciaZPushPlugin.csproj             | 7 ++++++-
 .../AcaciaZPushPlugin/Utils/StringUtil.cs                  | 4 +---
 src/AcaciaZPushPlugin/AcaciaZPushPlugin/packages.config    | 3 ++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/AcaciaZPushPlugin.csproj b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/AcaciaZPushPlugin.csproj
index 65c08c9..ac56f78 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/AcaciaZPushPlugin.csproj
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/AcaciaZPushPlugin.csproj
@@ -137,8 +137,12 @@
       <HintPath>..\packages\Heijden.Dns.2.0.0\lib\net35\Heijden.Dns.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="MimeKitLite, Version=1.16.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
+      <HintPath>..\packages\MimeKitLite.1.16.1\lib\net451\MimeKitLite.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.1\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.9\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="PresentationCore" />
@@ -147,6 +151,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Net.Http" />
+    <Reference Include="System.Security" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Windows.Forms" />
diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Utils/StringUtil.cs b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Utils/StringUtil.cs
index 6801f7c..aadf931 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Utils/StringUtil.cs
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Utils/StringUtil.cs
@@ -176,9 +176,7 @@ namespace Acacia.Utils
 
         public static string DecodeQuotedPrintable(this string _this)
         {
-            return ReplaceStringTokens(_this, "=?", "?=", (token) =>
-                System.Net.Mail.Attachment.CreateAttachmentFromString("", "=?" + token + "?=").Name
-            );
+            return MimeKit.Utils.Rfc2047.DecodeText(Encoding.UTF8.GetBytes(_this));
         }
 
     }
diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/packages.config b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/packages.config
index 39929b3..218cd6a 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/packages.config
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Heijden.Dns" version="2.0.0" targetFramework="net452" />
-  <package id="NLog" version="4.4.1" targetFramework="net452" />
+  <package id="MimeKitLite" version="1.16.1" targetFramework="net452" />
+  <package id="NLog" version="4.4.9" targetFramework="net452" />
 </packages>
\ No newline at end of file