diff --git a/modules/to.py b/modules/to.py
index cb0180b0..031d127c 100644
--- a/modules/to.py
+++ b/modules/to.py
@@ -1,27 +1,30 @@
-
+import EventManager
 
 class Module(object):
     def __init__(self, bot):
         bot.events.on("received").on("message").on("channel"
-            ).hook(self.channel_message)
+            ).hook(self.channel_message,
+            priority=EventManager.PRIORITY_MEDIUM)
         bot.events.on("received").on("command").on("to").hook(
             self.to, min_args=2, help=("Relay a message to a "
             "user the next time they talk in a channel"),
             channel_only=True, usage="<username> <message>")
 
     def channel_message(self, event):
-        setting = "to-%s" % event["user"].nickname
-        messages = event["channel"].get_setting(setting, [])
+        messages = event["channel"].get_user_setting(
+            event["user"].nickname, "to", [])
         for nickname, message in messages:
             event["channel"].send_message("%s: <%s> %s" % (
                 event["user"].nickname, nickname, message))
         if messages:
-            event["channel"].del_setting(setting)
+            event["channel"].del_user_setting(
+                event["user"].nickname, "to")
 
     def to(self, event):
-        setting = "to-%s" % event["args_split"][0]
-        messages = event["target"].get_setting(setting, [])
+        messages = event["target"].get_user_setting(
+            event["user"].nickname, "to", [])
         messages.append([event["user"].nickname,
             " ".join(event["args_split"][1:])])
-        event["target"].set_setting(setting, messages)
+        event["target"].set_user_setting(
+            event["user"].nickname, "to", messages)
         event["stdout"].write("Message saved")