diff --git a/FindArchiveMail/App.config b/FindArchiveMail/App.config
index 79a1a6f..f56dd94 100644
--- a/FindArchiveMail/App.config
+++ b/FindArchiveMail/App.config
@@ -1,13 +1,21 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
     </startup>
 	<appSettings>
-		<add key="MailFolder" value="C:\Users\khangnt\source\repos\EmailTest"/>
-		<add key="AppName" value="Mail2Go"/>
-		<add key="ChunkSize" value="2"/>
-		<add key="MaxThread" value="24"/>
-		<add key="Version" value="0.0.0.1"/>
+		<add key="MailFolder" value="C:\Users\khangnt\source\repos\EmailTest" />
+		<add key="AppName" value="Mail2Go" />
+		<add key="ChunkSize" value="2" />
+		<add key="MaxThread" value="24" />
+		<add key="Version" value="0.0.0.1" />
 	</appSettings>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="OpenMcdf" publicKeyToken="fdbb1629d7c00800" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.3.0" newVersion="3.1.3.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
\ No newline at end of file
diff --git a/FindArchiveMail/FindArchiveMail.csproj b/FindArchiveMail/FindArchiveMail.csproj
index 15f1193..2975121 100644
--- a/FindArchiveMail/FindArchiveMail.csproj
+++ b/FindArchiveMail/FindArchiveMail.csproj
@@ -45,18 +45,39 @@
     <Reference Include="Lucene.Net, Version=3.0.3.0, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
       <HintPath>..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Bcl.HashCode, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
+      <HintPath>..\packages\Microsoft.Bcl.HashCode.6.0.0\lib\net462\Microsoft.Bcl.HashCode.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="MsgReader, Version=3.7.20.0, Culture=neutral, PublicKeyToken=3ba01cf3434959fa, processorArchitecture=MSIL">
       <HintPath>..\packages\MsgReader.3.7.20\lib\net45\MsgReader.dll</HintPath>
     </Reference>
-    <Reference Include="OpenMcdf, Version=2.2.1.4, Culture=neutral, PublicKeyToken=fdbb1629d7c00800, processorArchitecture=MSIL">
-      <HintPath>..\packages\OpenMcdf.2.2.1.4\lib\net40\OpenMcdf.dll</HintPath>
+    <Reference Include="OpenMcdf, Version=3.1.3.0, Culture=neutral, PublicKeyToken=fdbb1629d7c00800">
+      <HintPath>..\packages\OpenMcdf.3.1.3\lib\netstandard2.0\OpenMcdf.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="RtfPipe, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b1b83b274d7d862f, processorArchitecture=MSIL">
       <HintPath>..\packages\MsgReader.3.7.20\lib\net45\RtfPipe.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
+      <HintPath>..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
+      <HintPath>..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Security" />
     <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
diff --git a/FindArchiveMail/packages.config b/FindArchiveMail/packages.config
index 9557222..e2a8fca 100644
--- a/FindArchiveMail/packages.config
+++ b/FindArchiveMail/packages.config
@@ -2,7 +2,12 @@
 <packages>
   <package id="ADGV" version="0.1.0.10" targetFramework="net472" />
   <package id="Lucene.Net" version="3.0.3" targetFramework="net472" />
+  <package id="Microsoft.Bcl.HashCode" version="6.0.0" targetFramework="net472" />
   <package id="MsgReader" version="3.7.20" targetFramework="net472" />
-  <package id="OpenMcdf" version="2.2.1.4" targetFramework="net472" />
+  <package id="OpenMcdf" version="3.1.3" targetFramework="net472" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net472" />
+  <package id="System.Buffers" version="4.6.1" targetFramework="net472" />
+  <package id="System.Memory" version="4.6.3" targetFramework="net472" />
+  <package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" targetFramework="net472" />
 </packages>
\ No newline at end of file