Populate should return MvcMailMessage. Cleanup T4 templates.

Mvc.Mailer/MailerBase.cs

@@ -70,7 +70,7 @@ public virtual string EmailBody(string viewName, string masterName = null) {
         /// Populates the mailMessage with content rendered from the view using the default masterName
         /// </summary>
         /// <param name="action">Action to be performed on a new message instance</param>
-        public virtual MailMessage Populate(Action<MvcMailMessage> action) {
+        public virtual MvcMailMessage Populate(Action<MvcMailMessage> action) {
             var message = new MvcMailMessage();
 
             action(message);

Mvc.Mailer/NuGet/input/tools/cs/MailerMethodTemplate.cs.t4

@@ -9,5 +9,4 @@ public virtual MailMessage <#= Model.MethodName #>()
         x.ViewName = "<#= Model.MethodName #>";
         x.To.Add("some-email@example.com");
     });
-}
-
+}

Mvc.Mailer/NuGet/input/tools/cs/MailerTemplate.cs.t4

@@ -1,37 +1,28 @@
 <#@ Template Language="C#" HostSpecific="True" Inherits="DynamicTransform" #>
 <#@ Output Extension="cs" #>
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
 using Mvc.Mailer;
 using System.Net.Mail;
 
 namespace <#= Model.Namespace #>.Mailers
 { 
     public class <#= Model.MailerName #> : MailerBase<# if( Model.Interface) { #>, I<#= Model.MailerName #> <# } #>
-
 	{
-		public <#= Model.MailerName #>():
-			base()
+		public <#= Model.MailerName #>()
 		{
 			MasterName="_Layout";
 		}
-
 		<# foreach(var mailerMethod in Model.MailerMethods) {#>
 
 		public virtual MailMessage <#= mailerMethod #>()
 		{
-			var mailMessage = new MailMessage{Subject = "<#= mailerMethod #>"};
-
-			//mailMessage.To.Add("some-email@example.com");
 			//ViewBag.Data = someObject;
-			PopulateBody(mailMessage, viewName: "<#= mailerMethod #>");
-
-			return mailMessage;
+			return Populate(x =>
+			{
+				x.Subject = "<#= mailerMethod #>";
+				x.ViewName = "<#= mailerMethod #>";
+				x.To.Add("some-email@example.com");
+			});
 		}
-
 		<# } #>
-
 	}
 }