diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js
index fb539b8be..c7e6f4cf0 100644
--- a/modules/admin/tpl/js/admin.js
+++ b/modules/admin/tpl/js/admin.js
@@ -99,6 +99,8 @@ jQuery(function($){
 	// pagination
 	$.fn.xePagination = function(){
 		this
+			.not('.xe-pagination')
+			.addClass('xe-pagination')
 			.find('span.tgContent').css('whiteSpace', 'nowrap').end()
 			.find('a.tgAnchor')
 				.each(function(idx){
@@ -151,6 +153,30 @@ jQuery(function($){
 						// Display all sections then hide this button
 						$(this).hide().parent().prevAll('.section').show();
 					});
+
+	$.fn.xeMask = function(){
+		this
+			.each(function(){
+				var $this = $(this), text = $this.text();
+				var reg_mail = /^([\w\-\.]+?)@(([\w-]+\.)+[a-z]{2,})$/ig;
+				$this.data('originalText', text);
+
+				if(reg_mail.test(text)) {
+					$this.data('maskedText', RegExp.$1+'...');
+				}
+
+				$this.text( $this.data('maskedText') );
+			})
+			.mouseover(function(){
+				$(this).text( $(this).data('originalText') );
+			})
+			.mouseout(function(){
+				$(this).text( $(this).data('maskedText') );
+			})
+			.focus(function(){ $(this).mouseover(); })
+			.blur(function(){ $(this).mouseout(); });
+	};
+	$('.masked').xeMask();
 });
 
 // Modal Window
diff --git a/modules/member/tpl/member_list.html b/modules/member/tpl/member_list.html
index 917ea9d56..64159b9c0 100644
--- a/modules/member/tpl/member_list.html
+++ b/modules/member/tpl/member_list.html
@@ -60,7 +60,7 @@
                     <tr loop="$member_list=>$no,$member_info">
 {@$member_info = get_object_vars($member_info)}
                         <td>
-                            <span class="member_{$member_info['member_srl']}">{getEncodeEmailAddress($member_info['email_address'])}</span>
+                            <span class="member_{$member_info['member_srl']} masked">{getEncodeEmailAddress($member_info['email_address'])}</span>
                         </td>
                         {@ $member_info['group_list'] = implode(', ', $member_info['group_list'])}
                         <td loop="$usedIdentifiers=>$name,$title">{$member_info[$name]}</td>