Index: branches/RC/core/units/email_queue/email_queue_config.php
===================================================================
diff -u -N
--- branches/RC/core/units/email_queue/email_queue_config.php	(revision 0)
+++ branches/RC/core/units/email_queue/email_queue_config.php	(revision 10842)
@@ -0,0 +1,79 @@
+<?php
+
+	$config = Array (
+		'Prefix' => 'email-queue',
+		'ItemClass' => Array('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+		'ListClass' => Array('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+		'EventHandlerClass' => Array ('class' => 'kDBEventHandler', 'file' => '', 'build_event' => 'OnBuild'),
+		'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
+
+		'AutoLoad' => true,
+
+		'QueryString' => Array (
+			1 => 'id',
+			2 => 'Page',
+			3 => 'event',
+			4 => 'mode',
+		),
+
+		'IDField' => 'EmailQueueId',
+
+		'TableName' => TABLE_PREFIX . 'EmailQueue',
+
+		'TitlePresets' => Array (
+			'email_queue_list' => Array ('prefixes' => Array('email-queue_List'), 'format' => '!la_tab_EmailQueue! (#email-queue_recordcount#)',),
+		),
+
+		'PermSection' => Array ('main' => 'in-portal:email_queue'),
+
+		'Sections' => Array (
+			'in-portal:email_queue' => Array (
+				'parent'		=>	'in-portal:email_folder',
+				'icon'			=>	'in-portal:email_log',
+				'label'			=>	'la_tab_EmailQueue',
+				'url'			=>	Array('t' => 'logs/email_logs/email_queue_list', 'pass' => 'm'),
+				'permissions'	=>	Array ('view', 'delete'),
+				'priority'		=>	2,
+				'type'			=>	stTAB,
+			),
+		),
+
+		'ListSQLs' => Array (
+			'' => '	SELECT %1$s.* %2$s FROM %1$s',
+		),
+
+		'ListSortings' => Array (
+			'' => Array (
+				'Sorting' => Array ('Queued' => 'desc'),
+			)
+		),
+
+		'Fields' => Array (
+			'EmailQueueId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+			'ToEmail' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
+			'Subject' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
+			'MessageHeaders' => Array ('type' => 'string', 'default' => NULL),
+			'MessageBody' => Array ('type' => 'string', 'default' => NULL),
+			'Queued' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0),
+			'SendRetries' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+			'LastSendRetry' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0),
+		),
+
+		'Grids' => Array (
+			'Default' => Array (
+				'Fields' => Array (
+					'EmailQueueId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter',),
+					'ToEmail' => Array ('title' => 'la_prompt_AddressTo', 'filter_block' => 'grid_like_filter', ),
+					'Subject' => Array ('title' => 'la_col_Subject', 'filter_block' => 'grid_like_filter', ),
+					'MessageHeaders' => Array ('title' => 'la_col_MessageHeaders', 'filter_block' => 'grid_like_filter', ),
+					'Queued' => Array ('title' => 'la_col_Queued', 'filter_block' => 'grid_date_range_filter', ),
+					'SendRetries' => Array ('title' => 'la_col_SendRetries', 'filter_block' => 'grid_range_filter', ),
+					'LastSendRetry' => Array ('title' => 'la_col_LastSendRetry', 'filter_block' => 'grid_date_range_filter', ),
+				),
+			),
+		),
+
+		'ConfigMapping' => Array(
+			'PerPage' => 'Perpage_EmailsL',
+		),
+	);
\ No newline at end of file
Index: branches/RC/core/units/logs/email_logs/email_logs_config.php
===================================================================
diff -u -N -r10841 -r10842
--- branches/RC/core/units/logs/email_logs/email_logs_config.php	(.../email_logs_config.php)	(revision 10841)
+++ branches/RC/core/units/logs/email_logs/email_logs_config.php	(.../email_logs_config.php)	(revision 10842)
@@ -27,15 +27,24 @@
 		'PermSection' => Array ('main' => 'in-portal:emaillog'),
 
 		'Sections' => Array (
-			'in-portal:emaillog' => Array (
+			'in-portal:email_folder' => Array (
 				'parent'		=>	'in-portal:reports',
 				'icon'			=>	'in-portal:email_log',
 				'label'			=>	'la_tab_EmailLog',
-				'url'			=>	Array('t' => 'logs/email_logs/email_log_list', 'pass' => 'm'),
-				'permissions'	=>	Array ('view', 'delete'),
+				'permissions'	=>	Array (),
 				'priority'		=>	4,
 				'type'			=>	stTREE,
 			),
+
+			'in-portal:emaillog' => Array (
+				'parent'		=>	'in-portal:email_folder',
+				'icon'			=>	'in-portal:email_log',
+				'label'			=>	'la_tab_EmailLog',
+				'url'			=>	Array('t' => 'logs/email_logs/email_log_list', 'pass' => 'm'),
+				'permissions'	=>	Array ('view', 'delete'),
+				'priority'		=>	1,
+				'type'			=>	stTAB,
+			),
 		),
 
 		'ListSQLs' => Array (
Index: branches/RC/core/admin_templates/logs/email_logs/email_log_tabs.tpl
===================================================================
diff -u -N -r10841 -r10842
--- branches/RC/core/admin_templates/logs/email_logs/email_log_tabs.tpl	(.../email_log_tabs.tpl)	(revision 10841)
+++ branches/RC/core/admin_templates/logs/email_logs/email_log_tabs.tpl	(.../email_log_tabs.tpl)	(revision 10842)
@@ -3,8 +3,7 @@
 		<td align="right" width="100%">
 		  	<table cellpadding="0" cellspacing="0" border="0" height="23">
 				<tr>
-					<inp2:m_RenderElement name="tab_direct" title="la_tab_EmailLog" t="logs/email_logs/email_log_list"/>
-					<inp2:m_RenderElement name="tab_direct" title="la_tab_EmailQueue" t="logs/email_logs/email_queue_list"/>
+					<inp2:adm_ListTabs render_as="tab_direct" section_name="in-portal:email_folder"/>
 				</tr>
 			</table>
 		</td>
Index: branches/RC/core/admin_templates/logs/email_logs/email_queue_list.tpl
===================================================================
diff -u -N
--- branches/RC/core/admin_templates/logs/email_logs/email_queue_list.tpl	(revision 0)
+++ branches/RC/core/admin_templates/logs/email_logs/email_queue_list.tpl	(revision 10842)
@@ -0,0 +1,79 @@
+<inp2:m_include t="incs/header" />
+
+<inp2:m_RenderElement name="combined_header" section="in-portal:email_queue" prefix="email-queue" title_preset="email_queue_list" tabs="logs/email_logs/email_log_tabs" pagination="1"/>
+
+<!-- ToolBar --->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  		<td>
+	  		<table width="100%" cellpadding="0" cellspacing="0">
+	  			<tr>
+	  				<td >
+	  					<script type="text/javascript">
+							a_toolbar = new ToolBar();
+
+
+							function edit()
+							{
+
+							}
+
+							a_toolbar.AddButton(
+								new ToolBarButton(
+									'refresh',
+									'<inp2:m_phrase label="la_ToolTip_Refresh" escape="1"/>',
+									function() {
+										window.location.href = window.location.href;
+									}
+				 				)
+				 			);
+
+				 			a_toolbar.AddButton(
+								new ToolBarButton(
+									'delete',
+									'<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+									function() {
+										std_delete_items('email-queue');
+									}
+				 				)
+				 			);
+
+				 			a_toolbar.AddButton(
+								new ToolBarButton(
+									'in-portal:reset',
+									'<inp2:m_phrase label="la_ToolTip_DeleteAll" escape="1"/>',
+									function() {
+										if (inpConfirm('<inp2:m_Phrase name="la_Delete_Confirm" escape="1"/>')) {
+									  		submit_event('email-queue', 'OnDeleteAll');
+										}
+									}
+				 				)
+				 			);
+
+					  		a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+
+							a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function(id) {
+										show_viewmenu(a_toolbar,'view');
+									}
+							) );
+
+							a_toolbar.Render();
+						</script>
+	  				</td>
+
+	  				<inp2:m_RenderElement name="search_main_toolbar" prefix="email-queue" grid="Default"/>
+	  			</tr>
+	  		</table>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_ParseBlock name="grid" PrefixSpecial="email-queue" IdField="EmailQueueId" grid="Default"/>
+<script type="text/javascript">
+	Grids['email-queue'].SetDependantToolbarButtons( new Array('delete') );
+</script>
+
+<inp2:m_include t="incs/footer"/>