Index: /main/waeup.sirp/trunk/src/waeup/sirp/objecthistory.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/objecthistory.py	(revision 6467)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/objecthistory.py	(revision 6468)
@@ -21,13 +21,19 @@
 ##
 import grok
+from datetime import datetime
 from persistent.list import PersistentList
 from zope.annotation.interfaces import IAnnotations
 from waeup.sirp.interfaces import IObjectHistory, IWAeUPObject
+from waeup.sirp.utils.helpers import get_current_principal
 
 class ObjectHistory(grok.Adapter):
     """A history for objects.
+
+    For any object implementing `IWAeUPObject` which is annotatable,
+    we provide histories. A history for such an object can be obtained
+    by adapting it to `IObjectHistory`.
     """
     grok.context(IWAeUPObject)
-    grok.provides(IObjectHistory)
+    grok.implements(IObjectHistory)
 
     history_key = 'waeup.history'
@@ -43,8 +49,22 @@
     @property
     def messages(self):
+        """Get all messages as a persistent list of strings.
+        """
         return self._getMessages()
 
     def addMessage(self, msg):
+        """Add the message (history entry) in msg.
+
+        Any message will be stored with a timestamp and the current
+        user (principal).
+        """
         msgs = self._getMessages()
+        timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        user = get_current_principal()
+        if user is None:
+            user = 'system'
+        else:
+            user = '%s (%s)' % (user.id, user.title)
+        msg = '%s - %s - %s' % (timestamp, user, msg)
         msgs.append(msg)
         self._annotations[self.history_key] = msgs
