diff --git a/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj b/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj
index 5848e615c..4d571c4c3 100644
--- a/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj
@@ -77,11 +77,12 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Module.txt" />
-    <Content Include="Views\EditorTemplates\Parts\Smtp.SiteSettings.ascx" />
     <Content Include="Web.config" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <None Include="Views\EditorTemplates\Parts\Smtp.SiteSettings.cshtml" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
       <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
diff --git a/src/Orchard.Web/Modules/Orchard.Email/Views/EditorTemplates/Parts/Smtp.SiteSettings.ascx b/src/Orchard.Web/Modules/Orchard.Email/Views/EditorTemplates/Parts/Smtp.SiteSettings.ascx
deleted file mode 100644
index a6ac4e3f6..000000000
--- a/src/Orchard.Web/Modules/Orchard.Email/Views/EditorTemplates/Parts/Smtp.SiteSettings.ascx
+++ /dev/null
@@ -1,43 +0,0 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<SmtpSettingsPart>" %>
-<%@ Import Namespace="Orchard.Email.Models"%>
-<%@ Import Namespace="System.Net.Mail" %>
-<fieldset>
-    <legend><%: T("SMTP")%></legend>
-    <div>
-        <label for="<%: Html.FieldIdFor(m => m.Address)%>"><%: T("Sender email address")%></label>
-        <%: Html.EditorFor(m => m.Address)%>
-        <%: Html.ValidationMessage("Address", "*")%> 
-    </div>
-    <div>
-        <label for="<%: Html.FieldIdFor(m => m.Host)%>"><%: T("Host name")%></label>
-        <%: Html.EditorFor(m => m.Host)%>
-        <%: Html.ValidationMessage("Host", "*")%> 
-    </div>
-    <div>
-        <label for="<%: Html.FieldIdFor(m => m.Port)%>"><%: T("Port number")%></label>
-        <%: Html.EditorFor(m => m.Port)%>
-        <%: Html.ValidationMessage("Port", "*")%> 
-    </div>
-    <div>
-        <%: Html.EditorFor(m => m.EnableSsl)%>
-        <label for="<%: Html.FieldIdFor(m => m.EnableSsl)%>" class="forcheckbox"><%: T("Enable SSL communications")%></label>
-        <%: Html.ValidationMessage("EnableSsl", "*")%> 
-    </div>
-    <div>
-        <%: Html.EditorFor(m => m.RequireCredentials)%>
-        <label for="<%: Html.FieldIdFor(m => m.RequireCredentials)%>" class="forcheckbox"><%: T("Require credentials")%></label>
-        <%: Html.ValidationMessage("RequireCredentials", "*")%> 
-    </div>
-    <div data-controllerid="<%: Html.FieldIdFor(m => m.RequireCredentials)%>">
-        <div>
-            <label for="<%: Html.FieldIdFor(m => m.UserName)%>"><%: T("User name")%></label>
-            <%: Html.EditorFor(m => m.UserName)%>
-            <%: Html.ValidationMessage("UserName", "*")%> 
-        </div>
-        <div>
-            <label for="<%: Html.FieldIdFor(m => m.Password)%>"><%: T("Password")%></label>
-            <%: Html.PasswordFor(m => m.Password)%>
-            <%: Html.ValidationMessage("Password", "*")%> 
-        </div>
-    </div>
-</fieldset>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Email/Views/EditorTemplates/Parts/Smtp.SiteSettings.cshtml b/src/Orchard.Web/Modules/Orchard.Email/Views/EditorTemplates/Parts/Smtp.SiteSettings.cshtml
new file mode 100644
index 000000000..160afff9e
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Email/Views/EditorTemplates/Parts/Smtp.SiteSettings.cshtml
@@ -0,0 +1,43 @@
+@model Orchard.Email.Models.SmtpSettingsPart
+@using System.Net.Mail
+
+<fieldset>
+    <legend>@T("SMTP")</legend>
+    <div>
+        <label for="@Html.FieldIdFor(m => m.Address)">@T("Sender email address")</label>
+        @Html.EditorFor(m => m.Address)
+        @Html.ValidationMessage("Address", "*")
+    </div>
+    <div>
+        <label for="@Html.FieldIdFor(m => m.Host)">@T("Host name")</label>
+        @Html.EditorFor(m => m.Host)
+        @Html.ValidationMessage("Host", "*") 
+    </div>
+    <div>
+        <label for="@Html.FieldIdFor(m => m.Port)">@T("Port number")</label>
+        @Html.EditorFor(m => m.Port)
+        @Html.ValidationMessage("Port", "*")
+    </div>
+    <div>
+        @Html.EditorFor(m => m.EnableSsl)
+        <label for="@Html.FieldIdFor(m => m.EnableSsl)" class="forcheckbox">@T("Enable SSL communications")</label>
+        @Html.ValidationMessage("EnableSsl", "*")
+    </div>
+    <div>
+        @Html.EditorFor(m => m.RequireCredentials)
+        <label for="@Html.FieldIdFor(m => m.RequireCredentials)" class="forcheckbox">@T("Require credentials")</label>
+        @Html.ValidationMessage("RequireCredentials", "*")
+    </div>
+    <div data-controllerid="@Html.FieldIdFor(m => m.RequireCredentials)">
+        <div>
+            <label for="@Html.FieldIdFor(m => m.UserName)">@T("User name")</label>
+            @Html.EditorFor(m => m.UserName)
+            @Html.ValidationMessage("UserName", "*")
+        </div>
+        <div>
+            <label for="@Html.FieldIdFor(m => m.Password)">@T("Password")</label>
+            @Html.PasswordFor(m => m.Password)
+            @Html.ValidationMessage("Password", "*")
+        </div>
+    </div>
+</fieldset>
\ No newline at end of file
diff --git a/src/Orchard.sln b/src/Orchard.sln
index 3d1f2e5f6..f8b5b53ac 100644
--- a/src/Orchard.sln
+++ b/src/Orchard.sln
@@ -64,6 +64,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TinyMce", "Orchard.Web\Modu
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Media", "Orchard.Web\Modules\Orchard.Media\Orchard.Media.csproj", "{D9A7B330-CD22-4DA1-A95A-8DE1982AD8EB}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Email", "Orchard.Web\Modules\Orchard.Email\Orchard.Email.csproj", "{05660F47-D649-48BD-9DED-DF4E01E7CFF9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		CodeCoverage|Any CPU = CodeCoverage|Any CPU
@@ -323,6 +325,16 @@ Global
 		{D9A7B330-CD22-4DA1-A95A-8DE1982AD8EB}.FxCop|Any CPU.Build.0 = Release|Any CPU
 		{D9A7B330-CD22-4DA1-A95A-8DE1982AD8EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D9A7B330-CD22-4DA1-A95A-8DE1982AD8EB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{05660F47-D649-48BD-9DED-DF4E01E7CFF9}.CodeCoverage|Any CPU.ActiveCfg = Release|Any CPU
+		{05660F47-D649-48BD-9DED-DF4E01E7CFF9}.CodeCoverage|Any CPU.Build.0 = Release|Any CPU
+		{05660F47-D649-48BD-9DED-DF4E01E7CFF9}.Coverage|Any CPU.ActiveCfg = Release|Any CPU
+		{05660F47-D649-48BD-9DED-DF4E01E7CFF9}.Coverage|Any CPU.Build.0 = Release|Any CPU
+		{05660F47-D649-48BD-9DED-DF4E01E7CFF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{05660F47-D649-48BD-9DED-DF4E01E7CFF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{05660F47-D649-48BD-9DED-DF4E01E7CFF9}.FxCop|Any CPU.ActiveCfg = Release|Any CPU
+		{05660F47-D649-48BD-9DED-DF4E01E7CFF9}.FxCop|Any CPU.Build.0 = Release|Any CPU
+		{05660F47-D649-48BD-9DED-DF4E01E7CFF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{05660F47-D649-48BD-9DED-DF4E01E7CFF9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -339,6 +351,7 @@ Global
 		{5D0F00F0-26C9-4785-AD61-B85710C60EB0} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
 		{954CA994-D204-468B-9D69-51F6AD3E1C29} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
 		{D9A7B330-CD22-4DA1-A95A-8DE1982AD8EB} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
+		{05660F47-D649-48BD-9DED-DF4E01E7CFF9} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
 		{ABC826D4-2FA1-4F2F-87DE-E6095F653810} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA}
 		{F112851D-B023-4746-B6B1-8D2E5AD8F7AA} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA}
 		{6CB3EB30-F725-45C0-9742-42599BA8E8D2} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA}