1 files changed, 7 insertions, 5 deletions

diff --git a/src/mailman/model/message.py b/src/mailman/model/message.py
index 2d697c30b..691861d46 100644
--- a/src/mailman/model/message.py
+++ b/src/mailman/model/message.py
@@ -24,7 +24,7 @@ __all__ = [
     'Message',
     ]
 
-from storm.locals import AutoReload, Int, RawStr, Unicode
+from sqlalchemy import Column, Integer, LargeBinary, Unicode
 from zope.interface import implementer
 
 from mailman.database.model import Model
@@ -37,11 +37,13 @@ from mailman.interfaces.messages import IMessage
 class Message(Model):
     """A message in the message store."""
 
-    id = Int(primary=True, default=AutoReload)
-    message_id = Unicode()
-    message_id_hash = RawStr()
-    path = RawStr()
+    __tablename__ = 'message'
+
+    id = Column(Integer, primary_key=True)
     # This is a Messge-ID field representation, not a database row id.
+    message_id = Column(Unicode)
+    message_id_hash = Column(LargeBinary)
+    path = Column(LargeBinary)
 
     @dbconnection
     def __init__(self, store, message_id, message_id_hash, path):