diff --git a/drupal/sites/default/boinc/themes/boinc/css/pages.css b/drupal/sites/default/boinc/themes/boinc/css/pages.css
index 1598abb23e..6a3fb74a2f 100644
--- a/drupal/sites/default/boinc/themes/boinc/css/pages.css
+++ b/drupal/sites/default/boinc/themes/boinc/css/pages.css
@@ -331,6 +331,9 @@ ul.links li a {
   right: 0;
   text-align: right;
 }
+.subscribe .flag-subscriptions {
+  padding-left: .5em;
+}
 
 .toc {
   background-color: transparent;
diff --git a/drupal/sites/default/boinc/themes/boinc/templates/node-forum.tpl.php b/drupal/sites/default/boinc/themes/boinc/templates/node-forum.tpl.php
index abde4a6986..2cc309ba60 100644
--- a/drupal/sites/default/boinc/themes/boinc/templates/node-forum.tpl.php
+++ b/drupal/sites/default/boinc/themes/boinc/templates/node-forum.tpl.php
@@ -99,10 +99,18 @@
       <h2 class="title"><?php print $subtitle; ?></h2>
     </div>
     <div class="subscribe">
-      <?php if ($subscribe_link): ?>
-        <a href="#block-comment_form_block-comment_form">Post new comment</a> |&nbsp;
-        <?php print $subscribe_link; ?>
-      <?php endif; ?>
+      <ul class="links">
+        <?php if (user_access('post comments') AND ($comment==COMMENT_NODE_READ_WRITE)): ?>
+          <li class="first"><a href="#block-comment_form_block-comment_form">Post new comment</a></li>
+          <?php if ($subscribe_link): ?>
+            <li class="last"><?php print $subscribe_link; ?></li>
+          <?php endif; ?>
+        <?php else: ?>
+          <?php if ($subscribe_link): ?>
+            <li class="first"><?php print $subscribe_link; ?></li>
+          <?php endif; ?>
+        <?php endif; ?>
+      </ul>
     </div>
     <div class="clearfix"></div>
   </div>
diff --git a/drupal/sites/default/boinc/themes/boinc/templates/node-team_forum.tpl.php b/drupal/sites/default/boinc/themes/boinc/templates/node-team_forum.tpl.php
index e99db810a6..9c7aedb3e5 100644
--- a/drupal/sites/default/boinc/themes/boinc/templates/node-team_forum.tpl.php
+++ b/drupal/sites/default/boinc/themes/boinc/templates/node-team_forum.tpl.php
@@ -115,10 +115,18 @@
       <h2 class="title"><?php print $subtitle; ?></h2>
     </div>
     <div class="subscribe">
-      <?php if ($subscribe_link): ?>
-        <a href="#block-comment_form_block-comment_form">Post new comment</a> |&nbsp;
-        <?php print $subscribe_link; ?>
-      <?php endif; ?>
+      <ul class="links">
+        <?php if (user_access('post comments') AND ($comment==COMMENT_NODE_READ_WRITE)): ?>
+          <li class="first"><a href="#block-comment_form_block-comment_form">Post new comment</a></li>
+          <?php if ($subscribe_link): ?>
+            <li class="last"><?php print $subscribe_link; ?></li>
+          <?php endif; ?>
+        <?php else: ?>
+          <?php if ($subscribe_link): ?>
+            <li class="first"><?php print $subscribe_link; ?></li>
+          <?php endif; ?>
+        <?php endif; ?>
+      </ul>
     </div>
     <div class="clearfix"></div>
   </div>
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 3f9305fc43..517f4361b5 100644
--- a/drupal/sites/default/boinc/themes/boinc/templates/node.tpl.php
+++ b/drupal/sites/default/boinc/themes/boinc/templates/node.tpl.php
@@ -74,11 +74,20 @@
  */
 ?>
 
-<?php if ($subscribe_link): ?>
-  <div class="subscribe">
-    <?php print $subscribe_link; ?>
-  </div>
-<?php endif; ?>
+<div class="subscribe">
+  <ul class="links">
+    <?php if (user_access('post comments') AND ($comment==COMMENT_NODE_READ_WRITE)): ?>
+      <li class="first"><a href="#block-comment_form_block-comment_form">Post new comment</a></li>
+      <?php if ($subscribe_link): ?>
+        <li class="last"><?php print $subscribe_link; ?></li>
+      <?php endif; ?>
+    <?php else: ?>
+      <?php if ($subscribe_link): ?>
+        <li class="first"><?php print $subscribe_link; ?></li>
+      <?php endif; ?>
+    <?php endif; ?>
+  </ul>
+</div>
 
 <div id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?> clearfix">
   <?php print $user_picture; ?>