diff --git a/upload/config.php b/upload/config.php
index 5a9e96a9b..3cf050d6a 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -53,7 +53,7 @@ $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'] = 'R322';
+$bb_cfg['tp_release_state'] = 'R323';
 $bb_cfg['tp_release_date'] = '19-11-2011';
 
 // Database
@@ -411,7 +411,7 @@ $bb_cfg['show_poster_joined'] = true;
 $bb_cfg['show_poster_posts']  = true;
 $bb_cfg['show_poster_from']   = true;
 $bb_cfg['show_bot_nick']      = false;
-$bb_cfg['text_buttons']       = true;              // replace EDIT, QUOTE... images with text links
+$bb_cfg['text_buttons']       = false;              // replace EDIT, QUOTE... images with text links
 $bb_cfg['parse_ed2k_links']   = true;              // make ed2k links clickable
 $bb_cfg['post_date_format']   = 'd-M-Y H:i';
 $bb_cfg['ext_link_new_win']   = true;              // open external links in new window
diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php
index dd1a5632f..cdf32e139 100644
--- a/upload/language/lang_english/lang_main.php
+++ b/upload/language/lang_english/lang_main.php
@@ -598,7 +598,7 @@ $lang['DATE_FORMAT_EXPLAIN'] = 'The syntax used is identical to the PHP <a href=
 $lang['SIGNATURE'] = 'Signature';
 $lang['SIGNATURE_EXPLAIN'] = 'This is a block of text that can be added to posts you make. There is a %d character limit';
 $lang['SIGNATURE_DISABLE'] = 'Signed off for violation of forum rules';
-$lang['PUBLIC_VIEW_EMAIL'] = 'Always show my e-mail address';
+$lang['PUBLIC_VIEW_EMAIL'] = 'Show e-mail address in your profile';
 
 $lang['EMAIL_EXPLAIN'] = 'At this address you will be sent to complete the registration';
 
diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php
index c08d68264..69e4cb7e5 100644
--- a/upload/language/lang_russian/lang_main.php
+++ b/upload/language/lang_russian/lang_main.php
@@ -604,7 +604,7 @@ $lang['DATE_FORMAT_EXPLAIN'] = 'Синтаксис идентичен функц
 $lang['SIGNATURE'] = 'Подпись';
 $lang['SIGNATURE_EXPLAIN'] = 'Это текст, который можно добавлять к размещаемым вами сообщениям. Длина его ограничена %d символами.';
 $lang['SIGNATURE_DISABLE'] = 'Подпись отключена за нарушение правил форума';
-$lang['PUBLIC_VIEW_EMAIL'] = 'Всегда показывать мой адрес e-mail';
+$lang['PUBLIC_VIEW_EMAIL'] = 'Показывать адрес e-mail в профиле';
 
 $lang['EMAIL_EXPLAIN'] = 'На этот адрес вам будет отправлено письмо для завершения регистрации';
 
diff --git a/upload/memberlist.php b/upload/memberlist.php
index c00b77e5c..a0c551d62 100644
--- a/upload/memberlist.php
+++ b/upload/memberlist.php
@@ -176,7 +176,8 @@ if ($result = DB()->fetch_rowset($sql))
         if (bf($row['user_opt'], 'user_opt', 'viewemail') || IS_AM)
         {
         	$email_uri = ($bb_cfg['board_email_form']) ? append_sid("profile.php?mode=email&amp;". POST_USERS_URL ."=$user_id") : 'mailto:'. $row['user_email'];
-			$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>';
+			$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
diff --git a/upload/templates/default/memberlist.tpl b/upload/templates/default/memberlist.tpl
index a9f435e86..016bb8c28 100644
--- a/upload/templates/default/memberlist.tpl
+++ b/upload/templates/default/memberlist.tpl
@@ -22,7 +22,7 @@
 	<th class="{sorter: 'digit'}" ><b class="tbs-text">#</b></th>
 	<th class="{sorter: 'text'}" ><b class="tbs-text">{L_USERNAME}</b></th>
 	<th class="{sorter: false}" ><b class="tbs-text">{L_PM}</b></th>
-	<th class="{sorter: 'text'}" ><b class="tbs-text">{L_EMAIL}</b></th>
+	<!-- IF IS_ADMIN --><th class="{sorter: 'text'}" ><b class="tbs-text">{L_EMAIL}</b></th><!-- ENDIF -->
 	<th class="{sorter: 'text'}" ><b class="tbs-text">{L_LOCATION}</b></th>
 	<th class="{sorter: 'digit'}" ><b class="tbs-text">{L_JOINED}</b></th>
 	<th class="{sorter: 'digit'}" ><b class="tbs-text">{L_POSTS_SHORT}</b></th>
@@ -39,7 +39,7 @@
 	<td>{memberrow.ROW_NUMBER}</td>
 	<td><b>{memberrow.USER}</b></td>
 	<td>{memberrow.PM}</td>
-	<td>{memberrow.EMAIL}</td>
+	<!-- IF IS_ADMIN --><td>{memberrow.EMAIL}</td><!-- ENDIF -->
 	<td>{memberrow.FROM}</td>
 	<td class="small">
 		<u>{memberrow.JOINED_RAW}</u>