diff --git a/plugins/DirectMessage/actions/inbox.php b/plugins/DirectMessage/actions/inbox.php
index 1a4de6ccaa..b3dc88598b 100644
--- a/plugins/DirectMessage/actions/inbox.php
+++ b/plugins/DirectMessage/actions/inbox.php
@@ -102,24 +102,3 @@ class InboxAction extends MailboxAction
         return _('This is your inbox, which lists your incoming private messages.');
     }
 }
-
-class InboxMessageList extends MessageList
-{
-    function newItem($message)
-    {
-        return new InboxMessageListItem($this->out, $message);
-    }
-}
-
-class InboxMessageListItem extends MessageListItem
-{
-    /**
-     * Returns the profile we want to show with the message
-     *
-     * @return Profile The profile that matches the message
-     */
-    function getMessageProfile()
-    {
-        return $this->message->getFrom();
-    }
-}
diff --git a/plugins/DirectMessage/lib/inboxmessagelist.php b/plugins/DirectMessage/lib/inboxmessagelist.php
new file mode 100644
index 0000000000..f24f540b04
--- /dev/null
+++ b/plugins/DirectMessage/lib/inboxmessagelist.php
@@ -0,0 +1,11 @@
+<?php
+
+if (!defined('GNUSOCIAL')) { exit(1); }
+
+class InboxMessageList extends MessageList
+{
+    function newItem($message)
+    {
+        return new InboxMessageListItem($this->out, $message);
+    }
+}
diff --git a/plugins/DirectMessage/lib/inboxmessagelistitem.php b/plugins/DirectMessage/lib/inboxmessagelistitem.php
new file mode 100644
index 0000000000..929c67018f
--- /dev/null
+++ b/plugins/DirectMessage/lib/inboxmessagelistitem.php
@@ -0,0 +1,16 @@
+<?php
+
+if (!defined('GNUSOCIAL')) { exit(1); }
+
+class InboxMessageListItem extends MessageListItem
+{
+    /**
+     * Returns the profile we want to show with the message
+     *
+     * @return Profile The profile that matches the message
+     */
+    function getMessageProfile()
+    {
+        return $this->message->getFrom();
+    }
+}