Index: heartbeat.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/heartbeat/heartbeat.admin.inc,v
retrieving revision 1.1.2.15.2.20.2.68
diff -u -r1.1.2.15.2.20.2.68 heartbeat.admin.inc
--- heartbeat.admin.inc	5 Jan 2011 12:49:46 -0000	1.1.2.15.2.20.2.68
+++ heartbeat.admin.inc	16 Jan 2011 19:36:56 -0000
@@ -628,8 +628,9 @@
   );
   $options = array(
     0 => t('No more link'),
-    1 => t('Display "full list" link in block display'),
-    2 => t('Display an ajax-driven older messages link')
+    1 => t('Display "full list" link'),
+    2 => t('Display an ajax-driven older messages link'),
+    3 => t('Display an ajax-driven older messages link and a "full list" link')
   );
   $form['fs_settings']['block_show_pager'] = array(
     '#title' => t('Show "older messages" link in block display'),
Index: heartbeat.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/heartbeat/heartbeat.module,v
retrieving revision 1.1.2.26.2.46.2.105
diff -u -r1.1.2.26.2.46.2.105 heartbeat.module
--- heartbeat.module	5 Jan 2011 18:33:49 -0000	1.1.2.26.2.46.2.105
+++ heartbeat.module	16 Jan 2011 19:36:56 -0000
@@ -566,7 +566,7 @@
       '@node_title' => '[node:title-link]',
     ),
   );
-    
+
   $info['heartbeat_add_node'] = array(
     'message' => '!username has added !node_type !node_title.',
     'message_concat' => '!username has added the following !types: %node_title%.',
@@ -672,7 +672,7 @@
       ),
     );
   }
-  
+
   return $info;
 }
 
@@ -1682,8 +1682,7 @@
  */
 function theme_heartbeat_stream_more_link($heartbeatAccess, $offset_time, $page = TRUE, $absolute = FALSE) {
 
-  $ajax_pager = $page ? $heartbeatAccess->getStream()->page_pager_ajax : $heartbeatAccess->getStream()->block_show_pager == 2;
-  $path = 'heartbeat/' . $heartbeatAccess->getAccess();
+  $ajax_pager = $page ? $heartbeatAccess->getStream()->page_pager_ajax : ($heartbeatAccess->getStream()->block_show_pager == 2 || $heartbeatAccess->getStream()->block_show_pager == 3);
   $attributes = array('html' => FALSE, 'attributes' => array('class' => 'heartbeat-older-messages'));
 
   if (isset($_GET['filters'])) {
@@ -1693,12 +1692,11 @@
     $attributes['absolute'] = TRUE;
   }
 
-  // Blocks link to the pages
-  if (!$page && !$ajax_pager) {
-    return '<div class="more fullarchive">' . l(t('Full list'), $path, $attributes) . '</div>';
-  }
-  else {
+  $content = '';
+  $content .= '<div class="heartbeat-more-messages-wrapper">';
+  if ($ajax_pager) {
 
+    $path = 'heartbeat/' . $heartbeatAccess->getAccess();
     $path .= '/' . $offset_time;
 
     // Add a fourth paramter to indicate that where on a profile page.
@@ -1710,13 +1708,25 @@
       $attributes['attributes']['onclick'] = 'javascript:Drupal.heartbeat.getOlderMessages(this, ' . (int)$page . '); return false;';
     }
 
-    $formattedlink = '<span class="heartbeat-more-messages-wrapper">';
-    $formattedlink .= l(t('Older messages'), $path, $attributes);
-    $formattedlink .= '<span class="heartbeat-messages-throbber">&nbsp;</span></span>';
+    $formattedlink = l(t('Older messages'), $path, $attributes) . '<span class="heartbeat-messages-throbber">&nbsp;</span>';
+    $content .= $formattedlink;
+
+  }
 
-    return $formattedlink;
+  // Blocks link to the pages.
+  if (!$page && (!$ajax_pager || $heartbeatAccess->getStream()->block_show_pager == 3)) {
+    $path = 'heartbeat/' . $heartbeatAccess->getAccess();
+    if (isset($attributes['attributes']['onclick'])) {
+      unset($attributes['attributes']['onclick']);
+    }
+    $fulllink = '<div class="more fullarchive heartbeat-full">' . l(t('Full list'), $path, $attributes) . '</div>';
+    $content .= $fulllink;
   }
 
+  $content .= '</div>';
+
+  return $content;
+
 }
 
 /**