diff --git a/Lib/mailbox.py b/Lib/mailbox.py
index 46f41ce8020..1e04bdd9cd4 100755
--- a/Lib/mailbox.py
+++ b/Lib/mailbox.py
@@ -315,7 +315,10 @@ class Maildir(Mailbox):
         subpath = self._lookup(key)
         f = open(os.path.join(self._path, subpath), 'r')
         try:
-            msg = MaildirMessage(f)
+            if self._factory:
+                msg = self._factory(f)
+            else:
+                msg = MaildirMessage(f)
         finally:
             f.close()
         subdir, name = os.path.split(subpath)
diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
index 57e44f436c8..ffeeb3eed05 100644
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@ -508,6 +508,20 @@ class TestMaildir(TestMailbox):
         self.assert_(msg_returned.get_flags() == 'S')
         self.assert_(msg_returned.get_payload() == '3')
 
+    def test_consistent_factory(self):
+        # Add a message.
+        msg = mailbox.MaildirMessage(self._template % 0)
+        msg.set_subdir('cur')
+        msg.set_flags('RF')
+        key = self._box.add(msg)
+
+        # Create new mailbox with
+        class FakeMessage(mailbox.MaildirMessage):
+            pass
+        box = mailbox.Maildir(self._path, factory=FakeMessage)
+        msg2 = box.get_message(key)
+        self.assert_(isinstance(msg2, FakeMessage))
+
     def test_initialize_new(self):
         # Initialize a non-existent mailbox
         self.tearDown()