diff --git a/web/skins/classic/views/export.php b/web/skins/classic/views/export.php
index 54fad211c..20dfe2c11 100644
--- a/web/skins/classic/views/export.php
+++ b/web/skins/classic/views/export.php
@@ -39,33 +39,115 @@ if ( isset($_SESSION['export']) ) {
 }
 
 $focusWindow = true;
+$connkey = isset($_REQUEST['connkey']) ? $_REQUEST['connkey'] : generateConnKey();
 
 xhtmlHeaders(__FILE__, translate('Export') );
 ?>
 <body>
   <div id="page">
+    <?php echo getNavBarHTML() ?>
     <div id="header">
-      <div id="headerButtons">
-        <a href="#" onclick="closeWindow()"><?php echo translate('Close') ?></a>
-      </div>
       <h2><?php echo translate('ExportOptions') ?></h2>
     </div>
     <div id="content">
       <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
+        <input type="hidden" name="connkey" value="<?php echo $connkey; ?>"/>
 <?php
+
+$eventsSql = 'SELECT E.*,M.Name AS MonitorName FROM Monitors AS M INNER JOIN Events AS E on (M.Id = E.MonitorId) WHERE';
+$eventsValues = array();
+$filterQuery = '';
+$sortColumn = '';
+$sortOrder = '';
+
+if ( $user['MonitorIds'] ) {
+  $user_monitor_ids = ' M.Id in ('.$user['MonitorIds'].')';
+  $eventsSql .= $user_monitor_ids;
+} else {
+  $eventsSql .= ' 1';
+}
+
 if ( !empty($_REQUEST['eid']) ) {
-?>
-        <input type="hidden" name="id" value="<?php echo validInt($_REQUEST['eid']) ?>"/>
-<?php
+  $eventsSql .= ' AND E.Id=?';
+  $eventsValues[] = $_REQUEST['eid'];
 } elseif ( !empty($_REQUEST['eids']) ) {
-    foreach ( $_REQUEST['eids'] as $eid ) {
+  $eventsSql .= ' AND E.Id IN ('.implode(',', array_map(function(){return '?';}, $_REQUEST['eids'])). ')';
+  $eventsValues += $_REQUEST['eids'];
+} else if ( !empty($_REQUEST['filter']) ) {
+  parseSort();
+  parseFilter($_REQUEST['filter']);
+  $filterQuery = $_REQUEST['filter']['query'];
+
+  if ( $_REQUEST['filter']['sql'] ) {
+    $eventsSql .= $_REQUEST['filter']['sql'];
+  }
+  $eventsSql .= " ORDER BY $sortColumn $sortOrder";
+} # end if filter
+
+$results = dbQuery($eventsSql, $eventsValues);
+
+echo 'Export the following ' .$results->rowCount() . ' events:<br/>';
+$disk_space_total = 0;
 ?>
-        <input type="hidden" name="eids[]" value="<?php echo validInt($eid) ?>"/>
+        <table id="contentTable" class="major">
+          <thead>
+            <tr>
+              <th class="colId"><a href="<?php echo sortHeader('Id') ?>"><?php echo translate('Id') ?><?php echo sortTag( 'Id' ) ?></a></th>
+              <th class="colName"><a href="<?php echo sortHeader('Name') ?>"><?php echo translate('Name') ?><?php echo sortTag( 'Name' ) ?></a></th>
+              <th class="colMonitor"><a href="<?php echo sortHeader('MonitorName') ?>"><?php echo translate('Monitor') ?><?php echo sortTag( 'MonitorName' ) ?></a></th>
+              <th class="colCause"><a href="<?php echo sortHeader('Cause') ?>"><?php echo translate('Cause') ?><?php echo sortTag( 'Cause' ) ?></a></th>
+              <th class="colTime"><a href="<?php echo sortHeader('StartTime') ?>"><?php echo translate('Time') ?><?php echo sortTag( 'StartTime' ) ?></a></th>
+              <th class="colDuration"><a href="<?php echo sortHeader('Length') ?>"><?php echo translate('Duration') ?><?php echo sortTag( 'Length' ) ?></a></th>
+              <th class="colFrames"><a href="<?php echo sortHeader('Frames') ?>"><?php echo translate('Frames') ?><?php echo sortTag( 'Frames' ) ?></a></th>
+              <th class="colAlarmFrames"><a href="<?php echo sortHeader('AlarmFrames') ?>"><?php echo translate('AlarmBrFrames') ?><?php echo sortTag( 'AlarmFrames' ) ?></a></th>
+              <th class="colTotScore"><a href="<?php echo sortHeader('TotScore') ?>"><?php echo translate('TotalBrScore') ?><?php echo sortTag( 'TotScore' ) ?></a></th>
+              <th class="colAvgScore"><a href="<?php echo sortHeader('AvgScore') ?>"><?php echo translate('AvgBrScore') ?><?php echo sortTag( 'AvgScore' ) ?></a></th>
+              <th class="colMaxScore"><a href="<?php echo sortHeader('MaxScore') ?>"><?php echo translate('MaxBrScore') ?><?php echo sortTag( 'MaxScore' ) ?></a></th>
+<?php
+    if ( ZM_WEB_EVENT_DISK_SPACE ) {
+?>
+              <th class="colDiskSpace"><a href="<?php echo sortHeader('DiskSpace') ?>"><?php echo translate('DiskSpace') ?><?php echo sortTag('DiskSpace') ?></a></th>
 <?php
     }
-    unset( $eid );
-}
 ?>
+        </tr>
+      </thead>
+      <tbody>
+<?php
+while ( $event_row = dbFetchNext($results) ) {
+  $event = new Event($event_row);
+  $scale = max( reScale( SCALE_BASE, $event->DefaultScale(), ZM_WEB_DEFAULT_SCALE ), SCALE_BASE );
+  echo '<input type="hidden" name="eids[]" value="'.validInt($event->Id())."\"/>\n";
+?>
+          <tr<?php echo $event->Archived() ? ' class="archived"' : '' ?>>
+              <td class="colId"><a href="?view=event&amp;eid=<?php echo $event->Id().$filterQuery.$sortQuery.'&amp;page=1"> '.$event->Id().($event->Archived()?'*':'') ?></a></td>
+              <td class="colName"><a href="?view=event&amp;eid=<?php echo $event->Id().$filterQuery.$sortQuery.'&amp;page=1"> '.validHtmlStr($event->Name()).($event->Archived()?'*':'') ?></a></td>
+              <td class="colMonitorName"><?php echo makePopupLink( '?view=monitor&amp;mid='.$event->MonitorId(), 'zmMonitor'.$event->Monitorid(), 'monitor', $event->MonitorName(), canEdit( 'Monitors' ) ) ?></td>
+              <td class="colCause"><?php echo makePopupLink( '?view=eventdetail&amp;eid='.$event->Id(), 'zmEventDetail', 'eventdetail', validHtmlStr($event->Cause()), canEdit( 'Events' ), 'title="'.htmlspecialchars($event->Notes()).'"' ) ?></td>
+              <td class="colTime"><?php echo strftime(STRF_FMT_DATETIME_SHORTER, strtotime($event->StartTime())) .
+( $event->EndTime() ? ' until ' . strftime(STRF_FMT_DATETIME_SHORTER, strtotime($event->EndTime()) ) : '' ) ?>
+              </td>
+              <td class="colDuration"><?php echo gmdate("H:i:s", $event->Length() ) ?></td>
+              <td class="colFrames"><?php echo makePopupLink( '?view=frames&amp;eid='.$event->Id(), 'zmFrames', 'frames', $event->Frames() ) ?></td>
+              <td class="colAlarmFrames"><?php echo makePopupLink( '?view=frames&amp;eid='.$event->Id(), 'zmFrames', 'frames', $event->AlarmFrames() ) ?></td>
+              <td class="colTotScore"><?php echo $event->TotScore() ?></td>
+              <td class="colAvgScore"><?php echo $event->AvgScore() ?></td>
+              <td class="colMaxScore"><?php echo
+ $event->MaxScore();
+ #makePopupLink('?view=frame&amp;eid='.$event->Id().'&amp;fid=0', 'zmImage', array('image', reScale($event->Width(), $scale), reScale($event->Height(), $scale)), $event->MaxScore()) ?></td>
+<?php
+  if ( ZM_WEB_EVENT_DISK_SPACE ) {
+    $disk_space_total += $event->DiskSpace();
+?>
+              <td class="colDiskSpace"><?php echo human_filesize($event->DiskSpace()) ?></td>
+<?php
+  }
+  unset($event);
+} # end foreach event
+?>
+        </tbody>
+      </table>
+
         <table id="contentTable" class="minor">
           <tbody>
             <tr>
@@ -112,7 +194,7 @@ if ( !empty($_REQUEST['eid']) ) {
     }
     if ( !empty($_REQUEST['generated']) ) {
 ?>
-      <h3 id="downloadLink"><a href="<?php echo validHtmlStr($_REQUEST['exportFile']) ?>"><?php echo translate('Download') ?></a></h3>
+      <button href="<?php echo validHtmlStr($_REQUEST['exportFile']) ?>"><?php echo translate('Download') ?></button>
 <?php
     }
 ?>
