--- a/src/memory/sqlite.py	Tue Nov 05 22:41:45 2013 +0100
+++ b/src/memory/sqlite.py	Thu Nov 07 15:29:39 2013 +0100
@@ -51,7 +51,7 @@
                 "INSERT INTO message_types VALUES ('groupchat')",
                 "INSERT INTO message_types VALUES ('headline')",
                 "INSERT INTO message_types VALUES ('normal')",
-                "CREATE TABLE history (id INTEGER PRIMARY KEY ASC, profile_id INTEGER, source TEXT, dest TEXT, source_res TEXT, dest_res TEXT, timestamp DATETIME, message TEXT, type TEXT, FOREIGN KEY(profile_id) REFERENCES profiles(id) ON DELETE CASCADE, FOREIGN KEY(type) REFERENCES message_types(type))",
+                "CREATE TABLE history (id INTEGER PRIMARY KEY ASC, profile_id INTEGER, source TEXT, dest TEXT, source_res TEXT, dest_res TEXT, timestamp DATETIME, message TEXT, type TEXT, extra BLOB, FOREIGN KEY(profile_id) REFERENCES profiles(id) ON DELETE CASCADE, FOREIGN KEY(type) REFERENCES message_types(type))",
                 "CREATE TABLE param_gen (category TEXT, name TEXT, value TEXT, PRIMARY KEY (category,name))",
                 "CREATE TABLE param_ind (category TEXT, name TEXT, profile_id INTEGER, value TEXT, PRIMARY KEY (category,name,profile_id), FOREIGN KEY(profile_id) REFERENCES profiles(id) ON DELETE CASCADE)",
                 "CREATE TABLE private_gen (namespace TEXT, key TEXT, value TEXT, PRIMARY KEY (namespace, key))",
@@ -177,18 +177,21 @@
         return d
 
     #History
-    def addToHistory(self, from_jid, to_jid, message, _type='chat', timestamp=None, profile=None):
+    def addToHistory(self, from_jid, to_jid, message, _type='chat', extra=None, timestamp=None, profile=None):
         """Store a new message in history
         @param from_jid: full source JID
         @param to_jid: full dest JID
         @param message: message
         @param _type: message type (see RFC 6121 §5.2.2)
+        @param extra: dictionary (keys and values are unicode) of extra message data
         @param timestamp: timestamp in seconds since epoch, or None to use current time
         """
         assert(profile)
-        d = self.dbpool.runQuery("INSERT INTO history(source, source_res, dest, dest_res, timestamp, message, type, profile_id) VALUES (?,?,?,?,?,?,?,?)",
+        if extra is None:
+            extra = {}
+        d = self.dbpool.runQuery("INSERT INTO history(source, source_res, dest, dest_res, timestamp, message, type, extra, profile_id) VALUES (?,?,?,?,?,?,?,?,?)",
                                  (from_jid.userhost(), from_jid.resource, to_jid.userhost(), to_jid.resource, timestamp or time(),
-                                  message, _type, self.profiles[profile]))
+                                  message, _type, pickle.dumps(extra, 0), self.profiles[profile]))
         d.addErrback(lambda ignore: error(_("Can't save following message in history: from [%(from_jid)s] to [%(to_jid)s] ==> [%(message)s]" %
                                           {"from_jid": from_jid.full(), "to_jid": to_jid.full(), "message": message})))
         return d
@@ -201,25 +204,29 @@
         """
         assert(profile)
 
-        def sqliteToDict(query_result):
+        def sqliteToList(query_result):
             query_result.reverse()
             result = []
             for row in query_result:
-                timestamp, source, source_res, dest, dest_res, message, _type = row
+                timestamp, source, source_res, dest, dest_res, message, type_, extra_raw = row
+                try:
+                    extra = pickle.loads(str(extra_raw or ""))
+                except EOFError:
+                    extra = {}
                 result.append((timestamp, "%s/%s" % (source, source_res) if source_res else source,
                                           "%s/%s" % (dest, dest_res) if dest_res else dest,
-                                          message, _type))
+                                          message, type_, extra))
             return result
 
-        query_parts = ["SELECT timestamp, source, source_res, dest, dest_res, message, type FROM history WHERE profile_id=? AND"]
+        query_parts = ["SELECT timestamp, source, source_res, dest, dest_res, message, type, extra FROM history WHERE profile_id=? AND"]
         values = [self.profiles[profile]]
 
-        def test_jid(_type, _jid):
+        def test_jid(type_, _jid):
             values.append(_jid.userhost())
             if _jid.resource:
                 values.append(_jid.resource)
-                return '(%s=? AND %s_res=?)' % (_type, _type)
-            return '%s=?' % (_type, )
+                return '(%s=? AND %s_res=?)' % (type_, type_)
+            return '%s=?' % (type_, )
 
         if between:
             query_parts.append("(%s OR %s) AND (%s or %s)" % (test_jid('source', from_jid),
@@ -237,7 +244,7 @@
             values.append(limit)
 
         d = self.dbpool.runQuery(" ".join(query_parts), values)
-        return d.addCallback(sqliteToDict)
+        return d.addCallback(sqliteToList)
 
     #Private values
     def loadGenPrivates(self, private_gen, namespace):