diff --git a/phpBB/common.php b/phpBB/common.php
index 7b8fd285e6..f3ef262412 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -42,14 +42,14 @@ $images['edit'] = "$url_images/icon_edit.gif";
 $images['search_icon'] = "$url_images/search_icon.gif";
 $images['profile'] = "$url_images/icon_profile.gif";
 $images['privmsg'] = "$url_images/icon_pm.gif";
-$images['email'] = "$url_images/email.gif";
+$images['email'] = "$url_images/icon_email.gif";
 $images['delpost'] = "$url_images/edit.gif";
 $images['ip'] = "$url_images/icon_ip.gif";
 $images['www'] = "$url_images/icon_www.gif";
-$images['icq'] = "$url_images/icq_add.gif";
-$images['aim'] = "$url_images/aim.gif";
-$images['yim'] = "$url_images/yim.gif";
-$images['msnm'] = "$url_images/msnm.gif";
+$images['icq'] = "$url_images/icon_icq_add.gif";
+$images['aim'] = "$url_images/icon_aim.gif";
+$images['yim'] = "$url_images/icon_yim.gif";
+$images['msnm'] = "$url_images/icon_msnm.gif";
 $images['posticon'] = "$url_images/posticon.gif";
 $images['folder'] = "$url_images/folder.gif";
 $images['new_folder'] = "$url_images/red_folder.gif";
@@ -65,9 +65,47 @@ include('includes/functions.'.$phpEx);
 include('includes/db.'.$phpEx);
 
 
+//
 // Obtain and encode users IP
-//$get_user_ip = ;
-$user_ip = encode_ip(($HTTP_X_FORWARDED_FOR) ? $HTTP_X_FORWARDED_FOR : $REMOTE_ADDR);
+//
+if(!empty($HTTP_CLIENT_IP))
+{
+	if(eregi("[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+", $HTTP_PROXY_USER))
+	{
+		$client_ip = $HTTP_CLIENT_IP; 
+	}
+}
+else if(!empty($HTTP_X_FORWADED_FOR))
+{
+	if(strstr(",", $HTTP_X_FORWARDED_FOR))
+	{
+		list($client_ip) = explode(",", $HTTP_X_FORWADED_FOR);
+	}
+	else
+	{
+		$client_ip = $HTTP_X_FORWARDED_FOR;
+	}
+}
+else if(!empty($HTTP_VIA))
+{
+	if(eregi("[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+", $HTTP_PROXY_USER))
+	{
+		$client_ip = $HTTP_VIA;
+	}
+}
+else if(!empty($HTTP_PROXY_USER))
+{
+	if(eregi("[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+", $HTTP_PROXY_USER))
+	{
+		$client_ip = $HTTP_PROXY_USER;
+	}
+}
+else
+{
+	$client_ip = $REMOTE_ADDR;
+}
+$user_ip = encode_ip($client_ip);
+
 
 //
 // Setup forum wide options.
diff --git a/phpBB/images/icon_aim.gif b/phpBB/images/icon_aim.gif
new file mode 100644
index 0000000000..d892a33127
Binary files /dev/null and b/phpBB/images/icon_aim.gif differ
diff --git a/phpBB/images/icon_email.gif b/phpBB/images/icon_email.gif
new file mode 100644
index 0000000000..2ac811b2a5
Binary files /dev/null and b/phpBB/images/icon_email.gif differ
diff --git a/phpBB/images/icon_icq_add.gif b/phpBB/images/icon_icq_add.gif
new file mode 100644
index 0000000000..f28017c5de
Binary files /dev/null and b/phpBB/images/icon_icq_add.gif differ
diff --git a/phpBB/images/icon_msnm.gif b/phpBB/images/icon_msnm.gif
new file mode 100644
index 0000000000..6288b79455
Binary files /dev/null and b/phpBB/images/icon_msnm.gif differ
diff --git a/phpBB/images/icon_yim.gif b/phpBB/images/icon_yim.gif
new file mode 100644
index 0000000000..7aaa9ea753
Binary files /dev/null and b/phpBB/images/icon_yim.gif differ
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 82ddc10785..1d101393f5 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *				 						   viewtopic.php
+ *                               viewtopic.php
  *                            -------------------
  *   begin                : Saturday, Feb 13, 2001
  *   copyright            : (C) 2001 The phpBB Group
@@ -380,7 +380,7 @@ for($i = 0; $i < $total_posts; $i++)
 
 	$aim_img = ($postrow[$i]['user_aim']) ? "<a href=\"aim:goim?screenname=" . $postrow[$i]['user_aim'] . "&message=Hello+Are+you+there?\"><img src=\"" . $images['aim'] . "\" border=\"0\"></a>" : "";
 
-	$msn_img = ($postrow[$i]['user_msnm']) ? "<a href=\"profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id\"><img src=\"" . $images['msn'] . "\" border=\"0\"></a>" : "";
+	$msn_img = ($postrow[$i]['user_msnm']) ? "<a href=\"profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id\"><img src=\"" . $images['msnm'] . "\" border=\"0\"></a>" : "";
 
 	$yim_img = ($postrow[$i]['user_yim']) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $postrow[$i]['user_yim'] . "&.src=pg\"><img src=\"" . $images['yim'] . "\" border=\"0\"></a>" : "";
 	
@@ -394,9 +394,9 @@ for($i = 0; $i < $total_posts; $i++)
 	}
 	$edit_img = "<a href=\"" . $edit_post_url . "\"><img src=\"" . $images['edit'] . "\" alt=\"$l_editdelete\" border=\"0\"></a>";
 
-	$quote_img = "<a href=\"" . append_sid("posting.$phpEx?mode=reply&quote=true&" . POST_POST_URL . "=" . $postrow[$i]['post_id'] . "&" . POST_TOPIC_URL . "=$topic_id&" . POST_FORUM_URL . "=$forum_id") . "\"><img src=\"" . $images['quote'] . "\" alt=\"$l_replyquote\" border=\"0\"></a>";
+	$quote_img = "<a href=\"" . append_sid("posting.$phpEx?mode=quote&" . POST_POST_URL . "=" . $postrow[$i]['post_id'] . "&" . POST_TOPIC_URL . "=$topic_id&" . POST_FORUM_URL . "=$forum_id") . "\"><img src=\"" . $images['quote'] . "\" alt=\"$l_replyquote\" border=\"0\"></a>";
 
-	if($is_auth['auth_mod'])
+	if($is_auth['auth_mod'] || $userdata['user_level'] == ADMIN)
 	{
 		$ip_img = "<a href=\"" . append_sid("topicadmin.$phpEx?mode=viewip&" . POST_USERS_URL . "=" . $poster_id) . "\"><img src=\"" . $images['ip'] . "\" alt=\"$l_viewip\" border=\"0\"></a>";