Merge branch 'release/6.0.0' into master

ChangemakerStudios · Nov 15, 2021 · 965a347 · 965a347
2 parents b51880d + c4ba509
commit 965a347
Show file tree

Hide file tree

Showing 86 changed files with 1,509 additions and 696 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,4 @@ graphics/
 /tools
 out/
 /.vscode
+*.msi
diff --git a/Papercut.sln b/Papercut.sln
@@ -51,105 +51,148 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AC067042-66BD-4110-ADA1-E2CEA43E7947}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC067042-66BD-4110-ADA1-E2CEA43E7947}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC067042-66BD-4110-ADA1-E2CEA43E7947}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AC067042-66BD-4110-ADA1-E2CEA43E7947}.Debug|x86.Build.0 = Debug|Any CPU
-		{AC067042-66BD-4110-ADA1-E2CEA43E7947}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AC067042-66BD-4110-ADA1-E2CEA43E7947}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AC067042-66BD-4110-ADA1-E2CEA43E7947}.Release|x86.ActiveCfg = Release|Any CPU
-		{AC067042-66BD-4110-ADA1-E2CEA43E7947}.Release|x86.Build.0 = Release|Any CPU
+		{AC067042-66BD-4110-ADA1-E2CEA43E7947}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{AC067042-66BD-4110-ADA1-E2CEA43E7947}.Debug|x64.ActiveCfg = Debug|x64
+		{AC067042-66BD-4110-ADA1-E2CEA43E7947}.Debug|x64.Build.0 = Debug|x64
+		{AC067042-66BD-4110-ADA1-E2CEA43E7947}.Debug|x86.ActiveCfg = Debug|x86
+		{AC067042-66BD-4110-ADA1-E2CEA43E7947}.Debug|x86.Build.0 = Debug|x86
+		{AC067042-66BD-4110-ADA1-E2CEA43E7947}.Release|Any CPU.ActiveCfg = Release|x86
+		{AC067042-66BD-4110-ADA1-E2CEA43E7947}.Release|x64.ActiveCfg = Release|x64
+		{AC067042-66BD-4110-ADA1-E2CEA43E7947}.Release|x64.Build.0 = Release|x64
+		{AC067042-66BD-4110-ADA1-E2CEA43E7947}.Release|x86.ActiveCfg = Release|x86
+		{AC067042-66BD-4110-ADA1-E2CEA43E7947}.Release|x86.Build.0 = Release|x86
 		{EEDD1016-6442-48CE-8F8E-1D350829FBDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EEDD1016-6442-48CE-8F8E-1D350829FBDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EEDD1016-6442-48CE-8F8E-1D350829FBDE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EEDD1016-6442-48CE-8F8E-1D350829FBDE}.Debug|x64.Build.0 = Debug|Any CPU
 		{EEDD1016-6442-48CE-8F8E-1D350829FBDE}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{EEDD1016-6442-48CE-8F8E-1D350829FBDE}.Debug|x86.Build.0 = Debug|Any CPU
 		{EEDD1016-6442-48CE-8F8E-1D350829FBDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EEDD1016-6442-48CE-8F8E-1D350829FBDE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EEDD1016-6442-48CE-8F8E-1D350829FBDE}.Release|x64.ActiveCfg = Release|Any CPU
+		{EEDD1016-6442-48CE-8F8E-1D350829FBDE}.Release|x64.Build.0 = Release|Any CPU
 		{EEDD1016-6442-48CE-8F8E-1D350829FBDE}.Release|x86.ActiveCfg = Release|Any CPU
 		{EEDD1016-6442-48CE-8F8E-1D350829FBDE}.Release|x86.Build.0 = Release|Any CPU
 		{BDDBCFD4-A1BD-4469-ACBD-E676E1723252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BDDBCFD4-A1BD-4469-ACBD-E676E1723252}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BDDBCFD4-A1BD-4469-ACBD-E676E1723252}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BDDBCFD4-A1BD-4469-ACBD-E676E1723252}.Debug|x64.Build.0 = Debug|Any CPU
 		{BDDBCFD4-A1BD-4469-ACBD-E676E1723252}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{BDDBCFD4-A1BD-4469-ACBD-E676E1723252}.Debug|x86.Build.0 = Debug|Any CPU
 		{BDDBCFD4-A1BD-4469-ACBD-E676E1723252}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BDDBCFD4-A1BD-4469-ACBD-E676E1723252}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BDDBCFD4-A1BD-4469-ACBD-E676E1723252}.Release|x64.ActiveCfg = Release|Any CPU
+		{BDDBCFD4-A1BD-4469-ACBD-E676E1723252}.Release|x64.Build.0 = Release|Any CPU
 		{BDDBCFD4-A1BD-4469-ACBD-E676E1723252}.Release|x86.ActiveCfg = Release|Any CPU
 		{BDDBCFD4-A1BD-4469-ACBD-E676E1723252}.Release|x86.Build.0 = Release|Any CPU
 		{CB1F4128-BE3E-42BD-AE04-FCBBE5692E14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CB1F4128-BE3E-42BD-AE04-FCBBE5692E14}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB1F4128-BE3E-42BD-AE04-FCBBE5692E14}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CB1F4128-BE3E-42BD-AE04-FCBBE5692E14}.Debug|x64.Build.0 = Debug|Any CPU
 		{CB1F4128-BE3E-42BD-AE04-FCBBE5692E14}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{CB1F4128-BE3E-42BD-AE04-FCBBE5692E14}.Debug|x86.Build.0 = Debug|Any CPU
 		{CB1F4128-BE3E-42BD-AE04-FCBBE5692E14}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CB1F4128-BE3E-42BD-AE04-FCBBE5692E14}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB1F4128-BE3E-42BD-AE04-FCBBE5692E14}.Release|x64.ActiveCfg = Release|Any CPU
+		{CB1F4128-BE3E-42BD-AE04-FCBBE5692E14}.Release|x64.Build.0 = Release|Any CPU
 		{CB1F4128-BE3E-42BD-AE04-FCBBE5692E14}.Release|x86.ActiveCfg = Release|Any CPU
 		{CB1F4128-BE3E-42BD-AE04-FCBBE5692E14}.Release|x86.Build.0 = Release|Any CPU
 		{5EC90C45-979D-43A5-BA1C-A286DBF4BECA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5EC90C45-979D-43A5-BA1C-A286DBF4BECA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5EC90C45-979D-43A5-BA1C-A286DBF4BECA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5EC90C45-979D-43A5-BA1C-A286DBF4BECA}.Debug|x64.Build.0 = Debug|Any CPU
 		{5EC90C45-979D-43A5-BA1C-A286DBF4BECA}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{5EC90C45-979D-43A5-BA1C-A286DBF4BECA}.Debug|x86.Build.0 = Debug|Any CPU
 		{5EC90C45-979D-43A5-BA1C-A286DBF4BECA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5EC90C45-979D-43A5-BA1C-A286DBF4BECA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5EC90C45-979D-43A5-BA1C-A286DBF4BECA}.Release|x64.ActiveCfg = Release|Any CPU
+		{5EC90C45-979D-43A5-BA1C-A286DBF4BECA}.Release|x64.Build.0 = Release|Any CPU
 		{5EC90C45-979D-43A5-BA1C-A286DBF4BECA}.Release|x86.ActiveCfg = Release|Any CPU
 		{5EC90C45-979D-43A5-BA1C-A286DBF4BECA}.Release|x86.Build.0 = Release|Any CPU
 		{5FA0E4AA-27AF-4801-B6CA-8C97DADD6DA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5FA0E4AA-27AF-4801-B6CA-8C97DADD6DA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5FA0E4AA-27AF-4801-B6CA-8C97DADD6DA6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5FA0E4AA-27AF-4801-B6CA-8C97DADD6DA6}.Debug|x64.Build.0 = Debug|Any CPU
 		{5FA0E4AA-27AF-4801-B6CA-8C97DADD6DA6}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{5FA0E4AA-27AF-4801-B6CA-8C97DADD6DA6}.Debug|x86.Build.0 = Debug|Any CPU
 		{5FA0E4AA-27AF-4801-B6CA-8C97DADD6DA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5FA0E4AA-27AF-4801-B6CA-8C97DADD6DA6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5FA0E4AA-27AF-4801-B6CA-8C97DADD6DA6}.Release|x64.ActiveCfg = Release|Any CPU
+		{5FA0E4AA-27AF-4801-B6CA-8C97DADD6DA6}.Release|x64.Build.0 = Release|Any CPU
 		{5FA0E4AA-27AF-4801-B6CA-8C97DADD6DA6}.Release|x86.ActiveCfg = Release|Any CPU
 		{5FA0E4AA-27AF-4801-B6CA-8C97DADD6DA6}.Release|x86.Build.0 = Release|Any CPU
 		{A1C924F3-3CFB-4844-B79F-8BFFEC60EEBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A1C924F3-3CFB-4844-B79F-8BFFEC60EEBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1C924F3-3CFB-4844-B79F-8BFFEC60EEBF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A1C924F3-3CFB-4844-B79F-8BFFEC60EEBF}.Debug|x64.Build.0 = Debug|Any CPU
 		{A1C924F3-3CFB-4844-B79F-8BFFEC60EEBF}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{A1C924F3-3CFB-4844-B79F-8BFFEC60EEBF}.Debug|x86.Build.0 = Debug|Any CPU
 		{A1C924F3-3CFB-4844-B79F-8BFFEC60EEBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A1C924F3-3CFB-4844-B79F-8BFFEC60EEBF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A1C924F3-3CFB-4844-B79F-8BFFEC60EEBF}.Release|x64.ActiveCfg = Release|Any CPU
+		{A1C924F3-3CFB-4844-B79F-8BFFEC60EEBF}.Release|x64.Build.0 = Release|Any CPU
 		{A1C924F3-3CFB-4844-B79F-8BFFEC60EEBF}.Release|x86.ActiveCfg = Release|Any CPU
 		{A1C924F3-3CFB-4844-B79F-8BFFEC60EEBF}.Release|x86.Build.0 = Release|Any CPU
 		{9EA3D96F-4B03-404D-BD2D-EBE12C1C1FFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9EA3D96F-4B03-404D-BD2D-EBE12C1C1FFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9EA3D96F-4B03-404D-BD2D-EBE12C1C1FFA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9EA3D96F-4B03-404D-BD2D-EBE12C1C1FFA}.Debug|x64.Build.0 = Debug|Any CPU
 		{9EA3D96F-4B03-404D-BD2D-EBE12C1C1FFA}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{9EA3D96F-4B03-404D-BD2D-EBE12C1C1FFA}.Debug|x86.Build.0 = Debug|Any CPU
 		{9EA3D96F-4B03-404D-BD2D-EBE12C1C1FFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9EA3D96F-4B03-404D-BD2D-EBE12C1C1FFA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9EA3D96F-4B03-404D-BD2D-EBE12C1C1FFA}.Release|x64.ActiveCfg = Release|Any CPU
+		{9EA3D96F-4B03-404D-BD2D-EBE12C1C1FFA}.Release|x64.Build.0 = Release|Any CPU
 		{9EA3D96F-4B03-404D-BD2D-EBE12C1C1FFA}.Release|x86.ActiveCfg = Release|Any CPU
 		{9EA3D96F-4B03-404D-BD2D-EBE12C1C1FFA}.Release|x86.Build.0 = Release|Any CPU
 		{BE653826-1E09-4905-B03D-2A68633BE2F8}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{BE653826-1E09-4905-B03D-2A68633BE2F8}.Debug|Any CPU.Build.0 = Debug|x86
+		{BE653826-1E09-4905-B03D-2A68633BE2F8}.Debug|x64.ActiveCfg = Debug|x64
+		{BE653826-1E09-4905-B03D-2A68633BE2F8}.Debug|x64.Build.0 = Debug|x64
 		{BE653826-1E09-4905-B03D-2A68633BE2F8}.Debug|x86.ActiveCfg = Debug|x86
 		{BE653826-1E09-4905-B03D-2A68633BE2F8}.Debug|x86.Build.0 = Debug|x86
 		{BE653826-1E09-4905-B03D-2A68633BE2F8}.Release|Any CPU.ActiveCfg = Release|x86
-		{BE653826-1E09-4905-B03D-2A68633BE2F8}.Release|Any CPU.Build.0 = Release|x86
+		{BE653826-1E09-4905-B03D-2A68633BE2F8}.Release|x64.ActiveCfg = Release|x64
+		{BE653826-1E09-4905-B03D-2A68633BE2F8}.Release|x64.Build.0 = Release|x64
 		{BE653826-1E09-4905-B03D-2A68633BE2F8}.Release|x86.ActiveCfg = Release|x86
 		{BE653826-1E09-4905-B03D-2A68633BE2F8}.Release|x86.Build.0 = Release|x86
 		{72719C72-122E-4313-8A57-0A0FC666BA75}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{72719C72-122E-4313-8A57-0A0FC666BA75}.Debug|Any CPU.Build.0 = Debug|x86
+		{72719C72-122E-4313-8A57-0A0FC666BA75}.Debug|x64.ActiveCfg = Debug|x64
+		{72719C72-122E-4313-8A57-0A0FC666BA75}.Debug|x64.Build.0 = Debug|x64
 		{72719C72-122E-4313-8A57-0A0FC666BA75}.Debug|x86.ActiveCfg = Debug|x86
 		{72719C72-122E-4313-8A57-0A0FC666BA75}.Debug|x86.Build.0 = Debug|x86
 		{72719C72-122E-4313-8A57-0A0FC666BA75}.Release|Any CPU.ActiveCfg = Release|x86
-		{72719C72-122E-4313-8A57-0A0FC666BA75}.Release|Any CPU.Build.0 = Release|x86
+		{72719C72-122E-4313-8A57-0A0FC666BA75}.Release|x64.ActiveCfg = Release|x64
+		{72719C72-122E-4313-8A57-0A0FC666BA75}.Release|x64.Build.0 = Release|x64
 		{72719C72-122E-4313-8A57-0A0FC666BA75}.Release|x86.ActiveCfg = Release|x86
 		{72719C72-122E-4313-8A57-0A0FC666BA75}.Release|x86.Build.0 = Release|x86
 		{873EC485-8E94-4877-8EA7-A7DFE7612E0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{873EC485-8E94-4877-8EA7-A7DFE7612E0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{873EC485-8E94-4877-8EA7-A7DFE7612E0A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{873EC485-8E94-4877-8EA7-A7DFE7612E0A}.Debug|x64.Build.0 = Debug|Any CPU
 		{873EC485-8E94-4877-8EA7-A7DFE7612E0A}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{873EC485-8E94-4877-8EA7-A7DFE7612E0A}.Debug|x86.Build.0 = Debug|Any CPU
 		{873EC485-8E94-4877-8EA7-A7DFE7612E0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{873EC485-8E94-4877-8EA7-A7DFE7612E0A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{873EC485-8E94-4877-8EA7-A7DFE7612E0A}.Release|x64.ActiveCfg = Release|Any CPU
+		{873EC485-8E94-4877-8EA7-A7DFE7612E0A}.Release|x64.Build.0 = Release|Any CPU
 		{873EC485-8E94-4877-8EA7-A7DFE7612E0A}.Release|x86.ActiveCfg = Release|Any CPU
 		{873EC485-8E94-4877-8EA7-A7DFE7612E0A}.Release|x86.Build.0 = Release|Any CPU
 		{DA92047E-B764-41B4-B2D9-1C66C5449FA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DA92047E-B764-41B4-B2D9-1C66C5449FA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA92047E-B764-41B4-B2D9-1C66C5449FA9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DA92047E-B764-41B4-B2D9-1C66C5449FA9}.Debug|x64.Build.0 = Debug|Any CPU
 		{DA92047E-B764-41B4-B2D9-1C66C5449FA9}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{DA92047E-B764-41B4-B2D9-1C66C5449FA9}.Debug|x86.Build.0 = Debug|Any CPU
 		{DA92047E-B764-41B4-B2D9-1C66C5449FA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DA92047E-B764-41B4-B2D9-1C66C5449FA9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DA92047E-B764-41B4-B2D9-1C66C5449FA9}.Release|x64.ActiveCfg = Release|Any CPU
+		{DA92047E-B764-41B4-B2D9-1C66C5449FA9}.Release|x64.Build.0 = Release|Any CPU
 		{DA92047E-B764-41B4-B2D9-1C66C5449FA9}.Release|x86.ActiveCfg = Release|Any CPU
 		{DA92047E-B764-41B4-B2D9-1C66C5449FA9}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection

diff --git a/README.md b/README.md
@@ -1,13 +1,13 @@
 ![Papercut Logo](https://raw.githubusercontent.com/ChangemakerStudios/Papercut/develop/graphics/PapercutLogo.png)<br>
 *The Simple Desktop Email Helper*
 
-[![Build status](https://ci.appveyor.com/api/projects/status/bs2asxoafdwbkcxa?svg=true)](https://ci.appveyor.com/project/Jaben/papercut)
+[![Build status](https://ci.appveyor.com/api/projects/status/bs2asxoafdwbkcxa?svg=true)](https://ci.appveyor.com/project/Jaben/papercut-smtp)
 
 ## The problem
 If you ever send emails from an application or web site during development, you're familiar with the fear of an email being released into the wild. Are you positive none of the 'test' emails are addressed to colleagues or worse, customers? Of course, you can set up and maintain a test email server for development -- but that's a chore. Plus, the delay when you are waiting to view new test emails can radically slow your development cycle.
 
 ## Papercut SMTP to the rescue!
-Papercut SMTP is a 2-in-1 quick email viewer AND built-in SMTP server (designed to receive messages only). Not only does it not enforce any restrictions how you prepare your email, but it allows you to view the whole email-chilada: body, html, headers, attachment down right down to the naughty raw encoded bits. Papercut can be configured to run on startup and sit quietly (minimized in the tray) only providing a notification when a new message has arrived.
+Papercut SMTP is a 2-in-1 quick email viewer AND built-in SMTP server (designed to receive messages only). Papercut SMTP doesn't enforce any restrictions how you prepare your email, but it allows you to view the whole email-chilada: body, html, headers, attachment down right down to the naughty raw encoded bits. Papercut can be configured to run on startup and sit quietly (minimized in the tray) only providing a notification when a new message has arrived.
 
 ## Download Now
 #### [Latest Release](https://github.com/ChangemakerStudios/Papercut-SMTP/releases)

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,6 +1,19 @@
 # Release Notes
 
-## Papercut v5.8.0 [2021-06-16]
+## Papercut SMTP v6.0.0 [2021-11-14]
+
+_NOTE: Papercut SMTP now requires that Microsoft Edge WebView2 be installed. Papercut SMTP will automatically run the installation dependency if WebView2 is not available._
+
+- Moved to Edge (WebView2) for email display providing modern browser support for viewing.
+  - Support for SVGs.
+  - Support for newer HTML/CSS display.
+- Fixed: Progress bar for Forwarding Dialog displays correctly now.
+- Fixed: Multiple issues with the forwarding dialog.
+- [#193] Add logging path to settings.json (PR thanks to [1Jesper1](https://github.com/1Jesper1))
+- [#192] Adds an option (defaulting to true) to enable popup notifications when a new message is received. (PR thanks to [richardlawley](https://github.com/richardlawley))
+- [#189] Use first capital character in text in "proceed" and "cancel" buttons (PR thanks to [1Jesper1](https://github.com/1Jesper1)) 
+
+## Papercut SMTP v5.8.0 [2021-06-16]
 - Moved to .NET Framework 4.7.2
 - Upgraded to latest dependencies (Caliburn Micro, Autofac, MahApps)
 - Fixed: Window sizes weren't binding properly. 
@@ -13,7 +26,7 @@
 - [#180] Fixed message not displaying in Web UI when id includes '#' symbol (PR thanks to [ryan-warrener](https://github.com/ryan-warrener))
 - [#185] Responsive Delete button (PR thanks to [rfverbruggen](https://github.com/rfverbruggen)) 
 
-## Papercut v5.7.0 [2020-04-05]
+## Papercut SMTP v5.7.0 [2020-04-05]
 - Renamed product to "Papercut SMTP" to seperate from other products.
 - Moved "Readme.eml" and logs to *\ProgramData\Changemaker Studios\Papercut SMTP* allowing it to be deleted.
 - Changed default save directory for Papercut UI to *\%ApplicationData%\Changemaker Studios\Papercut SMTP*. Mail in legacy paths are still supported.

diff --git a/build.ps1 b/build.ps1
@@ -1,2 +1,6 @@
+# $exePath = "$env:TEMP\wix311.exe"
+# (New-Object Net.WebClient).DownloadFile('https://github.com/wixtoolset/wix3/releases/download/wix3111rtm/wix311.exe', $exePath)
+# cmd /c start /wait "$exePath" /q
+
 cd .\build
 .\build.ps1
diff --git a/build/ReleaseNotes.cake b/build/ReleaseNotes.cake
@@ -26,7 +26,7 @@ src=""data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAPoAAABBCAYAAAD44bmLAAAAGXRF
         var body = new MimeKit.BodyBuilder { HtmlBody = outPut };
         var message = new MimeKit.MimeMessage
         {
-            Subject = "Welcome to Papercut!",
+            Subject = "Welcome to Papercut SMTP!",
             Body = body.ToMessageBody(),
         };
         message.From.Add(new MimeKit.MailboxAddress("Papercut SMTP", "Papercut@papercut.com"));