diff --git a/upload/config.php b/upload/config.php
index a654d06f2..b167dec7c 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -53,8 +53,8 @@ $bb_cfg = $tr_cfg = $page_cfg = array();
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.2 Beta';
-$bb_cfg['tp_release_state'] = 'R320';
-$bb_cfg['tp_release_date'] = '17-11-2011';
+$bb_cfg['tp_release_state'] = 'R321';
+$bb_cfg['tp_release_date'] = '19-11-2011';
 
 // Database
 $charset  = 'utf8';
diff --git a/upload/memberlist.php b/upload/memberlist.php
index c7847564c..06bdb4058 100644
--- a/upload/memberlist.php
+++ b/upload/memberlist.php
@@ -177,6 +177,8 @@ if ($result = DB()->fetch_rowset($sql))
         {
         	$email_uri = ($bb_cfg['board_email_form']) ? append_sid("profile.php?mode=email&". POST_USERS_URL ."=$user_id") : 'mailto:'. $row['user_email'];
         	$email = '<a class="editable" href="'. $email_uri .'">'. $row['user_email'] .'</a>';
+			$email = ($bb_cfg['text_buttons']) ? '<a class="editable" href="'. $email_uri .'">'. $row['user_email'] .'</a>' : '<a href="' . $email_uri .'"><img src="' . $images['icon_email'] . '" alt="' . $lang['SEND_EMAIL_MSG'] . '" title="' . $lang['SEND_EMAIL_MSG'] . '" border="0" /></a>';
+
         }
         else
         {