diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/MessageTemplateController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/MessageTemplateController.cs
index db5273490c..d6d68d10fe 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/MessageTemplateController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/MessageTemplateController.cs
@@ -14,6 +14,7 @@
 using SmartStore.Web.Framework.Controllers;
 using SmartStore.Web.Framework.Filters;
 using SmartStore.Web.Framework.Security;
+using SmartStore.Web.Framework.Modelling;
 using Telerik.Web.Mvc;
 using SmartStore.Templating;
 using SmartStore.Web.Framework;
@@ -195,9 +196,9 @@ private void PrepareLastModelTree(MessageTemplate template)
 			ViewBag.LastModelTree = Services.Resolve<IMessageModelProvider>().GetLastModelTree(template);
 		}
 
-        [HttpPost, ParameterBasedOnFormName("save-continue", "continueEditing")]
+        [HttpPost, ValidateInput(false), ParameterBasedOnFormName("save-continue", "continueEditing")]
 		[FormValueRequired("save", "save-continue")]
-        public ActionResult Edit(MessageTemplateModel model, bool continueEditing)
+        public ActionResult Edit(MessageTemplateModel model, bool continueEditing, FormCollection form)
         {
             if (!_permissionService.Authorize(StandardPermissionProvider.ManageMessageTemplates))
                 return AccessDeniedView();
@@ -222,6 +223,8 @@ public ActionResult Edit(MessageTemplateModel model, bool continueEditing)
 				// locales
                 UpdateLocales(messageTemplate, model);
 
+                Services.EventPublisher.Publish(new ModelBoundEvent(model, messageTemplate, form));
+
                 NotifySuccess(_localizationService.GetResource("Admin.ContentManagement.MessageTemplates.Updated"));
                 return continueEditing ? RedirectToAction("Edit", messageTemplate.Id) : RedirectToAction("List");
             }
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Messages/MessageTemplateModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Messages/MessageTemplateModel.cs
index aef4792494..90cffa4419 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Messages/MessageTemplateModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Messages/MessageTemplateModel.cs
@@ -12,7 +12,7 @@
 namespace SmartStore.Admin.Models.Messages
 {
     [Validator(typeof(MessageTemplateValidator))]
-    public class MessageTemplateModel : EntityModelBase, ILocalizedModel<MessageTemplateLocalizedModel>, IStoreSelector
+    public class MessageTemplateModel : TabbableModel, ILocalizedModel<MessageTemplateLocalizedModel>, IStoreSelector
     {
         public MessageTemplateModel()
         {