Imported Upstream version 0.1

[roundcube.git] / program / steps / mail / search.inc

diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc
index a3f6dda66cdf5524f95a9dc7e8874f1f6ae008d3..66fcf47a3554c618f8ca7fe7f18763822b90dfd2 100644 (file)
--- a/program/steps/mail/search.inc
+++ b/program/steps/mail/search.inc
@@ -64,7 +64,8 @@ else if (preg_match("/^body:/i", $str))
 // search in subject and sender by default
 else
 {
-  $subject = array("HEADER SUBJECT", "HEADER FROM");
+  $from = ($mbox == $CONFIG['sent_mbox'] || $mbox == $CONFIG['drafts_mbox']) ? "TO" : "FROM";
+  $subject = array("HEADER SUBJECT", "HEADER $from");
   $search = trim($str);
 }
 
@@ -88,6 +89,7 @@ if (is_array($result) && $result[0] != '')
   if ($result_h != NULL)
   {
     $_SESSION['search'][$search_request] = $IMAP->get_search_set();
+    $_SESSION['last_text_search'] = $str;
     rcmail_js_message_list($result_h);
     $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $count));
   }
@@ -106,4 +108,4 @@ $OUTPUT->set_env('pagecount', $pages);
 $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count, 1));
 $OUTPUT->send();
 
-?>
\ No newline at end of file
+?>