Index: branches/RC/core/units/email_queue/email_queue_config.php
===================================================================
diff -u -r10842 -r10843
--- branches/RC/core/units/email_queue/email_queue_config.php	(.../email_queue_config.php)	(revision 10842)
+++ branches/RC/core/units/email_queue/email_queue_config.php	(.../email_queue_config.php)	(revision 10843)
@@ -5,7 +5,7 @@
 		'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'),
+		'TagProcessorClass' => Array ('class' => 'EmailQueueTagProcessor', 'file' => 'email_queue_tp.php', 'build_event' => 'OnBuild'),
 
 		'AutoLoad' => true,
 
@@ -61,11 +61,12 @@
 
 		'Grids' => Array (
 			'Default' => Array (
+				'Icons' => Array ('default' => 'icon16_custom.gif'),
 				'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', ),
+					'MessageHeaders' => Array ('title' => 'la_col_MessageHeaders', 'data_block' => 'grid_headers_td', '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', ),
Index: branches/RC/core/units/logs/email_logs/email_logs_config.php
===================================================================
diff -u -r10842 -r10843
--- branches/RC/core/units/logs/email_logs/email_logs_config.php	(.../email_logs_config.php)	(revision 10842)
+++ branches/RC/core/units/logs/email_logs/email_logs_config.php	(.../email_logs_config.php)	(revision 10843)
@@ -69,6 +69,7 @@
 
 		'Grids' => Array (
 			'Default' => Array (
+				'Icons' => Array ('default' => 'icon16_custom.gif'),
 				'Fields' => Array (
 					'EmailLogId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter',),
 					'fromuser' => Array ('title' => 'la_prompt_FromUsername', 'filter_block' => 'grid_like_filter', ),
Index: branches/RC/core/admin_templates/emails/send_complete.tpl
===================================================================
diff -u -r8929 -r10843
--- branches/RC/core/admin_templates/emails/send_complete.tpl	(.../send_complete.tpl)	(revision 8929)
+++ branches/RC/core/admin_templates/emails/send_complete.tpl	(.../send_complete.tpl)	(revision 10843)
@@ -4,13 +4,23 @@
 
 <inp2:m_RenderElement name="combined_header" section="in-portal:user_list" permission_type="advanced:send_email" prefix="emailevents" title_preset="email_send_complete"/>
 
+<script type="text/javascript">
+	function close_window() {
+		if (window.opener) {
+			window.opener.location.reload();
+		}
+
+		window.close();
+	}
+</script>
+
 <table class="edit-form">
 	<inp2:m_RenderElement name="subsection" title="la_prompt_EmailCompleteMessage"/>
 	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td colspan="3" align="center">
-			<input type="button" value="<inp2:m_phrase name="la_Close"/>" class="button" onclick="window.close();"/>
+			<input type="button" value="<inp2:m_phrase name="la_Close"/>" class="button" onclick="close_window();"/>
 		</td>
 	</tr>
-</table>	 
+</table>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/logs/email_logs/email_queue_list.tpl
===================================================================
diff -u -r10842 -r10843
--- branches/RC/core/admin_templates/logs/email_logs/email_queue_list.tpl	(.../email_queue_list.tpl)	(revision 10842)
+++ branches/RC/core/admin_templates/logs/email_logs/email_queue_list.tpl	(.../email_queue_list.tpl)	(revision 10843)
@@ -51,6 +51,16 @@
 				 				)
 				 			);
 
+				 			a_toolbar.AddButton(
+								new ToolBarButton(
+									'e-mail',
+									'<inp2:m_phrase label="la_ToolTip_ProcessQueue" escape="1"/>',
+									function() {
+										open_popup('emailmessages', null, 'emails/send_queue');
+									}
+				 				)
+				 			);
+
 					  		a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 
@@ -71,6 +81,16 @@
 </tbody>
 </table>
 
+<inp2:m_DefineElement name="header_element">
+	<strong><inp2:m_Param name="key"/></strong>: <inp2:m_Param name="value"/><br />
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_headers_td">
+	<td valign="top" class="text" style="<inp2:m_param name="td_style"/>">
+		<inp2:PrintSerializedFields field="$field" render_as="header_element"/>
+	</td>
+</inp2:m_DefineElement>
+
 <inp2:m_ParseBlock name="grid" PrefixSpecial="email-queue" IdField="EmailQueueId" grid="Default"/>
 <script type="text/javascript">
 	Grids['email-queue'].SetDependantToolbarButtons( new Array('delete') );
Index: branches/RC/core/units/email_queue/email_queue_tp.php
===================================================================
diff -u
--- branches/RC/core/units/email_queue/email_queue_tp.php	(revision 0)
+++ branches/RC/core/units/email_queue/email_queue_tp.php	(revision 10843)
@@ -0,0 +1,24 @@
+<?php
+
+	class EmailQueueTagProcessor extends kDBTagProcessor {
+
+		function PrintSerializedFields($params)
+		{
+			$object =& $this->getObject($params);
+
+			$field = $this->SelectParam($params, 'field');
+			$data = unserialize( $object->GetDBField($field) );
+
+			$o = '';
+			$std_params['name'] = $params['render_as'];
+			$std_params['field'] = $params['field'];
+			$std_params['pass_params'] = true;
+
+			foreach ($data as $key => $value) {
+				$block_params = array_merge($std_params, Array ('key' => $key, 'value' => $value));
+				$o .= $this->Application->ParseBlock($block_params);
+			}
+
+			return $o;
+		}
+	}
\ No newline at end of file