76 files changed, 133 insertions, 275 deletions

diff --git a/plugins/SecureIM/!whatsnew.txt b/plugins/SecureIM/docs/!whatsnew.txt
index eeb792d864..eeb792d864 100644
--- a/plugins/SecureIM/!whatsnew.txt
+++ b/plugins/SecureIM/docs/!whatsnew.txt
diff --git a/plugins/SecureIM/secureim-translation.txt b/plugins/SecureIM/docs/secureim-translation.txt
index 1242476fc9..1242476fc9 100644
--- a/plugins/SecureIM/secureim-translation.txt
+++ b/plugins/SecureIM/docs/secureim-translation.txt
diff --git a/plugins/SecureIM/icons/cl_dis.ico b/plugins/SecureIM/res/cl_dis.ico
index 53209bc652..53209bc652 100644
--- a/plugins/SecureIM/icons/cl_dis.ico
+++ b/plugins/SecureIM/res/cl_dis.ico
diff --git a/plugins/SecureIM/icons/cl_est.ico b/plugins/SecureIM/res/cl_est.ico
index 8b42e2cb44..8b42e2cb44 100644
--- a/plugins/SecureIM/icons/cl_est.ico
+++ b/plugins/SecureIM/res/cl_est.ico
diff --git a/plugins/SecureIM/icons/cm_dis.ico b/plugins/SecureIM/res/cm_dis.ico
index 53209bc652..53209bc652 100644
--- a/plugins/SecureIM/icons/cm_dis.ico
+++ b/plugins/SecureIM/res/cm_dis.ico
diff --git a/plugins/SecureIM/icons/cm_est.ico b/plugins/SecureIM/res/cm_est.ico
index dd6f805868..dd6f805868 100644
--- a/plugins/SecureIM/icons/cm_est.ico
+++ b/plugins/SecureIM/res/cm_est.ico
diff --git a/plugins/SecureIM/icons/mw_dis.ico b/plugins/SecureIM/res/mw_dis.ico
index 53209bc652..53209bc652 100644
--- a/plugins/SecureIM/icons/mw_dis.ico
+++ b/plugins/SecureIM/res/mw_dis.ico
diff --git a/plugins/SecureIM/icons/mw_est.ico b/plugins/SecureIM/res/mw_est.ico
index 8b42e2cb44..8b42e2cb44 100644
--- a/plugins/SecureIM/icons/mw_est.ico
+++ b/plugins/SecureIM/res/mw_est.ico
diff --git a/plugins/SecureIM/icons/ov_gpg.ico b/plugins/SecureIM/res/ov_gpg.ico
index d823cf83b6..d823cf83b6 100644
--- a/plugins/SecureIM/icons/ov_gpg.ico
+++ b/plugins/SecureIM/res/ov_gpg.ico
diff --git a/plugins/SecureIM/icons/ov_nat.ico b/plugins/SecureIM/res/ov_nat.ico
index 37000bd69b..37000bd69b 100644
--- a/plugins/SecureIM/icons/ov_nat.ico
+++ b/plugins/SecureIM/res/ov_nat.ico
diff --git a/plugins/SecureIM/icons/ov_pgp.ico b/plugins/SecureIM/res/ov_pgp.ico
index c365c48cde..c365c48cde 100644
--- a/plugins/SecureIM/icons/ov_pgp.ico
+++ b/plugins/SecureIM/res/ov_pgp.ico
diff --git a/plugins/SecureIM/icons/ov_rsa.ico b/plugins/SecureIM/res/ov_rsa.ico
index a659463475..a659463475 100644
--- a/plugins/SecureIM/icons/ov_rsa.ico
+++ b/plugins/SecureIM/res/ov_rsa.ico
diff --git a/plugins/SecureIM/icons/pu_dis.ico b/plugins/SecureIM/res/pu_dis.ico
index 53209bc652..53209bc652 100644
--- a/plugins/SecureIM/icons/pu_dis.ico
+++ b/plugins/SecureIM/res/pu_dis.ico
diff --git a/plugins/SecureIM/icons/pu_est.ico b/plugins/SecureIM/res/pu_est.ico
index 8b42e2cb44..8b42e2cb44 100644
--- a/plugins/SecureIM/icons/pu_est.ico
+++ b/plugins/SecureIM/res/pu_est.ico
diff --git a/plugins/SecureIM/icons/pu_msg.ico b/plugins/SecureIM/res/pu_msg.ico
index 5964ead2e1..5964ead2e1 100644
--- a/plugins/SecureIM/icons/pu_msg.ico
+++ b/plugins/SecureIM/res/pu_msg.ico
diff --git a/plugins/SecureIM/icons/pu_prc.ico b/plugins/SecureIM/res/pu_prc.ico
index 822c55aeb7..822c55aeb7 100644
--- a/plugins/SecureIM/icons/pu_prc.ico
+++ b/plugins/SecureIM/res/pu_prc.ico
diff --git a/plugins/SecureIM/resource.rc b/plugins/SecureIM/res/resource.rc
index 929f4a413f..9ff15ed681 100644
--- a/plugins/SecureIM/resource.rc
+++ b/plugins/SecureIM/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

+#include "..\src\resource.h"

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

 //

@@ -22,8 +22,6 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 #pragma code_page(1251)

 #endif //_WIN32

 

-#include "version.rc"

-

 /////////////////////////////////////////////////////////////////////////////

 //

 // Dialog

@@ -323,9 +321,8 @@ END
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

+    "..\\src\\resource.h\0"

     "afxres.h\0"

-    "version.rc\0"

 END

 

 #endif    // APSTUDIO_INVOKED

diff --git a/plugins/SecureIM/resource_icons.rc b/plugins/SecureIM/res/resource_icons.rc
index db48cece57..8f9e8edf85 100644
--- a/plugins/SecureIM/resource_icons.rc
+++ b/plugins/SecureIM/res/resource_icons.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

+#include "..\src\resource.h"

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

 //

@@ -20,8 +20,6 @@
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT

 #pragma code_page(1251)

 

-#include "version_icons.rc"

-

 /////////////////////////////////////////////////////////////////////////////

 //

 // Icon

@@ -29,23 +27,23 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

-IDI_CL_DIS ICON "icons\\cl_dis.ico"

-IDI_CL_EST ICON "icons\\cl_est.ico"

-IDI_CM_DIS ICON "icons\\cm_dis.ico"

-IDI_CM_EST ICON "icons\\cm_est.ico"

-IDI_MW_DIS ICON "icons\\mw_dis.ico"

-IDI_MW_EST ICON "icons\\mw_est.ico"

-IDI_PU_DIS ICON "icons\\pu_dis.ico"

-IDI_PU_EST ICON "icons\\pu_est.ico"

-IDI_PU_PRC ICON "icons\\pu_prc.ico"

-IDI_PU_MSG ICON "icons\\pu_msg.ico"

-IDI_ST_DIS ICON "icons\\st_dis.ico"

-IDI_ST_ENA ICON "icons\\st_ena.ico"

-IDI_ST_TRY ICON "icons\\st_try.ico"

-IDI_OV_NAT ICON "icons\\ov_nat.ico"

-IDI_OV_PGP ICON "icons\\ov_pgp.ico"

-IDI_OV_GPG ICON "icons\\ov_gpg.ico"

-IDI_OV_RSA ICON "icons\\ov_rsa.ico"

+IDI_CL_DIS ICON "cl_dis.ico"

+IDI_CL_EST ICON "cl_est.ico"

+IDI_CM_DIS ICON "cm_dis.ico"

+IDI_CM_EST ICON "cm_est.ico"

+IDI_MW_DIS ICON "mw_dis.ico"

+IDI_MW_EST ICON "mw_est.ico"

+IDI_PU_DIS ICON "pu_dis.ico"

+IDI_PU_EST ICON "pu_est.ico"

+IDI_PU_PRC ICON "pu_prc.ico"

+IDI_PU_MSG ICON "pu_msg.ico"

+IDI_ST_DIS ICON "st_dis.ico"

+IDI_ST_ENA ICON "st_ena.ico"

+IDI_ST_TRY ICON "st_try.ico"

+IDI_OV_NAT ICON "ov_nat.ico"

+IDI_OV_PGP ICON "ov_pgp.ico"

+IDI_OV_GPG ICON "ov_gpg.ico"

+IDI_OV_RSA ICON "ov_rsa.ico"

 

 #ifdef APSTUDIO_INVOKED

 /////////////////////////////////////////////////////////////////////////////

@@ -55,9 +53,8 @@ IDI_OV_RSA ICON "icons\\ov_rsa.ico"
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

+    "..\\src\\resource.h\0"

     "afxres.h\0"

-    "version.rc\0"

 END

 

 #endif    // APSTUDIO_INVOKED

diff --git a/plugins/SecureIM/icons/st_dis.ico b/plugins/SecureIM/res/st_dis.ico
index 16c5bcfa90..16c5bcfa90 100644
--- a/plugins/SecureIM/icons/st_dis.ico
+++ b/plugins/SecureIM/res/st_dis.ico
diff --git a/plugins/SecureIM/icons/st_ena.ico b/plugins/SecureIM/res/st_ena.ico
index fa67cbd015..fa67cbd015 100644
--- a/plugins/SecureIM/icons/st_ena.ico
+++ b/plugins/SecureIM/res/st_ena.ico
diff --git a/plugins/SecureIM/icons/st_try.ico b/plugins/SecureIM/res/st_try.ico
index 9f4c6855aa..9f4c6855aa 100644
--- a/plugins/SecureIM/icons/st_try.ico
+++ b/plugins/SecureIM/res/st_try.ico
diff --git a/plugins/SecureIM/version.rc b/plugins/SecureIM/res/version.rc
index cd57f59d78..1dbe2d8238 100644
--- a/plugins/SecureIM/version.rc
+++ b/plugins/SecureIM/res/version.rc
@@ -2,7 +2,7 @@
 #error this file is not editable by Microsoft Visual C++

 #endif //APSTUDIO_INVOKED

 

-#include "version.h"

+#include "..\src\version.h"

 

 /////////////////////////////////////////////////////////////////////////////

 //

diff --git a/plugins/SecureIM/version_icons.rc b/plugins/SecureIM/res/version_icons.rc
index ca622fe360..194ee4bc79 100644
--- a/plugins/SecureIM/version_icons.rc
+++ b/plugins/SecureIM/res/version_icons.rc
@@ -2,7 +2,7 @@
 #error this file is not editable by Microsoft Visual C++

 #endif //APSTUDIO_INVOKED

 

-#include "version.h"

+#include "..\src\version.h"

 

 /////////////////////////////////////////////////////////////////////////////

 //

diff --git a/plugins/SecureIM/secureim.msp b/plugins/SecureIM/secureim.msp
deleted file mode 100644
index 3d02d076d0..0000000000
--- a/plugins/SecureIM/secureim.msp
+++ /dev/null
@@ -1,136 +0,0 @@
-[Project]

-name=secureim

-type=2

-defaultConfig=1

-

-

-[Debug]

-// compiler 

-workingDirectory=

-arguments=

-intermediateFilesDirectory=Debug

-outputFilesDirectory=Debug

-compilerPreprocessor=BUILDING_DLL

-extraCompilerOptions=

-compilerIncludeDirectory=\mingw\local\include,\mingw\local\include\libotr,\source\include

-noWarning=0

-defaultWarning=0

-allWarning=1

-extraWarning=0

-isoWarning=0

-warningsAsErrors=0

-debugType=1

-debugLevel=3

-exceptionEnabled=0

-runtimeTypeEnabled=0

-optimizeLevel=0

-

-// linker

-libraryPath=

-outputFilename=Debug\secureim.dll

-libraries=comctl32,comdlg32,msimg32,gdi32

-extraLinkerOptions=-shared

-ignoreStartupFile=0

-ignoreDefaultLibs=0

-stripExecutableFile=0

-

-// archive

-extraArchiveOptions=

-

-//resource

-resourcePreprocessor=

-resourceIncludeDirectory=

-extraResourceOptions=

-

-[Release]

-// compiler 

-workingDirectory=

-arguments=

-intermediateFilesDirectory=Release

-outputFilesDirectory=Release

-compilerPreprocessor=BUILDING_DLL

-extraCompilerOptions=

-compilerIncludeDirectory=\mingw\local\include,\mingw\local\include\libotr,\source\include

-noWarning=0

-defaultWarning=0

-allWarning=1

-extraWarning=0

-isoWarning=0

-warningAsErrors=0

-debugType=0

-debugLevel=1

-exceptionEnabled=0

-runtimeTypeEnabled=0

-optimizeLevel=4

-

-// linker

-libraryPath=

-outputFilename=Release\secureim.dll

-libraries=comctl32,comdlg32,msimg32,gdi32

-extraLinkerOptions=-shared

-ignoreStartupFile=0

-ignoreDefaultLibs=0

-stripExecutableFile=1

-

-// archive

-extraArchiveOptions=

-

-//resource

-resourcePreprocessor=

-resourceIncludeDirectory=

-extraResourceOptions=

-

-[Source]

-1=commonheaders.cpp

-2=crypt_check.cpp

-3=crypt_dll.cpp

-4=crypt_lists.cpp

-5=crypt_misc.cpp

-6=crypt_popups.cpp

-7=gettime.cpp

-8=language.cpp

-9=loadicons.cpp

-10=loadlib.cpp

-11=main.cpp

-12=mmi.cpp

-13=options.cpp

-14=popupOptions.cpp

-15=rtfconv.cpp

-16=crypt_metacontacts.cpp

-17=crypt_icons.cpp

-18=images.cpp

-19=dbevent.cpp

-20=svcs_clist.cpp

-21=svcs_menu.cpp

-22=svcs_srmm.cpp

-23=svcs_rsa.cpp

-24=svcs_proto.cpp

-25=splitmsg.cpp

-[Header]

-1=commonheaders.h

-2=crypt.h

-3=cryptopp.h

-4=forkthread.h

-5=gettime.h

-6=language.h

-7=loadicons.h

-8=loadlib.h

-9=mmi.h

-10=options.h

-11=popupOptions.h

-12=resource.h

-13=rtfconv.h

-14=secureim.h

-15=version.h

-16=dbevent.h

-17=images.h

-18=svcs_clist.h

-19=svcs_menu.h

-20=svcs_proto.h

-21=svcs_rsa.h

-22=svcs_srmm.h

-23=splitmsg.h

-[Resource]

-1=resource.rc

-[Other]

-[History]

diff --git a/plugins/SecureIM/secureim_10.vcxproj b/plugins/SecureIM/secureim_10.vcxproj
index 9e6ced746a..d413c80bdc 100644
--- a/plugins/SecureIM/secureim_10.vcxproj
+++ b/plugins/SecureIM/secureim_10.vcxproj
@@ -73,7 +73,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -99,7 +99,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -126,7 +126,7 @@
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <OmitFramePointers>true</OmitFramePointers>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <BufferSecurityCheck>false</BufferSecurityCheck>

       <FunctionLevelLinking>true</FunctionLevelLinking>

@@ -156,7 +156,7 @@
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <OmitFramePointers>true</OmitFramePointers>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <BufferSecurityCheck>false</BufferSecurityCheck>

       <FunctionLevelLinking>true</FunctionLevelLinking>

@@ -181,60 +181,61 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ResourceCompile Include="resource.rc" />

+    <ResourceCompile Include="res\resource.rc" />

+    <ResourceCompile Include="res\version.rc" />

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="commonheaders.h" />

-    <ClInclude Include="crypt.h" />

-    <ClInclude Include="cryptopp.h" />

-    <ClInclude Include="dbevent.h" />

-    <ClInclude Include="gettime.h" />

-    <ClInclude Include="images.h" />

-    <ClInclude Include="language.h" />

-    <ClInclude Include="loadicons.h" />

-    <ClInclude Include="loadlib.h" />

-    <ClInclude Include="mmi.h" />

-    <ClInclude Include="options.h" />

-    <ClInclude Include="popupOptions.h" />

-    <ClInclude Include="resource.h" />

-    <ClInclude Include="rtfconv.h" />

-    <ClInclude Include="secureim.h" />

-    <ClInclude Include="splitmsg.h" />

-    <ClInclude Include="svcs_clist.h" />

-    <ClInclude Include="svcs_menu.h" />

-    <ClInclude Include="svcs_proto.h" />

-    <ClInclude Include="svcs_rsa.h" />

-    <ClInclude Include="svcs_srmm.h" />

-    <ClInclude Include="version.h" />

+    <ClInclude Include="src\commonheaders.h" />

+    <ClInclude Include="src\crypt.h" />

+    <ClInclude Include="src\cryptopp.h" />

+    <ClInclude Include="src\dbevent.h" />

+    <ClInclude Include="src\gettime.h" />

+    <ClInclude Include="src\images.h" />

+    <ClInclude Include="src\language.h" />

+    <ClInclude Include="src\loadicons.h" />

+    <ClInclude Include="src\loadlib.h" />

+    <ClInclude Include="src\mmi.h" />

+    <ClInclude Include="src\options.h" />

+    <ClInclude Include="src\popupOptions.h" />

+    <ClInclude Include="src\resource.h" />

+    <ClInclude Include="src\rtfconv.h" />

+    <ClInclude Include="src\secureim.h" />

+    <ClInclude Include="src\splitmsg.h" />

+    <ClInclude Include="src\svcs_clist.h" />

+    <ClInclude Include="src\svcs_menu.h" />

+    <ClInclude Include="src\svcs_proto.h" />

+    <ClInclude Include="src\svcs_rsa.h" />

+    <ClInclude Include="src\svcs_srmm.h" />

+    <ClInclude Include="src\version.h" />

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="commonheaders.cpp">

+    <ClCompile Include="src\commonheaders.cpp">

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="crypt_check.cpp" />

-    <ClCompile Include="crypt_dll.cpp" />

-    <ClCompile Include="crypt_icons.cpp" />

-    <ClCompile Include="crypt_lists.cpp" />

-    <ClCompile Include="crypt_metacontacts.cpp" />

-    <ClCompile Include="crypt_misc.cpp" />

-    <ClCompile Include="crypt_popups.cpp" />

-    <ClCompile Include="dbevent.cpp" />

-    <ClCompile Include="gettime.cpp" />

-    <ClCompile Include="images.cpp" />

-    <ClCompile Include="language.cpp" />

-    <ClCompile Include="loadicons.cpp" />

-    <ClCompile Include="loadlib.cpp" />

-    <ClCompile Include="main.cpp" />

-    <ClCompile Include="mmi.cpp" />

-    <ClCompile Include="options.cpp" />

-    <ClCompile Include="popupOptions.cpp" />

-    <ClCompile Include="rtfconv.cpp" />

-    <ClCompile Include="splitmsg.cpp" />

-    <ClCompile Include="svcs_clist.cpp" />

-    <ClCompile Include="svcs_menu.cpp" />

-    <ClCompile Include="svcs_proto.cpp" />

-    <ClCompile Include="svcs_rsa.cpp" />

-    <ClCompile Include="svcs_srmm.cpp" />

+    <ClCompile Include="src\crypt_check.cpp" />

+    <ClCompile Include="src\crypt_dll.cpp" />

+    <ClCompile Include="src\crypt_icons.cpp" />

+    <ClCompile Include="src\crypt_lists.cpp" />

+    <ClCompile Include="src\crypt_metacontacts.cpp" />

+    <ClCompile Include="src\crypt_misc.cpp" />

+    <ClCompile Include="src\crypt_popups.cpp" />

+    <ClCompile Include="src\dbevent.cpp" />

+    <ClCompile Include="src\gettime.cpp" />

+    <ClCompile Include="src\images.cpp" />

+    <ClCompile Include="src\language.cpp" />

+    <ClCompile Include="src\loadicons.cpp" />

+    <ClCompile Include="src\loadlib.cpp" />

+    <ClCompile Include="src\main.cpp" />

+    <ClCompile Include="src\mmi.cpp" />

+    <ClCompile Include="src\options.cpp" />

+    <ClCompile Include="src\popupOptions.cpp" />

+    <ClCompile Include="src\rtfconv.cpp" />

+    <ClCompile Include="src\splitmsg.cpp" />

+    <ClCompile Include="src\svcs_clist.cpp" />

+    <ClCompile Include="src\svcs_menu.cpp" />

+    <ClCompile Include="src\svcs_proto.cpp" />

+    <ClCompile Include="src\svcs_rsa.cpp" />

+    <ClCompile Include="src\svcs_srmm.cpp" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/SecureIM/secureim_10.vcxproj.filters b/plugins/SecureIM/secureim_10.vcxproj.filters
index 3a30f21882..737f043152 100644
--- a/plugins/SecureIM/secureim_10.vcxproj.filters
+++ b/plugins/SecureIM/secureim_10.vcxproj.filters
@@ -15,152 +15,155 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="resource.rc">

+    <ResourceCompile Include="res\resource.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <ResourceCompile Include="res\version.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="commonheaders.h">

+    <ClInclude Include="src\commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="crypt.h">

+    <ClInclude Include="src\crypt.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="cryptopp.h">

+    <ClInclude Include="src\cryptopp.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="dbevent.h">

+    <ClInclude Include="src\dbevent.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="gettime.h">

+    <ClInclude Include="src\gettime.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="images.h">

+    <ClInclude Include="src\images.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="language.h">

+    <ClInclude Include="src\language.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="loadicons.h">

+    <ClInclude Include="src\loadicons.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="loadlib.h">

+    <ClInclude Include="src\loadlib.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="mmi.h">

+    <ClInclude Include="src\mmi.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="options.h">

+    <ClInclude Include="src\options.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="popupOptions.h">

+    <ClInclude Include="src\popupOptions.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

+    <ClInclude Include="src\resource.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="rtfconv.h">

+    <ClInclude Include="src\rtfconv.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="secureim.h">

+    <ClInclude Include="src\secureim.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="splitmsg.h">

+    <ClInclude Include="src\splitmsg.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="svcs_clist.h">

+    <ClInclude Include="src\svcs_clist.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="svcs_menu.h">

+    <ClInclude Include="src\svcs_menu.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="svcs_proto.h">

+    <ClInclude Include="src\svcs_proto.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="svcs_rsa.h">

+    <ClInclude Include="src\svcs_rsa.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="svcs_srmm.h">

+    <ClInclude Include="src\svcs_srmm.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="version.h">

+    <ClInclude Include="src\version.h">

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="commonheaders.cpp">

+    <ClCompile Include="src\commonheaders.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="crypt_check.cpp">

+    <ClCompile Include="src\crypt_check.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="crypt_dll.cpp">

+    <ClCompile Include="src\crypt_dll.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="crypt_icons.cpp">

+    <ClCompile Include="src\crypt_icons.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="crypt_lists.cpp">

+    <ClCompile Include="src\crypt_lists.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="crypt_metacontacts.cpp">

+    <ClCompile Include="src\crypt_metacontacts.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="crypt_misc.cpp">

+    <ClCompile Include="src\crypt_misc.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="crypt_popups.cpp">

+    <ClCompile Include="src\crypt_popups.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="dbevent.cpp">

+    <ClCompile Include="src\dbevent.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="gettime.cpp">

+    <ClCompile Include="src\gettime.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="images.cpp">

+    <ClCompile Include="src\images.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="language.cpp">

+    <ClCompile Include="src\language.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="loadicons.cpp">

+    <ClCompile Include="src\loadicons.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="loadlib.cpp">

+    <ClCompile Include="src\loadlib.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="main.cpp">

+    <ClCompile Include="src\main.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="mmi.cpp">

+    <ClCompile Include="src\mmi.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="options.cpp">

+    <ClCompile Include="src\options.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="popupOptions.cpp">

+    <ClCompile Include="src\popupOptions.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="rtfconv.cpp">

+    <ClCompile Include="src\rtfconv.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="splitmsg.cpp">

+    <ClCompile Include="src\splitmsg.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="svcs_clist.cpp">

+    <ClCompile Include="src\svcs_clist.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="svcs_menu.cpp">

+    <ClCompile Include="src\svcs_menu.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="svcs_proto.cpp">

+    <ClCompile Include="src\svcs_proto.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="svcs_rsa.cpp">

+    <ClCompile Include="src\svcs_rsa.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="svcs_srmm.cpp">

+    <ClCompile Include="src\svcs_srmm.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

diff --git a/plugins/SecureIM/secureim_icons_10.vcxproj b/plugins/SecureIM/secureim_icons_10.vcxproj
index be629d525d..aff7599b79 100644
--- a/plugins/SecureIM/secureim_icons_10.vcxproj
+++ b/plugins/SecureIM/secureim_icons_10.vcxproj
@@ -122,7 +122,8 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ResourceCompile Include="resource_icons.rc" />

+    <ResourceCompile Include="res\resource_icons.rc" />

+    <ResourceCompile Include="res\version_icons.rc" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/SecureIM/secureim_icons_10.vcxproj.filters b/plugins/SecureIM/secureim_icons_10.vcxproj.filters
index c5b09773a5..62b3db57fd 100644
--- a/plugins/SecureIM/secureim_icons_10.vcxproj.filters
+++ b/plugins/SecureIM/secureim_icons_10.vcxproj.filters
@@ -1,21 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>

 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <ItemGroup>

-    <Filter Include="Source Files">

-      <UniqueIdentifier>{309a0365-ebce-450d-8b06-98d3d2d5e2ba}</UniqueIdentifier>

-      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>

-    </Filter>

     <Filter Include="Resource Files">

       <UniqueIdentifier>{d6176538-1c22-41e7-b82c-e4c9344fd47f}</UniqueIdentifier>

       <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

     </Filter>

-    <Filter Include="Header Files">

-      <UniqueIdentifier>{abff76b4-ff7b-41c3-bfd2-40efdda4e3d5}</UniqueIdentifier>

-      <Extensions>h;hpp;hxx;hm;inl</Extensions>

-    </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="resource_icons.rc">

+    <ResourceCompile Include="res\resource_icons.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <ResourceCompile Include="res\version_icons.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/plugins/SecureIM/commonheaders.cpp b/plugins/SecureIM/src/commonheaders.cpp
index 3697abea6e..3697abea6e 100644
--- a/plugins/SecureIM/commonheaders.cpp
+++ b/plugins/SecureIM/src/commonheaders.cpp
diff --git a/plugins/SecureIM/commonheaders.h b/plugins/SecureIM/src/commonheaders.h
index c848d43484..c848d43484 100644
--- a/plugins/SecureIM/commonheaders.h
+++ b/plugins/SecureIM/src/commonheaders.h
diff --git a/plugins/SecureIM/crypt.h b/plugins/SecureIM/src/crypt.h
index e626570f9e..e626570f9e 100644
--- a/plugins/SecureIM/crypt.h
+++ b/plugins/SecureIM/src/crypt.h
diff --git a/plugins/SecureIM/crypt_check.cpp b/plugins/SecureIM/src/crypt_check.cpp
index 3a4a0e0c30..3a4a0e0c30 100644
--- a/plugins/SecureIM/crypt_check.cpp
+++ b/plugins/SecureIM/src/crypt_check.cpp
diff --git a/plugins/SecureIM/crypt_dll.cpp b/plugins/SecureIM/src/crypt_dll.cpp
index 6a97021886..6a97021886 100644
--- a/plugins/SecureIM/crypt_dll.cpp
+++ b/plugins/SecureIM/src/crypt_dll.cpp
diff --git a/plugins/SecureIM/crypt_icons.cpp b/plugins/SecureIM/src/crypt_icons.cpp
index 6c5984c345..6c5984c345 100644
--- a/plugins/SecureIM/crypt_icons.cpp
+++ b/plugins/SecureIM/src/crypt_icons.cpp
diff --git a/plugins/SecureIM/crypt_lists.cpp b/plugins/SecureIM/src/crypt_lists.cpp
index 7b68fbd250..7b68fbd250 100644
--- a/plugins/SecureIM/crypt_lists.cpp
+++ b/plugins/SecureIM/src/crypt_lists.cpp
diff --git a/plugins/SecureIM/crypt_metacontacts.cpp b/plugins/SecureIM/src/crypt_metacontacts.cpp
index f36c7e4dd3..f36c7e4dd3 100644
--- a/plugins/SecureIM/crypt_metacontacts.cpp
+++ b/plugins/SecureIM/src/crypt_metacontacts.cpp
diff --git a/plugins/SecureIM/crypt_misc.cpp b/plugins/SecureIM/src/crypt_misc.cpp
index 7e0055913d..7e0055913d 100644
--- a/plugins/SecureIM/crypt_misc.cpp
+++ b/plugins/SecureIM/src/crypt_misc.cpp
diff --git a/plugins/SecureIM/crypt_popups.cpp b/plugins/SecureIM/src/crypt_popups.cpp
index 836a68efc1..836a68efc1 100644
--- a/plugins/SecureIM/crypt_popups.cpp
+++ b/plugins/SecureIM/src/crypt_popups.cpp
diff --git a/plugins/SecureIM/cryptopp.h b/plugins/SecureIM/src/cryptopp.h
index bfa4e097b3..bfa4e097b3 100644
--- a/plugins/SecureIM/cryptopp.h
+++ b/plugins/SecureIM/src/cryptopp.h
diff --git a/plugins/SecureIM/dbevent.cpp b/plugins/SecureIM/src/dbevent.cpp
index 9b7d8f10c0..9b7d8f10c0 100644
--- a/plugins/SecureIM/dbevent.cpp
+++ b/plugins/SecureIM/src/dbevent.cpp
diff --git a/plugins/SecureIM/dbevent.h b/plugins/SecureIM/src/dbevent.h
index 68719c21c0..68719c21c0 100644
--- a/plugins/SecureIM/dbevent.h
+++ b/plugins/SecureIM/src/dbevent.h
diff --git a/plugins/SecureIM/gettime.cpp b/plugins/SecureIM/src/gettime.cpp
index 529a8e0c8e..529a8e0c8e 100644
--- a/plugins/SecureIM/gettime.cpp
+++ b/plugins/SecureIM/src/gettime.cpp
diff --git a/plugins/SecureIM/gettime.h b/plugins/SecureIM/src/gettime.h
index e84276c609..e84276c609 100644
--- a/plugins/SecureIM/gettime.h
+++ b/plugins/SecureIM/src/gettime.h
diff --git a/plugins/SecureIM/images.cpp b/plugins/SecureIM/src/images.cpp
index eb4c87dea1..eb4c87dea1 100644
--- a/plugins/SecureIM/images.cpp
+++ b/plugins/SecureIM/src/images.cpp
diff --git a/plugins/SecureIM/images.h b/plugins/SecureIM/src/images.h
index ea65b09893..ea65b09893 100644
--- a/plugins/SecureIM/images.h
+++ b/plugins/SecureIM/src/images.h
diff --git a/plugins/SecureIM/language.cpp b/plugins/SecureIM/src/language.cpp
index 9bdf620cea..9bdf620cea 100644
--- a/plugins/SecureIM/language.cpp
+++ b/plugins/SecureIM/src/language.cpp
diff --git a/plugins/SecureIM/language.h b/plugins/SecureIM/src/language.h
index 154e306814..154e306814 100644
--- a/plugins/SecureIM/language.h
+++ b/plugins/SecureIM/src/language.h
diff --git a/plugins/SecureIM/loadicons.cpp b/plugins/SecureIM/src/loadicons.cpp
index 3303424626..3303424626 100644
--- a/plugins/SecureIM/loadicons.cpp
+++ b/plugins/SecureIM/src/loadicons.cpp
diff --git a/plugins/SecureIM/loadicons.h b/plugins/SecureIM/src/loadicons.h
index f5258a41a0..f5258a41a0 100644
--- a/plugins/SecureIM/loadicons.h
+++ b/plugins/SecureIM/src/loadicons.h
diff --git a/plugins/SecureIM/loadlib.cpp b/plugins/SecureIM/src/loadlib.cpp
index ac0d2f9272..ac0d2f9272 100644
--- a/plugins/SecureIM/loadlib.cpp
+++ b/plugins/SecureIM/src/loadlib.cpp
diff --git a/plugins/SecureIM/loadlib.h b/plugins/SecureIM/src/loadlib.h
index 105f441dc9..105f441dc9 100644
--- a/plugins/SecureIM/loadlib.h
+++ b/plugins/SecureIM/src/loadlib.h
diff --git a/plugins/SecureIM/main.cpp b/plugins/SecureIM/src/main.cpp
index 205a025ffe..205a025ffe 100644
--- a/plugins/SecureIM/main.cpp
+++ b/plugins/SecureIM/src/main.cpp
diff --git a/plugins/SecureIM/mmi.cpp b/plugins/SecureIM/src/mmi.cpp
index 2269d76a51..2269d76a51 100644
--- a/plugins/SecureIM/mmi.cpp
+++ b/plugins/SecureIM/src/mmi.cpp
diff --git a/plugins/SecureIM/mmi.h b/plugins/SecureIM/src/mmi.h
index 7b3027e232..7b3027e232 100644
--- a/plugins/SecureIM/mmi.h
+++ b/plugins/SecureIM/src/mmi.h
diff --git a/plugins/SecureIM/options.cpp b/plugins/SecureIM/src/options.cpp
index d6cc1a70d6..d6cc1a70d6 100644
--- a/plugins/SecureIM/options.cpp
+++ b/plugins/SecureIM/src/options.cpp
diff --git a/plugins/SecureIM/options.h b/plugins/SecureIM/src/options.h
index c87a0de34d..c87a0de34d 100644
--- a/plugins/SecureIM/options.h
+++ b/plugins/SecureIM/src/options.h
diff --git a/plugins/SecureIM/popupOptions.cpp b/plugins/SecureIM/src/popupOptions.cpp
index 6e08cd81fc..6e08cd81fc 100644
--- a/plugins/SecureIM/popupOptions.cpp
+++ b/plugins/SecureIM/src/popupOptions.cpp
diff --git a/plugins/SecureIM/popupOptions.h b/plugins/SecureIM/src/popupOptions.h
index 22d3453adc..22d3453adc 100644
--- a/plugins/SecureIM/popupOptions.h
+++ b/plugins/SecureIM/src/popupOptions.h
diff --git a/plugins/SecureIM/resource.h b/plugins/SecureIM/src/resource.h
index f8a753773d..f8a753773d 100644
--- a/plugins/SecureIM/resource.h
+++ b/plugins/SecureIM/src/resource.h
diff --git a/plugins/SecureIM/rtfconv.cpp b/plugins/SecureIM/src/rtfconv.cpp
index 994f541373..994f541373 100644
--- a/plugins/SecureIM/rtfconv.cpp
+++ b/plugins/SecureIM/src/rtfconv.cpp
diff --git a/plugins/SecureIM/rtfconv.h b/plugins/SecureIM/src/rtfconv.h
index 2a3e75089b..2a3e75089b 100644
--- a/plugins/SecureIM/rtfconv.h
+++ b/plugins/SecureIM/src/rtfconv.h
diff --git a/plugins/SecureIM/secureim.h b/plugins/SecureIM/src/secureim.h
index a307d1e5a2..a307d1e5a2 100644
--- a/plugins/SecureIM/secureim.h
+++ b/plugins/SecureIM/src/secureim.h
diff --git a/plugins/SecureIM/splitmsg.cpp b/plugins/SecureIM/src/splitmsg.cpp
index ca4f0635cf..ca4f0635cf 100644
--- a/plugins/SecureIM/splitmsg.cpp
+++ b/plugins/SecureIM/src/splitmsg.cpp
diff --git a/plugins/SecureIM/splitmsg.h b/plugins/SecureIM/src/splitmsg.h
index 9f55c2784e..9f55c2784e 100644
--- a/plugins/SecureIM/splitmsg.h
+++ b/plugins/SecureIM/src/splitmsg.h
diff --git a/plugins/SecureIM/svcs_clist.cpp b/plugins/SecureIM/src/svcs_clist.cpp
index 12402a58be..12402a58be 100644
--- a/plugins/SecureIM/svcs_clist.cpp
+++ b/plugins/SecureIM/src/svcs_clist.cpp
diff --git a/plugins/SecureIM/svcs_clist.h b/plugins/SecureIM/src/svcs_clist.h
index 8c2dd192b6..8c2dd192b6 100644
--- a/plugins/SecureIM/svcs_clist.h
+++ b/plugins/SecureIM/src/svcs_clist.h
diff --git a/plugins/SecureIM/svcs_menu.cpp b/plugins/SecureIM/src/svcs_menu.cpp
index 310d367e1b..310d367e1b 100644
--- a/plugins/SecureIM/svcs_menu.cpp
+++ b/plugins/SecureIM/src/svcs_menu.cpp
diff --git a/plugins/SecureIM/svcs_menu.h b/plugins/SecureIM/src/svcs_menu.h
index 69b079ebf7..69b079ebf7 100644
--- a/plugins/SecureIM/svcs_menu.h
+++ b/plugins/SecureIM/src/svcs_menu.h
diff --git a/plugins/SecureIM/svcs_popup.cpp b/plugins/SecureIM/src/svcs_popup.cpp
index bb1eb88355..bb1eb88355 100644
--- a/plugins/SecureIM/svcs_popup.cpp
+++ b/plugins/SecureIM/src/svcs_popup.cpp
diff --git a/plugins/SecureIM/svcs_proto.cpp b/plugins/SecureIM/src/svcs_proto.cpp
index ef8d6c850c..ef8d6c850c 100644
--- a/plugins/SecureIM/svcs_proto.cpp
+++ b/plugins/SecureIM/src/svcs_proto.cpp
diff --git a/plugins/SecureIM/svcs_proto.h b/plugins/SecureIM/src/svcs_proto.h
index 64ce1c43a3..64ce1c43a3 100644
--- a/plugins/SecureIM/svcs_proto.h
+++ b/plugins/SecureIM/src/svcs_proto.h
diff --git a/plugins/SecureIM/svcs_rsa.cpp b/plugins/SecureIM/src/svcs_rsa.cpp
index e72221dc91..e72221dc91 100644
--- a/plugins/SecureIM/svcs_rsa.cpp
+++ b/plugins/SecureIM/src/svcs_rsa.cpp
diff --git a/plugins/SecureIM/svcs_rsa.h b/plugins/SecureIM/src/svcs_rsa.h
index 3f43e71d30..3f43e71d30 100644
--- a/plugins/SecureIM/svcs_rsa.h
+++ b/plugins/SecureIM/src/svcs_rsa.h
diff --git a/plugins/SecureIM/svcs_srmm.cpp b/plugins/SecureIM/src/svcs_srmm.cpp
index 688246847e..688246847e 100644
--- a/plugins/SecureIM/svcs_srmm.cpp
+++ b/plugins/SecureIM/src/svcs_srmm.cpp
diff --git a/plugins/SecureIM/svcs_srmm.h b/plugins/SecureIM/src/svcs_srmm.h
index d64c89ab4e..d64c89ab4e 100644
--- a/plugins/SecureIM/svcs_srmm.h
+++ b/plugins/SecureIM/src/svcs_srmm.h
diff --git a/plugins/SecureIM/version.h b/plugins/SecureIM/src/version.h
index 22b458eac8..22b458eac8 100644
--- a/plugins/SecureIM/version.h
+++ b/plugins/SecureIM/src/version.h