85 files changed, 4 insertions, 93 deletions

diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index a9387e5eaa..be5a414bee 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -33,8 +33,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ICQ", "..\protocols\IcqOsca
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Jabber", "..\protocols\JabberG\jabber_10.vcxproj", "{33276462-8313-4192-8306-13717ECCA60A}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSN", "..\protocols\MSN\msn_10.vcxproj", "{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_nicer", "..\plugins\Clist_nicer\clist_nicer_10.vcxproj", "{3C42510C-A29E-4A53-899C-203BFA874E0B}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cln_skinedit", "..\plugins\Clist_nicer\skineditor\skinedit_10.vcxproj", "{987F026D-EB1F-4013-ADA8-2406ACCDA526}"

@@ -544,14 +542,6 @@ Global
 		{33276462-8313-4192-8306-13717ECCA60A}.Release|Win32.Build.0 = Release|Win32

 		{33276462-8313-4192-8306-13717ECCA60A}.Release|x64.ActiveCfg = Release|x64

 		{33276462-8313-4192-8306-13717ECCA60A}.Release|x64.Build.0 = Release|x64

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|Win32.ActiveCfg = Debug|Win32

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|Win32.Build.0 = Debug|Win32

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|x64.ActiveCfg = Debug|x64

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|x64.Build.0 = Debug|x64

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|Win32.ActiveCfg = Release|Win32

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|Win32.Build.0 = Release|Win32

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|x64.ActiveCfg = Release|x64

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|x64.Build.0 = Release|x64

 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|Win32.ActiveCfg = Debug|Win32

 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|Win32.Build.0 = Debug|Win32

 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|x64.ActiveCfg = Debug|x64

diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln
index e3252548bf..c6255eace7 100644
--- a/bin10/mir_full_pro.sln
+++ b/bin10/mir_full_pro.sln
@@ -33,8 +33,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ICQ", "..\protocols\IcqOsca
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Jabber", "..\protocols\JabberG\jabber_10.vcxproj", "{33276462-8313-4192-8306-13717ECCA60A}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSN", "..\protocols\MSN\msn_10.vcxproj", "{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_nicer", "..\plugins\Clist_nicer\clist_nicer_10.vcxproj", "{3C42510C-A29E-4A53-899C-203BFA874E0B}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cln_skinedit", "..\plugins\Clist_nicer\skineditor\skinedit_10.vcxproj", "{987F026D-EB1F-4013-ADA8-2406ACCDA526}"

@@ -576,14 +574,6 @@ Global
 		{33276462-8313-4192-8306-13717ECCA60A}.Release|Win32.Build.0 = Release|Win32

 		{33276462-8313-4192-8306-13717ECCA60A}.Release|x64.ActiveCfg = Release|x64

 		{33276462-8313-4192-8306-13717ECCA60A}.Release|x64.Build.0 = Release|x64

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|Win32.ActiveCfg = Debug|Win32

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|Win32.Build.0 = Debug|Win32

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|x64.ActiveCfg = Debug|x64

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|x64.Build.0 = Debug|x64

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|Win32.ActiveCfg = Release|Win32

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|Win32.Build.0 = Release|Win32

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|x64.ActiveCfg = Release|x64

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|x64.Build.0 = Release|x64

 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|Win32.ActiveCfg = Debug|Win32

 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|Win32.Build.0 = Debug|Win32

 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|x64.ActiveCfg = Debug|x64

@@ -1959,7 +1949,6 @@ Global
 		{E42870DB-9FED-44E7-9C93-4E64D0C87F51} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}

 		{01DDCB36-4DE2-405D-BC36-2C8BDEB86659} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}

 		{33276462-8313-4192-8306-13717ECCA60A} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}

 		{EE182018-5D3D-43F3-955F-7B5AB0BE2FCA} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}

 		{2A737817-2443-48FF-A2E8-CA8D69E450F3} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}

 		{DADE9455-DC28-465A-9604-2CA28052B9FB} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}

diff --git a/bin10/mir_icons.sln b/bin10/mir_icons.sln
index 53cc2e37bf..9f55f7699b 100644
--- a/bin10/mir_icons.sln
+++ b/bin10/mir_icons.sln
@@ -28,8 +28,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Jabber", "..\protocol
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MRA", "..\protocols\MRA\proto_mra\Proto_MRA_10.vcxproj", "{38BF6F63-58E7-442D-A7E8-B4BD57D224E2}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MSN", "..\protocols\MSN\proto_msn\Proto_MSN_10.vcxproj", "{7BC6C3E7-2B17-4718-A82E-084798710E14}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_GG", "..\protocols\Gadu-Gadu\proto_gg\Proto_GG_10.vcxproj", "{33912E32-3B68-4E2C-82AE-64C06EE987A7}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Twitter", "..\protocols\Twitter\proto_twitter\Proto_Twitter_10.vcxproj", "{A82C682E-8596-4DCA-98A6-50436194714B}"

@@ -194,14 +192,6 @@ Global
 		{38BF6F63-58E7-442D-A7E8-B4BD57D224E2}.Release|Win32.Build.0 = Release|Win32

 		{38BF6F63-58E7-442D-A7E8-B4BD57D224E2}.Release|x64.ActiveCfg = Release|x64

 		{38BF6F63-58E7-442D-A7E8-B4BD57D224E2}.Release|x64.Build.0 = Release|x64

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|Win32.ActiveCfg = Debug|Win32

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|Win32.Build.0 = Debug|Win32

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|x64.ActiveCfg = Debug|x64

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|x64.Build.0 = Debug|x64

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|Win32.ActiveCfg = Release|Win32

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|Win32.Build.0 = Release|Win32

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|x64.ActiveCfg = Release|x64

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|x64.Build.0 = Release|x64

 		{33912E32-3B68-4E2C-82AE-64C06EE987A7}.Debug|Win32.ActiveCfg = Debug|Win32

 		{33912E32-3B68-4E2C-82AE-64C06EE987A7}.Debug|Win32.Build.0 = Debug|Win32

 		{33912E32-3B68-4E2C-82AE-64C06EE987A7}.Debug|x64.ActiveCfg = Debug|x64

diff --git a/bin10/miranda32.sln b/bin10/miranda32.sln
index f6d3c6c255..23b0315c74 100644
--- a/bin10/miranda32.sln
+++ b/bin10/miranda32.sln
@@ -34,8 +34,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ICQ", "..\protocols\IcqOsca
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Jabber", "..\protocols\JabberG\jabber_10.vcxproj", "{33276462-8313-4192-8306-13717ECCA60A}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSN", "..\protocols\MSN\msn_10.vcxproj", "{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_nicer", "..\plugins\clist_nicer\clist_nicer_10.vcxproj", "{3C42510C-A29E-4A53-899C-203BFA874E0B}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_ICQ", "..\protocols\IcqOscarJ\icons_pack\ICONS_10.vcxproj", "{E98A8615-1082-1979-D6D8-F763F13BFCBD}"

@@ -54,8 +52,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_IRC", "..\protocols\I
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Jabber", "..\protocols\JabberG\proto_jabber\Proto_Jabber_10.vcxproj", "{1AA0A504-0644-4F00-A1AD-F55D69E50DD0}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MSN", "..\protocols\MSN\proto_msn\Proto_MSN_10.vcxproj", "{7BC6C3E7-2B17-4718-A82E-084798710E14}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Yahoo", "..\protocols\Yahoo\proto_yahoo\Proto_Yahoo_10.vcxproj", "{BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_modern", "..\plugins\Clist_modern\clist_modern_10.vcxproj", "{D9057E63-AAAA-4FE7-800A-20C02F4761F3}"

@@ -270,14 +266,6 @@ Global
 		{33276462-8313-4192-8306-13717ECCA60A}.Release|Win32.Build.0 = Release|Win32

 		{33276462-8313-4192-8306-13717ECCA60A}.Release|x64.ActiveCfg = Release|x64

 		{33276462-8313-4192-8306-13717ECCA60A}.Release|x64.Build.0 = Release|x64

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|Win32.ActiveCfg = Debug|Win32

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|Win32.Build.0 = Debug|Win32

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|x64.ActiveCfg = Debug|x64

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|x64.Build.0 = Debug|x64

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|Win32.ActiveCfg = Release|Win32

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|Win32.Build.0 = Release|Win32

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|x64.ActiveCfg = Release|x64

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|x64.Build.0 = Release|x64

 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|Win32.ActiveCfg = Debug|Win32

 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|Win32.Build.0 = Debug|Win32

 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|x64.ActiveCfg = Debug|x64

@@ -350,14 +338,6 @@ Global
 		{1AA0A504-0644-4F00-A1AD-F55D69E50DD0}.Release|Win32.Build.0 = Release|Win32

 		{1AA0A504-0644-4F00-A1AD-F55D69E50DD0}.Release|x64.ActiveCfg = Release|x64

 		{1AA0A504-0644-4F00-A1AD-F55D69E50DD0}.Release|x64.Build.0 = Release|x64

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|Win32.ActiveCfg = Debug|Win32

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|Win32.Build.0 = Debug|Win32

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|x64.ActiveCfg = Debug|x64

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|x64.Build.0 = Debug|x64

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|Win32.ActiveCfg = Release|Win32

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|Win32.Build.0 = Release|Win32

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|x64.ActiveCfg = Release|x64

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|x64.Build.0 = Release|x64

 		{BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Debug|Win32.ActiveCfg = Debug|Win32

 		{BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Debug|Win32.Build.0 = Debug|Win32

 		{BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Debug|x64.ActiveCfg = Debug|x64

diff --git a/bin12/mir_full.sln b/bin12/mir_full.sln
index 1a448765bf..7b45ed5157 100644
--- a/bin12/mir_full.sln
+++ b/bin12/mir_full.sln
@@ -35,8 +35,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ICQ", "..\protocols\IcqOsca
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Jabber", "..\protocols\JabberG\jabber_12.vcxproj", "{33276462-8313-4192-8306-13717ECCA60A}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSN", "..\protocols\MSN\msn_12.vcxproj", "{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_nicer", "..\plugins\Clist_nicer\clist_nicer_12.vcxproj", "{3C42510C-A29E-4A53-899C-203BFA874E0B}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cln_skinedit", "..\plugins\Clist_nicer\skineditor\skinedit_12.vcxproj", "{987F026D-EB1F-4013-ADA8-2406ACCDA526}"

@@ -546,14 +544,6 @@ Global
 		{33276462-8313-4192-8306-13717ECCA60A}.Release|Win32.Build.0 = Release|Win32

 		{33276462-8313-4192-8306-13717ECCA60A}.Release|x64.ActiveCfg = Release|x64

 		{33276462-8313-4192-8306-13717ECCA60A}.Release|x64.Build.0 = Release|x64

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|Win32.ActiveCfg = Debug|Win32

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|Win32.Build.0 = Debug|Win32

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|x64.ActiveCfg = Debug|x64

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|x64.Build.0 = Debug|x64

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|Win32.ActiveCfg = Release|Win32

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|Win32.Build.0 = Release|Win32

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|x64.ActiveCfg = Release|x64

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|x64.Build.0 = Release|x64

 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|Win32.ActiveCfg = Debug|Win32

 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|Win32.Build.0 = Debug|Win32

 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|x64.ActiveCfg = Debug|x64

diff --git a/bin12/mir_icons.sln b/bin12/mir_icons.sln
index 6cda80d7a0..621b757635 100644
--- a/bin12/mir_icons.sln
+++ b/bin12/mir_icons.sln
@@ -30,8 +30,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Jabber", "..\protocol
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MRA", "..\protocols\MRA\proto_mra\Proto_MRA_12.vcxproj", "{38BF6F63-58E7-442D-A7E8-B4BD57D224E2}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MSN", "..\protocols\MSN\proto_msn\Proto_MSN_12.vcxproj", "{7BC6C3E7-2B17-4718-A82E-084798710E14}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_GG", "..\protocols\Gadu-Gadu\proto_gg\Proto_GG_12.vcxproj", "{33912E32-3B68-4E2C-82AE-64C06EE987A7}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Twitter", "..\protocols\Twitter\proto_twitter\Proto_Twitter_12.vcxproj", "{A82C682E-8596-4DCA-98A6-50436194714B}"

@@ -198,14 +196,6 @@ Global
 		{38BF6F63-58E7-442D-A7E8-B4BD57D224E2}.Release|Win32.Build.0 = Release|Win32

 		{38BF6F63-58E7-442D-A7E8-B4BD57D224E2}.Release|x64.ActiveCfg = Release|x64

 		{38BF6F63-58E7-442D-A7E8-B4BD57D224E2}.Release|x64.Build.0 = Release|x64

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|Win32.ActiveCfg = Debug|Win32

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|Win32.Build.0 = Debug|Win32

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|x64.ActiveCfg = Debug|x64

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|x64.Build.0 = Debug|x64

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|Win32.ActiveCfg = Release|Win32

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|Win32.Build.0 = Release|Win32

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|x64.ActiveCfg = Release|x64

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|x64.Build.0 = Release|x64

 		{33912E32-3B68-4E2C-82AE-64C06EE987A7}.Debug|Win32.ActiveCfg = Debug|Win32

 		{33912E32-3B68-4E2C-82AE-64C06EE987A7}.Debug|Win32.Build.0 = Debug|Win32

 		{33912E32-3B68-4E2C-82AE-64C06EE987A7}.Debug|x64.ActiveCfg = Debug|x64

diff --git a/bin12/miranda32.sln b/bin12/miranda32.sln
index b710ae0db8..ba55de66b2 100644
--- a/bin12/miranda32.sln
+++ b/bin12/miranda32.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00

 # Visual Studio Express 2013 for Windows Desktop

-VisualStudioVersion = 12.0.30501.0

+VisualStudioVersion = 12.0.30723.0

 MinimumVisualStudioVersion = 10.0.40219.1

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32_12.vcxproj", "{F9916510-9055-4C9F-997A-3755DEC1511B}"

 	ProjectSection(ProjectDependencies) = postProject

@@ -36,8 +36,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ICQ", "..\protocols\IcqOsca
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Jabber", "..\protocols\JabberG\jabber_12.vcxproj", "{33276462-8313-4192-8306-13717ECCA60A}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSN", "..\protocols\MSN\msn_12.vcxproj", "{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_nicer", "..\plugins\clist_nicer\clist_nicer_12.vcxproj", "{3C42510C-A29E-4A53-899C-203BFA874E0B}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_ICQ", "..\protocols\IcqOscarJ\icons_pack\ICONS_12.vcxproj", "{E98A8615-1082-1979-D6D8-F763F13BFCBD}"

@@ -56,8 +54,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_IRC", "..\protocols\I
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Jabber", "..\protocols\JabberG\proto_jabber\Proto_Jabber_12.vcxproj", "{1AA0A504-0644-4F00-A1AD-F55D69E50DD0}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MSN", "..\protocols\MSN\proto_msn\Proto_MSN_12.vcxproj", "{7BC6C3E7-2B17-4718-A82E-084798710E14}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Yahoo", "..\protocols\Yahoo\proto_yahoo\Proto_Yahoo_12.vcxproj", "{BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_modern", "..\plugins\Clist_modern\clist_modern_12.vcxproj", "{D9057E63-AAAA-4FE7-800A-20C02F4761F3}"

@@ -272,14 +268,6 @@ Global
 		{33276462-8313-4192-8306-13717ECCA60A}.Release|Win32.Build.0 = Release|Win32

 		{33276462-8313-4192-8306-13717ECCA60A}.Release|x64.ActiveCfg = Release|x64

 		{33276462-8313-4192-8306-13717ECCA60A}.Release|x64.Build.0 = Release|x64

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|Win32.ActiveCfg = Debug|Win32

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|Win32.Build.0 = Debug|Win32

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|x64.ActiveCfg = Debug|x64

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|x64.Build.0 = Debug|x64

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|Win32.ActiveCfg = Release|Win32

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|Win32.Build.0 = Release|Win32

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|x64.ActiveCfg = Release|x64

-		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|x64.Build.0 = Release|x64

 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|Win32.ActiveCfg = Debug|Win32

 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|Win32.Build.0 = Debug|Win32

 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|x64.ActiveCfg = Debug|x64

@@ -352,14 +340,6 @@ Global
 		{1AA0A504-0644-4F00-A1AD-F55D69E50DD0}.Release|Win32.Build.0 = Release|Win32

 		{1AA0A504-0644-4F00-A1AD-F55D69E50DD0}.Release|x64.ActiveCfg = Release|x64

 		{1AA0A504-0644-4F00-A1AD-F55D69E50DD0}.Release|x64.Build.0 = Release|x64

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|Win32.ActiveCfg = Debug|Win32

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|Win32.Build.0 = Debug|Win32

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|x64.ActiveCfg = Debug|x64

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|x64.Build.0 = Debug|x64

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|Win32.ActiveCfg = Release|Win32

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|Win32.Build.0 = Release|Win32

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|x64.ActiveCfg = Release|x64

-		{7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|x64.Build.0 = Release|x64

 		{BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Debug|Win32.ActiveCfg = Debug|Win32

 		{BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Debug|Win32.Build.0 = Debug|Win32

 		{BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Debug|x64.ActiveCfg = Debug|x64

diff --git a/protocols/MSN/Docs/gpl.txt b/plugins/!Deprecated/MSN/Docs/gpl.txt
index 45645b4b53..45645b4b53 100644
--- a/protocols/MSN/Docs/gpl.txt
+++ b/plugins/!Deprecated/MSN/Docs/gpl.txt
diff --git a/protocols/MSN/Docs/history-msn.txt b/plugins/!Deprecated/MSN/Docs/history-msn.txt
index b3f08ab339..b3f08ab339 100644
--- a/protocols/MSN/Docs/history-msn.txt
+++ b/plugins/!Deprecated/MSN/Docs/history-msn.txt
diff --git a/protocols/MSN/Docs/readme-msn.txt b/plugins/!Deprecated/MSN/Docs/readme-msn.txt
index 8c0a035958..8c0a035958 100644
--- a/protocols/MSN/Docs/readme-msn.txt
+++ b/plugins/!Deprecated/MSN/Docs/readme-msn.txt
diff --git a/protocols/MSN/Docs/todo-msn.txt b/plugins/!Deprecated/MSN/Docs/todo-msn.txt
index 627c0ae56b..627c0ae56b 100644
--- a/protocols/MSN/Docs/todo-msn.txt
+++ b/plugins/!Deprecated/MSN/Docs/todo-msn.txt
diff --git a/protocols/MSN/Docs/translate-msn.txt b/plugins/!Deprecated/MSN/Docs/translate-msn.txt
index 552e1951ec..552e1951ec 100644
--- a/protocols/MSN/Docs/translate-msn.txt
+++ b/plugins/!Deprecated/MSN/Docs/translate-msn.txt
diff --git a/protocols/MSN/msn_10.vcxproj b/plugins/!Deprecated/MSN/msn_10.vcxproj
index 2cf0ee8aef..2cf0ee8aef 100644
--- a/protocols/MSN/msn_10.vcxproj
+++ b/plugins/!Deprecated/MSN/msn_10.vcxproj
diff --git a/protocols/MSN/msn_10.vcxproj.filters b/plugins/!Deprecated/MSN/msn_10.vcxproj.filters
index b9585f0393..b9585f0393 100644
--- a/protocols/MSN/msn_10.vcxproj.filters
+++ b/plugins/!Deprecated/MSN/msn_10.vcxproj.filters
diff --git a/protocols/MSN/msn_12.vcxproj b/plugins/!Deprecated/MSN/msn_12.vcxproj
index 33657ea881..33657ea881 100644
--- a/protocols/MSN/msn_12.vcxproj
+++ b/plugins/!Deprecated/MSN/msn_12.vcxproj
diff --git a/protocols/MSN/msn_12.vcxproj.filters b/plugins/!Deprecated/MSN/msn_12.vcxproj.filters
index b9585f0393..b9585f0393 100644
--- a/protocols/MSN/msn_12.vcxproj.filters
+++ b/plugins/!Deprecated/MSN/msn_12.vcxproj.filters
diff --git a/protocols/MSN/proto_msn/Proto_MSN_10.vcxproj b/plugins/!Deprecated/MSN/proto_msn/Proto_MSN_10.vcxproj
index b1f887ef0e..b1f887ef0e 100644
--- a/protocols/MSN/proto_msn/Proto_MSN_10.vcxproj
+++ b/plugins/!Deprecated/MSN/proto_msn/Proto_MSN_10.vcxproj
diff --git a/protocols/MSN/proto_msn/Proto_MSN_10.vcxproj.filters b/plugins/!Deprecated/MSN/proto_msn/Proto_MSN_10.vcxproj.filters
index 13a42fab36..13a42fab36 100644
--- a/protocols/MSN/proto_msn/Proto_MSN_10.vcxproj.filters
+++ b/plugins/!Deprecated/MSN/proto_msn/Proto_MSN_10.vcxproj.filters
diff --git a/protocols/MSN/proto_msn/Proto_MSN_12.vcxproj b/plugins/!Deprecated/MSN/proto_msn/Proto_MSN_12.vcxproj
index e85378ccbb..e85378ccbb 100644
--- a/protocols/MSN/proto_msn/Proto_MSN_12.vcxproj
+++ b/plugins/!Deprecated/MSN/proto_msn/Proto_MSN_12.vcxproj
diff --git a/protocols/MSN/proto_msn/Proto_MSN_12.vcxproj.filters b/plugins/!Deprecated/MSN/proto_msn/Proto_MSN_12.vcxproj.filters
index 13a42fab36..13a42fab36 100644
--- a/protocols/MSN/proto_msn/Proto_MSN_12.vcxproj.filters
+++ b/plugins/!Deprecated/MSN/proto_msn/Proto_MSN_12.vcxproj.filters
diff --git a/protocols/MSN/proto_msn/res/Away.ico b/plugins/!Deprecated/MSN/proto_msn/res/Away.ico
index 861c161ed1..861c161ed1 100644
--- a/protocols/MSN/proto_msn/res/Away.ico
+++ b/plugins/!Deprecated/MSN/proto_msn/res/Away.ico
diff --git a/protocols/MSN/proto_msn/res/Invisible.ico b/plugins/!Deprecated/MSN/proto_msn/res/Invisible.ico
index 382e3bf50d..382e3bf50d 100644
--- a/protocols/MSN/proto_msn/res/Invisible.ico
+++ b/plugins/!Deprecated/MSN/proto_msn/res/Invisible.ico
diff --git a/protocols/MSN/proto_msn/res/Occupied.ico b/plugins/!Deprecated/MSN/proto_msn/res/Occupied.ico
index 47c63a4214..47c63a4214 100644
--- a/protocols/MSN/proto_msn/res/Occupied.ico
+++ b/plugins/!Deprecated/MSN/proto_msn/res/Occupied.ico
diff --git a/protocols/MSN/proto_msn/res/Offline.ico b/plugins/!Deprecated/MSN/proto_msn/res/Offline.ico
index d52328aa47..d52328aa47 100644
--- a/protocols/MSN/proto_msn/res/Offline.ico
+++ b/plugins/!Deprecated/MSN/proto_msn/res/Offline.ico
diff --git a/protocols/MSN/proto_msn/res/Online.ico b/plugins/!Deprecated/MSN/proto_msn/res/Online.ico
index 7388d3928f..7388d3928f 100644
--- a/protocols/MSN/proto_msn/res/Online.ico
+++ b/plugins/!Deprecated/MSN/proto_msn/res/Online.ico
diff --git a/protocols/MSN/proto_msn/res/Phone.ico b/plugins/!Deprecated/MSN/proto_msn/res/Phone.ico
index 144bc48e59..144bc48e59 100644
--- a/protocols/MSN/proto_msn/res/Phone.ico
+++ b/plugins/!Deprecated/MSN/proto_msn/res/Phone.ico
diff --git a/protocols/MSN/proto_msn/res/Proto_MSN.rc b/plugins/!Deprecated/MSN/proto_msn/res/Proto_MSN.rc
index 6d2a82de81..6d2a82de81 100644
--- a/protocols/MSN/proto_msn/res/Proto_MSN.rc
+++ b/plugins/!Deprecated/MSN/proto_msn/res/Proto_MSN.rc
diff --git a/protocols/MSN/proto_msn/src/resource.h b/plugins/!Deprecated/MSN/proto_msn/src/resource.h
index 2842dcf4f3..2842dcf4f3 100644
--- a/protocols/MSN/proto_msn/src/resource.h
+++ b/plugins/!Deprecated/MSN/proto_msn/src/resource.h
diff --git a/protocols/MSN/res/inbox.ico b/plugins/!Deprecated/MSN/res/inbox.ico
index 7a5e461f6f..7a5e461f6f 100644
--- a/protocols/MSN/res/inbox.ico
+++ b/plugins/!Deprecated/MSN/res/inbox.ico
diff --git a/protocols/MSN/res/invite.ico b/plugins/!Deprecated/MSN/res/invite.ico
index 25bd23be86..25bd23be86 100644
--- a/protocols/MSN/res/invite.ico
+++ b/plugins/!Deprecated/MSN/res/invite.ico
diff --git a/protocols/MSN/res/list_al.ico b/plugins/!Deprecated/MSN/res/list_al.ico
index 05bd93fac4..05bd93fac4 100644
--- a/protocols/MSN/res/list_al.ico
+++ b/plugins/!Deprecated/MSN/res/list_al.ico
diff --git a/protocols/MSN/res/list_bl.ico b/plugins/!Deprecated/MSN/res/list_bl.ico
index 58d39b6fcf..58d39b6fcf 100644
--- a/protocols/MSN/res/list_bl.ico
+++ b/plugins/!Deprecated/MSN/res/list_bl.ico
diff --git a/protocols/MSN/res/list_fl.ico b/plugins/!Deprecated/MSN/res/list_fl.ico
index fb77874fc4..fb77874fc4 100644
--- a/protocols/MSN/res/list_fl.ico
+++ b/plugins/!Deprecated/MSN/res/list_fl.ico
diff --git a/protocols/MSN/res/list_ph.ico b/plugins/!Deprecated/MSN/res/list_ph.ico
index da5a991a0c..da5a991a0c 100644
--- a/protocols/MSN/res/list_ph.ico
+++ b/plugins/!Deprecated/MSN/res/list_ph.ico
diff --git a/protocols/MSN/res/list_rl.ico b/plugins/!Deprecated/MSN/res/list_rl.ico
index 1e22656d1d..1e22656d1d 100644
--- a/protocols/MSN/res/list_rl.ico
+++ b/plugins/!Deprecated/MSN/res/list_rl.ico
diff --git a/protocols/MSN/res/msn.ico b/plugins/!Deprecated/MSN/res/msn.ico
index 818824f3a0..818824f3a0 100644
--- a/protocols/MSN/res/msn.ico
+++ b/plugins/!Deprecated/MSN/res/msn.ico
diff --git a/protocols/MSN/res/msn.rc b/plugins/!Deprecated/MSN/res/msn.rc
index b8b9fa5d98..b8b9fa5d98 100644
--- a/protocols/MSN/res/msn.rc
+++ b/plugins/!Deprecated/MSN/res/msn.rc
diff --git a/protocols/MSN/res/msnblock.ico b/plugins/!Deprecated/MSN/res/msnblock.ico
index 26c0a6d040..26c0a6d040 100644
--- a/protocols/MSN/res/msnblock.ico
+++ b/plugins/!Deprecated/MSN/res/msnblock.ico
diff --git a/protocols/MSN/res/netmeeting.ico b/plugins/!Deprecated/MSN/res/netmeeting.ico
index 40e341ec16..40e341ec16 100644
--- a/protocols/MSN/res/netmeeting.ico
+++ b/plugins/!Deprecated/MSN/res/netmeeting.ico
diff --git a/protocols/MSN/res/profile.ico b/plugins/!Deprecated/MSN/res/profile.ico
index 2056f57798..2056f57798 100644
--- a/protocols/MSN/res/profile.ico
+++ b/plugins/!Deprecated/MSN/res/profile.ico
diff --git a/protocols/MSN/res/services.ico b/plugins/!Deprecated/MSN/res/services.ico
index 2aca9a8bb4..2aca9a8bb4 100644
--- a/protocols/MSN/res/services.ico
+++ b/plugins/!Deprecated/MSN/res/services.ico
diff --git a/protocols/MSN/res/version.rc b/plugins/!Deprecated/MSN/res/version.rc
index df06238f1f..df06238f1f 100644
--- a/protocols/MSN/res/version.rc
+++ b/plugins/!Deprecated/MSN/res/version.rc
diff --git a/protocols/MSN/src/des.c b/plugins/!Deprecated/MSN/src/des.c
index 030fb983cd..030fb983cd 100644
--- a/protocols/MSN/src/des.c
+++ b/plugins/!Deprecated/MSN/src/des.c
diff --git a/protocols/MSN/src/des.h b/plugins/!Deprecated/MSN/src/des.h
index e1fc923fad..e1fc923fad 100644
--- a/protocols/MSN/src/des.h
+++ b/plugins/!Deprecated/MSN/src/des.h
diff --git a/protocols/MSN/src/ezxml.c b/plugins/!Deprecated/MSN/src/ezxml.c
index 41ef70598e..41ef70598e 100644
--- a/protocols/MSN/src/ezxml.c
+++ b/plugins/!Deprecated/MSN/src/ezxml.c
diff --git a/protocols/MSN/src/ezxml.h b/plugins/!Deprecated/MSN/src/ezxml.h
index 37a0385541..37a0385541 100644
--- a/protocols/MSN/src/ezxml.h
+++ b/plugins/!Deprecated/MSN/src/ezxml.h
diff --git a/protocols/MSN/src/msn.cpp b/plugins/!Deprecated/MSN/src/msn.cpp
index 21e199fb77..21e199fb77 100644
--- a/protocols/MSN/src/msn.cpp
+++ b/plugins/!Deprecated/MSN/src/msn.cpp
diff --git a/protocols/MSN/src/msn_auth.cpp b/plugins/!Deprecated/MSN/src/msn_auth.cpp
index 9474b71dfc..9474b71dfc 100644
--- a/protocols/MSN/src/msn_auth.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_auth.cpp
diff --git a/protocols/MSN/src/msn_avatar.cpp b/plugins/!Deprecated/MSN/src/msn_avatar.cpp
index ba3b0da6ce..ba3b0da6ce 100644
--- a/protocols/MSN/src/msn_avatar.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_avatar.cpp
diff --git a/protocols/MSN/src/msn_chat.cpp b/plugins/!Deprecated/MSN/src/msn_chat.cpp
index 04b17072d5..04b17072d5 100644
--- a/protocols/MSN/src/msn_chat.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_chat.cpp
diff --git a/protocols/MSN/src/msn_commands.cpp b/plugins/!Deprecated/MSN/src/msn_commands.cpp
index c3bfaf9ee6..c3bfaf9ee6 100644
--- a/protocols/MSN/src/msn_commands.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_commands.cpp
diff --git a/protocols/MSN/src/msn_contact.cpp b/plugins/!Deprecated/MSN/src/msn_contact.cpp
index fc3bef21a1..fc3bef21a1 100644
--- a/protocols/MSN/src/msn_contact.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_contact.cpp
diff --git a/protocols/MSN/src/msn_errors.cpp b/plugins/!Deprecated/MSN/src/msn_errors.cpp
index 177122d4e0..177122d4e0 100644
--- a/protocols/MSN/src/msn_errors.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_errors.cpp
diff --git a/protocols/MSN/src/msn_ftold.cpp b/plugins/!Deprecated/MSN/src/msn_ftold.cpp
index db1ba3de66..db1ba3de66 100644
--- a/protocols/MSN/src/msn_ftold.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_ftold.cpp
diff --git a/protocols/MSN/src/msn_global.h b/plugins/!Deprecated/MSN/src/msn_global.h
index d1efa2736b..d1efa2736b 100644
--- a/protocols/MSN/src/msn_global.h
+++ b/plugins/!Deprecated/MSN/src/msn_global.h
diff --git a/protocols/MSN/src/msn_http.cpp b/plugins/!Deprecated/MSN/src/msn_http.cpp
index ae2f18cdf2..ae2f18cdf2 100644
--- a/protocols/MSN/src/msn_http.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_http.cpp
diff --git a/protocols/MSN/src/msn_libstr.cpp b/plugins/!Deprecated/MSN/src/msn_libstr.cpp
index 48296b36fb..48296b36fb 100644
--- a/protocols/MSN/src/msn_libstr.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_libstr.cpp
diff --git a/protocols/MSN/src/msn_links.cpp b/plugins/!Deprecated/MSN/src/msn_links.cpp
index 4c3adb0a1b..4c3adb0a1b 100644
--- a/protocols/MSN/src/msn_links.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_links.cpp
diff --git a/protocols/MSN/src/msn_lists.cpp b/plugins/!Deprecated/MSN/src/msn_lists.cpp
index 57a227a22f..57a227a22f 100644
--- a/protocols/MSN/src/msn_lists.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_lists.cpp
diff --git a/protocols/MSN/src/msn_mail.cpp b/plugins/!Deprecated/MSN/src/msn_mail.cpp
index 407375bf17..407375bf17 100644
--- a/protocols/MSN/src/msn_mail.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_mail.cpp
diff --git a/protocols/MSN/src/msn_menu.cpp b/plugins/!Deprecated/MSN/src/msn_menu.cpp
index 84ef664f0f..84ef664f0f 100644
--- a/protocols/MSN/src/msn_menu.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_menu.cpp
diff --git a/protocols/MSN/src/msn_mime.cpp b/plugins/!Deprecated/MSN/src/msn_mime.cpp
index 6f9d15d587..6f9d15d587 100644
--- a/protocols/MSN/src/msn_mime.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_mime.cpp
diff --git a/protocols/MSN/src/msn_misc.cpp b/plugins/!Deprecated/MSN/src/msn_misc.cpp
index d370429c57..d370429c57 100644
--- a/protocols/MSN/src/msn_misc.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_misc.cpp
diff --git a/protocols/MSN/src/msn_msgqueue.cpp b/plugins/!Deprecated/MSN/src/msn_msgqueue.cpp
index c11887c53d..c11887c53d 100644
--- a/protocols/MSN/src/msn_msgqueue.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_msgqueue.cpp
diff --git a/protocols/MSN/src/msn_msgsplit.cpp b/plugins/!Deprecated/MSN/src/msn_msgsplit.cpp
index ab0e3bb11d..ab0e3bb11d 100644
--- a/protocols/MSN/src/msn_msgsplit.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_msgsplit.cpp
diff --git a/protocols/MSN/src/msn_natdetect.cpp b/plugins/!Deprecated/MSN/src/msn_natdetect.cpp
index c6569ff817..c6569ff817 100644
--- a/protocols/MSN/src/msn_natdetect.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_natdetect.cpp
diff --git a/protocols/MSN/src/msn_opts.cpp b/plugins/!Deprecated/MSN/src/msn_opts.cpp
index ae6276b6f3..ae6276b6f3 100644
--- a/protocols/MSN/src/msn_opts.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_opts.cpp
diff --git a/protocols/MSN/src/msn_p2p.cpp b/plugins/!Deprecated/MSN/src/msn_p2p.cpp
index 28001e66cc..28001e66cc 100644
--- a/protocols/MSN/src/msn_p2p.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_p2p.cpp
diff --git a/protocols/MSN/src/msn_p2ps.cpp b/plugins/!Deprecated/MSN/src/msn_p2ps.cpp
index 07d8f80d5a..07d8f80d5a 100644
--- a/protocols/MSN/src/msn_p2ps.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_p2ps.cpp
diff --git a/protocols/MSN/src/msn_proto.cpp b/plugins/!Deprecated/MSN/src/msn_proto.cpp
index f289313ee6..f289313ee6 100644
--- a/protocols/MSN/src/msn_proto.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_proto.cpp
diff --git a/protocols/MSN/src/msn_proto.h b/plugins/!Deprecated/MSN/src/msn_proto.h
index 9c0b27214b..9c0b27214b 100644
--- a/protocols/MSN/src/msn_proto.h
+++ b/plugins/!Deprecated/MSN/src/msn_proto.h
diff --git a/protocols/MSN/src/msn_soapab.cpp b/plugins/!Deprecated/MSN/src/msn_soapab.cpp
index 7545a1d7d7..7545a1d7d7 100644
--- a/protocols/MSN/src/msn_soapab.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_soapab.cpp
diff --git a/protocols/MSN/src/msn_soapstore.cpp b/plugins/!Deprecated/MSN/src/msn_soapstore.cpp
index 0edbe6b9b0..0edbe6b9b0 100644
--- a/protocols/MSN/src/msn_soapstore.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_soapstore.cpp
diff --git a/protocols/MSN/src/msn_srv.cpp b/plugins/!Deprecated/MSN/src/msn_srv.cpp
index 57eee9f381..57eee9f381 100644
--- a/protocols/MSN/src/msn_srv.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_srv.cpp
diff --git a/protocols/MSN/src/msn_ssl.cpp b/plugins/!Deprecated/MSN/src/msn_ssl.cpp
index 42b324655c..42b324655c 100644
--- a/protocols/MSN/src/msn_ssl.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_ssl.cpp
diff --git a/protocols/MSN/src/msn_std.cpp b/plugins/!Deprecated/MSN/src/msn_std.cpp
index b6e2163e4d..b6e2163e4d 100644
--- a/protocols/MSN/src/msn_std.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_std.cpp
diff --git a/protocols/MSN/src/msn_svcs.cpp b/plugins/!Deprecated/MSN/src/msn_svcs.cpp
index 9c6c61b915..9c6c61b915 100644
--- a/protocols/MSN/src/msn_svcs.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_svcs.cpp
diff --git a/protocols/MSN/src/msn_switchboard.cpp b/plugins/!Deprecated/MSN/src/msn_switchboard.cpp
index 4ff32a7938..4ff32a7938 100644
--- a/protocols/MSN/src/msn_switchboard.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_switchboard.cpp
diff --git a/protocols/MSN/src/msn_threads.cpp b/plugins/!Deprecated/MSN/src/msn_threads.cpp
index e643bce91b..e643bce91b 100644
--- a/protocols/MSN/src/msn_threads.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_threads.cpp
diff --git a/protocols/MSN/src/msn_ws.cpp b/plugins/!Deprecated/MSN/src/msn_ws.cpp
index 22a4cbc0aa..22a4cbc0aa 100644
--- a/protocols/MSN/src/msn_ws.cpp
+++ b/plugins/!Deprecated/MSN/src/msn_ws.cpp
diff --git a/protocols/MSN/src/resource.h b/plugins/!Deprecated/MSN/src/resource.h
index 938a0124b7..938a0124b7 100644
--- a/protocols/MSN/src/resource.h
+++ b/plugins/!Deprecated/MSN/src/resource.h
diff --git a/protocols/MSN/src/stdafx.cpp b/plugins/!Deprecated/MSN/src/stdafx.cpp
index 01a3153a4d..01a3153a4d 100644
--- a/protocols/MSN/src/stdafx.cpp
+++ b/plugins/!Deprecated/MSN/src/stdafx.cpp
diff --git a/protocols/MSN/src/version.h b/plugins/!Deprecated/MSN/src/version.h
index f3f5952fe3..f3f5952fe3 100644
--- a/protocols/MSN/src/version.h
+++ b/plugins/!Deprecated/MSN/src/version.h
diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp
index 610afd1d7d..ddcbc48d89 100644
--- a/plugins/PluginUpdater/src/DlgUpdate.cpp
+++ b/plugins/PluginUpdater/src/DlgUpdate.cpp
@@ -539,6 +539,7 @@ static renameTable[] =
 	{ _T("gender.dll"),                     NULL },

 	{ _T("langman.dll"),                    NULL },

 	{ _T("metacontacts.dll"),               NULL },

+	{ _T("msn.dll"),                        NULL },

 };

 

 static bool CheckFileRename(const TCHAR *ptszOldName, TCHAR *pNewName)

diff --git a/src/modules/plugins/newplugins.cpp b/src/modules/plugins/newplugins.cpp
index 562447810e..6b34247c68 100644
--- a/src/modules/plugins/newplugins.cpp
+++ b/src/modules/plugins/newplugins.cpp
@@ -100,7 +100,8 @@ static const MUUID pluginBannedList[] =
 	{0x28ff9b91, 0x3e4d, 0x4f1c, { 0xb4, 0x7c, 0xc6, 0x41, 0xb0, 0x37, 0xff, 0x40 }},  // dbx_mmap_sa

 	{0x28f45248, 0x8c9c, 0x4bee, { 0x93, 0x07, 0x7b, 0xcf, 0x3e, 0x12, 0xbf, 0x99 }},  // dbx_tree

 	{0x4c4a27cf, 0x5e64, 0x4242, { 0xa3, 0x32, 0xb9, 0x8b, 0x08, 0x24, 0x3e, 0x89 }},  // metacontacts

-	{0x9c448c61, 0xfc3f, 0x42f9, { 0xb9, 0xf0, 0x4a, 0x30, 0xe1, 0xcf, 0x86, 0x71 }}   // skypekit based skype

+	{0x9c448c61, 0xfc3f, 0x42f9, { 0xb9, 0xf0, 0x4a, 0x30, 0xe1, 0xcf, 0x86, 0x71 }},  // skypekit based skype protocol

+	{0x97724af9, 0xf3fb, 0x47d3, { 0xa3, 0xbf, 0xea, 0xa9, 0x35, 0xc7, 0x4e, 0x6d }}   // msn protocol

 };

 

 static bool isPluginBanned(const MUUID& u1)