Index: irc/reader.css
===================================================================
--- irc/reader.css	(revision 18638)
+++ irc/reader.css	(working copy)
@@ -66,6 +66,7 @@
 .regular {
   text-align: right;
   background: transparent url(/rockbox16.png) no-repeat;
+  padding-left: 20px;
 }
 
 a[target="_blank"] {
Index: irc/reader.pl
===================================================================
--- irc/reader.pl	(revision 18638)
+++ irc/reader.pl	(working copy)
@@ -306,8 +306,8 @@
             $message =~ s!FS *\#(\d+)!<a target="_blank" href=\"http://www.rockbox.org/tracker/task/$1\">FS \#$1</a>!g;
 
 
-            # tag svn revisions
-            $message =~ s!(\b)r(\d+)(\b)!$1<a target="_blank" href=\"http://svn.rockbox.org/viewvc.cgi?view=rev&revision=$2\">r$2</a>$3!g;
+            # tag svn revisions (they normally start with a blank. avoids bricking urls with &r[0-9] in them)
+            $message =~ s!(\b)\sr(\d+)(\b)!$1 <a target="_blank" href=\"http://svn.rockbox.org/viewvc.cgi?view=rev&revision=$2\">r$2</a>$3!g;
 
             # break long lines. max 60 chars
             if (0 and $message =~ /([^ ]{60,})/) {
@@ -331,7 +331,19 @@
                     $message =~ s|\b\Q$nick\E\b|<span class=nick_$nick>$nick</span>|g;
                 }
             }
+            
+            # get rid of nick-highlightning in hrefs
+            if ($message =~ /href=\"([^\"]+)/) {
+                my $url = $1;
+                my $broken_url = $url;
 
+                if ($url =~ /<span class=nick_([^>]+)/) {
+                    my $nick = $1;
+                    $url =~ s|<span class=nick_$nick>$nick</span>|$nick|g;
+                }
+                $message =~ s|$broken_url|$url|g;
+            }
+
             my $class = "nick";
             my $realnick = $nick;
             if (defined $regular{lc $nick}) {
Index: irc/reader.js
===================================================================
--- irc/reader.js	(revision 18638)
+++ irc/reader.js	(working copy)
@@ -83,8 +83,12 @@
 
     if (getCookie('showseconds') == 'none')
         secondStyle.display = 'none';
+    else
+    	secondStyle.display = '';
     if (getCookie('showjoins') == 'none')
         joinStyle.display = 'none';
+    else
+    	joinStyle.display = '';
 }
 
 function scroll_to_bottom()