diff --git a/WPML_Email_Log_List.php b/WPML_Email_Log_List.php
index 80fcb604..e805efaf 100644
--- a/WPML_Email_Log_List.php
+++ b/WPML_Email_Log_List.php
@@ -31,7 +31,7 @@ function __construct() {
 	 * @see WP_List_Table::no_items()
 	 */
 	function no_items() {
-		_e( 'No ' . $this->_args['singular'] . ' logged yet.' );
+		_e( 'No ' . $this->_args['singular'] . ' found.' );
 		return;
 	}
 	
@@ -84,9 +84,10 @@ function get_hidden_columns() {
 	/**
 	 * Prepares the items for rendering
 	 * @since 1.0
+	 * @param string you want to search for
 	 * @see WP_List_Table::prepare_items()
 	 */
-	function prepare_items() {
+	function prepare_items( $search = false ) {
 		global $wpdb;
 		$tableName = WPML_Plugin::getTablename( 'mails' );
 		
@@ -99,16 +100,27 @@ function prepare_items() {
 		
 		$per_page = $this->get_items_per_page( 'per_page', 25 );
 		$current_page = $this->get_pagenum();
-		$total_items = $wpdb->get_var( "SELECT COUNT(*) FROM `$tableName`" );
+		$total_items = $wpdb->get_var( "SELECT COUNT(*) FROM `$tableName`;" );
 		
-		//TODO: make option for default order
 		$orderby_default = "mail_id";
 		$order_default = "desc";
 		$orderby = ( !empty( $_GET['orderby'] ) ) ? $_GET['orderby'] : $orderby_default;
 		$order = ( !empty($_GET['order'] ) ) ? $_GET['order'] : $order_default;
 		$offset = ( $current_page-1 ) * $per_page;
 		
-		$dataset = $wpdb->get_results( "SELECT * FROM `$tableName` ORDER BY $orderby $order LIMIT $per_page OFFSET $offset", ARRAY_A);
+		$search_query = '';
+		if( $search ) {
+			$search = esc_sql( sanitize_text_field( $search ) );
+			$search_query = sprintf( "
+				WHERE 
+				(`receiver` LIKE '%%%1\$s%%') OR  
+				(`subject` LIKE '%%%1\$s%%') OR 
+				(`message` LIKE '%%%1\$s%%') OR 
+				(`headers` LIKE '%%%1\$s%%') OR 
+				(`attachments` LIKE '%%%1\$s%%')", $search );
+		}
+		
+		$dataset = $wpdb->get_results( "SELECT * FROM `$tableName` $search_query ORDER BY $orderby $order LIMIT $per_page OFFSET $offset;", ARRAY_A);
 		
 		$this->set_pagination_args( array(
 			'total_items' => $total_items, // the total number of items
diff --git a/WPML_OptionsManager.php b/WPML_OptionsManager.php
index 1fe56f24..bd470fe5 100644
--- a/WPML_OptionsManager.php
+++ b/WPML_OptionsManager.php
@@ -377,11 +377,7 @@ public function LogMenu() {
     	?>
     	 <div class="wrap">
             <h2><?php echo $this->getPluginDisplayName(); echo ' '; _e('Log', 'wpml'); ?></h2>
-				<?php
-				$emailLoggingListTable = new Email_Logging_ListTable();
-				$emailLoggingListTable->prepare_items();
-				?>
-
+				
 				<div id="wp-mail-logging-modal-wrap">
 					<div id="wp-mail-logging-modal-backdrop"></div>
 					<div id="wp-mail-logging-modal-content-wrap">
@@ -415,7 +411,12 @@ public function LogMenu() {
 
 				<form id="email-list" method="get">
 					<input type="hidden" name="page" value="<?php echo $_REQUEST['page'] ?>" />
+					
 					<?php
+					$search = ( isset( $_REQUEST['s'] ) ) ? $_REQUEST['s'] : false;
+					$emailLoggingListTable = new Email_Logging_ListTable();
+					$emailLoggingListTable->prepare_items( $search );
+					$emailLoggingListTable->search_box( __( 'Search' ), 's' );
 					$emailLoggingListTable->display();
 					?>
 				</form>