Index: branches/RC/core/admin_templates/users/users_edit_groups.tpl
===================================================================
diff -u -r11143 -r11166
--- branches/RC/core/admin_templates/users/users_edit_groups.tpl	(.../users_edit_groups.tpl)	(revision 11143)
+++ branches/RC/core/admin_templates/users/users_edit_groups.tpl	(.../users_edit_groups.tpl)	(revision 11166)
@@ -42,7 +42,7 @@
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
-				a_toolbar.AddButton( new ToolBarButton('in-portal:usertogroup', '<inp2:m_phrase label="la_ToolTip_AddToGroup" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+				a_toolbar.AddButton( new ToolBarButton('usertogroup', '<inp2:m_phrase label="la_ToolTip_AddToGroup" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 						function() {
 							openSelector('u-ug', '<inp2:m_Link t="users/group_selector" pass="m,u"/>', 'GroupId', '800x600');
 						} ) );
@@ -53,7 +53,7 @@
 							std_delete_items('u-ug');
 						} ) );
 
-				a_toolbar.AddButton( new ToolBarButton('in-portal:primary_group', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>',
+				a_toolbar.AddButton( new ToolBarButton('primary_group', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>',
 						function() {
 							submit_event('u-ug','OnSetPrimary');
 						} ) );
Index: branches/RC/core/admin_templates/users/users_list.tpl
===================================================================
diff -u -r11147 -r11166
--- branches/RC/core/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 11147)
+++ branches/RC/core/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 11166)
@@ -30,7 +30,7 @@
 
 				/*a_toolbar.AddButton (
 					new ToolBarButton(
-						'in-portal:primary_user_group',
+						'primary_user_group',
 						'<inp2:m_phrase label="la_ToolTip_PrimaryGroup" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_SetPrimary" escape="1"/>',
 						function() {
 							openSelector('u.regular', '<inp2:m_Link t="users/group_selector" pass="m,u"/>', 'PrimaryGroupId', '800x600', 'OnSaveSelected');
@@ -55,13 +55,15 @@
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
-				/*<inp2:m_if check="m_Recall" name="user_id" equals_to="-1">
-					a_toolbar.AddButton( new ToolBarButton('in-portal: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 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>
 
 				a_toolbar.AddButton( new ToolBarButton('export', '<inp2:m_phrase label="la_ToolTip_Export" escape="1"/>', function() {
 							set_hidden_field('remove_specials[u.regular]', 1);
Index: branches/RC/core/admin_templates/reviews/reviews.tpl
===================================================================
diff -u -r11099 -r11166
--- branches/RC/core/admin_templates/reviews/reviews.tpl	(.../reviews.tpl)	(revision 11099)
+++ branches/RC/core/admin_templates/reviews/reviews.tpl	(.../reviews.tpl)	(revision 11166)
@@ -52,7 +52,7 @@
 						} ) );
 
 
-					<inp2:m_ModuleInclude template="catalog_buttons" main_template="reviews" skip_prefixes="m,cms"/>
+					<inp2:m_ModuleInclude template="catalog_buttons" main_template="reviews" skip_prefixes="m,adm,cms"/>
 
 					a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
@@ -121,12 +121,12 @@
 				</table>
 			</td>
 		</inp2:m_DefineElement>
-		<inp2:adm_ListCatalogTabs render_as="item_tab" title_property="ViewMenuPhrase" skip_prefixes="m,cms"/>
+		<inp2:adm_ListCatalogTabs render_as="item_tab" title_property="ViewMenuPhrase" skip_prefixes="m,adm,cms"/>
 	</tr>
 </table>
 <!-- item tabs: end -->
 <inp2:m_set prefix_append="-rev" td="no"/>
-<inp2:m_ModuleInclude template="catalog_tab" tab_init="2" skip_prefixes="m,cms"/>
+<inp2:m_ModuleInclude template="catalog_tab" tab_init="2" skip_prefixes="m,adm,cms"/>
 
 <inp2:m_if check="m_get" var="SetTab">
 <script type="text/javascript">