diff --git a/OpenSim/Addons/OfflineIM/Data/IOfflineIMData.cs b/OpenSim/Data/IOfflineIMData.cs
similarity index 98%
rename from OpenSim/Addons/OfflineIM/Data/IOfflineIMData.cs
rename to OpenSim/Data/IOfflineIMData.cs
index a507f7d240..e780304ec8 100644
--- a/OpenSim/Addons/OfflineIM/Data/IOfflineIMData.cs
+++ b/OpenSim/Data/IOfflineIMData.cs
@@ -29,7 +29,7 @@ using System.Collections.Generic;
 using OpenSim.Data;
 using OpenMetaverse;
 
-namespace OpenSim.OfflineIM
+namespace OpenSim.Data
 {
     public class OfflineIMData
     {
diff --git a/OpenSim/Addons/OfflineIM/Data/MySQLOfflineIMData.cs b/OpenSim/Data/MySQL/MySQLOfflineIMData.cs
similarity index 92%
rename from OpenSim/Addons/OfflineIM/Data/MySQLOfflineIMData.cs
rename to OpenSim/Data/MySQL/MySQLOfflineIMData.cs
index 0a61cd291b..252f358b7c 100644
--- a/OpenSim/Addons/OfflineIM/Data/MySQLOfflineIMData.cs
+++ b/OpenSim/Data/MySQL/MySQLOfflineIMData.cs
@@ -36,16 +36,10 @@ using OpenSim.Data.MySQL;
 using OpenMetaverse;
 using MySql.Data.MySqlClient;
 
-namespace OpenSim.OfflineIM
+namespace OpenSim.Data.MySQL
 {
     public class MySQLOfflineIMData : MySQLGenericTableHandler<OfflineIMData>, IOfflineIMData
     {
-        protected override Assembly Assembly
-        {
-            // WARNING! Moving migrations to this assembly!!!
-            get { return GetType().Assembly; }
-        }
-
         public MySQLOfflineIMData(string connectionString, string realm)
             : base(connectionString, realm, "IM_Store")
         {
diff --git a/OpenSim/Addons/OfflineIM/Resources/IM_Store.migrations b/OpenSim/Data/MySQL/Resources/IM_Store.migrations
similarity index 100%
rename from OpenSim/Addons/OfflineIM/Resources/IM_Store.migrations
rename to OpenSim/Data/MySQL/Resources/IM_Store.migrations
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 07e7357c03..674a66c147 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -542,9 +542,9 @@
     ;; URL of web service for offline message storage. Leave it commented if your service is local to the sim.
     ; OfflineMessageURL = http://yourserver/Offline.php or http://yourrobustserver:8003
 
-    ;# {StorageProvider} {Offline Message Module V2:Offline Message Module V2} {DLL that provides the storage interface} {OpenSim.Addons.OfflineIM}
-	;; For standalones, use the service directly. This is the storage dll.
-	; StorageProvider = OpenSim.Addons.OfflineIM.dll
+    ;# {StorageProvider} {Offline Message Module V2:Offline Message Module V2} {DLL that provides the storage interface} {OpenSim.Data.MySQL.dll}
+	;; For standalones, this is the storage dll.
+	; StorageProvider = OpenSim.Data.MySQL.dll
 
     ;# {MuteListModule} {OfflineMessageModule:OfflineMessageModule} {} {} MuteListModule
     ;; Mute list handler (not yet implemented). MUST BE SET to allow offline
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index fd86bca7a8..020815e1eb 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -548,6 +548,5 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
 
 [Messaging]
     ; OfflineIM
-    StorageProvider = "OpenSim.Addons.OfflineIM.dll"
     OfflineIMService = "OpenSim.Addons.OfflineIM.dll:OfflineIMService"
 
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 9dd0d71ef6..63a569937f 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -334,7 +334,6 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
 
 [Messaging]
     ; OfflineIM
-    StorageProvider = "OpenSim.Addons.OfflineIM.dll"
     OfflineIMService = "OpenSim.Addons.OfflineIM.dll:OfflineIMService"
 
 [GridInfoService]