diff --git a/product/CMFActivity/Activity/SQLBase.py b/product/CMFActivity/Activity/SQLBase.py
index dc12c0bd5f0e28e7a1fc70b2ce5f7495339097b5..2d2a840787509e0755bad454c19f38d110b6892a 100644
--- a/product/CMFActivity/Activity/SQLBase.py
+++ b/product/CMFActivity/Activity/SQLBase.py
@@ -48,12 +48,14 @@ class SQLBase:
   def getMessageList(self, activity_tool, processing_node=None,
                      include_processing=0, **kw):
     # YO: reading all lines might cause a deadlock
+    class_name = self.__class__.__name__
     readMessageList = getattr(activity_tool,
-                              self.__class__.__name__ + '_readMessageList',
+                              class_name + '_readMessageList',
                               None)
     if readMessageList is None:
       return []
     return [self.loadMessage(line.message,
+                             activity=class_name,
                              uid=line.uid,
                              processing_node=line.processing_node,
                              priority=line.priority,
diff --git a/product/CMFActivity/dtml/manageActivities.dtml b/product/CMFActivity/dtml/manageActivities.dtml
index 67be1f9f92439bdd54c3da17fa3cb3661ff356b1..06c37dfbd8933365d0e83faf33daaf60e84a0f5e 100644
--- a/product/CMFActivity/dtml/manageActivities.dtml
+++ b/product/CMFActivity/dtml/manageActivities.dtml
@@ -62,7 +62,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
             <a href="manageInvoke?object_path=&dtml-path;&amp;method_id=&dtml-method_id;">Invoke</a>
           </td>
         </dtml-if>
-        <td align="left" valign="top"><dtml-var uid></td>
+        <td align="left" valign="top"><dtml-var uid>
+          <dtml-var expr="{'SQLDict':'(dict)','SQLQueue':'(queue)'}[activity]">
+        </td>
         <td align="left" valign="top"><a href="&dtml-path;"><dtml-var path></a></td>
         <td align="left" valign="top"><dtml-var method_id></td>
         <td align="left" valign="top">