diff --git a/classes/Message.php b/classes/Message.php
new file mode 100644
index 0000000000..3f01e3c832
--- /dev/null
+++ b/classes/Message.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Table Definition for message
+ */
+require_once 'DB/DataObject.php';
+
+class Message extends DB_DataObject 
+{
+    ###START_AUTOCODE
+    /* the code below is auto generated do not remove the above tag */
+
+    public $__table = 'message';                         // table name
+    public $id;                              // int(4)  primary_key not_null
+    public $uri;                             // varchar(255)  unique_key
+    public $from_profile;                    // int(4)   not_null
+    public $to_profile;                      // int(4)   not_null
+    public $content;                         // varchar(140)  
+    public $rendered;                        // text()  
+    public $url;                             // varchar(255)  
+    public $created;                         // datetime()   not_null
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
+    public $source;                          // varchar(32)  
+
+    /* Static get */
+    function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Message',$k,$v); }
+
+    /* the code above is auto generated do not remove the tag below */
+    ###END_AUTOCODE
+}
diff --git a/classes/stoica.ini b/classes/stoica.ini
index 90d83abc8a..0d02da426c 100644
--- a/classes/stoica.ini
+++ b/classes/stoica.ini
@@ -108,6 +108,21 @@ created = 142
 [invitation__keys]
 code = K
 
+[message]
+id = 129
+uri = 2
+from_profile = 129
+to_profile = 129
+content = 2
+rendered = 34
+url = 2
+created = 142
+modified = 384
+source = 2
+
+[message__keys]
+id = N
+
 [nonce]
 consumer_key = 130
 tok = 130
diff --git a/db/laconica.sql b/db/laconica.sql
index a643fd2312..8dba7e3797 100644
--- a/db/laconica.sql
+++ b/db/laconica.sql
@@ -311,3 +311,21 @@ create table invitation (
      index invitation_address_idx (address, address_type),
      index invitation_user_id_idx (user_id)
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+
+create table message (
+
+    id integer auto_increment primary key comment 'unique identifier',
+    uri varchar(255) unique key comment 'universally unique identifier',
+    from_profile integer not null comment 'who the message is from' references profile (id),
+    to_profile integer not null comment 'who the message is to' references profile (id),
+    content varchar(140) comment 'message content',
+    rendered text comment 'HTML version of the content',
+    url varchar(255) comment 'URL of any attachment (image, video, bookmark, whatever)',
+    created datetime not null comment 'date this record was created',
+    modified timestamp comment 'date this record was modified',
+    source varchar(32) comment 'source of comment, like "web", "im", or "clientname"',
+    
+    index message_from_idx (from_profile),
+    index message_to_idx (to_profile),
+    index message_created_idx (created)
+) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;