diff --git a/twitter.module b/twitter.module
index ba4cce8..ec48e34 100644
--- a/twitter.module
+++ b/twitter.module
@@ -277,15 +277,16 @@ function _twitter_filter_hashtag($text, $filter) {
  * actual links.
  */
 function _twitter_filter_text($text, $prefix, $destination) {
+  $class = ($prefix == '@') ? 'twitter-atreply' : 'twitter-hashtag';
   $matches = array(
     '/\>' . $prefix . '(\w+)/ui',
     '/^' . $prefix . '(\w+)/ui',
     '/(\s+)' . $prefix . '(\w+)/ui',
   );
   $replacements = array(
-    '><a href="' . $destination . '${1}">' . $prefix . '${1}</a>',
-    '<a href="' . $destination . '${1}">' . $prefix . '${1}</a>',
-    '${1}<a href="' . $destination . '${2}">' . $prefix . '${2}</a>',
+    '><a href="' . $destination . '${1}" class="' . $class . '">' . $prefix . '${1}</a>',
+    '<a href="' . $destination . '${1}" class="' . $class . '">' . $prefix . '${1}</a>',
+    '${1}<a href="' . $destination . '${2}" class="' . $class . '">' . $prefix . '${2}</a>',
   );
   return preg_replace($matches, $replacements, $text);
 }
@@ -294,7 +295,7 @@ function _twitter_filter_text($text, $prefix, $destination) {
  * Callback for twitter link converter.
  */
 function _twitter_filter_link($text, $filter) {
-  return str_replace("<a ", '<a target="_blank" rel="nofollow" ', $text);
+  return str_replace("<a ", '<a target="_blank" rel="nofollow" class="twitter-timeline-link"', $text);
 }
 
 /**