diff --git a/Wino.Core/Extensions/OutlookIntegratorExtensions.cs b/Wino.Core/Extensions/OutlookIntegratorExtensions.cs
index bd4ff3c9..6d02f20f 100644
--- a/Wino.Core/Extensions/OutlookIntegratorExtensions.cs
+++ b/Wino.Core/Extensions/OutlookIntegratorExtensions.cs
@@ -191,15 +191,12 @@ namespace Wino.Core.Extensions
             {
                 if (!headersToIgnore.Contains(header.Field))
                 {
-                    if (headersToModify.Contains(header.Field))
-                    {
-                        headers.Add(new InternetMessageHeader() { Name = $"X-{header.Field}", Value = header.Value });
-                    }
-                    else
-                    {
-                        headers.Add(new InternetMessageHeader() { Name = header.Field, Value = header.Value });
-                    }
+                    var headerName = headersToModify.Contains(header.Field) ? $"X-{header.Field}" : header.Field;
 
+                    // No header value should exceed 995 characters.
+                    var headerValue = header.Value.Length >= 995 ? header.Value.Substring(0, 995) : header.Value;
+
+                    headers.Add(new InternetMessageHeader() { Name = headerName, Value = headerValue });
                     includedHeaderCount++;
                 }
 
diff --git a/Wino.Packaging/Package.appxmanifest b/Wino.Packaging/Package.appxmanifest
index 9f1d71ac..96e89796 100644
--- a/Wino.Packaging/Package.appxmanifest
+++ b/Wino.Packaging/Package.appxmanifest
@@ -11,7 +11,7 @@
 	<Identity
 	  Name="58272BurakKSE.WinoMailPreview"
 	  Publisher="CN=51FBDAF3-E212-4149-89A2-A2636B3BC911"
-	  Version="1.8.4.0" />
+	  Version="1.8.5.0" />
 	
 	<Extensions>
 		<!-- Publisher Cache Folders -->