SF.net SVN: mahogany:[7587] trunk/M

[email protected] Sat, 05 Dec 2009 00:53:49 +0000
Newsgroups gmane.mail.mahogany.cvs
Message-ID <[email protected]>
Revision: 7587
          http://mahogany.svn.sourceforge.net/mahogany/?rev=7587&view=rev
Author:   vadz
Date:     2009-12-05 00:53:48 +0000 (Sat, 05 Dec 2009)

Log Message:
-----------
upgrade MSVC project files to VC9

Modified Paths:
--------------
    trunk/M/M.sln
    trunk/M/M.vcproj
    trunk/M/Mconfig.vcproj
    trunk/M/doc/build_win.txt
    trunk/M/include/Mconfig.h
    trunk/M/lib/compface/compface.vcproj
    trunk/M/lib/dspam/dspam.vcproj
    trunk/M/lib/dspam/src/auto-config.h.win32
    trunk/M/lib/imap/imap.vcproj
    trunk/M/src/wx/vcard/versit.vcproj

Modified: trunk/M/M.sln
===================================================================
--- trunk/M/M.sln	2009-12-05 00:53:02 UTC (rev 7586)
+++ trunk/M/M.sln	2009-12-05 00:53:48 UTC (rev 7587)
@@ -1,262 +1,59 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "M", "M.vcproj", "{1515C8EB-5C72-43DF-9D3A-0703F155F268}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0E9F4403-1AA1-4824-A99F-041B1BF18D14} = {0E9F4403-1AA1-4824-A99F-041B1BF18D14}
-		{458FA00B-681B-46F2-9C32-FB717D4D4609} = {458FA00B-681B-46F2-9C32-FB717D4D4609}
-		{18A0EF1F-2476-46F9-936F-A6B46274FA7A} = {18A0EF1F-2476-46F9-936F-A6B46274FA7A}
-		{C1814137-3DDE-4ADC-876B-EAA86E2900AC} = {C1814137-3DDE-4ADC-876B-EAA86E2900AC}
 		{62156246-DCEA-4713-95E0-C01F595F1A20} = {62156246-DCEA-4713-95E0-C01F595F1A20}
-		{390CE24E-8BF0-4606-B218-BE13AF7C0160} = {390CE24E-8BF0-4606-B218-BE13AF7C0160}
-		{4D31FA55-B643-4CB3-A8F5-5AA5179317F3} = {4D31FA55-B643-4CB3-A8F5-5AA5179317F3}
-		{F41FC06D-BF41-4A39-A4B6-9FCD6B4FFAFE} = {F41FC06D-BF41-4A39-A4B6-9FCD6B4FFAFE}
-		{9F67E589-0373-4100-81E4-AC7D3328BAAF} = {9F67E589-0373-4100-81E4-AC7D3328BAAF}
-		{0B20B2A1-6D5F-4366-9154-6995152A07EC} = {0B20B2A1-6D5F-4366-9154-6995152A07EC}
-		{62C959C3-EC09-4323-9FB8-DC39A4428CAE} = {62C959C3-EC09-4323-9FB8-DC39A4428CAE}
-		{AF27ABC5-1AB2-55D0-8E7D-239C0176530E} = {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}
 		{E46C11C7-5924-4F7C-B82E-5BEB8856A8BC} = {E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}
 		{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5} = {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}
 		{457CFEC8-5C3F-4C7E-98A6-B65E1DE22682} = {457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}
-		{03CC77E1-56F2-4536-9578-1DC4D858DC16} = {03CC77E1-56F2-4536-9578-1DC4D858DC16}
-		{8C0797F8-5B9F-4B33-957B-01552CD9F2DE} = {8C0797F8-5B9F-4B33-957B-01552CD9F2DE}
-		{461C65F9-FD63-4262-8AAB-578E9E0EC485} = {461C65F9-FD63-4262-8AAB-578E9E0EC485}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "L:\wx\HEAD\build\msw\wx_vc7_base.vcproj", "{03CC77E1-56F2-4536-9578-1DC4D858DC16}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adv", "L:\wx\HEAD\build\msw\wx_vc7_adv.vcproj", "{390CE24E-8BF0-4606-B218-BE13AF7C0160}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "html", "L:\wx\HEAD\build\msw\wx_vc7_html.vcproj", "{458FA00B-681B-46F2-9C32-FB717D4D4609}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxjpeg", "L:\wx\HEAD\build\msw\wx_vc7_wxjpeg.vcproj", "{9F67E589-0373-4100-81E4-AC7D3328BAAF}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "L:\wx\HEAD\build\msw\wx_vc7_wxregex.vcproj", "{F41FC06D-BF41-4A39-A4B6-9FCD6B4FFAFE}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxtiff", "L:\wx\HEAD\build\msw\wx_vc7_wxtiff.vcproj", "{C1814137-3DDE-4ADC-876B-EAA86E2900AC}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "L:\wx\HEAD\build\msw\wx_vc7_wxzlib.vcproj", "{18A0EF1F-2476-46F9-936F-A6B46274FA7A}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imap", "lib\imap\imap.vcproj", "{457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}"
 	ProjectSection(ProjectDependencies) = postProject
 		{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5} = {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxpng", "L:\wx\HEAD\build\msw\wx_vc7_wxpng.vcproj", "{62C959C3-EC09-4323-9FB8-DC39A4428CAE}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compface", "lib\compface\compface.vcproj", "{0E9F4403-1AA1-4824-A99F-041B1BF18D14}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dspam", "lib\dspam\dspam.vcproj", "{62156246-DCEA-4713-95E0-C01F595F1A20}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "L:\wx\HEAD\build\msw\wx_vc7_core.vcproj", "{8C0797F8-5B9F-4B33-957B-01552CD9F2DE}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "L:\wx\HEAD\build\msw\wx_vc7_net.vcproj", "{461C65F9-FD63-4262-8AAB-578E9E0EC485}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qa", "L:\wx\HEAD\build\msw\wx_vc7_qa.vcproj", "{0B20B2A1-6D5F-4366-9154-6995152A07EC}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "L:\wx\HEAD\build\msw\wx_vc7_xml.vcproj", "{4D31FA55-B643-4CB3-A8F5-5AA5179317F3}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "config", "Mconfig.vcproj", "{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "versit", "src\wx\vcard\versit.vcproj", "{E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxexpat", "L:\wx\HEAD\build\msw\wx_vc7_wxexpat.vcproj", "{AF27ABC5-1AB2-55D0-8E7D-239C0176530E}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
 Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
-		Unicode Debug = Unicode Debug
-		Unicode Release = Unicode Release
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
 	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{1515C8EB-5C72-43DF-9D3A-0703F155F268}.Debug.ActiveCfg = Debug|Win32
-		{1515C8EB-5C72-43DF-9D3A-0703F155F268}.Debug.Build.0 = Debug|Win32
-		{1515C8EB-5C72-43DF-9D3A-0703F155F268}.Release.ActiveCfg = Release|Win32
-		{1515C8EB-5C72-43DF-9D3A-0703F155F268}.Release.Build.0 = Release|Win32
-		{1515C8EB-5C72-43DF-9D3A-0703F155F268}.Unicode Debug.ActiveCfg = Unicode Debug|Win32
-		{1515C8EB-5C72-43DF-9D3A-0703F155F268}.Unicode Debug.Build.0 = Unicode Debug|Win32
-		{1515C8EB-5C72-43DF-9D3A-0703F155F268}.Unicode Release.ActiveCfg = Unicode Release|Win32
-		{1515C8EB-5C72-43DF-9D3A-0703F155F268}.Unicode Release.Build.0 = Unicode Release|Win32
-		{03CC77E1-56F2-4536-9578-1DC4D858DC16}.Debug.ActiveCfg = Debug|Win32
-		{03CC77E1-56F2-4536-9578-1DC4D858DC16}.Debug.Build.0 = Debug|Win32
-		{03CC77E1-56F2-4536-9578-1DC4D858DC16}.Release.ActiveCfg = Release|Win32
-		{03CC77E1-56F2-4536-9578-1DC4D858DC16}.Release.Build.0 = Release|Win32
-		{03CC77E1-56F2-4536-9578-1DC4D858DC16}.Unicode Debug.ActiveCfg = Debug|Win32
-		{03CC77E1-56F2-4536-9578-1DC4D858DC16}.Unicode Debug.Build.0 = Debug|Win32
-		{03CC77E1-56F2-4536-9578-1DC4D858DC16}.Unicode Release.ActiveCfg = Release|Win32
-		{03CC77E1-56F2-4536-9578-1DC4D858DC16}.Unicode Release.Build.0 = Release|Win32
-		{390CE24E-8BF0-4606-B218-BE13AF7C0160}.Debug.ActiveCfg = Debug|Win32
-		{390CE24E-8BF0-4606-B218-BE13AF7C0160}.Debug.Build.0 = Debug|Win32
-		{390CE24E-8BF0-4606-B218-BE13AF7C0160}.Release.ActiveCfg = Release|Win32
-		{390CE24E-8BF0-4606-B218-BE13AF7C0160}.Release.Build.0 = Release|Win32
-		{390CE24E-8BF0-4606-B218-BE13AF7C0160}.Unicode Debug.ActiveCfg = Debug|Win32
-		{390CE24E-8BF0-4606-B218-BE13AF7C0160}.Unicode Debug.Build.0 = Debug|Win32
-		{390CE24E-8BF0-4606-B218-BE13AF7C0160}.Unicode Release.ActiveCfg = Release|Win32
-		{390CE24E-8BF0-4606-B218-BE13AF7C0160}.Unicode Release.Build.0 = Release|Win32
-		{458FA00B-681B-46F2-9C32-FB717D4D4609}.Debug.ActiveCfg = Debug|Win32
-		{458FA00B-681B-46F2-9C32-FB717D4D4609}.Debug.Build.0 = Debug|Win32
-		{458FA00B-681B-46F2-9C32-FB717D4D4609}.Release.ActiveCfg = Release|Win32
-		{458FA00B-681B-46F2-9C32-FB717D4D4609}.Release.Build.0 = Release|Win32
-		{458FA00B-681B-46F2-9C32-FB717D4D4609}.Unicode Debug.ActiveCfg = Debug|Win32
-		{458FA00B-681B-46F2-9C32-FB717D4D4609}.Unicode Debug.Build.0 = Debug|Win32
-		{458FA00B-681B-46F2-9C32-FB717D4D4609}.Unicode Release.ActiveCfg = Release|Win32
-		{458FA00B-681B-46F2-9C32-FB717D4D4609}.Unicode Release.Build.0 = Release|Win32
-		{9F67E589-0373-4100-81E4-AC7D3328BAAF}.Debug.ActiveCfg = Debug|Win32
-		{9F67E589-0373-4100-81E4-AC7D3328BAAF}.Debug.Build.0 = Debug|Win32
-		{9F67E589-0373-4100-81E4-AC7D3328BAAF}.Release.ActiveCfg = Release|Win32
-		{9F67E589-0373-4100-81E4-AC7D3328BAAF}.Release.Build.0 = Release|Win32
-		{9F67E589-0373-4100-81E4-AC7D3328BAAF}.Unicode Debug.ActiveCfg = Debug|Win32
-		{9F67E589-0373-4100-81E4-AC7D3328BAAF}.Unicode Debug.Build.0 = Debug|Win32
-		{9F67E589-0373-4100-81E4-AC7D3328BAAF}.Unicode Release.ActiveCfg = Release|Win32
-		{9F67E589-0373-4100-81E4-AC7D3328BAAF}.Unicode Release.Build.0 = Release|Win32
-		{F41FC06D-BF41-4A39-A4B6-9FCD6B4FFAFE}.Debug.ActiveCfg = Debug|Win32
-		{F41FC06D-BF41-4A39-A4B6-9FCD6B4FFAFE}.Debug.Build.0 = Debug|Win32
-		{F41FC06D-BF41-4A39-A4B6-9FCD6B4FFAFE}.Release.ActiveCfg = Release|Win32
-		{F41FC06D-BF41-4A39-A4B6-9FCD6B4FFAFE}.Release.Build.0 = Release|Win32
-		{F41FC06D-BF41-4A39-A4B6-9FCD6B4FFAFE}.Unicode Debug.ActiveCfg = Debug|Win32
-		{F41FC06D-BF41-4A39-A4B6-9FCD6B4FFAFE}.Unicode Debug.Build.0 = Debug|Win32
-		{F41FC06D-BF41-4A39-A4B6-9FCD6B4FFAFE}.Unicode Release.ActiveCfg = Release|Win32
-		{F41FC06D-BF41-4A39-A4B6-9FCD6B4FFAFE}.Unicode Release.Build.0 = Release|Win32
-		{C1814137-3DDE-4ADC-876B-EAA86E2900AC}.Debug.ActiveCfg = Debug|Win32
-		{C1814137-3DDE-4ADC-876B-EAA86E2900AC}.Debug.Build.0 = Debug|Win32
-		{C1814137-3DDE-4ADC-876B-EAA86E2900AC}.Release.ActiveCfg = Release|Win32
-		{C1814137-3DDE-4ADC-876B-EAA86E2900AC}.Release.Build.0 = Release|Win32
-		{C1814137-3DDE-4ADC-876B-EAA86E2900AC}.Unicode Debug.ActiveCfg = Debug|Win32
-		{C1814137-3DDE-4ADC-876B-EAA86E2900AC}.Unicode Debug.Build.0 = Debug|Win32
-		{C1814137-3DDE-4ADC-876B-EAA86E2900AC}.Unicode Release.ActiveCfg = Release|Win32
-		{C1814137-3DDE-4ADC-876B-EAA86E2900AC}.Unicode Release.Build.0 = Release|Win32
-		{18A0EF1F-2476-46F9-936F-A6B46274FA7A}.Debug.ActiveCfg = Debug|Win32
-		{18A0EF1F-2476-46F9-936F-A6B46274FA7A}.Debug.Build.0 = Debug|Win32
-		{18A0EF1F-2476-46F9-936F-A6B46274FA7A}.Release.ActiveCfg = Release|Win32
-		{18A0EF1F-2476-46F9-936F-A6B46274FA7A}.Release.Build.0 = Release|Win32
-		{18A0EF1F-2476-46F9-936F-A6B46274FA7A}.Unicode Debug.ActiveCfg = Debug|Win32
-		{18A0EF1F-2476-46F9-936F-A6B46274FA7A}.Unicode Debug.Build.0 = Debug|Win32
-		{18A0EF1F-2476-46F9-936F-A6B46274FA7A}.Unicode Release.ActiveCfg = Release|Win32
-		{18A0EF1F-2476-46F9-936F-A6B46274FA7A}.Unicode Release.Build.0 = Release|Win32
-		{457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Debug.ActiveCfg = Debug|Win32
-		{457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Debug.Build.0 = Debug|Win32
-		{457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Release.ActiveCfg = Release|Win32
-		{457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Release.Build.0 = Release|Win32
-		{457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Unicode Debug.ActiveCfg = Debug|Win32
-		{457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Unicode Debug.Build.0 = Debug|Win32
-		{457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Unicode Release.ActiveCfg = Release|Win32
-		{457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Unicode Release.Build.0 = Release|Win32
-		{62C959C3-EC09-4323-9FB8-DC39A4428CAE}.Debug.ActiveCfg = Debug|Win32
-		{62C959C3-EC09-4323-9FB8-DC39A4428CAE}.Debug.Build.0 = Debug|Win32
-		{62C959C3-EC09-4323-9FB8-DC39A4428CAE}.Release.ActiveCfg = Release|Win32
-		{62C959C3-EC09-4323-9FB8-DC39A4428CAE}.Release.Build.0 = Release|Win32
-		{62C959C3-EC09-4323-9FB8-DC39A4428CAE}.Unicode Debug.ActiveCfg = Debug|Win32
-		{62C959C3-EC09-4323-9FB8-DC39A4428CAE}.Unicode Debug.Build.0 = Debug|Win32
-		{62C959C3-EC09-4323-9FB8-DC39A4428CAE}.Unicode Release.ActiveCfg = Release|Win32
-		{62C959C3-EC09-4323-9FB8-DC39A4428CAE}.Unicode Release.Build.0 = Release|Win32
-		{0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Debug.ActiveCfg = Debug|Win32
-		{0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Debug.Build.0 = Debug|Win32
-		{0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Release.ActiveCfg = Release|Win32
-		{0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Release.Build.0 = Release|Win32
-		{0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Unicode Debug.ActiveCfg = Debug|Win32
-		{0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Unicode Debug.Build.0 = Debug|Win32
-		{0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Unicode Release.ActiveCfg = Release|Win32
-		{0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Unicode Release.Build.0 = Release|Win32
-		{62156246-DCEA-4713-95E0-C01F595F1A20}.Debug.ActiveCfg = Debug|Win32
-		{62156246-DCEA-4713-95E0-C01F595F1A20}.Debug.Build.0 = Debug|Win32
-		{62156246-DCEA-4713-95E0-C01F595F1A20}.Release.ActiveCfg = Release|Win32
-		{62156246-DCEA-4713-95E0-C01F595F1A20}.Release.Build.0 = Release|Win32
-		{62156246-DCEA-4713-95E0-C01F595F1A20}.Unicode Debug.ActiveCfg = Debug|Win32
-		{62156246-DCEA-4713-95E0-C01F595F1A20}.Unicode Debug.Build.0 = Debug|Win32
-		{62156246-DCEA-4713-95E0-C01F595F1A20}.Unicode Release.ActiveCfg = Release|Win32
-		{62156246-DCEA-4713-95E0-C01F595F1A20}.Unicode Release.Build.0 = Release|Win32
-		{8C0797F8-5B9F-4B33-957B-01552CD9F2DE}.Debug.ActiveCfg = Debug|Win32
-		{8C0797F8-5B9F-4B33-957B-01552CD9F2DE}.Debug.Build.0 = Debug|Win32
-		{8C0797F8-5B9F-4B33-957B-01552CD9F2DE}.Release.ActiveCfg = Release|Win32
-		{8C0797F8-5B9F-4B33-957B-01552CD9F2DE}.Release.Build.0 = Release|Win32
-		{8C0797F8-5B9F-4B33-957B-01552CD9F2DE}.Unicode Debug.ActiveCfg = Debug|Win32
-		{8C0797F8-5B9F-4B33-957B-01552CD9F2DE}.Unicode Debug.Build.0 = Debug|Win32
-		{8C0797F8-5B9F-4B33-957B-01552CD9F2DE}.Unicode Release.ActiveCfg = Release|Win32
-		{8C0797F8-5B9F-4B33-957B-01552CD9F2DE}.Unicode Release.Build.0 = Release|Win32
-		{461C65F9-FD63-4262-8AAB-578E9E0EC485}.Debug.ActiveCfg = Debug|Win32
-		{461C65F9-FD63-4262-8AAB-578E9E0EC485}.Debug.Build.0 = Debug|Win32
-		{461C65F9-FD63-4262-8AAB-578E9E0EC485}.Release.ActiveCfg = Release|Win32
-		{461C65F9-FD63-4262-8AAB-578E9E0EC485}.Release.Build.0 = Release|Win32
-		{461C65F9-FD63-4262-8AAB-578E9E0EC485}.Unicode Debug.ActiveCfg = Debug|Win32
-		{461C65F9-FD63-4262-8AAB-578E9E0EC485}.Unicode Debug.Build.0 = Debug|Win32
-		{461C65F9-FD63-4262-8AAB-578E9E0EC485}.Unicode Release.ActiveCfg = Release|Win32
-		{461C65F9-FD63-4262-8AAB-578E9E0EC485}.Unicode Release.Build.0 = Release|Win32
-		{0B20B2A1-6D5F-4366-9154-6995152A07EC}.Debug.ActiveCfg = Debug|Win32
-		{0B20B2A1-6D5F-4366-9154-6995152A07EC}.Debug.Build.0 = Debug|Win32
-		{0B20B2A1-6D5F-4366-9154-6995152A07EC}.Release.ActiveCfg = Release|Win32
-		{0B20B2A1-6D5F-4366-9154-6995152A07EC}.Release.Build.0 = Release|Win32
-		{0B20B2A1-6D5F-4366-9154-6995152A07EC}.Unicode Debug.ActiveCfg = Debug|Win32
-		{0B20B2A1-6D5F-4366-9154-6995152A07EC}.Unicode Debug.Build.0 = Debug|Win32
-		{0B20B2A1-6D5F-4366-9154-6995152A07EC}.Unicode Release.ActiveCfg = Release|Win32
-		{0B20B2A1-6D5F-4366-9154-6995152A07EC}.Unicode Release.Build.0 = Release|Win32
-		{4D31FA55-B643-4CB3-A8F5-5AA5179317F3}.Debug.ActiveCfg = Debug|Win32
-		{4D31FA55-B643-4CB3-A8F5-5AA5179317F3}.Debug.Build.0 = Debug|Win32
-		{4D31FA55-B643-4CB3-A8F5-5AA5179317F3}.Release.ActiveCfg = Release|Win32
-		{4D31FA55-B643-4CB3-A8F5-5AA5179317F3}.Release.Build.0 = Release|Win32
-		{4D31FA55-B643-4CB3-A8F5-5AA5179317F3}.Unicode Debug.ActiveCfg = Debug|Win32
-		{4D31FA55-B643-4CB3-A8F5-5AA5179317F3}.Unicode Debug.Build.0 = Debug|Win32
-		{4D31FA55-B643-4CB3-A8F5-5AA5179317F3}.Unicode Release.ActiveCfg = Release|Win32
-		{4D31FA55-B643-4CB3-A8F5-5AA5179317F3}.Unicode Release.Build.0 = Release|Win32
-		{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Debug.ActiveCfg = Debug|Win32
-		{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Debug.Build.0 = Debug|Win32
-		{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Release.ActiveCfg = Release|Win32
-		{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Release.Build.0 = Release|Win32
-		{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Unicode Debug.ActiveCfg = Debug|Win32
-		{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Unicode Debug.Build.0 = Debug|Win32
-		{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Unicode Release.ActiveCfg = Release|Win32
-		{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Unicode Release.Build.0 = Release|Win32
-		{E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Debug.ActiveCfg = Debug|Win32
-		{E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Debug.Build.0 = Debug|Win32
-		{E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Release.ActiveCfg = Release|Win32
-		{E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Release.Build.0 = Release|Win32
-		{E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Unicode Debug.ActiveCfg = Debug|Win32
-		{E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Unicode Debug.Build.0 = Debug|Win32
-		{E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Unicode Release.ActiveCfg = Release|Win32
-		{E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Unicode Release.Build.0 = Release|Win32
-		{AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Debug.ActiveCfg = Debug|Win32
-		{AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Debug.Build.0 = Debug|Win32
-		{AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Release.ActiveCfg = Release|Win32
-		{AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Release.Build.0 = Release|Win32
-		{AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Unicode Debug.ActiveCfg = Debug|Win32
-		{AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Unicode Debug.Build.0 = Debug|Win32
-		{AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Unicode Release.ActiveCfg = Release|Win32
-		{AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Unicode Release.Build.0 = Release|Win32
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{1515C8EB-5C72-43DF-9D3A-0703F155F268}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1515C8EB-5C72-43DF-9D3A-0703F155F268}.Debug|Win32.Build.0 = Debug|Win32
+		{1515C8EB-5C72-43DF-9D3A-0703F155F268}.Release|Win32.ActiveCfg = Release|Win32
+		{1515C8EB-5C72-43DF-9D3A-0703F155F268}.Release|Win32.Build.0 = Release|Win32
+		{457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Debug|Win32.ActiveCfg = Debug|Win32
+		{457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Debug|Win32.Build.0 = Debug|Win32
+		{457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Release|Win32.ActiveCfg = Release|Win32
+		{457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Release|Win32.Build.0 = Release|Win32
+		{0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Debug|Win32.Build.0 = Debug|Win32
+		{0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Release|Win32.ActiveCfg = Release|Win32
+		{0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Release|Win32.Build.0 = Release|Win32
+		{62156246-DCEA-4713-95E0-C01F595F1A20}.Debug|Win32.ActiveCfg = Debug|Win32
+		{62156246-DCEA-4713-95E0-C01F595F1A20}.Debug|Win32.Build.0 = Debug|Win32
+		{62156246-DCEA-4713-95E0-C01F595F1A20}.Release|Win32.ActiveCfg = Release|Win32
+		{62156246-DCEA-4713-95E0-C01F595F1A20}.Release|Win32.Build.0 = Release|Win32
+		{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Debug|Win32.Build.0 = Debug|Win32
+		{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Release|Win32.ActiveCfg = Release|Win32
+		{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Release|Win32.Build.0 = Release|Win32
+		{E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Debug|Win32.Build.0 = Debug|Win32
+		{E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Release|Win32.ActiveCfg = Release|Win32
+		{E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
 EndGlobal

Modified: trunk/M/M.vcproj
===================================================================
--- trunk/M/M.vcproj	2009-12-05 00:53:02 UTC (rev 7586)
+++ trunk/M/M.vcproj	2009-12-05 00:53:48 UTC (rev 7587)
@@ -1,146 +1,67 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="9.00"
 	Name="M"
 	ProjectGUID="{1515C8EB-5C72-43DF-9D3A-0703F155F268}"
 	RootNamespace="M"
-	Keyword="Win32Proj">
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="debug_ansi"
-			IntermediateDirectory="debug_ansi"
+			Name="Release|Win32"
+			OutputDirectory="release"
+			IntermediateDirectory="release"
 			ConfigurationType="1"
-			CharacterSet="2">
+			CharacterSet="0"
+			>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="include;&quot;$(wxwin)/include/msvc&quot;;&quot;$(wxwin)/include&quot;;lib/compface;lib/imap/src/osdep/nt;&quot;lib/imap/src/c-client&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;wxNO_AUI_LIB;wxNO_GL_LIB;wxNO_MEDIA_LIB;wxNO_RIBBON_LIB;wxNO_RICHTEXT_LIB;wxNO_XRC_LIB"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="Mpch.h"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"
-				CompileAs="0"
-				DisableSpecificWarnings="4100"/>
+				Name="VCPreBuildEventTool"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCCustomBuildTool"
+			/>
 			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="lib/imap/debug/imap.lib lib/compface/debug/compface.lib lib/dspam/debug/dspam.lib src\wx\vcard\Debug\versit.lib winmm.lib comctl32.lib rpcrt4.lib ws2_32.lib"
-				OutputFile="$(OutDir)/M.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="$(wxwin)\lib\vc_lib"
-				GenerateDebugInformation="TRUE"
-				SubSystem="2"
-				StackReserveSize="10000000"
-				TargetMachine="1"/>
+				Name="VCXMLDataGeneratorTool"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCMIDLTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="include,$(wxwin)/include"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="release_ansi"
-			IntermediateDirectory="release_ansi"
-			ConfigurationType="1"
-			CharacterSet="0">
-			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="include;&quot;$(wxwin)/include/msvc&quot;;&quot;$(wxwin)/include&quot;;lib/compface;lib/imap/src/osdep/nt;&quot;lib/imap/src/c-client&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;wxNO_AUI_LIB;wxNO_GL_LIB;wxNO_MEDIA_LIB;wxNO_RIBBON_LIB;wxNO_RICHTEXT_LIB;wxNO_XRC_LIB"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_UNICODE;wxNO_AUI_LIB;wxNO_GL_LIB;wxNO_MEDIA_LIB;wxNO_RIBBON_LIB;wxNO_RICHTEXT_LIB;wxNO_XRC_LIB"
 				RuntimeLibrary="2"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="Mpch.h"
 				WarningLevel="4"
-				Detect64BitPortabilityProblems="FALSE"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				CompileAs="0"
-				DisableSpecificWarnings="4100"/>
+				DisableSpecificWarnings="4100"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="lib/imap/release/imap.lib lib/compface/release/compface.lib lib/dspam/release/dspam.lib src\wx\vcard\release\versit.lib winmm.lib comctl32.lib rpcrt4.lib ws2_32.lib"
-				OutputFile="$(OutDir)/M.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="$(wxwin)\lib\vc_lib"
-				GenerateDebugInformation="TRUE"
-				GenerateMapFile="TRUE"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="include,$(wxwin)/include"/>
+				AdditionalIncludeDirectories="include,$(wxwin)/include"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Unicode Release|Win32"
-			OutputDirectory="release"
-			IntermediateDirectory="release"
-			ConfigurationType="1"
-			CharacterSet="0">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="include;&quot;$(wxwin)/include/msvc&quot;;&quot;$(wxwin)/include&quot;;lib/compface;lib/imap/src/osdep/nt;&quot;lib/imap/src/c-client&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_UNICODE;wxNO_AUI_LIB;wxNO_GL_LIB;wxNO_MEDIA_LIB;wxNO_RIBBON_LIB;wxNO_RICHTEXT_LIB;wxNO_XRC_LIB"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="Mpch.h"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"
-				CompileAs="0"
-				DisableSpecificWarnings="4100"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="lib/imap/release/imap.lib lib/compface/release/compface.lib lib/dspam/release/dspam.lib src\wx\vcard\release\versit.lib winmm.lib comctl32.lib rpcrt4.lib ws2_32.lib"
 				ShowProgress="0"
@@ -148,89 +69,120 @@
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(wxwin)\lib\vc_lib"
 				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="TRUE"
-				GenerateMapFile="TRUE"
+				GenerateDebugInformation="true"
+				GenerateMapFile="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="include,$(wxwin)/include"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
-			Name="Unicode Debug|Win32"
+			Name="Debug|Win32"
 			OutputDirectory="debug"
 			IntermediateDirectory="debug"
 			ConfigurationType="1"
-			CharacterSet="2">
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="include;&quot;$(wxwin)/include/msvc&quot;;&quot;$(wxwin)/include&quot;;lib/compface;lib/imap/src/osdep/nt;&quot;lib/imap/src/c-client&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_UNICODE;wxNO_AUI_LIB;wxNO_GL_LIB;wxNO_MEDIA_LIB;wxNO_RIBBON_LIB;wxNO_RICHTEXT_LIB;wxNO_XRC_LIB"
-				MinimalRebuild="TRUE"
+				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="Mpch.h"
 				WarningLevel="4"
-				Detect64BitPortabilityProblems="FALSE"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				CompileAs="0"
-				DisableSpecificWarnings="4100"/>
+				DisableSpecificWarnings="4100"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="include,$(wxwin)/include"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="lib/imap/debug/imap.lib lib/compface/debug/compface.lib lib/dspam/debug/dspam.lib src\wx\vcard\Debug\versit.lib winmm.lib comctl32.lib rpcrt4.lib ws2_32.lib"
 				OutputFile="$(OutDir)/M.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(wxwin)\lib\vc_lib"
 				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				SubSystem="2"
 				StackReserveSize="10000000"
-				TargetMachine="1"/>
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="include,$(wxwin)/include"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -239,2003 +191,1908 @@
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
 			<Filter
 				Name="classes"
-				Filter="">
+				>
 				<File
-					RelativePath=".\src\classes\CacheFile.cpp">
+					RelativePath=".\src\classes\CacheFile.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\classes\ComposeTemplate.cpp">
+					RelativePath=".\src\classes\ComposeTemplate.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\classes\ConfigSource.cpp">
+					RelativePath=".\src\classes\ConfigSource.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\classes\ConfigSourcesAll.cpp">
+					RelativePath=".\src\classes\ConfigSourcesAll.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\classes\FolderMonitor.cpp">
+					RelativePath=".\src\classes\FolderMonitor.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\classes\FolderView.cpp">
+					RelativePath=".\src\classes\FolderView.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\classes\kbList.cpp">
+					RelativePath=".\src\classes\kbList.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\classes\ListReceiver.cpp">
+					RelativePath=".\src\classes\ListReceiver.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\classes\MApplication.cpp">
+					RelativePath=".\src\classes\MApplication.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\classes\MessageTemplate.cpp">
+					RelativePath=".\src\classes\MessageTemplate.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\classes\MessageView.cpp">
+					RelativePath=".\src\classes\MessageView.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\classes\MEvent.cpp">
+					RelativePath=".\src\classes\MEvent.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\classes\MFilter.cpp">
+					RelativePath=".\src\classes\MFilter.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\classes\MFolder.cpp">
+					RelativePath=".\src\classes\MFolder.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\classes\MModule.cpp">
+					RelativePath=".\src\classes\MModule.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\classes\MObject.cpp">
+					RelativePath=".\src\classes\MObject.cpp"
+					>
 					<FileConfiguration
-						Name="Debug|Win32">
+						Name="Release|Win32"
+						>
 						<Tool
 							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="1"/>
+							UsePrecompiledHeader="1"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32">
+						Name="Debug|Win32"
+						>
 						<Tool
 							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="1"/>
+							UsePrecompiledHeader="1"
+						/>
 					</FileConfiguration>
-					<FileConfiguration
-						Name="Unicode Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="1"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Unicode Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="1"/>
-					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\classes\Moptions.cpp">
+					RelativePath=".\src\classes\Moptions.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\classes\Mpers.cpp">
+					RelativePath=".\src\classes\Mpers.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\classes\PathFinder.cpp">
+					RelativePath=".\src\classes\PathFinder.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\classes\PGPClickInfo.cpp">
+					RelativePath=".\src\classes\PGPClickInfo.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\classes\Profile.cpp">
+					RelativePath=".\src\classes\Profile.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\classes\QuotedText.cpp">
+					RelativePath=".\src\classes\QuotedText.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\classes\Sequence.cpp">
+					RelativePath=".\src\classes\Sequence.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\classes\XFace.cpp">
+					RelativePath=".\src\classes\XFace.cpp"
+					>
 					<FileConfiguration
-						Name="Debug|Win32">
+						Name="Release|Win32"
+						>
 						<Tool
 							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="SYSV32"/>
+							PreprocessorDefinitions="SYSV32"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32">
+						Name="Debug|Win32"
+						>
 						<Tool
 							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="SYSV32"/>
+							PreprocessorDefinitions="SYSV32"
+						/>
 					</FileConfiguration>
-					<FileConfiguration
-						Name="Unicode Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="SYSV32"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Unicode Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="SYSV32"/>
-					</FileConfiguration>
 				</File>
 			</Filter>
 			<Filter
 				Name="gui"
-				Filter="">
+				>
 				<File
-					RelativePath=".\src\gui\AddressExpander.cpp">
+					RelativePath=".\src\gui\AddressExpander.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\ClickAtt.cpp">
+					RelativePath=".\src\gui\ClickAtt.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\ClickURL.cpp">
+					RelativePath=".\src\gui\ClickURL.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\ConfigSourceChoice.cpp">
+					RelativePath=".\src\gui\ConfigSourceChoice.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\Mdnd.cpp">
+					RelativePath=".\src\gui\Mdnd.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\MImport.cpp">
+					RelativePath=".\src\gui\MImport.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxAttachDialog.cpp">
+					RelativePath=".\src\gui\wxAttachDialog.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxBrowseButton.cpp">
+					RelativePath=".\src\gui\wxBrowseButton.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxColumnsDlg.cpp">
+					RelativePath=".\src\gui\wxColumnsDlg.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxComposeView.cpp">
+					RelativePath=".\src\gui\wxComposeView.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxDialogLayout.cpp">
+					RelativePath=".\src\gui\wxDialogLayout.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxFiltersDialog.cpp">
+					RelativePath=".\src\gui\wxFiltersDialog.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxFolderMenu.cpp">
+					RelativePath=".\src\gui\wxFolderMenu.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxFolderTree.cpp">
+					RelativePath=".\src\gui\wxFolderTree.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxFolderView.cpp">
+					RelativePath=".\src\gui\wxFolderView.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxHeadersDialogs.cpp">
+					RelativePath=".\src\gui\wxHeadersDialogs.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxIconManager.cpp">
+					RelativePath=".\src\gui\wxIconManager.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxMainFrame.cpp">
+					RelativePath=".\src\gui\wxMainFrame.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxMApp.cpp">
+					RelativePath=".\src\gui\wxMApp.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxMDialogs.cpp">
+					RelativePath=".\src\gui\wxMDialogs.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxMenuDefs.cpp">
+					RelativePath=".\src\gui\wxMenuDefs.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxMessageView.cpp">
+					RelativePath=".\src\gui\wxMessageView.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxMFolderDialogs.cpp">
+					RelativePath=".\src\gui\wxMFolderDialogs.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxMFrame.cpp">
+					RelativePath=".\src\gui\wxMFrame.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxMGuiUtils.cpp">
+					RelativePath=".\src\gui\wxMGuiUtils.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxMimeDialog.cpp">
+					RelativePath=".\src\gui\wxMimeDialog.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxMIMETreeDialog.cpp">
+					RelativePath=".\src\gui\wxMIMETreeDialog.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxModulesDlg.cpp">
+					RelativePath=".\src\gui\wxModulesDlg.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxMsgCmdProc.cpp">
+					RelativePath=".\src\gui\wxMsgCmdProc.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxMSplash.cpp">
+					RelativePath=".\src\gui\wxMSplash.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxOptionsDlg.cpp">
+					RelativePath=".\src\gui\wxOptionsDlg.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxRenameDialog.cpp">
+					RelativePath=".\src\gui\wxRenameDialog.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxSearchDialog.cpp">
+					RelativePath=".\src\gui\wxSearchDialog.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxSortDialog.cpp">
+					RelativePath=".\src\gui\wxSortDialog.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxSubfoldersDialog.cpp">
+					RelativePath=".\src\gui\wxSubfoldersDialog.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxTemplateDialog.cpp">
+					RelativePath=".\src\gui\wxTemplateDialog.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxTextDialog.cpp">
+					RelativePath=".\src\gui\wxTextDialog.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxThrDialog.cpp">
+					RelativePath=".\src\gui\wxThrDialog.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\gui\wxWizards.cpp">
+					RelativePath=".\src\gui\wxWizards.cpp"
+					>
 				</File>
 				<Filter
 					Name="layout"
-					Filter="">
+					>
 					<File
-						RelativePath=".\src\gui\wxllist.cpp">
+						RelativePath=".\src\gui\wxllist.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\src\gui\wxlparser.cpp">
+						RelativePath=".\src\gui\wxlparser.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\src\gui\wxlwindow.cpp">
+						RelativePath=".\src\gui\wxlwindow.cpp"
+						>
 					</File>
 				</Filter>
 				<Filter
 					Name="wx"
-					Filter="">
+					>
 					<File
-						RelativePath=".\src\wx\generic\persctrl.cpp">
+						RelativePath=".\src\wx\generic\persctrl.cpp"
+						>
 						<FileConfiguration
-							Name="Debug|Win32">
+							Name="Release|Win32"
+							>
 							<Tool
 								Name="VCCLCompilerTool"
-								UsePrecompiledHeader="3"
-								PrecompiledHeaderThrough="wx/wxprec.h"/>
+								UsePrecompiledHeader="0"
+							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Win32">
+							Name="Debug|Win32"
+							>
 							<Tool
 								Name="VCCLCompilerTool"
-								UsePrecompiledHeader="0"/>
+								UsePrecompiledHeader="2"
+								PrecompiledHeaderThrough="wx/wxprec.h"
+							/>
 						</FileConfiguration>
-						<FileConfiguration
-							Name="Unicode Release|Win32">
-							<Tool
-								Name="VCCLCompilerTool"
-								UsePrecompiledHeader="0"/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Unicode Debug|Win32">
-							<Tool
-								Name="VCCLCompilerTool"
-								UsePrecompiledHeader="3"
-								PrecompiledHeaderThrough="wx/wxprec.h"/>
-						</FileConfiguration>
 					</File>
 				</Filter>
 			</Filter>
 			<Filter
 				Name="mail"
-				Filter="">
+				>
 				<File
-					RelativePath=".\src\mail\Address.cpp">
+					RelativePath=".\src\mail\Address.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\AddressCC.cpp">
+					RelativePath=".\src\mail\AddressCC.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\ASMailFolder.cpp">
+					RelativePath=".\src\mail\ASMailFolder.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\FolderType.cpp">
+					RelativePath=".\src\mail\FolderType.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\HeaderInfoImpl.cpp">
+					RelativePath=".\src\mail\HeaderInfoImpl.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\HeaderIterator.cpp">
+					RelativePath=".\src\mail\HeaderIterator.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\LogCircle.cpp">
+					RelativePath=".\src\mail\LogCircle.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\MailFolder.cpp">
+					RelativePath=".\src\mail\MailFolder.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\MailFolderCC.cpp">
+					RelativePath=".\src\mail\MailFolderCC.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\MailFolderCmn.cpp">
+					RelativePath=".\src\mail\MailFolderCmn.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\MailMH.cpp">
+					RelativePath=".\src\mail\MailMH.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\Message.cpp">
+					RelativePath=".\src\mail\Message.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\MessageCC.cpp">
+					RelativePath=".\src\mail\MessageCC.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\MFCache.cpp">
+					RelativePath=".\src\mail\MFCache.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\MFDriver.cpp">
+					RelativePath=".\src\mail\MFDriver.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\MFPool.cpp">
+					RelativePath=".\src\mail\MFPool.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\MFui.cpp">
+					RelativePath=".\src\mail\MFui.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\MimeDecode.cpp">
+					RelativePath=".\src\mail\MimeDecode.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\MimePartCC.cpp">
+					RelativePath=".\src\mail\MimePartCC.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\MimePartCCBase.cpp">
+					RelativePath=".\src\mail\MimePartCCBase.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\MimePartVirtual.cpp">
+					RelativePath=".\src\mail\MimePartVirtual.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\MimeType.cpp">
+					RelativePath=".\src\mail\MimeType.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\Pop3.cpp">
+					RelativePath=".\src\mail\Pop3.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\SendMessageCC.cpp">
+					RelativePath=".\src\mail\SendMessageCC.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\Sorting.cpp">
+					RelativePath=".\src\mail\Sorting.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\SpamFilter.cpp">
+					RelativePath=".\src\mail\SpamFilter.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\Threading.cpp">
+					RelativePath=".\src\mail\Threading.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\ThreadJWZ.cpp">
+					RelativePath=".\src\mail\ThreadJWZ.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\VFolder.cpp">
+					RelativePath=".\src\mail\VFolder.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\mail\VMessage.cpp">
+					RelativePath=".\src\mail\VMessage.cpp"
+					>
 				</File>
 			</Filter>
 			<Filter
 				Name="adb"
-				Filter="">
+				>
 				<File
-					RelativePath=".\src\adb\AdbDialogs.cpp">
+					RelativePath=".\src\adb\AdbDialogs.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\adb\AdbEntry.cpp">
+					RelativePath=".\src\adb\AdbEntry.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\adb\AdbExport.cpp">
+					RelativePath=".\src\adb\AdbExport.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\adb\AdbFrame.cpp">
+					RelativePath=".\src\adb\AdbFrame.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\adb\AdbImport.cpp">
+					RelativePath=".\src\adb\AdbImport.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\adb\AdbManager.cpp">
+					RelativePath=".\src\adb\AdbManager.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\adb\AdbModule.cpp">
+					RelativePath=".\src\adb\AdbModule.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\adb\AdbProvider.cpp">
+					RelativePath=".\src\adb\AdbProvider.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\adb\Collect.cpp">
+					RelativePath=".\src\adb\Collect.cpp"
+					>
 				</File>
 				<Filter
 					Name="providers"
-					Filter="">
+					>
 					<File
-						RelativePath=".\src\adb\ProvBbdb.cpp">
+						RelativePath=".\src\adb\ProvBbdb.cpp"
+						>
 						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="TRUE">
-							<Tool
-								Name="VCCLCompilerTool"/>
-						</FileConfiguration>
-						<FileConfiguration
 							Name="Release|Win32"
-							ExcludedFromBuild="TRUE">
+							ExcludedFromBuild="true"
+							>
 							<Tool
-								Name="VCCLCompilerTool"/>
+								Name="VCCLCompilerTool"
+							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Unicode Release|Win32"
-							ExcludedFromBuild="TRUE">
+							Name="Debug|Win32"
+							ExcludedFromBuild="true"
+							>
 							<Tool
-								Name="VCCLCompilerTool"/>
+								Name="VCCLCompilerTool"
+							/>
 						</FileConfiguration>
-						<FileConfiguration
-							Name="Unicode Debug|Win32"
-							ExcludedFromBuild="TRUE">
-							<Tool
-								Name="VCCLCompilerTool"/>
-						</FileConfiguration>
 					</File>
 					<File
-						RelativePath=".\src\adb\ProvDummy.cpp">
+						RelativePath=".\src\adb\ProvDummy.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\src\adb\ProvFC.cpp">
+						RelativePath=".\src\adb\ProvFC.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\src\adb\ProvLine.cpp">
+						RelativePath=".\src\adb\ProvLine.cpp"
+						>
 						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="TRUE">
-							<Tool
-								Name="VCCLCompilerTool"/>
-						</FileConfiguration>
-						<FileConfiguration
 							Name="Release|Win32"
-							ExcludedFromBuild="TRUE">
+							ExcludedFromBuild="true"
+							>
 							<Tool
-								Name="VCCLCompilerTool"/>
+								Name="VCCLCompilerTool"
+							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Unicode Release|Win32"
-							ExcludedFromBuild="TRUE">
+							Name="Debug|Win32"
+							ExcludedFromBuild="true"
+							>
 							<Tool
-								Name="VCCLCompilerTool"/>
+								Name="VCCLCompilerTool"
+							/>
 						</FileConfiguration>
-						<FileConfiguration
-							Name="Unicode Debug|Win32"
-							ExcludedFromBuild="TRUE">
-							<Tool
-								Name="VCCLCompilerTool"/>
-						</FileConfiguration>
 					</File>
 					<File
-						RelativePath=".\src\adb\ProvPalm.cpp">
+						RelativePath=".\src\adb\ProvPalm.cpp"
+						>
 						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="TRUE">
-							<Tool
-								Name="VCCLCompilerTool"/>
-						</FileConfiguration>
-						<FileConfiguration
 							Name="Release|Win32"
-							ExcludedFromBuild="TRUE">
+							ExcludedFromBuild="true"
+							>
 							<Tool
-								Name="VCCLCompilerTool"/>
+								Name="VCCLCompilerTool"
+							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Unicode Release|Win32"
-							ExcludedFromBuild="TRUE">
+							Name="Debug|Win32"
+							ExcludedFromBuild="true"
+							>
 							<Tool
-								Name="VCCLCompilerTool"/>
+								Name="VCCLCompilerTool"
+							/>
 						</FileConfiguration>
-						<FileConfiguration
-							Name="Unicode Debug|Win32"
-							ExcludedFromBuild="TRUE">
-							<Tool
-								Name="VCCLCompilerTool"/>
-						</FileConfiguration>
 					</File>
 					<File
-						RelativePath=".\src\adb\ProvPasswd.cpp">
+						RelativePath=".\src\adb\ProvPasswd.cpp"
+						>
 						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="TRUE">
-							<Tool
-								Name="VCCLCompilerTool"/>
-						</FileConfiguration>
-						<FileConfiguration
 							Name="Release|Win32"
-							ExcludedFromBuild="TRUE">
+							ExcludedFromBuild="true"
+							>
 							<Tool
-								Name="VCCLCompilerTool"/>
+								Name="VCCLCompilerTool"
+							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Unicode Release|Win32"
-							ExcludedFromBuild="TRUE">
+							Name="Debug|Win32"
+							ExcludedFromBuild="true"
+							>
 							<Tool
-								Name="VCCLCompilerTool"/>
+								Name="VCCLCompilerTool"
+							/>
 						</FileConfiguration>
-						<FileConfiguration
-							Name="Unicode Debug|Win32"
-							ExcludedFromBuild="TRUE">
-							<Tool
-								Name="VCCLCompilerTool"/>
-						</FileConfiguration>
 					</File>
 				</Filter>
 				<Filter
 					Name="impexp"
-					Filter="">
+					>
 					<File
-						RelativePath=".\src\adb\ExportPalm.cpp">
+						RelativePath=".\src\adb\ExportPalm.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\src\adb\ExportText.cpp">
+						RelativePath=".\src\adb\ExportText.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\src\adb\ExportVCard.cpp">
+						RelativePath=".\src\adb\ExportVCard.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\src\adb\ImportEudora.cpp">
+						RelativePath=".\src\adb\ImportEudora.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\src\adb\ImportMailrc.cpp">
+						RelativePath=".\src\adb\ImportMailrc.cpp"
+						>
 						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="TRUE">
-							<Tool
-								Name="VCCLCompilerTool"/>
-						</FileConfiguration>
-						<FileConfiguration
 							Name="Release|Win32"
-							ExcludedFromBuild="TRUE">
+							ExcludedFromBuild="true"
+							>
 							<Tool
-								Name="VCCLCompilerTool"/>
+								Name="VCCLCompilerTool"
+							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Unicode Release|Win32"
-							ExcludedFromBuild="TRUE">
+							Name="Debug|Win32"
+							ExcludedFromBuild="true"
+							>
 							<Tool
-								Name="VCCLCompilerTool"/>
+								Name="VCCLCompilerTool"
+							/>
 						</FileConfiguration>
-						<FileConfiguration
-							Name="Unicode Debug|Win32"
-							ExcludedFromBuild="TRUE">
-							<Tool
-								Name="VCCLCompilerTool"/>
-						</FileConfiguration>
 					</File>
 					<File
-						RelativePath=".\src\adb\ImportPine.cpp">
+						RelativePath=".\src\adb\ImportPine.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\src\adb\ImportText.cpp">
+						RelativePath=".\src\adb\ImportText.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\src\adb\ImportVCard.cpp">
+						RelativePath=".\src\adb\ImportVCard.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\src\adb\ImportXFMail.cpp">
+						RelativePath=".\src\adb\ImportXFMail.cpp"
+						>
 						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="TRUE">
-							<Tool
-								Name="VCCLCompilerTool"/>
-						</FileConfiguration>
-						<FileConfiguration
 							Name="Release|Win32"
-							ExcludedFromBuild="TRUE">
+							ExcludedFromBuild="true"
+							>
 							<Tool
-								Name="VCCLCompilerTool"/>
+								Name="VCCLCompilerTool"
+							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Unicode Release|Win32"
-							ExcludedFromBuild="TRUE">
+							Name="Debug|Win32"
+							ExcludedFromBuild="true"
+							>
 							<Tool
-								Name="VCCLCompilerTool"/>
+								Name="VCCLCompilerTool"
+							/>
 						</FileConfiguration>
-						<FileConfiguration
-							Name="Unicode Debug|Win32"
-							ExcludedFromBuild="TRUE">
-							<Tool
-								Name="VCCLCompilerTool"/>
-						</FileConfiguration>
 					</File>
 				</Filter>
 			</Filter>
 			<Filter
 				Name="interfaces"
-				Filter="">
+				>
 				<File
-					RelativePath=".\include\MInterface.mid">
+					RelativePath=".\include\MInterface.mid"
+					>
 					<FileConfiguration
-						Name="Debug|Win32">
+						Name="Release|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Creating MInterface.h and .cpp"
-							CommandLine="extra\scripts\m4.bat $(InputDir) $(InputDir)
-"
+							CommandLine="extra\scripts\m4.bat $(InputDir) $(InputDir)&#x0D;&#x0A;"
 							AdditionalDependencies="$(InputDir)/MInterface.mid;$(InputDir)/MInterface.cpp.m4;$(InputDir)/MInterface.h.m4;$(InputDir)/mid2cpp.m4;$(InputDir)/mid2h.m4"
-							Outputs="$(InputDir)/MInterface.cpp;$(InputDir)/MInterface.h"/>
+							Outputs="$(InputDir)/MInterface.cpp;$(InputDir)/MInterface.h"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32">
+						Name="Debug|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Creating MInterface.h and .cpp"
-							CommandLine="extra\scripts\m4.bat $(InputDir) $(InputDir)
-"
+							CommandLine="extra\scripts\m4.bat $(InputDir) $(InputDir)&#x0D;&#x0A;"
 							AdditionalDependencies="$(InputDir)/MInterface.mid;$(InputDir)/MInterface.cpp.m4;$(InputDir)/MInterface.h.m4;$(InputDir)/mid2cpp.m4;$(InputDir)/mid2h.m4"
-							Outputs="$(InputDir)/MInterface.cpp;$(InputDir)/MInterface.h"/>
+							Outputs="$(InputDir)/MInterface.cpp;$(InputDir)/MInterface.h"
+						/>
 					</FileConfiguration>
-					<FileConfiguration
-						Name="Unicode Release|Win32">
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Creating MInterface.h and .cpp"
-							CommandLine="extra\scripts\m4.bat $(InputDir) $(InputDir)
-"
-							AdditionalDependencies="$(InputDir)/MInterface.mid;$(InputDir)/MInterface.cpp.m4;$(InputDir)/MInterface.h.m4;$(InputDir)/mid2cpp.m4;$(InputDir)/mid2h.m4"
-							Outputs="$(InputDir)/MInterface.cpp;$(InputDir)/MInterface.h"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Unicode Debug|Win32">
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Creating MInterface.h and .cpp"
-							CommandLine="extra\scripts\m4.bat $(InputDir) $(InputDir)
-"
-							AdditionalDependencies="$(InputDir)/MInterface.mid;$(InputDir)/MInterface.cpp.m4;$(InputDir)/MInterface.h.m4;$(InputDir)/mid2cpp.m4;$(InputDir)/mid2h.m4"
-							Outputs="$(InputDir)/MInterface.cpp;$(InputDir)/MInterface.h"/>
-					</FileConfiguration>
 				</File>
 				<Filter
 					Name="python"
-					Filter="">
+					>
 					<File
-						RelativePath=".\src\Python\InitPython.cpp">
+						RelativePath=".\src\Python\InitPython.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\src\Python\PythonDll.cpp">
+						RelativePath=".\src\Python\PythonDll.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\src\Python\PythonHelp.cpp">
+						RelativePath=".\src\Python\PythonHelp.cpp"
+						>
 					</File>
 					<Filter
 						Name="SWIG output"
-						Filter="">
+						>
 						<File
-							RelativePath=".\src\Python\HeaderInfo_swig.cpp">
+							RelativePath=".\src\Python\HeaderInfo_swig.cpp"
+							>
 							<FileConfiguration
-								Name="Debug|Win32">
+								Name="Release|Win32"
+								>
 								<Tool
 									Name="VCCLCompilerTool"
 									PreprocessorDefinitions="STATIC_LINKED"
 									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
+									WarningLevel="1"
+								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Win32">
+								Name="Debug|Win32"
+								>
 								<Tool
 									Name="VCCLCompilerTool"
 									PreprocessorDefinitions="STATIC_LINKED"
 									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
+									WarningLevel="1"
+								/>
 							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Release|Win32">
-								<Tool
-									Name="VCCLCompilerTool"
-									PreprocessorDefinitions="STATIC_LINKED"
-									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Debug|Win32">
-								<Tool
-									Name="VCCLCompilerTool"
-									PreprocessorDefinitions="STATIC_LINKED"
-									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
-							</FileConfiguration>
 						</File>
 						<File
-							RelativePath=".\src\Python\MailFolder_swig.cpp">
+							RelativePath=".\src\Python\MailFolder_swig.cpp"
+							>
 							<FileConfiguration
-								Name="Debug|Win32">
+								Name="Release|Win32"
+								>
 								<Tool
 									Name="VCCLCompilerTool"
 									PreprocessorDefinitions="STATIC_LINKED"
 									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
+									WarningLevel="1"
+								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Win32">
+								Name="Debug|Win32"
+								>
 								<Tool
 									Name="VCCLCompilerTool"
 									PreprocessorDefinitions="STATIC_LINKED"
 									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
+									WarningLevel="1"
+								/>
 							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Release|Win32">
-								<Tool
-									Name="VCCLCompilerTool"
-									PreprocessorDefinitions="STATIC_LINKED"
-									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Debug|Win32">
-								<Tool
-									Name="VCCLCompilerTool"
-									PreprocessorDefinitions="STATIC_LINKED"
-									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
-							</FileConfiguration>
 						</File>
 						<File
-							RelativePath=".\src\Python\MDialogs_swig.cpp">
+							RelativePath=".\src\Python\MDialogs_swig.cpp"
+							>
 							<FileConfiguration
-								Name="Debug|Win32">
+								Name="Release|Win32"
+								>
 								<Tool
 									Name="VCCLCompilerTool"
 									PreprocessorDefinitions="STATIC_LINKED"
 									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
+									WarningLevel="1"
+								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Win32">
+								Name="Debug|Win32"
+								>
 								<Tool
 									Name="VCCLCompilerTool"
 									PreprocessorDefinitions="STATIC_LINKED"
 									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
+									WarningLevel="1"
+								/>
 							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Release|Win32">
-								<Tool
-									Name="VCCLCompilerTool"
-									PreprocessorDefinitions="STATIC_LINKED"
-									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Debug|Win32">
-								<Tool
-									Name="VCCLCompilerTool"
-									PreprocessorDefinitions="STATIC_LINKED"
-									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
-							</FileConfiguration>
 						</File>
 						<File
-							RelativePath=".\src\Python\Message_swig.cpp">
+							RelativePath=".\src\Python\Message_swig.cpp"
+							>
 							<FileConfiguration
-								Name="Debug|Win32">
+								Name="Release|Win32"
+								>
 								<Tool
 									Name="VCCLCompilerTool"
 									PreprocessorDefinitions="STATIC_LINKED"
 									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
+									WarningLevel="1"
+								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Win32">
+								Name="Debug|Win32"
+								>
 								<Tool
 									Name="VCCLCompilerTool"
 									PreprocessorDefinitions="STATIC_LINKED"
 									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
+									WarningLevel="1"
+								/>
 							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Release|Win32">
-								<Tool
-									Name="VCCLCompilerTool"
-									PreprocessorDefinitions="STATIC_LINKED"
-									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Debug|Win32">
-								<Tool
-									Name="VCCLCompilerTool"
-									PreprocessorDefinitions="STATIC_LINKED"
-									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
-							</FileConfiguration>
 						</File>
 						<File
-							RelativePath=".\src\Python\MimePart_swig.cpp">
+							RelativePath=".\src\Python\MimePart_swig.cpp"
+							>
 							<FileConfiguration
-								Name="Debug|Win32">
+								Name="Release|Win32"
+								>
 								<Tool
 									Name="VCCLCompilerTool"
 									PreprocessorDefinitions="STATIC_LINKED"
 									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
+									WarningLevel="1"
+								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Win32">
+								Name="Debug|Win32"
+								>
 								<Tool
 									Name="VCCLCompilerTool"
 									PreprocessorDefinitions="STATIC_LINKED"
 									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
+									WarningLevel="1"
+								/>
 							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Release|Win32">
-								<Tool
-									Name="VCCLCompilerTool"
-									PreprocessorDefinitions="STATIC_LINKED"
-									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Debug|Win32">
-								<Tool
-									Name="VCCLCompilerTool"
-									PreprocessorDefinitions="STATIC_LINKED"
-									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
-							</FileConfiguration>
 						</File>
 						<File
-							RelativePath=".\src\Python\MimeType_swig.cpp">
+							RelativePath=".\src\Python\MimeType_swig.cpp"
+							>
 							<FileConfiguration
-								Name="Debug|Win32">
+								Name="Release|Win32"
+								>
 								<Tool
 									Name="VCCLCompilerTool"
 									PreprocessorDefinitions="STATIC_LINKED"
 									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
+									WarningLevel="1"
+								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Win32">
+								Name="Debug|Win32"
+								>
 								<Tool
 									Name="VCCLCompilerTool"
 									PreprocessorDefinitions="STATIC_LINKED"
 									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
+									WarningLevel="1"
+								/>
 							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Release|Win32">
-								<Tool
-									Name="VCCLCompilerTool"
-									PreprocessorDefinitions="STATIC_LINKED"
-									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Debug|Win32">
-								<Tool
-									Name="VCCLCompilerTool"
-									PreprocessorDefinitions="STATIC_LINKED"
-									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
-							</FileConfiguration>
 						</File>
 						<File
-							RelativePath=".\src\Python\SendMessage_swig.cpp">
+							RelativePath=".\src\Python\SendMessage_swig.cpp"
+							>
 							<FileConfiguration
-								Name="Debug|Win32">
+								Name="Release|Win32"
+								>
 								<Tool
 									Name="VCCLCompilerTool"
 									PreprocessorDefinitions="STATIC_LINKED"
 									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
+									WarningLevel="1"
+								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Win32">
+								Name="Debug|Win32"
+								>
 								<Tool
 									Name="VCCLCompilerTool"
 									PreprocessorDefinitions="STATIC_LINKED"
 									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
+									WarningLevel="1"
+								/>
 							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Release|Win32">
-								<Tool
-									Name="VCCLCompilerTool"
-									PreprocessorDefinitions="STATIC_LINKED"
-									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Debug|Win32">
-								<Tool
-									Name="VCCLCompilerTool"
-									PreprocessorDefinitions="STATIC_LINKED"
-									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
-							</FileConfiguration>
 						</File>
 						<File
-							RelativePath=".\src\Python\swiglib_swig.cpp">
+							RelativePath=".\src\Python\swiglib_swig.cpp"
+							>
 							<FileConfiguration
-								Name="Debug|Win32">
+								Name="Release|Win32"
+								>
 								<Tool
 									Name="VCCLCompilerTool"
 									PreprocessorDefinitions="STATIC_LINKED,SWIG_GLOBAL"
 									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
+									WarningLevel="1"
+								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Win32">
+								Name="Debug|Win32"
+								>
 								<Tool
 									Name="VCCLCompilerTool"
 									PreprocessorDefinitions="STATIC_LINKED,SWIG_GLOBAL"
 									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
+									WarningLevel="1"
+								/>
 							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Release|Win32">
-								<Tool
-									Name="VCCLCompilerTool"
-									PreprocessorDefinitions="STATIC_LINKED,SWIG_GLOBAL"
-									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Debug|Win32">
-								<Tool
-									Name="VCCLCompilerTool"
-									PreprocessorDefinitions="STATIC_LINKED,SWIG_GLOBAL"
-									UsePrecompiledHeader="0"
-									WarningLevel="1"/>
-							</FileConfiguration>
 						</File>
 					</Filter>
 					<Filter
 						Name="SWIG precompiled output"
-						Filter="">
+						>
 						<File
-							RelativePath=".\src\Python\HeaderInfo.cpp-swig">
+							RelativePath=".\src\Python\HeaderInfo.cpp-swig"
+							>
 							<FileConfiguration
-								Name="Debug|Win32">
+								Name="Release|Win32"
+								>
 								<Tool
 									Name="VCCustomBuildTool"
 									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
+									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp&#x0D;&#x0A;"
+									Outputs="$(InputDir)\$(InputName)_swig.cpp"
+								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Win32">
+								Name="Debug|Win32"
+								>
 								<Tool
 									Name="VCCustomBuildTool"
 									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
+									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp&#x0D;&#x0A;"
+									Outputs="$(InputDir)\$(InputName)_swig.cpp"
+								/>
 							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Release|Win32">
-								<Tool
-									Name="VCCustomBuildTool"
-									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Debug|Win32">
-								<Tool
-									Name="VCCustomBuildTool"
-									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
-							</FileConfiguration>
 						</File>
 						<File
-							RelativePath=".\src\Python\MailFolder.cpp-swig">
+							RelativePath=".\src\Python\MailFolder.cpp-swig"
+							>
 							<FileConfiguration
-								Name="Debug|Win32">
+								Name="Release|Win32"
+								>
 								<Tool
 									Name="VCCustomBuildTool"
 									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
+									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp&#x0D;&#x0A;"
+									Outputs="$(InputDir)\$(InputName)_swig.cpp"
+								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Win32">
+								Name="Debug|Win32"
+								>
 								<Tool
 									Name="VCCustomBuildTool"
 									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
+									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp&#x0D;&#x0A;"
+									Outputs="$(InputDir)\$(InputName)_swig.cpp"
+								/>
 							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Release|Win32">
-								<Tool
-									Name="VCCustomBuildTool"
-									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Debug|Win32">
-								<Tool
-									Name="VCCustomBuildTool"
-									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
-							</FileConfiguration>
 						</File>
 						<File
-							RelativePath=".\src\Python\MDialogs.cpp-swig">
+							RelativePath=".\src\Python\MDialogs.cpp-swig"
+							>
 							<FileConfiguration
-								Name="Debug|Win32">
+								Name="Release|Win32"
+								>
 								<Tool
 									Name="VCCustomBuildTool"
 									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
+									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp&#x0D;&#x0A;"
+									Outputs="$(InputDir)\$(InputName)_swig.cpp"
+								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Win32">
+								Name="Debug|Win32"
+								>
 								<Tool
 									Name="VCCustomBuildTool"
 									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
+									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp&#x0D;&#x0A;"
+									Outputs="$(InputDir)\$(InputName)_swig.cpp"
+								/>
 							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Release|Win32">
-								<Tool
-									Name="VCCustomBuildTool"
-									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Debug|Win32">
-								<Tool
-									Name="VCCustomBuildTool"
-									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
-							</FileConfiguration>
 						</File>
 						<File
-							RelativePath=".\src\Python\Message.cpp-swig">
+							RelativePath=".\src\Python\Message.cpp-swig"
+							>
 							<FileConfiguration
-								Name="Debug|Win32">
+								Name="Release|Win32"
+								>
 								<Tool
 									Name="VCCustomBuildTool"
 									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
+									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp&#x0D;&#x0A;"
+									Outputs="$(InputDir)\$(InputName)_swig.cpp"
+								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Win32">
+								Name="Debug|Win32"
+								>
 								<Tool
 									Name="VCCustomBuildTool"
 									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
+									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp&#x0D;&#x0A;"
+									Outputs="$(InputDir)\$(InputName)_swig.cpp"
+								/>
 							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Release|Win32">
-								<Tool
-									Name="VCCustomBuildTool"
-									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Debug|Win32">
-								<Tool
-									Name="VCCustomBuildTool"
-									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
-							</FileConfiguration>
 						</File>
 						<File
-							RelativePath=".\src\Python\MimePart.cpp-swig">
+							RelativePath=".\src\Python\MimePart.cpp-swig"
+							>
 							<FileConfiguration
-								Name="Debug|Win32">
+								Name="Release|Win32"
+								>
 								<Tool
 									Name="VCCustomBuildTool"
 									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
+									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp&#x0D;&#x0A;"
+									Outputs="$(InputDir)\$(InputName)_swig.cpp"
+								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Win32">
+								Name="Debug|Win32"
+								>
 								<Tool
 									Name="VCCustomBuildTool"
 									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
+									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp&#x0D;&#x0A;"
+									Outputs="$(InputDir)\$(InputName)_swig.cpp"
+								/>
 							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Release|Win32">
-								<Tool
-									Name="VCCustomBuildTool"
-									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Debug|Win32">
-								<Tool
-									Name="VCCustomBuildTool"
-									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
-							</FileConfiguration>
 						</File>
 						<File
-							RelativePath=".\src\Python\MimeType.cpp-swig">
+							RelativePath=".\src\Python\MimeType.cpp-swig"
+							>
 							<FileConfiguration
-								Name="Debug|Win32">
+								Name="Release|Win32"
+								>
 								<Tool
 									Name="VCCustomBuildTool"
 									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
+									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp&#x0D;&#x0A;"
+									Outputs="$(InputDir)\$(InputName)_swig.cpp"
+								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Win32">
+								Name="Debug|Win32"
+								>
 								<Tool
 									Name="VCCustomBuildTool"
 									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
+									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp&#x0D;&#x0A;"
+									Outputs="$(InputDir)\$(InputName)_swig.cpp"
+								/>
 							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Release|Win32">
-								<Tool
-									Name="VCCustomBuildTool"
-									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Debug|Win32">
-								<Tool
-									Name="VCCustomBuildTool"
-									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
-							</FileConfiguration>
 						</File>
 						<File
-							RelativePath=".\src\Python\SendMessage.cpp-swig">
+							RelativePath=".\src\Python\SendMessage.cpp-swig"
+							>
 							<FileConfiguration
-								Name="Debug|Win32">
+								Name="Release|Win32"
+								>
 								<Tool
 									Name="VCCustomBuildTool"
 									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
+									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp&#x0D;&#x0A;"
+									Outputs="$(InputDir)\$(InputName)_swig.cpp"
+								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Win32">
+								Name="Debug|Win32"
+								>
 								<Tool
 									Name="VCCustomBuildTool"
 									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
+									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp&#x0D;&#x0A;"
+									Outputs="$(InputDir)\$(InputName)_swig.cpp"
+								/>
 							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Release|Win32">
-								<Tool
-									Name="VCCustomBuildTool"
-									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Debug|Win32">
-								<Tool
-									Name="VCCustomBuildTool"
-									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
-							</FileConfiguration>
 						</File>
 						<File
-							RelativePath=".\src\Python\swiglib.cpp-swig">
+							RelativePath=".\src\Python\swiglib.cpp-swig"
+							>
 							<FileConfiguration
-								Name="Debug|Win32">
+								Name="Release|Win32"
+								>
 								<Tool
 									Name="VCCustomBuildTool"
 									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
+									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp&#x0D;&#x0A;"
+									Outputs="$(InputDir)\$(InputName)_swig.cpp"
+								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Win32">
+								Name="Debug|Win32"
+								>
 								<Tool
 									Name="VCCustomBuildTool"
 									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
+									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp&#x0D;&#x0A;"
+									Outputs="$(InputDir)\$(InputName)_swig.cpp"
+								/>
 							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Release|Win32">
-								<Tool
-									Name="VCCustomBuildTool"
-									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Unicode Debug|Win32">
-								<Tool
-									Name="VCCustomBuildTool"
-									Description="Updating SWIG-generated sources"
-									CommandLine="copy $(InputPath) $(InputDir)\$(InputName)_swig.cpp
-"
-									Outputs="$(InputDir)\$(InputName)_swig.cpp"/>
-							</FileConfiguration>
 						</File>
 					</Filter>
 				</Filter>
 				<Filter
 					Name="SWIG input"
-					Filter="">
+					>
 					<File
-						RelativePath=".\include\interface\HeaderInfo.i">
+						RelativePath=".\include\interface\HeaderInfo.i"
+						>
 					</File>
 					<File
-						RelativePath=".\include\interface\MailFolder.i">
+						RelativePath=".\include\interface\MailFolder.i"
+						>
 					</File>
 					<File
-						RelativePath=".\include\interface\MDialogs.i">
+						RelativePath=".\include\interface\MDialogs.i"
+						>
 					</File>
 					<File
-						RelativePath=".\include\interface\Message.i">
+						RelativePath=".\include\interface\Message.i"
+						>
 					</File>
 					<File
-						RelativePath=".\include\interface\MimePart.i">
+						RelativePath=".\include\interface\MimePart.i"
+						>
 					</File>
 					<File
-						RelativePath=".\include\interface\MimeType.i">
+						RelativePath=".\include\interface\MimeType.i"
+						>
 					</File>
 					<File
-						RelativePath=".\include\interface\SendMessage.i">
+						RelativePath=".\include\interface\SendMessage.i"
+						>
 					</File>
 					<File
-						RelativePath=".\include\interface\swigcmn.i">
+						RelativePath=".\include\interface\swigcmn.i"
+						>
 					</File>
 					<File
-						RelativePath=".\include\interface\swiglib.i">
+						RelativePath=".\include\interface\swiglib.i"
+						>
 					</File>
 				</Filter>
 			</Filter>
 			<Filter
 				Name="util"
-				Filter="">
+				>
 				<File
-					RelativePath=".\src\util\ColourNames.cpp">
+					RelativePath=".\src\util\ColourNames.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\util\matchurl.cpp">
+					RelativePath=".\src\util\matchurl.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\util\ssl.cpp">
+					RelativePath=".\src\util\ssl.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\util\strutil.cpp">
+					RelativePath=".\src\util\strutil.cpp"
+					>
 					<FileConfiguration
-						Name="Debug|Win32">
+						Name="Release|Win32"
+						>
 						<Tool
 							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories="lib/imap/src"/>
+							AdditionalIncludeDirectories="lib/imap/src"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32">
+						Name="Debug|Win32"
+						>
 						<Tool
 							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories="lib/imap/src"/>
+							AdditionalIncludeDirectories="lib/imap/src"
+						/>
 					</FileConfiguration>
-					<FileConfiguration
-						Name="Unicode Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories="lib/imap/src"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Unicode Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories="lib/imap/src"/>
-					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\util\sysutil.cpp">
+					RelativePath=".\src\util\sysutil.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\util\twofish2.c">
+					RelativePath=".\src\util\twofish2.c"
+					>
 					<FileConfiguration
-						Name="Debug|Win32">
+						Name="Release|Win32"
+						>
 						<Tool
 							Name="VCCLCompilerTool"
 							UsePrecompiledHeader="0"
-							WarningLevel="0"/>
+							WarningLevel="0"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32">
+						Name="Debug|Win32"
+						>
 						<Tool
 							Name="VCCLCompilerTool"
 							UsePrecompiledHeader="0"
-							WarningLevel="0"/>
+							WarningLevel="0"
+						/>
 					</FileConfiguration>
-					<FileConfiguration
-						Name="Unicode Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							WarningLevel="0"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Unicode Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							WarningLevel="0"/>
-					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\util\upgrade.cpp">
+					RelativePath=".\src\util\upgrade.cpp"
+					>
 				</File>
 			</Filter>
 			<Filter
 				Name="modules"
-				Filter="">
+				>
 				<File
-					RelativePath=".\src\modules\Calendar.cpp">
+					RelativePath=".\src\modules\Calendar.cpp"
+					>
 					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="TRUE">
-						<Tool
-							Name="VCCLCompilerTool"/>
-					</FileConfiguration>
-					<FileConfiguration
 						Name="Release|Win32"
-						ExcludedFromBuild="TRUE">
+						ExcludedFromBuild="true"
+						>
 						<Tool
-							Name="VCCLCompilerTool"/>
+							Name="VCCLCompilerTool"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Unicode Release|Win32"
-						ExcludedFromBuild="TRUE">
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
 						<Tool
-							Name="VCCLCompilerTool"/>
+							Name="VCCLCompilerTool"
+						/>
 					</FileConfiguration>
-					<FileConfiguration
-						Name="Unicode Debug|Win32"
-						ExcludedFromBuild="TRUE">
-						<Tool
-							Name="VCCLCompilerTool"/>
-					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\modules\Filters.cpp">
+					RelativePath=".\src\modules\Filters.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\modules\Mdummy.cpp">
+					RelativePath=".\src\modules\Mdummy.cpp"
+					>
 					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="TRUE">
-						<Tool
-							Name="VCCLCompilerTool"/>
-					</FileConfiguration>
-					<FileConfiguration
 						Name="Release|Win32"
-						ExcludedFromBuild="TRUE">
+						ExcludedFromBuild="true"
+						>
 						<Tool
-							Name="VCCLCompilerTool"/>
+							Name="VCCLCompilerTool"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Unicode Release|Win32"
-						ExcludedFromBuild="TRUE">
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
 						<Tool
-							Name="VCCLCompilerTool"/>
+							Name="VCCLCompilerTool"
+						/>
 					</FileConfiguration>
-					<FileConfiguration
-						Name="Unicode Debug|Win32"
-						ExcludedFromBuild="TRUE">
-						<Tool
-							Name="VCCLCompilerTool"/>
-					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\modules\Migrate.cpp">
+					RelativePath=".\src\modules\Migrate.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\src\modules\PalmOS.cpp">
+					RelativePath=".\src\modules\PalmOS.cpp"
+					>
 					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="TRUE">
-						<Tool
-							Name="VCCLCompilerTool"/>
-					</FileConfiguration>
-					<FileConfiguration
 						Name="Release|Win32"
-						ExcludedFromBuild="TRUE">
+						ExcludedFromBuild="true"
+						>
 						<Tool
-							Name="VCCLCompilerTool"/>
+							Name="VCCLCompilerTool"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Unicode Release|Win32"
-						ExcludedFromBuild="TRUE">
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
 						<Tool
-							Name="VCCLCompilerTool"/>
+							Name="VCCLCompilerTool"
+						/>
 					</FileConfiguration>
-					<FileConfiguration
-						Name="Unicode Debug|Win32"
-						ExcludedFromBuild="TRUE">
-						<Tool
-							Name="VCCLCompilerTool"/>
-					</FileConfiguration>
 				</File>
 				<Filter
 					Name="viewflt"
-					Filter="">
+					>
 					<File
-						RelativePath=".\src\modules\viewflt\PGP.cpp">
+						RelativePath=".\src\modules\viewflt\PGP.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\src\modules\viewflt\QuoteURL.cpp">
+						RelativePath=".\src\modules\viewflt\QuoteURL.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\src\modules\viewflt\Rot13.cpp">
+						RelativePath=".\src\modules\viewflt\Rot13.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\src\modules\viewflt\Signature.cpp">
+						RelativePath=".\src\modules\viewflt\Signature.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\src\modules\viewflt\TextMarkup.cpp">
+						RelativePath=".\src\modules\viewflt\TextMarkup.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\src\modules\viewflt\Trailer.cpp">
+						RelativePath=".\src\modules\viewflt\Trailer.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\src\modules\viewflt\UUDecode.cpp">
+						RelativePath=".\src\modules\viewflt\UUDecode.cpp"
+						>
 					</File>
 				</Filter>
 				<Filter
 					Name="viewers"
-					Filter="">
+					>
 					<File
-						RelativePath=".\src\modules\HtmlViewer.cpp">
+						RelativePath=".\src\modules\HtmlViewer.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\src\modules\LayoutViewer.cpp">
+						RelativePath=".\src\modules\LayoutViewer.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\src\modules\TextViewer.cpp">
+						RelativePath=".\src\modules\TextViewer.cpp"
+						>
 					</File>
 				</Filter>
 				<Filter
 					Name="editors"
-					Filter="">
+					>
 					<File
-						RelativePath=".\src\modules\BareBonesEditor.cpp">
+						RelativePath=".\src\modules\BareBonesEditor.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\src\modules\LayoutEditor.cpp">
+						RelativePath=".\src\modules\LayoutEditor.cpp"
+						>
 					</File>
 				</Filter>
 				<Filter
 					Name="importers"
-					Filter="">
+					>
 					<File
-						RelativePath=".\src\modules\NetscapeImporter.cpp">
+						RelativePath=".\src\modules\NetscapeImporter.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\src\modules\PineImport.cpp">
+						RelativePath=".\src\modules\PineImport.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\src\modules\XFMailImport.cpp">
+						RelativePath=".\src\modules\XFMailImport.cpp"
+						>
 					</File>
 				</Filter>
 				<Filter
 					Name="crypt"
-					Filter="">
+					>
 					<File
-						RelativePath=".\src\modules\crypt\PGPEngine.cpp">
+						RelativePath=".\src\modules\crypt\PGPEngine.cpp"
+						>
 					</File>
 				</Filter>
 				<Filter
 					Name="spam"
-					Filter="">
+					>
 					<File
-						RelativePath=".\src\modules\spam\DspamFilter.cpp">
+						RelativePath=".\src\modules\spam\DspamFilter.cpp"
+						>
 						<FileConfiguration
-							Name="Debug|Win32">
+							Name="Release|Win32"
+							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories="lib/dspam/src"
-								PreprocessorDefinitions="HAVE_CONFIG_H"/>
+								PreprocessorDefinitions="HAVE_CONFIG_H"
+							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Win32">
+							Name="Debug|Win32"
+							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories="lib/dspam/src"
-								PreprocessorDefinitions="HAVE_CONFIG_H"/>
+								PreprocessorDefinitions="HAVE_CONFIG_H"
+							/>
 						</FileConfiguration>
-						<FileConfiguration
-							Name="Unicode Release|Win32">
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories="lib/dspam/src"
-								PreprocessorDefinitions="HAVE_CONFIG_H"/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Unicode Debug|Win32">
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories="lib/dspam/src"
-								PreprocessorDefinitions="HAVE_CONFIG_H"/>
-						</FileConfiguration>
 					</File>
 					<File
-						RelativePath=".\src\modules\spam\HeadersFilter.cpp">
+						RelativePath=".\src\modules\spam\HeadersFilter.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\src\modules\spam\ServerSideFilter.cpp">
+						RelativePath=".\src\modules\spam\ServerSideFilter.cpp"
+						>
 					</File>
 				</Filter>
 			</Filter>
 			<Filter
 				Name="vcard"
-				Filter="">
+				>
 				<File
-					RelativePath=".\src\wx\common\vcard.cpp">
+					RelativePath=".\src\wx\common\vcard.cpp"
+					>
 					<FileConfiguration
-						Name="Debug|Win32">
+						Name="Release|Win32"
+						>
 						<Tool
 							Name="VCCLCompilerTool"
-							PrecompiledHeaderThrough="wx/wxprec.h"/>
+							PrecompiledHeaderThrough="wx/wxprec.h"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32">
+						Name="Debug|Win32"
+						>
 						<Tool
 							Name="VCCLCompilerTool"
-							PrecompiledHeaderThrough="wx/wxprec.h"/>
+							PrecompiledHeaderThrough="wx/wxprec.h"
+						/>
 					</FileConfiguration>
-					<FileConfiguration
-						Name="Unicode Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							PrecompiledHeaderThrough="wx/wxprec.h"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Unicode Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							PrecompiledHeaderThrough="wx/wxprec.h"/>
-					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\wx\generic\vcarddlg.cpp">
+					RelativePath=".\src\wx\generic\vcarddlg.cpp"
+					>
 					<FileConfiguration
-						Name="Debug|Win32">
+						Name="Release|Win32"
+						>
 						<Tool
 							Name="VCCLCompilerTool"
-							PrecompiledHeaderThrough="wx/wxprec.h"/>
+							PrecompiledHeaderThrough="wx/wxprec.h"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32">
+						Name="Debug|Win32"
+						>
 						<Tool
 							Name="VCCLCompilerTool"
-							PrecompiledHeaderThrough="wx/wxprec.h"/>
+							PrecompiledHeaderThrough="wx/wxprec.h"
+						/>
 					</FileConfiguration>
-					<FileConfiguration
-						Name="Unicode Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							PrecompiledHeaderThrough="wx/wxprec.h"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Unicode Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							PrecompiledHeaderThrough="wx/wxprec.h"/>
-					</FileConfiguration>
 				</File>
 			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
 			<File
-				RelativePath=".\include\Address.h">
+				RelativePath=".\include\Address.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\AddressCC.h">
+				RelativePath=".\include\AddressCC.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\gui\AddressExpander.h">
+				RelativePath=".\include\gui\AddressExpander.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\ASMailFolder.h">
+				RelativePath=".\include\ASMailFolder.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\AttachDialog.h">
+				RelativePath=".\include\AttachDialog.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\CacheFile.h">
+				RelativePath=".\include\CacheFile.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\ClickAtt.h">
+				RelativePath=".\include\ClickAtt.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\ClickInfo.h">
+				RelativePath=".\include\ClickInfo.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\ClickURL.h">
+				RelativePath=".\include\ClickURL.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\CmdLineOpts.h">
+				RelativePath=".\include\CmdLineOpts.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\Collect.h">
+				RelativePath=".\include\Collect.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\Composer.h">
+				RelativePath=".\include\Composer.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\ConfigPrivate.h">
+				RelativePath=".\include\ConfigPrivate.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\ConfigSource.h">
+				RelativePath=".\include\ConfigSource.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\ConfigSourceLocal.h">
+				RelativePath=".\include\ConfigSourceLocal.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\ConfigSourcesAll.h">
+				RelativePath=".\include\ConfigSourcesAll.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\FolderMonitor.h">
+				RelativePath=".\include\FolderMonitor.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\FolderType.h">
+				RelativePath=".\include\FolderType.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\FolderView.h">
+				RelativePath=".\include\FolderView.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\guidef.h">
+				RelativePath=".\include\guidef.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\HeaderInfo.h">
+				RelativePath=".\include\HeaderInfo.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\HeaderInfoImpl.h">
+				RelativePath=".\include\HeaderInfoImpl.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\HeadersDialogs.h">
+				RelativePath=".\include\HeadersDialogs.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\InitPython.h">
+				RelativePath=".\include\InitPython.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\kbList.h">
+				RelativePath=".\include\kbList.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\ListReceiver.h">
+				RelativePath=".\include\ListReceiver.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\lists.h">
+				RelativePath=".\include\lists.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\LogCircle.h">
+				RelativePath=".\include\LogCircle.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\MailFolder.h">
+				RelativePath=".\include\MailFolder.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\MailFolderCC.h">
+				RelativePath=".\include\MailFolderCC.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\MailFolderCmn.h">
+				RelativePath=".\include\MailFolderCmn.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\MApplication.h">
+				RelativePath=".\include\MApplication.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\MAtExit.h">
+				RelativePath=".\include\MAtExit.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\gui\MBookCtrl.h">
+				RelativePath=".\include\gui\MBookCtrl.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\Mcallbacks.h">
+				RelativePath=".\include\Mcallbacks.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\Mcclient.h">
+				RelativePath=".\include\Mcclient.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\Mcommon.h">
+				RelativePath=".\include\Mcommon.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\Mconfig.h">
+				RelativePath=".\include\Mconfig.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\Mdefaults.h">
+				RelativePath=".\include\Mdefaults.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\MDialogs.h">
+				RelativePath=".\include\MDialogs.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\Mdnd.h">
+				RelativePath=".\include\Mdnd.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\Merror.h">
+				RelativePath=".\include\Merror.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\Message.h">
+				RelativePath=".\include\Message.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\MessageCC.h">
+				RelativePath=".\include\MessageCC.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\MessageEditor.h">
+				RelativePath=".\include\MessageEditor.h"
+				>
 			</File>
 			<File

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing. 
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev