diff --git a/config.php.in b/config.php.in
index 1f14bda2..bf7117b0 100644
--- a/config.php.in
+++ b/config.php.in
@@ -55,6 +55,8 @@ $config['SHOW_MENU_FOR_OUTLOOK'] = 0;
 
 $config['SEARCH_QUERY_QUOTING'] = 0;
 
+$config['LOCALIZE_MESSAGE_HEADERS_IN_PREVIEW'] = 1;
+
 $config['TIMEZONE'] = 'Europe/Budapest';
 
 $config['PROVIDED_BY'] = 'www.mailpiler.org';
diff --git a/webui/model/search/message.php b/webui/model/search/message.php
index c7b06ecc..0178f8f6 100644
--- a/webui/model/search/message.php
+++ b/webui/model/search/message.php
@@ -129,11 +129,21 @@ class ModelSearchMessage extends Model {
 
 
    public function extract_message($id = '', $terms = '') {
-      $from = "From: ";
-      $to = "To: ";
-      $cc = "Cc: ";
-      $subject = "Subject: ";
-      $date = "Date: ";
+      if(LOCALIZE_MESSAGE_HEADERS_IN_PREVIEW) {
+         $lang = Registry::get('language');
+
+         $from = $lang->data['text_from'] . ": ";
+         $to = $lang->data['text_to'] . ": ";
+         $cc = "Cc: ";
+         $subject = $lang->data['text_subject'] . ": ";
+         $date = $lang->data['text_date'] . ": ";
+      } else {
+         $from = "From: ";
+         $to = "To: ";
+         $cc = "Cc: ";
+         $subject = "Subject: ";
+         $date = "Date: ";
+      }
 
       $msg = $this->get_raw_message($id);