diff --git a/src/mod/languages/mod_spidermonkey/Makefile b/src/mod/languages/mod_spidermonkey/Makefile
index a310e7500a..e5ea8fde08 100644
--- a/src/mod/languages/mod_spidermonkey/Makefile
+++ b/src/mod/languages/mod_spidermonkey/Makefile
@@ -61,7 +61,7 @@ endif
 
 CFLAGS += -I$(BASE)/libs/mozilla/js/src -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX  -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/js/src -I$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_DBG.OBJ -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX  -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/nsprpub/dist/include/nspr -I$(OS_CONFIG)_DBG.OBJ
 LDFLAGS +=-DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX  -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/nsprpub/dist/include/nspr -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX  -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/nsprpub/dist/include/nspr -lteletone
-OBJS=$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_DBG.OBJ/libjs.a $(BASE)/libs/mozilla/nsprpub/dist/lib/libnspr4.a -lcurl
+OBJS=$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_DBG.OBJ/libjs.a $(BASE)/libs/mozilla/nsprpub/dist/lib/libnspr4.a -lcurl -letpan
 LINKER=$(CC)
 
 
@@ -70,6 +70,7 @@ all:	depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 depends:
 	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) mozilla.tar.gz --prefix=$(PREFIX)
 	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install curl-7.15.2.tar.gz --prefix=$(PREFIX)
+	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libetpan-0.45.tar.gz --prefix=$(PREFIX)
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj
index 12ca04b0df..48ead36cf0 100644
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj
@@ -65,10 +65,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="js32.lib  curllib.lib ws2_32.lib winmm.lib sqlite.lib fdlibm.lib libnspr4.lib libplc4.lib  libplds4.lib libteletone.lib FreeSwitchCore.lib"
+				AdditionalDependencies="js32.lib  curllib.lib ws2_32.lib winmm.lib sqlite.lib fdlibm.lib libnspr4.lib libplc4.lib  libplds4.lib libteletone.lib FreeSwitchCore.lib libetpan.lib"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_spidermonkey.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;..\..\..\..\libs\js\src\$(OutDir)&quot;;&quot;..\..\..\..\libs\curl\lib\$(OutDir)&quot;;&quot;..\..\..\..\libs\sqlite\$(OutDir)&quot;;..\..\..\..\libs\js\nspr\lib;&quot;..\..\..\..\w32\vsnet\$(OutDir)&quot;"
+				AdditionalLibraryDirectories="&quot;..\..\..\..\libs\js\src\$(OutDir)&quot;;&quot;..\..\..\..\libs\curl\lib\$(OutDir)&quot;;&quot;..\..\..\..\libs\sqlite\$(OutDir)&quot;;..\..\..\..\libs\js\nspr\lib;&quot;..\..\..\..\w32\vsnet\$(OutDir)&quot;;&quot;..\..\..\..\libs\libetpan\build-windows\libetpan\$(OutDir)&quot;"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/mod_spidermonkey.pdb"
 				SubSystem="2"
@@ -147,10 +147,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="js32.lib  curllib.lib ws2_32.lib winmm.lib sqlite.lib fdlibm.lib libnspr4.lib libplc4.lib  libplds4.lib libteletone.lib FreeSwitchCore.lib"
+				AdditionalDependencies="js32.lib  curllib.lib ws2_32.lib winmm.lib sqlite.lib fdlibm.lib libnspr4.lib libplc4.lib  libplds4.lib libteletone.lib FreeSwitchCore.lib libetpan.lib"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_spidermonkey.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;..\..\..\..\libs\js\src\$(OutDir)&quot;;&quot;..\..\..\..\libs\curl\lib\$(OutDir)&quot;;&quot;..\..\..\..\libs\sqlite\$(OutDir)&quot;;..\..\..\..\libs\js\nspr\lib;&quot;..\..\..\..\w32\vsnet\$(OutDir)&quot;"
+				AdditionalLibraryDirectories="&quot;..\..\..\..\libs\js\src\$(OutDir)&quot;;&quot;..\..\..\..\libs\curl\lib\$(OutDir)&quot;;&quot;..\..\..\..\libs\sqlite\$(OutDir)&quot;;..\..\..\..\libs\js\nspr\lib;&quot;..\..\..\..\w32\vsnet\$(OutDir)&quot;;&quot;..\..\..\..\libs\libetpan\build-windows\libetpan\$(OutDir)&quot;"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
diff --git a/w32/vsnet/GetLibs.vbs b/w32/vsnet/GetLibs.vbs
index 24934a14a0..5e98161732 100644
--- a/w32/vsnet/GetLibs.vbs
+++ b/w32/vsnet/GetLibs.vbs
@@ -229,6 +229,7 @@ End If
 If BuildModSpiderMonkey Then
 	BuildLibs_SpiderMonkey BuildDebug, BuildRelease
 	BuildLibs_curl BuildDebug, BuildRelease
+	BuildLibs_libetpan BuildDebug, BuildRelease
 End If
 
 WScript.Echo "Complete"
@@ -642,6 +643,29 @@ Sub BuildLibs_libsndfile(BuildDebug, BuildRelease)
 	End If 
 End Sub
 
+Sub BuildLibs_libetpan(BuildDebug, BuildRelease)
+	If Not FSO.FolderExists(LibDestDir & "libetpan") Then 
+		WgetUnCompress LibsBase & "libetpan-0.45.tar.gz", LibDestDir
+		RenameFolder LibDestDir & "libetpan-0.45", "libetpan"
+		FSO.CopyFile Utilsdir & "libetpan.vcproj", LibDestDir & "libetpan\build-windows\libetpan\", True
+	End If 
+	If FSO.FolderExists(LibDestDir & "libetpan") Then 
+		If BuildDebug Then
+			If Not FSO.FileExists(LibDestDir & "libetpan\build-windows\libetpan\Debug\libetpan.lib") Then 
+				BuildViaVCBuild LibDestDir & "libetpan\build-windows\libetpan\libetpan.vcproj", "Debug"
+			End If
+		End If
+		If BuildRelease Then
+			If Not FSO.FileExists(LibDestDir & "libetpan\build-windows\libetpan\Release\libetpan.lib") Then 
+				BuildViaVCBuild LibDestDir & "libetpan\build-windows\libetpan\libsndfile.vcproj", "Release"
+			End If
+		End If
+	Else
+		Wscript.echo "Unable to download libetpan"
+	End If 
+End Sub
+
+
 Sub BuildLibs_howl(BuildDebug, BuildRelease)
 	If Not FSO.FolderExists(LibDestDir & "howl") Then 
 		WgetUnCompress LibsBase & "howl-1.0.0.tar.gz", LibDestDir
diff --git a/w32/vsnet/Tools/libetpan.vcproj b/w32/vsnet/Tools/libetpan.vcproj
new file mode 100644
index 0000000000..a529316629
--- /dev/null
+++ b/w32/vsnet/Tools/libetpan.vcproj
@@ -0,0 +1,1031 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="libetpan"
+	ProjectGUID="{BA4DED3C-E56F-4484-BFC3-9C13E461A1BE}"
+	RootNamespace="libetpan"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="0"
+				AdditionalIncludeDirectories="../include;../include/libetpan"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBETPAN_DLL"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+				ForcedIncludeFiles="../StdAfx.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../include;../include/libetpan"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBETPAN_DLL"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="0"
+				CompileAs="1"
+				ForcedIncludeFiles="../StdAfx.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\build_headers.list"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="cd ..&#x0D;&#x0A;build_headers.bat&#x0D;&#x0A;"
+						Outputs="$(InputDir)\_headers_depends"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="cd ..&#x0D;&#x0A;build_headers.bat&#x0D;&#x0A;"
+						Outputs="$(InputDir)\_headers_depends"
+					/>
+				</FileConfiguration>
+			</File>
+			<Filter
+				Name="engine"
+				>
+				<File
+					RelativePath="..\..\src\engine\mailengine.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\src\engine\mailprivacy.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\src\engine\mailprivacy_gnupg.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\src\engine\mailprivacy_smime.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\src\engine\mailprivacy_tools.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+			<Filter
+				Name="datatypes"
+				>
+				<File
+					RelativePath="..\..\src\data-types\base64.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\data-types\carray.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\data-types\charconv.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\data-types\chash.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\data-types\cinthash.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\data-types\clist.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\data-types\connect.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\data-types\mail_cache_db.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\data-types\maillock.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\data-types\mailsem.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\src\data-types\mailstream.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\data-types\mailstream_helper.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\data-types\mailstream_low.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\data-types\mailstream_socket.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\data-types\mailstream_ssl.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\data-types\mapping.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\src\data-types\md5.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\data-types\mmapstring.c"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="low-level"
+				>
+				<Filter
+					Name="imap"
+					>
+					<File
+						RelativePath="..\..\src\low-level\imap\mailimap.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\imap\mailimap_helper.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\imap\mailimap_keywords.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\imap\mailimap_parser.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\imap\mailimap_print.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\imap\mailimap_sender.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\imap\mailimap_socket.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\imap\mailimap_ssl.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\imap\mailimap_types.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\imap\mailimap_types_helper.c"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="pop3"
+					>
+					<File
+						RelativePath="..\..\src\low-level\pop3\mailpop3.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\pop3\mailpop3_helper.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\pop3\mailpop3_socket.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\pop3\mailpop3_ssl.c"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="mime"
+					>
+					<File
+						RelativePath="..\..\src\low-level\mime\mailmime.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\mime\mailmime_content.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\mime\mailmime_decode.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\mime\mailmime_disposition.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\mime\mailmime_types.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\mime\mailmime_types_helper.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\mime\mailmime_write.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\mime\mailmime_write_file.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\mime\mailmime_write_generic.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\mime\mailmime_write_mem.c"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="imf"
+					>
+					<File
+						RelativePath="..\..\src\low-level\imf\mailimf.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\imf\mailimf_types.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\imf\mailimf_types_helper.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\imf\mailimf_write.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\imf\mailimf_write_file.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\imf\mailimf_write_generic.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\imf\mailimf_write_mem.c"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="maildir"
+					>
+					<File
+						RelativePath="..\..\src\low-level\maildir\maildir.c"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="mbox"
+					>
+					<File
+						RelativePath="..\..\src\low-level\mbox\mailmbox.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\mbox\mailmbox_parse.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\mbox\mailmbox_types.c"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="mh"
+					>
+					<File
+						RelativePath="..\..\src\low-level\mh\mailmh.c"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="nntp"
+					>
+					<File
+						RelativePath="..\..\src\low-level\nntp\newsnntp.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\nntp\newsnntp_socket.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\nntp\newsnntp_ssl.c"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="smtp"
+					>
+					<File
+						RelativePath="..\..\src\low-level\smtp\mailsmtp.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\smtp\mailsmtp_helper.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\smtp\mailsmtp_socket.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\low-level\smtp\mailsmtp_ssl.c"
+						>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="driver"
+				>
+				<Filter
+					Name="interface"
+					>
+					<File
+						RelativePath="..\..\src\driver\interface\maildriver.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\driver\interface\maildriver_tools.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\driver\interface\maildriver_types.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\driver\interface\maildriver_types_helper.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\driver\interface\mailfolder.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\driver\interface\mailmessage.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\driver\interface\mailmessage_tools.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\driver\interface\mailmessage_types.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\driver\interface\mailstorage.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\driver\interface\mailstorage_tools.c"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="implementation"
+					>
+					<Filter
+						Name="data-message"
+						>
+						<File
+							RelativePath="..\..\src\driver\implementation\data-message\data_message_driver.c"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="db"
+						>
+						<File
+							RelativePath="..\..\src\driver\implementation\db\dbdriver.c"
+							>
+							<FileConfiguration
+								Name="Debug|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Release|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\db\dbdriver_message.c"
+							>
+							<FileConfiguration
+								Name="Debug|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Release|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\db\dbstorage.c"
+							>
+							<FileConfiguration
+								Name="Debug|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Release|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
+						</File>
+					</Filter>
+					<Filter
+						Name="hotmail"
+						>
+						<File
+							RelativePath="..\..\src\driver\implementation\hotmail\hotmailstorage.c"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="imap"
+						>
+						<File
+							RelativePath="..\..\src\driver\implementation\imap\imapdriver.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\imap\imapdriver_cached.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\imap\imapdriver_cached_message.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\imap\imapdriver_message.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\imap\imapdriver_tools.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\imap\imapstorage.c"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="maildir"
+						>
+						<File
+							RelativePath="..\..\src\driver\implementation\maildir\maildirdriver.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\maildir\maildirdriver_cached.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\maildir\maildirdriver_cached_message.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\maildir\maildirdriver_message.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\maildir\maildirdriver_tools.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\maildir\maildirstorage.c"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="mbox"
+						>
+						<File
+							RelativePath="..\..\src\driver\implementation\mbox\mboxdriver.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\mbox\mboxdriver_cached.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\mbox\mboxdriver_cached_message.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\mbox\mboxdriver_message.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\mbox\mboxdriver_tools.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\mbox\mboxstorage.c"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="mh"
+						>
+						<File
+							RelativePath="..\..\src\driver\implementation\mh\mhdriver.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\mh\mhdriver_cached.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\mh\mhdriver_cached_message.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\mh\mhdriver_message.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\mh\mhdriver_tools.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\mh\mhstorage.c"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="mime-message"
+						>
+						<File
+							RelativePath="..\..\src\driver\implementation\mime-message\mime_message_driver.c"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="nntp"
+						>
+						<File
+							RelativePath="..\..\src\driver\implementation\nntp\nntpdriver.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\nntp\nntpdriver_cached.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\nntp\nntpdriver_cached_message.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\nntp\nntpdriver_message.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\nntp\nntpdriver_tools.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\nntp\nntpstorage.c"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="pop3"
+						>
+						<File
+							RelativePath="..\..\src\driver\implementation\pop3\pop3driver.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\pop3\pop3driver_cached.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\pop3\pop3driver_cached_message.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\pop3\pop3driver_message.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\pop3\pop3driver_tools.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\src\driver\implementation\pop3\pop3storage.c"
+							>
+						</File>
+					</Filter>
+				</Filter>
+				<Filter
+					Name="tools"
+					>
+					<File
+						RelativePath="..\..\src\driver\tools\generic_cache.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\driver\tools\imfcache.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\driver\tools\mailthread.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\driver\tools\mailthread_types.c"
+						>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="Windows"
+				>
+				<File
+					RelativePath="..\..\src\windows\dirent.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\windows\misc.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\windows\mmap.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\windows\time_r.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\windows\wsocket.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							CompileAs="2"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							CompileAs="2"
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\libetpan-config.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libetpan_version.h"
+				>
+			</File>
+			<File
+				RelativePath="..\StdAfx.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>