diff --git a/drupal/sites/default/boinc/themes/boinc/template.php b/drupal/sites/default/boinc/themes/boinc/template.php
index c624cc8705..a0e4847bfe 100644
--- a/drupal/sites/default/boinc/themes/boinc/template.php
+++ b/drupal/sites/default/boinc/themes/boinc/template.php
@@ -218,6 +218,12 @@ function boinc_preprocess_page(&$vars, $hook) {
 function boinc_preprocess_node(&$vars, $hook) {
   
   //$vars['sample_variable'] = t('Lorem ipsum.');
+  
+  // Detach subscribe link from the Links list
+  if (!empty($vars['node']->links['flag-subscriptions']['title'])) {
+    $vars['subscribe_link'] = $vars['node']->links['flag-subscriptions']['title'];
+    unset($vars['node']->links['flag-subscriptions']);
+  }
 
   // Optionally, run node-type-specific preprocess functions, like
   // boinc_preprocess_node_page() or boinc_preprocess_node_story().
@@ -257,10 +263,6 @@ function boinc_preprocess_node_forum(&$vars, $hook) {
   // Get the author of the node
   $account = user_load($vars['uid']);
   
-  // Detach subscribe link from the Links list
-  $vars['subscribe_link'] = $vars['node']->links['flag-subscriptions']['title'];
-  unset($vars['node']->links['flag-subscriptions']);
-  
   // Add topic moderator controls
   if (user_access('edit any forum topic')) {
     $vars['moderator_links'] = array();
diff --git a/drupal/sites/default/boinc/themes/boinc/templates/node.tpl.php b/drupal/sites/default/boinc/themes/boinc/templates/node.tpl.php
index 398e39b6f7..e133da9ff3 100644
--- a/drupal/sites/default/boinc/themes/boinc/templates/node.tpl.php
+++ b/drupal/sites/default/boinc/themes/boinc/templates/node.tpl.php
@@ -73,6 +73,13 @@
  * @see zen_process()
  */
 ?>
+
+<?php if ($subscribe_link): ?>
+  <div class="subscribe">
+    <?php print $subscribe_link; ?>
+  </div>
+<?php endif; ?>
+
 <div id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?> clearfix">
   <?php print $user_picture; ?>