diff --git a/src/Orchard.Web/Modules/Orchard.Messaging/Handlers/MessageSettingsPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Messaging/Handlers/MessageSettingsPartHandler.cs
index d11ed7d8c..2eb303d19 100644
--- a/src/Orchard.Web/Modules/Orchard.Messaging/Handlers/MessageSettingsPartHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.Messaging/Handlers/MessageSettingsPartHandler.cs
@@ -1,14 +1,12 @@
 using JetBrains.Annotations;
-using Orchard.Data;
 using Orchard.ContentManagement.Handlers;
 using Orchard.Messaging.Models;
 
 namespace Orchard.Messaging.Handlers {
     [UsedImplicitly]
     public class MessageSettingsPartHandler : ContentHandler {
-        public MessageSettingsPartHandler(IRepository<MessageSettingsPartRecord> repository) {
+        public MessageSettingsPartHandler() {
             Filters.Add(new ActivatingFilter<MessageSettingsPart>("Site"));
-            Filters.Add(StorageFilter.For(repository));
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Messaging/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Messaging/Migrations.cs
index 9c7dda7f8..8f39d72b6 100644
--- a/src/Orchard.Web/Modules/Orchard.Messaging/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.Messaging/Migrations.cs
@@ -4,10 +4,6 @@ namespace Orchard.Messaging {
     public class Migrations : DataMigrationImpl {
 
         public int Create() {
-            SchemaBuilder.CreateTable("MessageSettingsPartRecord", table => table
-                .ContentPartRecord()
-                .Column<string>("DefaultChannelService", c => c.WithLength(64))
-                );
 
             return 1;
         }
diff --git a/src/Orchard.Web/Modules/Orchard.Messaging/Models/MessageSettingsPart.cs b/src/Orchard.Web/Modules/Orchard.Messaging/Models/MessageSettingsPart.cs
index 77e0b7d0b..796aed4c4 100644
--- a/src/Orchard.Web/Modules/Orchard.Messaging/Models/MessageSettingsPart.cs
+++ b/src/Orchard.Web/Modules/Orchard.Messaging/Models/MessageSettingsPart.cs
@@ -2,12 +2,14 @@
 using Orchard.ContentManagement;
 
 namespace Orchard.Messaging.Models {
-    public class MessageSettingsPart : ContentPart<MessageSettingsPartRecord> {
+    public class MessageSettingsPart : ContentPart {
 
-        [StringLength(MessageSettingsPartRecord.DefaultChannelServiceLength)]
+        public const ushort DefaultChannelServiceLength = 64;
+
+        [StringLength(DefaultChannelServiceLength)]
         public string DefaultChannelService {
-            get { return Record.DefaultChannelService; }
-            set { Record.DefaultChannelService = value;  }
+            get { return this.Retrieve(x => x.DefaultChannelService); }
+            set { this.Store(x => x.DefaultChannelService, value);  }
         }
     }
 }
diff --git a/src/Orchard.Web/Modules/Orchard.Messaging/Models/MessageSettingsPartRecord.cs b/src/Orchard.Web/Modules/Orchard.Messaging/Models/MessageSettingsPartRecord.cs
deleted file mode 100644
index 2453fa8da..000000000
--- a/src/Orchard.Web/Modules/Orchard.Messaging/Models/MessageSettingsPartRecord.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using Orchard.ContentManagement.Records;
-
-namespace Orchard.Messaging.Models {
-    public class MessageSettingsPartRecord : ContentPartRecord {
-        public const ushort DefaultChannelServiceLength = 64;
-
-        /// <summary>
-        /// Default service used for messages
-        /// </summary>
-        [StringLength(DefaultChannelServiceLength)]
-        public virtual string DefaultChannelService { get; set; }
-    
-    }
-}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Messaging/Orchard.Messaging.csproj b/src/Orchard.Web/Modules/Orchard.Messaging/Orchard.Messaging.csproj
index fe9a3bc03..53ff0f470 100644
--- a/src/Orchard.Web/Modules/Orchard.Messaging/Orchard.Messaging.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Messaging/Orchard.Messaging.csproj
@@ -19,12 +19,12 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>4.0</OldToolsVersion>
-    <TargetFrameworkProfile />
     <UseIISExpress>false</UseIISExpress>
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
+    <IISExpressUseClassicPipelineMode />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,7 +68,6 @@
     <Compile Include="Handlers\MessageSettingsPartHandler.cs" />
     <Compile Include="Migrations.cs" />
     <Compile Include="Models\MessageSettingsPart.cs" />
-    <Compile Include="Models\MessageSettingsPartRecord.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ViewModels\MessageSettingsPartViewModel.cs" />
   </ItemGroup>
diff --git a/src/Orchard.Web/Modules/Upgrade/Controllers/InfosetController.cs b/src/Orchard.Web/Modules/Upgrade/Controllers/InfosetController.cs
index 6d43b51bc..57ea87a3c 100644
--- a/src/Orchard.Web/Modules/Upgrade/Controllers/InfosetController.cs
+++ b/src/Orchard.Web/Modules/Upgrade/Controllers/InfosetController.cs
@@ -128,7 +128,14 @@ namespace Upgrade.Controllers {
 
             _upgradeService.ExecuteReader("DROP TABLE " + _upgradeService.GetPrefixedTableName("Orchard_Comment_CommentSettingsPartRecord"), null);
 
+            // MessageSettingsPartRecord
+            _upgradeService.ExecuteReader("SELECT * FROM " + _upgradeService.GetPrefixedTableName("Orchard_Messaging_MessageSettingsPartRecord"),
+                (reader, connection) => {
+                    site.As<InfosetPart>().Store("MessageSettingsPart", "DefaultChannelService", (bool)reader["DefaultChannelService"]);
+                });
 
+            _upgradeService.ExecuteReader("DROP TABLE " + _upgradeService.GetPrefixedTableName("Orchard_Messaging_MessageSettingsPartRecord"), null);
+            
             _orchardServices.Notifier.Information(T("Site Settings migrated successfully"));
 
             return View();