Index: branches/RC/core/admin_templates/users/users_list.tpl
===================================================================
diff -u -N -r11205 -r11319
--- branches/RC/core/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 11205)
+++ branches/RC/core/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 11319)
@@ -55,14 +55,28 @@
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
-				<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
+				/*<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
 					<inp2:m_if check="m_Recall" name="user_id" equals_to="-1">
 						a_toolbar.AddButton( new ToolBarButton('e-mail', '<inp2:m_phrase label="la_ToolTip_SendMail" escape="1"/>', function() {
 									set_hidden_field('remove_specials[u.regular]', 1);
 									openSelector('emailmessages', '<inp2:m_Link template="emails/mass_mail"/>', 'UserEmail', null, 'OnPrepareMassRecipients');
 								}
 						 ) );
 					</inp2:m_if>
+				</inp2:m_if>*/
+
+				<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
+					a_toolbar.AddButton(
+						new ToolBarButton(
+							'e-mail',
+							'<inp2:m_phrase label="la_ToolTip_SendMail" escape="1"/>',
+							function() {
+								Application.SetVar('remove_specials[u.regular]', 1);
+								Application.SetVar('mailing_recipient_type', 'u');
+								openSelector('mailing-list', '<inp2:m_Link template="mailing_lists/mailing_list_edit"/>', 'UserEmail', null, 'OnNew');
+							}
+						)
+					);
 				</inp2:m_if>
 
 				a_toolbar.AddButton( new ToolBarButton('export', '<inp2:m_phrase label="la_ToolTip_Export" escape="1"/>', function() {