diff --git a/workbench_moderation.module b/workbench_moderation.module
index 3370981..51d429d 100644
--- a/workbench_moderation.module
+++ b/workbench_moderation.module
@@ -1765,11 +1765,11 @@ function workbench_moderation_messages($context, $node = NULL) {
   $info_block_messages = array();
 
   if ($context == 'view') {
-    $info_block_messages[] = array(
+    $info_block_messages['state-' . $node->nid] = array(
       'label' => t('Revision state'),
       'message' => check_plain(workbench_moderation_state_label($state['my_revision']->state)),
     );
-    $info_block_messages[] = array(
+    $info_block_messages['draft-' . $node->nid] = array(
       'label' => t('Current draft'),
       'message' => !empty($revision_current) ? t('Yes') : t('No'),
     );
@@ -1780,7 +1780,7 @@ function workbench_moderation_messages($context, $node = NULL) {
     // Add a moderation form.
     if ($revision_current && !$revision_published && _workbench_moderation_access('update', $node) && $moderate_form = drupal_get_form('workbench_moderation_moderate_form', $node, "node/{$node->nid}/current-revision")) {
       if ($moderate_form = drupal_render($moderate_form)) {
-        $info_block_messages[] = array(
+        $info_block_messages['set-' . $node->nid] = array(
           'label' => t('Set moderation state'),
           'message' => $moderate_form,
         );
@@ -1790,7 +1790,7 @@ function workbench_moderation_messages($context, $node = NULL) {
     // Add an unpublish link.
     $next_states = workbench_moderation_states_next(workbench_moderation_state_published(), $user, $node);
     if ($revision_published && !empty($next_states) && $link = workbench_moderation_access_link(t('Unpublish this revision'), "node/{$node->nid}/moderation/{$node->vid}/unpublish")) {
-      $info_block_messages[] = array(
+      $info_block_messages['actions-' . $node->nid] = array(
         'label' => t('Actions'),
         'message' => $link,
       );
@@ -1828,7 +1828,7 @@ function workbench_moderation_messages($context, $node = NULL) {
 
       // Post the links in a non-repeating message.
       if (!empty($links)) {
-        $info_block_messages[] = array(
+        $info_block_messages['view-' . $node->nid] = array(
           'label' => t('View'),
           'message' => implode(', ', $links),
         );
@@ -1838,18 +1838,18 @@ function workbench_moderation_messages($context, $node = NULL) {
   // @TODO: Clean these up.
   elseif ($context == 'edit') {
     if ($node_published && $revision_published) {
-      $info_block_messages[] = array(
+      $info_block_messages['status-' . $node->nid] = array(
         'label' => t('Status'),
         'message' => t('New draft of live content.'),
       );
     }
     elseif ($node_published && !$revision_published) {
-      $info_block_messages[] = array(
+      $info_block_messages['status-' . $node->nid] = array(
         'label' => t('Status'),
         'message' => t('New draft from current revision'),
       );
       $link = workbench_moderation_access_link(t('Create a new draft from the published revision.'), "node/{$node->nid}/revisions/{$state['published']->vid}/revert");
-      $info_block_messages[] = array(
+      $info_block_messages['action-' . $node->nid] = array(
         'label' => t('Actions'),
         'message' => $link,
       );