80 files changed, 129 insertions, 2072 deletions
diff --git a/protocols/YAMN/YAMN_10.vcxproj b/protocols/YAMN/YAMN_10.vcxproj
index 92ae1576da..3f563a0435 100644
--- a/protocols/YAMN/YAMN_10.vcxproj
+++ b/protocols/YAMN/YAMN_10.vcxproj
@@ -178,46 +178,38 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="account.cpp" />
-    <ClCompile Include="debug.cpp" />
-    <ClCompile Include="filterplugin.cpp" />
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="protoplugin.cpp" />
-    <ClCompile Include="services.cpp" />
-    <ClCompile Include="synchro.cpp" />
-    <ClCompile Include="yamn.cpp" />
-    <ClCompile Include="browser\badconnect.cpp" />
-    <ClCompile Include="browser\mailbrowser.cpp" />
-    <ClCompile Include="mails\decode.cpp" />
-    <ClCompile Include="mails\mails.cpp" />
-    <ClCompile Include="mails\mime.cpp" />
-    <ClCompile Include="proto\md5.c" />
-    <ClCompile Include="proto\netlib.cpp" />
-    <ClCompile Include="proto\pop3\pop3.cpp" />
-    <ClCompile Include="proto\pop3\pop3comm.cpp" />
-    <ClCompile Include="proto\pop3\pop3opt.cpp" />
+    <ClCompile Include="src\account.cpp" />
+    <ClCompile Include="src\debug.cpp" />
+    <ClCompile Include="src\filterplugin.cpp" />
+    <ClCompile Include="src\main.cpp" />
+    <ClCompile Include="src\protoplugin.cpp" />
+    <ClCompile Include="src\services.cpp" />
+    <ClCompile Include="src\synchro.cpp" />
+    <ClCompile Include="src\yamn.cpp" />
+    <ClCompile Include="src\browser\badconnect.cpp" />
+    <ClCompile Include="src\browser\mailbrowser.cpp" />
+    <ClCompile Include="src\mails\decode.cpp" />
+    <ClCompile Include="src\mails\mails.cpp" />
+    <ClCompile Include="src\mails\mime.cpp" />
+    <ClCompile Include="src\proto\md5.c" />
+    <ClCompile Include="src\proto\netlib.cpp" />
+    <ClCompile Include="src\proto\pop3\pop3.cpp" />
+    <ClCompile Include="src\proto\pop3\pop3comm.cpp" />
+    <ClCompile Include="src\proto\pop3\pop3opt.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="resources\iconeutral.ico" />
-    <None Include="resources\iconttbdown.ico" />
-    <None Include="resources\icooffline.ico" />
-    <None Include="resources\icoyamn3.ico" />
-    <None Include="resources\yamn.bmp" />
-    <None Include="ChangeLog.txt" />
+    <ClInclude Include="src\resource.h" />
+    <ClInclude Include="src\debug.h" />
+    <ClInclude Include="src\main.h" />
+    <ClInclude Include="src\proto\pop3\pop3.h" />
+    <ClInclude Include="src\proto\pop3\pop3comm.h" />
+    <ClInclude Include="src\proto\pop3\pop3opt.h" />
+    <ClInclude Include="src\yamn.h" />
+    <ClInclude Include="src\version.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="resources\resource.h" />
-    <ClInclude Include="debug.h" />
-    <ClInclude Include="main.h" />
-    <ClInclude Include="proto\pop3\pop3.h" />
-    <ClInclude Include="proto\pop3\pop3comm.h" />
-    <ClInclude Include="proto\pop3\pop3opt.h" />
-    <ClInclude Include="yamn.h" />
-    <ClInclude Include="version.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="resources\YAMN.rc" />
-    <ResourceCompile Include="resources\yamn_ver.rc" />
+    <ResourceCompile Include="res\YAMN.rc" />
+    <ResourceCompile Include="res\yamn_ver.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/protocols/YAMN/YAMN_10.vcxproj.filters b/protocols/YAMN/YAMN_10.vcxproj.filters
index 9ad0a75aab..9b91a6595f 100644
--- a/protocols/YAMN/YAMN_10.vcxproj.filters
+++ b/protocols/YAMN/YAMN_10.vcxproj.filters
@@ -23,108 +23,90 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="account.cpp">
+    <ClCompile Include="src\account.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="debug.cpp">
+    <ClCompile Include="src\debug.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="filterplugin.cpp">
+    <ClCompile Include="src\filterplugin.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="src\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="protoplugin.cpp">
+    <ClCompile Include="src\protoplugin.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="services.cpp">
+    <ClCompile Include="src\services.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="synchro.cpp">
+    <ClCompile Include="src\synchro.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="yamn.cpp">
+    <ClCompile Include="src\yamn.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="browser\badconnect.cpp">
+    <ClCompile Include="src\browser\badconnect.cpp">
       <Filter>Source Files\Mail browser, dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="browser\mailbrowser.cpp">
+    <ClCompile Include="src\browser\mailbrowser.cpp">
       <Filter>Source Files\Mail browser, dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="mails\decode.cpp">
+    <ClCompile Include="src\mails\decode.cpp">
       <Filter>Source Files\Mails</Filter>
     </ClCompile>
-    <ClCompile Include="mails\mails.cpp">
+    <ClCompile Include="src\mails\mails.cpp">
       <Filter>Source Files\Mails</Filter>
     </ClCompile>
-    <ClCompile Include="mails\mime.cpp">
+    <ClCompile Include="src\mails\mime.cpp">
       <Filter>Source Files\Mails</Filter>
     </ClCompile>
-    <ClCompile Include="proto\md5.c">
+    <ClCompile Include="src\proto\md5.c">
       <Filter>Source Files\POP3 plugin</Filter>
     </ClCompile>
-    <ClCompile Include="proto\netlib.cpp">
+    <ClCompile Include="src\proto\netlib.cpp">
       <Filter>Source Files\POP3 plugin</Filter>
     </ClCompile>
-    <ClCompile Include="proto\pop3\pop3.cpp">
+    <ClCompile Include="src\proto\pop3\pop3.cpp">
       <Filter>Source Files\POP3 plugin</Filter>
     </ClCompile>
-    <ClCompile Include="proto\pop3\pop3comm.cpp">
+    <ClCompile Include="src\proto\pop3\pop3comm.cpp">
       <Filter>Source Files\POP3 plugin</Filter>
     </ClCompile>
-    <ClCompile Include="proto\pop3\pop3opt.cpp">
+    <ClCompile Include="src\proto\pop3\pop3opt.cpp">
       <Filter>Source Files\POP3 plugin</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="resources\iconeutral.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="resources\iconttbdown.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="resources\icooffline.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="resources\icoyamn3.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="resources\yamn.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="ChangeLog.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="resources\resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Resource Files</Filter>
     </ClInclude>
-    <ClInclude Include="debug.h">
+    <ClInclude Include="src\debug.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="main.h">
+    <ClInclude Include="src\main.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="proto\pop3\pop3.h">
+    <ClInclude Include="src\proto\pop3\pop3.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="proto\pop3\pop3comm.h">
+    <ClInclude Include="src\proto\pop3\pop3comm.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="proto\pop3\pop3opt.h">
+    <ClInclude Include="src\proto\pop3\pop3opt.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="yamn.h">
+    <ClInclude Include="src\yamn.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="version.h" />
+    <ClInclude Include="src\version.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="resources\YAMN.rc">
+    <ResourceCompile Include="res\YAMN.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="resources\yamn_ver.rc">
+    <ResourceCompile Include="res\yamn_ver.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
diff --git a/protocols/YAMN/ChangeLog.txt b/protocols/YAMN/docs/ChangeLog.txt
index 6a85810ab2..6a85810ab2 100644
--- a/protocols/YAMN/ChangeLog.txt
+++ b/protocols/YAMN/docs/ChangeLog.txt
diff --git a/protocols/YAMN/yamn-translation.txt b/protocols/YAMN/docs/yamn-translation.txt
index 7acbad549f..7acbad549f 100644
--- a/protocols/YAMN/yamn-translation.txt
+++ b/protocols/YAMN/docs/yamn-translation.txt
diff --git a/protocols/YAMN/filter/Base/AggressiveOptimize.h b/protocols/YAMN/filter/Base/AggressiveOptimize.h
deleted file mode 100644
index 1bf0e19c2c..0000000000
--- a/protocols/YAMN/filter/Base/AggressiveOptimize.h
+++ /dev/null
@@ -1,168 +0,0 @@
-
-//////////////////////////////
-// Version 1.40 
-// October 22nd, 2002 - .NET (VC7, _MSC_VER=1300) support!
-// Version 1.30
-// Nov 24th, 2000
-// Version 1.20
-// Jun 9th, 2000
-// Version 1.10
-// Jan 23rd, 2000
-// Version 1.00
-// May 20th, 1999
-// Todd C. Wilson, Fresh Ground Software
-// (todd@nopcode.com)
-// This header file will kick in settings for Visual C++ 5 and 6 that will (usually)
-// result in smaller exe's.
-// The "trick" is to tell the compiler to not pad out the function calls; this is done
-// by not using the /O1 or /O2 option - if you do, you implicitly use /Gy, which pads
-// out each and every function call. In one single 500k dll, I managed to cut out 120k
-// by this alone!
-// The other two "tricks" are telling the Linker to merge all data-type segments together
-// in the exe file. The relocation, read-only (constants) data, and code section (.text)
-// sections can almost always be merged. Each section merged can save 4k in exe space,
-// since each section is padded out to 4k chunks. This is very noticeable with smaller
-// exes, since you could have only 700 bytes of data, 300 bytes of code, 94 bytes of
-// strings - padded out, this could be 12k of runtime, for 1094 bytes of stuff! For larger
-// programs, this is less overall, but can save at least 4k.
-// Note that if you're using MFC static or some other 3rd party libs, you may get poor
-// results with merging the readonly (.rdata) section - the exe may grow larger.
-// To use this feature, define _MERGE_DATA_ in your project or before this header is used.
-// With Visual C++ 5, the program uses a file alignment of 512 bytes, which results
-// in a small exe. Under VC6, the program instead uses 4k, which is the same as the
-// section size. The reason (from what I understand) is that 4k is the chunk size of
-// the virtual memory manager, and that WinAlign (an end-user tuning tool for Win98)
-// will re-align the programs on this boundary. The problem with this is that all of
-// Microsoft's system exes and dlls are *NOT* tuned like this, and using 4k causes serious
-// exe bloat. This is very noticeable for smaller programs.
-// The "trick" for this is to use the undocumented FILEALIGN linker parm to change the
-// padding from 4k to 1/2k, which results in a much smaller exe - anywhere from 20%-75%
-// depending on the size. Note that this is the same as using /OPT:NOWIN98, which *is*
-// a previously documented switch, but was left out of the docs for some reason in VC6 and
-// all of the current MSDN's - see KB:Q235956 for more information.
-// Microsoft does say that using the 4k alignment will "speed up process loading",
-// but I've been unable to notice a difference, even on my P180, with a very large (4meg) exe.
-// Please note, however, that this will probably not change the size of the COMPRESSED
-// file (either in a .zip file or in an install archive), since this 4k is all zeroes and
-// gets compressed away.
-// Also, the /ALIGN:4096 switch will "magically" do the same thing, even though this is the
-// default setting for this switch. Apparently this sets the same values as the above two
-// switches do. We do not use this in this header, since it smacks of a bug and not a feature.
-// Thanks to Michael Geary <Mike@Geary.com> for some additional tips!
-//
-// Notes about using this header in .NET
-// First off, VC7 does not allow a lot of the linker command options in pragma's. There is no
-// honest or good reason why Microsoft decided to make this change, it just doesn't.
-// So that is why there are a lot of <1300 #if's in the header.
-// If you want to take full advantage of the VC7 linker options, you will need to do it on a 
-// PER PROJECT BASIS; you can no longer use a global header file like this to make it better.
-// Items I strongly suggest putting in all your VC7 project linker options command line settings:
-//			/ignore:4078	/RELEASE
-// Compiler options:
-//			/GL (Whole Program Optimization)
-// If you're making an .EXE and not a .DLL, consider adding in:
-//			/GA (Optimize for Windows Application)
-// Some items to consider using in your VC7 projects (not VC6):
-// Link-time Code Generation - whole code optimization. Put this in your exe/dll project link settings.
-//			/LTCG:NOSTATUS
-// The classic no-padding and no-bloat compiler C/C++ switch:
-//			/opt:nowin98
-//
-// (C++ command line options:  /GL /opt:nowin98  and /GA for .exe files)
-// (Link command line options: /ignore:4078 /RELEASE /LTCG:NOSTATUS)
-//
-// Now, notes on using these options in VC7 vs VC6.
-// VC6 consistently, for me, produces smaller code from C++ the exact same sources,
-// with or without this header. On average, VC6 produces 5% smaller binaries compared
-// to VC7 compiling the exact same project, *without* this header. With this header, VC6
-// will make a 13k file, while VC7 will make a 64k one. VC7 is just bloaty, pure and
-// simple - all that managed/unmanaged C++ runtimes, and the CLR stuff must be getting
-// in the way of code generation. However, template support is better, so there.
-// Both VC6 and VC7 show the same end kind of end result savings - larger binary output
-// will shave about 2% off, where as smaller projects (support DLL's, cpl's,
-// activex controls, ATL libs, etc) get the best result, since the padding is usually
-// more than the actual usable code. But again, VC7 does not compile down as small as VC6.
-//
-// The argument can be made that doing this is a waste of time, since the "zero bytes"
-// will be compressed out in a zip file or install archive. Not really - it doesn't matter
-// if the data is a string of zeroes or ones or 85858585 - it will still take room (20 bytes
-// in a zip file, 29 bytes if only *4* of them 4k bytes are not the same) and time to
-// compress that data and decompress it. Also, 20k of zeros is NOT 20k on disk - it's the
-// size of the cluster slop- for Fat32 systems, 20k can be 32k, NTFS could make it 24k if you're
-// just 1 byte over (round up). Most end users do not have the dual P4 Xeon systems with
-// two gigs of RDram and a Raid 0+1 of Western Digital 120meg Special Editions that all
-// worthy developers have (all six of us), so they will need any space and LOADING TIME
-// savings they will need; taking an extra 32k or more out of your end user's 64megs of
-// ram on Windows 98 is Not a Good Thing.
-//
-// Now, as a ADDED BONUS at NO EXTRA COST TO YOU! Under VC6, using the /merge:.text=.data
-// pragma will cause the output file to be un-disassembleable! (is that a word?) At least,
-// with the normal tools - WinDisam, DumpBin, and the like will not work. Try it - use the
-// header, compile release, and then use DUMPBIN /DISASM filename.exe - no code!
-// Thanks to G�zim Pani <gpani@siu.edu> for discovering this gem - for a full writeup on
-// this issue and the ramifactions of it, visit www.nopcode.com for the Aggressive Optimize
-// article.
-
-#ifndef _AGGRESSIVEOPTIMIZE_H_
-#define _AGGRESSIVEOPTIMIZE_H_
-
-#pragma warning(disable:4711)
-
-#ifdef NDEBUG
-// /Og (global optimizations), /Os (favor small code), /Oy (no frame pointers)
-#pragma optimize("gsy",on)
-
-#if (_MSC_VER<1300)
-	#pragma comment(linker,"/RELEASE")
-#endif
-
-/*
-// Note that merging the .rdata section will result in LARGER exe's if you using
-// MFC (esp. static link). If this is desirable, define _MERGE_RDATA_ in your project.
-#ifdef _MERGE_RDATA_
-#pragma comment(linker,"/merge:.rdata=.data")
-#endif // _MERGE_RDATA_
-
-#pragma comment(linker,"/merge:.text=.data")
-#if (_MSC_VER<1300)
-	// In VC7, this causes problems with the relocation and data tables, so best to not merge them
-	#pragma comment(linker,"/merge:.reloc=.data")
-#endif
-*/
-
-// Merging sections with different attributes causes a linker warning, so
-// turn off the warning. From Michael Geary. Undocumented, as usual!
-#if (_MSC_VER<1300)
-	// In VC7, you will need to put this in your project settings
-	#pragma comment(linker,"/ignore:4078")
-#endif
-
-// With Visual C++ 5, you already get the 512-byte alignment, so you will only need
-// it for VC6, and maybe later.
-#if _MSC_VER >= 1000
-
-// Option #1: use /filealign
-// Totally undocumented! And if you set it lower than 512 bytes, the program crashes.
-// Either leave at 0x200 or 0x1000
-//#pragma comment(linker,"/FILEALIGN:0x200")
-
-// Option #2: use /opt:nowin98
-// See KB:Q235956 or the READMEVC.htm in your VC directory for info on this one.
-// This is our currently preferred option, since it is fully documented and unlikely
-// to break in service packs and updates.
-#if (_MSC_VER<1300)
-	// In VC7, you will need to put this in your project settings
-	#pragma comment(linker,"/opt:nowin98")
-#else
-
-// Option #3: use /align:4096
-// A side effect of using the default align value is that it turns on the above switch.
-// Does nothing under Vc7 that /opt:nowin98 doesn't already give you
-// #pragma comment(linker,"/ALIGN:512")
-#endif
-
-#endif // _MSC_VER >= 1000
-
-#endif // NDEBUG
-
-#endif //  _AGGRESSIVEOPTIMIZE_H_
diff --git a/protocols/YAMN/filter/Base/Base.dsp b/protocols/YAMN/filter/Base/Base.dsp
deleted file mode 100644
index 7231712a74..0000000000
--- a/protocols/YAMN/filter/Base/Base.dsp
+++ /dev/null
@@ -1,108 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Base" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** NICHT BEARBEITEN **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=Base - Win32 Release
-!MESSAGE Dies ist kein g�ltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und f�hren Sie den Befehl
-!MESSAGE 
-!MESSAGE NMAKE /f "Base.mak".
-!MESSAGE 
-!MESSAGE Sie k�nnen beim Ausf�hren von NMAKE eine Konfiguration angeben
-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
-!MESSAGE 
-!MESSAGE NMAKE /f "Base.mak" CFG="Base - Win32 Release"
-!MESSAGE 
-!MESSAGE F�r die Konfiguration stehen zur Auswahl:
-!MESSAGE 
-!MESSAGE "Base - Win32 Release" (basierend auf  "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "Base - Win32 Debug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "Base - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Ignore_Export_Lib 1
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 1
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /G4 /Zp4 /MD /W3 /GX /O1 /Ob0 /I "../../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /G4 /Zp4 /MD /W3 /GX /Zi /O1 /Ob0 /I "../../../../include" /I "../../../../include/msapi" /I "../../../../include_API" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE RSC /l 0x417 /d "NDEBUG"
-# ADD RSC /l 0x417 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib /nologo /dll /machine:I386 /out:"../../../../bin/release/plugins/YAMN-filter/Base.dll" /filealign:512
-# ADD LINK32 kernel32.lib user32.lib /nologo /dll /pdb:"../../../../bin/Release/plugins/YAMN/base.pdb" /debug /machine:I386 /out:"../../../../bin/Release/plugins/YAMN/base.dll" /filealign:512
-
-!ELSEIF  "$(CFG)" == "Base - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 1
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /G4 /Zp4 /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../../../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /GZ /c
-# ADD CPP /nologo /G4 /Zp4 /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../../../../include" /I "../../../../include/msapi" /I "../../../../include_API" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x417 /d "_DEBUG"
-# ADD RSC /l 0x417 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib /nologo /dll /debug /machine:I386 /out:"../../../../bin/Debug/plugins/YAMN-filter/Base.dll"
-# ADD LINK32 kernel32.lib user32.lib /nologo /dll /pdb:"../../../../bin/Debug/plugins/YAMN/base.pdb" /debug /machine:I386 /out:"../../../../bin/Debug/plugins/YAMN/base.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "Base - Win32 Release"
-# Name "Base - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\debug.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\maindll.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/protocols/YAMN/filter/Base/Base.mak b/protocols/YAMN/filter/Base/Base.mak
deleted file mode 100644
index 75ec59db8a..0000000000
--- a/protocols/YAMN/filter/Base/Base.mak
+++ /dev/null
@@ -1,229 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on Base.dsp
-!IF "$(CFG)" == ""
-CFG=Base - Win32 Release
-!MESSAGE No configuration specified. Defaulting to Base - Win32 Release.
-!ENDIF 
-
-!IF "$(CFG)" != "Base - Win32 Release" && "$(CFG)" != "Base - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "Base.mak" CFG="Base - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "Base - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "Base - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "Base - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-
-ALL : "..\..\..\..\bin\release\plugins\YAMN-filter\base.dll"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\debug.obj"
-	-@erase "$(INTDIR)\maindll.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(OUTDIR)\base.exp"
-	-@erase "..\..\..\..\bin\release\plugins\YAMN-filter\base.dll"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /G4 /Zp4 /MD /W3 /GX /O1 /Ob0 /I "../../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\Base.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\Base.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\base.pdb" /machine:I386 /out:"../../../../bin/release/plugins/YAMN-filter/base.dll" /implib:"$(OUTDIR)\base.lib" /filealign:512 
-LINK32_OBJS= \
-	"$(INTDIR)\debug.obj" \
-	"$(INTDIR)\maindll.obj"
-
-"..\..\..\..\bin\release\plugins\YAMN-filter\base.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "Base - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-ALL : "..\..\..\..\bin\Debug\plugins\YAMN-filter\Base.dll" "$(OUTDIR)\Base.bsc"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\debug.obj"
-	-@erase "$(INTDIR)\debug.sbr"
-	-@erase "$(INTDIR)\maindll.obj"
-	-@erase "$(INTDIR)\maindll.sbr"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\vc60.pdb"
-	-@erase "$(OUTDIR)\Base.bsc"
-	-@erase "$(OUTDIR)\Base.exp"
-	-@erase "$(OUTDIR)\Base.pdb"
-	-@erase "..\..\..\..\bin\Debug\plugins\YAMN-filter\Base.dll"
-	-@erase "..\..\..\..\bin\Debug\plugins\YAMN-filter\Base.ilk"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /G4 /Zp4 /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../../../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\Base.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\Base.bsc" 
-BSC32_SBRS= \
-	"$(INTDIR)\debug.sbr" \
-	"$(INTDIR)\maindll.sbr"
-
-"$(OUTDIR)\Base.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
-    $(BSC32) @<<
-  $(BSC32_FLAGS) $(BSC32_SBRS)
-<<
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\Base.pdb" /debug /machine:I386 /out:"../../../../bin/Debug/plugins/YAMN-filter/Base.dll" /implib:"$(OUTDIR)\Base.lib" 
-LINK32_OBJS= \
-	"$(INTDIR)\debug.obj" \
-	"$(INTDIR)\maindll.obj"
-
-"..\..\..\..\bin\Debug\plugins\YAMN-filter\Base.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("Base.dep")
-!INCLUDE "Base.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "Base.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "Base - Win32 Release" || "$(CFG)" == "Base - Win32 Debug"
-SOURCE=.\debug.cpp
-
-!IF  "$(CFG)" == "Base - Win32 Release"
-
-
-"$(INTDIR)\debug.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "Base - Win32 Debug"
-
-
-"$(INTDIR)\debug.obj"	"$(INTDIR)\debug.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\maindll.cpp
-
-!IF  "$(CFG)" == "Base - Win32 Release"
-
-
-"$(INTDIR)\maindll.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "Base - Win32 Debug"
-
-
-"$(INTDIR)\maindll.obj"	"$(INTDIR)\maindll.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-
-!ENDIF 
-
diff --git a/protocols/YAMN/filter/Base/debug.cpp b/protocols/YAMN/filter/Base/debug.cpp
deleted file mode 100644
index 654ece7b57..0000000000
--- a/protocols/YAMN/filter/Base/debug.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copied from YAMN plugin
- *
- * (c) majvan 2002-2004
- */
-#ifdef DEBUG_FILTER
-
-#include <windows.h>
-#include <tchar.h>
-#include <stdio.h>
-
-
-//--------------------------------------------------------------------------------------------------
-//--------------------------------------------------------------------------------------------------
-
-TCHAR DebugUserDirectory[MAX_PATH]=".";
-LPCRITICAL_SECTION FileAccessCS;
-
-void DebugLog(HANDLE File,const char *fmt,...);
-
-#ifdef DEBUG_FILTER
-TCHAR DebugFilterFileName2[]=_T("%s\\yamn-debug.basefilter.log");
-HANDLE FilterFile=INVALID_HANDLE_VALUE;
-#endif
-
-//--------------------------------------------------------------------------------------------------
-//--------------------------------------------------------------------------------------------------
-
-void InitDebug()
-{
-	TCHAR DebugFileName[MAX_PATH];
-
-	if(FileAccessCS==NULL)
-	{
-		FileAccessCS=new CRITICAL_SECTION;
-		InitializeCriticalSection(FileAccessCS);
-	}
-
-	_stprintf(DebugFileName,DebugFilterFileName2,DebugUserDirectory);
-
-	FilterFile=CreateFile(DebugFileName,GENERIC_WRITE,FILE_SHARE_WRITE,NULL,CREATE_ALWAYS,0,NULL);
-
-	DebugLog(FilterFile,"Base filter plugin for YAMN - debug file\n");
-}
-
-void UnInitDebug()
-{
-	DebugLog(FilterFile,"File is being closed normally.");
-	CloseHandle(FilterFile);
-}
-
-void DebugLog(HANDLE File,const char *fmt,...)
-{
-	char *str;
-	char tids[32];
-	va_list vararg;
-	int strsize;
-	DWORD Written;
-
-	va_start(vararg,fmt);
-	str=(char *)malloc(strsize=65536);
-	_stprintf(tids,_T("[%x]"),GetCurrentThreadId());
-	while(_vsnprintf(str,strsize,fmt,vararg)==-1)
-		str=(char *)realloc(str,strsize+=65536);
-	va_end(vararg);
-	EnterCriticalSection(FileAccessCS);
-	WriteFile(File,tids,(DWORD)strlen(tids),&Written,NULL);
-	WriteFile(File,str,(DWORD)strlen(str),&Written,NULL);
-	LeaveCriticalSection(FileAccessCS);
-	free(str);
-}
-
-#endif	//ifdef DEBUG
-\ No newline at end of file
diff --git a/protocols/YAMN/filter/Base/docs/base-readme.txt b/protocols/YAMN/filter/Base/docs/base-readme.txt
deleted file mode 100644
index 2e79bbbdd8..0000000000
--- a/protocols/YAMN/filter/Base/docs/base-readme.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-========================
-= Base Filter for YAMN =
-========================
-
-Q: What???
-A: YAMN filter to classify incoming email.
-
-Q: How?
-A: Finding occurency of defiend MIME header item and its value from blacklist file.
-
-Q: Blacklist file?
-A: Yes. It is created by yourself and located in Miranda directory with name 'basefilterdeny.txt'
-
-Q: Created by myself?
-A: Just create the file and write there your header MIME items and its values.
-
-Q: What do you mean "header MIME items" and "its values"?
-A: Every mail has header consisting of MIME items like "Subject" or "Return-Path".
-
-Q: So I need to understand how the header looks like...
-A: Yes, if you want to use this filter, you should. Header MIME is defined in RFC822 standard.
-
-Q: Ok, I've just studied it. So how to set filter (write some rules to the blacklist file)?
-A: Each line is one rule: write the exact item, press <tab>, press the substring of value needed to be found, press <tab>, define spamlevel and then press <Enter>.
-
-Q: Spamlevel?
-A: Yes.
-   0=do not notify
-   1=notify, display with another color in mailbrowser
-   2=do not notify, display with another color in mailbrowser
-   3=delete, display in mailbrowser about deleted mail
-   4=delete, do not display (mail's quick death, hehe)
-
-Q: So the rule has 3 parameters, that's it?
-A: Yes. This is the example:
-<------ start of file ------>
-From	CrazyMail	1
-X-Importance	low	0
-Subject	LinuxMailList	0
-Return-Path	cheapsoftware@junkmails.net	2
-X-TextClassification	spam	3
-<------ end of file ------->
-
-Q: Wait while. Ok, but it does not work.
-A: Check if you have this plugin listed in Miranda/Options/Plugins/YAMN item
-
-Q: No, it is not listed in YAMN plugins.
-A: Then check if the dll residents in Plugins/YAMN direcotry.
-
-Q: This directory does not exists.
-A: Create it and put the dll there. Restart Miranda.
-
-Q: Hmmm, ok. But it is not still listed.
-A: Your version of YAMN and filter does not match.
-
-Q: And?
-A: Try to look to http://www.majvan.host.sk/Projekty/YAMN for updates.
-
-Q: Now, it is listed, but does not work anyway.
-A: Try to download debug version from YAMN homepage, if you are not using it (the name of filter must contain the word "debug")
-
-Q: What does debug version do?
-A: It creates debug log file in Miranda home directory where you can browse how does filter mark mails.
-\ No newline at end of file
diff --git a/protocols/YAMN/filter/Base/maindll.cpp b/protocols/YAMN/filter/Base/maindll.cpp
deleted file mode 100644
index 1cb9d92338..0000000000
--- a/protocols/YAMN/filter/Base/maindll.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-//---------------------------------------------------------------------------
-#include <windows.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <newpluginapi.h>
-#include <m_system.h>
-#include <m_langpack.h>
-#include <m_options.h>
-#include "../../m_filterplugin.h"
-#if !defined(_WIN64)
-	#include "aggressiveoptimize.h"
-#endif
-
-typedef INT_PTR(* MIRANDASERVICE)(WPARAM,LPARAM);
-
-DWORD WINAPI FilterMail(HACCOUNT Account,DWORD AccountVer,HYAMNMAIL Mail,DWORD MailVer);//Function marks mail as spam when it is spam...
-DWORD WINAPI UnLoadFilter(LPVOID);
-
-int LoadRules();	//Load rules from file
-int findsubstr(char *original,char *pattern); //finds if original contains substring
-
-YAMN_FILTERIMPORTFCN FilterFunctions=	//we set for YAMN which is our filter function
-{
-	FilterMail,
-	UnLoadFilter,
-};
-
-struct cFilterTable
-{
-	char account[256];
-	char name[256];
-	char value[256];
-	unsigned char sl;
-} *ft=NULL;
-int fts=0;
-
-YAMN_FILTERREGISTRATION FilterRegistration=		//classical YAMN registration
-{
-#ifdef DEBUG_FILTER
-	"Base filter plugin for YAMN (debug)",
-#else
-	"Base filter plugin for YAMN",
-#endif
-	"",
-	"� majvan",
-	"Classifies mails using the rules stored in file",
-	"om3tn@psg.sk",
-	"http://www.majvan.host.sk/Projekty/YAMN?fm=soft",
-};
-
-char *FilterPath=NULL;
-
-struct YAMNExportedFcn
-{
-	YAMN_SETFILTERPLUGINFCNIMPORTFCN	SetFilterPluginFcnImportFcn;
-	MIRANDASERVICE RegisterFilterPlugin;
-} YAMNFcn,*pYAMNFcn;			//exported functions from YAMN we will use
-
-HYAMNFILTERPLUGIN POPFilePlugin;	//handle of this plugin for YAMN
-HINSTANCE hInst;		//handle of this DLL for Windows
-
-#ifdef DEBUG_FILTER
-extern void InitDebug();
-extern void UnInitDebug();
-extern void DebugLog(HANDLE File,const char *fmt,...);
-extern HANDLE FilterFile;
-#endif
-
-extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fwdreason, LPVOID lpvReserved)
-{
-	hInst=hinstDLL;
-	return true;
-}
-
-extern "C" int __declspec(dllexport) LoadFilter(MIRANDASERVICE GetYAMNFcnPtr)
-{
-	FilterPath=new char[MAX_PATH];
-	char *delim;
-	pYAMNFcn=&YAMNFcn;
-
-	GetModuleFileName(GetModuleHandle(NULL),FilterPath,MAX_PATH);
-	if(NULL!=(delim=strrchr(FilterPath,'\\')))
-		*delim=0;
-	lstrcat(FilterPath,"\\basefilterdeny.txt");
-#ifdef DEBUG_FILTER
-	InitDebug();
-#endif
-
-	if (!LoadRules())
-		return 0;
-
-	pYAMNFcn->RegisterFilterPlugin=(MIRANDASERVICE)GetYAMNFcnPtr((WPARAM)MS_YAMN_REGISTERFILTERPLUGIN,(LPARAM)0);
-	pYAMNFcn->SetFilterPluginFcnImportFcn=(YAMN_SETFILTERPLUGINFCNIMPORTFCN)GetYAMNFcnPtr((WPARAM)YAMN_SETFILTERPLUGINFCNIMPORTID,(LPARAM)0);
-//Register our filter plugin to YAMN
-	if(NULL==(POPFilePlugin=(HYAMNFILTERPLUGIN)pYAMNFcn->RegisterFilterPlugin((WPARAM)&FilterRegistration,(LPARAM)YAMN_FILTERREGISTRATIONVERSION)))
-		return 0;
-//And add our imported functions for YAMN
-	if (!pYAMNFcn->SetFilterPluginFcnImportFcn(POPFilePlugin,0xb0000000,&FilterFunctions,YAMN_FILTERIMPORTFCNVERSION))
-		return 0;
-	return 1;		//Load luccess
-}
-
-DWORD WINAPI UnLoadFilter(LPVOID)
-{
-#ifdef DEBUG_FILTER
-	UnInitDebug();
-#endif
-	if(FilterPath!=NULL)
-		delete[] FilterPath;
-	FilterPath=NULL;
-
-	return 0;
-}
-
-extern "C" int __declspec(dllexport) UninstallFilter()
-{
-	if(FilterPath==NULL)
-		MessageBox(NULL,"Cannot delete blacklist file when Base Filter is not loaded. Please do it manually.","Base Filter uninstalling",MB_OK|MB_ICONWARNING);
-	else
-		DeleteFile(FilterPath);
-	return 0;
-}
-
-
-//And this is main filter function.
-DWORD WINAPI FilterMail(HACCOUNT Account,DWORD AccountVer,HYAMNMAIL Mail,DWORD MailVer)
-{
-	struct CMimeItem *Browser;
-
-	if(MailVer!=YAMN_MAILVERSION)	//we test if we work with the right YAMNMAIL
-		return 0;
-	if(Mail->MailData==NULL)		//MailData should be available
-		return 0;
-
-#ifdef DEBUG_FILTER
-	DebugLog(FilterFile,"<New mail>\n");
-#endif
-	if (!(Mail->Flags & YAMN_MSG_VIRTUAL))
-		for(Browser=Mail->MailData->TranslatedHeader;Browser!=NULL;Browser=Browser->Next)	//we browse all header stored in Mail->TranslatedHeader
-		{
-#ifdef DEBUG_FILTER
-			DebugLog(FilterFile,"<Testing header item %s: %s>\n",Browser->name,Browser->value);
-#endif
-			for(int i=0;i<fts;i++)
-				if (!lstrcmpi(Browser->name,ft[i].name))
-				{
-#ifdef DEBUG_FILTER
-					DebugLog(FilterFile,"\t\t<Found appropriate selector %s>\n",Browser->name);
-#endif
-					if(findsubstr(Browser->value,ft[i].value))		//and if we find
-					{
-						if ((ft[i].sl==0) && ((Mail->Flags & YAMN_MSG_SPAMMASK)==0))
-						{
-							Mail->Flags&=~(YAMN_MSG_POPUP | YAMN_MSG_SYSTRAY | YAMN_MSG_BROWSER | YAMN_MSG_SOUND | YAMN_MSG_APP | YAMN_MSG_NEVENT);
-#ifdef DEBUG_FILTER
-							DebugLog(FilterFile,"\t\tSetting individual flags not to notify mail, but does not consider as spam.");
-#endif
-						}
-						else if ((Mail->Flags & YAMN_MSG_SPAMMASK) < ft[i].sl)			//if some filter plugin set higher level of spam, we do nothing
-						{
-							Mail->Flags=(Mail->Flags & ~YAMN_MSG_SPAMMASK)+ft[i].sl;	//else we set spam level 2 (clearing spam bits and then settting them to level 2
-#ifdef DEBUG_FILTER
-							DebugLog(FilterFile,"\t\tMail marked to be spam #%d\n",Mail->Flags & YAMN_MSG_SPAMMASK);
-#endif
-						}
-					}
-#ifdef DEBUG_FILTER
-					DebugLog(FilterFile,"\t\t</Found appropriate selector>\n");
-#endif
-				}
-#ifdef DEBUG_FILTER
-			DebugLog(FilterFile,"</Testing header>\n");
-#endif
-		}
-#ifdef DEBUG_FILTER
-	DebugLog(FilterFile,"</New mail>\n\n");
-#endif
-	return 1;
-}
-
-int LoadRules()
-{
-	char *account=NULL;
-	char name[256];
-	char value[256];
-	char BadCompiler[512+5];
-	unsigned char sl;
-	FILE *fp;
-
-#ifdef DEBUG_FILTER
-	DebugLog(FilterFile,"<Loading rules from file %s>\n",FilterPath);
-#endif
-
-	fp=fopen(FilterPath,"rt");
-	if(fp==NULL)
-		return 0;
-
-	while(!feof(fp))
-	{
-		if(fscanf(fp,"%255s",name) && !feof(fp) && (name[0]!=0))
-		{
-			if(fscanf(fp,"%255s",value) && !feof(fp) && (value[0]!=0))
-			{
-				if(fscanf(fp,"%d",&sl))
-				{
-					fts++;
-					ft=(struct cFilterTable *)realloc((void *)ft,sizeof(cFilterTable)*fts);
-					lstrcpy(ft[fts-1].name,name);
-					lstrcpy(ft[fts-1].value,value);
-					ft[fts-1].sl=sl;
-
-					sprintf(BadCompiler,"%s %s %d",name,value,sl);
-#ifdef DEBUG_FILTER
-					DebugLog(FilterFile,"\t<Rule><selector>%s</selector><value>%s</value><spamlevel>%d</spamlevel>\n",name,value,sl);
-#endif
-				}
-			}
-		}
-	}
-
-	fclose(fp);
-#ifdef DEBUG_FILTER
-	DebugLog(FilterFile,"</Loading rules>\n");
-#endif
-	return 1;
-}
-
-int findsubstr(char *original,char *pattern)
-{
-	int ol=lstrlen(original);
-	int pl=lstrlen(pattern);
-
-	for(int i=0;(i+pl)<=ol;i++)
-		if (!_strnicmp(original+i,pattern,pl))
-			return 1;
-	return 0;
-}
-\ No newline at end of file
diff --git a/protocols/YAMN/filter/Simple/AggressiveOptimize.h b/protocols/YAMN/filter/Simple/AggressiveOptimize.h
deleted file mode 100644
index 1bf0e19c2c..0000000000
--- a/protocols/YAMN/filter/Simple/AggressiveOptimize.h
+++ /dev/null
@@ -1,168 +0,0 @@
-
-//////////////////////////////
-// Version 1.40 
-// October 22nd, 2002 - .NET (VC7, _MSC_VER=1300) support!
-// Version 1.30
-// Nov 24th, 2000
-// Version 1.20
-// Jun 9th, 2000
-// Version 1.10
-// Jan 23rd, 2000
-// Version 1.00
-// May 20th, 1999
-// Todd C. Wilson, Fresh Ground Software
-// (todd@nopcode.com)
-// This header file will kick in settings for Visual C++ 5 and 6 that will (usually)
-// result in smaller exe's.
-// The "trick" is to tell the compiler to not pad out the function calls; this is done
-// by not using the /O1 or /O2 option - if you do, you implicitly use /Gy, which pads
-// out each and every function call. In one single 500k dll, I managed to cut out 120k
-// by this alone!
-// The other two "tricks" are telling the Linker to merge all data-type segments together
-// in the exe file. The relocation, read-only (constants) data, and code section (.text)
-// sections can almost always be merged. Each section merged can save 4k in exe space,
-// since each section is padded out to 4k chunks. This is very noticeable with smaller
-// exes, since you could have only 700 bytes of data, 300 bytes of code, 94 bytes of
-// strings - padded out, this could be 12k of runtime, for 1094 bytes of stuff! For larger
-// programs, this is less overall, but can save at least 4k.
-// Note that if you're using MFC static or some other 3rd party libs, you may get poor
-// results with merging the readonly (.rdata) section - the exe may grow larger.
-// To use this feature, define _MERGE_DATA_ in your project or before this header is used.
-// With Visual C++ 5, the program uses a file alignment of 512 bytes, which results
-// in a small exe. Under VC6, the program instead uses 4k, which is the same as the
-// section size. The reason (from what I understand) is that 4k is the chunk size of
-// the virtual memory manager, and that WinAlign (an end-user tuning tool for Win98)
-// will re-align the programs on this boundary. The problem with this is that all of
-// Microsoft's system exes and dlls are *NOT* tuned like this, and using 4k causes serious
-// exe bloat. This is very noticeable for smaller programs.
-// The "trick" for this is to use the undocumented FILEALIGN linker parm to change the
-// padding from 4k to 1/2k, which results in a much smaller exe - anywhere from 20%-75%
-// depending on the size. Note that this is the same as using /OPT:NOWIN98, which *is*
-// a previously documented switch, but was left out of the docs for some reason in VC6 and
-// all of the current MSDN's - see KB:Q235956 for more information.
-// Microsoft does say that using the 4k alignment will "speed up process loading",
-// but I've been unable to notice a difference, even on my P180, with a very large (4meg) exe.
-// Please note, however, that this will probably not change the size of the COMPRESSED
-// file (either in a .zip file or in an install archive), since this 4k is all zeroes and
-// gets compressed away.
-// Also, the /ALIGN:4096 switch will "magically" do the same thing, even though this is the
-// default setting for this switch. Apparently this sets the same values as the above two
-// switches do. We do not use this in this header, since it smacks of a bug and not a feature.
-// Thanks to Michael Geary <Mike@Geary.com> for some additional tips!
-//
-// Notes about using this header in .NET
-// First off, VC7 does not allow a lot of the linker command options in pragma's. There is no
-// honest or good reason why Microsoft decided to make this change, it just doesn't.
-// So that is why there are a lot of <1300 #if's in the header.
-// If you want to take full advantage of the VC7 linker options, you will need to do it on a 
-// PER PROJECT BASIS; you can no longer use a global header file like this to make it better.
-// Items I strongly suggest putting in all your VC7 project linker options command line settings:
-//			/ignore:4078	/RELEASE
-// Compiler options:
-//			/GL (Whole Program Optimization)
-// If you're making an .EXE and not a .DLL, consider adding in:
-//			/GA (Optimize for Windows Application)
-// Some items to consider using in your VC7 projects (not VC6):
-// Link-time Code Generation - whole code optimization. Put this in your exe/dll project link settings.
-//			/LTCG:NOSTATUS
-// The classic no-padding and no-bloat compiler C/C++ switch:
-//			/opt:nowin98
-//
-// (C++ command line options:  /GL /opt:nowin98  and /GA for .exe files)
-// (Link command line options: /ignore:4078 /RELEASE /LTCG:NOSTATUS)
-//
-// Now, notes on using these options in VC7 vs VC6.
-// VC6 consistently, for me, produces smaller code from C++ the exact same sources,
-// with or without this header. On average, VC6 produces 5% smaller binaries compared
-// to VC7 compiling the exact same project, *without* this header. With this header, VC6
-// will make a 13k file, while VC7 will make a 64k one. VC7 is just bloaty, pure and
-// simple - all that managed/unmanaged C++ runtimes, and the CLR stuff must be getting
-// in the way of code generation. However, template support is better, so there.
-// Both VC6 and VC7 show the same end kind of end result savings - larger binary output
-// will shave about 2% off, where as smaller projects (support DLL's, cpl's,
-// activex controls, ATL libs, etc) get the best result, since the padding is usually
-// more than the actual usable code. But again, VC7 does not compile down as small as VC6.
-//
-// The argument can be made that doing this is a waste of time, since the "zero bytes"
-// will be compressed out in a zip file or install archive. Not really - it doesn't matter
-// if the data is a string of zeroes or ones or 85858585 - it will still take room (20 bytes
-// in a zip file, 29 bytes if only *4* of them 4k bytes are not the same) and time to
-// compress that data and decompress it. Also, 20k of zeros is NOT 20k on disk - it's the
-// size of the cluster slop- for Fat32 systems, 20k can be 32k, NTFS could make it 24k if you're
-// just 1 byte over (round up). Most end users do not have the dual P4 Xeon systems with
-// two gigs of RDram and a Raid 0+1 of Western Digital 120meg Special Editions that all
-// worthy developers have (all six of us), so they will need any space and LOADING TIME
-// savings they will need; taking an extra 32k or more out of your end user's 64megs of
-// ram on Windows 98 is Not a Good Thing.
-//
-// Now, as a ADDED BONUS at NO EXTRA COST TO YOU! Under VC6, using the /merge:.text=.data
-// pragma will cause the output file to be un-disassembleable! (is that a word?) At least,
-// with the normal tools - WinDisam, DumpBin, and the like will not work. Try it - use the
-// header, compile release, and then use DUMPBIN /DISASM filename.exe - no code!
-// Thanks to G�zim Pani <gpani@siu.edu> for discovering this gem - for a full writeup on
-// this issue and the ramifactions of it, visit www.nopcode.com for the Aggressive Optimize
-// article.
-
-#ifndef _AGGRESSIVEOPTIMIZE_H_
-#define _AGGRESSIVEOPTIMIZE_H_
-
-#pragma warning(disable:4711)
-
-#ifdef NDEBUG
-// /Og (global optimizations), /Os (favor small code), /Oy (no frame pointers)
-#pragma optimize("gsy",on)
-
-#if (_MSC_VER<1300)
-	#pragma comment(linker,"/RELEASE")
-#endif
-
-/*
-// Note that merging the .rdata section will result in LARGER exe's if you using
-// MFC (esp. static link). If this is desirable, define _MERGE_RDATA_ in your project.
-#ifdef _MERGE_RDATA_
-#pragma comment(linker,"/merge:.rdata=.data")
-#endif // _MERGE_RDATA_
-
-#pragma comment(linker,"/merge:.text=.data")
-#if (_MSC_VER<1300)
-	// In VC7, this causes problems with the relocation and data tables, so best to not merge them
-	#pragma comment(linker,"/merge:.reloc=.data")
-#endif
-*/
-
-// Merging sections with different attributes causes a linker warning, so
-// turn off the warning. From Michael Geary. Undocumented, as usual!
-#if (_MSC_VER<1300)
-	// In VC7, you will need to put this in your project settings
-	#pragma comment(linker,"/ignore:4078")
-#endif
-
-// With Visual C++ 5, you already get the 512-byte alignment, so you will only need
-// it for VC6, and maybe later.
-#if _MSC_VER >= 1000
-
-// Option #1: use /filealign
-// Totally undocumented! And if you set it lower than 512 bytes, the program crashes.
-// Either leave at 0x200 or 0x1000
-//#pragma comment(linker,"/FILEALIGN:0x200")
-
-// Option #2: use /opt:nowin98
-// See KB:Q235956 or the READMEVC.htm in your VC directory for info on this one.
-// This is our currently preferred option, since it is fully documented and unlikely
-// to break in service packs and updates.
-#if (_MSC_VER<1300)
-	// In VC7, you will need to put this in your project settings
-	#pragma comment(linker,"/opt:nowin98")
-#else
-
-// Option #3: use /align:4096
-// A side effect of using the default align value is that it turns on the above switch.
-// Does nothing under Vc7 that /opt:nowin98 doesn't already give you
-// #pragma comment(linker,"/ALIGN:512")
-#endif
-
-#endif // _MSC_VER >= 1000
-
-#endif // NDEBUG
-
-#endif //  _AGGRESSIVEOPTIMIZE_H_
diff --git a/protocols/YAMN/filter/Simple/docs/simple-readme.txt b/protocols/YAMN/filter/Simple/docs/simple-readme.txt
deleted file mode 100644
index 34c0842c87..0000000000
--- a/protocols/YAMN/filter/Simple/docs/simple-readme.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-==========================
-= Simple Filter for YAMN =
-==========================
-
-Q: What???
-A: YAMN filter to classify incoming email.
-
-Q: How?
-A: Regarding what the email is from and finding it in the blacklist email file.
-
-Q: Blacklist email file?
-A: Yes. It is created by yourself and located in Miranda directory with name 'simplefilterdeny.txt'
-
-Q: Created by myself?
-A: Just create the file and write there your blacklist mails in every line.
-
-Q: That's all?
-A: Yes and no. You can specify spamlevel for each mail.
-
-Q: Spamlevel?
-A: Yes.
-   1=notify, display with another color in mailbrowser
-   2=do not notify, display with another color in mailbrowser
-   3=delete, display in mailbrowser about deleted mail
-   4=delete, do not display (mail's quick death, hehe)
-
-Q: How to specify it?
-A: After email press <tab> and write number 1-4. Note this is optional. If not defined, level 2 is default.
-
-Q: Ok, that's easy.
-A: Yes, this is the example:
-<------ start of file ------>
-nigeria@spamserver.com	2
-cheapsoftware@junkmails.net	3
-learnenglish@commercial.org
-<------ end of file ------->
-
-Q: Wait while. Ok, but it does not work.
-A: Check if you have this plugin listed in Miranda/Options/Plugins/YAMN item as YAMN plugin.
-
-Q: No, it is not listed in YAMN plugins.
-A: Then check if the dll residents in Plugins/YAMN direcotry.
-
-Q: This directory does not exists.
-A: Create it and put the dll there. Restart Miranda.
-
-Q: Hmmm, ok. But it is not still listed.
-A: Your version of YAMN and filter does not match.
-
-Q: And?
-A: Try to look to http://www.majvan.host.sk/Projekty/YAMN for updates.
-\ No newline at end of file
diff --git a/protocols/YAMN/filter/Simple/maindll.cpp b/protocols/YAMN/filter/Simple/maindll.cpp
deleted file mode 100644
index 44a277d4fa..0000000000
--- a/protocols/YAMN/filter/Simple/maindll.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-//---------------------------------------------------------------------------
-#include <windows.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <newpluginapi.h>
-#include <m_system.h>
-#include <m_langpack.h>
-#include <m_options.h>
-#include "../../m_filterplugin.h"
-#if !defined(_WIN64)
-	#include "aggressiveoptimize.h"
-#endif
-
-typedef INT_PTR(* MIRANDASERVICE)(WPARAM,LPARAM);
-
-DWORD WINAPI FilterMail(HACCOUNT Account,DWORD AccountVer,HYAMNMAIL Mail,DWORD MailVer);//Function marks mail as spam when it is spam...
-DWORD WINAPI UnLoadFilter(LPVOID);
-
-YAMN_FILTERIMPORTFCN FilterFunctions=	//we set for YAMN which is our filter function
-{
-	FilterMail,
-	UnLoadFilter,				//No unloading
-};
-
-YAMN_FILTERREGISTRATION FilterRegistration=		//classical YAMN registration
-{
-	"Simple filter plugin for YAMN",
-	"",
-	"� porter+ majvan",
-	"Classifies mails using the blacklist emails stored in file",
-	"porterbox@hotmail.com",
-	"http://www.majvan.host.sk/Projekty/YAMN?fm=soft",
-};
-
-char *FilterPath=NULL;
-
-struct YAMNExportedFcn
-{
-	YAMN_SETFILTERPLUGINFCNIMPORTFCN	SetFilterPluginFcnImportFcn;
-	MIRANDASERVICE RegisterFilterPlugin;
-} YAMNFcn,*pYAMNFcn;			//exported functions from YAMN we will use
-
-HYAMNFILTERPLUGIN POPFilePlugin;	//handle of this plugin for YAMN
-HINSTANCE hInst;		//handle of this DLL for Windows
-
-extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fwdreason, LPVOID lpvReserved)
-{
-	hInst=hinstDLL;
-	return true;
-}
-
-extern "C" int __declspec(dllexport) LoadFilter(MIRANDASERVICE GetYAMNFcnPtr)
-{
-	FilterPath=new char[MAX_PATH];
-	char *delim;
-	pYAMNFcn=&YAMNFcn;
-
-	GetModuleFileName(GetModuleHandle(NULL),FilterPath,MAX_PATH);
-	if(NULL!=(delim=strrchr(FilterPath,'\\')))
-		*delim=0;
-	lstrcat(FilterPath,"\\simplefilterdeny.txt");
-
-	pYAMNFcn->RegisterFilterPlugin=(MIRANDASERVICE)GetYAMNFcnPtr((WPARAM)MS_YAMN_REGISTERFILTERPLUGIN,(LPARAM)0);
-	pYAMNFcn->SetFilterPluginFcnImportFcn=(YAMN_SETFILTERPLUGINFCNIMPORTFCN)GetYAMNFcnPtr((WPARAM)YAMN_SETFILTERPLUGINFCNIMPORTID,(LPARAM)0);
-//Register our filter plugin to YAMN
-	if(NULL==(POPFilePlugin=(HYAMNFILTERPLUGIN)pYAMNFcn->RegisterFilterPlugin((WPARAM)&FilterRegistration,(LPARAM)YAMN_FILTERREGISTRATIONVERSION)))
-		return 0;
-//And add our imported functions for YAMN
-	if (!pYAMNFcn->SetFilterPluginFcnImportFcn(POPFilePlugin,0xb0000000,&FilterFunctions,YAMN_FILTERIMPORTFCNVERSION))
-		return 0;
-	return 1;		//Load luccess
-}
-
-DWORD WINAPI UnLoadFilter(LPVOID)
-{
-	if(FilterPath!=NULL)
-		delete[] FilterPath;
-	FilterPath=NULL;
-
-	return 0;
-}
-
-extern "C" int __declspec(dllexport) UninstallFilter()
-{
-	if(FilterPath==NULL)
-		MessageBox(NULL,"Cannot delete blacklist file when Simple Filter is not loaded. Please do it manually.","Simple Filter uninstalling",MB_OK|MB_ICONWARNING);
-	else
-		DeleteFile(FilterPath);
-	return 0;
-}
-
-
-//And this is main filter function.
-DWORD WINAPI FilterMail(HACCOUNT Account,DWORD AccountVer,HYAMNMAIL Mail,DWORD MailVer)
-{
-	FILE *fp;
-	char EmailSpam[256];
-	unsigned char spamLevel;
-	struct CMimeItem *Browser;
-
-	if(MailVer!=YAMN_MAILVERSION)	//we test if we work with the right YAMNMAIL
-		return 0;
-	if(Mail->MailData==NULL)		//MailData should be available
-		return 0;
-	fp=fopen(FilterPath,"rt");
-	if(fp != NULL) {
-		if (!(Mail->Flags & YAMN_MSG_VIRTUAL))
-			for(Browser=Mail->MailData->TranslatedHeader;Browser!=NULL;Browser=Browser->Next) {	//we browse all header stored in Mail->TranslatedHeader
-				if ((!lstrcmp(Browser->name,"Return-Path")) || (!lstrcmp(Browser->name,"From"))) {		//and if we find
-					fseek(fp, 0L, SEEK_SET);
-					while(!feof(fp)) {
-						if(fscanf(fp, "%255s", EmailSpam) != 0) {
-							if (!feof(fp))
-								if(fscanf(fp, "%d", &spamLevel)==0)
-									spamLevel=2;
-							if(spamLevel>4)
-								spamLevel=2;
-							if(strstr(Browser->value,EmailSpam)!=NULL) {
-								if ((Mail->Flags & (YAMN_MSG_SPAMMASK==0)) && (spamLevel==0))
-									Mail->Flags&=~(YAMN_MSG_SOUND | YAMN_MSG_APP | YAMN_MSG_POPUP | YAMN_MSG_SYSTRAY | YAMN_MSG_BROWSER);
-								else if ((Mail->Flags & YAMN_MSG_SPAMMASK) < spamLevel)			//if some filter plugin set higher level of spam, we do nothing
-									Mail->Flags=(Mail->Flags & ~YAMN_MSG_SPAMMASK)+spamLevel;	//else we set spam level 2 (clearing spam bits and then settting them to level 2
-							}
-						}
-					}
-				}
-		}
-		fclose(fp);
-	}
-	return 1;
-}
diff --git a/protocols/YAMN/filter/Simple/simple.dsp b/protocols/YAMN/filter/Simple/simple.dsp
deleted file mode 100644
index dc6d52e6c1..0000000000
--- a/protocols/YAMN/filter/Simple/simple.dsp
+++ /dev/null
@@ -1,105 +0,0 @@
-# Microsoft Developer Studio Project File - Name="simple" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** NICHT BEARBEITEN **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=simple - Win32 Release
-!MESSAGE Dies ist kein g�ltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und f�hren Sie den Befehl
-!MESSAGE 
-!MESSAGE NMAKE /f "simple.mak".
-!MESSAGE 
-!MESSAGE Sie k�nnen beim Ausf�hren von NMAKE eine Konfiguration angeben
-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
-!MESSAGE 
-!MESSAGE NMAKE /f "simple.mak" CFG="simple - Win32 Release"
-!MESSAGE 
-!MESSAGE F�r die Konfiguration stehen zur Auswahl:
-!MESSAGE 
-!MESSAGE "simple - Win32 Release" (basierend auf  "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "simple - Win32 Debug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "simple - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Ignore_Export_Lib 1
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 1
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /G4 /Zp4 /MD /W3 /GX /O1 /Ob0 /I "../../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /G4 /Zp4 /MD /W3 /GX /Zi /O1 /Ob0 /I "../../../../include" /I "../../../../include/msapi" /I "../../../../include_API" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE RSC /l 0x417 /d "NDEBUG"
-# ADD RSC /l 0x417 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib /nologo /dll /machine:I386 /out:"../../../../bin/release/plugins/YAMN-filter/simple.dll" /filealign:512
-# ADD LINK32 kernel32.lib user32.lib /nologo /dll /pdb:"../../../../bin/Release/plugins/YAMN/simple.pdb" /debug /machine:I386 /out:"../../../../bin/Release/plugins/YAMN/simple.dll" /filealign:512
-
-!ELSEIF  "$(CFG)" == "simple - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Ignore_Export_Lib 1
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 1
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /G4 /Zp4 /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../../../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /GZ /c
-# ADD CPP /nologo /G4 /Zp4 /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../../../../include" /I "../../../../include/msapi" /I "../../../../include_API" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x417 /d "_DEBUG"
-# ADD RSC /l 0x417 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib /nologo /dll /debug /machine:I386 /out:"../../../../bin/Debug/plugins/YAMN-filter/simple.dll"
-# ADD LINK32 kernel32.lib user32.lib /nologo /dll /pdb:"../../../../bin/Debug/plugins/YAMN/simple.pdb" /debug /machine:I386 /out:"../../../../bin/Debug/plugins/YAMN/simple.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "simple - Win32 Release"
-# Name "simple - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\maindll.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/protocols/YAMN/filter/Simple/simple.mak b/protocols/YAMN/filter/Simple/simple.mak
deleted file mode 100644
index 085dc22e33..0000000000
--- a/protocols/YAMN/filter/Simple/simple.mak
+++ /dev/null
@@ -1,207 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on simple.dsp
-!IF "$(CFG)" == ""
-CFG=simple - Win32 Release
-!MESSAGE No configuration specified. Defaulting to simple - Win32 Release.
-!ENDIF 
-
-!IF "$(CFG)" != "simple - Win32 Release" && "$(CFG)" != "simple - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "simple.mak" CFG="simple - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "simple - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "simple - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "simple - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-
-ALL : "..\..\..\..\bin\release\plugins\YAMN-filter\simple.dll"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\maindll.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(OUTDIR)\simple.exp"
-	-@erase "..\..\..\..\bin\release\plugins\YAMN-filter\simple.dll"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /G4 /Zp4 /MD /W3 /GX /O1 /Ob0 /I "../../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\simple.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\simple.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\simple.pdb" /machine:I386 /out:"../../../../bin/release/plugins/YAMN-filter/simple.dll" /implib:"$(OUTDIR)\simple.lib" /filealign:512 
-LINK32_OBJS= \
-	"$(INTDIR)\maindll.obj"
-
-"..\..\..\..\bin\release\plugins\YAMN-filter\simple.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "simple - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-ALL : "..\..\..\..\bin\Debug\plugins\YAMN-filter\simple.dll" "$(OUTDIR)\simple.bsc"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\maindll.obj"
-	-@erase "$(INTDIR)\maindll.sbr"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\vc60.pdb"
-	-@erase "$(OUTDIR)\simple.bsc"
-	-@erase "$(OUTDIR)\simple.exp"
-	-@erase "$(OUTDIR)\simple.pdb"
-	-@erase "..\..\..\..\bin\Debug\plugins\YAMN-filter\simple.dll"
-	-@erase "..\..\..\..\bin\Debug\plugins\YAMN-filter\simple.ilk"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /G4 /Zp4 /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../../../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\simple.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\simple.bsc" 
-BSC32_SBRS= \
-	"$(INTDIR)\maindll.sbr"
-
-"$(OUTDIR)\simple.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
-    $(BSC32) @<<
-  $(BSC32_FLAGS) $(BSC32_SBRS)
-<<
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\simple.pdb" /debug /machine:I386 /out:"../../../../bin/Debug/plugins/YAMN-filter/simple.dll" /implib:"$(OUTDIR)\simple.lib" 
-LINK32_OBJS= \
-	"$(INTDIR)\maindll.obj"
-
-"..\..\..\..\bin\Debug\plugins\YAMN-filter\simple.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("simple.dep")
-!INCLUDE "simple.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "simple.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "simple - Win32 Release" || "$(CFG)" == "simple - Win32 Debug"
-SOURCE=.\maindll.cpp
-
-!IF  "$(CFG)" == "simple - Win32 Release"
-
-
-"$(INTDIR)\maindll.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "simple - Win32 Debug"
-
-
-"$(INTDIR)\maindll.obj"	"$(INTDIR)\maindll.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-
-!ENDIF 
-
diff --git a/protocols/YAMN/filter/readme.txt b/protocols/YAMN/filter/readme.txt
deleted file mode 100644
index a46db0236a..0000000000
--- a/protocols/YAMN/filter/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-This folder contains filter plugin sources for YAMN.
-\ No newline at end of file
diff --git a/protocols/YAMN/icons/iconttbup.ico b/protocols/YAMN/icons/iconttbup.ico
deleted file mode 100644
index ad18c56822..0000000000
--- a/protocols/YAMN/icons/iconttbup.ico
+++ /dev/null
diff --git a/protocols/YAMN/icons/icoyamn1.ico b/protocols/YAMN/icons/icoyamn1.ico
deleted file mode 100644
index d3959b4fd7..0000000000
--- a/protocols/YAMN/icons/icoyamn1.ico
+++ /dev/null
diff --git a/protocols/YAMN/icons/icoyamn2.ico b/protocols/YAMN/icons/icoyamn2.ico
deleted file mode 100644
index dfada56b5f..0000000000
--- a/protocols/YAMN/icons/icoyamn2.ico
+++ /dev/null
diff --git a/protocols/YAMN/icons/proto_YAMN.rc b/protocols/YAMN/icons/proto_YAMN.rc
deleted file mode 100644
index e20bd50bda..0000000000
--- a/protocols/YAMN/icons/proto_YAMN.rc
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "resource.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-
-IDI_ONLINE              ICON    DISCARDABLE     "../resources/iconeutral.ico"
-IDI_ICOYAMN1            ICON    DISCARDABLE     "icoyamn1.ico"
-IDI_ICOYAMN2            ICON    DISCARDABLE     "icoyamn2.ico"
-IDI_ICOTTBUP            ICON    DISCARDABLE     "iconttbup.ico"
-
-IDI_OFFLINE             ICON    DISCARDABLE     "../resources/icooffline.ico"
-IDI_NA                  ICON    DISCARDABLE     "../resources/icoyamn3.ico"
-IDI_OCCUPIED            ICON    DISCARDABLE     "../resources/iconttbdown.ico"
diff --git a/protocols/YAMN/icons/proto_YAMN_10.vcxproj.filters b/protocols/YAMN/icons/proto_YAMN_10.vcxproj.filters
deleted file mode 100644
index ae56e318a4..0000000000
--- a/protocols/YAMN/icons/proto_YAMN_10.vcxproj.filters
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{4726e1d1-39cd-435a-bd59-51fdb6745f46}</UniqueIdentifier>
-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\resources\iconeutral.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="..\resources\iconttbdown.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="iconttbup.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="..\resources\icooffline.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="icoyamn1.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="icoyamn2.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="..\resources\icoyamn3.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="proto_YAMN.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
-\ No newline at end of file
diff --git a/protocols/YAMN/icons/resource.h b/protocols/YAMN/icons/resource.h
deleted file mode 100644
index af36adfdae..0000000000
--- a/protocols/YAMN/icons/resource.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "../resources/resource.h"
-
diff --git a/protocols/YAMN/include/IcoLib.h b/protocols/YAMN/include/IcoLib.h
deleted file mode 100644
index a911ba571d..0000000000
--- a/protocols/YAMN/include/IcoLib.h
+++ /dev/null
@@ -1,26 +0,0 @@
-typedef struct {
-	int cbSize;
-    char *pszSection;        //section name used to group icons
-	char *pszDescription;	   //description for options dialog
-	char *pszName;		   //name to refer to icon when playing and in db
-    char *pszDefaultFile;    //default icon file to use
-	int  iDefaultIndex;
-} SKINICONDESC;
-
-//
-//  Add a icon into options UI
-//  NB! pszName should be unique, e.g.: clistmw_apply, tabsrmm_history
-//
-//  wParam = (WPARAM)0
-//  lParam = (LPARAM)(SKINICONDESC*)sid;
-//
-#define MS_SKIN2_ADDICON "Skin2/Icons/AddIcon"
-//
-//  Retrieve HICON with name specified in lParam
-//  Returned HICON SHOULDN'T be destroyed, it managed by IcoLib
-//
-#define MS_SKIN2_GETICON "Skin2/Icons/GetIcon"
-//
-//  Icons change notification
-//
-#define ME_SKIN2_ICONSCHANGED "Skin2/IconsChanged"
diff --git a/protocols/YAMN/mails/test/header.txt b/protocols/YAMN/mails/test/header.txt
deleted file mode 100644
index 55a4d86d65..0000000000
--- a/protocols/YAMN/mails/test/header.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Return-Path: <foromundial-return-1047-decode.com.ar-pablo=decode.com.ar@decode.com.ar>
-Delivered-To: pablo@decode.com.ar
-Received: (qmail 5438 invoked by uid 618); 5 Sep 2003 19:49:16 -0000
-Mailing-List: contact foromundial-help@decode.com.ar; run by ezmlm
-Precedence: bulk
-X-No-Archive: yes
-List-Post: <mailto:foromundial@decode.com.ar>
-List-Help: <mailto:foromundial-help@decode.com.ar>
-List-Unsubscribe: <mailto:foromundial-unsubscribe@decode.com.ar>
-List-Subscribe: <mailto:foromundial-subscribe@decode.com.ar>
-X-Seq: 1047
-Delivered-To: mailing list foromundial@decode.com.ar
-Received: (qmail 5432 invoked by uid 618); 5 Sep 2003 19:49:15 -0000
-X-Spam-Status: No, hits=3.9 required=7.5
-Message-Id: <4.2.1.20030905163128.00a998a0@mail.labsem.cetuc.puc-rio.br>
-X-Sender: sandra@mail.labsem.cetuc.puc-rio.br
-X-Mailer: QUALCOMM Windows Eudora Pro Version 4.2.1 
-Date: Fri, 05 Sep 2003 16:48:12 -0300
-To: foromundial@decode.com.ar
-From: "Sandra M. Landi" <sandra@labsem.cetuc.puc-rio.br>
-Mime-Version: 1.0
-Content-Type: multipart/alternative;
-	boundary="=====================_4293080==_.ALT"
-X-Antirelay: Good relay from local net2 139.82.127.0/26
-Subject: [foromundial-1047] frases para un viernes
-
-
-.
diff --git a/protocols/YAMN/mails/test/header2.txt b/protocols/YAMN/mails/test/header2.txt
deleted file mode 100644
index 3ba81a2bd0..0000000000
--- a/protocols/YAMN/mails/test/header2.txt
+++ /dev/null
@@ -1,97 +0,0 @@
-Return-Path: <miranda@megami.sprintserve.net>
-Received: [from megami.sprintserve.net (megami.sprintserve.net [207.142.136.160])
-	by mail2.ba.psg.sk  with ESMTP id i4FHNUY6018585
-	for <om3tn@psg.sk>; Sat, 15 May 2004 19:23:31 +0200]
-X-Envelope-To: <om3tn@psg.sk>
-Received: from miranda by megami.sprintserve.net with local (Exim 4.34)
-	id 1BP2sS-0006W6-MS
-	for om3tn@psg.sk; Sat, 15 May 2004 13:23:12 -0400 
-To: Undisclosed-recipients:;
-Subject: Upozorn�n� na odpov�� v t�matu - YAMN problem
-Reply-to: forum@miranda-im.org
-From: forum@miranda-im.org:
-Message-ID: <e003226b4a46a7ca6b490345f21b91af@forums.miranda-im.org>
-MIME-Version: 1.0
-Content-type: text/plain; charset=Windows-1250
-Content-transfer-encoding: 8bit
-Date: Sat, 15 May 2004 13:23:12 -0400
-X-Priority: 3
-X-MSMail-Priority: Normal
-X-Mailer: PHP
-X-MimeOLE: Produced By phpBB2
-X-MailScanner-Information: Please contact the ISP for more information
-X-MailScanner: Found to be clean
-X-AntiAbuse: This header was added to track abuse, please include it with any abuse report
-X-AntiAbuse: Primary Hostname - megami.sprintserve.net
-X-AntiAbuse: Original Domain - psg.sk
-X-AntiAbuse: Originator/Caller UID/GID - [32110 32110] / [47 12]
-X-AntiAbuse: Sender Address Domain - megami.sprintserve.net
-X-Source: 
-X-Source-Args: 
-X-Source-Dir: 
-.
-
-Subject: Upozorn�n� na odpov�� v t�matu - YAMN problem
-
-Return-Path: <miranda@megami.sprintserve.net>
-Received: [from megami.sprintserve.net (megami.sprintserve.net [207.142.136.160])
-	by mail2.ba.psg.sk  with ESMTP id i4FHX2Y6020695
-	for <om3tn@psg.sk>; Sat, 15 May 2004 19:33:03 +0200]
-X-Envelope-To: <om3tn@psg.sk>
-Received: from miranda by megami.sprintserve.net with local (Exim 4.34)
-	id 1BP31h-0001cs-Ai
-	for om3tn@psg.sk; Sat, 15 May 2004 13:32:45 -0400
-To: Undisclosed-recipients:;
-Subject: Upozorn�n� na odpov�� v t�matu - YAMN problem
-Reply-to: forum@miranda-im.org
-From: forum@miranda-im.org
-Message-ID: <0873b36d0931479c4ebe23ba71ff4810@forums.miranda-im.org>
-MIME-Version: 1.0
-Content-type: text/plain; charset=Windows-1250
-Content-transfer-encoding: 8bit
-Date: Sat, 15 May 2004 13:32:45 -0400
-X-Priority: 3
-X-MSMail-Priority: Normal
-X-Mailer: PHP
-X-MimeOLE: Produced By phpBB2
-X-MailScanner-Information: Please contact the ISP for more information
-X-MailScanner: Found to be clean
-X-AntiAbuse: This header was added to track abuse, please include it with any abuse report
-X-AntiAbuse: Primary Hostname - megami.sprintserve.net
-X-AntiAbuse: Original Domain - psg.sk
-X-AntiAbuse: Originator/Caller UID/GID - [32110 32110] / [47 12]
-X-AntiAbuse: Sender Address Domain - megami.sprintserve.net
-X-Source: 
-X-Source-Args: 
-X-Source-Dir: 
-
-.
-
-Received: by hplm (mbox om3tn)
- (with POP3 daemon cucipop (v1.31 1998/05/13) Tue May 27 18:42:20 2003)
-X-From_: HMF@hotbox.ru  Tue May 20 18:11:44 2003
-Return-Path: <HMF@hotbox.ru>
-Received: from ns1.slovanet.net (ns1.slovanet.net [195.28.64.119])
-        by hplm.psg.sk (8.12.9/8.12.7) with SMTP id h4KGBfxJ003732
-        for <om3tn@psg.sk>; Tue, 20 May 2003 18:11:44 +0200
-X-Envelope-To: <om3tn@psg.sk>
-Received: (qmail 6339 invoked from network); 20 May 2003 18:11:45 +0200
-Received: from unknown (HELO ??+???) (61.33.134.106)
-  by ns1.slovanet.net with SMTP; 20 May 2003 18:11:45 +0200
-Received: by london.com (Postfix, from userid 302)
-         id WTS; Tue, 20 May 2003 20:13:19
-Received: from ��+⌥ (��+⌥ [61.33.134.106])
-         by mill.co.uk (Postfix) with ESMTP id 613
-         for <om3tn@psg.sk>; Tue, 20 May 2003 20:13:19
-Subject: ����������������. ������������. �� 0,8 �� ��, ��������� ! 20:13:19
-From: <HMF@hotbox.ru>
-To: OM3TN <om3tn@psg.sk>
-Reply-To: <>
-X-Mailer: AOL 7.0 for Windows UK sub 52
-X-Priority: 1
-X-MSMail-Priority: High
-Mime-Version: 1.0
-Content-Type: text/html; charset="Windows-1251"
-Content-Transfer-Encoding: 7bit
-Date: Tue, 20 May 2003 20:13:21
-Message-Id: <DED-173-MCL662@mail-relay2.slovanet.net>
-\ No newline at end of file
diff --git a/protocols/YAMN/mails/test/readme.txt b/protocols/YAMN/mails/test/readme.txt
deleted file mode 100644
index 35a30b255a..0000000000
--- a/protocols/YAMN/mails/test/readme.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This  is  project  for  testing  mime  encoding/decoding. It
-is  very  usefull  for  developers,  when some problems with
-non-standard headers occured. You can use it to step through
-MIME decoding functions.
diff --git a/protocols/YAMN/mails/test/test.cpp b/protocols/YAMN/mails/test/test.cpp
deleted file mode 100644
index f8dcd14e89..0000000000
--- a/protocols/YAMN/mails/test/test.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * This file is for testing purposes. Save in header.txt your problem header and you can
- * browse through functions to get result
- *
- * (c) majvan 2002-2004
- */
-
-#include <stdio.h>
-#include "../m_mails.h"
-
-extern void WINAPI TranslateHeaderFcn(char *stream,int len,struct CMimeItem **head);
-extern void ExtractHeader(struct CMimeItem *items,int CP,struct CHeader *head);
-
-void main()
-{
-	char Buffer[8192];			//we do not suppose longer header
-	FILE *fp;
-	YAMNMAIL *Mail;
-	PMAILDATA *MailData;
-	CMimeItem *head;
-
-	struct CHeader ExtractedHeader;
-
-	if(NULL==(fp=fopen("header2.txt","r")))
-		return;
-	fread(Buffer,sizeof(Buffer),1,fp);
-	if(ferror(fp))
-	{
-		fclose(fp);
-		return;
-	}
-	fclose(fp);
-	Mail = new YAMNMAIL;
-	MailData = new PMAILDATA;
-	head = new CMimeItem;
-	Mail->MailData = *MailData;
-	Mail->MailData->TranslatedHeader = head;
-
-	TranslateHeaderFcn(Buffer,strlen(Buffer), &Mail->MailData->TranslatedHeader);
-	ExtractHeader(Mail->MailData->TranslatedHeader,CP_ACP,&ExtractedHeader);
-	return;
-}
-\ No newline at end of file
diff --git a/protocols/YAMN/mails/test/test.dsp b/protocols/YAMN/mails/test/test.dsp
deleted file mode 100644
index 6d01b3669a..0000000000
--- a/protocols/YAMN/mails/test/test.dsp
+++ /dev/null
@@ -1,112 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "test.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "test.mak" CFG="test - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "test - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x405 /d "NDEBUG"
-# ADD RSC /l 0x405 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "test - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x405 /d "_DEBUG"
-# ADD RSC /l 0x405 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "test - Win32 Release"
-# Name "test - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\decode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\mails.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\mime.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\test.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/protocols/YAMN/mails/test/test.dsw b/protocols/YAMN/mails/test/test.dsw
deleted file mode 100644
index e25096d17d..0000000000
--- a/protocols/YAMN/mails/test/test.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "test"=.\test.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/protocols/YAMN/icons/proto_YAMN_10.vcxproj b/protocols/YAMN/proto_yamn/proto_YAMN_10.vcxproj
index 5cf5919162..2338196c5f 100644
--- a/protocols/YAMN/icons/proto_YAMN_10.vcxproj
+++ b/protocols/YAMN/proto_yamn/proto_YAMN_10.vcxproj
@@ -120,21 +120,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <None Include="..\resources\iconeutral.ico" />
-    <None Include="..\resources\iconttbdown.ico" />
-    <None Include="iconttbup.ico" />
-    <None Include="..\resources\icooffline.ico" />
-    <None Include="icoyamn1.ico" />
-    <None Include="icoyamn2.ico" />
-    <None Include="..\resources\icoyamn3.ico" />
+    <ClInclude Include="src\resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="proto_YAMN.rc">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
+    <ResourceCompile Include="res\proto_YAMN.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/protocols/YAMN/proto_yamn/proto_YAMN_10.vcxproj.filters b/protocols/YAMN/proto_yamn/proto_YAMN_10.vcxproj.filters
new file mode 100644
index 0000000000..3fa00bebfb
--- /dev/null
+++ b/protocols/YAMN/proto_yamn/proto_YAMN_10.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{4726e1d1-39cd-435a-bd59-51fdb6745f46}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{81ae85e6-6c6b-42dc-be93-6b2bdc29210f}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="res\proto_YAMN.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/protocols/YAMN/proto_yamn/res/icoaway.ico b/protocols/YAMN/proto_yamn/res/icoaway.ico
new file mode 100644
index 0000000000..a99cbe0a60
--- /dev/null
+++ b/protocols/YAMN/proto_yamn/res/icoaway.ico
diff --git a/protocols/YAMN/proto_yamn/res/icooccupied.ico b/protocols/YAMN/proto_yamn/res/icooccupied.ico
new file mode 100644
index 0000000000..81dd9fe467
--- /dev/null
+++ b/protocols/YAMN/proto_yamn/res/icooccupied.ico
diff --git a/protocols/YAMN/proto_yamn/res/icooffline.ico b/protocols/YAMN/proto_yamn/res/icooffline.ico
new file mode 100644
index 0000000000..78f925ede7
--- /dev/null
+++ b/protocols/YAMN/proto_yamn/res/icooffline.ico
diff --git a/protocols/YAMN/proto_yamn/res/icoonline.ico b/protocols/YAMN/proto_yamn/res/icoonline.ico
new file mode 100644
index 0000000000..b2605bb9d4
--- /dev/null
+++ b/protocols/YAMN/proto_yamn/res/icoonline.ico
diff --git a/protocols/YAMN/proto_yamn/res/proto_YAMN.rc b/protocols/YAMN/proto_yamn/res/proto_YAMN.rc
new file mode 100644
index 0000000000..087ee444c9
--- /dev/null
+++ b/protocols/YAMN/proto_yamn/res/proto_YAMN.rc
@@ -0,0 +1,16 @@
+#include "..\src\resource.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+
+IDI_ICON1             ICON         "icooffline.ico"
+IDI_ICON2             ICON         "icoonline.ico"
+IDI_ICON5             ICON         "icooffline.ico"
+IDI_ICON7             ICON         "icooccupied.ico"
+IDI_ICON3             ICON         "icoaway.ico"
diff --git a/protocols/YAMN/proto_yamn/src/resource.h b/protocols/YAMN/proto_yamn/src/resource.h
new file mode 100644
index 0000000000..0532df3fa6
--- /dev/null
+++ b/protocols/YAMN/proto_yamn/src/resource.h
@@ -0,0 +1,20 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by Proto_YAMN.rc
+//
+#define IDI_ICON1                       105
+#define IDI_ICON2                       104
+#define IDI_ICON3                       128
+#define IDI_ICON5                       131
+#define IDI_ICON7                       159
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        110
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/protocols/YAMN/resources/YAMN.rc b/protocols/YAMN/res/YAMN.rc
index 54320549e4..a002fe7ef8 100644
--- a/protocols/YAMN/resources/YAMN.rc
+++ b/protocols/YAMN/res/YAMN.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -27,7 +27,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 1 TEXTINCLUDE
 BEGIN
-    "resource.h\0"
+    "..\\src\\resource.h\0"
 END
 
 2 TEXTINCLUDE
@@ -321,13 +321,6 @@ IDI_ONLINE              ICON                    "iconeutral.ico"
 IDI_OFFLINE             ICON                    "icooffline.ico"
 IDI_NA                  ICON                    "icoyamn3.ico"
 IDI_OCCUPIED            ICON                    "iconttbdown.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDB_ICONS               BITMAP                  "yamn.bmp"
 #endif    // Neutral resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/protocols/YAMN/res/iconeutral.ico b/protocols/YAMN/res/iconeutral.ico
new file mode 100644
index 0000000000..a99cbe0a60
--- /dev/null
+++ b/protocols/YAMN/res/iconeutral.ico
diff --git a/protocols/YAMN/res/iconttbdown.ico b/protocols/YAMN/res/iconttbdown.ico
new file mode 100644
index 0000000000..81dd9fe467
--- /dev/null
+++ b/protocols/YAMN/res/iconttbdown.ico
diff --git a/protocols/YAMN/res/icooffline.ico b/protocols/YAMN/res/icooffline.ico
new file mode 100644
index 0000000000..78f925ede7
--- /dev/null
+++ b/protocols/YAMN/res/icooffline.ico
diff --git a/protocols/YAMN/res/icoyamn3.ico b/protocols/YAMN/res/icoyamn3.ico
new file mode 100644
index 0000000000..78f925ede7
--- /dev/null
+++ b/protocols/YAMN/res/icoyamn3.ico
diff --git a/protocols/YAMN/resources/yamn_ver.rc b/protocols/YAMN/res/yamn_ver.rc
index e9fb345412..84d27568b6 100644
--- a/protocols/YAMN/resources/yamn_ver.rc
+++ b/protocols/YAMN/res/yamn_ver.rc
@@ -1,8 +1,7 @@
 // Microsoft Visual C++ generated resource script.
 //
 
-#include "resource.h"
-#include "../version.h"
+#include "..\src\version.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/YAMN/resources/iconeutral.ico b/protocols/YAMN/resources/iconeutral.ico
deleted file mode 100644
index 9304f4334a..0000000000
--- a/protocols/YAMN/resources/iconeutral.ico
+++ /dev/null
diff --git a/protocols/YAMN/resources/iconttbdown.ico b/protocols/YAMN/resources/iconttbdown.ico
deleted file mode 100644
index 206eba2c76..0000000000
--- a/protocols/YAMN/resources/iconttbdown.ico
+++ /dev/null
diff --git a/protocols/YAMN/resources/icooffline.ico b/protocols/YAMN/resources/icooffline.ico
deleted file mode 100644
index db5b2e18fa..0000000000
--- a/protocols/YAMN/resources/icooffline.ico
+++ /dev/null
diff --git a/protocols/YAMN/resources/icoyamn3.ico b/protocols/YAMN/resources/icoyamn3.ico
deleted file mode 100644
index ca11f0f4f4..0000000000
--- a/protocols/YAMN/resources/icoyamn3.ico
+++ /dev/null
diff --git a/protocols/YAMN/resources/yamn.bmp b/protocols/YAMN/resources/yamn.bmp
deleted file mode 100644
index 91a9e34ddf..0000000000
--- a/protocols/YAMN/resources/yamn.bmp
+++ /dev/null
diff --git a/protocols/YAMN/YAMNopts.cpp b/protocols/YAMN/src/YAMNopts.cpp
index 99a8091366..99a8091366 100644
--- a/protocols/YAMN/YAMNopts.cpp
+++ b/protocols/YAMN/src/YAMNopts.cpp
diff --git a/protocols/YAMN/account.cpp b/protocols/YAMN/src/account.cpp
index d1de8b8e4c..d1de8b8e4c 100644
--- a/protocols/YAMN/account.cpp
+++ b/protocols/YAMN/src/account.cpp
diff --git a/protocols/YAMN/browser/badconnect.cpp b/protocols/YAMN/src/browser/badconnect.cpp
index 785508d066..785508d066 100644
--- a/protocols/YAMN/browser/badconnect.cpp
+++ b/protocols/YAMN/src/browser/badconnect.cpp
diff --git a/protocols/YAMN/browser/m_browser.h b/protocols/YAMN/src/browser/m_browser.h
index 8b05e3d84a..8b05e3d84a 100644
--- a/protocols/YAMN/browser/m_browser.h
+++ b/protocols/YAMN/src/browser/m_browser.h
diff --git a/protocols/YAMN/browser/mailbrowser.cpp b/protocols/YAMN/src/browser/mailbrowser.cpp
index 15b24d0356..15b24d0356 100644
--- a/protocols/YAMN/browser/mailbrowser.cpp
+++ b/protocols/YAMN/src/browser/mailbrowser.cpp
diff --git a/protocols/YAMN/debug.cpp b/protocols/YAMN/src/debug.cpp
index 9b9793a965..9b9793a965 100644
--- a/protocols/YAMN/debug.cpp
+++ b/protocols/YAMN/src/debug.cpp
diff --git a/protocols/YAMN/debug.h b/protocols/YAMN/src/debug.h
index 3bde9ddc81..3bde9ddc81 100644
--- a/protocols/YAMN/debug.h
+++ b/protocols/YAMN/src/debug.h
diff --git a/protocols/YAMN/filterplugin.cpp b/protocols/YAMN/src/filterplugin.cpp
index 8f61003293..8f61003293 100644
--- a/protocols/YAMN/filterplugin.cpp
+++ b/protocols/YAMN/src/filterplugin.cpp
diff --git a/protocols/YAMN/mails/decode.cpp b/protocols/YAMN/src/mails/decode.cpp
index 867ed7ff25..867ed7ff25 100644
--- a/protocols/YAMN/mails/decode.cpp
+++ b/protocols/YAMN/src/mails/decode.cpp
diff --git a/protocols/YAMN/mails/m_decode.h b/protocols/YAMN/src/mails/m_decode.h
index e6d2b52fae..e6d2b52fae 100644
--- a/protocols/YAMN/mails/m_decode.h
+++ b/protocols/YAMN/src/mails/m_decode.h
diff --git a/protocols/YAMN/mails/mails.cpp b/protocols/YAMN/src/mails/mails.cpp
index af0f3d2329..af0f3d2329 100644
--- a/protocols/YAMN/mails/mails.cpp
+++ b/protocols/YAMN/src/mails/mails.cpp
diff --git a/protocols/YAMN/mails/mime.cpp b/protocols/YAMN/src/mails/mime.cpp
index 2a66b80e2b..2a66b80e2b 100644
--- a/protocols/YAMN/mails/mime.cpp
+++ b/protocols/YAMN/src/mails/mime.cpp
diff --git a/protocols/YAMN/main.cpp b/protocols/YAMN/src/main.cpp
index e7e74ee7b4..196e96b213 100644
--- a/protocols/YAMN/main.cpp
+++ b/protocols/YAMN/src/main.cpp
@@ -11,7 +11,6 @@
 
 #include "yamn.h"
 #include "main.h"
-#include "resources/resource.h"
 #include <io.h>
 
 #include "m_hotkeys.h"
@@ -266,34 +265,23 @@ static TIconListItem iconList[] =
 
 static void LoadIcons()
 {
-	HIMAGELIST CSImages = ImageList_Create(16, 16, ILC_COLOR8|ILC_MASK, 0, 3);
-	{
-		HBITMAP hScrBM = (HBITMAP)LoadImage(YAMNVar.hInst, MAKEINTRESOURCE(IDB_ICONS), IMAGE_BITMAP, 0, 0, LR_SHARED);
-		ImageList_AddMasked(CSImages, hScrBM, RGB( 255, 0, 255 ));
-		DeleteObject(hScrBM);
-	}
-
-	char szFile[MAX_PATH];
-	GetModuleFileNameA(YAMNVar.hInst, szFile, MAX_PATH);
+	TCHAR szFile[MAX_PATH];
+	GetModuleFileName(YAMNVar.hInst, szFile, MAX_PATH);
 
 	SKINICONDESC sid = {0};
 	sid.cbSize = sizeof(SKINICONDESC);
-	sid.pszDefaultFile = szFile;
-	sid.pszSection = "YAMN";
+	sid.flags = SIDF_ALL_TCHAR;
+	sid.ptszDefaultFile = szFile;
+	sid.ptszSection = _T("YAMN");
 
-	for (int i = 0, k = 0; i < ICONSNUMBER; i++) {
-		switch (i){
-		case 1: case 2: case 5: 
-			sid.hDefaultIcon = ImageList_ExtractIcon(NULL, CSImages, k); k++;
-			break;
-		default:
-			sid.hDefaultIcon = LoadIcon(YAMNVar.hInst, MAKEINTRESOURCE(iconList[i].defIconID)); break;
-		}
+	for (int i = 0, k = 0; i < SIZEOF(iconList); i++)
+	{
 		sid.pszName = iconList[i].szName;
 		sid.pszDescription = iconList[i].szDescr;
 		sid.iDefaultIndex = -iconList[i].defIconID;
 		iconList[i].hIcon = Skin_AddIcon(&sid);
-}	}
+	}
+}
 
 HANDLE WINAPI g_GetIconHandle( int idx )
 {
diff --git a/protocols/YAMN/main.h b/protocols/YAMN/src/main.h
index 08d9f91fed..08d9f91fed 100644
--- a/protocols/YAMN/main.h
+++ b/protocols/YAMN/src/main.h
diff --git a/protocols/YAMN/proto/md5.c b/protocols/YAMN/src/proto/md5.c
index 25546d2a65..280fcdeaae 100644
--- a/protocols/YAMN/proto/md5.c
+++ b/protocols/YAMN/src/proto/md5.c
@@ -19,7 +19,6 @@
 	typedef unsigned __int64 size_t;
 #else
 	typedef unsigned int size_t;
-	#include "../filter/simple/AggressiveOptimize.h"
 #endif
 void *  __cdecl memcpy(void *, const void *, size_t);
 void *  __cdecl memset(void *, int, size_t);
diff --git a/protocols/YAMN/proto/md5.h b/protocols/YAMN/src/proto/md5.h
index e264f686db..e264f686db 100644
--- a/protocols/YAMN/proto/md5.h
+++ b/protocols/YAMN/src/proto/md5.h
diff --git a/protocols/YAMN/proto/netclient.h b/protocols/YAMN/src/proto/netclient.h
index 2414dbdef1..2414dbdef1 100644
--- a/protocols/YAMN/proto/netclient.h
+++ b/protocols/YAMN/src/proto/netclient.h
diff --git a/protocols/YAMN/proto/netlib.cpp b/protocols/YAMN/src/proto/netlib.cpp
index b7c1864ffa..b7c1864ffa 100644
--- a/protocols/YAMN/proto/netlib.cpp
+++ b/protocols/YAMN/src/proto/netlib.cpp
diff --git a/protocols/YAMN/proto/netlib.h b/protocols/YAMN/src/proto/netlib.h
index 90ad3613a5..90ad3613a5 100644
--- a/protocols/YAMN/proto/netlib.h
+++ b/protocols/YAMN/src/proto/netlib.h
diff --git a/protocols/YAMN/proto/pop3/pop3.cpp b/protocols/YAMN/src/proto/pop3/pop3.cpp
index 05e85d7156..05e85d7156 100644
--- a/protocols/YAMN/proto/pop3/pop3.cpp
+++ b/protocols/YAMN/src/proto/pop3/pop3.cpp
diff --git a/protocols/YAMN/proto/pop3/pop3.h b/protocols/YAMN/src/proto/pop3/pop3.h
index 1f7f2ea737..1f7f2ea737 100644
--- a/protocols/YAMN/proto/pop3/pop3.h
+++ b/protocols/YAMN/src/proto/pop3/pop3.h
diff --git a/protocols/YAMN/proto/pop3/pop3comm.cpp b/protocols/YAMN/src/proto/pop3/pop3comm.cpp
index 954f1b5860..954f1b5860 100644
--- a/protocols/YAMN/proto/pop3/pop3comm.cpp
+++ b/protocols/YAMN/src/proto/pop3/pop3comm.cpp
diff --git a/protocols/YAMN/proto/pop3/pop3comm.h b/protocols/YAMN/src/proto/pop3/pop3comm.h
index c7eb01b5a1..c7eb01b5a1 100644
--- a/protocols/YAMN/proto/pop3/pop3comm.h
+++ b/protocols/YAMN/src/proto/pop3/pop3comm.h
diff --git a/protocols/YAMN/proto/pop3/pop3opt.cpp b/protocols/YAMN/src/proto/pop3/pop3opt.cpp
index 1a265a0800..1a265a0800 100644
--- a/protocols/YAMN/proto/pop3/pop3opt.cpp
+++ b/protocols/YAMN/src/proto/pop3/pop3opt.cpp
diff --git a/protocols/YAMN/proto/pop3/pop3opt.h b/protocols/YAMN/src/proto/pop3/pop3opt.h
index 6a678284fa..6a678284fa 100644
--- a/protocols/YAMN/proto/pop3/pop3opt.h
+++ b/protocols/YAMN/src/proto/pop3/pop3opt.h
diff --git a/protocols/YAMN/protoplugin.cpp b/protocols/YAMN/src/protoplugin.cpp
index 479b54ce67..479b54ce67 100644
--- a/protocols/YAMN/protoplugin.cpp
+++ b/protocols/YAMN/src/protoplugin.cpp
diff --git a/protocols/YAMN/resources/resource.h b/protocols/YAMN/src/resource.h
index 8bfd74c9a3..87b4b07da2 100644
--- a/protocols/YAMN/resources/resource.h
+++ b/protocols/YAMN/src/resource.h
@@ -11,7 +11,6 @@
 #define IDD_DLGBADCONNECT               115
 #define IDD_POP3ACCOUNTOPT              121
 #define IDD_YAMNOPT                     126
-#define IDB_ICONS                       127
 #define IDI_NA                          131
 #define IDI_ICOTTBUP                    138
 #define IDD_PLUGINOPT                   141
diff --git a/protocols/YAMN/services.cpp b/protocols/YAMN/src/services.cpp
index cd01722997..cd01722997 100644
--- a/protocols/YAMN/services.cpp
+++ b/protocols/YAMN/src/services.cpp
diff --git a/protocols/YAMN/synchro.cpp b/protocols/YAMN/src/synchro.cpp
index e510d8bac9..e510d8bac9 100644
--- a/protocols/YAMN/synchro.cpp
+++ b/protocols/YAMN/src/synchro.cpp
diff --git a/protocols/YAMN/version.h b/protocols/YAMN/src/version.h
index e658cfee0c..e658cfee0c 100644
--- a/protocols/YAMN/version.h
+++ b/protocols/YAMN/src/version.h
diff --git a/protocols/YAMN/yamn.cpp b/protocols/YAMN/src/yamn.cpp
index c93225e609..c93225e609 100644
--- a/protocols/YAMN/yamn.cpp
+++ b/protocols/YAMN/src/yamn.cpp
diff --git a/protocols/YAMN/yamn.h b/protocols/YAMN/src/yamn.h
index c9511fd953..c8cd8d596d 100644
--- a/protocols/YAMN/yamn.h
+++ b/protocols/YAMN/src/yamn.h
@@ -40,7 +40,7 @@
 #include "m_mails.h"	//use YAMN's mails
 #include "mails/m_decode.h"	//use decoding macros (needed for header extracting)
 #include "browser/m_browser.h"	//we want to run YAMN mailbrowser, no new mail notification and bad connect window
-#include "resources/resource.h"
+#include "resource.h"
 #include "m_protoplugin.h"
 #include "m_filterplugin.h"
 #include "m_yamn.h"	//Main YAMN's variables
@@ -50,9 +50,6 @@
 #include <m_folders.h>
 
 
-//icons definitions
-#define ICONSNUMBER 8
-
 //From services.cpp
 void CreateServiceFunctions(void);
 void DestroyServiceFunctions(void);