Index: /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/form_display.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/form_display.pt	(revision 6322)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/form_display.pt	(revision 6323)
@@ -5,5 +5,5 @@
 <h2> ... <span tal:replace="view/getApplicationState">Application State</span> ... </h2>
 
-<div class="workflow" tal:content="structure context/messages">Application Workflow</div>
+<div class="workflow" tal:content="structure context/msgs">Application Workflow</div>
 
 <table class="zebra">
Index: /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/form_edit.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/form_edit.pt	(revision 6322)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/form_edit.pt	(revision 6323)
@@ -8,5 +8,5 @@
   <h2> ... <span tal:replace="view/getApplicationState">Application State</span> ... </h2>
 
-  <div class="workflow" tal:content="structure context/messages">Application Workflow</div>
+  <div class="workflow" tal:content="structure context/msgs">Application Workflow</div>
 
   
Index: /main/waeup.sirp/trunk/src/waeup/sirp/applicants/interfaces.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/applicants/interfaces.py	(revision 6322)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/applicants/interfaces.py	(revision 6323)
@@ -283,5 +283,5 @@
     state, depending on use-case.
     """
-    messages = Attribute('Workflow transitions with date of transition.')
+    msgs = Attribute('Workflow transitions with date of transition.')
 
     reg_no = schema.TextLine(
Index: /main/waeup.sirp/trunk/src/waeup/sirp/applicants/workflow.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/applicants/workflow.py	(revision 6322)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/applicants/workflow.py	(revision 6323)
@@ -172,14 +172,8 @@
     """
     timestamp = datetime.now().strftime("%d/%m/%Y %H:%M:%S")
-    # XXX: `messages` is meta data which shouldn't really be part of
-    #      the Applicant class. Furthermore we should not store HTML
-    #      code but simple messages. This has to be cleaned up
-    #      further. For now we replace the redundant code in browser
-    #      mod.  As we're here: one could use permissions and similar
-    #      to finetune transitions instead of doing that manually in
-    #      UI stuff.
+    # XXX: We should not store HTML code but simple messages.
     msg = '%s - %s (new state: %s)' % (
         timestamp, event.transition.user_data['msg'], event.destination)
-    msgs = getattr(obj, 'messages', None)
+    msgs = getattr(obj, 'msgs', None)
     if msgs:
         msgs += '<br />'
@@ -187,4 +181,4 @@
     else:
         msgs = msg
-    obj.messages = msgs
+    obj.msgs = msgs
     return
