diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Mail.SmarterMail10/WebsitePanel.Providers.Mail.SmarterMail10.csproj b/WebsitePanel/Sources/WebsitePanel.Providers.Mail.SmarterMail10/WebsitePanel.Providers.Mail.SmarterMail10.csproj
index df38d430..89d0bce6 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Mail.SmarterMail10/WebsitePanel.Providers.Mail.SmarterMail10.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Mail.SmarterMail10/WebsitePanel.Providers.Mail.SmarterMail10.csproj
@@ -12,24 +12,9 @@
     <AssemblyName>WebsitePanel.Providers.Mail.SmarterMail10</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
+	<TargetFrameworkProfile />
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -39,17 +24,14 @@
     <WarningLevel>4</WarningLevel>
     <WarningsAsErrors>618</WarningsAsErrors>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\WebsitePanel.Server\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject />
+    <WarningsAsErrors>618</WarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -58,30 +40,12 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
+	<Compile Include="..\VersionInfo.cs">
+      <Link>VersionInfo.cs</Link>
+    </Compile>
     <Compile Include="Extensions.cs" />
     <Compile Include="SmarterMail10.cs" />
     <Compile Include="SmarterMail10Proxies.cs" />
-    <Compile Include="VersionInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\WebsitePanel.Providers.Base\WebsitePanel.Providers.Base.csproj">
@@ -93,6 +57,9 @@
       <Name>WebsitePanel.Server.Utils</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/WebsitePanel/Sources/WebsitePanel.Server.sln b/WebsitePanel/Sources/WebsitePanel.Server.sln
index f063d89f..d05bb799 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server.sln
+++ b/WebsitePanel/Sources/WebsitePanel.Server.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2010
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Caching Application Block", "Caching Application Block", "{C8E6F2E4-A5B8-486A-A56E-92D864524682}"
 	ProjectSection(SolutionItems) = preProject
 		Bin\Microsoft.Practices.EnterpriseLibrary.Common.dll = Bin\Microsoft.Practices.EnterpriseLibrary.Common.dll
@@ -567,16 +567,16 @@ Global
 		{736FA0F0-ECA3-416E-B299-85CC425FFF44}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{736FA0F0-ECA3-416E-B299-85CC425FFF44}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{736FA0F0-ECA3-416E-B299-85CC425FFF44}.Release|x86.ActiveCfg = Release|Any CPU
-		{ADEAADF8-62E6-4AA9-9E0D-A8E552A2A85A}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{ADEAADF8-62E6-4AA9-9E0D-A8E552A2A85A}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{ADEAADF8-62E6-4AA9-9E0D-A8E552A2A85A}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{ADEAADF8-62E6-4AA9-9E0D-A8E552A2A85A}.Debug|x86.ActiveCfg = Debug|x86
-		{ADEAADF8-62E6-4AA9-9E0D-A8E552A2A85A}.Debug|x86.Build.0 = Debug|x86
-		{ADEAADF8-62E6-4AA9-9E0D-A8E552A2A85A}.Release|Any CPU.ActiveCfg = Release|x86
-		{ADEAADF8-62E6-4AA9-9E0D-A8E552A2A85A}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{ADEAADF8-62E6-4AA9-9E0D-A8E552A2A85A}.Release|Mixed Platforms.Build.0 = Release|x86
-		{ADEAADF8-62E6-4AA9-9E0D-A8E552A2A85A}.Release|x86.ActiveCfg = Release|x86
-		{ADEAADF8-62E6-4AA9-9E0D-A8E552A2A85A}.Release|x86.Build.0 = Release|x86
+		{ADEAADF8-62E6-4AA9-9E0D-A8E552A2A85A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADEAADF8-62E6-4AA9-9E0D-A8E552A2A85A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ADEAADF8-62E6-4AA9-9E0D-A8E552A2A85A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ADEAADF8-62E6-4AA9-9E0D-A8E552A2A85A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ADEAADF8-62E6-4AA9-9E0D-A8E552A2A85A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ADEAADF8-62E6-4AA9-9E0D-A8E552A2A85A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ADEAADF8-62E6-4AA9-9E0D-A8E552A2A85A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ADEAADF8-62E6-4AA9-9E0D-A8E552A2A85A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{ADEAADF8-62E6-4AA9-9E0D-A8E552A2A85A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{ADEAADF8-62E6-4AA9-9E0D-A8E552A2A85A}.Release|x86.ActiveCfg = Release|Any CPU
 		{27130BBB-76FA-411E-8B4D-51CD4DC821AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{27130BBB-76FA-411E-8B4D-51CD4DC821AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{27130BBB-76FA-411E-8B4D-51CD4DC821AF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU