diff --git a/drupal/sites/default/boinc/themes/boinc/css/pages.css b/drupal/sites/default/boinc/themes/boinc/css/pages.css
index a9b605dc4a..6a3fb74a2f 100644
--- a/drupal/sites/default/boinc/themes/boinc/css/pages.css
+++ b/drupal/sites/default/boinc/themes/boinc/css/pages.css
@@ -332,8 +332,6 @@ ul.links li a {
   text-align: right;
 }
 .subscribe .flag-subscriptions {
-  border-left: 1px solid #808080;
-  margin-left: .1em;
   padding-left: .5em;
 }
 
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 14122cd863..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,12 +99,18 @@
       <h2 class="title"><?php print $subtitle; ?></h2>
     </div>
     <div class="subscribe">
-      <?php if (user_access('post comments')): ?>
-        <a href="#block-comment_form_block-comment_form">Post new comment</a>
-      <?php endif; ?>
-      <?php if ($subscribe_link): ?>
-        <?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 b235cc8bfa..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,12 +115,18 @@
       <h2 class="title"><?php print $subtitle; ?></h2>
     </div>
     <div class="subscribe">
-      <?php if (user_access('post comments')): ?>
-        <a href="#block-comment_form_block-comment_form">Post new comment</a>
-      <?php endif; ?>
-      <?php if ($subscribe_link): ?>
-        <?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 a5ccb62f5e..517f4361b5 100644
--- a/drupal/sites/default/boinc/themes/boinc/templates/node.tpl.php
+++ b/drupal/sites/default/boinc/themes/boinc/templates/node.tpl.php
@@ -75,12 +75,18 @@
 ?>
 
 <div class="subscribe">
-  <?php if (user_access('post comments')): ?>
-    <a href="#block-comment_form_block-comment_form">Post new comment</a>
-  <?php endif; ?>
-  <?php if ($subscribe_link): ?>
-    <?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 id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?> clearfix">