diff --git a/modules/commons/commons_follow/commons_follow_ui/commons_follow_ui.module b/modules/commons/commons_follow/commons_follow_ui/commons_follow_ui.module
index c4b5e1e9c2639bdbe0d4082f0b6e9bb83316c851..3e7507bed2c14341f46bc02232d05393051bfcf9 100644
--- a/modules/commons/commons_follow/commons_follow_ui/commons_follow_ui.module
+++ b/modules/commons/commons_follow/commons_follow_ui/commons_follow_ui.module
@@ -110,7 +110,7 @@ function commons_follow_message_subscribe_email_setting_submit($form, &$form_sta
  * Generates the QuickTab title for the subscription UI.
  * Replaces message_subscribe_tab_title().
  */
-function commons_follow_ui_tab_title($account, $flag_name = NULL) {
+function commons_follow_ui_tab_title($account, $flag_name = NULL, $count = 0) {
   global $user;
 
   if (!$flag_name) {
@@ -121,7 +121,6 @@ function commons_follow_ui_tab_title($account, $flag_name = NULL) {
   $flag = flag_get_flag($flag_name);
   $flaggings = flag_get_user_flags($flag->content_type, NULL, $account->uid);
 
-  $count = !empty($flaggings[$flag_name]) ? count($flaggings[$flag_name]) : 0;
   $params = array(
     '@flag' => $flag->get_title(),
     '@count' => $count,
@@ -130,16 +129,27 @@ function commons_follow_ui_tab_title($account, $flag_name = NULL) {
   return $account->uid == $user->uid ? t('@flag you follow <span class="user-follow-count">@count</span>', $params) : t('@flag @name follows <span class="user-follow-count">@count</span>', $params);
 }
 
-
+/*
+ * Generates the Quicktab content for the subscription UI
+ */
 function commons_follow_ui_generate_tabs($account) {
   $tabs = array();
   foreach (array_keys(message_subscribe_flag_get_flags()) as $flag_name) {
+    $view = message_subscribe_ui_get_view($account, $flag_name);
+    $view->get_total_rows = TRUE;
+    $preview = $view->preview();
+
     $tabs[$flag_name] = array(
-      'title' => commons_follow_ui_tab_title($account, $flag_name),
-      'contents' => array('#markup' => message_subscribe_ui_tab($account, $flag_name)),
+      'title' => commons_follow_ui_tab_title($account, $flag_name, $view->total_rows),
+      'contents' => array('#markup' => $preview),
     );
   }
-  $settings = array('style' => 'Commons Tabs', 'ajax' => FALSE, 'html' => TRUE, 'title' => 'test', 'default_tab' => 'commons_follow_group');
+  $settings = array(
+    'style' => 'Commons Tabs',
+    'ajax' => FALSE, 'html' => TRUE,
+    'title' => 'test',
+    'default_tab' => 'commons_follow_group',
+  );
   $built_tabs = quicktabs_build_quicktabs('commons_follow_ui', $settings, $tabs);
   return $built_tabs;
-}
\ No newline at end of file
+}