diff --git a/contrib/forum/theme.php b/contrib/forum/theme.php
index 8dda9c7b..de3acb15 100644
--- a/contrib/forum/theme.php
+++ b/contrib/forum/theme.php
@@ -112,11 +112,8 @@ class ForumTheme extends Themelet {
 			
             $user = "<a href='".make_link("user/".$post["user_name"]."")."'>".$post["user_name"]."</a>";
 
-            $email = $post["user_email"];
-            $default = "$data_href/themes/$theme_name/images/gravatar.jpg";
-            $size = 50;
-
-            $gravatar = "<img id='gravatar' height='".$size."' width='".$size."' src='http://www.gravatar.com/avatar/".md5(strtolower($email))."?&d=".urlencode($default)."&s=".$size."'>";
+			$poster = User::by_name($post["user_name"]);
+			$gravatar = $poster->get_avatar_html();
 
             $oe = ($n++ % 2 == 0) ? "even" : "odd";
 			
@@ -227,4 +224,4 @@ class ForumTheme extends Themelet {
         return $html;
     }
 }
-?>
\ No newline at end of file
+?>